Changeset 14485

Timestamp:

07/17/08 10:25:43 (6 months ago)

Author:

doughays

Message:

Fixes #7226 !strict. setAttribute('onClick', myfunc) was being called since onClick was in the attributeMap and in the markup (subsequently calling dojo.connect), AND the menu item code was manually calling this.onClick. Changed _Widget.js to not have the lazy connected events in attributeMap, but have a similar but separate object to contain them.

Location:

dijit/trunk

Files:

• tests/test_Menu.html (modified) (1 diff)
• _Widget.js (modified) (5 diffs)

dijit/trunk/tests/test_Menu.html

@@ -84 +84 @@
                                 <div dojoType="dijit.PopupMenuItem">
                                         <span>Deeper Submenu</span>
-                                        <div dojoType="dijit.Menu" id="submenu4"">
+                                        <div dojoType="dijit.Menu" id="submenu4">
                                                 <div dojoType="dijit.MenuItem" onClick="alert('Sub-submenu 1!')">Sub-sub-menu Item One</div>
                                                 <div dojoType="dijit.MenuItem" onClick="alert('Sub-submenu 2!')">Sub-sub-menu Item Two</div>

dijit/trunk/_Widget.js

@@ -91 +91 @@
         //              on the widget's dom, at the "domNode" attach point, by default.
         //              Other node references can be specified as properties of 'this'
-        attributeMap: {id:"", dir:"", lang:"", "class":"", style:"", title:"",
+        attributeMap: {id:"", dir:"", lang:"", "class":"", style:"", title:""},
+
+        // _deferredConnects: Object
+        //              attributeMap addendum for event handlers that should be connected only on first use
+        _deferredConnects: {
                 onClick: "",
                 onDblClick: "",
@@ -213 +217 @@
 
         constructor: function(){
-                this._onUseEvents = []; // list of events that needs to be connected on first use
+                this._deferredConnects = dojo.clone(this._deferredConnects);
                 for(var attr in this.attributeMap){
-                        if(this[attr] === dijit._connectOnUseEventHandler){
-                                this._onUseEvents[attr] = true;
+                        delete this._deferredConnects[attr]; // can't be in both attributeMap and _deferredConnects
+                }
+                for(var attr in this._deferredConnects){
+                        if(this[attr] !== dijit._connectOnUseEventHandler){
+                                delete this._deferredConnects[attr];
                         }
                 }
@@ -285 +292 @@
                         for(var attr in this.attributeMap){
                                 var value = this[attr];
-                                if(value !== dijit._connectOnUseEventHandler && (typeof value != "undefined") && (typeof value != "object") && ((value !== "" && value !== false) || (params && params[attr]))){
+                                if((typeof value != "undefined") && (typeof value != "object") && ((value !== "" && value !== false) || (params && params[attr]))){
                                         this.setAttribute(attr, value);
+                                }
+                        }
+                        for(var attr in this._deferredConnects){
+                                var value = this[attr];
+                                if(value !== dijit._connectOnUseEventHandler){
+                                        this._onConnect(this, attr);
                                 }
                         }
@@ -448 +461 @@
         },
 
-        _onConnect: function(/*Widget*/ widget, /*String*/ event){
-                if(widget && (typeof widget == "object") && widget._onUseEvents && widget._onUseEvents[event]){
-                        widget.setAttribute(event, widget[event]);
+        _onConnect: function(/*Widget*/ _this, /*String*/ event){
+                if(typeof this._deferredConnects[event] != "undefined"){
+                        delete this._deferredConnects[event];
+                        var mapNode = this[this._deferredConnects[event]||'domNode'];
+                        this.connect(mapNode, event.toLowerCase(), this[event]);
                 }
         },
@@ -482 +497 @@
                                 }
                                 if(/^on[A-Z][a-zA-Z]*$/.test(attr)){ // eg. onSubmit needs to be onsubmit
-                                        if(this._onUseEvents[attr]){
-                                                delete this._onUseEvents[attr];
-                                        }
                                         attr = attr.toLowerCase();
                                 }
                                 dojo.attr(mapNode, attr, value);
-
                 }
         },