Changeset 10525

Timestamp:

09/16/07 19:47:23 (11 months ago)

Author:

peller

Message:

raise attributemap branch revs from [10478] to [10524]. Refs #3058

Location:

dijit/branches/attributemap

Files:

• Declaration.js (modified) (1 diff)
• demos/chat/client.html (modified) (1 diff)
• demos/chat/room.js (modified) (2 diffs)
• demos/mail.html (modified) (6 diffs)
• form/InlineEditBox.js (modified) (2 diffs)
• form/_DropDownTextBox.js (modified) (2 diffs)
• layout/StackContainer.js (modified) (3 diffs)
• tests/form/test_ComboBox.html (modified) (2 diffs)
• tests/test_Tree.html (modified) (2 diffs)
• tests/tree (copied) (copied from dijit/trunk/tests/tree)
• themes/themeTester.html (modified) (3 diffs)
• themes/tundra/tundra.css (modified) (10 diffs)
• Tree.js (modified) (17 diffs)
• _base/focus.js (modified) (1 diff)
• _base/manager.js (modified) (1 diff)
• _tree/dndContainer.js (copied) (copied from dijit/trunk/_tree/dndContainer.js)
• _tree/dndSelector.js (copied) (copied from dijit/trunk/_tree/dndSelector.js)
• _tree/dndSource.js (copied) (copied from dijit/trunk/_tree/dndSource.js)
• _Widget.js (modified) (1 diff)

dijit/branches/attributemap/Declaration.js

@@ -36 +36 @@
                         }
                         propList.widgetsInTemplate = true;
-                        propList.templateString = "<"+srcType+" class='"+src.className+"'>"+src.innerHTML.replace(/\%7B/g,"{").replace(/\%7D/g,"}")+"</"+srcType+">";
+                        propList.templateString = "<"+srcType+" class='"+src.className+"' dojoAttachPoint='"+(src.getAttribute("dojoAttachPoint")||'')+"' dojoAttachEvent='"+(src.getAttribute("dojoAttachEvent")||'')+"' >"+src.innerHTML.replace(/\%7B/g,"{").replace(/\%7D/g,"}")+"</"+srcType+">";
+                        // console.debug(propList.templateString);
 
                         // strip things so we don't create stuff under us in the initial setup phase

dijit/branches/attributemap/demos/chat/client.html

@@ -59 +59 @@
         <div title="Chat with Technical Support:" id="helpPane" dojoType="dijit.TitlePane" 
                 style="width:275px; height:400px; position:absolute; top:4px; right:4px; margin:0; padding:0; display:none;" open="false" >
-                <div dojoType="dijit.demos.chat.Room" id="chatroom" private="true"></div>
+                <div dojoType="dijit.demos.chat.Room" id="chatroom" isPrivate="true"></div>
         </div>
 

dijit/branches/attributemap/demos/chat/room.js

@@ -12 +12 @@
         _username: null,
         roomId: "public",
-        private: false,
+        isPrivate: false,
         prompt: "Name:",
 
@@ -32 +32 @@
                         alert('Please enter a username!');
                 }else{
-                        if(this.private){ this.roomId = name; } 
+                        if(this.isPrivate){ this.roomId = name; } 
                         this._username=name;
                         this.joining.className='hidden';

dijit/branches/attributemap/demos/mail.html

@@ -39 +39 @@
                 dojo.require("dijit.layout.ContentPane");
 
+                function initWai(){
+                        dijit.wai.setAttr(dojo.body(), "waiRole", "role", "application");
+                }
+                dojo.addOnLoad(initWai);
+                
                 var paneId=1;
 
@@ -58 +63 @@
                                         // set progress back to indeterminate. we're cheating, because this
                                         // doesn't actually have any data to "progress"
-                                        onEnd: function(){ dijit.byId('fakeFetch').update({ indeterminate: true }) }
+                                        onEnd: function(){ 
+                                                dijit.byId('fakeFetch').update({ indeterminate: true });
+                                                dojo.byId('fetchMail').style.visibility='hidden'; // remove progress bar from tab order
+                                        }
                                 }).play();
                         }
@@ -65 +73 @@
                         // FIXME: can't set a label on an indeterminate progress bar
                         // like if(this.indeterminate) { return " connecting."; }
-                        return "Fetching: "+(percent*this.maximum) + " of " + this.maximum + " messgaes.";
+                        return "Fetching: "+(percent*this.maximum) + " of " + this.maximum + " messages.";
                 }
                 var fakeDownload = function(){
+                        dojo.byId('fetchMail').style.visibility='visible';
                         numMails = Math.floor(Math.random()*10)+1;
                         dijit.byId('fakeFetch').update({ maximum: numMails, progress:0 });
@@ -88 +97 @@
                         setTimeout("stopSendBar()", 3000);
                 }
-                
-
-                
+
         </script>
 
@@ -243 +250 @@
                 <div dojoType="dijit.Toolbar" layoutAlign="top" style="height:25px;">
                         <div id="getMail" dojoType="dijit.form.ComboButton"
-                                iconClass="mailIconGetMail">
+                                iconClass="mailIconGetMail" optionsTitle="Mail Source Options">
                                 <script type="dojo/method" event="onClick">
                                         fakeDownload();
@@ -286 +293 @@
                 <div dojoType="dijit.layout.ContentPane" layoutAlign="bottom" id="footer" align="left">
                         <span style="float:right;">DojoMail v0.9b (demo only)</span>
-                        <div id="fetchMail" style="opacity:0;">
+                        <div id="fetchMail" style="opacity:0;visibility:hidden">
                         <div annotate="true" id="fakeFetch" dojoType="dijit.ProgressBar" style="height:15px; width:275px;" indeterminate="true" report="fakeReport"></div>
                         </div>

dijit/branches/attributemap/form/InlineEditBox.js

@@ -209 +209 @@
                 // e is passed in if click on save button or user presses Enter.  It's not
                 // passed in when called by _onBlur.
-                if(e){ dojo.stopEvent(e); }
+                if(typeof e == "object"){ dojo.stopEvent(e); }
                 if(!this.enableSave()){ return; }
                 this.editing = false;
@@ -293 +293 @@
                         this._showText(); // asynchronous update made famous by ComboBox/FilteringSelect
                 }else if(this.autoSave){
-                        this.save();
+                        this.save(1);
                 }else{
                         // #3752

dijit/branches/attributemap/form/_DropDownTextBox.js

@@ -153 +153 @@
                                 var popupbox=dojo.marginBox(this._popupWidget.domNode);
                                 this._popupWidget.domNode.style.overflow=((best.h==popupbox.h)&&(best.w==popupbox.w))?"hidden":"auto";
-                                dojo.marginBox(this._popupWidget.domNode, {h:best.h,w:Math.max(best.w,this.domNode.offsetWidth)});
-
+                                // #4134: borrow TextArea scrollbar test so content isn't covered by scrollbar and horizontal scrollbar doesn't appear
+                                var newwidth=best.w;
+                                if(best.h<this._popupWidget.domNode.scrollHeight){newwidth+=16;}
+                                dojo.marginBox(this._popupWidget.domNode, {h:best.h,w:Math.max(newwidth,this.domNode.offsetWidth)});
                         }
                 },
@@ -175 +177 @@
                 open:function(){
                         this.makePopup();
-                        var self=this;
-                        self._isShowingNow=true;
+                        this._isShowingNow=true;
                         return dijit.popup.open({
                                 popup: this._popupWidget,

dijit/branches/attributemap/layout/StackContainer.js

@@ -23 +23 @@
         _started: false,
 
+        // selectedChildWidget: Widget
+        //      References the currently selected child widget, if any
+
         startup: function(){
                 if(this._started){ return; }
@@ -39 +42 @@
                 }, this);
 
+                var selected = this.selectedChildWidget;
+
                 // Default to the first child
-                if(!this.selectedChildWidget && children[0]){
-                        this.selectedChildWidget = children[0];
-                        this.selectedChildWidget.selected = true;
-                }
-                if(this.selectedChildWidget){
-                        this._showChild(this.selectedChildWidget);
+                if(!selected && children[0]){
+                        selected = this.selectedChildWidget = children[0];
+                        selected.selected = true;
+                }
+                if(selected){
+                        this._showChild(selected);
                 }
 
                 // Now publish information about myself so any StackControllers can initialize..
-                dojo.publish(this.id+"-startup", [{children: children, selected: this.selectedChildWidget}]);
+                dojo.publish(this.id+"-startup", [{children: children, selected: selected}]);
 
                 dijit.layout._LayoutWidget.prototype.startup.apply(this, arguments);
@@ -158 +163 @@
                 //      Keystroke handling for keystrokes on the tab panel itself (that were bubbled up to me)
                 //      Ctrl-w: close tab
-                if (e.ctrlKey){
+                if(e.ctrlKey){
                         switch(e.keyCode){
                                 case dojo.keys.PAGE_DOWN:

dijit/branches/attributemap/tests/form/test_ComboBox.html

@@ -185 +185 @@
         <hr>
         <p>ComboBox #4: url, autocomplete=false required=true:</p>
-        <label for="datatest">US State test 4: </label>
+        <label for="combobox4">US State test 4: </label>
         <input dojoType="dijit.form.ComboBox"
                         value=""
@@ -195 +195 @@
                         onChange="setVal4"
                         autocomplete="false"
-                        id="datatest"
+                        id="combobox4"
                         required="true"
         >

dijit/branches/attributemap/tests/test_Tree.html

@@ -36 +36 @@
                         alert("Execute of node " + continentStore.getLabel(item)
                                 +", population=" + continentStore.getValue(item, "population"));
+                </script>
+                <script type="dojo/method" event="getIconClass" args="item">
+                        return "noteIcon";
                 </script>
         </div>
@@ -97 +100 @@
                         });
                 </script>
+                <script type="dojo/method" event="getIconClass" args="item">
+                        return "noteIcon";
+                </script>
         </div>
 

dijit/branches/attributemap/themes/themeTester.html

@@ -433 +433 @@
                                                         intermediateChanges="true"
                                                         style="width:50%; height: 20px;"
-                                                        id="slider1">
+                                                        id="horizontal1">
                                                                 <ol dojoType="dijit.form.HorizontalRuleLabels" container="topDecoration" style="height:1.2em;font-size:75%;color:gray;">
                                                                         <li>
@@ -453 +453 @@
                                                 <br>Value: <input id="slider1input" size="5">
 
-                                                <div dojoType="dijit.form.HorizontalSlider" name="horizontal1"
+                                                <div dojoType="dijit.form.HorizontalSlider" name="horizontal2"
                                                         minimum="1"
                                                         value="2"
@@ -461 +461 @@
                                                         intermediateChanges="true"
                                                         style="width:300px; height: 40px;"
-                                                        id="slider1">
+                                                        id="horizontal2">
                                                                 <div dojoType="dijit.form.HorizontalRule" container="bottomDecoration" count=3 style="height:5px;"></div>
                                                                 <ol dojoType="dijit.form.HorizontalRuleLabels" container="bottomDecoration"style="height:1em;font-size:75%;color:gray;">

dijit/branches/attributemap/themes/tundra/tundra.css

@@ -8 +8 @@
 .dj_safari .tundra .dijitPopup {
         /* -webkit-border-radius: 5px; */
-        -webkit-box-shadow: 0px 3px 7px #adadad;
+        -webkit-box-shadow: 0px 5px 10px #adadad;
 }
 
@@ -36 +36 @@
 .dj_ie6 .tundra .dijitButtonNode {
         position:relative; 
+}
+
+.tundra .dijitA11yDownArrow,
+.tundra .dijitDownArrowButton,
+.tundra .dijitUpArrowButton {
+        font-size: 0.75em;
+        color: #848484;
 }
 
@@ -181 +188 @@
 .tundra .dijitComboBox {
         /* put margin on the outer element of the autocompleter rather than the input */
-        margin:.0em .1em .2em .1em;
+        margin: 0em 0.1em 0.2em 0.1em;
 }
 
@@ -201 +208 @@
         border-color:#366dba;
         border-style:inset;
+        /* outline: auto 5px -webkit-focus-ring-color; */
 }
 
@@ -256 +264 @@
 .tundra .dijitInputFieldValidationIconText {
         visibility: hidden;
+}
+
+.tundra td.dijitInputField {
+        margin: 0px;
+        padding: 0px 0px 0px 0.3em;
 }
 
@@ -384 +397 @@
 
 .tundra .dijitMenuItemHover {
-        background-color: #95a0b0; /* #555555; #aaaaaa; #646464;  #60a1ea; */
+        background-color: #808080; /* #95a0b0; #555555; #aaaaaa; #646464;  #60a1ea; #848484; */
         color:#fff;
 }
@@ -657 +670 @@
         background: #eee;
         border: 1px solid #999;
-        -webkit-box-shadow: 0px 3px 7px #adadad;
+        -webkit-box-shadow: 0px 5px 10px #adadad;
 }
 
@@ -826 +839 @@
 .tundra .dijitAccordionPane .dijitAccordionTitle {
         background:#fafafa url("images/titleBar.png") repeat-x bottom left;
-        border: 1px solid #bfbfbf;
+        border-left: 1px solid #bfbfbf;
+        border-top: 1px solid #bfbfbf;
+        border-right: 1px solid #bfbfbf;
         padding:4px 4px 2px 4px;
 }
@@ -833 +848 @@
         background: #ededed url("images/buttonActive.png") bottom repeat-x;
         font-weight: bold;
-        /* border:1px solid #84a3d1; */
-        border: 1px solid #aaaaaa;
+        border-left: 1px solid #aaaaaa;
+        border-top: 1px solid #aaaaaa;
+        border-right: 1px solid #aaaaaa;
         padding: 4px 4px 2px 4px;
 }
@@ -858 +874 @@
 .tundra .dijitAccordionPane .dijitAccordionBody {
         background: #fff;
+        /*
         border:1px solid #bfbfbf;
+        */
+        border-left: 1px solid #bfbfbf;
+        border-top: 1px solid #bfbfbf;
+        border-right: 1px solid #bfbfbf;
 }
 

dijit/branches/attributemap/Tree.js

@@ -20 +20 @@
         state: "UNCHECKED",
         locked: false,
+        startExpanded: true,
 
         lock: function(){
@@ -48 +49 @@
                 return false;
         },
+
 
         _setChildren: function(/* Object[] */ childrenArray){
@@ -82 +84 @@
                                 child._updateLayout();
                         });
-
                 }else{
                         this.isExpandable=false;
@@ -97 +98 @@
                         // change expando to/form dot or + icon, as appropriate
                         this._setExpando(false);
+                }
+
+                if (this.isTree && this.startExpanded) {
+                        var children = this.getChildren();
+                        for(var i=0; i<children.length;i++){
+                                if (children[i].isExpandable){
+                                        this._expandNode(children[i]);  
+                                }
+                        }
                 }
 
@@ -129 +139 @@
         },
 
-        deleteNode: function(/* treeNode */ node) {
+        deleteNode: function(/* treeNode */ node){
                 node.destroy();
 
@@ -137 +147 @@
         },
 
-        makeExpandable: function() {
+        makeExpandable: function(){
                 //summary
                 //              if this node wasn't already showing the expando node,
@@ -159 +169 @@
 
         // childrenAttr: String
-        //              name of attribute that holds children of a tree node
+        //              one ore more attributes that holds children of a tree node
         childrenAttr: "children",
 
@@ -167 +177 @@
 
         isTree: true,
+
+        // dndController: String
+        //      class name to use as as the dnd controller
+        dndController: null,
+
+        //parameters to pull off of the tree and pass on to the dndController as its params
+        dndParams: ["onDndDrop","itemCreator","onDndCancel","checkAcceptance", "checkItemAcceptance"],
+
+        //declare the above items so they can be pulled from the tree's markup
+        onDndDrop:null,
+        itemCreator:null,
+        onDndCancel:null,
+        checkAcceptance:null,   
+        checkItemAcceptance:null,
 
         _publish: function(/*String*/ topicName, /*Object*/ message){
@@ -179 +203 @@
                 this._itemNodeMap={};
 
-                // if the store supports Notification, subscribe to the notifcation events
+                // if the store supports Notification, subscribe to the notification events
                 if (this.store.getFeatures()['dojo.data.api.Notification']){
                         this.connect(this.store, "onNew", "_onNewItem");
@@ -200 +224 @@
                 // load top level children
                 this.getItemChildren(null, dojo.hitch(this, "_onLoadAllItems", this));
+
+                if (this.dndController){
+                        if (dojo.isString(this.dndController)){
+                                this.dndController= dojo.getObject(this.dndController);
+                        }       
+                        var params={};
+                        for (var i=0; i<this.dndParams.length;i++){
+                                if (this[this.dndParams[i]]){
+                                        params[this.dndParams[i]]=this[this.dndParams[i]];
+                                }
+                        }
+                        this.dndController= new this.dndController(this, params);
+                }
         },
 
@@ -210 +247 @@
                 //              (For efficiency reasons we may not want to check if an element has
                 //              children until user clicks the expando node)
-                return this.store.hasAttribute(item, this.childrenAttr);
+
+                if (dojo.isString(this.childrenAttr)){
+                        this.childrenAttr = this.childrenAttr.split(/,\s*/);
+                }
+
+                if (!dojo.isArray(this.childrenAttr)){
+                        this.childrenAttr=[this.childrenAttr];
+                }
+
+                for (var i=0; i<this.childrenAttr.length; i++){ 
+                        if (this.store.hasAttribute(item, this.childrenAttr[i])){
+                                return true;
+                        }
+                }
+                return false;
         },
 
@@ -220 +271 @@
                 if(parentItem == null){
                         // get top level nodes
-                        store.fetch({ query: this.query, onComplete: onComplete });
+                        store.fetch({ query: this.query, onComplete: onComplete});
                 }else{
                         // get children of specified node
-                        var childItems = store.getValues(parentItem, this.childrenAttr);
-
+                        var childItems = [];
+                        for (var i=0; i<this.childrenAttr.length; i++){ 
+                                childItems= childItems.concat(store.getValues(parentItem, this.childrenAttr[i]));
+                        }
                         // count how many items need to be loaded
                         var _waitCount = 0;
@@ -256 +309 @@
         },
 
-        getLabel: function(/*dojo.data.Item*/ item) {
+        getLabel: function(/*dojo.data.Item*/ item){
                 // summary: user overridable function to get the label for a tree node (given the item)
                 return this.store.getLabel(item);       // String
@@ -648 +701 @@
                 //summary: callback when new item has been added to the store.
 
+                var loadNewItem=false;
                 if (parentInfo){