Changeset 503 for Dev

Timestamp:

03/11/14 01:00:40 (11 years ago)

Author:

hendrikvanantwerpen

Message:

Don't delete elements from certain lists if they are disabled
or readOnly. Didn't include this in ListWidget?.removeItem, since
programmatically things should keep working even when disabled, I would
say. So this needs to be done in the place of the event.

Location:

Dev/trunk/src/client/qed-client

Files:

• model/widgets/QuestionEditorPreviewItem.js (modified) (2 diffs)
• model/widgets/QuestionListView.js (modified) (2 diffs)
• pages/question.js (modified) (1 diff)
• pages/response.js (modified) (2 diffs)
• pages/survey.js (modified) (1 diff)

Dev/trunk/src/client/qed-client/model/widgets/QuestionEditorPreviewItem.js

@@ -33 +33 @@
                         lang.hitch(this, 'onToggleFold')));
             this.own(this.removeButton.on('click',
-                        lang.hitch(this, 'onDestroy')));
+                        lang.hitch(this, '_handleDestroy')));
             this.own(this.editButton.on('click',
                         lang.hitch(this, 'onToggleEdit')));
             this.showEdit();
         },
-        onDestroy: function() {},
+        _handleDestroy: function(evt) {
+            if ( !( this.disabled || this.readOnly ) ) {
+                this.emit('destroy');
+            }
+            if ( evt ) { event.stop(evt); }
+            return false;
+        },
         _getValueAttr: function(value) {
             if ( this._editing ) {
@@ -102 +108 @@
                 this.innerWidget = newWidget;
                 this.addChild(this.innerWidget);
+                this.innerWidget.set('readOnly',this.readOnly);
+                this.innerWidget.set('disabled',this.disabled);
                 this.titleNode.innerHTML = this.value.type+" [editing]";
                 domClass.replace(this.editButton.iconNode, "rftIconAccept", "rftIconEdit");

Dev/trunk/src/client/qed-client/model/widgets/QuestionListView.js

@@ -23 +23 @@
                 actions: {
                     "Remove" : {
-                        callback: lang.hitch(this, 'removeItem', id, true),
+                        callback: lang.hitch(this, '_handleRemove', id),
                         properties: {
                             blockButton: false,
@@ -44 +44 @@
             w.startup();
             return w;
+        },
+        _handleRemove: function(id) {
+            if ( !( this.readOnly || this.disabled ) ) {
+                this.removeItem(id,true);
+            }
         }
     });

Dev/trunk/src/client/qed-client/pages/question.js

@@ -30 +30 @@
             if ( this.object.publicationDate ) {
                 this.QuestionEditorToolkit.set('readOnly',true);
-                this.QuestionEditorToolkit.set('disabled',true);
                 this.contentList.set('readOnly',true);
-                this.contentList.set('disabled',true);
             }
         },

Dev/trunk/src/client/qed-client/pages/response.js

@@ -43 +43 @@
                              this.response._surveyRun.respondentCanDeleteOwnResponse);
             this.cancelButton.set('disabled',canDelete||false);
-            this.surveyWidget.set('disabled', false);
+            this.surveyWidget.set('readOnly', false);
         },
         _disableSubmit: function() {
@@ -49 +49 @@
             this.continueButton.set('disabled',true);
             this.cancelButton.set('disabled',true);
-            this.surveyWidget.set('disabled', true);
+            this.surveyWidget.set('readOnly', true);
         },
         _showInfo: function(html) {

Dev/trunk/src/client/qed-client/pages/survey.js

@@ -70 +70 @@
             if ( this.object.publicationDate ) {
                 this.propertiesForm.set('readOnly',true);
-                this.propertiesForm.set('disabled',true);
                 this.questionList.set('readOnly',true);
-                this.questionList.set('disabled',true);
             }
         },