Changeset 7394

Timestamp:

02/21/07 14:54:01 (18 months ago)

Author:

jburke

Message:

References #2366. Converting more tests to use dojo.addOnLoad()

Location:

branches/0.4/tests

Files:

• undo/test_browser.html (modified) (1 diff)
• undo/test_browser_bookmark.html (modified) (1 diff)
• undo/test_Manager.html (modified) (1 diff)
• widget/Chart/test_fromScript.html (modified) (1 diff)
• widget/Editor/test_Editor2.html (modified) (2 diffs)
• widget/Editor/test_Editor2Code.html (modified) (1 diff)
• widget/Editor/test_Editor2InsideDialog.html (modified) (1 diff)
• widget/Editor/test_Editor2InsideFloatingPane.html (modified) (1 diff)
• widget/Editor/test_Editor2_replace.html (modified) (1 diff)
• widget/Editor/test_Editor2_shared.html (modified) (2 diffs)
• widget/Editor/test_RichText.html (modified) (3 diffs)
• widget/Editor/test_RichTextStyleSheets.html (modified) (1 diff)
• xml/test_XslTransform.html (modified) (1 diff)

branches/0.4/tests/undo/test_browser.html

@@ -6 +6 @@
                         //debugAtAllCosts: true, //Don't normally need this in applications.
                         isDebug: true,
+                        dojoIframeHistoryUrl: "../../iframe_history.html", //for xdomain
                         preventBackButtonFix: false
                 };

branches/0.4/tests/undo/test_browser_bookmark.html

@@ -6 +6 @@
                         //debugAtAllCosts: true, //Don't normally need this in applications.
                         isDebug: true,
+                        dojoIframeHistoryUrl: "../../iframe_history.html", //for xdomain
                         preventBackButtonFix: false
                 };

branches/0.4/tests/undo/test_Manager.html

@@ -9 +9 @@
                 </script>
                 <script type="text/javascript" src="../../dojo.js"></script>
-                <script type="text/javascript" src="../../src/undo/Manager.js"></script>
                 <script type="text/javascript">
+                        dojo.require("dojo.undo.Manager");
                         function foo(n) {
                                 return function() {

branches/0.4/tests/widget/Chart/test_fromScript.html

@@ -9 +9 @@
                         dojo.require("dojo.widget.Chart");
 
-                        var seriesA = new dojo.widget.Chart.DataSeries("SeriesA", "First series", "area");
-                        seriesA.values=[
-                                {x:0,value:-92.45},
-                                {x:4,value:94.23},
-                                {x:8,value:-93.12},
-                                {x:12,value:89.16},
-                                {x:16,value:-82.47},
-                                {x:20,value:73.25},
-                                {x:24,value:-61.79},
-                                {x:28,value:48.44},
-                                {x:32,value:-33.6},
-                                {x:36,value:17.74},
-                                {x:40,value:-1.33},
-                                {x:44,value:-15.11},
-                                {x:48,value:31.1},
-                                {x:52,value:-46.13},
-                                {x:56,value:59.75},
-                                {x:60,value:-71.54},
-                                {x:64,value:81.14},
-                                {x:68,value:-88.26},
-                                {x:72,value:92.67},
-                                {x:76,value:-94.24},
-                                {x:80,value:92.93},
-                                {x:84,value:-88.77},
-                                {x:88,value:81.89},
-                                {x:92,value:-72.51},
-                                {x:96,value:60.9},
-                                {x:100,value:-47.43}
-                        ];
-                        var seriesB = new dojo.widget.Chart.DataSeries("SeriesB", "Second series", "area");
-                        seriesB.values=[
-                                {x:0,value:63.06},
-                                {x:4,value:-100},
-                                {x:8,value:-33.54},
-                                {x:12,value:29.71},
-                                {x:16,value:100},
-                                {x:20,value:-69.5},
-                                {x:24,value:6.07},
-                                {x:28,value:100},
-                                {x:32,value:-100},
-                                {x:36,value:-15.99},
-                                {x:40,value:51.1},
-                                {x:44,value:-100},
-                                {x:48,value:-42.5},
-                                {x:52,value:22.04},
-                                {x:56,value:100},
-                                {x:60,value:-86.06},
-                                {x:64,value:-0.51},
-                                {x:68,value:83.18},
-                                {x:72,value:-100},
-                                {x:76,value:-23.19},
-                                {x:80,value:41.02},
-                                {x:84,value:100},
-                                {x:88,value:-52.83},
-                                {x:92,value:14.91},
-                                {x:96,value:100},
-                                {x:100,value:-100}
-                        ];
                         dojo.addOnLoad(function(e){
+                                var seriesA = new dojo.widget.Chart.DataSeries("SeriesA", "First series", "area");
+                                seriesA.values=[
+                                        {x:0,value:-92.45},
+                                        {x:4,value:94.23},
+                                        {x:8,value:-93.12},
+                                        {x:12,value:89.16},
+                                        {x:16,value:-82.47},
+                                        {x:20,value:73.25},
+                                        {x:24,value:-61.79},
+                                        {x:28,value:48.44},
+                                        {x:32,value:-33.6},
+                                        {x:36,value:17.74},
+                                        {x:40,value:-1.33},
+                                        {x:44,value:-15.11},
+                                        {x:48,value:31.1},
+                                        {x:52,value:-46.13},
+                                        {x:56,value:59.75},
+                                        {x:60,value:-71.54},
+                                        {x:64,value:81.14},
+                                        {x:68,value:-88.26},
+                                        {x:72,value:92.67},
+                                        {x:76,value:-94.24},
+                                        {x:80,value:92.93},
+                                        {x:84,value:-88.77},
+                                        {x:88,value:81.89},
+                                        {x:92,value:-72.51},
+                                        {x:96,value:60.9},
+                                        {x:100,value:-47.43}
+                                ];
+                                var seriesB = new dojo.widget.Chart.DataSeries("SeriesB", "Second series", "area");
+                                seriesB.values=[
+                                        {x:0,value:63.06},
+                                        {x:4,value:-100},
+                                        {x:8,value:-33.54},
+                                        {x:12,value:29.71},
+                                        {x:16,value:100},
+                                        {x:20,value:-69.5},
+                                        {x:24,value:6.07},
+                                        {x:28,value:100},
+                                        {x:32,value:-100},
+                                        {x:36,value:-15.99},
+                                        {x:40,value:51.1},
+                                        {x:44,value:-100},
+                                        {x:48,value:-42.5},
+                                        {x:52,value:22.04},
+                                        {x:56,value:100},
+                                        {x:60,value:-86.06},
+                                        {x:64,value:-0.51},
+                                        {x:68,value:83.18},
+                                        {x:72,value:-100},
+                                        {x:76,value:-23.19},
+                                        {x:80,value:41.02},
+                                        {x:84,value:100},
+                                        {x:88,value:-52.83},
+                                        {x:92,value:14.91},
+                                        {x:96,value:100},
+                                        {x:100,value:-100}
+                                ];
+
                                 var test = dojo.widget.createWidget("dojo:Chart", {}, dojo.byId("test"));
                                 test.series.push(seriesA);

branches/0.4/tests/widget/Editor/test_Editor2.html

@@ -5 +5 @@
         <title>Dojo Editor2 Test</title>
         <script type="text/javascript">
-                var djConfig = { isDebug: true };
+                var djConfig = {
+                        isDebug: true,
+                        dojoRichTextFrameUrl: "../../../src/widget/templates/richtextframe.html" //for xdomain
+                };
         </script>
 
@@ -60 +63 @@
 </button>
 <script>
-        dojo.event.connect(dojo.byId("onDemandButton"), "onclick", function(){
-                dojo.widget.createWidget("Editor2", 
-                        {       shareToolbar: false, 
-                                toolbarAlwaysVisible: true,
-                                focusOnLoad: false 
-                        }, dojo.byId("onDemandEditor"));
+        dojo.addOnLoad(function(){
+                dojo.event.connect(dojo.byId("onDemandButton"), "onclick", function(){
+                        dojo.widget.createWidget("Editor2", 
+                                {       shareToolbar: false, 
+                                        toolbarAlwaysVisible: true,
+                                        focusOnLoad: false 
+                                }, dojo.byId("onDemandEditor"));
+                });
         });
 </script>

branches/0.4/tests/widget/Editor/test_Editor2Code.html

@@ -5 +5 @@
         <title>Dojo Editor2 Test</title>
         <script type="text/javascript">
-                var djConfig = { isDebug: true };
+                var djConfig = {
+                        isDebug: true,
+                        dojoRichTextFrameUrl: "../../../src/widget/templates/richtextframe.html" //for xdomain
+                };
         </script>
 
         <script type="text/javascript" src="../../../dojo.js"></script>
-        <script type="text/javascript" src="../../../src/widget/RichText.js"></script>
-        <script type="text/javascript" src="../../../src/widget/Editor2.js"></script>
         <script type="text/javascript">
         dojo.require("dojo.widget.Editor2Plugin.SimpleSignalCommands");

branches/0.4/tests/widget/Editor/test_Editor2InsideDialog.html

@@ -6 +6 @@
 <head>
 <title>Editor2 Inside Dialog Dojo Test</title>
-<script type="text/javascript"> djConfig = { isDebug: true }; </script>
+<script type="text/javascript">
+        djConfig = {
+                isDebug: true,
+                dojoRichTextFrameUrl: "../../../src/widget/templates/richtextframe.html" //for xdomain
+        };
+</script>
 <script type="text/javascript" src="../../../dojo.js"></script>
 <script type="text/javascript">

branches/0.4/tests/widget/Editor/test_Editor2InsideFloatingPane.html

@@ -5 +5 @@
         <title>Dojo Editor2 Test</title>
         <script type="text/javascript">
-                var djConfig = { isDebug: true };
+                var djConfig = {
+                        isDebug: true,
+                        dojoRichTextFrameUrl: "../../../src/widget/templates/richtextframe.html" //for xdomain
+                };
         </script>
 

branches/0.4/tests/widget/Editor/test_Editor2_replace.html

@@ -5 +5 @@
         <title>Dojo Editor2 Test</title>
         <script type="text/javascript">
-                var djConfig = { isDebug: true };
+                djConfig = {
+                        isDebug: true,
+                        dojoRichTextFrameUrl: "../../../src/widget/templates/richtextframe.html" //for xdomain
+                };
         </script>
 

branches/0.4/tests/widget/Editor/test_Editor2_shared.html

@@ -5 +5 @@
         <title>Dojo Editor2 shared Toolbar and ContextMenu Test</title>
         <script type="text/javascript">
-                var djConfig = { isDebug: true };
+                djConfig = {
+                        isDebug: true,
+                        dojoRichTextFrameUrl: "../../../src/widget/templates/richtextframe.html" //for xdomain
+                };
         </script>
 
@@ -13 +16 @@
                 dojo.require("dojo.widget.Editor2Plugin.ContextMenu");
                 dojo.require("dojo.widget.Editor2Plugin.SimpleSignalCommands");
-                dojo.widget.Editor2Plugin.ContextMenuManager.registerGroupSet('menugroup1',['Generic'])
+                dojo.addOnLoad(function(){
+                        dojo.widget.Editor2Plugin.ContextMenuManager.registerGroupSet('menugroup1',['Generic']);
+                });
         </script>
 </head>

branches/0.4/tests/widget/Editor/test_RichText.html

@@ -6 +6 @@
                 //debugAtAllCosts: true,
                 isDebug: true,
-                ieClobberMinimal: true
+                ieClobberMinimal: true,
+                dojoRichTextFrameUrl: "../../../src/widget/templates/richtextframe.html" //for xdomain
         };
 </script>
@@ -47 +48 @@
 <input type="button" value="paste in gunk" id="pastebutton">
 <script type="text/javascript">
-var editable = dojo.byId("editable");
-var savebutton = dojo.byId("savebutton");
-var editableRT;
-dojo.event.connect(dojo.hostenv, "loaded", function (e) {
+dojo.addOnLoad(function(){
+        editable = dojo.byId("editable");
+        savebutton = dojo.byId("savebutton");
         editableRT = dojo.widget.manager.getWidgetById("editdiv");
-});
-dojo.event.connect(savebutton, "onclick", function (e) {
-        if (editableRT) {
-                editableRT.close(true);
-                savebutton.value = "edit";
-                editableRT = null;
-        } else {
-                editableRT = dojo.widget.createWidget("RichText", {}, editable);
-                savebutton.value = "save";
-        }
-});
 
-var pasteButton = dojo.byId("pastebutton");
-dojo.event.connect(pasteButton, "onclick", function(){
-        editableRT.execCommand("inserthtml", "<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque iaculis, nulla id semper faucibus, pede tellus nonummy magna, vitae adipiscing orci arcu ut augue. Nunc condimentum, magna a vestibulum convallis, libero purus pulvinar orci, sed vestibulum urna sem ut pede.</p>");
+        dojo.event.connect(savebutton, "onclick", function (e) {
+                if (editableRT) {
+                        editableRT.close(true);
+                        savebutton.value = "edit";
+                        editableRT = null;
+                } else {
+                        editableRT = dojo.widget.createWidget("RichText", {}, editable);
+                        savebutton.value = "save";
+                }
+        });
+        
+        pasteButton = dojo.byId("pastebutton");
+        dojo.event.connect(pasteButton, "onclick", function(){
+                editableRT.execCommand("inserthtml", "<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque iaculis, nulla id semper faucibus, pede tellus nonummy magna, vitae adipiscing orci arcu ut augue. Nunc condimentum, magna a vestibulum convallis, libero purus pulvinar orci, sed vestibulum urna sem ut pede.</p>");
+        });
 });
 </script>
@@ -73 +74 @@
 
 <script type="text/javascript">
-
-dojo.event.connect(dojo, "loaded", function (e) {
-        function makeEditable (e) {
-                // create an editor from the table cell and keep it's width
-                var editor = dojo.widget.createWidget("RichText",
-                        {inheritWidth: true}, e.currentTarget);
-                editor.placeCursorAtEnd();
-
-                // save and exit on a blur
-                dojo.event.connect(editor, "onBlur", function (e) {
-                        editor.close();
-                });
-        }
-
-        var table = dojo.byId("editabletable");
-        var tds = table.getElementsByTagName("td");
-        for (var i = 0; i < tds.length; i++) {
-                dojo.event.connect(tds[i], "onclick", makeEditable);
-        }
+dojo.addOnLoad(function(){
+        dojo.event.connect(dojo, "loaded", function (e) {
+                function makeEditable (e) {
+                        // create an editor from the table cell and keep it's width
+                        var editor = dojo.widget.createWidget("RichText",
+                                {inheritWidth: true}, e.currentTarget);
+                        editor.placeCursorAtEnd();
+        
+                        // save and exit on a blur
+                        dojo.event.connect(editor, "onBlur", function (e) {
+                                editor.close();
+                        });
+                }
+        
+                table = dojo.byId("editabletable");
+                tds = table.getElementsByTagName("td");
+                for (var i = 0; i < tds.length; i++) {
+                        dojo.event.connect(tds[i], "onclick", makeEditable);
+                }
+        });
 });
-
 </script>
 

branches/0.4/tests/widget/Editor/test_RichTextStyleSheets.html

@@ -5 +5 @@
         <title>Dojo Editor2 Stylesheet test</title>
         <script type="text/javascript">
-                var djConfig = { isDebug: true };
+                var djConfig = {
+                        isDebug: true,
+                        dojoRichTextFrameUrl: "../../../src/widget/templates/richtextframe.html" //for xdomain
+                };
         </script>
 

branches/0.4/tests/xml/test_XslTransform.html

@@ -13 +13 @@
                         dojo.require("dojo.io.*");
                         dojo.require("dojo.widget.*");
+                        dojo.require("dojo.widget.ContentPane");
+                        dojo.require("dojo.widget.Tree");
+                        dojo.require("dojo.widget.TreeRPCController");
                         dojo.require("dojo.xml.XslTransform");