@qooxdoo/framework 7.0.0-beta.5 → 7.0.0-beta.9

package/source/class/qx/data/__init__.js

@@ -1,3 +1,3 @@
 /**
  * Data binding classes.
- */
+ */

package/source/class/qx/data/controller/CheckedList.js

@@ -29,22 +29,22 @@
  */
 qx.Class.define("qx.data.controller.CheckedList", {
   extend: qx.data.controller.List,
-  
+
   /**
    * Constructor
    *
    * @param model {qx.data.Array?null} the model array
    * @param widget {qx.ui.core.Widget?null} the widget target
-   * @param path {String} the path in the model for the caption  
+   * @param path {String} the path in the model for the caption
    */
   construct(model, widget, path) {
-    this.base(arguments, null, widget, path);
+    super(null, widget, path);
     this.setChecked(new qx.data.Array());
     if (model) {
       this.setModel(model);
     }
   },
-  
+
   properties: {
     checked: {
       init: null,
@@ -53,11 +53,11 @@ qx.Class.define("qx.data.controller.CheckedList", {
       event: "changeChecked",
       apply: "_applyChecked"
     },
-    
+
     /**
      * The path to the property which holds the information that should be
-     * shown as a label for a tag for a checked item. This is only needed if 
-     * used with a CheckedSelectBox, and only if live updates of the label 
+     * shown as a label for a tag for a checked item. This is only needed if
+     * used with a CheckedSelectBox, and only if live updates of the label
      * are required.
      */
     checkedLabelPath: {
@@ -66,11 +66,10 @@ qx.Class.define("qx.data.controller.CheckedList", {
       nullable: true
     },
 
-
     /**
      * The path to the property which holds the information that should be
-     * shown as an icon for a tag for a checked item. This is only needed if 
-     * used with a CheckedSelectBox, and only if live updates of the label 
+     * shown as an icon for a tag for a checked item. This is only needed if
+     * used with a CheckedSelectBox, and only if live updates of the label
      * are required.
      */
     checkedIconPath: {
@@ -79,7 +78,6 @@ qx.Class.define("qx.data.controller.CheckedList", {
       nullable: true
     },
 
-
     /**
      * A map containing the options for the checkedLabel binding. The possible keys
      * can be found in the {@link qx.data.SingleValueBinding} documentation.
@@ -89,7 +87,6 @@ qx.Class.define("qx.data.controller.CheckedList", {
       nullable: true
     },
 
-
     /**
      * A map containing the options for the checked icon binding. The possible keys
      * can be found in the {@link qx.data.SingleValueBinding} documentation.
@@ -99,7 +96,7 @@ qx.Class.define("qx.data.controller.CheckedList", {
       nullable: true
     }
   },
-  
+
   members: {
     _applyChecked(value, oldValue) {
       if (oldValue) {
@@ -110,14 +107,14 @@ qx.Class.define("qx.data.controller.CheckedList", {
       }
       this._updateChecked();
     },
-    
+
     /**
      * @Override
-     */  
+     */
     _createItem() {
       var delegate = this.getDelegate();
       var item;
-      
+
       // check if a delegate and a create method is set
       if (delegate != null && delegate.createItem != null) {
         item = delegate.createItem();
@@ -129,10 +126,10 @@ qx.Class.define("qx.data.controller.CheckedList", {
       if (delegate != null && delegate.configureItem != null) {
         delegate.configureItem(item);
       }
-      
+
       return item;
     },
-      
+
     /**
      * Event handler for changes to the checked array
      *
@@ -148,35 +145,35 @@ qx.Class.define("qx.data.controller.CheckedList", {
 
     /**
      * @Override
-     */  
+     */
     update() {
-      this.base(arguments);
+      super.update();
       this._updateChecked();
     },
-    
+
     /**
      * @Override
-     */  
+     */
     _setFilter(value, old) {
-      this.base(arguments, value, old);
+      super._setFilter(value, old);
       this.__syncModelChecked = true;
       qx.ui.core.queue.Widget.add(this);
     },
-    
+
     /**
      * @Override
-     */  
+     */
     syncWidget() {
-      this.base(arguments);
+      super.syncWidget();
       if (this.__syncModelChecked) {
         this._updateChecked();
       }
       this.__syncModelChecked = null;
     },
-    
+
     /**
      * @Override
-     */  
+     */
     _applyModel(value, oldValue) {
       if (!value || !value.getLength()) {
         let checked = this.getChecked();
@@ -184,31 +181,54 @@ qx.Class.define("qx.data.controller.CheckedList", {
           checked.removeAll();
         }
       }
-      this.base(arguments, value, oldValue);
+      super._applyModel(value, oldValue);
       this._updateChecked();
     },
-    
+
     /**
      * @Override
-     */  
+     */
     _applyTarget(value, oldValue) {
-      this.base(arguments, value, oldValue);
+      super._applyTarget(value, oldValue);
       if (oldValue) {
-        oldValue.removeListener("changeChecked", this.__onTargetCheckedChange, this);
+        oldValue.removeListener(
+          "changeChecked",
+          this.__onTargetCheckedChange,
+          this
+        );
+
         if (qx.Class.supportsEvent(oldValue.constructor, "attachResultsTag")) {
-          oldValue.removeListener("attachResultsTag", this.__onTargetAttachResultsTag, this);
-          oldValue.removeListener("detachResultsTag", this.__onTargetDetachResultsTag, this);
+          oldValue.removeListener(
+            "attachResultsTag",
+            this.__onTargetAttachResultsTag,
+            this
+          );
+
+          oldValue.removeListener(
+            "detachResultsTag",
+            this.__onTargetDetachResultsTag,
+            this
+          );
         }
       }
       if (value) {
         value.addListener("changeChecked", this.__onTargetCheckedChange, this);
         if (qx.Class.supportsEvent(value.constructor, "attachResultsTag")) {
-          value.addListener("attachResultsTag", this.__onTargetAttachResultsTag, this);
-          value.addListener("detachResultsTag", this.__onTargetDetachResultsTag, this);
+          value.addListener(
+            "attachResultsTag",
+            this.__onTargetAttachResultsTag,
+            this
+          );
+
+          value.addListener(
+            "detachResultsTag",
+            this.__onTargetDetachResultsTag,
+            this
+          );
         }
       }
     },
-    
+
     /**
      * Event handler for changes in the target widget's `checked` property
      */
@@ -229,7 +249,7 @@ qx.Class.define("qx.data.controller.CheckedList", {
         checked.replace(replacement);
       }
     },
-    
+
     /**
      * Event handler for changes in the target widget's `attachResults` property
      */
@@ -238,7 +258,7 @@ qx.Class.define("qx.data.controller.CheckedList", {
       item.setUserData(this.classname + ".tagWidget", tagWidget);
       this.__attachTag(tagWidget, item);
     },
-    
+
     /**
      * Event handler for changes in the target widget's `detachResults` property
      */
@@ -247,7 +267,7 @@ qx.Class.define("qx.data.controller.CheckedList", {
       this.__detachTag(tagWidget, item);
       item.setUserData(this.classname + ".tagWidget", null);
     },
-    
+
     /**
      * Updates all tags in the target widget
      */
@@ -262,7 +282,7 @@ qx.Class.define("qx.data.controller.CheckedList", {
         this.__attachTag(tagWidget, item);
       });
     },
-    
+
     /**
      * Attaches a single tag; used to bind to the tag so that live updates to the underlying model are reflected in tag names
      *
@@ -271,16 +291,26 @@ qx.Class.define("qx.data.controller.CheckedList", {
      */
     __attachTag(tagWidget, item) {
       let itemModel = item.getModel();
-      let bindData = { };
+      let bindData = {};
       if (this.getCheckedLabelPath()) {
-        bindData.checkedLabelId = itemModel.bind(this.getCheckedLabelPath(), tagWidget, "label", this.getCheckedLabelOptions());
+        bindData.checkedLabelId = itemModel.bind(
+          this.getCheckedLabelPath(),
+          tagWidget,
+          "label",
+          this.getCheckedLabelOptions()
+        );
       }
       if (this.getCheckedIconPath()) {
-        bindData.checkedIconId = itemModel.bind(this.getCheckedIconPath(), tagWidget, "label", this.getCheckedIconOptions());
+        bindData.checkedIconId = itemModel.bind(
+          this.getCheckedIconPath(),
+          tagWidget,
+          "label",
+          this.getCheckedIconOptions()
+        );
       }
       itemModel.setUserData(this.classname + ".bindData", bindData);
     },
-    
+
     /**
      * Detaches a single tag, inverse of `__attachTag`
      *
@@ -300,7 +330,7 @@ qx.Class.define("qx.data.controller.CheckedList", {
         itemModel.setUserData(this.classname + ".bindData", null);
       }
     },
-      
+
     /**
      * Updates the checked widget items to match the array of checked model items
      */
@@ -309,16 +339,16 @@ qx.Class.define("qx.data.controller.CheckedList", {
       if (!target) {
         return;
       }
-      
+
       if (this.__inUpdateChecked) {
         return;
       }
       this.__inUpdateChecked = true;
       try {
-        // Maps of the widget item, indexed by the hashcode of the model item      
+        // Maps of the widget item, indexed by the hashcode of the model item
         let children = {};
         let toUncheck = {};
-        
+
         target.getChildren().forEach(item => {
           let itemModel = item.getModel();
           if (itemModel) {
@@ -329,7 +359,7 @@ qx.Class.define("qx.data.controller.CheckedList", {
             }
           }
         });
-        
+
         let toRemove = [];
         let checked = this.getChecked();
         if (checked) {
@@ -351,7 +381,5 @@ qx.Class.define("qx.data.controller.CheckedList", {
         this.__inUpdateChecked = false;
       }
     }
-    
-    
-  }  
+  }
 });

package/source/class/qx/data/controller/Form.js

@@ -42,11 +42,10 @@
  * * If you want to bind a list like widget, use {@link qx.data.controller.List}
  * * If you want to bind a tree widget, use {@link qx.data.controller.Tree}
  */
-qx.Class.define("qx.data.controller.Form",
-{
-  extend : qx.core.Object,
-  implement: [ qx.core.IDisposable ],
-  
+qx.Class.define("qx.data.controller.Form", {
+  extend: qx.core.Object,
+  implement: [qx.core.IDisposable],
+
   /**
    * @param model {qx.core.Object | null} The model to bind the target to. The
    *   given object will be set as {@link #model} property.
@@ -57,9 +56,8 @@ qx.Class.define("qx.data.controller.Form",
    *   Otherwise, the data will be synced automatically on every change of
    *   the form.
    */
-  construct : function(model, target, selfUpdate)
-  {
-    this.base(arguments);
+  construct(model, target, selfUpdate) {
+    super();
 
     this._selfUpdate = !!selfUpdate;
     this.__bindingOptions = {};
@@ -73,12 +71,9 @@ qx.Class.define("qx.data.controller.Form",
     }
   },
 
-
-  properties :
-  {
+  properties: {
     /** Data object containing the data which should be shown in the target. */
-    model :
-    {
+    model: {
       check: "qx.core.Object",
       apply: "_applyModel",
       event: "changeModel",
@@ -86,10 +81,8 @@ qx.Class.define("qx.data.controller.Form",
       dereference: true
     },
 
-
     /** The target widget which should show the data. */
-    target :
-    {
+    target: {
       check: "qx.ui.form.Form",
       apply: "_applyTarget",
       event: "changeTarget",
@@ -99,12 +92,9 @@ qx.Class.define("qx.data.controller.Form",
     }
   },
 
-
-  members :
-  {
-    __objectController : null,
-    __bindingOptions : null,
-
+  members: {
+    __objectController: null,
+    __bindingOptions: null,
 
     /**
      * The form controller uses for setting up the bindings the fundamental
@@ -121,8 +111,7 @@ qx.Class.define("qx.data.controller.Form",
      *   to model. The possible options can be found in the
      *   {@link qx.data.SingleValueBinding} class.
      */
-    addBindingOptions : function(name, model2target, target2model)
-    {
+    addBindingOptions(name, model2target, target2model) {
       this.__bindingOptions[name] = [model2target, target2model];
 
       // return if not both, model and target are given
@@ -132,18 +121,23 @@ qx.Class.define("qx.data.controller.Form",
 
       // renew the affected binding
       var item = this.getTarget().getItems()[name];
-      var targetProperty =
-        this.__isModelSelectable(item) ? "modelSelection[0]" : "value";
+      var targetProperty = this.__isModelSelectable(item)
+        ? "modelSelection[0]"
+        : "value";
 
       // remove the binding
       this.__objectController.removeTarget(item, targetProperty, name);
       // set up the new binding with the options
       this.__objectController.addTarget(
-        item, targetProperty, name, !this._selfUpdate, model2target, target2model
+        item,
+        targetProperty,
+        name,
+        !this._selfUpdate,
+        model2target,
+        target2model
       );
     },
 
-
     /**
      * Creates and sets a model using the {@link qx.data.marshal.Json} object.
      * Remember that this method can only work if the form is set. The created
@@ -154,7 +148,7 @@ qx.Class.define("qx.data.controller.Form",
      *   the bubbling of change events or not.
      * @return {qx.core.Object} The created model.
      */
-    createModel : function(includeBubbleEvents) {
+    createModel(includeBubbleEvents) {
       var target = this.getTarget();
 
       // throw an error if no target is set
@@ -201,7 +195,6 @@ qx.Class.define("qx.data.controller.Form",
       return model;
     },
 
-
     /**
      * Responsible for syncing the data from entered in the form to the model.
      * Please keep in mind that this method only works if you create the form
@@ -209,7 +202,7 @@ qx.Class.define("qx.data.controller.Form",
      * this method will do nothing because updates will be synced automatically
      * on every change.
      */
-    updateModel: function(){
+    updateModel() {
       // only do stuff if self update is enabled and a model or target is set
       if (!this._selfUpdate || !this.getModel() || !this.getTarget()) {
         return;
@@ -218,21 +211,25 @@ qx.Class.define("qx.data.controller.Form",
       var items = this.getTarget().getItems();
       for (var name in items) {
         var item = items[name];
-        var sourceProperty =
-          this.__isModelSelectable(item) ? "modelSelection[0]" : "value";
+        var sourceProperty = this.__isModelSelectable(item)
+          ? "modelSelection[0]"
+          : "value";
 
         var options = this.__bindingOptions[name];
         options = options && this.__bindingOptions[name][1];
 
         qx.data.SingleValueBinding.updateTarget(
-          item, sourceProperty, this.getModel(), name, options
+          item,
+          sourceProperty,
+          this.getModel(),
+          name,
+          options
         );
       }
     },
 
-
     // apply method
-    _applyTarget : function(value, old) {
+    _applyTarget(value, old) {
       // if an old target is given, remove the binding
       if (old != null) {
         this.__tearDownBinding(old);
@@ -249,10 +246,8 @@ qx.Class.define("qx.data.controller.Form",
       }
     },
 
-
     // apply method
-    _applyModel : function(value, old) {
-
+    _applyModel(value, old) {
       // set the model to null to reset all items before removing them
       if (this.__objectController != null && value == null) {
         this.__objectController.setModel(null);
@@ -263,8 +258,9 @@ qx.Class.define("qx.data.controller.Form",
         var items = this.getTarget().getItems();
         for (var name in items) {
           var item = items[name];
-          var targetProperty =
-            this.__isModelSelectable(item) ? "modelSelection[0]" : "value";
+          var targetProperty = this.__isModelSelectable(item)
+            ? "modelSelection[0]"
+            : "value";
           this.__objectController.removeTarget(item, targetProperty, name);
         }
       }
@@ -277,8 +273,7 @@ qx.Class.define("qx.data.controller.Form",
       // do nothing is no target is set
       if (this.getTarget() == null) {
         return;
-      }
-      else {
+      } else {
         // if form was validated with errors and model changes
         // the errors should be cleared see #8977
         this.getTarget().getValidationManager().reset();
@@ -290,16 +285,17 @@ qx.Class.define("qx.data.controller.Form",
       }
     },
 
-
     /**
      * Internal helper for setting up the bindings using
      * {@link qx.data.controller.Object#addTarget}. All bindings are set
      * up bidirectional.
      */
-    __setUpBinding : function() {
+    __setUpBinding() {
       // create the object controller
       if (this.__objectController == null) {
-        this.__objectController = new qx.data.controller.Object(this.getModel());
+        this.__objectController = new qx.data.controller.Object(
+          this.getModel()
+        );
       }
 
       // get the form items
@@ -308,23 +304,41 @@ qx.Class.define("qx.data.controller.Form",
       // connect all items
       for (var name in items) {
         var item = items[name];
-        var targetProperty =
-          this.__isModelSelectable(item) ? "modelSelection[0]" : "value";
+        var targetProperty = this.__isModelSelectable(item)
+          ? "modelSelection[0]"
+          : "value";
         var options = this.__bindingOptions[name];
 
         // try to bind all given items in the form
         try {
           if (options == null) {
-            this.__objectController.addTarget(item, targetProperty, name, !this._selfUpdate);
+            this.__objectController.addTarget(
+              item,
+              targetProperty,
+              name,
+              !this._selfUpdate
+            );
           } else {
             this.__objectController.addTarget(
-              item, targetProperty, name, !this._selfUpdate, options[0], options[1]
+              item,
+              targetProperty,
+              name,
+              !this._selfUpdate,
+              options[0],
+              options[1]
             );
           }
-        // ignore not working items
+          // ignore not working items
         } catch (ex) {
           if (qx.core.Environment.get("qx.debug")) {
-            this.warn("Could not bind property " + name + " of " + this.getModel() + ":\n" + ex.stack);
+            this.warn(
+              "Could not bind property " +
+                name +
+                " of " +
+                this.getModel() +
+                ":\n" +
+                ex.stack
+            );
           }
         }
       }
@@ -332,14 +346,13 @@ qx.Class.define("qx.data.controller.Form",
       this.getTarget().redefineResetter();
     },
 
-
     /**
      * Internal helper for removing all set up bindings using
      * {@link qx.data.controller.Object#removeTarget}.
      *
      * @param oldTarget {qx.ui.form.Form} The form which has been removed.
      */
-    __tearDownBinding : function(oldTarget) {
+    __tearDownBinding(oldTarget) {
       // do nothing if the object controller has not been created
       if (this.__objectController == null) {
         return;
@@ -351,13 +364,13 @@ qx.Class.define("qx.data.controller.Form",
       // disconnect all items
       for (var name in items) {
         var item = items[name];
-        var targetProperty =
-          this.__isModelSelectable(item) ? "modelSelection[0]" : "value";
+        var targetProperty = this.__isModelSelectable(item)
+          ? "modelSelection[0]"
+          : "value";
         this.__objectController.removeTarget(item, targetProperty, name);
       }
     },
 
-
     /**
      * Returns whether the given item implements
      * {@link qx.ui.core.ISingleSelection} and
@@ -367,25 +380,24 @@ qx.Class.define("qx.data.controller.Form",
      *
      * @return {Boolean} true, if given item fits.
      */
-    __isModelSelectable : function(item) {
-      return qx.Class.hasInterface(item.constructor, qx.ui.core.ISingleSelection) &&
-      qx.Class.hasInterface(item.constructor, qx.ui.form.IModelSelection);
+    __isModelSelectable(item) {
+      return (
+        qx.Class.hasInterface(item.constructor, qx.ui.core.ISingleSelection) &&
+        qx.Class.hasInterface(item.constructor, qx.ui.form.IModelSelection)
+      );
     }
-
   },
 
-
-
   /*
    *****************************************************************************
       DESTRUCTOR
    *****************************************************************************
    */
 
-   destruct : function() {
-     // dispose the object controller because the bindings need to be removed
-     if (this.__objectController) {
-       this.__objectController.dispose();
-     }
-   }
+  destruct() {
+    // dispose the object controller because the bindings need to be removed
+    if (this.__objectController) {
+      this.__objectController.dispose();
+    }
+  }
 });