@qooxdoo/framework 7.0.0-beta.6 → 7.0.0

package/source/class/qx/core/MObjectId.js

@@ -18,13 +18,12 @@
 
 /**
  * A mixin providing objects by ID and owners.
- * 
+ *
  * The typical use of IDs is to override the `_createQxObjectImpl` method and create
  * new instances on demand; all code should access these instances by calling
  * `getQxObject`.
  */
 qx.Mixin.define("qx.core.MObjectId", {
-  
   /*
    * ****************************************************************************
    * PROPERTIES
@@ -32,22 +31,24 @@ qx.Mixin.define("qx.core.MObjectId", {
    */
 
   properties: {
-
     /** The owning object */
-    qxOwner : {
-      init : null,
-      check : "qx.core.Object",
-      nullable : true,
-      apply : "_applyQxOwner"
+    qxOwner: {
+      init: null,
+      check: "qx.core.Object",
+      nullable: true,
+      apply: "_applyQxOwner"
     },
 
-
     /** {String} The ID of the object.  */
-    qxObjectId : {
+    qxObjectId: {
       init: null,
-      check : function(value) { return value === null || (typeof value == "string" && value.indexOf('/') < 0); },
-      nullable : true,
-      apply : "_applyQxObjectId"
+      check(value) {
+        return (
+          value === null || (typeof value == "string" && value.indexOf("/") < 0)
+        );
+      },
+      nullable: true,
+      apply: "_applyQxObjectId"
     }
   },
 
@@ -58,23 +59,24 @@ qx.Mixin.define("qx.core.MObjectId", {
    */
 
   members: {
-    
     __ownedQxObjects: null,
     __changingQxOwner: false,
 
     /**
      * Apply owner
      */
-    _applyQxOwner : function(value, oldValue) {
+    _applyQxOwner(value, oldValue) {
       if (!this.__changingQxOwner) {
-        throw new Error("Please use API methods to change owner, not the property");
+        throw new Error(
+          "Please use API methods to change owner, not the property"
+        );
       }
     },
-    
+
     /**
      * Apply objectId
      */
-    _applyQxObjectId : function(value, oldValue) {
+    _applyQxObjectId(value, oldValue) {
       if (!this.__changingQxOwner) {
         var owner = this.getQxOwner();
         if (owner) {
@@ -83,19 +85,19 @@ qx.Mixin.define("qx.core.MObjectId", {
         this._cascadeQxObjectIdChanges();
       }
     },
-    
+
     /**
      * Called when a child's objectId changes
      */
-    __onOwnedObjectIdChange: function(obj, newId, oldId) {
+    __onOwnedObjectIdChange(obj, newId, oldId) {
       delete this.__ownedQxObjects[oldId];
       this.__ownedQxObjects[newId] = obj;
     },
-    
+
     /**
      * Reflect changes to IDs or owners
      */
-    _cascadeQxObjectIdChanges: function() {
+    _cascadeQxObjectIdChanges() {
       if (typeof this.getContentElement == "function") {
         var contentElement = this.getContentElement();
         if (contentElement) {
@@ -111,37 +113,37 @@ qx.Mixin.define("qx.core.MObjectId", {
         }
       }
     },
-    
+
     /**
      * Returns the object with the specified ID
-     * 
+     *
      * @param id
      *          {String} ID of the object
      * @return {qx.core.Object?} the found object
      */
-    getQxObject: function(id) {
+    getQxObject(id) {
       if (this.__ownedQxObjects) {
         var obj = this.__ownedQxObjects[id];
         if (obj !== undefined) {
           return obj;
         }
       }
-      
+
       // Separate out the child control ID
       var controlId = null;
-      var pos = id.indexOf('#');
+      var pos = id.indexOf("#");
       if (pos > -1) {
         controlId = id.substring(pos + 1);
         id = id.substring(0, pos);
       }
-      
+
       var result = undefined;
-      
+
       // Handle paths
-      if (id.indexOf('/') > -1) {
-        var segs = id.split('/');
+      if (id.indexOf("/") > -1) {
+        var segs = id.split("/");
         var target = this;
-        var found = segs.every(function(seg) {
+        var found = segs.every(function (seg) {
           if (!seg.length) {
             return true;
           }
@@ -157,70 +159,78 @@ qx.Mixin.define("qx.core.MObjectId", {
         if (found) {
           result = target;
         }
-        
       } else {
         // No object, creating the object
         result = this._createQxObject(id);
       }
-      
+
       if (result && controlId) {
         var childControl = result.getChildControl(controlId);
         return childControl;
       }
-      
+
       return result;
     },
-    
+
     /**
      * Creates the object and adds it to a list; most classes are expected to
      * override `_createQxObjectImpl` NOT this method.
-     * 
+     *
      * @param id {String} ID of the object
      * @return {qx.core.Object?} the created object
      */
-    _createQxObject: function(id) {
+    _createQxObject(id) {
       var result = this._createQxObjectImpl(id);
       if (result !== undefined) {
         this.addOwnedQxObject(result, id);
       }
       return result;
     },
-    
+
     /**
      * Creates the object, intended to be overridden. Null is a valid return
      * value and will be cached by `getQxObject`, however `undefined` is NOT a
      * valid value and so will not be cached meaning that `_createQxObjectImpl`
      * will be called multiple times until a valid value is returned.
-     * 
+     *
      * @param id {String} ID of the object
      * @return {qx.core.Object?} the created object
      */
-    _createQxObjectImpl: function(id) {
+    _createQxObjectImpl(id) {
       return undefined;
     },
-    
+
     /**
      * Adds an object as owned by this object
-     * 
+     *
      * @param obj {qx.core.Object} the object to register
      * @param id {String?} the id to set when registering the object
      */
-    addOwnedQxObject: function(obj, id) {
+    addOwnedQxObject(obj, id) {
       if (!this.__ownedQxObjects) {
         this.__ownedQxObjects = {};
       }
-      
+
       if (!(obj instanceof qx.core.Object)) {
         if (!id) {
-          throw new Error("Cannot register an object that has no ID, obj=" + obj);
+          throw new Error(
+            "Cannot register an object that has no ID, obj=" + obj
+          );
         }
         if (this.__ownedQxObjects[id]) {
-          throw new Error("Cannot register an object with ID '" + id + "' because that ID is already in use, this=" + this + ", obj=" + obj);
+          throw new Error(
+            "Cannot register an object with ID '" +
+              id +
+              "' because that ID is already in use, this=" +
+              this +
+              ", obj=" +
+              obj
+          );
         }
         this.__ownedQxObjects[id] = obj;
         return;
       }
-      
+
       var thatOwner = obj.getQxOwner();
       if (thatOwner === this) {
         return;
@@ -234,13 +244,29 @@ qx.Mixin.define("qx.core.MObjectId", {
           id = obj.getQxObjectId();
         }
         if (!id) {
-          throw new Error("Cannot register an object that has no ID, obj=" + obj);
+          throw new Error(
+            "Cannot register an object that has no ID, obj=" + obj
+          );
         }
         if (this.__ownedQxObjects[id]) {
-          throw new Error("Cannot register an object with ID '" + id + "' because that ID is already in use, this=" + this + ", obj=" + obj);
+          throw new Error(
+            "Cannot register an object with ID '" +
+              id +
+              "' because that ID is already in use, this=" +
+              this +
+              ", obj=" +
+              obj
+          );
         }
         if (obj.getQxOwner() != null) {
-          throw new Error("Cannot register an object with ID '" + id + "' because it is already owned by another object this=" + this + ", obj=" + obj);
+          throw new Error(
+            "Cannot register an object with ID '" +
+              id +
+              "' because it is already owned by another object this=" +
+              this +
+              ", obj=" +
+              obj
+          );
         }
         obj.setQxOwner(this);
         obj.setQxObjectId(id);
@@ -254,18 +280,23 @@ qx.Mixin.define("qx.core.MObjectId", {
     /**
      * Discards an object from the list of owned objects; note that this does
      * not dispose of the object, simply forgets it if it exists.
-     * 
+     *
      * @param args {String|Object} the ID of the object to discard, or the object itself
      */
-    removeOwnedQxObject: function(args) {
+    removeOwnedQxObject(args) {
       if (!this.__ownedQxObjects) {
-        throw new Error("Cannot discard object because it is not owned by this, this=" + this + ", object=" + obj);
+        throw new Error(
+          "Cannot discard object because it is not owned by this, this=" +
+            this +
+            ", object=" +
+            obj
+        );
       }
-      
+
       var id;
       var obj;
       if (typeof args === "string") {
-        if (args.indexOf('/') > -1) {
+        if (args.indexOf("/") > -1) {
           throw new Error("Cannot discard owned objects based on a path");
         }
         id = args;
@@ -276,11 +307,19 @@ qx.Mixin.define("qx.core.MObjectId", {
       } else {
         obj = args;
         if (!(obj instanceof qx.core.Object)) {
-          throw new Error("Cannot discard object by reference because it is not a Qooxdoo object, please remove it using the original ID; object=" + obj);
+          throw new Error(
+            "Cannot discard object by reference because it is not a Qooxdoo object, please remove it using the original ID; object=" +
+              obj
+          );
         }
         id = obj.getQxObjectId();
         if (this.__ownedQxObjects[id] !== obj) {
-          throw new Error("Cannot discard object because it is not owned by this, this=" + this + ", object=" + obj);
+          throw new Error(
+            "Cannot discard object because it is not owned by this, this=" +
+              this +
+              ", object=" +
+              obj
+          );
         }
       }
 
@@ -299,13 +338,13 @@ qx.Mixin.define("qx.core.MObjectId", {
         }
       }
     },
-    
+
     /**
      * Removes an owned object
-     * 
+     *
      * @param obj {qx.core.Object} the object
      */
-    __removeOwnedQxObjectImpl: function(obj) {
+    __removeOwnedQxObjectImpl(obj) {
       if (obj !== null) {
         var id = obj.getQxObjectId();
         obj.setQxOwner(null);
@@ -316,11 +355,11 @@ qx.Mixin.define("qx.core.MObjectId", {
     /**
      * Returns an array of objects that are owned by this object, or an empty
      * array if none exists.
-     * 
+     *
      * @return {Array}
-     */    
-    getOwnedQxObjects : function(){
+     */
+    getOwnedQxObjects() {
       return this.__ownedQxObjects ? Object.values(this.__ownedQxObjects) : [];
     }
   }
-});
+});

package/source/class/qx/core/MProperty.js

@@ -20,30 +20,25 @@
  * This mixin offers the basic property features which include generic
  * setter, getter and resetter.
  */
-qx.Mixin.define("qx.core.MProperty",
-{
-  members :
-  {
+qx.Mixin.define("qx.core.MProperty", {
+  members: {
     /**
      * Sets either multiple properties at once by using a property list or
      * sets one property and its value by the first and second argument.
      * As a fallback, if no generated property setter could be found, a
      * handwritten setter will be searched and invoked if available.
      *
-     * @param data {Map | String} a map of property values. The key is the name of the property.
+     * @param data {Object | String} a map of property values. The key is the name of the property.
      * @param value {var?} the value, only used when <code>data</code> is a string.
      * @return {Object} Returns this instance if <code>data</code> is a map
      *   or a non-generated setter is called; otherwise returns <code>value</code>.
      * @throws {Error} if a property defined does not exist
      */
-    set : function(data, value)
-    {
+    set(data, value) {
       var setter = qx.core.Property.$$method.set;
 
-      if (qx.Bootstrap.isString(data))
-      {
-        if (!this[setter[data]])
-        {
+      if (qx.Bootstrap.isString(data)) {
+        if (!this[setter[data]]) {
           if (this["set" + qx.Bootstrap.firstUp(data)] != undefined) {
             this["set" + qx.Bootstrap.firstUp(data)](value);
             return this;
@@ -53,13 +48,9 @@ qx.Mixin.define("qx.core.MProperty",
         }
 
         return this[setter[data]](value);
-      }
-      else
-      {
-        for (var prop in data)
-        {
-          if (!this[setter[prop]])
-          {
+      } else {
+        for (var prop in data) {
+          if (!this[setter[prop]]) {
             if (this["set" + qx.Bootstrap.firstUp(prop)] != undefined) {
               this["set" + qx.Bootstrap.firstUp(prop)](data[prop]);
               continue;
@@ -75,7 +66,6 @@ qx.Mixin.define("qx.core.MProperty",
       }
     },
 
-
     /**
      * Returns the value of the given property. If no generated getter could be
      * found, a fallback tries to access a handwritten getter.
@@ -84,12 +74,10 @@ qx.Mixin.define("qx.core.MProperty",
      * @return {var} The value of the value
      * @throws {Error} if a property defined does not exist
      */
-    get : function(prop)
-    {
+    get(prop) {
       var getter = qx.core.Property.$$method.get;
 
-      if (!this[getter[prop]])
-      {
+      if (!this[getter[prop]]) {
         if (this["get" + qx.Bootstrap.firstUp(prop)] != undefined) {
           return this["get" + qx.Bootstrap.firstUp(prop)]();
         }
@@ -97,11 +85,9 @@ qx.Mixin.define("qx.core.MProperty",
         throw new Error("No such property: " + prop);
       }
 
-
       return this[getter[prop]]();
     },
 
-
     /**
      * Resets the value of the given property. If no generated resetter could be
      * found, a handwritten resetter will be invoked, if available.
@@ -109,12 +95,10 @@ qx.Mixin.define("qx.core.MProperty",
      * @param prop {String} Name of the property.
      * @throws {Error} if a property defined does not exist
      */
-    reset : function(prop)
-    {
+    reset(prop) {
       var resetter = qx.core.Property.$$method.reset;
 
-      if (!this[resetter[prop]])
-      {
+      if (!this[resetter[prop]]) {
         if (this["reset" + qx.Bootstrap.firstUp(prop)] != undefined) {
           this["reset" + qx.Bootstrap.firstUp(prop)]();
           return;
@@ -123,7 +107,6 @@ qx.Mixin.define("qx.core.MProperty",
         throw new Error("No such property: " + prop);
       }
 
-
       this[resetter[prop]]();
     },
 
@@ -135,8 +118,7 @@ qx.Mixin.define("qx.core.MProperty",
      * @return {Boolean} If the property is initialized
      * @throws {Error} If the property defined does not exist
      */
-    isPropertyInitialized : function(prop)
-    {
+    isPropertyInitialized(prop) {
       if (qx.core.Environment.get("qx.debug")) {
         qx.core.Assert.assertString(prop);
 
@@ -145,8 +127,10 @@ qx.Mixin.define("qx.core.MProperty",
         }
       }
 
-      return this["$$user_" + prop] !== undefined ||
-        this["$$init_" + prop] !== undefined;
+      return (
+        this["$$user_" + prop] !== undefined ||
+        this["$$init_" + prop] !== undefined
+      );
     }
   }
 });