Changeset 54067 in webkit

Timestamp:

Jan 29, 2010 9:22:23 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-29 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by Pavel Feldman.

Fix MacOS X version detection

MacOS X version can have 2 or 3 segments.
​https://bugs.webkit.org/show_bug.cgi?id=34322

• inspector/front-end/inspector.js: (WebInspector._detectPlatform):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-29  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Fix MacOS X version detection
+
+        MacOS X version can have 2 or 3 segments.
+        https://bugs.webkit.org/show_bug.cgi?id=34322
+
+        * inspector/front-end/inspector.js:
+        (WebInspector._detectPlatform):
+
 2010-01-29  Jakob Petsovits  <jpetsovits@rim.com>
 

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

@@ -84 +84 @@
             return WebInspector.OS.Windows;
         } else if (nativePlatform === "mac") {
-            var match = userAgent.match(/Mac OS X\s*(?:(\d+)_(\d+)_(?:\d+))?/);
+            var match = userAgent.match(/Mac OS X\s*(?:(\d+)_(\d+))?/);
             if (!match || match[1] != 10)
-                return WebInspector.OS.MacLeopard;
+                return WebInspector.OS.MacSnowLeopard;
             switch (Number(match[2])) {
                 case 4:
@@ -93 +93 @@
                     return WebInspector.OS.MacLeopard;
                 case 6:
+                default:
                     return WebInspector.OS.MacSnowLeopard;
             }
-            return WebInspector.OS.MacLeopard;
         }