@qooxdoo/framework 7.0.0-beta.6 → 7.0.0

package/source/class/qx/bom/History.js

@@ -94,13 +94,9 @@
  *
  * @asset(qx/static/blank.html)
  */
-qx.Class.define("qx.bom.History",
-{
-  extend : qx.core.Object,
-  type : "abstract",
-
-
-
+qx.Class.define("qx.bom.History", {
+  extend: qx.core.Object,
+  type: "abstract",
 
   /*
   *****************************************************************************
@@ -108,17 +104,15 @@ qx.Class.define("qx.bom.History",
   *****************************************************************************
   */
 
-  construct : function()
-  {
-    this.base(arguments);
+  construct() {
+    super();
 
-    this._baseUrl = window.location.href.split('#')[0] + '#';
+    this._baseUrl = window.location.href.split("#")[0] + "#";
 
     this._titles = {};
     this._setInitialState();
   },
 
-
   /*
   *****************************************************************************
      EVENTS
@@ -130,47 +124,43 @@ qx.Class.define("qx.bom.History",
      * Fired when the user moved in the history. The data property of the event
      * holds the state, which was passed to {@link #addToHistory}.
      */
-    "request" : "qx.event.type.Data"
+    request: "qx.event.type.Data"
   },
 
-
   /*
   *****************************************************************************
      STATICS
   *****************************************************************************
   */
 
-
-  statics :
-  {
+  statics: {
     /**
      * @type {Boolean} Whether the browser supports the 'hashchange' event natively.
      */
-    SUPPORTS_HASH_CHANGE_EVENT : qx.core.Environment.get("event.hashchange"),
-
+    SUPPORTS_HASH_CHANGE_EVENT: qx.core.Environment.get("event.hashchange"),
 
     /**
      * Get the singleton instance of the history manager.
      *
      * @return {History}
      */
-    getInstance : function()
-    {
+    getInstance() {
       var runsInIframe = !(window == window.top);
 
-      if (!this.$$instance)
-      {
+      if (!this.$$instance) {
         // in iframe + IE9
-        if (runsInIframe
-          && qx.core.Environment.get("browser.documentmode") == 9
+        if (
+          runsInIframe &&
+          qx.core.Environment.get("browser.documentmode") == 9
         ) {
           this.$$instance = new qx.bom.HashHistory();
         }
 
         // in iframe + IE<9
-        else if (runsInIframe
-          && qx.core.Environment.get("engine.name") == "mshtml"
-          && qx.core.Environment.get("browser.documentmode") < 9
+        else if (
+          runsInIframe &&
+          qx.core.Environment.get("engine.name") == "mshtml" &&
+          qx.core.Environment.get("browser.documentmode") < 9
         ) {
           this.$$instance = new qx.bom.IframeHistory();
         }
@@ -181,7 +171,7 @@ qx.Class.define("qx.bom.History",
         }
 
         // IE without hashChange event
-        else if ((qx.core.Environment.get("engine.name") == "mshtml")) {
+        else if (qx.core.Environment.get("engine.name") == "mshtml") {
           this.$$instance = new qx.bom.IframeHistory();
         }
 
@@ -194,75 +184,62 @@ qx.Class.define("qx.bom.History",
     }
   },
 
-
   /*
   *****************************************************************************
      PROPERTIES
   *****************************************************************************
   */
 
-  properties :
-  {
+  properties: {
     /**
      * Property holding the current title
      */
-    title :
-    {
-      check : "String",
-      event : "changeTitle",
-      nullable : true,
-      apply    : "_applyTitle"
+    title: {
+      check: "String",
+      event: "changeTitle",
+      nullable: true,
+      apply: "_applyTitle"
     },
 
     /**
      * Property holding the current state of the history.
      */
-    state :
-    {
-      check : "String",
-      event : "changeState",
-      nullable : true,
+    state: {
+      check: "String",
+      event: "changeState",
+      nullable: true,
       apply: "_applyState"
     }
   },
 
-
-
-
   /*
   *****************************************************************************
      MEMBERS
   *****************************************************************************
   */
 
-  members :
-  {
-    _titles : null,
-
+  members: {
+    _titles: null,
 
     // property apply
-    _applyState : function(value, old)
-    {
+    _applyState(value, old) {
       this._writeState(value);
     },
 
-
     /**
      * Populates the 'state' property with the initial state value
      */
-    _setInitialState : function() {
+    _setInitialState() {
       this.setState(this._readState());
     },
 
-
     /**
      * Encodes the state value into a format suitable as fragment identifier.
      *
      * @param value {String} The string to encode
      * @return {String} The encoded string
      */
-    _encode : function (value)
-    {
+    _encode(value) {
       if (qx.lang.Type.isString(value)) {
         return encodeURIComponent(value);
       }
@@ -270,15 +247,13 @@ qx.Class.define("qx.bom.History",
       return "";
     },
 
-
     /**
      * Decodes a fragment identifier into a string
      *
      * @param value {String} The fragment identifier
      * @return {String} The decoded fragment identifier
      */
-    _decode : function (value)
-    {
+    _decode(value) {
       if (qx.lang.Type.isString(value)) {
         return decodeURIComponent(value);
       }
@@ -286,16 +261,13 @@ qx.Class.define("qx.bom.History",
       return "";
     },
 
-
     // property apply
-    _applyTitle : function (title)
-    {
+    _applyTitle(title) {
       if (title != null) {
         document.title = title || "";
       }
     },
 
-
     /**
      * Adds an entry to the browser history.
      *
@@ -305,14 +277,12 @@ qx.Class.define("qx.bom.History",
      * @param newTitle {String ? null} the page title to set after the history entry
      *          is done. This title should represent the new state of the application.
      */
-    addToHistory : function(state, newTitle)
-    {
+    addToHistory(state, newTitle) {
       if (!qx.lang.Type.isString(state)) {
         state = state + "";
       }
 
-      if (qx.lang.Type.isString(newTitle))
-      {
+      if (qx.lang.Type.isString(newTitle)) {
         this.setTitle(newTitle);
         this._titles[state] = newTitle;
       }
@@ -322,32 +292,40 @@ qx.Class.define("qx.bom.History",
       }
     },
 
-
     /**
      * Navigates back in the browser history.
      * Simulates a back button click.
      */
-     navigateBack : function() {
-       qx.event.Timer.once(function() {window.history.back();}, this, 100);
-     },
-
+    navigateBack() {
+      qx.event.Timer.once(
+        function () {
+          window.history.back();
+        },
+        this,
+        100
+      );
+    },
 
     /**
      * Navigates forward in the browser history.
      * Simulates a forward button click.
      */
-     navigateForward : function() {
-       qx.event.Timer.once(function() {window.history.forward();}, this, 100);
-     },
-
+    navigateForward() {
+      qx.event.Timer.once(
+        function () {
+          window.history.forward();
+        },
+        this,
+        100
+      );
+    },
 
     /**
      * Called on changes to the history using the browser buttons.
      *
      * @param state {String} new state of the history
      */
-    _onHistoryLoad : function(state)
-    {
+    _onHistoryLoad(state) {
       this.setState(state);
       this.fireDataEvent("request", state);
       if (this._titles[state] != null) {
@@ -355,34 +333,30 @@ qx.Class.define("qx.bom.History",
       }
     },
 
-
     /**
      * Browser dependent function to read the current state of the history
      *
      * @return {String} current state of the browser history
      */
-    _readState : function() {
+    _readState() {
       throw new Error("Abstract method call");
     },
 
-
     /**
      * Save a state into the browser history.
      *
      * @param state {String} state to save
      */
-    _writeState : function(state) {
+    _writeState(state) {
       throw new Error("Abstract method call");
     },
 
-
     /**
      * Sets the fragment identifier of the window URL
      *
      * @param value {String} the fragment identifier
      */
-    _setHash : function (value)
-    {
+    _setHash(value) {
       var url = this._baseUrl + (value || "");
       var loc = window.location;
 
@@ -391,15 +365,13 @@ qx.Class.define("qx.bom.History",
       }
     },
 
-
     /**
      * Returns the fragment identifier of the top window URL. For gecko browsers we
      * have to use a regular expression to avoid encoding problems.
      *
      * @return {String} the fragment identifier
      */
-    _getHash : function()
-    {
+    _getHash() {
       var hash = /#(.*)$/.exec(window.location.href);
       return hash && hash[1] ? hash[1] : "";
     }

package/source/class/qx/bom/Html.js

@@ -36,16 +36,14 @@
  *
  * @ignore(qxWeb)
  */
-qx.Bootstrap.define("qx.bom.Html",
-{
+qx.Bootstrap.define("qx.bom.Html", {
   /*
   *****************************************************************************
      STATICS
   *****************************************************************************
   */
 
-  statics :
-  {
+  statics: {
     /**
      * Helper method for XHTML replacement.
      *
@@ -54,30 +52,28 @@ qx.Bootstrap.define("qx.bom.Html",
      * @param tag {String} Tag name
      * @return {String} XHTML corrected tag
      */
-    __fixNonDirectlyClosableHelper : function(all, front, tag)
-    {
-      return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ?
-        all : front + "></" + tag + ">";
+    __fixNonDirectlyClosableHelper(all, front, tag) {
+      return tag.match(
+        /^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i
+      )
+        ? all
+        : front + "></" + tag + ">";
     },
 
-
     /** @type {Map} Contains wrap fragments for specific HTML matches */
-    __convertMap :
-    {
-      opt : [ 1, "<select multiple='multiple'>", "</select>" ], // option or optgroup
-      leg : [ 1, "<fieldset>", "</fieldset>" ],
-      table : [ 1, "<table>", "</table>" ],
-      tr : [ 2, "<table><tbody>", "</tbody></table>" ],
-      td : [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-      col : [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-      def : qx.core.Environment.select("engine.name",
-      {
-        "mshtml" : [ 1, "div<div>", "</div>" ],
-        "default" : null
+    __convertMap: {
+      opt: [1, "<select multiple='multiple'>", "</select>"], // option or optgroup
+      leg: [1, "<fieldset>", "</fieldset>"],
+      table: [1, "<table>", "</table>"],
+      tr: [2, "<table><tbody>", "</tbody></table>"],
+      td: [3, "<table><tbody><tr>", "</tr></tbody></table>"],
+      col: [2, "<table><tbody></tbody><colgroup>", "</colgroup></table>"],
+      def: qx.core.Environment.select("engine.name", {
+        mshtml: [1, "div<div>", "</div>"],
+        default: null
       })
     },
 
-
     /**
      * Fixes "XHTML"-style tags in all browsers.
      * Replaces tags which are not allowed to be closed directly such as
@@ -87,12 +83,13 @@ qx.Bootstrap.define("qx.bom.Html",
      * @param html {String} HTML to fix
      * @return {String} Fixed HTML
      */
-    fixEmptyTags : function(html)
-    {
-      return html.replace(/(<(\w+)[^>]*?)\/>/g, this.__fixNonDirectlyClosableHelper);
+    fixEmptyTags(html) {
+      return html.replace(
+        /(<(\w+)[^>]*?)\/>/g,
+        this.__fixNonDirectlyClosableHelper
+      );
     },
 
-
     /**
      * Translates a HTML string into an array of elements.
      *
@@ -100,8 +97,7 @@ qx.Bootstrap.define("qx.bom.Html",
      * @param context {Document} Context document in which (helper) elements should be created
      * @return {Array} List of resulting elements
      */
-    __convertHtmlString : function(html, context)
-    {
+    __convertHtmlString(html, context) {
       var div = context.createElement("div");
 
       html = qx.bom.Html.fixEmptyTags(html);
@@ -110,7 +106,8 @@ qx.Bootstrap.define("qx.bom.Html",
       var tags = html.replace(/^\s+/, "").substring(0, 5).toLowerCase();
 
       // Auto-wrap content into required DOM structure
-      var wrap, map = this.__convertMap;
+      var wrap,
+        map = this.__convertMap;
       if (!tags.indexOf("<opt")) {
         wrap = map.opt;
       } else if (!tags.indexOf("<leg")) {
@@ -128,8 +125,7 @@ qx.Bootstrap.define("qx.bom.Html",
       }
 
       // Omit string concat when no wrapping is needed
-      if (wrap)
-      {
+      if (wrap) {
         // Go to html and back, then peel off extra wrappers
         div.innerHTML = wrap[1] + html + wrap[2];
 
@@ -138,42 +134,45 @@ qx.Bootstrap.define("qx.bom.Html",
         while (depth--) {
           div = div.lastChild;
         }
-      }
-      else
-      {
+      } else {
         div.innerHTML = html;
       }
 
       // Fix IE specific bugs
-      if ((qx.core.Environment.get("engine.name") == "mshtml"))
-      {
+      if (qx.core.Environment.get("engine.name") == "mshtml") {
         // Remove IE's autoinserted <tbody> from table fragments
         // String was a <table>, *may* have spurious <tbody>
         var hasBody = /<tbody/i.test(html);
 
         // String was a bare <thead> or <tfoot>
-        var tbody = !tags.indexOf("<table") && !hasBody ?
-          div.firstChild && div.firstChild.childNodes :
-          wrap[1] == "<table>" && !hasBody ? div.childNodes :
-          [];
-
-        for (var j=tbody.length-1; j>=0 ; --j)
-        {
-          if (tbody[j].tagName.toLowerCase() === "tbody" && !tbody[j].childNodes.length) {
+        var tbody =
+          !tags.indexOf("<table") && !hasBody
+            ? div.firstChild && div.firstChild.childNodes
+            : wrap[1] == "<table>" && !hasBody
+            ? div.childNodes
+            : [];
+
+        for (var j = tbody.length - 1; j >= 0; --j) {
+          if (
+            tbody[j].tagName.toLowerCase() === "tbody" &&
+            !tbody[j].childNodes.length
+          ) {
             tbody[j].parentNode.removeChild(tbody[j]);
           }
         }
 
         // IE completely kills leading whitespace when innerHTML is used
         if (/^\s/.test(html)) {
-          div.insertBefore(context.createTextNode(html.match(/^\s*/)[0]), div.firstChild);
+          div.insertBefore(
+            context.createTextNode(html.match(/^\s*/)[0]),
+            div.firstChild
+          );
         }
       }
 
       return qx.lang.Array.fromCollection(div.childNodes);
     },
 
-
     /**
      * Cleans-up the given HTML and append it to a fragment
      *
@@ -193,20 +192,21 @@ qx.Bootstrap.define("qx.bom.Html",
      * @param fragment {Element?null} Document fragment to appends elements to
      * @return {Element[]} Array of elements (when a fragment is given it only contains script elements)
      */
-    clean: function(objs, context, fragment)
-    {
+    clean(objs, context, fragment) {
       context = context || document;
 
       // !context.createElement fails in IE with an error but returns typeof 'object'
       if (typeof context.createElement === "undefined") {
-        context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+        context =
+          context.ownerDocument ||
+          (context[0] && context[0].ownerDocument) ||
+          document;
       }
 
       // Fast-Path:
       // If a single string is passed in and it's a single tag
       // just do a createElement and skip the rest
-      if (!fragment && objs.length === 1 && typeof objs[0] === "string")
-      {
+      if (!fragment && objs.length === 1 && typeof objs[0] === "string") {
         var match = /^<(\w+)\s*\/?>$/.exec(objs[0]);
         if (match) {
           return [context.createElement(match[1])];
@@ -214,9 +214,9 @@ qx.Bootstrap.define("qx.bom.Html",
       }
 
       // Iterate through items in incoming array
-      var obj, ret=[];
-      for (var i=0, l=objs.length; i<l; i++)
-      {
+      var obj,
+        ret = [];
+      for (var i = 0, l = objs.length; i < l; i++) {
         obj = objs[i];
 
         // Convert HTML string into DOM nodes
@@ -227,8 +227,10 @@ qx.Bootstrap.define("qx.bom.Html",
         // Append or merge depending on type
         if (obj.nodeType) {
           ret.push(obj);
-        } else if (obj instanceof qx.type.BaseArray ||
-            (typeof qxWeb !== "undefined" && obj instanceof qxWeb)) {
+        } else if (
+          obj instanceof qx.type.BaseArray ||
+          (typeof qxWeb !== "undefined" && obj instanceof qxWeb)
+        ) {
           ret.push.apply(ret, Array.prototype.slice.call(obj, 0));
         } else if (obj.toElement) {
           ret.push(obj.toElement());
@@ -238,8 +240,7 @@ qx.Bootstrap.define("qx.bom.Html",
       }
 
       // Append to fragment and filter out scripts... or...
-      if (fragment)
-      {
+      if (fragment) {
         return qx.bom.Html.extractScripts(ret, fragment);
       }
 
@@ -247,7 +248,6 @@ qx.Bootstrap.define("qx.bom.Html",
       return ret;
     },
 
-
     /**
      * Extracts script elements from an element list. Optionally
      * attaches them to a given document fragment
@@ -256,13 +256,17 @@ qx.Bootstrap.define("qx.bom.Html",
      * @param fragment {Document?} document fragment
      * @return {Element[]} Array containing the script elements
      */
-    extractScripts : function(elements, fragment) {
-      var scripts=[], elem;
-      for (var i=0; elements[i]; i++) {
+    extractScripts(elements, fragment) {
+      var scripts = [],
+        elem;
+      for (var i = 0; elements[i]; i++) {
         elem = elements[i];
 
-        if (elem.nodeType == 1 && elem.tagName.toLowerCase() === "script" && (!elem.type || elem.type.toLowerCase() === "text/javascript"))
-        {
+        if (
+          elem.nodeType == 1 &&
+          elem.tagName.toLowerCase() === "script" &&
+          (!elem.type || elem.type.toLowerCase() === "text/javascript")
+        ) {
           // Trying to remove the element from DOM
           if (elem.parentNode) {
             elem.parentNode.removeChild(elements[i]);
@@ -270,14 +274,14 @@ qx.Bootstrap.define("qx.bom.Html",
 
           // Store in script list
           scripts.push(elem);
-        }
-        else
-        {
-          if (elem.nodeType === 1)
-          {
+        } else {
+          if (elem.nodeType === 1) {
             // Recursively search for scripts and append them to the list of elements to process
-            var scriptList = qx.lang.Array.fromCollection(elem.getElementsByTagName("script"));
-            elements.splice.apply(elements, [i+1, 0].concat(scriptList));
+            var scriptList = qx.lang.Array.fromCollection(
+              elem.getElementsByTagName("script")
+            );
+
+            elements.splice.apply(elements, [i + 1, 0].concat(scriptList));
           }
 
           // Finally append element to fragment