Changeset 303 for Dev/branches/rest-dojo-ui/client/rft/ui

Timestamp:

03/04/12 15:48:42 (13 years ago)

Author:

hendrikvanantwerpen

Message:

[Server] Refactored model classes with some meta-programming. Specific classes only define their fields and inherit from class RdfObject?. Changes to handle the new model objects correctly.
[Client] Added rft/store module for uniform resource access. Removed dependencies on 'uid' field name. Added support for references without loading full object nor exposing uri.
[Client] Added reset() to QuestionWidget?.
[RDFAPI] Fixed PHP warning.

Location:

Dev/branches/rest-dojo-ui/client/rft/ui

Files:

• QuestionWidget.js (modified) (2 diffs)
• templates/QuestionWidget.html (modified) (1 diff)

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

@@ -1 @@
-define(['dojo/_base/declare','dojo/dom-construct','dijit/_WidgetBase',
+define(['dojo/_base/declare','dojo/_base/lang','dojo/dom-construct','dijit/_WidgetBase',
     'dijit/_TemplatedMixin','dijit/_WidgetsInTemplateMixin',
     'dojo/text!./templates/QuestionWidget.html','dijit/form/TextBox',
     'dijit/form/Textarea','./MultipleChoiceWidget'],
-    function(declare,domConstruct,_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,templateString,TextBox,Textarea,MultipleChoiceWidget){
+    function(declare,lang,domConstruct,_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,templateString,TextBox,Textarea,MultipleChoiceWidget){
         return declare('rft.ui.QuestionWidget',[_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin],{
             templateString: templateString,
             mode: 'view', // view || edit
             name: '',
+            value: null,
             _type: null,
             _widgetCache: null,
             constructor: function() {
                 this.inherited(arguments);
+                this.value = {};
                 this._widgetCache = {};
             },
             postCreate: function() {
+                this._resetValue = this.value;
                 this.typeSelector.set('disabled', this.mode == 'edit');
             },
             _setValueAttr: function(value) {
-                value.type && this._onTypeChange(value.type);
+                this.value = value;
+                this._onTypeChange(value.type || 'string');
                 this.ourForm.set('value',value);
             },
             _getValueAttr: function() {
-                return this.ourForm.get('value');
+                var value = this.ourForm.get('value');
+                lang.mixin(this.value,value);
+                return this._question;
             },
             _onTypeChange: function(type) {
@@ -60 +66 @@
                 }
                 return widget;
+            },
+            reset: function() {
+                this.ourForm.reset();
+                this._setValueAttr(this._resetValue);
             }
         });

Dev/branches/rest-dojo-ui/client/rft/ui/templates/QuestionWidget.html

@@ -2 +2 @@
     <form data-dojo-type="dijit.form.Form" data-dojo-attach-point="ourForm">
         <fieldset>
-            <input data-dojo-type="dijit.form.TextBox" name="uid" type="text" class="dijitHidden" />
             <label for="code" class="loginLabel">Code</label>
             <input data-dojo-type="dijit.form.TextBox" name="code" type="text" class="loginInput" />