@qooxdoo/framework 7.7.2 → 7.9.0

package/source/class/qx/test/lang/Type.js

@@ -42,6 +42,156 @@ qx.Class.define("qx.test.lang.Type", {
       this.assertFalse(Type.isString(document.getElementById("ReturenedNull")));
     },
 
+    testIsPojo() {
+      var isPojo = qx.lang.Type.isPojo;
+
+      //Class Person extends Object
+      function Person() {
+        this.name = "Mary";
+        this.surname = "Berry";
+      }
+
+      Person.prototype.getFullName = function () {
+        return this.name + " " + this.surname;
+      };
+
+      Person.prototype.properties = function () {
+        return "Properties";
+      };
+
+      //Class Child extends Person
+      function Child() {
+        Person.call(this);
+      }
+
+      Child.prototype = Object.create(Person.prototype);
+      Child.prototype.constructor = Child;
+
+      Child.prototype.childMethod = function () {
+        return "Child method";
+      };
+
+      // Simple POJO, should return true
+      this.assertTrue(isPojo({ foo: 1 }));
+
+      //Arrays, strings, numbers, and booleans are not POJOs
+      this.assertFalse(isPojo([]));
+      this.assertFalse(isPojo(null));
+      this.assertFalse(isPojo(new qx.data.Array()));
+      this.assertFalse(isPojo("hello"));
+      this.assertFalse(isPojo(12));
+      this.assertFalse(isPojo(true));
+
+      //Class instance which does not inherit
+      var nonInheritance = new Person();
+      this.assertFalse(isPojo(nonInheritance));
+
+      //Class instance with class that inherits
+      var withInheritance = new Child();
+      this.assertFalse(isPojo(withInheritance));
+
+      //POJO with class prototype
+      var pojoWithClassPrototype = { age: 22 };
+      Object.setPrototypeOf(pojoWithClassPrototype, Person.prototype);
+      this.assertFalse(isPojo(pojoWithClassPrototype));
+
+      //POJO with an object prototype
+      //Should return true
+      var pojoWithObjectPrototype = { extraproperty: "Nuts" };
+      var proto = {
+        protoMethod() {
+          return "protomethod";
+        }
+      };
+      Object.setPrototypeOf(pojoWithObjectPrototype, proto);
+      this.assertTrue(isPojo(pojoWithObjectPrototype));
+
+      //Object which has a POJO prototype, which in turn has a class prototype
+      //Should return false
+      var prototypeIsObjectThenConstructor = { extraproperty: "Nuts" };
+      var proto = {
+        protoMethod() {
+          return "protomethod";
+        }
+      };
+
+      Object.setPrototypeOf(prototypeIsObjectThenConstructor, proto);
+      Object.setPrototypeOf(proto, Person.prototype);
+      this.assertFalse(isPojo(prototypeIsObjectThenConstructor));
+
+      //Object which has a POJO prototype, which in turn has a POJO prototype
+      //Should return true
+      var obj = {
+        nuts: 345
+      };
+
+      var proto1 = {
+        myMethod() {
+          return "proto1.myMethod";
+        }
+      };
+
+      Object.setPrototypeOf(obj, proto1);
+      var proto2 = {
+        myMethod() {
+          return "proto2.myMethod";
+        },
+
+        method2() {
+          return "proto2.method2";
+        }
+      };
+
+      Object.setPrototypeOf(proto1, proto2);
+
+      this.assertEquals("proto1.myMethod", obj.myMethod());
+      this.assertEquals("proto2.method2", obj.method2());
+      this.assertTrue(isPojo(obj));
+
+      //Object which is instance of a class, where the class has a prototype which is not Object.prototype
+      //Must return false
+      function NonObjectPrototype() {
+        this.foo = "foo";
+      }
+
+      var proto = {
+        myMethod() {
+          return "proto.myMethod";
+        }
+      };
+
+      NonObjectPrototype.prototype = proto;
+      NonObjectPrototype.prototype.constructor = NonObjectPrototype;
+      NonObjectPrototype.prototype.extraMethod = function () {
+        return "extraMethod";
+      };
+
+      var obj = new NonObjectPrototype();
+
+      this.assertEquals("proto.myMethod", obj.myMethod());
+      this.assertEquals("extraMethod", obj.extraMethod());
+      this.assertEquals("foo", obj.foo);
+      this.assertFalse(isPojo(obj));
+
+      //Qooxdoo objects must not be POJOs
+      var obj = new qx.core.Object();
+      this.assertFalse(isPojo(obj));
+
+      //ES6 class must not be a POJO
+      class ES6Class {
+        constructor() {
+          this.foo = "bar";
+        }
+
+        method() {
+          return "method: " + this.foo;
+        }
+      }
+
+      var obj = new ES6Class();
+      this.assertFalse(isPojo(obj));
+    },
+
     testIsArray() {
       var Type = qx.lang.Type;
 
@@ -64,6 +214,7 @@ qx.Class.define("qx.test.lang.Type", {
     },
 
     testIsObject() {
+      //note: old testIsObject
       var Type = qx.lang.Type;
 
       this.assertTrue(Type.isObject({}));

package/source/class/qx/test/ui/embed/Iframe.js

@@ -145,7 +145,7 @@ qx.Class.define("qx.test.ui.embed.Iframe", {
             this.assertEquals("Hello World!", innerText);
           });
         }.bind(this),
-        4000
+        5000
       );
 
       this.wait(10000);

package/source/class/qx/test/ui/form/TextArea.js

@@ -294,6 +294,10 @@ qx.Class.define("qx.test.ui.form.TextArea", {
         this.skip();
       }
 
+      if ((qx.core.Environment.get("engine.name") === "gecko") && (navigator.plugins.length == 0)) {
+        this.skip("test disabled on headless firefox browser");
+      }
+
       var textArea = this.__textArea;
       textArea.set({
         autoSize: true,

package/source/class/qx/test/util/DeferredCall.js

@@ -24,6 +24,12 @@ qx.Class.define("qx.test.util.DeferredCall", {
       if (navigator.plugins.length == 0) {
         this.skip("test disabled on headless browsers");
       }
+      
+      if (qx.core.Environment.get("browser.name") == "safari") {
+        this.skip(
+          "we can not detect headless mode in safari"
+        );
+      }
 
       var fail = function () {
         throw new Error("fail");

package/source/class/qx/test/util/Function.js

@@ -30,7 +30,7 @@ qx.Class.define("qx.test.util.Function", {
       this.assertNotCalled(test);
       debouncedTest(false);
       this.wait(
-        100,
+        250,
         function () {
           this.assertCalledOnce(test);
           this.assertCalledWith(test, false);
@@ -52,7 +52,7 @@ qx.Class.define("qx.test.util.Function", {
       debouncedTest(true);
       debouncedTest(false);
       this.wait(
-        100,
+        250,
         function () {
           this.assertCalledTwice(test);
           this.assertCalledWith(test, false);

package/source/class/qx/theme/indigo/ColorDark.js

@@ -95,7 +95,7 @@ qx.Theme.define("qx.theme.indigo.ColorDark", {
     // used in table code
     "table-header-cell": "#ebeadb",
     "table-row-background-focused-selected": "#666666",
-    "table-row-background-focused": "#666666",
+    "table-row-background-focused": "#444444",
     "table-row-background-selected": "#666666",
     "table-row-background-even": "#333333",
     "table-row-background-odd": "#333333",

package/source/class/qx/tool/cli/api/Test.js

@@ -1,3 +1,16 @@
+/* ************************************************************************
+
+   qooxdoo - the new era of web development
+
+   http://qooxdoo.org
+
+   Copyright:
+     2020 Henner Kollmann
+
+   License:
+     MIT: https://opensource.org/licenses/MIT
+     See the LICENSE file in the project"s top-level directory for details.
+************************************************************************ */
 /**
  * This is used to add an test case for qx test
  */
@@ -47,6 +60,15 @@ qx.Class.define("qx.tool.cli.api.Test", {
       init: true
     },
 
+    /**
+     * If this special test fails exit process
+     */
+    failFast: {
+      check: "Boolean",
+      nullable: false,
+      init: false
+    },
+
     /**
      * The test function called by qx test
      *

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

@@ -1345,6 +1345,15 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         if (data.environment) {
           maker.setEnvironment(data.environment);
         }
+
+        /*
+        Libraries have to be added first because there is qx library
+        which includes a framework version
+        */
+        for (let library of librariesArray) {
+          maker.getAnalyser().addLibrary(library);
+        }
+
         let targetEnvironment = {
           "qx.version": maker.getAnalyser().getQooxdooVersion(),
           "qx.compiler.targetType": target.getType(),
@@ -1395,6 +1404,14 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
 
         maker.getAnalyser().setBabelConfig(babelConfig);
 
+        let browserifyConfig = qx.lang.Object.clone(data.browserify || {}, true);
+        browserifyConfig.options = browserifyConfig.options || {};
+        qx.lang.Object.mergeWith(
+          browserifyConfig.options,
+          targetConfig.browserifyOptions || {}
+        );
+        maker.getAnalyser().setBrowserifyConfig(browserifyConfig);
+
         var addCreatedAt =
           targetConfig["addCreatedAt"] || t.argv["addCreatedAt"];
         if (addCreatedAt) {
@@ -1406,10 +1423,6 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           maker.getAnalyser().setVerboseCreatedAt(true);
         }
 
-        for (let library of librariesArray) {
-          maker.getAnalyser().addLibrary(library);
-        }
-
         let allApplicationTypes = {};
         appConfigs.forEach(appConfig => {
           var app = (appConfig.app = new qx.tool.compiler.app.Application(

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

@@ -99,7 +99,7 @@ qx.Class.define("qx.tool.cli.commands.Test", {
       let exitCode = evt.getData();
       // overwrite error code only in case of errors
       if (exitCode !== 0 && argv.failFast) {
-        process.exit(exitCode);
+        process.exit(Math.min(255, exitCode));
       }
     });
   },
@@ -152,6 +152,9 @@ qx.Class.define("qx.tool.cli.commands.Test", {
         }
         // overwrite error code only in case of errors
         if (exitCode !== 0) {
+          if (test.getFailFast()) {
+            this.argv.failFast = true;
+          }  
           this.setExitCode(exitCode);
         }
       });
@@ -194,6 +197,9 @@ qx.Class.define("qx.tool.cli.commands.Test", {
 
       this.addListener("afterStart", async () => {
         qx.tool.compiler.Console.info(`Running unit tests`);
+        if (this.argv.verbose) {
+          console.log(this.argv);
+        }
         await this.fireDataEventAsync("runTests", this);
         if (
           this.getCompilerApi() &&

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

@@ -126,6 +126,13 @@ qx.Class.define("qx.tool.compiler.Analyser", {
       check: "Object"
     },
 
+    /** configuration of browserify */
+    browserifyConfig: {
+      init: null,
+      nullable: true,
+      check: "Object"
+    },
+
     /** list of global ignores */
     ignores: {
       init: [],

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

@@ -962,14 +962,15 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
 
         CallExpression(path) {
           const name = collapseMemberExpression(path.node.callee);
+          const env = t.__analyser.getEnvironment();
 
           if (
+            env["qx.environment.allowRuntimeMutations"] !== true &&
             (name === "qx.core.Environment.select" ||
               name === "qx.core.Environment.get") &&
-            types.isLiteral(path.node.arguments[0])
+            types.isLiteral(path.node.arguments[0]) 
           ) {
             const arg = path.node.arguments[0];
-            const env = t.__analyser.getEnvironment();
             const envValue = env[arg.value];
 
             if (envValue !== undefined) {

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

@@ -109,11 +109,6 @@ qx.Class.define("qx.tool.compiler.MetaExtraction", {
 
       const babelCore = require("@babel/core");
       let src = await fs.promises.readFile(classFilename, "utf8");
-      let babelConfig = {
-        options: {
-          modules: false
-        }
-      };
 
       let plugins = [require("@babel/plugin-syntax-jsx"), this.__plugin()];
 

package/source/class/qx/tool/compiler/targets/meta/Browserify.js

@@ -158,12 +158,18 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
       builtins.process = builtins._process;
 
       return new Promise((resolve, reject) => {
-        let b = browserify([], {
+        const options = {
           builtins: builtins,
           ignoreMissing: true,
           insertGlobals: true,
           detectGlobals: true
-        });
+        };
+        qx.lang.Object.mergeWith(
+          options,
+          this.getAppMeta().getAnalyser().getBrowserifyConfig()?.options || {},
+          false
+        );
+        let b = browserify([], options);
 
         b._mdeps.on("missing", (id, parent) => {
           let message = [];

package/source/class/qx/ui/basic/Image.js

@@ -144,6 +144,16 @@ qx.Class.define("qx.ui.basic.Image", {
     allowGrowY: {
       refine: true,
       init: false
+    },
+
+    /**
+     * Source of image to display if the image in the `source` property fails to load.
+     */
+    fallbackSource: {
+      check: "String",
+      init: null,
+      nullable: true,
+      event: "changeFallbackSource"
     }
   },
 
@@ -189,6 +199,19 @@ qx.Class.define("qx.ui.basic.Image", {
     __currentContentElement: null,
     __wrapper: null,
     __requestId: 0,
+    /**
+     * If the image in the `source` property failed to load.
+     */
+    __failedToLoad: false,
+
+    /**
+     * @type {string} The actual source of the image that we display.
+     * While the `source` property is what we want to display,
+     * this property is what we are actually showing.
+     * This can be the `source` property but it can also be the `fallbackSource` property
+     * if the image in the `source` property failed to load.
+     */
+    __sourceToDisplay: null,
 
     // overridden
     _onChangeTheme() {
@@ -225,7 +248,7 @@ qx.Class.define("qx.ui.basic.Image", {
     _applyDecorator(value, old) {
       super._applyDecorator(value, old);
 
-      var source = this.getSource();
+      var source = this.__sourceToDisplay;
       source = qx.util.AliasManager.getInstance().resolve(source);
       var el = this.getContentElement();
       if (this.__wrapper) {
@@ -307,7 +330,7 @@ qx.Class.define("qx.ui.basic.Image", {
     _applyEnabled(value, old) {
       super._applyEnabled(value, old);
 
-      if (this.getSource()) {
+      if (this.__sourceToDisplay) {
         this._styleSource();
       }
     },
@@ -321,6 +344,8 @@ qx.Class.define("qx.ui.basic.Image", {
         }
       }
 
+      this.__failedToLoad = false;
+      this.__sourceToDisplay = value;
       this._styleSource();
     },
 
@@ -345,7 +370,7 @@ qx.Class.define("qx.ui.basic.Image", {
      */
     __getMode() {
       if (this.__mode == null) {
-        var source = this.getSource();
+        var source = this.__sourceToDisplay;
 
         if (source && qx.lang.String.startsWith(source, "@")) {
           this.__mode = "font";
@@ -458,13 +483,12 @@ qx.Class.define("qx.ui.basic.Image", {
     /**
      * Applies the source to the clipped image instance or preload
      * an image to detect sizes and apply it afterwards.
-     *
      */
     _styleSource() {
       var AliasManager = qx.util.AliasManager.getInstance();
       var ResourceManager = qx.util.ResourceManager.getInstance();
 
-      var source = AliasManager.resolve(this.getSource());
+      var source = AliasManager.resolve(this.__sourceToDisplay);
 
       var element = this.getContentElement();
       if (this.__wrapper) {
@@ -791,7 +815,7 @@ qx.Class.define("qx.ui.basic.Image", {
         el.setStyle("fontSize", (width > height ? height : width) + "px");
       } else {
         var source = qx.util.AliasManager.getInstance().resolve(
-          this.getSource()
+          this.__sourceToDisplay
         );
 
         var sparts = source.split("/");
@@ -805,7 +829,8 @@ qx.Class.define("qx.ui.basic.Image", {
       super._applyDimension();
 
       var isFont =
-        this.getSource() && qx.lang.String.startsWith(this.getSource(), "@");
+        this.__sourceToDisplay &&
+        qx.lang.String.startsWith(this.__sourceToDisplay, "@");
       if (isFont) {
         var el = this.getContentElement();
         if (el) {
@@ -872,6 +897,11 @@ qx.Class.define("qx.ui.basic.Image", {
         ImageLoader.load(source, this.__loaderCallback, this);
       } else {
         this.__resetSource(el);
+        if (!this.__failedToLoad && this.getFallbackSource()) {
+          this.__failedToLoad = true;
+          this.__sourceToDisplay = this.getFallbackSource();
+          this._styleSource();
+        }
       }
     },
 
@@ -904,6 +934,7 @@ qx.Class.define("qx.ui.basic.Image", {
     },
 
     /**
+     * Sets image source on the DOM element
      * Combines the decorator's image styles with our own image to make sure
      * gradient and backgroundImage decorators work on Images.
      *
@@ -991,6 +1022,32 @@ qx.Class.define("qx.ui.basic.Image", {
       }
     },
 
+    /**
+     * Tries to display the image in the `source` property again if it has failed to load.
+     */
+    tryReload() {
+      if (!this.__failedToLoad) {
+        return;
+      }
+      this.__failedToLoad = false;
+      this.__sourceToDisplay = this.getSource();
+      qx.io.ImageLoader.load(
+        this.getSource(),
+        () => this._styleSource(),
+        undefined,
+        {
+          retryFailed: true
+        }
+      );
+    },
+
+    /**
+     * @returns {boolean} If the image in the `source` property failed to load.
+     */
+    hasFailedToLoad() {
+      return this.__failedToLoad;
+    },
+
     /**
      * Event handler fired after the preloader has finished loading the icon
      *
@@ -1005,7 +1062,8 @@ qx.Class.define("qx.ui.basic.Image", {
 
       // Ignore when the source has already been modified
       if (
-        source !== qx.util.AliasManager.getInstance().resolve(this.getSource())
+        source !==
+        qx.util.AliasManager.getInstance().resolve(this.__sourceToDisplay)
       ) {
         this.fireEvent("aborted");
         return;
@@ -1015,6 +1073,12 @@ qx.Class.define("qx.ui.basic.Image", {
       if (imageInfo.failed) {
         this.warn("Image could not be loaded: " + source);
         this.fireEvent("loadingFailed");
+        if (!this.__failedToLoad && this.getFallbackSource()) {
+          this.__failedToLoad = true;
+          this.__sourceToDisplay = this.getFallbackSource();
+          this._styleSource();
+          return;
+        }
       } else if (imageInfo.aborted) {
         this.fireEvent("aborted");
         return;

package/source/class/qx/ui/basic/Label.js

@@ -79,7 +79,7 @@ qx.Class.define("qx.ui.basic.Label", {
     }
 
     if (qx.core.Environment.get("qx.dynlocale")) {
-      qx.locale.Manager.getInstance().addListener(
+      this.__changeLocaleLabelListenerId = qx.locale.Manager.getInstance().addListener(
         "changeLocale",
         this._onChangeLocale,
         this
@@ -529,11 +529,9 @@ qx.Class.define("qx.ui.basic.Label", {
   */
 
   destruct() {
-    if (qx.core.Environment.get("qx.dynlocale")) {
-      qx.locale.Manager.getInstance().removeListener(
-        "changeLocale",
-        this._onChangeLocale,
-        this
+    if (qx.core.Environment.get("qx.dynlocale") && this.__changeLocaleLabelListenerId) {
+      qx.locale.Manager.getInstance().removeListenerById(
+        this.__changeLocaleLabelListenerId
       );
     }
 

package/source/class/qx/ui/control/DateChooser.js

@@ -102,7 +102,7 @@ qx.Class.define("qx.ui.control.DateChooser", {
 
     // listen for locale changes
     if (qx.core.Environment.get("qx.dynlocale")) {
-      qx.locale.Manager.getInstance().addListener(
+      this.__changeLocaleDatePaneListenerId = qx.locale.Manager.getInstance().addListener(
         "changeLocale",
         this._updateDatePane,
         this
@@ -782,11 +782,9 @@ qx.Class.define("qx.ui.control.DateChooser", {
   */
 
   destruct() {
-    if (qx.core.Environment.get("qx.dynlocale")) {
-      qx.locale.Manager.getInstance().removeListener(
-        "changeLocale",
-        this._updateDatePane,
-        this
+    if (qx.core.Environment.get("qx.dynlocale") && this.__changeLocaleDatePaneListenerId) {
+      qx.locale.Manager.getInstance().removeListenerById(
+        this.__changeLocaleDatePaneListenerId
       );
     }
 

package/source/class/qx/ui/core/Blocker.js

@@ -63,7 +63,7 @@ qx.Class.define("qx.ui.core.Blocker", {
 
     // dynamic theme switch
     if (qx.core.Environment.get("qx.dyntheme")) {
-      qx.theme.manager.Meta.getInstance().addListener(
+      this.__changeThemeBlockerListenerId = qx.theme.manager.Meta.getInstance().addListener(
         "changeTheme",
         this._onChangeTheme,
         this
@@ -499,11 +499,9 @@ qx.Class.define("qx.ui.core.Blocker", {
 
   destruct() {
     // remove dynamic theme listener
-    if (qx.core.Environment.get("qx.dyntheme")) {
-      qx.theme.manager.Meta.getInstance().removeListener(
-        "changeTheme",
-        this._onChangeTheme,
-        this
+    if (qx.core.Environment.get("qx.dyntheme") && this.__changeThemeBlockerListenerId) {
+      qx.theme.manager.Meta.getInstance().removeListenerById(
+        this.__changeThemeBlockerListenerId
       );
     }
 

package/source/class/qx/ui/core/LayoutItem.js

@@ -30,7 +30,7 @@ qx.Class.define("qx.ui.core.LayoutItem", {
 
     // dynamic theme switch
     if (qx.core.Environment.get("qx.dyntheme")) {
-      qx.theme.manager.Meta.getInstance().addListener(
+      this.__changeThemeLayoutItemListenerId = qx.theme.manager.Meta.getInstance().addListener(
         "changeTheme",
         this._onChangeTheme,
         this
@@ -933,11 +933,9 @@ qx.Class.define("qx.ui.core.LayoutItem", {
 
   destruct() {
     // remove dynamic theme listener
-    if (qx.core.Environment.get("qx.dyntheme")) {
-      qx.theme.manager.Meta.getInstance().removeListener(
-        "changeTheme",
-        this._onChangeTheme,
-        this
+    if (qx.core.Environment.get("qx.dyntheme") && this.__changeThemeLayoutItemListenerId) {
+      qx.theme.manager.Meta.getInstance().removeListenerById(
+        this.__changeThemeLayoutItemListenerId
       );
     }
     this.$$parent =