@qooxdoo/framework 7.5.0 → 7.5.1

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

@@ -68,12 +68,12 @@ qx.Class.define("qx.tool.cli.commands.Run", {
       let config = this.getCompilerApi().getConfiguration();
       if (!config.run) {
         qx.tool.compiler.Console.print("qx.tool.cli.run.noRunConfig");
-        process.exit(-1);
+        process.exit(1);
       }
 
       if (!config.run.application) {
         qx.tool.compiler.Console.print("qx.tool.cli.run.noAppName");
-        process.exit(-1);
+        process.exit(1);
       }
 
       let maker = null;
@@ -85,14 +85,14 @@ qx.Class.define("qx.tool.cli.commands.Run", {
         if (apps.length) {
           if (maker) {
             qx.tool.compiler.Console.print("qx.tool.cli.run.tooManyMakers");
-            process.exit(-1);
+            process.exit(1);
           }
           if (apps.length != 1) {
             qx.tool.compiler.Console.print(
               "qx.tool.cli.run.tooManyApplications"
             );
 
-            process.exit(-1);
+            process.exit(1);
           }
           maker = tmp;
           app = apps[0];
@@ -100,11 +100,11 @@ qx.Class.define("qx.tool.cli.commands.Run", {
       });
       if (!app) {
         qx.tool.compiler.Console.print("qx.tool.cli.run.noAppName");
-        process.exit(-1);
+        process.exit(1);
       }
       if (app.getType() != "node") {
         qx.tool.compiler.Console.print("qx.tool.cli.run.mustBeNode");
-        process.exit(-1);
+        process.exit(1);
       }
 
       let target = maker.getTarget();
@@ -150,7 +150,6 @@ qx.Class.define("qx.tool.cli.commands.Run", {
         child.stdout.on("data", function (data) {
           console.log(data);
         });
-
         child.stderr.setEncoding("utf8");
         child.stderr.on("data", function (data) {
           console.error(data);

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

@@ -90,9 +90,6 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
   },
 
   members: {
-    /** @type {qx.tool.utils.Website} the Website instance */
-    _website: null,
-
     /*
      * @Override
      */
@@ -100,18 +97,19 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
       this.argv.watch = true;
       this.argv["machine-readable"] = false;
       this.argv["feedback"] = false;
-      await super.process();
 
       // build website if it hasn't been built yet.
-      const website = (this._website = new qx.tool.utils.Website());
+      const website = new qx.tool.utils.Website();
       if (!(await fs.existsAsync(website.getTargetDir()))) {
         qx.tool.compiler.Console.info(">>> Building startpage...");
-        await this._website.rebuildAll();
+        await website.rebuildAll();
       } else if (this.argv.rebuildStartpage) {
-        this._website.startWatcher();
+        website.startWatcher();
       }
-
-      await this.runWebServer();
+      this.addListenerOnce("made", () => {
+        this.runWebServer();
+      });
+      return super.process();
     },
 
     /**
@@ -210,36 +208,31 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
           res.send(JSON.stringify(appsData, null, 2));
         });
       }
-      this.addListenerOnce("made", e => {
-        let server = http.createServer(app);
-        this.fireDataEvent("beforeStart", {
-          server: server,
-          application: app,
-          outputdir: defaultMaker.getTarget().getOutputDir()
-        });
-
-        server.on("error", e => {
-          if (e.code === "EADDRINUSE") {
-            qx.tool.compiler.Console.print(
-              "qx.tool.cli.serve.webAddrInUse",
-              config.serve.listenPort
-            );
-
-            process.exit(-1);
-          } else {
-            qx.tool.compiler.Console.log(
-              "Error when starting web server: " + e
-            );
-          }
-        });
-        server.listen(config.serve.listenPort, () => {
+      let server = http.createServer(app);
+      this.fireDataEvent("beforeStart", {
+        server: server,
+        application: app,
+        outputdir: defaultMaker.getTarget().getOutputDir()
+      });
+      server.on("error", e => {
+        if (e.code === "EADDRINUSE") {
           qx.tool.compiler.Console.print(
-            "qx.tool.cli.serve.webStarted",
-            "http://localhost:" + config.serve.listenPort
+            "qx.tool.cli.serve.webAddrInUse",
+            config.serve.listenPort
           );
 
-          this.fireEvent("afterStart");
-        });
+          process.exit(1);
+        } else {
+          qx.tool.compiler.Console.log("Error when starting web server: " + e);
+        }
+      });
+      server.listen(config.serve.listenPort, () => {
+        qx.tool.compiler.Console.print(
+          "qx.tool.cli.serve.webStarted",
+          "http://localhost:" + config.serve.listenPort
+        );
+
+        this.fireEvent("afterStart");
       });
     },
 

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

@@ -188,7 +188,7 @@ qx.Class.define("qx.tool.cli.commands.Test", {
              See documentation at https://qooxdoo.org/docs/#/development/testing/`
           );
 
-          process.exit(-1);
+          process.exit(1);
         }
       });
 
@@ -206,6 +206,7 @@ qx.Class.define("qx.tool.cli.commands.Test", {
           await test.execute();
         }
         // for bash exitcode is not allowed to be more then 255!
+        // We must exit the process here because serve runs infinite!
         process.exit(Math.min(255, this.getExitCode()));
       });
 
@@ -216,7 +217,7 @@ qx.Class.define("qx.tool.cli.commands.Test", {
         // compile only
         await qx.tool.cli.commands.Compile.prototype.process.call(this);
         // since the server is not started, manually fire the event necessary for firing the "runTests" event
-        this.fireEvent("afterStart");
+        await this.fireDataEventAsync("afterStart");
       }
     },
 

package/source/class/qx/tool/cli/commands/add/Script.js

@@ -140,7 +140,9 @@ qx.Class.define("qx.tool.cli.commands.add.Script", {
       }
       // save
       this.debug(script_list);
-      manifestModel.setValue("externalResources.script", script_list).save();
+      await manifestModel
+        .setValue("externalResources.script", script_list)
+        .save();
     }
   }
 });

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

@@ -677,6 +677,9 @@ qx.Class.define("qx.tool.cli.commands.package.Install", {
 
         return false;
       }
+      // relaod config. We need a fresh model here because data will be verified.
+      // The original model is enriched during parsing so validate will fail.
+      compileConfigModel.setLoaded(false);
       await compileConfigModel.load();
       let app = compileConfigModel.getValue("applications").find(app => {
         if (manifestApp.name && app.name) {

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

@@ -854,7 +854,8 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
         if (sectionName === "members" || sectionName === "statics") {
           if (
             node.type == "ObjectMethod" ||
-            node.value.type === "FunctionExpression"
+            node.value.type === "FunctionExpression" ||
+            node.value.type === "MemberExpression"
           ) {
             meta.type = "function";
           } else {

package/source/class/qx/tool/compiler/app/Cldr.js

@@ -28,7 +28,9 @@ var path = require("path");
 var xml2js = require("xml2js");
 const CLDR = require("cldr");
 const { promisify } = require("util");
+const process = require("process");
 const readFile = promisify(fs.readFile);
+const readDir = promisify(fs.readdir);
 
 var log = qx.tool.utils.LogManager.createLog("cldr");
 
@@ -59,9 +61,39 @@ qx.Class.define("qx.tool.compiler.app.Cldr", {
       }
       log.debug("Loading CLDR " + cldrPath);
 
-      return readFile(path.join(cldrPath, data_path, locale + ".xml"), {
-        encoding: "utf-8"
-      })
+      const fullDir = path.join(cldrPath, data_path);
+
+      return readDir(fullDir)
+        .then(
+          names =>
+            new Promise((resolve, reject) => {
+              const searchedName = locale.toLowerCase() + ".xml";
+              const realName = names.find(
+                name => name.toLowerCase() === searchedName
+              );
+
+              if (realName) {
+                resolve(realName);
+              } else {
+                reject(
+                  new Error(
+                    'Cannot find XML file for locale "' +
+                      locale +
+                      '" in CLDR folder'
+                  )
+                );
+              }
+            })
+        )
+        .then(fileName =>
+          readFile(path.join(fullDir, fileName), {
+            encoding: "utf-8"
+          })
+        )
+        .catch(err => {
+          qx.tool.compiler.Console.error(err);
+          process.exit(1);
+        })
         .then(data =>
           qx.tool.utils.Utils.promisifyThis(parser.parseString, parser, data)
         )
@@ -564,30 +596,35 @@ qx.Class.define("qx.tool.compiler.app.Cldr", {
             });
 
             var monthContext = get("months[0].monthContext", cal);
-            find(monthContext, "type", "format", function (row) {
-              find(row.monthWidth, "type", "abbreviated", function (row) {
-                for (var i = 0; i < row.month.length; i++) {
-                  var m = row.month[i];
-                  cldr["cldr_month_format_abbreviated_" + m["$"].type] =
-                    getText(m);
-                }
-              });
-            });
-            find(monthContext, "type", "format", function (row) {
-              find(row.monthWidth, "type", "wide", function (row) {
-                for (var i = 0; i < row.month.length; i++) {
-                  var m = row.month[i];
-                  cldr["cldr_month_format_wide_" + m["$"].type] = getText(m);
-                }
-              });
-            });
-            find(monthContext, "type", "stand-alone", function (row) {
-              for (var i = 0; i < row.monthWidth[0].month.length; i++) {
-                var m = row.monthWidth[0].month[i];
-                cldr["cldr_month_stand-alone_narrow_" + m["$"].type] =
-                  getText(m);
+
+            const parseMonth = (months, cldrProperty) => {
+              if (!months) {
+                return;
               }
-            });
+              months.forEach(month => {
+                cldr[cldrProperty + "_" + month["$"].type] = getText(month);
+              });
+            };
+
+            const parseMonthContext = sectionNameInLocaleFile => {
+              find(monthContext, "type", "format", row =>
+                find(row.monthWidth, "type", sectionNameInLocaleFile, row =>
+                  parseMonth(
+                    row.month,
+                    "cldr_month_format_" + sectionNameInLocaleFile
+                  )
+                )
+              );
+            };
+
+            parseMonthContext("abbreviated");
+            parseMonthContext("wide");
+            find(monthContext, "type", "stand-alone", row =>
+              parseMonth(
+                row.monthWidth[0].month,
+                "cldr_month_stand-alone_narrow"
+              )
+            );
 
             function getTimeFormatPattern(row) {
               return row.timeFormat.pattern;

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

@@ -634,7 +634,8 @@ qx.Class.define("qx.ui.basic.Image", {
           }
 
           // Don't transfer background image when switching from image to icon font
-          if (this.__getMode() === "font") {
+          var mode = this.__getMode();
+          if (mode === "font" || mode === "scaled") {
             delete styles.backgroundImage;
           }
 
@@ -785,7 +786,10 @@ qx.Class.define("qx.ui.basic.Image", {
       if (this.getScale()) {
         el.setStyle("fontSize", (width > height ? height : width) + "px");
       } else {
-        var source = qx.util.AliasManager.getInstance().resolve(this.getSource());
+        var source = qx.util.AliasManager.getInstance().resolve(
+          this.getSource()
+        );
+
         var sparts = source.split("/");
         var font = this.__getFont(source);
         var size = parseInt(sparts[2] || font.getSize());

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

@@ -2122,24 +2122,17 @@ qx.Class.define("qx.ui.core.Widget", {
     // property apply
     _applyTextColor(value, old) {
       // empty template
-    },
-
-    // property apply
+    }, // property apply
     _applyZIndex(value, old) {
       this.getContentElement().setStyle("zIndex", value == null ? 0 : value);
-    },
-
-    // property apply
+    }, // property apply
     _applyVisibility(value, old) {
       var content = this.getContentElement();
-
       if (value === "visible") {
         content.show();
       } else {
         content.hide();
-      }
-
-      // only force a layout update if visibility change from/to "exclude"
+      } // only force a layout update if visibility change from/to "exclude"
       var parent = this.$$parent;
       if (
         parent &&
@@ -2187,31 +2180,19 @@ qx.Class.define("qx.ui.core.Widget", {
     // property apply
     _applyFont(value, old) {
       // empty template
-    },
-
-    /*
-    ---------------------------------------------------------------------------
-      DYNAMIC THEME SWITCH SUPPORT
-    ---------------------------------------------------------------------------
-    */
-
+    }, // ---------------------------------------------------------------------------
+    // DYNAMIC THEME SWITCH SUPPORT
+    // ---------------------------------------------------------------------------
     // overridden
     _onChangeTheme() {
       if (this.isDisposed()) {
         return;
       }
-
-      super._onChangeTheme();
-
-      // update the appearance
-      this.updateAppearance();
-
-      // DECORATOR //
+      super._onChangeTheme(); // update the appearance
+      this.updateAppearance(); // DECORATOR //
       var value = this.getDecorator();
       this._applyDecorator(null, value);
-      this._applyDecorator(value);
-
-      // FONT //
+      this._applyDecorator(value); // FONT //
       value = this.getFont();
       if (qx.lang.Type.isString(value)) {
         this._applyFont(value, value);
@@ -2561,30 +2542,24 @@ qx.Class.define("qx.ui.core.Widget", {
     syncWidget(jobs) {
       // empty implementation
     },
-
     /*
     ---------------------------------------------------------------------------
-      EVENT SUPPORT
+    EVENT SUPPORT
     ---------------------------------------------------------------------------
-    */
-
-    /**
+    */ /**
      * Returns the next event target in the parent chain. May
      * also return the widget itself if it is not anonymous.
      *
      * @return {qx.ui.core.Widget} A working event target of this widget.
      *    May be <code>null</code> as well.
-     */
-    getEventTarget() {
+     */ getEventTarget() {
       var target = this;
-
       while (target.getAnonymous()) {
         target = target.getLayoutParent();
         if (!target) {
           return null;
         }
       }
-
       return target;
     },
 
@@ -2751,17 +2726,13 @@ qx.Class.define("qx.ui.core.Widget", {
     // property apply
     _applyNativeContextMenu(value, old, name) {
       // empty body to allow overriding
-    },
-
-    // property apply
+    }, // property apply
     _applyContextMenu(value, old) {
       if (old) {
         old.removeState("contextmenu");
-
         if (old.getOpener() == this) {
           old.resetOpener();
         }
-
         if (!value) {
           this.removeListener("contextmenu", this._onContextMenuOpen);
           this.removeListener("longtap", this._onContextMenuOpen);

package/source/resource/qx/mobile/scss/common/_gradients.scss

@@ -117,7 +117,7 @@
 
       $stops: $stops  + $separator + "color-stop(#{$pos}, #{$color})";
 
-      $i: $i +1;
+      $i: $i + 1;
     }
   }
 

package/source/resource/qx/tool/cli/templates/skeleton/desktop/source/class/custom/Application.tmpl.js

@@ -28,15 +28,15 @@ qx.Class.define("${namespace}.Application",
   members :
   {
     /**
-     * This method contains the initial application code and gets called 
+     * This method contains the initial application code and gets called
      * during startup of the application
-     * 
+     *
      * @lint ignoreDeprecated(alert)
      */
-    main : function()
+    main()
     {
       // Call super class
-      this.base(arguments);
+      super.main();
 
       // Enable logging in debug variant
       if (qx.core.Environment.get("qx.debug"))
@@ -54,10 +54,10 @@ qx.Class.define("${namespace}.Application",
       */
 
       // Create a button
-      var button1 = new qx.ui.form.Button("Click me", "${namespace_as_path}/test.png");
+      const button1 = new qx.ui.form.Button("Click me", "${namespace_as_path}/test.png");
 
       // Document is the application root
-      var doc = this.getRoot();
+      const doc = this.getRoot();
 
       // Add button to document at fixed coordinates
       doc.add(button1, {left: 100, top: 50});
@@ -69,4 +69,4 @@ qx.Class.define("${namespace}.Application",
       });
     }
   }
-});
+});

package/source/resource/qx/tool/cli/templates/skeleton/desktop/source/class/custom/test/DemoTest.tmpl.js

@@ -11,13 +11,13 @@
 /**
  * This class demonstrates how to define unit tests for your application.
  *
- * Execute <code>qx test</code> to generate a testrunner application 
+ * Execute <code>qx test</code> to generate a testrunner application
  * and open it from <tt>test/index.html</tt>
  *
- * The methods that contain the tests are instance methods with a 
- * <code>test</code> prefix. You can create an arbitrary number of test 
- * classes like this one. They can be organized in a regular class hierarchy, 
- * i.e. using deeper namespaces and a corresponding file structure within the 
+ * The methods that contain the tests are instance methods with a
+ * <code>test</code> prefix. You can create an arbitrary number of test
+ * classes like this one. They can be organized in a regular class hierarchy,
+ * i.e. using deeper namespaces and a corresponding file structure within the
  * <tt>test</tt> folder.
  */
 qx.Class.define("${namespace}.test.DemoTest",
@@ -31,11 +31,11 @@ qx.Class.define("${namespace}.test.DemoTest",
       TESTS
     ---------------------------------------------------------------------------
     */
-  
+
     /**
      * Here are some simple tests
      */
-    testSimple : function()
+    testSimple()
     {
       this.assertEquals(4, 3+1, "This should never fail!");
       this.assertFalse(false, "Can false be true?!");
@@ -44,10 +44,10 @@ qx.Class.define("${namespace}.test.DemoTest",
     /**
      * Here are some more advanced tests
      */
-    testAdvanced: function () 
+    testAdvanced()
     {
-      var a = 3;
-      var b = a;
+      let a = 3;
+      let b = a;
       this.assertIdentical(a, b, "A rose by any other name is still a rose");
       this.assertInRange(3, 1, 10, "You must be kidding, 3 can never be outside [1,10]!");
     }

package/source/resource/qx/tool/cli/templates/skeleton/mobile/source/class/custom/Application.tmpl.js

@@ -25,10 +25,10 @@ qx.Class.define("${namespace}.Application",
      * This method contains the initial application code and gets called
      * during startup of the application
      */
-    main : function()
+    main()
     {
       // Call super class
-      this.base(arguments);
+      super.main();
 
       // Enable logging in debug variant
       if (qx.core.Environment.get("qx.debug"))
@@ -47,11 +47,11 @@ qx.Class.define("${namespace}.Application",
       -------------------------------------------------------------------------
       */
 
-      var login = new ${namespace}.page.Login();
-      var overview = new ${namespace}.page.Overview();
+      const login = new ${namespace}.page.Login();
+      const overview = new ${namespace}.page.Overview();
 
       // Add the pages to the page manager.
-      var manager = new qx.ui.mobile.page.Manager(false);
+      const manager = new qx.ui.mobile.page.Manager(false);
       manager.addDetail([
         login,
         overview
@@ -69,7 +69,7 @@ qx.Class.define("${namespace}.Application",
      * Default behaviour when a route matches. Displays the corresponding page on screen.
      * @param data {Map} the animation properties
      */
-    _show : function(data) {
+    _show(data) {
       this.show(data.customData);
     }
   }

package/source/resource/qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/Login.tmpl.js

@@ -15,9 +15,9 @@ qx.Class.define("${namespace}.page.Login",
 {
   extend : qx.ui.mobile.page.NavigationPage,
 
-  construct : function()
+  construct()
   {
-    this.base(arguments);
+    super();
     this.setTitle("Login");
   },
 
@@ -28,22 +28,22 @@ qx.Class.define("${namespace}.page.Login",
 
 
     // overridden
-    _initialize: function() {
-      this.base(arguments);
+    _initialize() {
+      super._initialize();
 
       // Username
-      var user = new qx.ui.mobile.form.TextField();
+      const user = new qx.ui.mobile.form.TextField();
       user.setRequired(true);
 
       // Password
-      var pwd = new qx.ui.mobile.form.PasswordField();
+      const pwd = new qx.ui.mobile.form.PasswordField();
       pwd.setRequired(true);
 
       // Login Button
-      var loginButton = new qx.ui.mobile.form.Button("Login");
+      const loginButton = new qx.ui.mobile.form.Button("Login");
       loginButton.addListener("tap", this._onButtonTap, this);
 
-      var loginForm = this.__form = new qx.ui.mobile.form.Form();
+      const loginForm = this.__form = new qx.ui.mobile.form.Form();
       loginForm.add(user, "Username");
       loginForm.add(pwd, "Password");
 
@@ -56,7 +56,7 @@ qx.Class.define("${namespace}.page.Login",
     /**
      * Event handler for <code>tap</code> on the login button.
      */
-    _onButtonTap: function() {
+    _onButtonTap() {
       // use form validation
       if (this.__form.validate()) {
         qx.core.Init.getApplication().getRouting().executeGet("/overview");

package/source/resource/qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/Overview.tmpl.js

@@ -15,9 +15,9 @@ qx.Class.define("${namespace}.page.Overview",
 {
   extend : qx.ui.mobile.page.NavigationPage,
 
-  construct : function()
+  construct()
   {
-    this.base(arguments);
+    super();
     this.setTitle("Overview");
     this.setShowBackButton(true);
     this.setBackButtonText("Back");
@@ -27,16 +27,16 @@ qx.Class.define("${namespace}.page.Overview",
   members :
   {
     // overridden
-    _initialize : function()
+    _initialize()
     {
-      this.base(arguments);
+      super._initialize(arguments);
 
       this.getContent().add(new qx.ui.mobile.basic.Label("Your first app."));
     },
 
 
     // overridden
-    _back : function(triggeredByKeyEvent)
+    _back(triggeredByKeyEvent)
     {
       qx.core.Init.getApplication().getRouting().back();
     }