@qooxdoo/framework 7.5.0 → 7.6.0

package/source/class/qx/event/handler/GestureCore.js

@@ -472,7 +472,7 @@ qx.Bootstrap.define("qx.event.handler.GestureCore", {
       if (
         (Math.abs(deltaY) < 1 && Math.abs(deltaX) < 1) ||
         this.__stopMomentum[oldTimeoutId] ||
-        !this.getWindow()
+        (this.getWindow && !this.getWindow())
       ) {
         delete this.__stopMomentum[oldTimeoutId];
         delete this.__momentum[domEvent.pointerId];

package/source/class/qx/test/bom/webfonts/Validator.js

@@ -20,7 +20,6 @@ qx.Class.define("qx.test.bom.webfonts.Validator", {
 
   members: {
     setUp() {
-      this.__nodesBefore = document.body.childNodes.length;
       this.require(["webFontSupport"]);
       this.__val = new qx.bom.webfonts.Validator();
     },
@@ -31,11 +30,6 @@ qx.Class.define("qx.test.bom.webfonts.Validator", {
         delete this.__val;
       }
       qx.bom.webfonts.Validator.removeDefaultHelperElements();
-      this.assertEquals(
-        this.__nodesBefore,
-        document.body.childNodes.length,
-        "Validator did not clean up correctly!"
-      );
     },
 
     testValidFont() {

package/source/class/qx/test/core/Environment.js

@@ -156,25 +156,25 @@ qx.Class.define("qx.test.core.Environment", {
     },
 
     testAddFunction() {
-      qx.core.Environment.add("affe", function () {
+      qx.core.Environment.add("qx.test.core.Environment.affe", function () {
         return "AFFE";
       });
 
-      this.assertEquals("AFFE", qx.core.Environment.get("affe"));
+      this.assertEquals("AFFE", qx.core.Environment.get("qx.test.core.Environment.affe"));
 
       // clear the check
-      delete qx.core.Environment.getChecks()["affe"];
-      qx.core.Environment.invalidateCacheKey("affe");
+      delete qx.core.Environment.getChecks()["qx.test.core.Environment.affe"];
+      qx.core.Environment.invalidateCacheKey("qx.test.core.Environment.affe");
     },
 
     testAddValue() {
-      qx.core.Environment.add("affe", "AFFE");
+      qx.core.Environment.add("qx.test.core.Environment.affe", "AFFE");
 
-      this.assertEquals("AFFE", qx.core.Environment.get("affe"));
+      this.assertEquals("AFFE", qx.core.Environment.get("qx.test.core.Environment.affe"));
 
       // clear the check
-      delete qx.core.Environment.getChecks()["affe"];
-      qx.core.Environment.invalidateCacheKey("affe");
+      delete qx.core.Environment.getChecks()["qx.test.core.Environment.affe"];
+      qx.core.Environment.invalidateCacheKey("qx.test.core.Environment.affe");
     },
 
     testAddAsyncFunction() {

package/source/class/qx/test/core/Validation.js

@@ -33,7 +33,7 @@ qx.Class.define("qx.test.core.Validation", {
         custom: {
           init: "Some String",
           check: "String",
-          validate: "__validateCustom"
+          validate: "_validateCustom"
         },
 
         number: {
@@ -78,7 +78,7 @@ qx.Class.define("qx.test.core.Validation", {
       },
 
       members: {
-        __validateCustom(value) {
+        _validateCustom(value) {
           // if the length is lower than 4
           if (value.length < 4) {
             throw new qx.core.ValidationError(

package/source/class/qx/test/dev/unit/Requirements.js

@@ -57,30 +57,30 @@ qx.Class.define("qx.test.dev.unit.Requirements", {
     },
 
     testEnvironmentPass() {
-      qx.core.Environment.add("qx.test.requirement.syncTrue", function () {
+      qx.core.Environment.add("qx.test.dev.unit.Requirements.syncTrue", function () {
         return true;
       });
 
       try {
-        this.require(["fulfilledReq", "qx.test.requirement.syncTrue"]);
+        this.require(["fulfilledReq", "qx.test.dev.unit.Requirements.syncTrue"]);
       } catch (ex) {
         this.fail("Check for environment key failed!");
       }
 
-      delete qx.core.Environment.getChecks()["qx.test.requirement.syncTrue"];
+      delete qx.core.Environment.getChecks()["qx.test.dev.unit.Requirements.syncTrue"];
     },
 
     testEnvironmentFail() {
-      qx.core.Environment.add("qx.test.requirement.syncFalse", function () {
+      qx.core.Environment.add("qx.test.dev.unit.Requirements.syncFalse", function () {
         return false;
       });
 
       var self = this;
       this.assertException(function () {
-        self.require(["fulfilledReq", "qx.test.requirement.syncFalse"]);
+        self.require(["fulfilledReq", "qx.test.dev.unit.Requirements.syncFalse"]);
       }, qx.dev.unit.RequirementError);
 
-      delete qx.core.Environment.getChecks()["qx.test.requirement.syncFalse"];
+      delete qx.core.Environment.getChecks()["qx.test.dev.unit.Requirements.syncFalse"];
     },
 
     testEnvironmentAsync() {

package/source/class/qx/test/io/transport/Websocket.js

@@ -24,7 +24,7 @@ qx.Class.define("qx.test.io.transport.Websocket", {
   extend: qx.dev.unit.TestCase,
 
   statics: {
-    TEST_ENDPOINT: "socketsbay.com/wss/v2/2/demo/"
+    TEST_ENDPOINT: "ws.postman-echo.com/raw/"
   },
 
   members: {

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

@@ -556,10 +556,10 @@ qx.Class.define("qx.test.ui.basic.Image", {
             lineHeight: 1,
             comparisonString: "\uf1e3\uf1f7\uf11b\uf19d",
             family: ["FontAwesome"],
-            sources: [
+            fontFaces: [
               {
-                family: "FontAwesome",
-                source: [
+                fontFamily: "FontAwesome",
+                paths: [
                   "qx/test/webfonts/fontawesome-webfont.ttf",
                   "qx/test/webfonts/fontawesome-webfont.woff"
                 ]

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

@@ -41,8 +41,6 @@ qx.Class.define("qx.test.ui.basic.Label", {
     tearDown() {
       super.tearDown();
       this.getSandbox().restore();
-      qx.bom.webfonts.Manager.getInstance().dispose();
-      delete qx.bom.webfonts.Manager.$$instance;
     },
 
     testHeightForWidth() {
@@ -164,69 +162,6 @@ qx.Class.define("qx.test.ui.basic.Label", {
       l.dispose();
     },
 
-    testApplyWebFont() {
-      this.require(["webFontSupport"]);
-      var l = new qx.ui.basic.Label("Laugh while you can, monkey boy!");
-
-      var f = new qx.bom.webfonts.WebFont();
-      f.set({
-        size: 18,
-        family: ["monospace"],
-        sources: [
-          {
-            family: "FinelinerScriptRegular",
-            source: [
-              qx.util.ResourceManager.getInstance().toUri(
-                "qx/test/webfonts/fineliner_script-webfont.woff"
-              ),
-
-              qx.util.ResourceManager.getInstance().toUri(
-                "qx/test/webfonts/fineliner_script-webfont.ttf"
-              ),
-
-              qx.util.ResourceManager.getInstance().toUri(
-                "qx/test/webfonts/fineliner_script-webfont.eot"
-              )
-            ]
-          },
-
-          {
-            family: "YanoneKaffeesatzRegular",
-            source: [
-              qx.util.ResourceManager.getInstance().toUri(
-                "qx/test/webfonts/yanonekaffeesatz-regular-webfont.woff"
-              ),
-
-              qx.util.ResourceManager.getInstance().toUri(
-                "qx/test/webfonts/yanonekaffeesatz-regular-webfont.ttf"
-              ),
-
-              qx.util.ResourceManager.getInstance().toUri(
-                "qx/test/webfonts/yanonekaffeesatz-regular-webfont.eot"
-              )
-            ]
-          }
-        ]
-      });
-
-      var statusChangeSpy = this.spy(l, "_onWebFontStatusChange");
-      l.setFont(f);
-
-      qx.event.Timer.once(
-        function () {
-          this.resume(function () {
-            l.dispose();
-            f.dispose();
-            this.assertCalledTwice(statusChangeSpy);
-          }, this);
-        },
-        this,
-        4000
-      );
-
-      this.wait(8000);
-    },
-
     testApplyFontColorAndTextColor() {
       var font1 = new qx.bom.Font();
       font1.setColor("#FF0000");

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

@@ -43,8 +43,6 @@ qx.Class.define("qx.test.ui.form.Field", {
 
     tearDown() {
       this.getSandbox().restore();
-      qx.bom.webfonts.Manager.getInstance().dispose();
-      delete qx.bom.webfonts.Manager.$$instance;
     },
 
     testSelectTextAllBeforeFlush() {
@@ -155,63 +153,69 @@ qx.Class.define("qx.test.ui.form.Field", {
       this.require(["webFontSupport"]);
       var tf = new qx.ui.form.TextField("Laugh while you can, monkey boy!");
 
-      var f = new qx.bom.webfonts.WebFont();
-      f.set({
-        size: 18,
-        family: ["monospace"],
-        sources: [
-          {
-            family: "FinelinerScriptRegular",
-            source: [
-              qx.util.ResourceManager.getInstance().toUri(
-                "qx/test/webfonts/fineliner_script-webfont.woff"
-              ),
-
-              qx.util.ResourceManager.getInstance().toUri(
-                "qx/test/webfonts/fineliner_script-webfont.ttf"
-              ),
-
-              qx.util.ResourceManager.getInstance().toUri(
-                "qx/test/webfonts/fineliner_script-webfont.eot"
-              )
-            ]
-          },
-
-          {
-            family: "YanoneKaffeesatzRegular",
-            source: [
-              qx.util.ResourceManager.getInstance().toUri(
-                "qx/test/webfonts/yanonekaffeesatz-regular-webfont.woff"
-              ),
-
-              qx.util.ResourceManager.getInstance().toUri(
-                "qx/test/webfonts/yanonekaffeesatz-regular-webfont.ttf"
-              ),
-
-              qx.util.ResourceManager.getInstance().toUri(
-                "qx/test/webfonts/yanonekaffeesatz-regular-webfont.eot"
-              )
-            ]
-          }
-        ]
-      });
+      let loader = qx.bom.webfonts.WebFontLoader.getLoader(
+        "FinelinerScriptRegular",
+        true
+      );
 
-      var statusChangeSpy = this.spy(tf, "_onWebFontStatusChange");
-      tf.setFont(f);
+      loader.setFontFaces([
+        {
+          fontFamily: "FinelinerScriptRegular",
+          paths: [
+            qx.util.ResourceManager.getInstance().toUri(
+              "qx/test/webfonts/fineliner_script-webfont.woff"
+            ),
+
+            qx.util.ResourceManager.getInstance().toUri(
+              "qx/test/webfonts/fineliner_script-webfont.ttf"
+            ),
+
+            qx.util.ResourceManager.getInstance().toUri(
+              "qx/test/webfonts/fineliner_script-webfont.eot"
+            )
+          ]
+        },
 
-      qx.event.Timer.once(
-        function () {
+        {
+          fontFamily: "YanoneKaffeesatzRegular",
+          paths: [
+            qx.util.ResourceManager.getInstance().toUri(
+              "qx/test/webfonts/yanonekaffeesatz-regular-webfont.woff"
+            ),
+
+            qx.util.ResourceManager.getInstance().toUri(
+              "qx/test/webfonts/yanonekaffeesatz-regular-webfont.ttf"
+            ),
+
+            qx.util.ResourceManager.getInstance().toUri(
+              "qx/test/webfonts/yanonekaffeesatz-regular-webfont.eot"
+            )
+          ]
+        }
+      ]);
+
+      loader.load().then(() => {
+        var f = new qx.bom.webfonts.WebFont();
+        f.set({
+          size: 18,
+          family: ["FinelinerScriptRegular", "monospace"]
+        });
+
+        f.addListener("changeValid", () => {
           this.resume(function () {
             tf.dispose();
             f.dispose();
-            this.assertCalledTwice(statusChangeSpy);
+            this.assertCalledOnce(statusChangeSpy);
           }, this);
-        },
-        this,
-        4000
-      );
+        });
+
+        f.loadComplete();
+
+        var statusChangeSpy = this.spy(tf, "_onWebFontStatusChange");
+        tf.setFont(f);
+      });
 
-      this.wait(8000);
+      this.wait(30000);
     }
   }
 });

package/source/class/qx/theme/IndigoDark.js

@@ -20,7 +20,7 @@ qx.Theme.define("qx.theme.IndigoDark", {
 
   meta: {
     color: qx.theme.indigo.ColorDark,
-    decoration: qx.theme.indigo.Decoration,
+    decoration: qx.theme.indigo.DecorationDark,
     font: qx.theme.indigo.Font,
     appearance: qx.theme.indigo.AppearanceDark,
     icon: qx.theme.icon.Tango

package/source/class/qx/theme/classic/Font.js

@@ -19,51 +19,35 @@
 
 /**
  * The classic qooxdoo font theme.
+ *
+ * @usefont(qx.theme.classic.defaultFont)
+ * @usefont(qx.theme.monospace)
  */
 qx.Theme.define("qx.theme.classic.Font", {
   fonts: {
     default: {
       size: 11,
       lineHeight: 1.4,
-      family: [
-        "Lucida Grande",
-        "Tahoma",
-        "Verdana",
-        "Bitstream Vera Sans",
-        "Liberation Sans"
-      ]
+      fontName: "qx.theme.classic.defaultFont"
     },
 
     bold: {
       size: 11,
       lineHeight: 1.4,
-      family: [
-        "Lucida Grande",
-        "Tahoma",
-        "Verdana",
-        "Bitstream Vera Sans",
-        "Liberation Sans"
-      ],
-
+      fontName: "qx.theme.classic.defaultFont",
       bold: true
     },
 
     small: {
       size: 10,
       lineHeight: 1.4,
-      family: [
-        "Lucida Grande",
-        "Tahoma",
-        "Verdana",
-        "Bitstream Vera Sans",
-        "Liberation Sans"
-      ]
+      fontName: "qx.theme.classic.defaultFont"
     },
 
     monospace: {
       size: 11,
       lineHeight: 1.4,
-      family: ["DejaVu Sans Mono", "Courier New", "monospace"]
+      fontName: "qx.theme.monospace"
     }
   }
 });

package/source/class/qx/theme/iconfont/LoadMaterialIcons.js

@@ -20,9 +20,7 @@
  * A dummy class to trigger the compiler to copy the MaterialIcons font files
  */
 /**
- * @asset(qx/iconfont/MaterialIcons/materialicons-v126.ttf)
- * @asset(qx/iconfont/MaterialIcons/materialicons-v126.woff2)
- * @asset(qx/iconfont/MaterialIcons/materialicons-v126.woff)
- * @asset(qx/iconfont/MaterialIcons/materialicons-v126.eot)
+ * @usefont(MaterialIcons)
+ * @deprecated use the `@usefont` directive directly in your code
  */
 qx.Class.define("qx.theme.iconfont.LoadMaterialIcons", {});

package/source/class/qx/theme/iconfont/LoadMaterialIconsOutlined.js

@@ -20,9 +20,7 @@
  * A dummy class to trigger the compiler to copy the MaterialIconsOutlined font files
  */
 /**
- * @asset(qx/iconfont/MaterialIcons/materialiconsoutlined-v101.otf)
- * @asset(qx/iconfont/MaterialIcons/materialiconsoutlined-v101.woff2)
- * @asset(qx/iconfont/MaterialIcons/materialiconsoutlined-v101.woff)
- * @asset(qx/iconfont/MaterialIcons/materialiconsoutlined-v101.eot)
+ * @usefont(MaterialIconsOutlined)
+ * @deprecated use the `@usefont` directive directly in your code
  */
 qx.Class.define("qx.theme.iconfont.LoadMaterialIconsOutlined", {});

package/source/class/qx/theme/iconfont/LoadMaterialIconsRound.js

@@ -20,9 +20,7 @@
  * A dummy class to trigger the compiler to copy the MaterialIconsRound font files
  */
 /**
- * @asset(qx/iconfont/MaterialIcons/materialiconsround-v100.otf)
- * @asset(qx/iconfont/MaterialIcons/materialiconsround-v100.woff2)
- * @asset(qx/iconfont/MaterialIcons/materialiconsround-v100.woff)
- * @asset(qx/iconfont/MaterialIcons/materialiconsround-v100.eot)
+ * @usefont(MaterialIconsRound)
+ * @deprecated use the `@usefont` directive directly in your code
  */
 qx.Class.define("qx.theme.iconfont.LoadMaterialIconsRound", {});

package/source/class/qx/theme/iconfont/LoadMaterialIconsSharp.js

@@ -20,9 +20,7 @@
  * A dummy class to trigger the compiler to copy the MaterialIconsSharpe font files
  */
 /**
- * @asset(qx/iconfont/MaterialIcons/materialiconssharp-v101.otf)
- * @asset(qx/iconfont/MaterialIcons/materialiconssharp-v101.woff2)
- * @asset(qx/iconfont/MaterialIcons/materialiconssharp-v101.woff)
- * @asset(qx/iconfont/MaterialIcons/materialiconssharp-v101.eot)
+ * @usefont(MaterialIconsSharp)
+ * @deprecated use the `@usefont` directive directly in your code
  */
 qx.Class.define("qx.theme.iconfont.LoadMaterialIconsSharp", {});

package/source/class/qx/theme/iconfont/LoadMaterialIconsTwoTone.js

@@ -20,9 +20,7 @@
  * A dummy class to trigger the compiler to copy the MaterialIconsTwoTone font files
  */
 /**
- * @asset(qx/iconfont/MaterialIcons/materialiconstwotone-v104.otf)
- * @asset(qx/iconfont/MaterialIcons/materialiconstwotone-v104.woff2)
- * @asset(qx/iconfont/MaterialIcons/materialiconstwotone-v104.woff)
- * @asset(qx/iconfont/MaterialIcons/materialiconstwotone-v104.eot)
+ * @usefont(MaterialIconsTwoTone)
+ * @deprecated use the `@usefont` directive directly in your code
  */
 qx.Class.define("qx.theme.iconfont.LoadMaterialIconsTwoTone", {});

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

@@ -0,0 +1,30 @@
+/* ************************************************************************
+
+   qooxdoo - the new era of web development
+
+   http://qooxdoo.org
+
+   License:
+     MIT: https://opensource.org/licenses/MIT
+     See the LICENSE file in the project's top-level directory for details.
+
+   Authors:
+     * Scott Knick (sknick)
+     * Dmitrii Zolotov (goldim)
+
+************************************************************************ */
+
+/**
+ * The indigo dark qooxdoo decoration theme.
+ */
+qx.Theme.define("qx.theme.indigo.DecorationDark", {
+  extend: qx.theme.indigo.Decoration,
+
+  decorations: {
+    "menubar-button-hovered": {
+      style: {
+        backgroundColor: "background"
+      }
+    }
+  }
+});

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

@@ -24,21 +24,22 @@
 /**
  * The simple qooxdoo font theme.
  *
- * @asset(qx/decoration/Indigo/font/JosefinSlab-SemiBold.woff)
- * @asset(qx/decoration/Indigo/font/JosefinSlab-SemiBold.ttf)
+ * @usefont(JosefinSlab)
+ * @usefont(qx.theme.indigo.defaultFont)
+ * @usefont(qx.theme.monospace)
  */
 qx.Theme.define("qx.theme.indigo.Font", {
   fonts: {
     default: {
       size: 12,
-      family: ["Lucida Grande", "DejaVu Sans", "Verdana", "sans-serif"],
+      fontName: "qx.theme.indigo.defaultFont",
       color: "font",
       lineHeight: 1.8
     },
 
     bold: {
       size: 12,
-      family: ["Lucida Grande", "DejaVu Sans", "Verdana", "sans-serif"],
+      fontName: "qx.theme.indigo.defaultFont",
       bold: true,
       color: "font",
       lineHeight: 1.8
@@ -47,27 +48,19 @@ qx.Theme.define("qx.theme.indigo.Font", {
     headline: {
       size: 22,
       family: ["serif"],
-      sources: [
-        {
-          family: "JosefinSlab",
-          source: [
-            "qx/decoration/Indigo/font/JosefinSlab-SemiBold.woff",
-            "qx/decoration/Indigo/font/JosefinSlab-SemiBold.ttf"
-          ]
-        }
-      ]
+      fontName: "JosefinSlab"
     },
 
     small: {
       size: 11,
-      family: ["Lucida Grande", "DejaVu Sans", "Verdana", "sans-serif"],
+      fontName: "qx.theme.indigo.defaultFont",
       color: "font",
       lineHeight: 1.8
     },
 
     monospace: {
       size: 11,
-      family: ["DejaVu Sans Mono", "Courier New", "monospace"],
+      fontName: "qx.theme.monospace",
       color: "font",
       lineHeight: 1.8
     }