Changeset 393 for Dev/branches/rest-dojo-ui/client/rft/ui/content/ContentWidgetFactory.js

Timestamp:

08/08/12 15:10:30 (13 years ago)

Author:

jkraaijeveld

Message:

• Made the innerwidgets as seperate widgets instead of inheriting from either TextBox? or Textarea or the like. They now are their own container.

File:

• Dev/branches/rest-dojo-ui/client/rft/ui/content/ContentWidgetFactory.js (modified) (5 diffs)

Dev/branches/rest-dojo-ui/client/rft/ui/content/ContentWidgetFactory.js

@@ -2 +2 @@
     'dojo/_base/declare',
     'dojo/_base/lang', 
+    'dijit/_WidgetBase',
+    'dijit/_Container',
     'dijit/form/NumberSpinner',
     'dijit/form/Textarea',
@@ -8 +10 @@
     'dojox/form/CheckedMultiSelect',
     'dojox/layout/TableContainer'
-    ],function(declare, lang, NumberSpinner, Textarea, TextBox, StackContainer, CheckedMultiSelect, TableContainer) {
+    ],function(declare, lang, _WidgetBase, _Container, NumberSpinner, Textarea, TextBox, StackContainer, CheckedMultiSelect, TableContainer) {
         var factory = declare('rft.ui.content.ContentWidgetFactory', [], {
             /* No default type, all should be valid */
@@ -34 +36 @@
             createHeaderEditWidget: function() {
                 return new HeaderEditItem();
-            }/*,
+            },
 
             createTextViewWidget: function(options) {
@@ -41 +43 @@
                 });
             },
-            createTextEditWidget: function(options) {
-                return new TextEditItem({
-                    options: options
-                });
-            },
-
-            createFreeTextViewWidget: function(options) {
-                return new FreeTextViewItem({
-                    options: options
-                });
-            },
-            createFreeTextEditWidget: function(options) {
-                return new FreeTextEditItem({
-                    options: options
-                });
-            },
+            createTextEditWidget: function() {
+                return new TextEditItem();
+            },
+
+            createFreeTextInputViewWidget: function(options) {
+                return new FreeTextInputViewItem({
+                    options: options
+                });
+            },
+            createFreeTextInputEditWidget: function() {
+                return new FreeTextInputEditItem();
+            }/*,
 
             createIntegerViewWidget: function(options) {
@@ -82 +80 @@
 
         /* Contents */
-        var HeaderViewItem = declare(TextBox, {
-            postCreate: function() {
-                this.set('value', this.options.contents);
-                this.set('readOnly', true);
+        var HeaderViewItem = declare([_WidgetBase, _Container], {
+            _textBox: null,
+            postCreate: function() {
+                this._textBox = new TextBox();
+                this._textBox.set('value', this.options.contents);
+                this._textBox.set('readOnly', true);
+                this.addChild(this._textBox);
             },
             _getValueAttr: function() {
                 return {    type: 'Header',
-                            contents: this.get('displayedValue'),
-                }
-            }
-        });
-
-        var HeaderEditItem = declare(TextBox, {
+                            contents: this._textBox.get('displayedValue'),
+                };
+            }
+        });
+
+        var HeaderEditItem = declare([_WidgetBase, _Container], {
+            _textBox: null,
+            postCreate: function() {
+                this._textBox = new TextBox();
+                this.addChild(this._textBox);
+            },
             _setValueAttr: function(value) {
-                this.inherited(arguments, [value.contents || ""]);
+                this._textBox.set('value', value.contents || "");
             },
             _getValueAttr: function() {
                 return { type: 'Header',
-                         contents: this.get('displayedValue'),
-                }
-            }
-        });
-
-        var TextItem = declare(Textarea, {
-            getObject: function() {
+                         contents: this._textBox.get('displayedValue'),
+                };
+            }
+        });
+
+        var TextViewItem = declare([_WidgetBase, _Container], {
+            _textArea: null,
+            postCreate: function() {
+                this._textArea = new Textarea();
+                this._textArea.set('value', this.options.contents);
+                this._textArea.set('readOnly', true);
+                this.addChild(this._textArea);
+            },
+            _getValueAttr: function() {
                 return { type: 'Text',
-                         contents: this.get('value'),
-                         disabled: this.get('disabled')
-                };
-            },
-            setObject: function(object) {
-                this.set('value', object.contents);
-                if (object.disabled) {
-                    this.set('disabled', true);
-                }
-            }    
-        });
+                         contents: this._textArea.get('displayedValue'),
+                };
+            },
+        });
+
+        var TextEditItem = declare([_WidgetBase, _Container], {
+            _textArea: null,
+            postCreate: function() {
+                this._textArea = new Textarea();
+                this.addChild(this._textArea);
+            },
+            _setValueAttr: function(value) {
+                this._textArea.set('value', value.contents || "");
+            },
+            _getValueAttr: function() {
+                return { type: 'Text',
+                         contents: this._textArea.get('displayedValue')
+                };
+            }
+        })
 
         /* Inputs */
-        var FreeTextInput = declare(Textarea, {
-            getObject: function() {
-                return { type: 'FreeTextInput' };
-            }
-        });
+        var FreeTextViewItem = declare(Textarea, {
+            postCreate: function() {
+                this.set('value', this.options.defaultValue);
+                this.set('readOnly', this.options.readOnly);
+                this._onBlur = undefined;
+            },
+            _getValueAttr: function() {
+                return { type: "FreeText",
+                         defaultValue: this.options.defaultValue,
+                         readOnly: this.options.readOnly
+                };
+            }
+        });
+
+        var FreeTextEditItem = declare(Textarea, {
+            _setValueAttr: function(value) {
+                this.inherited(arguments, [value])
+            }
+        })
 
         //Use CheckedMultiSelect