Changeset 387 for Dev/branches/rest-dojo-ui/client/rft/ui/QuestionEditorPreview.js

Timestamp:

07/30/12 00:19:37 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• Small fix for styling of LargeButtons? in TitleGroup?.
• Renamed InnerWidgetFactory? to ContentWidgetFactory?.
• In ContentWidgetFactory?:
  • use local variables for widget constructors.
  • require widget dependencies properly, remove global references.
• A bit of cleanup and removal of redundant default values for the question toolkit/preview.
• Tab -> spaces replacement.

File:

• Dev/branches/rest-dojo-ui/client/rft/ui/QuestionEditorPreview.js (modified) (1 diff)

Dev/branches/rest-dojo-ui/client/rft/ui/QuestionEditorPreview.js

@@ -1 +1 @@
 define([
-        'dojo/_base/declare',
-        'dojo/_base/lang',
-        'dojo/_base/array',
-        'dijit/_WidgetBase',
-        'dijit/_Container',
-        'dojo/dom-construct',
-        'rft/ui/QuestionEditorPreviewItem',
-        'dijit/_TemplatedMixin',
-        'dijit/_WidgetsInTemplateMixin',
-        'dojo/text!./templates/QuestionEditorPreview.html'
-        ], function(declare, lang, baseArray, _WidgetBase, _Container, domConstruct, QuestionEditorPreviewItem, _TemplatedMixin, _WidgetsInTemplateMixin, template) {
-                return declare("rft.ui.QuestionEditorPreview", [_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, _Container], {
+    'dojo/_base/declare',
+    'dojo/_base/lang',
+    'dojo/dnd/Source',
+    'dojo/dom-construct',
+    'dijit/_Container',
+    'dijit/_TemplatedMixin',
+    'dijit/_WidgetBase',
+    'dijit/_WidgetsInTemplateMixin',
+    'rft/ui/QuestionEditorPreviewItem',
+    'dojo/text!./templates/QuestionEditorPreview.html'
+    ], function(declare, lang, Source, domConstruct, _Container, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, QuestionEditorPreviewItem, template) {
+        return declare("rft.ui.QuestionEditorPreview", [_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, _Container], {
 
-                        templateString: template,
-                        dndSource: null,
+            templateString: template,
+            dndSource: null,
 
-                        postCreate: function(){
-                                this.dndSource = new dojo.dnd.Source(this.dndSourceNode, {
-                                        isSource: true,
-                                        //accept: ["ToolkitItem", "PreviewItem"],
-                                        horizontal: false,
-                                        withHandles: false,
-                                        copyOnly: false,
-                                        selfCopy: false,
-                                        selfAccept: true,
-                                        delay: 0,
-                                        skipForm: true,
-                                        creator: lang.hitch(this, this._sourceCreatorMethod)
-                                });
-                                this.dndSource.startup();
-                        },
-                        _sourceCreatorMethod: function(item, hint){
-                                var node;
-                                switch(hint){
-                                        
-                                        case "avatar":
-                                        node = document.createElement("span");
-                                        node.innerHTML = item.item.data || "Dragging!!!";
-                                        return {node: node, data: item, type: "PreviewItem"};
-                                        break;
-                                        
-                                        default:
-                                        var previewItem = new rft.ui.QuestionEditorPreviewItem({
-                                                item: item
-                                        });
-                                        return {node: previewItem.domNode, data: previewItem, type: item.type};
-                                        break;                                  
-                                }                               
-                        },
-                        _createInnerWidget: function(item) {
-                                var innerWidget;
-                                switch (item.widgetType) {
-                                        default:
-                                        innerWidget = new dijit.form.Button({});
-                                        break;
-                                }
+            postCreate: function(){
+                this.inherited(arguments);
+                this.dndSource = new Source(this.dndSourceNode, {
+                    accept: ["questionContent"],
+                    skipForm: true,
+                    creator: lang.hitch(this, this._sourceCreatorMethod)
+                });
+                this.dndSource.startup();
+            },
+            _sourceCreatorMethod: function(item, hint){
+                var node;
+                switch(hint){
+                case "avatar":
+                    node = domConstruct.create("span",{
+                        innerHTML: item.type || "Dragging!!!"
+                    });
+                default:
+                    var previewItem = new QuestionEditorPreviewItem({
+                        item: item.content
+                    });
+                    node = previewItem.domNode;
+                }                
+                return {node: node, data: item, type: ["questionContent"]};
+            },
+            insertObjects: function(/*Array*/items) {
+                this.dndSource.insertNodes(false, items);
+            },
+            getContent: function() {
+                var content = [];
+                var nodes = this.dndSource.getAllNodes();
+                for (var i = 0; i < nodes.length; i++) {
+                    content.push(this.dndSource.getItem(nodes[i].id).data.getContent());
+                }
+                return content;
+            },
+            getNodeList: function() {
+                return this.dndSource.getAllNodes();
+            },
+            onDropInternal: function() {
+                topic.publish("/QuestionEditor/Preview/MoveItem");
+            },
+            onDropExternal: function() {
+                // This is fired when something from the Toolkit is dropped into the Preview -- add operation.
+                topic.publish("/QuestionEditor/Preview/AddItem");
+            }
 
-                                return innerWidget;
-                        },
-                        insertObjects: function(/*Array*/objects) {
-                                // This takes an array of objects {data:{//props}, type:[//types]}. Node is NOT included!
-                                objects.forEach(function(item){
-                                        this.dndSource.insertNodes(false, [item]);
-                                }, this);
-                        },
-                        getContent: function() {
-                                content = [];
-                                var nodes = this.dndSource.getAllNodes();
-                                for (var i = 0; i < nodes.length; i++) {
-                                        content.push(this.dndSource.getItem(nodes[i].id).data.getContent());
-                                }
-                                return content;
-                        },
-                        getNodeList: function() {
-                                return this.dndSource.getAllNodes();
-                        },
-                        onDropInternal: function() {
-                                topic.publish("/QuestionEditor/Preview/MoveItem");
-                        },
-                        onDropExternal: function() {
-                                // This is fired when something from the Toolkit is dropped into the Preview -- add operation.
-                                topic.publish("/QuestionEditor/Preview/AddItem");
-                        }
-
-                });
-});
+        });
+    });