Changeset 435

Timestamp:

04/24/13 19:48:32 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Rename as Input and add 'type' to output.

Location:

Dev/trunk/client/qed

Files:

• model/widgets/QuestionWidgetFactory.js (modified) (2 diffs)
• model/widgets/ScaleInputConfigWidget.js (moved) (moved from Dev/trunk/client/qed/model/widgets/ScaleConfigWidget.js) (3 diffs)
• model/widgets/ScaleInputWidget.js (moved) (moved from Dev/trunk/client/qed/model/widgets/ScaleWidget.js) (1 diff)
• model/widgets/templates/ScaleInputConfigRowWidget.html (moved) (moved from Dev/trunk/client/qed/model/widgets/templates/ScaleConfigRowWidget.html)
• model/widgets/templates/ScaleInputConfigWidget.html (moved) (moved from Dev/trunk/client/qed/model/widgets/templates/ScaleConfigWidget.html)
• model/widgets/templates/ScaleInputWidget.html (moved) (moved from Dev/trunk/client/qed/model/widgets/templates/ScaleWidget.html)
• tests/test_ScaleWidget.html (modified) (3 diffs)

Dev/trunk/client/qed/model/widgets/QuestionWidgetFactory.js

@@ -1 +1 @@
 define([
-    'dojo/_base/array',
-    'dojo/_base/declare',
-    'dojo/_base/lang', 
-    'dojo/dom-construct', 
-    'dijit/_TemplatedMixin',
-    'dijit/_WidgetBase',
-    'dijit/_Container',
-    'dijit/form/Button',
-    'dijit/form/CheckBox',
-    'dijit/form/Form',
-    'dijit/form/NumberSpinner',
-    'dijit/form/RadioButton',
-    'dijit/form/Textarea',
-    'dijit/form/TextBox',
-    'dojox/layout/TableContainer',
-    '../../widgets/list/_EditableListMixin',
-    '../../widgets/list/OrderedList'
-],function(array, declare, lang, domConstruct, _TemplatedMixin, _WidgetBase, _Container, Button, CheckBox, Form, NumberSpinner, RadioButton, Textarea, TextBox, TableContainer, _EditableListMixin, OrderedList) {
+    "../../widgets/list/OrderedList",
+    "../../widgets/list/_EditableListMixin",
+    "./ScaleInputConfigWidget",
+    "./ScaleInputWidget",
+    "dijit/_Container",
+    "dijit/_TemplatedMixin",
+    "dijit/_WidgetBase",
+    "dijit/form/Button",
+    "dijit/form/CheckBox",
+    "dijit/form/Form",
+    "dijit/form/NumberSpinner",
+    "dijit/form/RadioButton",
+    "dijit/form/TextBox",
+    "dijit/form/Textarea",
+    "dojo/_base/array",
+    "dojo/_base/declare",
+    "dojo/_base/lang",
+    "dojo/dom-construct",
+    "dojox/layout/TableContainer"
+], function(OrderedList, _EditableListMixin, ScaleInputConfigWidget, ScaleInputWidget, _Container, _TemplatedMixin, _WidgetBase, Button, CheckBox, Form, NumberSpinner, RadioButton, TextBox, Textarea, array, declare, lang, domConstruct, TableContainer) {
     var factory = declare(null, {
         createViewWidget: function(/*Object*/options) {
             // options: Object
-            //            type: "header", "text", textinput, etc.
+            //            type: "Header", "Text", "TextInput", etc.
             //            other type specific fields
             var fun = this['create'+options.type+'ViewWidget'];
@@ -94 +96 @@
         createMultipleChoiceInputEditWidget: function() {
             return new MultipleChoiceInputEdit();
+        },
+
+        createScaleInputViewWidget: function(options) {
+            return new ScaleInputWidget(options);
+        },
+        createScaleInputEditWidget: function(options) {
+            return new ScaleInputConfigWidget({
+                value: options || {}
+            });
         }
     });

Dev/trunk/client/qed/model/widgets/ScaleInputConfigWidget.js

@@ -16 +16 @@
     "dojo/dom-construct",
     "dojo/dom-style",
-    "dojo/text!./templates/ScaleConfigRowWidget.html",
-    "dojo/text!./templates/ScaleConfigWidget.html",
+    "dojo/text!./templates/ScaleInputConfigRowWidget.html",
+    "dojo/text!./templates/ScaleInputConfigWidget.html",
     "dijit/form/NumberTextBox",
     "dijit/form/TextBox"
@@ -50 +50 @@
         constuctor: function() {
             this.inherited(arguments);
-            this.items = [];
             this.value = {};
         },
@@ -82 +81 @@
                 value.items = [value.items];
             }
+            value.type = 'ScaleInput';
             return value;
         },

Dev/trunk/client/qed/model/widgets/ScaleInputWidget.js

@@ -10 +10 @@
     "dojo/dom-attr",
     "dojo/dom-construct",
-    "dojo/text!./templates/ScaleWidget.html"
+    "dojo/text!./templates/ScaleInputWidget.html"
 ], function(_Container, _TemplatedMixin, _WidgetBase, RadioButton, _FormMixin, array, declare, lang, domAttr, domConstruct, template) {
     return declare([_WidgetBase,_TemplatedMixin,_Container,_FormMixin],{

Dev/trunk/client/qed/tests/test_ScaleWidget.html

@@ -14 +14 @@
           'dojo/when',
           'dojo/parser',
-          'qed/model/widgets/ScaleConfigWidget',
-          'qed/model/widgets/ScaleWidget',
+          'qed/model/widgets/ScaleInputConfigWidget',
+          'qed/model/widgets/ScaleInputWidget',
           'dojo/domReady!'
-      ], function(registry,dom,when,parser,ScaleConfigWidget,ScaleWidget){
+      ], function(registry,dom,when,parser,ScaleInputConfigWidget,ScaleInputWidget){
         when(parser.parse()).then(function(){
 
@@ -31 +31 @@
                 configNode.innerHTML = JSON.stringify(config);
                 widgetNode.innerHTML = '';
-                widget = new ScaleWidget(config)
+                widget = new ScaleInputWidget(config)
                 widget.startup();
                 widget.placeAt(widgetNode);
@@ -73 +73 @@
       <div>
         <div id="configWidget"
-             data-dojo-type="qed/model/widgets/ScaleConfigWidget"></div>
+             data-dojo-type="qed/model/widgets/ScaleInputConfigWidget"></div>
         <button id="defaultConfigButton"
                 data-dojo-type="dijit/form/Button">Set Example</button>