Changeset 7388

Timestamp:

02/20/07 17:56:45 (21 months ago)

Author:

jburke

Message:

(merge from 0.4 branch) References #2366. Converting more tests to use dojo.addOnLoad()

Location:

trunk/tests/widget

Files:

• acme/Button.js (modified) (1 diff)
• test_AccordionContainer.html (modified) (1 diff)
• test_AnimatedPng.html (modified) (2 diffs)
• test_ColorPalette.html (modified) (1 diff)
• test_DropdownContainer.html (modified) (1 diff)
• test_DropdownTimePicker.html (modified) (1 diff)
• test_FloatingPane.html (modified) (1 diff)
• test_FloatingPaneCode.html (modified) (1 diff)
• test_funcArgs.html (modified) (1 diff)
• test_HslColorPicker.xhtml (modified) (1 diff)
• test_LayoutContainer.html (modified) (1 diff)
• test_Menu2_Around_Position.html (modified) (1 diff)
• test_Menu2_Position.html (modified) (1 diff)
• test_PageContainer.html (modified) (1 diff)
• test_RemotePane.html (modified) (1 diff)
• test_Toolbar.html (modified) (1 diff)
• test_validate.html (modified) (1 diff)

trunk/tests/widget/acme/Button.js

@@ -26 +26 @@
         {
                 // override background images
-                inactiveImg: "tests/widget/acme/user-",
-                activeImg: "tests/widget/acme/userActive-",
-                pressedImg: "tests/widget/acme/userPressed-",
-                disabledImg: "tests/widget/acme/userPressed-",
-                width2height: 1.3
+                inactiveImg: "user-",
+                activeImg: "userActive-",
+                pressedImg: "userPressed-",
+                disabledImg: "userPressed-",
+                width2height: 1.3,
+                _setImage: function(/*String*/ prefix){
+                        this.leftImage.src=dojo.uri.moduleUri("acme", prefix + "l.gif");
+                        this.centerImage.src=dojo.uri.moduleUri("acme", prefix + "c.gif");
+                        this.rightImage.src=dojo.uri.moduleUri("acme", prefix + "r.gif");
+                }
         }
 );

trunk/tests/widget/test_AccordionContainer.html

@@ -12 +12 @@
                 <script type="text/javascript">
                         dojo.require("dojo.widget.*");
+                        dojo.require("dojo.widget.AccordionContainer");
+                        dojo.require("dojo.widget.ContentPane");
+                        dojo.require("dojo.widget.TreeV3");
+                        dojo.require("dojo.widget.TreeBasicControllerV3");
+                        dojo.require("dojo.widget.SplitContainer");
                 </script>
                 

trunk/tests/widget/test_AnimatedPng.html

@@ -18 +18 @@
         //dojo.hostenv.writeIncludes();
 
+        dojo.addOnLoad(function(){
+                var params = {src: "images/animatedpng_static.gif", aniSrc: "images/animatedpng_frames.gif", width: 20, height: 20, interval: 50};
+                var widget = dojo.widget.createWidget("AnimatedPng", params, document.getElementById("pngContainer"));  
+        });
 </script>
 <style>
@@ -40 +44 @@
 <h3>Instantiation from Script:</h3>
 <div id="pngContainer"></div>
-<script type="text/javascript">
-        var params = {src: "images/animatedpng_static.gif", aniSrc: "images/animatedpng_frames.gif", width: 20, height: 20, interval: 50};
-        var widget = dojo.widget.createWidget("AnimatedPng", params, document.getElementById("pngContainer"));
-</script>
-        
 </body>
 </html>

trunk/tests/widget/test_ColorPalette.html

@@ -6 +6 @@
 <script type="text/javascript"> var djConfig = {isDebug: true}; </script>
 <script type="text/javascript" src="../../dojo.js"></script>
-<script src="../../src/widget/ColorPalette.js"></script>
 <script language="JavaScript" type="text/javascript">
         dojo.require("dojo.widget.*");
         dojo.require("dojo.widget.ColorPalette");
         var palette;
-        dojo.addOnLoad(init)
         function init(){
                 palette = dojo.widget.createWidget("dojo:ColorPalette",{palette:"7x10"}, dojo.byId("programPalette"));
         }
+        dojo.addOnLoad(init);
 </script>
 

trunk/tests/widget/test_DropdownContainer.html

@@ -26 +26 @@
 <div id="dropdown"><div style="border: 1px solid black;" class="popup">some content for the second <br/>dropdown container</div></div>
 <script type="text/javascript">
-        var params = {id: "dropdown"};
-        var widget = dojo.widget.createWidget("DropdownContainer", params, dojo.byId("dropdown"));
+        dojo.addOnLoad(function(){
+                var params = {id: "dropdown"};
+                var widget = dojo.widget.createWidget("DropdownContainer", params, dojo.byId("dropdown"));
+        });
 </script>
 

trunk/tests/widget/test_DropdownTimePicker.html

@@ -7 +7 @@
 <script type="text/javascript">
 dojo.require("dojo.debug.console");
-</script>
-<script type="text/javascript" src="../../src/widget/TimePicker.js"></script>
-<script type="text/javascript" src="../../src/widget/DropdownTimePicker.js"></script>
-<!--
--->
-<script type="text/javascript">
 dojo.require("dojo.widget.DropdownTimePicker");
 </script>

trunk/tests/widget/test_FloatingPane.html

@@ -10 +10 @@
 <script language="JavaScript" type="text/javascript">
         dojo.require("dojo.widget.*");
+        dojo.require("dojo.widget.FloatingPane");
+        dojo.require("dojo.widget.ComboBox");
+        dojo.require("dojo.widget.ContentPane");
+        dojo.require("dojo.widget.TabContainer");
+        dojo.require("dojo.widget.TreeV3");
+        dojo.require("dojo.widget.TreeBasicControllerV3");
 </script>
 </head>

trunk/tests/widget/test_FloatingPaneCode.html

@@ -15 +15 @@
         dojo.require("dojo.widget.Tree");
         dojo.require("dojo.widget.ComboBox");
+        dojo.require("dojo.widget.DebugConsole");
+        dojo.require("dojo.widget.TaskBar");
 </script>
 

trunk/tests/widget/test_funcArgs.html

@@ -19 +19 @@
                         dojo.debug('widget [' + this.widgetId + '] was clicked');
                 }
-                dojo.widget.Button.prototype.onClick=function(){dojo.debug("default click handler"); }
+                dojo.addOnLoad(function(){
+                        dojo.widget.Button.prototype.onClick=function(){dojo.debug("default click handler"); }
+                });
         </script>
 </head>

trunk/tests/widget/test_HslColorPicker.xhtml

@@ -11 +11 @@
                         dojo.require("dojo.widget.svg.HslColorPicker");
                         dojo.require("dojo.event.topic");
-                        dojo.event.topic.subscribe("/colorPicker/setStoredColor", window, "setColorSwatch");
-                        function setColorSwatch(evt) {
-                                document.getElementById("colorSwatch").style.backgroundColor = dojo.widget.getWidgetById("colorPicker").getStoredColor();
-                        }
+                        dojo.addOnLoad(function(){
+                                dojo.event.topic.subscribe("/colorPicker/setStoredColor", window, "setColorSwatch");
+                                function setColorSwatch(evt) {
+                                        document.getElementById("colorSwatch").style.backgroundColor = dojo.widget.getWidgetById("colorPicker").getStoredColor();
+                                }
+                        });
                 //]]></script>
         </head>

trunk/tests/widget/test_LayoutContainer.html

@@ -12 +12 @@
 <script language="JavaScript" type="text/javascript">
         dojo.require("dojo.widget.*");
+        dojo.require("dojo.widget.LayoutContainer");
+        dojo.require("dojo.widget.ContentPane");
+        dojo.require("dojo.widget.ComboBox");
 </script>
 </head>

trunk/tests/widget/test_Menu2_Around_Position.html

@@ -88 +88 @@
                 menu.open(e.currentTarget, null, e.currentTarget);
         }
-        dojo.addOnLoad(function(){menu=dojo.widget.byId("test3");});
-        dojo.event.connect(dojo.byId("test0"), "onclick", testAroundPlace);
-        dojo.event.connect(dojo.byId("test0IE"), "onclick", testAroundPlace);
-        
-        dojo.event.connect(dojo.byId("test1"), "onclick", testAroundPlace);
-        dojo.event.connect(dojo.byId("test2"), "onclick", testAroundPlace);
-        dojo.event.connect(dojo.byId("test3"), "onclick", testAroundPlace);
+        dojo.addOnLoad(function(){
+                menu=dojo.widget.byId("test3");
+                dojo.event.connect(dojo.byId("test0"), "onclick", testAroundPlace);
+                dojo.event.connect(dojo.byId("test0IE"), "onclick", testAroundPlace);
+                
+                dojo.event.connect(dojo.byId("test1"), "onclick", testAroundPlace);
+                dojo.event.connect(dojo.byId("test2"), "onclick", testAroundPlace);
+                dojo.event.connect(dojo.byId("test3"), "onclick", testAroundPlace);
+        });
 </script>
 </div>

trunk/tests/widget/test_Menu2_Position.html

@@ -118 +118 @@
                 menu.bindDomNode("embed");
         }
-        dojo.event.connect(dojo.byId("embed"), "onload", attachMenu);
+        dojo.addOnLoad(function(){
+                dojo.event.connect(dojo.byId("embed"), "onload", attachMenu);
+        });
 </script>
 </div>

trunk/tests/widget/test_PageContainer.html

@@ -33 +33 @@
                 dojo.byId("next2").disabled = page.isLastChild;
         }
-        dojo.event.topic.subscribe("myPageContainer-selectChild", selected);
-        // TODO: if someone removes the first or last page have to disable the previous/next buttons */
+        dojo.addOnLoad(function(){
+                dojo.event.topic.subscribe("myPageContainer-selectChild", selected);
+                // TODO: if someone removes the first or last page have to disable the previous/next buttons */
+        });
 </script>
 </head>

trunk/tests/widget/test_RemotePane.html

@@ -35 +35 @@
         }
 
-        var displayer = new DisplayTreeContent();
+        dojo.addOnLoad(function(){
+                displayer = new DisplayTreeContent();
 
-        var nodeSelectionTopic = dojo.event.topic.getTopic("nodeSelected");
-        nodeSelectionTopic.subscribe(displayer, "update");
+                var nodeSelectionTopic = dojo.event.topic.getTopic("nodeSelected");
+                nodeSelectionTopic.subscribe(displayer, "update");
+        });
 
         // display custom loadError or use built in

trunk/tests/widget/test_Toolbar.html

@@ -68 +68 @@
         }
         
-        dojo.event.connect(dojo, "loaded", function() {
+        dojo.addOnLoad(function(){
                 var total = 0;
                 for(var i = 0; i < 1; i++) {

trunk/tests/widget/test_validate.html

@@ -14 +14 @@
         <script type="text/javascript">
                 dojo.require("dojo.widget.*");
+                dojo.require("dojo.widget.Textbox");
+                dojo.require("dojo.widget.ValidationTextbox");
+                dojo.require("dojo.widget.UsTextbox");
+                dojo.require("dojo.widget.IntegerTextbox");
+                dojo.require("dojo.widget.InternetTextbox");
+                dojo.require("dojo.widget.RealNumberTextbox");
+                dojo.require("dojo.widget.CurrencyTextbox");
+                dojo.require("dojo.widget.DateTextbox");
+                dojo.require("dojo.widget.RegexpTextbox");
+
         </script>