Title: [172769] branches/safari-600.1-branch/Source/WebInspectorUI
- Revision
- 172769
- Author
- dburk...@apple.com
- Date
- 2014-08-19 15:47:37 -0700 (Tue, 19 Aug 2014)
Log Message
Merge r172617. <rdar://problem/18023242>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (172768 => 172769)
--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-19 22:43:40 UTC (rev 172768)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-19 22:47:37 UTC (rev 172769)
@@ -1,5 +1,26 @@
2014-08-19 Dana Burkart <dburk...@apple.com>
+ Merge r172617. <rdar://problem/18023242>
+
+ 2014-08-14 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Dragging Undocked inspector by window title has broken behavior
+ https://bugs.webkit.org/show_bug.cgi?id=135950
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Main.js:
+ On Mac ports where we the inspector content goes everywhere, window dragging behavior
+ still exists for the top 22px of the window. So don't do our _javascript_ based window
+ dragging for this special region.
+
+ * UserInterface/Models/KeyboardShortcut.js:
+ (WebInspector.KeyboardShortcut.Modifier.get CommandOrControl):
+ (WebInspector.KeyboardShortcut.prototype.get displayName):
+ Instead of calling a host function, use the value already in the frontend.
+
+2014-08-19 Dana Burkart <dburk...@apple.com>
+
Merge r172615. <rdar://problem/18024530>
2014-08-14 Joseph Pecoraro <pecor...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Main.js (172768 => 172769)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-08-19 22:43:40 UTC (rev 172768)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-08-19 22:47:37 UTC (rev 172769)
@@ -1312,6 +1312,13 @@
!event.target.classList.contains("item-section"))
return;
+ // Ignore dragging on the top of the toolbar on Mac where the inspector content fills the entire window.
+ if (WebInspector.Platform.name === "mac" && WebInspector.Platform.version.release >= 10) {
+ const windowDragHandledTitleBarHeight = 22;
+ if (event.pageY < windowDragHandledTitleBarHeight)
+ return;
+ }
+
var lastScreenX = event.screenX;
var lastScreenY = event.screenY;
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Models/KeyboardShortcut.js (172768 => 172769)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Models/KeyboardShortcut.js 2014-08-19 22:43:40 UTC (rev 172768)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Models/KeyboardShortcut.js 2014-08-19 22:47:37 UTC (rev 172769)
@@ -93,7 +93,7 @@
get CommandOrControl()
{
- return InspectorFrontendHost.platform() === "mac" ? this.Command : this.Control;
+ return WebInspector.Platform.name === "mac" ? this.Command : this.Control;
}
};
@@ -181,7 +181,7 @@
if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Control)
result += "\u2303";
if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Option)
- result += InspectorFrontendHost.platform() === "mac" ? "\u2325" : "\u2387";
+ result += WebInspector.Platform.name === "mac" ? "\u2325" : "\u2387";
if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Shift)
result += "\u21e7";
if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Command)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
