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

Timestamp:

03/13/14 00:44:08 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Added open item options to singe and multiple choice.
• Question view widgets are forms again, because we needed the control.
• Multiple and singel choice share their widgets.
• QuestionEditorPreview? now has items that were already there close, but opens newly dropped items.
• PreviewItems? will save modified value even when we change to view before the widget loses its focus (which causes a change event).

Location:

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

Files:

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

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

@@ -26 +26 @@
         _onChangeActive: false,
         _onChangeHandle: null,
+        _fromDrop: true,
         buildRendering: function() {
             this.inherited(arguments);
@@ -52 +53 @@
             lang.mixin(sourceParams, {
                 accept: [this.type],
-                creator: lang.hitch(this, "creator"),
+                creator: lang.hitch(this,"creator"),
                 dropParent: this.containerNode
             });
@@ -82 +83 @@
             } else {
                 if ( this.createListElement ) {
-                    nodeOrWidget = this.createListElement(id,item);
+                    nodeOrWidget = this.createListElement(id,item,this._fromDrop);
                 } else {
                     return this.source.defaultCreator(item, hint);
@@ -98 +99 @@
         },
         createAvatar: null, /*function(id,item){},*/
-        createListElement: null, /* function(id,item){},*/
+        createListElement: null, /* function(id,item,fromDrop){},*/
         _getValueAttr: function() {
             this.value = array.map(this.source.getAllNodes(),function(node){
@@ -145 +146 @@
         },
         appendItems: function(items,forceEvent) {
+            this._fromDrop = false;
             this.source.insertNodes(false,items);
             if ( forceEvent ) { this._handleDrop(); }
+            this._fromDrop = true;
         },
         appendItem: function(item,forceEvent) {
+            this._fromDrop = false;
             this.source.insertNodes(false,[item]);
             if ( forceEvent ) { this._handleDrop(); }
+            this._fromDrop = true;
         },
         removeItem: function(key,forceEvent) {
@@ -200 +205 @@
             this._onChange();
         },
-        _onChange: function(){
+        _onChange: function() {
             if ( this._onChangeActive &&
                  !(this.readOnly || this.disabled) ) {

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

@@ -92 +92 @@
         },
         focus: function() {
-            var children = this._getDescendantFormWidgets();
+            /*var children = this._getDescendantFormWidgets();
             if ( children.length > 0 ) {
                 children[0].focus();
-            }
+            }*/
         },
         _handleChange: function(evt) {
             if ( evt.target !== this.domNode ) {
-                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
-                        });
-                    });
-                }
+                this._onChange();
                 if ( evt ) { event.stop(evt); }
                 return false;
@@ -133 +119 @@
             if (evt) { event.stop(evt); }
             return false;
+        },
+        _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
+                    });
+                });
+            }
         }
     });