@qooxdoo/framework 7.9.1 → 8.0.0-beta.1

package/source/class/qx/locale/LocalizedString.js

@@ -49,6 +49,9 @@ qx.Class.define("qx.locale.LocalizedString", {
      *    locale.
      */
     translate() {
+      if (this.__messageId.includes("cldr_")) {
+        return this;
+      }
       if (this.__localized) {
         return qx.locale.Manager.getInstance().localize(
           this.__messageId,

package/source/class/qx/locale/Manager.js

@@ -25,11 +25,10 @@
  * @require(qx.event.dispatch.Direct)
  * @require(qx.locale.LocalizedString)
  * @require(qx.bom.client.Locale)
+ * @require(qx.bom.Lifecycle)
  *
  * Note: "translating" the empty string, e.g. tr("") will return the header
  * of the respective .po file. See also https://www.gnu.org/software/gettext/manual/html_node/PO-Files.html#PO-Files
- *
- * @cldr()
  */
 
 qx.Class.define("qx.locale.Manager", {
@@ -50,6 +49,18 @@ qx.Class.define("qx.locale.Manager", {
 
     this.initLocale();
     this.__clientLocale = this.getLocale();
+
+    // Fix for issue #9564: Fire changeLocale event after application is ready
+    // to ensure LocalizedStrings created before translations were loaded
+    // (e.g., in property init values) are properly re-translated
+    if (qx.core.Environment.get("qx.dynlocale")) {
+      qx.bom.Lifecycle.onReady(
+        function () {
+          this.fireDataEvent("changeLocale", this.getLocale());
+        },
+        this
+      );
+    }
   },
 
   /*
@@ -343,7 +354,7 @@ qx.Class.define("qx.locale.Manager", {
     },
 
     /**
-     * Provide localization (CLDR) data.
+     * Provide localization data.
      *
      * Implements the lookup chain locale (e.g. en_US) -> language (e.g. en) ->
      * default locale (e.g. C). Localizes the arguments if possible and splices

package/source/class/qx/locale/Number.js

@@ -15,6 +15,7 @@
      * Sebastian Werner (wpbasti)
      * Andreas Ecker (ecker)
      * Fabian Jakobs (fjakobs)
+     * Dmitrii Zolotov (goldim)
 
 ************************************************************************ */
 
@@ -22,7 +23,7 @@
  * Provides information about locale-dependent number formatting (like the decimal
  * separator).
  *
- * @cldr()
+ * @ignore(Intl.NumberFormat)
  */
 
 qx.Class.define("qx.locale.Number", {
@@ -34,10 +35,14 @@ qx.Class.define("qx.locale.Number", {
      * @return {String} decimal separator.
      */
     getDecimalSeparator(locale) {
-      return qx.locale.Manager.getInstance().localize(
+      locale = this.__transformLocale(locale);
+      const f = new Intl.NumberFormat(locale);
+      const value = f.format(1.1).charAt(1);
+      return new qx.locale.LocalizedString(
+        value,
         "cldr_number_decimal_separator",
         [],
-        locale
+        true
       );
     },
 
@@ -48,10 +53,14 @@ qx.Class.define("qx.locale.Number", {
      * @return {String} group separator.
      */
     getGroupSeparator(locale) {
-      return qx.locale.Manager.getInstance().localize(
+      locale = this.__transformLocale(locale);
+      const f = new Intl.NumberFormat(locale);
+      const value = f.format(1000).charAt(1);
+      return new qx.locale.LocalizedString(
+        value,
         "cldr_number_group_separator",
         [],
-        locale
+        true
       );
     },
 
@@ -62,11 +71,55 @@ qx.Class.define("qx.locale.Number", {
      * @return {String} percent format string.
      */
     getPercentFormat(locale) {
-      return qx.locale.Manager.getInstance().localize(
+      locale = this.__transformLocale(locale);
+
+      const option = {
+        style: 'percent',
+        minimumFractionDigits: 3,
+        maximumFractionDigits: 3
+      };
+
+      const formatter = new Intl.NumberFormat(locale, option);
+      const n = 0.00001;
+      const parts = formatter.formatToParts(n);
+
+      const result = [];
+
+      for (let part of parts){
+        const t = part.type;
+        const value = part.value;
+        let lexem;
+        if (t === "decimal" || t === "percentSign" || t === "literal"){
+          lexem = value;
+        } else if (t === "integer"){
+          lexem = "#".repeat(value.length);
+        } else if (t === "fraction"){
+          lexem = "#".repeat(value.length - 1) + "0";
+        }
+        if (lexem !== undefined){
+          result.push(lexem);
+        }
+      }
+
+      return new qx.locale.LocalizedString(
+        result.join(""),
         "cldr_number_percent_format",
         [],
-        locale
+        true
       );
+    },
+
+    /**
+     * Transforms an input locale into locale supported by Intl API
+     * 
+     * @param {String} locale locale to be used
+     * @returns {String} transformed locale
+     */
+    __transformLocale(locale) {
+      if (locale === "C") {
+        return "en";
+      }
+      return locale.replace("_", "-").split('@')[0];
     }
   }
 });

package/source/class/qx/log/Logger.js

@@ -557,7 +557,7 @@ qx.Bootstrap.define("qx.log.Logger", {
 
       // Add relation fields
       if (object) {
-        if (qx.Bootstrap.isQxCoreObject(object)) {
+        if (qx.Bootstrap.isQxCoreObject(object) && object.toHashCode) {
           entry.object = object.toHashCode();
         }
         if (object.$$type) {

package/source/class/qx/module/Animation.js

@@ -26,6 +26,8 @@
  * @require(qx.module.Environment)
  */
 qx.Bootstrap.define("qx.module.Animation", {
+  extend : qx.core.Object,
+
   events: {
     /** Fired when an animation starts. */
     animationStart: undefined,

package/source/class/qx/module/Attribute.js

@@ -22,6 +22,8 @@
  * @group (Core)
  */
 qx.Bootstrap.define("qx.module.Attribute", {
+  extend: qx.core.Object,
+
   members: {
     /**
      * Returns the HTML content of the first item in the collection

package/source/class/qx/module/Css.js

@@ -16,11 +16,14 @@
      * Daniel Wagner (danielwagner)
 
 ************************************************************************ */
+
 /**
  * CSS/Style property manipulation module
  * @group (Core)
  */
 qx.Bootstrap.define("qx.module.Css", {
+  extend: qx.core.Object,
+
   statics: {
     /**
      * INTERNAL
@@ -43,12 +46,7 @@ qx.Bootstrap.define("qx.module.Css", {
               visibility: "hidden"
             };
 
-            elementHeight = qx.module.Css.__swap(
-              elem,
-              stylesToSwap,
-              "_getHeight",
-              this
-            );
+            elementHeight = qx.module.Css.__swap(elem, stylesToSwap, "_getHeight", this);
           } else {
             elementHeight = qx.bom.element.Dimension.getHeight(elem);
           }
@@ -85,12 +83,7 @@ qx.Bootstrap.define("qx.module.Css", {
               visibility: "hidden"
             };
 
-            elementWidth = qx.module.Css.__swap(
-              elem,
-              stylesToSwap,
-              "_getWidth",
-              this
-            );
+            elementWidth = qx.module.Css.__swap(elem, stylesToSwap, "_getWidth", this);
           } else {
             elementWidth = qx.bom.element.Dimension.getWidth(elem);
           }
@@ -127,12 +120,7 @@ qx.Bootstrap.define("qx.module.Css", {
             display: "block"
           };
 
-          contentHeight = qx.module.Css.__swap(
-            obj,
-            stylesToSwap,
-            "_getContentHeight",
-            this
-          );
+          contentHeight = qx.module.Css.__swap(obj, stylesToSwap, "_getContentHeight", this);
         } else {
           contentHeight = qx.bom.element.Dimension.getContentHeight(obj);
         }
@@ -164,12 +152,7 @@ qx.Bootstrap.define("qx.module.Css", {
             display: "block"
           };
 
-          contentWidth = qx.module.Css.__swap(
-            obj,
-            stylesToSwap,
-            "_getContentWidth",
-            this
-          );
+          contentWidth = qx.module.Css.__swap(obj, stylesToSwap, "_getContentWidth", this);
         } else {
           contentWidth = qx.bom.element.Dimension.getContentWidth(obj);
         }

package/source/class/qx/module/Event.js

@@ -26,6 +26,8 @@
  * @group (Core)
  */
 qx.Bootstrap.define("qx.module.Event", {
+  extend : qx.core.Object,
+
   statics: {
     /**
      * Event normalization registry

package/source/class/qx/module/Manipulating.js

@@ -24,6 +24,8 @@
  * @group (Core)
  */
 qx.Bootstrap.define("qx.module.Manipulating", {
+  extend: qx.core.Object,
+
   statics: {
     /** Default animation descriptions for animated scrolling **/
     _animationDescription: {

package/source/class/qx/module/Traversing.js

@@ -28,6 +28,8 @@
  * @group (Core)
  */
 qx.Bootstrap.define("qx.module.Traversing", {
+  extend: qx.core.Object,
+
   statics: {
     /**
      * String attributes used to determine if two DOM nodes are equal

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

@@ -56,7 +56,13 @@ qx.Class.define("qx.test.Bootstrap", {
 
       var o = new qx.test.MyClass();
       this.assertEquals("qx.test.MyClass", o.classname);
-      this.assertEquals("qx.test.MyClass", o.name);
+
+      // BC break for qooxdoo v8; `name` is no longer defined (use
+      // `classname` instead) because it conflicts with Property
+      // `name` used elsewhere, now that members and properties are in
+      // the same namespace.
+      //
+      // this.assertEquals("qx.test.MyClass", o.name);
 
       qx.Class.undefine("qx.test.MyClass");
     },
@@ -80,58 +86,67 @@ qx.Class.define("qx.test.Bootstrap", {
       qx.Class.undefine("vanillebaer.test.ROOT");
     },
 
-    "test: merge methods of same class (statics optimization)"() {
-      qx.Bootstrap.define("qx.test.MyClass", {
-        statics: {
-          methodA() {
-            return true;
-          }
-        }
-      });
-
-      qx.Bootstrap.define("qx.test.MyClass", {
-        statics: {
-          methodB() {
-            return true;
-          }
-        }
-      });
-
-      this.assertNotUndefined(qx.test.MyClass.methodA);
-      this.assertNotUndefined(qx.test.MyClass.methodB);
-
-      qx.Class.undefine("qx.test.MyClass");
-    },
-
-    "test: merge methods of same class (statics optimization) respect defer"() {
-      qx.Bootstrap.define("qx.test.MyClass", {
-        statics: {
-          methodA() {
-            return true;
-          },
-          methodB() {
-            return true;
-          }
-        }
-      });
-
-      qx.Bootstrap.define("qx.test.MyClass", {
-        statics: {
-          methodA: null
-        },
-
-        defer(statics) {
-          statics.methodA = function () {
-            return true;
-          };
-        }
-      });
-
-      this.assertNotNull(qx.test.MyClass.methodA);
-      this.assertNotUndefined(qx.test.MyClass.methodB);
-
-      qx.Class.undefine("qx.test.MyClass");
-    },
+    //
+    // BC break for qooxdoo v8. Merging of classes is no longer
+    // supported. It's not clear why this was ever supported or how it
+    // was supposed to work. What if the two classes declare different
+    // superclasses? How are constructors merged? It's moot in most
+    // cases anyway, though, since the class name must match the
+    // directory path, so two definitions of the same class "can't
+    // happen".
+    //
+    // "test: merge methods of same class (statics optimization)"() {
+    //   qx.Bootstrap.define("qx.test.MyClass", {
+    //     statics: {
+    //       methodA() {
+    //         return true;
+    //       }
+    //     }
+    //   });
+
+    //   qx.Bootstrap.define("qx.test.MyClass", {
+    //     statics: {
+    //       methodB() {
+    //         return true;
+    //       }
+    //     }
+    //   });
+
+    //   this.assertNotUndefined(qx.test.MyClass.methodA);
+    //   this.assertNotUndefined(qx.test.MyClass.methodB);
+
+    //   qx.Class.undefine("qx.test.MyClass");
+    // },
+
+    // "test: merge methods of same class (statics optimization) respect defer"() {
+    //   qx.Bootstrap.define("qx.test.MyClass", {
+    //     statics: {
+    //       methodA() {
+    //         return true;
+    //       },
+    //       methodB() {
+    //         return true;
+    //       }
+    //     }
+    //   });
+
+    //   qx.Bootstrap.define("qx.test.MyClass", {
+    //     statics: {
+    //       methodA: null
+    //     },
+
+    //     defer(statics) {
+    //       statics.methodA = function () {
+    //         return true;
+    //       };
+    //     }
+    //   });
+
+    //   this.assertNotNull(qx.test.MyClass.methodA);
+    //   this.assertNotUndefined(qx.test.MyClass.methodB);
+
+    //   qx.Class.undefine("qx.test.MyClass");
+    // },
 
     "test: define class with constructor"() {
       var c = qx.Bootstrap.define("qx.test.Construct", {