Changeset 12861

Timestamp:

03/03/08 18:03:13 (9 months ago)

Author:

bill

Message:

Ooops, [12858] overwrote some other changes. Refs #6065.

Files:

• dijit/trunk/themes/themeTester.html (modified) (7 diffs)

dijit/trunk/themes/themeTester.html

@@ -8 +8 @@
                 @import "../../dojo/resources/dojo.css";
                 @import "../tests/css/dijitTests.css";
-                @import "../../dojo/tests/dnd/dndDefault.css";
 
                 html, body { height: 100%; width: 100%; padding: 0; border: 0; }
                 #main { height: 100%; width: 100%; padding: 0; border: 0; }
-                #header, #main { margin: 10px; }
+/*              #header, #mainSplit { margin: 10px; } */
                 #leftAccordion { width: 25%; }
                 #bottomTabs { height: 40%; }
@@ -57 +56 @@
         </style>
 
+        <script type="text/javascript">
+                window.__globalList = {dojo: true, dijit: true, dojox: true, djConfig: true};
+                for(var i in window){
+                        window.__globalList[i] = true;
+                }
+        </script>
+
         <script type="text/javascript" src="../../dojo/dojo.js" 
                 djConfig="parseOnLoad: false, isDebug: true"></script>
@@ -65 +71 @@
         <script type="text/javascript" src="../dijit-all.js"></script>
 
-        <script type="text/javascript">
-                // this is just a list of 'official' dijit themes, you can use ?theme=String 
-                // for 'un-supported' themes, too. (eg: yours) 
-                var availableThemes = [
-                        { theme:"tundra", author:"Dojo", baseUri:"../themes/" },
-                        { theme:"soria", author:"nikolai", baseUri:"../themes/" },
-                        //{ theme:"noir", author:"owen", baseUri:"../themes/"},
-                        { theme:"nihilo", author:"nikolai", baseUri:"../themes/" }
-                ];
-        </script>
         <script type="text/javascript" src="../tests/_testCommon.js"></script>
         <script type="text/javascript"> // dojo.requires()
@@ -130 +126 @@
                 function myHandler(id,newValue){
                         console.debug("onChange for id = " + id + ", value: " + newValue);
-                };
-
-                function hideLoader(){
-                        var loader = dojo.byId('loader'); 
-                        dojo.fadeOut({ node: loader, duration:500,
-                                onEnd: function(){ 
-                                        loader.style.display = "none"; 
-                                }
-                        }).play();
                 }
 
                 dojo.addOnLoad(function() {
+
+                        // this is just a list of 'official' dijit themes, you can use ?theme=String 
+                        // for 'un-supported' themes, too. (eg: yours) 
+                        var availableThemes = [
+                                { theme:"tundra", author:"Dojo", baseUri:"../themes/" },
+                                { theme:"soria", author:"nikolai", baseUri:"../themes/" },
+                                //{ theme:"noir", author:"owen", baseUri:"../themes/"},
+                                { theme:"nihilo", author:"nikolai", baseUri:"../themes/" }
+                        ];
 
                         var holder = dojo.byId('themeData');
@@ -152 +148 @@
                         var start = new Date().getTime();
                         dojo.parser.parse(dojo.byId('container')); 
-                        console.log("Total parse time: " + (new Date().getTime() - start) + "ms");
+                        console.info("Total parse time: " + (new Date().getTime() - start) + "ms");
 
                         dojo.byId('loaderInner').innerHTML += " done.";
-                        setTimeout(function(){hideLoader();},250);
-                        
+                        setTimeout(function hideLoader(){
+                                var loader = dojo.byId('loader'); 
+                                dojo.fadeOut({ node: loader, duration:500,
+                                        onEnd: function(){ 
+                                                loader.style.display = "none"; 
+                                        }
+                                }).play();
+                        }, 250);
+
+                        var strayGlobals = [];
+                        for(var i in window){
+                                if(!window.__globalList[i]){ strayGlobals.push(i); }
+                        }
+                        if(strayGlobals.length){
+                                console.warn("Stray globals: "+strayGlobals.join(", "));
+                        }
                 });
 
@@ -675 +685 @@
                                         <div style="float:left; margin:5px; ">
                                                 <h3>Source 1</h3>
-                                                <div dojoType="dojo.dnd.Source" class="container">
+                                                <div dojoType="dojo.dnd.Source" style="border:3px solid #ccc; padding: 1em 3em; ">
                                                         <div class="dojoDndItem">Item <strong>X</strong></div>
                                                         <div class="dojoDndItem">Item <strong>Y</strong></div>
@@ -683 +693 @@
                                         <div style="float:left; margin:5px; ">
                                                 <h3>Source 2</h3>
-                                                <div dojoType="dojo.dnd.Source" class="container">
+                                                <div dojoType="dojo.dnd.Source" style="border:3px solid #ccc; padding: 1em 3em; ">
                                                         <div class="dojoDndItem">Item <strong>1</strong></div>
                                                         <div class="dojoDndItem">Item <strong>2</strong></div>