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

Timestamp:

03/11/14 22:45:58 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Added subcodes to schema and config widgets.
• Disallow empty strings in schema and strip objects before sending them to the server.
• Finally managed proper change events in lists and complexvalues.

Location:

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

Files:

• ListWidget.js (modified) (3 diffs)
• _ComplexValueMixin.js (modified) (2 diffs)

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

@@ -25 +25 @@
         _restoreParams: null,
         _onChangeActive: false,
+        _onChangeHandle: null,
         buildRendering: function() {
             this.inherited(arguments);
@@ -86 +87 @@
                 }
             }
-            //this.own(on(nodeOrWidget,'change',lang.hitch(this,'_handleChange')));
             var node = nodeOrWidget.domNode ? nodeOrWidget.domNode : nodeOrWidget;
             if ( hint !== "avatar" && node.id !== id ) {
@@ -190 +190 @@
         _handleChange: function(evt) {
             if ( evt.target !== this.domNode ) {
-                if ( this._onChangeActive && !(this.readOnly || this.disabled) ) {
-                    this.emit('change',this.get('value'));
-                }
+                this._onChange();
                 if ( evt ) { event.stop(evt); }
                 return false;
-            }
-            return true;
-        },
-        _handleDrop: function() {
-            if ( this._onChangeActive && !(this.readOnly || this.disabled) ) {
-                this.emit('change',this.get('value'));
+            } else {
+                return evt;
+            }
+        },
+        _handleDrop: function(evt) {
+            this._onChange();
+        },
+        _onChange: function(){
+            if ( this._onChangeActive &&
+                 !(this.readOnly || this.disabled) ) {
+                if ( this._onChangeHandle ) {
+                    this._onChangeHandle.cancel();
+                }
+                this._onChangeHandle = this.defer(function(){
+                    this._onChangeHandle = null;
+                    on.emit(this.domNode,'change',{
+                        target: this.domNode,
+                        value: this.get('value'),
+                        bubbles: true,
+                        cancellable: true
+                    });
+                });
             }
         }

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

@@ -15 +15 @@
         readOnly: false,
         _onChangeActive: false,
+        _onChangeHandle: null,
         constructor: function() {
             this._listenerMap = {};
@@ -98 +99 @@
         _handleChange: function(evt) {
             if ( evt.target !== this.domNode ) {
-                if ( this._onChangeActive && !(this.readOnly || this.disabled) ) {
-                    this.emit('change',this.get('value'));
+                if ( this._onChangeActive &&
+                     !(this.readOnly || this.disabled) ) {
+                    if ( this._onChangeHandle ) {
+                        this._onChangeHandle.cancel();
+                    }
+                    this._onChangeHandle = this.defer(function(){
+                        this._onChangeHandle = null;
+                        on.emit(this.domNode,'change',{
+                            target: this.domNode,
+                            value: this.get('value'),
+                            bubbles: true,
+                            cancellable: true
+                        });
+                    });
                 }
                 if ( evt ) { event.stop(evt); }
                 return false;
+            } else {
+                return evt;
             }
-            return true;
         },
         _handleSubmit: function(evt) {