@qooxdoo/framework 7.0.0-beta.3 → 7.0.0-beta.7

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

@@ -3827,6 +3827,76 @@ qx.Class.define("qx.ui.core.Widget",
 
 
 
+    /*
+    ---------------------------------------------------------------------------
+      ARIA attrs support
+    ---------------------------------------------------------------------------
+    */
+    
+    /**
+     * Sets the string which labels this widget. This will be read out by screenreaders. Needed if there is no
+     * readable text/label in this widget which would automatically act as aria-label.
+     * @param label {String} Labelling Text
+     */
+    setAriaLabel: function(label) {
+      this.getContentElement().setAttribute("aria-label", label);
+    },
+
+    /**
+     * Marks that this widget gets labelled by another widget. This will be read out by screenreaders as first
+     * information.
+     * Similiar to aria-label, difference being that the labelling widget is an different widget and multiple
+     * widgets can be added.
+     * @param labelWidgets {qx.ui.core.Widget[]} Indefinite Number of labelling Widgets
+     */
+    addAriaLabelledBy: function(...labelWidgets) {
+      this.__addAriaXBy(labelWidgets, "aria-labelledby");
+    },
+
+    /**
+     * Marks that this widget gets described by another widget. This will be read out by screenreaders as last
+     * information. Multiple Widgets possible.
+     * @param describingWidgets {qx.ui.core.Widget[]} Indefinite Number of describing Widgets
+     */
+    addAriaDescribedBy: function(...describingWidgets) {
+      this.__addAriaXBy(describingWidgets, "aria-describedby");
+    },
+
+    /**
+     * Sets either aria-labelledby or aria-describedby
+     * @param widgets {qx.ui.core.Widget[]} Indefinite Number of widgets
+     * @param ariaAttr {String} aria-labelledby | aria-describedby
+     */
+    __addAriaXBy: function(widgets, ariaAttr) {
+      if (!["aria-labelledby", "aria-describedby"].includes(ariaAttr)) {
+        throw new Error("Only aria-labelledby or aria-describedby allowed!");
+      }
+      let idArr = [];
+      for (const widget of widgets) {
+        if (!(widget instanceof qx.ui.core.Widget)) {
+          throw new Error("Given widget " + widget + " is not an instance of qx.ui.core.Widget!");
+        }
+        const contentEl = widget.getContentElement();
+        let widgetId = contentEl.getAttribute("id");
+        if (!widgetId) {
+          widgetId = `label-${widget.toHashCode()}`;
+          contentEl.setAttribute("id", widgetId);
+        }
+        if (!idArr.includes(widgetId)) {
+          idArr.push(widgetId);
+        }
+      }
+      if (idArr.length === 0) {
+        return;
+      }
+      const idStr = idArr.join(" ");
+      const contentEl = this.getContentElement();
+      let res = contentEl.getAttribute(ariaAttr);
+      res = res ? `${res} ${idStr}` : idStr;
+      contentEl.setAttribute(ariaAttr, res);
+    },
+
+
 
     /*
     ---------------------------------------------------------------------------

package/source/class/qx/ui/decoration/MLinearBackgroundGradient.js

@@ -240,7 +240,8 @@ qx.Mixin.define("qx.ui.decoration.MLinearBackgroundGradient",
      *
      * @return {Boolean} Whether this implementation supports multiple gradients atop each other (true).
      */
-    __styleLinearBackgroundGradientWithCanvas: function me(startColor, endColor, unit, orientation, startColorPosition, endColorPosition, styles, backgroundStyle) {
+    __styleLinearBackgroundGradientWithCanvas: function(startColor, endColor, unit, orientation, startColorPosition, endColorPosition, styles, backgroundStyle) {
+      const me = qx.ui.decoration.MLinearBackgroundGradient.__styleLinearBackgroundGradientWithCanvas;
       if (!me.__canvas) {
         me.__canvas = document.createElement("canvas");
       }

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

@@ -337,10 +337,15 @@ qx.Class.define("qx.ui.form.ComboBox",
       }
 
       // Set aria-activedescendant
-      if (current && current[0]) {
-        this.getChildControl("textfield").getContentElement().setAttribute("aria-activedescendant", current[0].getContentElement().getAttribute("id"));
+      const textFieldContentEl = this.getChildControl("textfield").getContentElement();
+      if (!textFieldContentEl) {
+        return;
+      }
+      const currentContentEl = current && current[0] ? current[0].getContentElement() : null;
+      if (currentContentEl) {
+        textFieldContentEl.setAttribute("aria-activedescendant", currentContentEl.getAttribute("id"));
       } else {
-        this.getChildControl("textfield").getContentElement().removeAttribute("aria-activedescendant");
+        textFieldContentEl.removeAttribute("aria-activedescendant");
       }
     },
 

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

@@ -602,7 +602,22 @@ qx.Class.define("qx.ui.form.DateField",
 
       field.getFocusElement().focus();
       field.selectAllText();
-    }
+    },
+
+    // overridden
+    setAriaLabel: function(label) {
+      this.getChildControl("textfield").setAriaLabel(label);
+    },
+
+    // overridden
+    addAriaLabelledBy: function(...labelWidgets) {
+      this.getChildControl("textfield").addAriaLabelledBy(...labelWidgets);
+    },
+
+    // overridden
+    addAriaDescribedBy: function(...describingWidgets) {
+      this.getChildControl("textfield").addAriaDescribedBy(...describingWidgets);
+    },
   },
 
 

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

@@ -115,7 +115,6 @@ qx.Class.define("qx.ui.form.MenuButton",
         old.resetOpener();
       }
 
-      const contentEl = this.getContentElement();
       if (value)
       {
         value.addListener("changeVisibility", this._onMenuChange, this);
@@ -123,13 +122,18 @@ qx.Class.define("qx.ui.form.MenuButton",
 
         value.removeState("submenu");
         value.removeState("contextmenu");
-
-        // ARIA attrs
+      }
+      
+      // ARIA attrs
+      const contentEl = this.getContentElement();
+      if (!contentEl) {
+        return;
+      }
+      if (value) {
         contentEl.setAttribute("aria-haspopup", "menu");
         contentEl.setAttribute("aria-expanded", value.isVisible());
         contentEl.setAttribute("aria-controls", value.getContentElement().getAttribute("id"));
       } else {
-         // ARIA attrs
         contentEl.removeAttribute("aria-haspopup");
         contentEl.removeAttribute("aria-expanded");
         contentEl.removeAttribute("aria-controls");

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

@@ -430,10 +430,15 @@ qx.Class.define("qx.ui.form.SelectBox",
       }
 
       // Set aria-activedescendant
-      if (current && current[0]) {
-        this.getContentElement().setAttribute("aria-activedescendant", current[0].getContentElement().getAttribute("id"));
+      const contentEl = this.getContentElement();
+      if (!contentEl) {
+        return;
+      }
+      const currentContentEl = current && current[0] ? current[0].getContentElement() : null;
+      if (currentContentEl) {
+        contentEl.setAttribute("aria-activedescendant", currentContentEl.getAttribute("id"));
       } else {
-        this.getContentElement().removeAttribute("aria-activedescendant");
+        contentEl.removeAttribute("aria-activedescendant");
       }
     },
 

package/source/class/qx/ui/menu/AbstractButton.js

@@ -340,7 +340,6 @@ qx.Class.define("qx.ui.menu.AbstractButton",
         old.removeState("submenu");
       }
 
-      const contentEl = this.getContentElement();
       if (value)
       {
         this._showChildControl("arrow");
@@ -348,17 +347,22 @@ qx.Class.define("qx.ui.menu.AbstractButton",
         value.addListener("changeVisibility", this._onMenuChange, this);
         value.setOpener(this);
         value.addState("submenu");
-
-        // ARIA attrs
-        contentEl.setAttribute("aria-haspopup", "menu");
-        contentEl.setAttribute("aria-expanded", value.isVisible());
-        contentEl.setAttribute("aria-controls", value.getContentElement().getAttribute("id"));
       }
       else
       {
         this._excludeChildControl("arrow");
-        
-         // ARIA attrs
+      }
+      
+      // ARIA attrs
+      const contentEl = this.getContentElement();
+      if (!contentEl) {
+        return;
+      }
+      if (value) {
+        contentEl.setAttribute("aria-haspopup", "menu");
+        contentEl.setAttribute("aria-expanded", value.isVisible());
+        contentEl.setAttribute("aria-controls", value.getContentElement().getAttribute("id"));
+      } else {
         contentEl.removeAttribute("aria-haspopup");
         contentEl.removeAttribute("aria-expanded");
         contentEl.removeAttribute("aria-controls");

package/source/class/qx/ui/menu/Menu.js

@@ -493,14 +493,19 @@ qx.Class.define("qx.ui.menu.Menu",
       if (old) {
         old.removeState("selected");
       }
-
-      const opener = this.__getRootOpener();
-      const contentEl = opener ? opener.getContentElement() : this.getContentElement();
       if (value) {
         value.addState("selected");
+      }
 
-        // ARIA attrs
-        contentEl.setAttribute("aria-activedescendant", value.getContentElement().getAttribute("id"));
+      // ARIA attrs
+      const opener = this.__getRootOpener();
+      const contentEl = opener ? opener.getContentElement() : this.getContentElement();
+      if (!contentEl) {
+        return;
+      }
+      const valueContentEl = value ? value.getContentElement() : null;
+      if (valueContentEl) {
+        contentEl.setAttribute("aria-activedescendant", valueContentEl.getAttribute("id"));
       } else {
         contentEl.removeAttribute("aria-activedescendant");
       }
@@ -523,10 +528,15 @@ qx.Class.define("qx.ui.menu.Menu",
     _applyOpener : function(value, old)
     {
       // ARIA attrs
-      if (value) {
-        this.getContentElement().setAttribute("aria-labelledby", value);
+      const contentEl = this.getContentElement();
+      if (!contentEl) {
+        return;
+      }
+      if (value && value.getContentElement()) {
+        contentEl.setAttribute("aria-labelledby", "");
+        this.addAriaLabelledBy(value);
       } else {
-        this.getContentElement().removeAttribute("aria-labelledby");
+        contentEl.removeAttribute("aria-labelledby");
       }
     },
 

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

@@ -44,6 +44,10 @@ qx.Class.define("qx.ui.table.pane.Model",
     this.base(arguments);
 
     this.setTableColumnModel(tableColumnModel);
+    
+    this.__defferedEventDispatcher = new qx.util.DeferredCall(function() {
+      this.fireEvent(qx.ui.table.pane.Model.EVENT_TYPE_MODEL_CHANGED);
+    }, this);
   },
 
 
@@ -122,20 +126,21 @@ qx.Class.define("qx.ui.table.pane.Model",
   {
     __columnCount : null,
     __tableColumnModel : null,
+    __defferedEventDispatcher : null,
 
 
     // property modifier
     _applyFirstColumnX : function(value, old)
     {
       this.__columnCount = null;
-      this.fireEvent(qx.ui.table.pane.Model.EVENT_TYPE_MODEL_CHANGED);
+      this.__defferedEventDispatcher.schedule();
     },
 
     // property modifier
     _applyMaxColumnCount : function(value, old)
     {
       this.__columnCount = null;
-      this.fireEvent(qx.ui.table.pane.Model.EVENT_TYPE_MODEL_CHANGED);
+      this.__defferedEventDispatcher.schedule();
     },
 
 
@@ -166,7 +171,7 @@ qx.Class.define("qx.ui.table.pane.Model",
     {
       this.__columnCount = null;
 
-      this.fireEvent(qx.ui.table.pane.Model.EVENT_TYPE_MODEL_CHANGED);
+      this.__defferedEventDispatcher.schedule();
     },
 
 
@@ -177,7 +182,7 @@ qx.Class.define("qx.ui.table.pane.Model",
      */
     _onHeaderCellRendererChanged : function(evt)
     {
-      this.fireEvent(qx.ui.table.pane.Model.EVENT_TYPE_MODEL_CHANGED);
+      this.__defferedEventDispatcher.schedule();
     },
 
 
@@ -305,5 +310,6 @@ qx.Class.define("qx.ui.table.pane.Model",
       this.__tableColumnModel.removeListener("headerCellRendererChanged", this._onHeaderCellRendererChanged, this);
     }
     this.__tableColumnModel = null;
+    this._disposeObjects("__defferedEventDispatcher");
   }
 });

package/source/class/qx/ui/window/Window.js

@@ -102,6 +102,11 @@ qx.Class.define("qx.ui.window.Window",
 
     // Change the resize frames appearance
     this._getResizeFrame().setAppearance("window-resize-frame");
+    
+    // ARIA attrs
+    this.getContentElement().setAttribute("role", "dialog");
+    this.addAriaLabelledBy(this.getChildControl("title"));
+    this.addAriaDescribedBy(this.getChildControl("statusbar-text"));
   },
 
 
@@ -961,6 +966,9 @@ qx.Class.define("qx.ui.window.Window",
       } else {
         this.addState("modal");
       }
+      
+      // ARIA attrs
+      this.getContentElement().setAttribute("aria-modal", value);
     },
 
 

package/source/class/qx/util/format/DateFormat.js

@@ -64,7 +64,7 @@
  * single-quoted.
  *
  * The same format patterns will be used for both parsing and output formatting.
- * 
+ *
  * NOTE: Instances of this class must be disposed of after use
  *
  */
@@ -181,6 +181,7 @@ qx.Class.define("qx.util.format.DateFormat",
       isoDate :        "yyyy-MM-dd",
       isoTime :        "HH:mm:ss",
       isoDateTime :    "yyyy-MM-dd'T'HH:mm:ss",
+      isoDateTimeTz :  "yyyy-MM-dd'T'HH:mm:ssZ",
       isoUtcDateTime : "yyyy-MM-dd'T'HH:mm:ss'Z'"
     },
 
@@ -406,14 +407,14 @@ qx.Class.define("qx.util.format.DateFormat",
       }
       this.__locale = value === null ? this.__initialLocale : value;
     },
-    
+
     /**
      * Resets the Locale
      */
     resetLocale : function() {
       this.setLocale(null);
     },
-    
+
     /**
      * Returns the locale
      */
@@ -427,7 +428,7 @@ qx.Class.define("qx.util.format.DateFormat",
 
     /**
      * Returns the original format string
-     * 
+     *
      * @return {String}
      */
     getFormatString() {
@@ -761,7 +762,8 @@ qx.Class.define("qx.util.format.DateFormat",
         weekOfYear  : 1,
         min         : 0,
         sec         : 0,
-        ms          : 0
+        ms          : 0,
+        tzOffsetMins: null
       };
 
       var currGroup = 1;
@@ -825,14 +827,21 @@ qx.Class.define("qx.util.format.DateFormat",
         dateValues.year = dateValues.year * dateValues.era;
       }
 
-      var date = new Date(dateValues.year, dateValues.month, dateValues.day, (dateValues.ispm) ? (dateValues.hour + 12) : dateValues.hour, dateValues.min, dateValues.sec, dateValues.ms);
-
-      if(this.__UTC) {
-        date = new Date(date.getUTCFullYear(),date.getUTCMonth(),date.getUTCDate(),date.getUTCHours(),date.getUTCMinutes(),date.getUTCSeconds(),date.getUTCMilliseconds());
-      }
-
-      if (dateValues.month != date.getMonth() || dateValues.year != date.getFullYear()) {
-        throw new Error("Error parsing date '" + dateStr + "': the value for day or month is too large");
+      var date;
+      if (this.__UTC || dateValues.tzOffsetMins !== null) {
+        var utcMs = Date.UTC(dateValues.year, dateValues.month, dateValues.day, (dateValues.ispm) ? (dateValues.hour + 12) : dateValues.hour, dateValues.min, dateValues.sec, dateValues.ms);
+        if (dateValues.tzOffsetMins !== 0) {
+          utcMs += (dateValues.tzOffsetMins * 60000);
+        }
+        date = new Date(utcMs);
+        if (this.__UTC && (dateValues.month !== date.getUTCMonth() || dateValues.year !== date.getUTCFullYear())) {
+          throw new Error("Error parsing date '" + dateStr + "': the value for day or month is too large");
+        }
+      } else {
+        date = new Date(dateValues.year, dateValues.month, dateValues.day, (dateValues.ispm) ? (dateValues.hour + 12) : dateValues.hour, dateValues.min, dateValues.sec, dateValues.ms);
+        if (dateValues.month !== date.getMonth() || dateValues.year !== date.getFullYear()) {
+          throw new Error("Error parsing date '" + dateStr + "': the value for day or month is too large");
+        }
       }
 
       return date;
@@ -1207,10 +1216,28 @@ qx.Class.define("qx.util.format.DateFormat",
         dateValues.hour = parseInt(value, 10) % 12;
       };
 
-      var ignoreManipulator = function(dateValues, value) {
-        return;
+      var timezoneManipulator = function(dateValues, value) {
+        var regEx = new RegExp("([+-]?)(\\d\\d)(?::?(\\d\\d))?$");
+        var tzResults = regEx.exec(value);
+        var offsetHours = parseInt(tzResults[2], 10);
+        var offsetMins = parseInt(tzResults[3], 10);
+        // basic check, hours range is -12 to +14 https://en.wikipedia.org/wiki/Category:UTC_offsets
+        if (offsetHours > 14) {
+          throw new Error("Invalid hours in time zone offset.");
+        }
+        if (offsetMins > 59) {
+          throw new Error("Invalid minutes in time zone offset.");
+        }
+        dateValues.tzOffsetMins = (offsetHours * 60) + offsetMins;
+        if (tzResults[1] === "-") {
+          dateValues.tzOffsetMins = -dateValues.tzOffsetMins;
+        }
       };
 
+      // var ignoreManipulator = function(dateValues, value) {
+      //   return;
+      // };
+
       var narrowEraNames = ['A', 'B'];
       var narrowEraNameManipulator = function(dateValues, value) {
         dateValues.era = value == 'A' ? 1 : -1;
@@ -1755,14 +1782,14 @@ qx.Class.define("qx.util.format.DateFormat",
       {
         pattern     : "Z",
         regex       : "([\\+\\-]\\d\\d\\d\\d)",
-        manipulator : ignoreManipulator
+        manipulator : timezoneManipulator
       });
 
       rules.push(
       {
         pattern     : "z",
         regex       : "(GMT[\\+\\-]\\d\\d:\\d\\d)",
-        manipulator : ignoreManipulator
+        manipulator : timezoneManipulator
       });
     }
   }

package/source/resource/qx/tool/loadsass.js

@@ -1,7 +1,8 @@
-global.require = require;
-global.__filename__ = __filename;
-/* global loadSass */
-global.loadSass = new Function (
+if ((typeof global !== 'undefined')) {
+  global.require = require;
+  global.__filename__ = __filename;
+  /* global loadSass */
+  global.loadSass = new Function (
 `
   // trick out sass
   process.versions.electron = "0.0.0";
@@ -11,3 +12,4 @@ global.loadSass = new Function (
   delete process.versions.electron;
   return sass;
 `);
+}

package/source/resource/qx/tool/schema/compile-1-0-0.json

@@ -168,15 +168,6 @@
           },
           "parts": {
             "$ref": "#/properties/parts"
-          },
-          "minify": {
-            "$ref": "#/properties/targets"
-          },
-          "save-source-in-map": {
-            "$ref": "#/properties/targets"
-          },
-          "save-unminified": {
-            "$ref": "#/properties/targets"
           }
         }
       }
@@ -266,11 +257,15 @@
             "type": "boolean"
 		      },
           "save-source-in-map": {
-            "description": "If true, the source file will be saved in the map file if the target supports it. Can be overridden on a per application basis.",
+            "description": "If true, the source file will be saved in the map file if the target supports it.",
+            "type": "boolean"
+          },
+          "source-map-relative-paths": {
+            "description": "If true, the source map files will be saved with relative paths in the map file if the target supports it.",
             "type": "boolean"
           },
           "save-unminified": {
-            "description": "If true, the unminified files will be saved if the target supports it. Can be overridden on a per application basis.",
+            "description": "If true, the unminified files will be saved if the target supports it.",
             "type": "boolean"
           },
           "inline-external-scripts": {