Changeset 14557

Timestamp:

07/22/08 11:50:08 (4 months ago)

Author:

bill

Message:

Move code in constructor into create(), where all the other code is.
Refs #5417 !strict.

Files:

• dijit/trunk/_Widget.js (modified) (3 diffs)

dijit/trunk/_Widget.js

@@ -214 +214 @@
         postscript: function(/*Object?*/params, /*DomNode|String*/srcNodeRef){
                 this.create(params, srcNodeRef);
-        },
-
-        constructor: function(){
-                this._deferredConnects = dojo.clone(this._deferredConnects);
-                for(var attr in this.attributeMap){
-                        delete this._deferredConnects[attr]; // can't be in both attributeMap and _deferredConnects
-                }
-                // If a subclass has redefined a callback (ex: onClick) then assume it's being
-                // attached to explicitly, via dojoAttachEvent="" (or attributeMap, but that was handled
-                // above) and ignore the entry in _deferredConnects
-                for(var attr in this._deferredConnects){
-                        if(this[attr] !== dijit._connectOnUseEventHandler){
-                                delete this._deferredConnects[attr];
-                        }
-                }
         },
 
@@ -269 +254 @@
                 this._attaches = [];
 
+                // To avoid double-connects, remove entries from _deferredConnects
+                // that have been setup manually by a subclass (ex, by dojoAttachEvent).
+                // If a subclass has redefined a callback (ex: onClick) then assume it's being
+                // connected to manually.
+                this._deferredConnects = dojo.clone(this._deferredConnects);
+                for(var attr in this.attributeMap){
+                        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];    // redefined, probably dojoAttachEvent exists
+                        }
+                }
+
                 //mixin our passed parameters
                 if(this.srcNodeRef && (typeof this.srcNodeRef.id == "string")){ this.id = this.srcNodeRef.id; }
@@ -279 +278 @@
                 // generate an id for the widget if one wasn't specified
                 // (be sure to do this before buildRendering() because that function might
-                // expect the id to be there.
+                // expect the id to be there.)
                 if(!this.id){
                         this.id = dijit.getUniqueId(this.declaredClass.replace(/\./g,"_"));