@qooxdoo/framework 7.7.0 → 7.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qooxdoo/framework",
-  "version": "7.7.0",
+  "version": "7.7.2",
   "description": "The JS Framework for Coders",
   "author": "The qooxdoo project",
   "keywords": [

package/source/class/qx/Class.js

@@ -840,7 +840,7 @@ qx.Bootstrap.define("qx.Class", {
             ? this.__staticAllowedKeys
             : this.__allowedKeys;
         for (var key in config) {
-          if (!allowed[key]) {
+          if (!(key in allowed)) {
             throw new Error(
               'The configuration key "' +
                 key +

package/source/class/qx/Mixin.js

@@ -371,16 +371,18 @@ qx.Bootstrap.define("qx.Mixin", {
               break;
             }
           }
+
           // Try looking in the class itself
           if (!fn && mixedInAt.prototype[methodName]) {
-            fn = mixedInAt.prototype[methodName].base;
-            // if fn.self is set fn is an overloaded mixin method from
-            // another mixin. In this case fn.base contains the original
-            // class method.
-            if (fn && fn.self) {
+            fn = mixedInAt.prototype[methodName];
+            for (let i = 0; i < mixedInAt.$$flatIncludes.length; i++) {
+              if (!mixedInAt.$$flatIncludes[i].$$members[methodName]) {
+                continue;
+              }
               fn = fn.base;
             }
           }
+
           // Try looking in the superclass
           if (!fn && mixedInAt.superclass) {
             fn = mixedInAt.superclass.prototype[methodName];

package/source/class/qx/bom/Input.js

@@ -44,19 +44,30 @@ qx.Bootstrap.define("qx.bom.Input", {
   statics: {
     /** @type {Map} Internal data structures with all supported input types */
     __types: {
-      text: 1,
-      textarea: 1,
-      select: 1,
-      checkbox: 1,
-      radio: 1,
-      password: 1,
-      hidden: 1,
-      submit: 1,
-      image: 1,
-      file: 1,
-      search: 1,
-      reset: 1,
-      button: 1
+      textarea: true,
+      select: true,
+      button: true,
+      checkbox: true,
+      color: true,
+      date: true,
+      "datetime-local": true,
+      email: true,
+      file: true,
+      hidden: true,
+      image: true,
+      month: true,
+      number: true,
+      password: true,
+      radio: true,
+      range: true,
+      reset: true,
+      search: true,
+      submit: true,
+      tel: true,
+      text: true,
+      time: true,
+      url: true,
+      week: true
     },
 
     /**

package/source/class/qx/lang/Function.js

@@ -173,7 +173,7 @@ qx.Bootstrap.define("qx.lang.Function", {
         return func;
       }
 
-      return function (event) {
+      let result = function (event) {
         if (qx.core.Environment.get("qx.debug")) {
           function testSelf(self) {
             if (
@@ -233,6 +233,10 @@ qx.Bootstrap.define("qx.lang.Function", {
           return func.apply(options.self || this, args);
         }
       };
+      if (qx.core.Environment.get("qx.debug")) {
+        result.$$original = func;
+      }
+      return result;
     },
 
     /**

package/source/class/qx/test/Mixin.js

@@ -610,6 +610,266 @@ qx.Class.define("qx.test.Mixin", {
       var o = new qx.D();
       this.assertEquals("Double MA MB", o.sayJuhu());
       o.dispose();
+    },
+
+    testDoubleMixinWithSuperStruct() {
+      qx.Class.define("qx.E1", {
+        extend: qx.core.Object,
+        members: {
+          sayJuhu() {
+            return "E1";
+          }
+        }
+      });
+      qx.Mixin.define("qx.ME1a", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} ME1`;
+          }
+        }
+      });
+      qx.Mixin.define("qx.ME1b", {
+        members: {
+          // does not implement `sayJuhu`
+        }
+      });
+
+      qx.Class.define("qx.E2", {
+        extend: qx.E1,
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} E2`;
+          }
+        }
+      });
+      qx.Mixin.define("qx.ME2a", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} ME2a`;
+          }
+        }
+      });
+      qx.Mixin.define("qx.ME2b", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} ME2b`;
+          }
+        }
+      });
+
+      qx.Class.patch(qx.E1, qx.ME1a);
+      qx.Class.patch(qx.E1, qx.ME1b);
+      qx.Class.patch(qx.E2, qx.ME2a);
+      qx.Class.patch(qx.E2, qx.ME2b);
+
+      const e = new qx.E2();
+      this.assertEquals("E1 ME1 E2 ME2a ME2b", e.sayJuhu());
+      e.dispose();
+    },
+
+    /**
+     * tests a large structure to ensure that combinations of patch order,
+     * presence of given method, nor patched class count have an impact on
+     * the behavior of `super` in mixin methods.
+     */
+    testLotsMixinLotsSuper() {
+      qx.Class.define("qx.G1", {
+        extend: qx.core.Object,
+        members: {
+          sayJuhu() {
+            return "G1";
+          }
+        }
+      });
+      qx.Mixin.define("qx.M1G1", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} M1G1`;
+          }
+        }
+      });
+      qx.Class.patch(qx.G1, qx.M1G1);
+      qx.Mixin.define("qx.M2G1", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} M2G1`;
+          }
+        }
+      });
+      qx.Class.patch(qx.G1, qx.M2G1);
+      qx.Mixin.define("qx.M3G1", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} M3G1`;
+          }
+        }
+      });
+      qx.Class.patch(qx.G1, qx.M3G1);
+      qx.Mixin.define("qx.M4G1", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} M4G1`;
+          }
+        }
+      });
+      qx.Class.patch(qx.G1, qx.M4G1);
+      qx.Mixin.define("qx.M5G1", {
+        members: {
+          // does not implement `sayJuhu`
+        }
+      });
+      qx.Class.patch(qx.G1, qx.M5G1);
+      qx.Mixin.define("qx.M6G1", {
+        members: {
+          // does not implement `sayJuhu`
+        }
+      });
+      qx.Class.patch(qx.G1, qx.M6G1);
+
+      qx.Class.define("qx.G2", {
+        extend: qx.G1,
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} G2`;
+          }
+        }
+      });
+      qx.Mixin.define("qx.M1G2", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} M1G2`;
+          }
+        }
+      });
+      qx.Class.patch(qx.G2, qx.M1G2);
+      qx.Mixin.define("qx.M2G2", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} M2G2`;
+          }
+        }
+      });
+      qx.Class.patch(qx.G2, qx.M2G2);
+      qx.Mixin.define("qx.M3G2", {
+        members: {
+          // does not implement `sayJuhu`
+        }
+      });
+      qx.Class.patch(qx.G2, qx.M3G2);
+      qx.Mixin.define("qx.M4G2", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} M4G2`;
+          }
+        }
+      });
+      qx.Class.patch(qx.G2, qx.M4G2);
+      qx.Mixin.define("qx.M5G2", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} M5G2`;
+          }
+        }
+      });
+      qx.Class.patch(qx.G2, qx.M5G2);
+
+      qx.Class.define("qx.G3", {
+        extend: qx.G2,
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} G3`;
+          }
+        }
+      });
+      qx.Mixin.define("qx.M1G3", {
+        members: {
+          // does not implement `sayJuhu`
+        }
+      });
+      qx.Class.patch(qx.G3, qx.M1G3);
+      qx.Mixin.define("qx.M2G3", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} M2G3`;
+          }
+        }
+      });
+      qx.Class.patch(qx.G3, qx.M2G3);
+      qx.Mixin.define("qx.M3G3", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} M3G3`;
+          }
+        }
+      });
+      qx.Class.patch(qx.G3, qx.M3G3);
+      qx.Mixin.define("qx.M4G3", {
+        members: {
+          // does not implement `sayJuhu`
+        }
+      });
+      qx.Class.patch(qx.G3, qx.M4G3);
+
+      qx.Class.define("qx.G4", {
+        extend: qx.G3,
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} G4`;
+          }
+        }
+      });
+      qx.Mixin.define("qx.M1G4", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} M1G4`;
+          }
+        }
+      });
+      qx.Class.patch(qx.G4, qx.M1G4);
+      qx.Mixin.define("qx.M2G4", {
+        members: {
+          // does not implement `sayJuhu`
+        }
+      });
+      qx.Class.patch(qx.G4, qx.M2G4);
+      qx.Mixin.define("qx.M3G4", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} M3G4`;
+          }
+        }
+      });
+      qx.Class.patch(qx.G4, qx.M3G4);
+
+      qx.Class.define("qx.G5", {
+        extend: qx.G4,
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} G5`;
+          }
+        }
+      });
+      qx.Mixin.define("qx.M1G5", {
+        members: {
+          sayJuhu() {
+            return `${super.sayJuhu()} M1G5`;
+          }
+        }
+      });
+      qx.Class.patch(qx.G5, qx.M1G5);
+      qx.Mixin.define("qx.M2G5", {
+        members: {
+          // does not implement `sayJuhu`
+        }
+      });
+      qx.Class.patch(qx.G5, qx.M2G5);
+
+      const g5 = new qx.G5();
+      this.assertEquals(
+        "G1 M1G1 M2G1 M3G1 M4G1 G2 M1G2 M2G2 M4G2 M5G2 G3 M2G3 M3G3 G4 M1G4 M3G4 G5 M1G5",
+        g5.sayJuhu()
+      );
+      g5.dispose();
     }
   }
 });

package/source/class/qx/tool/cli/commands/Compile.js

@@ -789,14 +789,11 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
       }
 
       for (let filename of classFiles) {
-        if (this.argv.verbose) {
-          qx.tool.compiler.Console.info(`Processing ${filename} ...`);
-        }
         await metaDb.addFile(filename, !!this.argv.clean);
       }
       await metaDb.reparseAll();
       await metaDb.save();
-      this.fireDataEvent("writtenMetaData", metaDb);
+      await this.fireDataEventAsync("writtenMetaData", metaDb);
 
       // Do the inital write
       let tsWriter = null;
@@ -806,7 +803,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         if (this.__typescriptFile) {
           tsWriter.setOutputTo(this.__typescriptFile);
         } else {
-          tsWriter.setOutputTo(path.join("compiled", "qooxdoo.d.ts"));
+          tsWriter.setOutputTo(path.join(this.__metaDir, "..", "qooxdoo.d.ts"));
         }
         await tsWriter.process();
       }
@@ -885,9 +882,12 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
 
       if (qx.lang.Type.isBoolean(data?.meta?.typescript)) {
         this.__typescriptEnabled = data.meta.typescript;
-      } else if (qx.lang.Type.isString(data?.typescript)) {
+      } else if (qx.lang.Type.isString(data?.meta?.typescript)) {
         this.__typescriptEnabled = true;
-        this.__typescriptFile = data.typescript;
+        this.__typescriptFile = path.relative(
+          process.cwd(),
+          path.resolve(data?.meta?.typescript)
+        );
       }
       if (qx.lang.Type.isBoolean(this.argv.typescript)) {
         this.__typescriptEnabled = this.argv.typescript;

package/source/class/qx/tool/compiler/ClassFile.js

@@ -1349,8 +1349,12 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
           t.__hasDefer = true;
           t.__inDefer = true;
         }
-        t.__classMeta.functionName = FUNCTION_NAMES[keyName] || keyName;
-        if (FUNCTION_NAMES[keyName] !== undefined) {
+        var isSpecialFunctionName =
+          Object.keys(FUNCTION_NAMES).includes(keyName);
+        t.__classMeta.functionName = isSpecialFunctionName
+          ? FUNCTION_NAMES[keyName]
+          : keyName;
+        if (isSpecialFunctionName) {
           makeMeta(keyName, null, functionNode);
         }
         enterFunction(path, functionNode);
@@ -1393,8 +1397,9 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
           }
           var keyName = getKeyName(prop.key);
           checkValidTopLevel(path);
-
-          if (FUNCTION_NAMES[keyName] !== undefined) {
+          var isSpecialFunctionName =
+            Object.keys(FUNCTION_NAMES).includes(keyName);
+          if (isSpecialFunctionName) {
             let val = path.node.value;
             val.leadingComments = (path.node.leadingComments || []).concat(
               val.leadingComments || []

package/source/class/qx/tool/compiler/targets/Target.js

@@ -373,10 +373,10 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
 
       appMeta.setSourceUri(mapTo ? mapTo : targetUri + "transpiled/");
       mapTo = this.getPathMapping(
-        path.join(appRootDir, this.getOutputDir(), "resource/")
+        path.join(appRootDir, this.getOutputDir(), "resource")
       );
 
-      appMeta.setResourceUri(mapTo ? mapTo : targetUri + "resource/");
+      appMeta.setResourceUri(mapTo ? mapTo : targetUri + "resource");
 
       const requiredLibs = application.getRequiredLibraries();
 

package/source/class/qx/tool/compiler/targets/TypeScriptWriter.js

@@ -21,7 +21,7 @@
  *
  * *********************************************************************** */
 
-var path = require("path");
+var path = require("upath");
 
 var fs = require("fs");
 const { promisify } = require("util");
@@ -77,13 +77,8 @@ qx.Class.define("qx.tool.compiler.targets.TypeScriptWriter", {
       this.__outputStream.on("close", () =>
         this.__outputStreamClosed.resolve()
       );
-
       this.write(`// Generated declaration file at ${time}\n`);
-
-      let str = qx.util.ResourceManager.getInstance().toUri(
-        "qx/tool/cli/templates/TypeScriptWriter-base_declaration.d.ts"
-      );
-
+      let str = path.join(qx.tool.utils.Utils.getTemplateDir(), "TypeScriptWriter-base_declaration.d.ts")
       let baseDeclaration = await fs.promises.readFile(str, "utf8");
       this.write(baseDeclaration + "\n");
     },

package/source/class/qx/ui/form/AbstractField.js

@@ -35,19 +35,19 @@ qx.Class.define("qx.ui.form.AbstractField", {
   type: "abstract",
 
   statics: {
-    /** Stylesheet needed to style the native placeholder element. */
-    __stylesheet: null,
-
-    __addedPlaceholderRules: false,
+    __addedPlaceholderRules: "",
 
     /**
      * Adds the CSS rules needed to style the native placeholder element.
      */
     __addPlaceholderRules() {
-      if (qx.ui.form.AbstractField.__addedPlaceholderRules) {
+      const theme = qx.theme.manager.Meta.getInstance().getTheme();
+      const currentThemeName = theme ? theme.title || theme.name : "";
+
+      if (qx.ui.form.AbstractField.__addedPlaceholderRules === currentThemeName) {
         return;
       }
-      qx.ui.form.AbstractField.__addedPlaceholderRules = true;
+      qx.ui.form.AbstractField.__addedPlaceholderRules = currentThemeName;
       var engine = qx.core.Environment.get("engine.name");
       var browser = qx.core.Environment.get("browser.name");
       var colorManager = qx.theme.manager.Color.getInstance();
@@ -100,7 +100,9 @@ qx.Class.define("qx.ui.form.AbstractField", {
           "-ms-input-placeholder"
         ].join(separator);
       }
-
+      if(qx.ui.style.Stylesheet.getInstance().hasRule(selector)) {
+        qx.ui.style.Stylesheet.getInstance().removeRule(selector);
+      }
       qx.ui.style.Stylesheet.getInstance().addRule(
         selector,
         "color: " + color + " !important"
@@ -931,9 +933,7 @@ qx.Class.define("qx.ui.form.AbstractField", {
         this._placeholder.dispose();
         this._placeholder = null;
       }
-      if (!this.__useQxPlaceholder && qx.ui.form.AbstractField.__stylesheet) {
-        qx.bom.Stylesheet.removeSheet(qx.ui.form.AbstractField.__stylesheet);
-        qx.ui.form.AbstractField.__stylesheet = null;
+      if (!this.__useQxPlaceholder) {
         qx.ui.form.AbstractField.__addPlaceholderRules();
       }
     },

package/source/class/qx/ui/form/IListItem.js

@@ -20,4 +20,51 @@
  * This is a marker interface for classes which can act as a children of
  * {@link qx.ui.form.List}
  */
-qx.Interface.define("qx.ui.form.IListItem", {});
+qx.Interface.define("qx.ui.form.IListItem", {
+    /*
+  *****************************************************************************
+     EVENTS
+  *****************************************************************************
+  */
+
+  events: {
+    /** Fired when the value was modified */
+    changeReadOnly: "qx.event.type.Data"
+  },
+
+  /*
+  *****************************************************************************
+     MEMBERS
+  *****************************************************************************
+  */
+
+  members: {
+    /*
+    ---------------------------------------------------------------------------
+      READONLY PROPERTY
+    ---------------------------------------------------------------------------
+    */
+
+    /**
+     * Sets the element's value.
+     *
+     * @param value {Boolean|null} The new value of the element.
+     * @return {Boolean|null}
+     */
+    setReadOnly(value) {
+      this.assertArgumentsCount(arguments, 1, 1);
+    },
+
+    /**
+     * Resets the element's value to its initial value.
+     */
+    resetReadOnly() {},
+
+    /**
+     * The element's user set value.
+     *
+     * @return {Boolean|null} The value.
+     */
+    getReadOnly() {}
+  }
+});

package/source/class/qx/ui/form/List.js

@@ -199,10 +199,12 @@ qx.Class.define("qx.ui.form.List", {
      */
     _onAddChild(e) {
       const child = e.getData();
-      this.__childrenBindings.set(
-        child.toHashCode(),
-        this.bind("readOnly", child, "readOnly")
-      );
+      if (qx.Class.implementsInterface(child, qx.ui.form.IListItem)) {
+        this.__childrenBindings.set(
+          child.toHashCode(),
+          this.bind("readOnly", child, "readOnly")
+        );
+      }
 
       this.fireDataEvent("addItem", child);
     },
@@ -214,8 +216,11 @@ qx.Class.define("qx.ui.form.List", {
      */
     _onRemoveChild(e) {
       const child = e.getData();
-      child.removeBinding(this.__childrenBindings.get(child.toHashCode()));
-      this.__childrenBindings.delete(child.toHashCode());
+      const binding = this.__childrenBindings.get(child.toHashCode());
+      if (binding) {
+        child.removeBinding(binding);
+        this.__childrenBindings.delete(child.toHashCode());
+      }
       this.fireDataEvent("removeItem", child);
     },
 

package/source/class/qx/ui/table/Table.js

@@ -543,6 +543,14 @@ qx.Class.define("qx.ui.table.Table", {
       event: "changeDataRowRenderer"
     },
 
+    /**
+     * The action to take when a cell is being edited and the focus moves elsewhere.
+     */
+    cellEditorBlurAction: {
+      check: ["nothing", "save", "cancel"],
+      init: "nothing"
+    },
+
     /**
      * A function to call when before modal cell editor is opened.
      *

package/source/class/qx/ui/table/pane/Scroller.js

@@ -1873,6 +1873,7 @@ qx.Class.define("qx.ui.table.pane.Scroller", {
           // Make the focus indicator visible during editing
           this.__focusIndicator.setDecorator("table-scroller-focus-indicator");
 
+          this._cellEditor.addListenerOnce('focusin', this._onFocusinCellEditorAddBlurListener, this);
           this._cellEditor.focus();
           this._cellEditor.activate();
         }
@@ -1964,6 +1965,40 @@ qx.Class.define("qx.ui.table.pane.Scroller", {
       this.stopEditing();
     },
 
+    /**
+     * Focusin event handler which attaches the blur event listener ot the cell editor
+     * and uses a timer event to allow the focusin event listener execution before
+     * the blur event listener execution
+     */
+    _onFocusinCellEditorAddBlurListener(e) {
+      this.debug("executed FOCUSIN event listener for hash: " + e.getTarget().$$hash);
+      qx.event.Timer.once(function() {
+        this._cellEditor.addListenerOnce('blur', this._onBlurCellEditorStopEditing, this);
+        this.debug('added BLUR listener to hash: ' + this._cellEditor.$$hash);
+      }, this, 0);
+    },
+
+    /**
+     * Stop editing whenever the cell editor blurs.
+     */
+    _onBlurCellEditorStopEditing(e) {
+      this.debug("executed BLUR listener for hash " + e.getTarget().$$hash);
+      if (this._cellEditor === e.getTarget()) {
+        this.debug('hash: ' + this._cellEditor.$$hash);
+        switch (this.getTable().getCellEditorBlurAction()) {
+          case "save":
+            this.stopEditing();
+            break;
+          case "cancel":
+            this.cancelEditing();
+            break;
+          case "nothing":
+          default:
+            // do nothing
+        }
+      }
+    },
+
     /**
      * Returns the model index of the column the pointer is over or null if the pointer
      * is not over a column.