Changeset 390 for Dev/branches/rest-dojo-ui/client/rft/pages

Timestamp:

08/06/12 18:41:53 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• Removed some id's from elements in templates, these give problems when a widget or page is loaded more then once (use data-*-attach-point to access the nodes).
• Removed some unnecessary attach-* attributes from templates.
• Fixed some event handling.

Location:

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

Files:

• question.html (modified) (1 diff)
• question.js (modified) (6 diffs)

Dev/branches/rest-dojo-ui/client/rft/pages/question.html

@@ -12 +12 @@
             </div>
             <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
-                <button id="btnDiscard" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">Discard</button>
-                <button id="btnSave" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">Save and exit</button>
+                <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'" data-rft-attach-event="onClick:_onDiscard">Discard</button>
+                <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'" data-rft-attach-event="onClick:_onSave">Save and exit</button>
             </div>
         </div>

Dev/branches/rest-dojo-ui/client/rft/pages/question.js

@@ -2 +2 @@
     'dojo/_base/declare',
     'dojo/_base/Deferred',
+    'dojo/_base/event',
     'dojo/_base/lang',
-    'dojo/behavior',
     'rft/store',
     'rft/content',
@@ -9 +9 @@
     'rft/ui/QuestionEditorPreview',
     'rft/ui/QuestionEditorToolkit'
-    ],function(declare, Deferred, lang, behavior, store, content, _Page, QuestionEditorPreview, QuestionEditorToolkit){
+    ],function(declare, Deferred, event, lang, store, content, _Page, QuestionEditorPreview, QuestionEditorToolkit){
         return declare('rft.pages.question', [_Page], {
             question: null,
@@ -26 +26 @@
                 }
                 this._setupEditor();
-                this._setupButtons();
             },
             onLeave: function() {
@@ -35 +34 @@
                 this._preview.appendItems(this.question.content || []);
             },
-            _onSave: function() {
+            _onSave: function(evt) {
                 lang.mixin(this.question, this._toolkit.get('value'));
                 this.question.content = this._preview.getItems();
@@ -42 +41 @@
                     content.goTo('questions');
                 });
-                return true;
+                evt && event.stop( evt );
+                return false;
             },
             _onDiscard: function() {
@@ -48 +48 @@
                 return true;
             },
-            _setupButtons: function() {
-                var behaviorMap = {
-                    "#btnSave": {
-                        onclick: lang.hitch(this, function(){
-                            this._onSave();
-                        })
-                    },
-                    "#btnDiscard": {
-                        onclick: lang.hitch(this, function(){
-                            this._onDiscard();
-                        })
-                    }
-                }
-                behavior.add(behaviorMap);
-                behavior.apply();
-            },
             _setupEditor: function() {
                 this._toolkit = new QuestionEditorToolkit({
                 },this.QuestionEditorToolkitNode);
+                this._toolkit.on('submit',lang.hitch(this,"_onSave"));
                 this._toolkit.startup();