Changeset 10580 for dijit/trunk/tests/tree/test_Tree_DnD.html

Timestamp:

09/20/07 22:56:56 (16 months ago)

Author:

bill

Message:

Refactor tree to have a special node (without a corresponding item) at the top of
the tree, so that (for example) the continents/countries tree in test_Tree.html can
have a top node marked "Continents" even though there is no such item in the
data store.

This change requires handlers like onClick() to not fail when item==null, but
rather to assume that's the root node.

Fixes #4527, #4419, #4457.

Files:

• dijit/trunk/tests/tree/test_Tree_DnD.html (modified) (8 diffs)

dijit/trunk/tests/tree/test_Tree_DnD.html

@@ -11 +11 @@
                 @import "../css/dijitTests.css";
                 @import "../dndDefault.css"; 
-
-                @import "../../../dojo/resources/dojo.css";
-                @import "../../../dojo/resources/dnd.css";
-                @import "../../../dojo/tests/dnd/dndDefault.css";
-
-
-
-
+                @import "../../../dojo/resources/dojo.css";
+                @import "../../../dojo/resources/dnd.css";
+                @import "../../../dojo/tests/dnd/dndDefault.css";
         </style>
 
@@ -40 +35 @@
 
                 globalId=1000;
+                lastSelected=null;
 
                 dojo.addOnLoad(function(){
@@ -64 +60 @@
                                         parent: lastSelected,           
                                         attribute: "children"   
-                                }
+                                };
 
                                 //store.newItem({name: dojo.byId('newCat').value, id:globalId++, numberOfItems:dojo.byId('numItems').value}, pInfo);
@@ -118 +114 @@
                 function tree2CheckItemAcceptance(node,source) {
                         var item = this.tree._domElement2TreeNode(node).item;
-                        if (this.tree.store.hasAttribute(item,"numberOfItems")){
+                        if (item && this.tree.store.hasAttribute(item,"numberOfItems")){
                                 var numItems=this.tree.store.getValues(item, "numberOfItems");
                                 return true;
@@ -145 +141 @@
 
                 function getIcon(item) {
-                        if (catStore.hasAttribute(item, "numberOfItems")) {
+                        if (!item || catStore.hasAttribute(item, "numberOfItems")) {
                                 console.log("returning folder class");
                                 return "myFolder";
@@ -152 +148 @@
                         return "myItem"
                 }
-
         </script>
 
@@ -178 +173 @@
         <div dojoType="dojo.data.ItemFileWriteStore" jsId="catStore"
                 url="categories.json"></div>
-
-
-
 
         <table width="100%" style="margin:5px solid gray" >
@@ -218 +210 @@
                         <h2>Collection Count Summary</h2>
                         <p>You can't drop items onto this tree.</p>
-                        <div class="container" dojoType="dijit.Tree" id="myTree" store="catStore" labelAttr="name" getLabel="tree1CustomLabel"  childrenAttr="children" dndController="dijit._tree.dndSource" checkAcceptance="dndAccept" getIconClass="getIcon"></div>
+                        <div class="container" dojoType="dijit.Tree" id="myTree" store="catStore" label="Collections"
+                                labelAttr="name" getLabel="tree1CustomLabel"  childrenAttr="children" dndController="dijit._tree.dndSource"
+                                checkAcceptance="dndAccept" getIconClass="getIcon"></div>
                 </td>
                 <td>
                         <h2>Collection</h2>
                         <p>Drop items onto this tree, but only on categories, should fail to let you drop on other items.</p>
-                        <div class="container" dojoType="dijit.Tree" id="myTree2" store="catStore"  labelAttr="name"  childrenAttr="children, items" dndController="dijit._tree.dndSource" onDndDrop="tree2CustomDrop" checkAcceptance="dndAccept" checkItemAcceptance="tree2CheckItemAcceptance" getIconClass="getIcon"></div> 
+                        <div class="container" dojoType="dijit.Tree" id="myTree2" label="Collections" store="catStore"  labelAttr="name"  childrenAttr="children, items" dndController="dijit._tree.dndSource" onDndDrop="tree2CustomDrop" checkAcceptance="dndAccept" checkItemAcceptance="tree2CheckItemAcceptance" getIconClass="getIcon"></div> 
                 </td>
         </tr>
         </table>
 
-
         </body>
 </html>