bf

Build/Components/4DPop XLIFF Pro.4dbase/Info.plist

@@ -8,19 +8,19 @@
     <key>CFBundleIdentifier</key>
     <string>com.4D.4DPop XLIFF Pro</string>
     <key>CFBundleGetInfoString</key>
-    <string>20</string>
+    <string>20R3</string>
     <key>CFBundleLongVersionString</key>
-    <string>20 (87)</string>
+    <string>20R3 (91)</string>
     <key>CFBundleName</key>
     <string>4DPop XLIFF Pro</string>
     <key>CFBundleDevelopmentRegion</key>
     <string>French</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop XLIFF Pro</string>
     <key>CFBundleVersion</key>
-    <string>88</string>
+    <string>92</string>
     <key>CFBundleShortVersionString</key>
-    <string>20</string>
+    <string>20R3</string>
     <key>CFBundleExecutable</key>
     <string>4DPop XLIFF Pro</string>
   </dict>

Info.plist

@@ -8,19 +8,19 @@
     <key>CFBundleIdentifier</key>
     <string>com.4D.4DPop XLIFF Pro</string>
     <key>CFBundleGetInfoString</key>
-    <string>20</string>
+    <string>20R3</string>
     <key>CFBundleLongVersionString</key>
-    <string>20 (87)</string>
+    <string>20R3 (91)</string>
     <key>CFBundleName</key>
     <string>4DPop XLIFF Pro</string>
     <key>CFBundleDevelopmentRegion</key>
     <string>French</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop XLIFF Pro</string>
     <key>CFBundleVersion</key>
-    <string>88</string>
+    <string>92</string>
     <key>CFBundleShortVersionString</key>
-    <string>20</string>
+    <string>20R3</string>
     <key>CFBundleExecutable</key>
     <string>4DPop XLIFF Pro</string>
   </dict>

Project/Sources/Classes/buttonDelegate.4dm

@@ -210,7 +210,7 @@ style = 13: OS X Gradient
 	/// Returns True if the current button is a 3D button
 Function is3DButton($message : Text) : Boolean
 
-	return [Object type 3D button:K79:17; Object type 3D checkbox:K79:27; Object type 3D radio button:K79:24].indexOf(This:C1470.type)#-1
+	return [Object type 3D button:K79:17; Object type 3D checkbox:K79:27; Object type 3D radio button:K79:24].includes(This:C1470.type)
 
 
 	//MARK:-

Project/Sources/Classes/database.4dm

@@ -218,12 +218,12 @@ Function isMethodAvailable($name : Text) : Boolean
 	// === === === === === === === === === === === === === === === === === === === === === === === === === ===
 Function isComponentAvailable($name : Text) : Boolean
 
-	return This:C1470.components.indexOf($name)#-1
+	return This:C1470.components.includes($name)
 
 	// === === === === === === === === === === === === === === === === === === === === === === === === === ===
 Function isPluginAvailable($name : Text) : Boolean
 
-	return This:C1470.plugins.indexOf($name)#-1
+	return This:C1470.plugins.includes($name)
 
 	// === === === === === === === === === === === === === === === === === === === === === === === === === ===
 	// Check if the database folder is writable

Project/Sources/Classes/evt.4dm

@@ -28,13 +28,16 @@ Class constructor($e : cs:C1710.evt)
 
 	$e:=$e || FORM Event:C1606
 
-	var $key : Text
-
-	For each ($key; $e)
+	If ($e#Null:C1517)
 
-		This:C1470[$key]:=$e[$key]
+		var $key : Text
 
-	End for each 
+		For each ($key; $e)
+
+			This:C1470[$key]:=$e[$key]
+
+		End for each 
+	End if 
 
 	// MARK:-Form
 	// <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <==

Project/Sources/Classes/formDelegate.4dm

@@ -1,4 +1,4 @@
-property currentForm : Text
+property currentForm; _worker; _callback; _darkExtension : Text
 property isSubform; toBeInitialized; visible : Boolean
 property pageNumber : Integer
 property definition; pages : Object
@@ -193,8 +193,10 @@ Function handleEvents()
 Function onLoad()
 
 	var $event; $key : Text
-	var $o; $page; $widget : Object
+	var $o; $page : Object
 	var $events; $widgets : Collection
+	var $widget : cs:C1710.widgetDelegate
+
 
 	// Defines the container reference in subform instances
 	For each ($o; This:C1470.instantiatedSubforms)
@@ -204,7 +206,7 @@ Function onLoad()
 	End for each 
 
 	// Add the widgets events that we cannot select in the form properties 😇
-	// ⚠️ OBJECT GET EVENTS return an empty array if no object method
+	// ⚠️ OBJECT GET EVENTS return an empty array if no object method, so we analyze the json form
 
 	$widgets:=This:C1470._getInstantiated()
 
@@ -218,7 +220,7 @@ Function onLoad()
 
 				For each ($key; $page.objects)
 
-					$widget:=$widgets.query("name = :1"; $key).pop()
+					$widget:=$widgets.query("name = :1"; $key).first()
 
 					If ($widget#Null:C1517)\
 						 && ($page.objects[$key].events#Null:C1517)
@@ -230,8 +232,7 @@ Function onLoad()
 							If (Asserted:C1132($o#Null:C1517; "FIXME:Add missing event map for "+$event))
 
 								// Update the widget
-								$widget.events:=$widget.events || []
-								$widget.events.push($o.k)
+								$widget.addEvent($o.k)
 
 								// Keep the event
 								$events.push($o.k)
@@ -1178,7 +1179,7 @@ Function _getInstantiated($class : Object; $instanceName : Text) : Variant
 			For each ($key; This:C1470.__SUPER__)
 
 				If (Value type:C1509(This:C1470.__SUPER__[$key])=Is object:K8:27)\
-					 && (This:C1470.instantiableWidgets.indexOf(OB Class:C1730(This:C1470.__SUPER__[$key]))#-1)
+					 && (This:C1470.instantiableWidgets.includes(OB Class:C1730(This:C1470.__SUPER__[$key])))
 
 					$c.push(This:C1470.__SUPER__[$key])
 

Project/Sources/Classes/groupDelegate.4dm

@@ -144,7 +144,7 @@ Function belongsTo($formObject : Variant) : Boolean
 			//______________________________________________________
 		: (Value type:C1509($formObject)=Is object:K8:27)
 
-			return This:C1470.members.indexOf($formObject)#-1
+			return This:C1470.members.includes($formObject)
 
 			//______________________________________________________
 		: (Value type:C1509($formObject)=Is text:K8:3)

Project/Sources/Classes/menu.4dm

@@ -45,7 +45,7 @@ Class constructor($options)
 							: ($c.length>1)
 
 								This:C1470.autoRelease:=($c.indexOf("keep-reference")=-1)
-								This:C1470.metacharacters:=($c.indexOf("display-metacharacters")#-1)
+								This:C1470.metacharacters:=($c.includes("display-metacharacters"))
 								This:C1470.localize:=($c.indexOf("no-localization")=-1)
 
 								//-----------------

Project/Sources/Classes/scrollableDelegate.4dm

@@ -10,7 +10,7 @@ Class constructor($name : Text)
 		Object type listbox:K79:8; \
 		Object type picture input:K79:5; \
 		Object type hierarchical list:K79:7; \
-		Object type text input:K79:4].indexOf(This:C1470.type)#-1)
+		Object type text input:K79:4].includes(This:C1470.type))
 
 	This:C1470.getScrollbars()
 

Project/Sources/Classes/staticDelegate.4dm

@@ -291,7 +291,7 @@ Function set font($font : Text)
 
 				For each ($font; $desiredFonts)
 
-					If (This:C1470._fontList().indexOf($font)#-1)
+					If (This:C1470._fontList().includes($font))
 
 						OBJECT SET FONT:C164(*; This:C1470.name; $font)
 						break
@@ -522,7 +522,7 @@ Function bestSize($alignment; $minWidth : Integer; $maxWidth : Integer) : cs:C17
 		Object type radio button:K79:23; \
 		Object type static picture:K79:3; \
 		Object type static text:K79:2; \
-		Object type listbox:K79:8].indexOf(This:C1470.type)#-1)
+		Object type listbox:K79:8].includes(This:C1470.type))
 
 		If ($o.maxWidth#Null:C1517)
 

Project/Sources/Classes/widgetDelegate.4dm

@@ -1,5 +1,7 @@
 Class extends staticDelegate
 
+property _events : Collection
+
 Class constructor($name : Text)
 
 	Super:C1705($name)
@@ -332,12 +334,12 @@ Function catch($e; $events) : Boolean
 				//______________________________________________________
 			: (This:C1470._events.length>0)
 
-				$catch:=(This:C1470._events.indexOf($e.code)#-1)
+				$catch:=(This:C1470._events.includes($e.code))
 
 				//______________________________________________________
 			: (Count parameters:C259>=2) && (Value type:C1509($events)=Is collection:K8:32)  // Old mechanism [COMPATIBILITY]
 
-				$catch:=($events.indexOf($e.code)#-1)
+				$catch:=($events.includes($e.code))
 
 				//______________________________________________________
 			: (Count parameters:C259>=2) && (Value type:C1509($events)=Is integer:K8:5)  // Old mechanism [COMPATIBILITY]
@@ -369,6 +371,8 @@ Function _setEvents($events; $mode : Integer)
 
 	ARRAY LONGINT:C221($eventCodes; 0x0000)
 
+	This:C1470._events:=This:C1470._events || []
+
 	Case of 
 
 			//______________________________________________________
@@ -401,8 +405,11 @@ Function _setEvents($events; $mode : Integer)
 	// Update widget events
 	// FIXME:Note that the arrEvents array is returned empty if no object method is associated with the object or if no form method is associated with the form.
 	OBJECT GET EVENTS:C1238(*; This:C1470.name; $eventCodes)
-	This:C1470._events:=[]
-	ARRAY TO COLLECTION:C1563(This:C1470._events; $eventCodes)
+	var $c : Collection
+	$c:=[]
+	ARRAY TO COLLECTION:C1563($c; $eventCodes)
+	This:C1470._events.combine($c)
+
 
 	//mark:-[Attached data]
 	// <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <==

lastbuild

@@ -1 +1 @@
-20
+20R3