Changeset 49956 in webkit

Timestamp:

Oct 22, 2009 2:08:58 PM (14 years ago)

Author:

Joseph Pecoraro

Message:

2009-10-22 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Timothy Hatcher.

Web Inspector: windowFocused and windowBlured Fail to Clear/Mark Inspector as "inactive"
​https://bugs.webkit.org/show_bug.cgi?id=30663

Correctly handle focusing/blurring on inner <iframe>'s such as Source Frames.

• inspector/front-end/inspector.js: (WebInspector.windowFocused): fix for inner iframes (WebInspector.windowBlurred): fix for inner iframes (WebInspector.addMainEventListeners): change useCapture to false

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/inspector.js (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-22  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: windowFocused and windowBlured Fail to Clear/Mark Inspector as "inactive"
+        https://bugs.webkit.org/show_bug.cgi?id=30663
+
+          Correctly handle focusing/blurring on inner <iframe>'s such as Source Frames.
+
+        * inspector/front-end/inspector.js:
+        (WebInspector.windowFocused): fix for inner iframes
+        (WebInspector.windowBlurred): fix for inner iframes
+        (WebInspector.addMainEventListeners): change useCapture to false
+
 2009-10-22  Jaime Yap  <jaimeyap@google.com>
 

trunk/WebCore/inspector/front-end/inspector.js

@@ -512 +512 @@
 WebInspector.windowFocused = function(event)
 {
-    if (event.target === document.defaultView)
+    // Fires after blur, so when focusing on either the main inspector
+    // or an <iframe> within the inspector we should always remove the
+    // "inactive" class.
+    if (event.target.document.nodeType === Node.DOCUMENT_NODE)
         document.body.removeStyleClass("inactive");
 }
@@ -518 +521 @@
 WebInspector.windowBlurred = function(event)
 {
-    if (event.target === document.defaultView)
+    // Leaving the main inspector or an <iframe> within the inspector.
+    // We can add "inactive" now, and if we are moving the focus to another
+    // part of the inspector then windowFocused will correct this.
+    if (event.target.document.nodeType === Node.DOCUMENT_NODE)
         document.body.addStyleClass("inactive");
 }
@@ -1424 +1430 @@
 WebInspector.addMainEventListeners = function(doc)
 {
-    doc.defaultView.addEventListener("focus", this.windowFocused.bind(this), true);
-    doc.defaultView.addEventListener("blur", this.windowBlurred.bind(this), true);
+    doc.defaultView.addEventListener("focus", this.windowFocused.bind(this), false);
+    doc.defaultView.addEventListener("blur", this.windowBlurred.bind(this), false);
     doc.addEventListener("click", this.documentClick.bind(this), true);
 }