Changeset 127437 in webkit

Timestamp:

Sep 3, 2012 7:09:42 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: the URL of worker inspector window sometimes is invalid
​https://bugs.webkit.org/show_bug.cgi?id=95334

Patch by Peter Wang <​peter.wang@torchmobile.com.cn> on 2012-09-03
Reviewed by Pavel Feldman.

In "_openInspectorWindow", before "&dedicatedWorkerId=" should have a '?' to make the whole URL valid.

No new tests case for this bug.

• inspector/front-end/WorkerManager.js:

(WebInspector.WorkerManager.prototype._openInspectorWindow):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-03  Peter Wang  <peter.wang@torchmobile.com.cn>
+
+        Web Inspector: the URL of worker inspector window sometimes is invalid
+        https://bugs.webkit.org/show_bug.cgi?id=95334
+
+        Reviewed by Pavel Feldman.
+
+        In "_openInspectorWindow", before "&dedicatedWorkerId=" should have a '?' to make the whole URL valid.
+
+        No new tests case for this bug.
+
+        * inspector/front-end/WorkerManager.js:
+        (WebInspector.WorkerManager.prototype._openInspectorWindow):
+
 2012-09-03  Jinwoo Song  <jinwoo7.song@samsung.com>
 

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

@@ -162 +162 @@
     _openInspectorWindow: function(workerId, workerIsPaused)
     {
-        var url = window.location.href + "&dedicatedWorkerId=" + workerId;
+        var search = window.location.search;
+        var hash = window.location.hash;
+        var url = window.location.href;
+        // Make sure hash is in rear
+        url = url.replace(hash, "");
+        url += (search ? "&dedicatedWorkerId=" : "?dedicatedWorkerId=") + workerId;
         if (workerIsPaused)
             url += "&workerPaused=true";
         url = url.replace("docked=true&", "");
+        url += hash;
         // Set location=0 just to make sure the front-end will be opened in a separate window, not in new tab.
         var workerInspectorWindow = window.open(url, undefined, "location=0");