Changeset 12858

Timestamp:

03/03/08 17:43:47 (9 months ago)

Author:

bill

Message:

Tree tests specified labelAttr even though there is currently no such attribute.
(And even if there was such an attribute, would only need to specify it when wanted to specify a non-default label.)
Refs #6065.

Location:

dijit/trunk

Files:

• demos/mail.html (modified) (1 diff)
• tests/test_Tree.html (modified) (2 diffs)
• tests/test_Tree_Notification_API_Support.html (modified) (1 diff)
• tests/tree/test_Tree_v1.html (modified) (1 diff)
• tests/_inspector.html (modified) (1 diff)
• themes/themeTester.html (modified) (8 diffs)
• themes/themeTesterQuirk.html (modified) (1 diff)

dijit/trunk/demos/mail.html

@@ -304 +304 @@
                                         <div dojoType="dijit.layout.AccordionPane" title="Folders">
                                                 <div dojoType="dijit.Tree" id="mytree" store="mailStore"
-                                                        labelAttr="label" childrenAttr="folders" query="{type:'folder'}" label="Folders">
+                                                        childrenAttr="folders" query="{type:'folder'}" label="Folders">
                                                         <script type="dojo/method" event="onClick" args="item">
                                                                 if(!item){

dijit/trunk/tests/test_Tree.html

@@ -36 +36 @@
         <p>Clicking a folder node will open/close it (openOnclick==true), and clicking a leaf node will popup an alert.</p>
         <div dojoType="dijit.Tree" id="mytree"
-                model="continentModel" labelAttr="name" childrenAttr="children"
+                model="continentModel" childrenAttr="children"
                 openOnClick="true">
                 <script type="dojo/method" event="onClick" args="item">
@@ -81 +81 @@
 
         <div dojoType="dijit.Tree" id="tree2"
-                model="continentModel" labelAttr="name" childrenAttr="children"
+                model="continentModel" childrenAttr="children"
                 showRoot="false" openOnClick="true">
 

dijit/trunk/tests/test_Tree_Notification_API_Support.html

@@ -215 +215 @@
                 url="../tests/_data/treeTest.json"></div>
 
-        <div dojoType="dijit.Tree" id="myTree" label="root" store="store" onClick="onSelectItem" labelAttr="name" somePropertyAttr="someProperty"></div>
+        <div dojoType="dijit.Tree" id="myTree" label="root" store="store" onClick="onSelectItem" somePropertyAttr="someProperty"></div>
 
         <br />

dijit/trunk/tests/tree/test_Tree_v1.html

@@ -34 +34 @@
                 onfocus="console.log('user focus handler')"
                 onblur="console.log('user blur handler')"
-                labelAttr="name" label="Continents" openOnClick="true">
+                label="Continents" openOnClick="true">
                 <script type="dojo/method" event="onClick" args="item">
                         alert("Execute of node " + continentStore.getLabel(item)

dijit/trunk/tests/_inspector.html

@@ -31 +31 @@
                 <div dojoType="dijit.layout.ContentPane" layoutAlign="left">
                         <div dojoType="dijit.Tree" id="mytree" store="theStore" query="{namespace:'dijit'}"
-                                labelAttr="className" label="Dijits">
+                                label="Dijits">
                         <script type="dojo/method" event="onClick" args="item">
                 

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, #mainSplit { margin: 10px; } */
+                #header, #main { margin: 10px; }
                 #leftAccordion { width: 25%; }
                 #bottomTabs { height: 40%; }
@@ -56 +57 @@
         </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>
@@ -71 +65 @@
         <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()
@@ -126 +130 @@
                 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');
@@ -148 +152 @@
                         var start = new Date().getTime();
                         dojo.parser.parse(dojo.byId('container')); 
-                        console.info("Total parse time: " + (new Date().getTime() - start) + "ms");
+                        console.log("Total parse time: " + (new Date().getTime() - start) + "ms");
 
                         dojo.byId('loaderInner').innerHTML += " done.";
-                        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(", "));
-                        }
+                        setTimeout(function(){hideLoader();},250);
+                        
                 });
 
@@ -300 +290 @@
                                         <!-- tree widget -->
                                         <div dojoType="dijit.Tree" store="continentStore" query="{type:'continent'}"
-                                                labelAttr="name" typeAttr="type" label="Continents">
+                                                label="Continents">
                                         </div>
                                 </div>
@@ -685 +675 @@
                                         <div style="float:left; margin:5px; ">
                                                 <h3>Source 1</h3>
-                                                <div dojoType="dojo.dnd.Source" style="border:3px solid #ccc; padding: 1em 3em; ">
+                                                <div dojoType="dojo.dnd.Source" class="container">
                                                         <div class="dojoDndItem">Item <strong>X</strong></div>
                                                         <div class="dojoDndItem">Item <strong>Y</strong></div>
@@ -693 +683 @@
                                         <div style="float:left; margin:5px; ">
                                                 <h3>Source 2</h3>
-                                                <div dojoType="dojo.dnd.Source" style="border:3px solid #ccc; padding: 1em 3em; ">
+                                                <div dojoType="dojo.dnd.Source" class="container">
                                                         <div class="dojoDndItem">Item <strong>1</strong></div>
                                                         <div class="dojoDndItem">Item <strong>2</strong></div>

dijit/trunk/themes/themeTesterQuirk.html

@@ -286 +286 @@
                                         <!-- tree widget -->
                                         <div dojoType="dijit.Tree" store="continentStore" query="{type:'continent'}"
-                                                labelAttr="name" typeAttr="type" label="Continents">
+                                                label="Continents">
                                         </div>
                                 </div>