Changeset 500 for Dev/trunk/src/client/qed-client/widgets

Timestamp:

03/10/14 16:07:00 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Indicate of refresh is due to load or due to save in _ObjectPage.
• _ComplexValueMixin & ListWidget? catch all change events and drops them if still being created.

Location:

Dev/trunk/src/client/qed-client/widgets

Files:

• ListWidget.js (modified) (5 diffs)
• _ComplexValueMixin.js (modified) (4 diffs)

Dev/trunk/src/client/qed-client/widgets/ListWidget.js

@@ -14 +14 @@
         name: "",
         value: null,
+        disabled: false,
+        readOnly: false,
         multiple: true,
         type: "text",
@@ -20 +22 @@
          */
         container: Source,
+        _onChangeActive: false,
         buildRendering: function() {
             this.inherited(arguments);
@@ -50 +53 @@
             });
             this.source = new this.container(this.domNode,sourceParams);
-            this.own(this.source.on('Drop',lang.hitch(this,'_handleChange')));
+            this.own(this.source.on('Drop',
+                                    lang.hitch(this,'_handleDrop')));
+            this.own(on(this.domNode,'change',
+                        lang.hitch(this,'_handleChange')));
         },
         creator: function(item, hint) {
@@ -92 +98 @@
             return this.value;
         },
-        _setValueAttr: function(value) {
+        _setValueAttr: function(value,priorityChange) {
             this.clear();
             this.appendItems(value || []);
@@ -158 +164 @@
             this.inherited(arguments);
         },
-        _handleChange: function() {
-            this.value = this._getValueAttr();
-            this.onChange(this.value);
+        _handleChange: function(evt) {
+            if ( evt.target !== this.domNode ) {
+                if ( this._onChangeActive && !(this.readOnly || this.disabled) ) {
+                    this.emit('change',this.get('value'));
+                }
+                if ( evt ) { event.stop(evt); }
+                return false;
+            }
+            return true;
         },
-        onChange: function(value) {}
+        _handleDrop: function() {
+            if ( this._onChangeActive && !(this.readOnly || this.disabled) ) {
+                this.emit('change',this.get('value'));
+            }
+        }
     });
 });

Dev/trunk/src/client/qed-client/widgets/_ComplexValueMixin.js

@@ -11 +11 @@
     return declare([_Container, _FormMixin], {
         name: "",
+        value: null,
         disabled: false,
         readOnly: false,
-        _changeActive: false,
+        _onChangeActive: false,
+        constructor: function() {
+            this._listenerMap = {};
+        },
+        buildRendering: function() {
+            // capture child change events
+            this.inherited(arguments);
+            this.own(on(this.domNode,'change',
+                        lang.hitch(this,'_handleChange')));
+        },
+        create: function() {
+            this.inherited(arguments);
+            this._onChangeActive = true;
+        },
         postCreate: function() {
             this.inherited(arguments);
@@ -24 +38 @@
             if (this._started) { return; }
             this.inherited(arguments);
-            this._connectChildren();
-            this._changeActive = true;
-        },
-        _connectChildren: function() {
-            var children = this._getDescendantFormWidgets();
-            array.forEach(children, lang.hitch(this,function(child) {
-                this.own(child.on('change',lang.hitch(this,'_handleChange')));
-            }));
         },
         _setDisabledAttr: function(value) {
@@ -41 +47 @@
         // Yuk, this function is taken directly from _FromMixin only
         // to add the priorityChange parameter
+        _getValueAttr: function() {
+            this.value = this.inherited(arguments);
+            return this.value;
+        },
                 _setValueAttr: function(obj, priorityChange) {
+            this.value = obj;
+
                         var map = { };
                         array.forEach(this._getDescendantFormWidgets(), function(widget){
@@ -84 +96 @@
             }
         },
-        _handleChange: function() {
-            if ( this._changeActive ) {
-                this.onChange(this.get('value'));
+        _handleChange: function(evt) {
+            if ( evt.target !== this.domNode ) {
+                if ( this._onChangeActive && !(this.readOnly || this.disabled) ) {
+                    this.emit('change',this.get('value'));
+                }
+                if ( evt ) { event.stop(evt); }
+                return false;
             }
+            return true;
         },
-        onChange: function(){},
         _handleSubmit: function(evt) {
             var node = this.domNode;