Changeset 11084

Timestamp:

10/23/07 13:14:41 (9 months ago)

Author:

bill

Message:

Refs #4809: fix focus issues on IE

Location:

dijit/trunk

Files:

• form/Slider.js (modified) (1 diff)
• _base/focus.js (modified) (4 diffs)

dijit/trunk/form/Slider.js

@@ -84 +84 @@
         _onHandleClick: function(e){
                 if(this.disabled){ return; }
-                dijit.focus(this.sliderHandle);
+                if(!dojo.isIE){
+                        // make sure you get focus when dragging the handle
+                        // (but don't do on IE because it causes a flicker on mouse up (due to blur then focus)
+                        dijit.focus(this.sliderHandle);
+                }
                 dojo.stopEvent(e);
         },

dijit/trunk/_base/focus.js

@@ -190 +190 @@
                                         }
                                 });
-                                body.attachEvent('ondeactivate', function(evt){ dijit._onBlurNode(); });
+                                body.attachEvent('ondeactivate', function(evt){ dijit._onBlurNode(evt.srcElement); });
                         }else{
                                 body.addEventListener('focus', function(evt){ dijit._onFocusNode(evt.target); }, true);
-                                body.addEventListener('blur', function(evt){ dijit._onBlurNode(); }, true);
+                                body.addEventListener('blur', function(evt){ dijit._onBlurNode(evt.target); }, true);
                         }
                 }
@@ -199 +199 @@
         },
 
-        _onBlurNode: function(){
+        _onBlurNode: function(/*DomNode*/ node){
                 // summary:
                 //              Called when focus leaves a node.
@@ -205 +205 @@
                 //              which indicates that we tabbed off the last field on the page,
                 //              in which case every widget is marked inactive
-
                 dijit._prevFocus = dijit._curFocus;
                 dijit._curFocus = null;
+
+                var w = dijit.getEnclosingWidget(node);
+                if (w && w._setStateClass){
+                        w._focused = false;
+                        w._setStateClass();
+                }
                 if(dijit._justMouseDowned){
                         // the mouse down caused a new widget to be marked as active; this blur event
@@ -277 +282 @@
                         w._focused = true;
                         w._setStateClass();
-                        // watch for a blur on the node that received focus
-                        var blurConnector = dojo.connect(node, "onblur", function(){
-                                w._focused = false;
-                                w._setStateClass();
-                                if(node==dijit._curFocus){ dijit._curFocus = null; } // so that node!=dijit._curFocus
-                                dojo.disconnect(blurConnector);
-                        });
                 }
         },