Changeset 354 for Dev/branches/rest-dojo-ui/client/rft/ui/Selector.js

Timestamp:

07/09/12 19:24:56 (13 years ago)

Author:

tjcschipper

Message:

• Made change to _Page.js to destroy the page's child widgets on page leave. This was causing widgets with identical names (such as "btnSave") to make regsitry throw a duplicate widget error.
• survey.js/html now sorts loaded questions into categories and topics and creates or adds them to the proper TabPane/Selectors?. TODO: Allow for spaces in category titles.
• Added "addQuestion()" method to Selector.js, to internalize question visualization logic.
• Included surveyAdvanced page in run.js
• Changes index to use proper button format, still need to figure out a way to bind content.goTo to the onclick field (since there is no index.js script being run!)
• Various css tweaks.

File:

• Dev/branches/rest-dojo-ui/client/rft/ui/Selector.js (modified) (4 diffs)

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

@@ -26 +26 @@
             title: "The professional as a participant",
             baseClass: 'rftSelector',
-            modifiers: 'blue',    // Extra CSS classes
+            modifiers: 'blue',
             postCreate: function() {
                 domClass.add(this.domNode, this.modifiers);
                 domClass.add(this.selectedColorNode, "pending");
-                var infoFunction = function() {
-                    alert("Show info here");
-                }
+                
                 new LineWithActionsWidget({
                     title: this.title,
@@ -48 +46 @@
                     }
                 },this.titleNode);
-                var selectorLine = new LineWithActionsWidget({
+                
+                this.selectorLine = new LineWithActionsWidget({
                     title: 'None',
                     modifiers: this.modifiers,
                     actions: {
                         "ToggleDropdown" : {
-                            callback: lang.hitch(this,function(){
-                                var node = this.optionsNode;
-                                var show = fx.wipeIn({
-                                    node: node
-                                });
-                                var hide = fx.wipeOut({
-                                    node: node
-                                });
-                                hide.play();
-                                var folded = true;
-                                return function(e) {
-                                    if ( folded ) {
-                                        // Bit of an ugly solution, really. Limit workload by limiting search to child elements of selecorLine.buttonsNode
-                                        var downArrowIcon = dojo.query(".rftBlockButton .rftIconHalfArrowDown", selectorLine.buttonsNode)[0];  // Query the down arrow rftIcon span
-                                        if (downArrowIcon){
-                                            domClass.replace(downArrowIcon, "rftIconHalfArrowUp", "rftIconHalfArrowDown");
-                                        }
-                                        show.play();
-                                        folded = false;
-                                    } else {
-                                        // Bit of an ugly solution, really. Limit workload by limiting search to child elements of selecorLine.buttonsNode
-                                        var upArrowIcon = dojo.query(".rftBlockButton .rftIconHalfArrowUp", selectorLine.buttonsNode)[0];  // Query the up arrow rftIcon span
-                                        if (upArrowIcon){
-                                            domClass.replace(upArrowIcon, "rftIconHalfArrowDown", "rftIconHalfArrowUp");
-                                        }
-                                        hide.play();
-                                        folded = true;
-                            
-                                    }
-                                    e.preventDefault();
-                                    e.stopPropagation();
-                                };
-                            })(),
+                            callback: lang.hitch(this, this._toggleDropdown()),
                             properties: {
                                 blockButton: true,
@@ -95 +62 @@
                     }
                 },this.selectedItemNode);
+            },
+            _toggleDropdown: function(selectorLine) {
+                var node = this.optionsNode;
+                var show = fx.wipeIn({
+                    node: node
+                });
+                var hide = fx.wipeOut({
+                    node: node
+                });
+                hide.play();
+                var folded = true;
+                return function(e) {
+                    if ( folded ) {
+                        var downArrowIcon = dojo.query(".rftBlockButton .rftIconHalfArrowDown", this.selectorLine.buttonsNode)[0];
+                        if (downArrowIcon){
+                            domClass.replace(downArrowIcon, "rftIconHalfArrowUp", "rftIconHalfArrowDown");
+                        }
+                        show.play();
+                        folded = false;
+                    } else {
+                        var upArrowIcon = dojo.query(".rftBlockButton .rftIconHalfArrowUp", this.selectorLine.buttonsNode)[0];
+                        if (upArrowIcon){
+                            domClass.replace(upArrowIcon, "rftIconHalfArrowDown", "rftIconHalfArrowUp");
+                        }
+                        hide.play();
+                        folded = true;
+
+                    }
+                    e.preventDefault();
+                    e.stopPropagation();
+                };
+            },
+            addQuestion: function(question) {
                 new LineWithActionsWidget({
-                    title: 'Are there direct colleagues among the other participants?',
+                    title: question.title,
+                    question: question,
                     actions: {
                         "InfoHover" : {
-                            callback: infoFunction,
+                            callback: this.infoFunction,
                             properties: {
                                 blockButton: false,
@@ -108 +109 @@
                     }
                 }).placeAt(this.optionsNode);
+            },
+            infoFunction: function(){
+                alert("Some info here!");text
             }
         });
-    });
+});