Title: [236357] trunk/Source/WebInspectorUI
- Revision
- 236357
- Author
- bb...@apple.com
- Date
- 2018-09-21 13:32:09 -0700 (Fri, 21 Sep 2018)
Log Message
Web Inspector: remove unnecessary WI.Platform.version checks
https://bugs.webkit.org/show_bug.cgi?id=189845
Reviewed by Matt Baker.
* UserInterface/Base/Platform.js:
(osVersionMatch): Add name for macOS Mojave.
* UserInterface/Base/Main.js:
* UserInterface/Views/Popover.js:
Remove old logic that's no longer needed.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (236356 => 236357)
--- trunk/Source/WebInspectorUI/ChangeLog 2018-09-21 20:29:18 UTC (rev 236356)
+++ trunk/Source/WebInspectorUI/ChangeLog 2018-09-21 20:32:09 UTC (rev 236357)
@@ -1,3 +1,17 @@
+2018-09-21 Brian Burg <bb...@apple.com>
+
+ Web Inspector: remove unnecessary WI.Platform.version checks
+ https://bugs.webkit.org/show_bug.cgi?id=189845
+
+ Reviewed by Matt Baker.
+
+ * UserInterface/Base/Platform.js:
+ (osVersionMatch): Add name for macOS Mojave.
+
+ * UserInterface/Base/Main.js:
+ * UserInterface/Views/Popover.js:
+ Remove old logic that's no longer needed.
+
2018-09-21 Devin Rousso <drou...@apple.com>
Web Inspector: remove setting for Sources tab
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (236356 => 236357)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2018-09-21 20:29:18 UTC (rev 236356)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2018-09-21 20:32:09 UTC (rev 236357)
@@ -1745,21 +1745,9 @@
event[WI.Popover.EventPreventDismissSymbol] = true;
if (WI.Platform.name === "mac") {
- // New Mac releases can start a window drag.
- if (WI.Platform.version.release >= 11) {
- InspectorFrontendHost.startWindowDrag();
- event.preventDefault();
- return;
- }
-
- // Ignore dragging on the top of the toolbar on Mac if the system handles it.
- if (WI.Platform.version.release === 10) {
- const windowDragHandledTitleBarHeight = 22;
- if (event.pageY < windowDragHandledTitleBarHeight) {
- event.preventDefault();
- return;
- }
- }
+ InspectorFrontendHost.startWindowDrag();
+ event.preventDefault();
+ return;
}
var lastScreenX = event.screenX;
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Platform.js (236356 => 236357)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Platform.js 2018-09-21 20:29:18 UTC (rev 236356)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Platform.js 2018-09-21 20:32:09 UTC (rev 236357)
@@ -49,6 +49,9 @@
WI.Platform.version.base = 10;
WI.Platform.version.release = parseInt(osVersionMatch[2]);
switch (osVersionMatch[2]) {
+ case "14":
+ WI.Platform.version.name = "mojave";
+ break;
case "13":
WI.Platform.version.name = "high-sierra";
break;
@@ -55,12 +58,6 @@
case "12":
WI.Platform.version.name = "sierra";
break;
- case "11":
- WI.Platform.version.name = "el-capitan";
- break;
- case "10":
- WI.Platform.version.name = "yosemite";
- break;
default:
WI.Platform.version.name = "unknown-mac";
break;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Popover.js (236356 => 236357)
--- trunk/Source/WebInspectorUI/UserInterface/Views/Popover.js 2018-09-21 20:29:18 UTC (rev 236356)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Popover.js 2018-09-21 20:32:09 UTC (rev 236357)
@@ -226,7 +226,7 @@
this._preferredSize = new WI.Size(Math.ceil(popoverBounds.width), Math.ceil(popoverBounds.height));
}
- var titleBarOffset = WI.Platform.name === "mac" && WI.Platform.version.release >= 10 ? 22 : 0;
+ var titleBarOffset = WI.Platform.name === "mac" ? 22 : 0;
var containerFrame = new WI.Rect(0, titleBarOffset, window.innerWidth, window.innerHeight - titleBarOffset);
// The frame of the window with a little inset to make sure we have room for shadows.
containerFrame = containerFrame.inset(WI.Popover.ShadowEdgeInsets);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
