[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[apavlov at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 105d1c0eb87989ad7a42a08cba417cde38c41736
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 14:53:15 2011 +0000

    2011-02-01  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: [Chromium] Wrongly labelled context-menu item for links in Web Inspector's side-pane
            https://bugs.webkit.org/show_bug.cgi?id=53482
    
            * English.lproj/localizedStrings.js:
            * inspector/front-end/ElementsPanel.js:
            (WebInspector.ElementsPanel.prototype.populateHrefContextMenu):
            * inspector/front-end/inspector.js:
            (WebInspector.resourceForURL):
            (WebInspector.openLinkExternallyLabel):
    2011-02-01  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: [Chromium] Wrongly labelled context-menu item for links in Web Inspector's side-pane
            https://bugs.webkit.org/show_bug.cgi?id=53482
    
            * src/js/DevTools.js:
            (WebInspector.openLinkExternallyLabel): Override to customize a context menu item label
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77249 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a96d1ed..003f397 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-02-01  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: [Chromium] Wrongly labelled context-menu item for links in Web Inspector's side-pane
+        https://bugs.webkit.org/show_bug.cgi?id=53482
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/ElementsPanel.js:
+        (WebInspector.ElementsPanel.prototype.populateHrefContextMenu):
+        * inspector/front-end/inspector.js:
+        (WebInspector.resourceForURL):
+        (WebInspector.openLinkExternallyLabel):
+
 2011-02-01  Anton Muhin  <antonm at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/Source/WebCore/English.lproj/localizedStrings.js b/Source/WebCore/English.lproj/localizedStrings.js
index 7aecbb6..fde9dcb 100644
Binary files a/Source/WebCore/English.lproj/localizedStrings.js and b/Source/WebCore/English.lproj/localizedStrings.js differ
diff --git a/Source/WebCore/inspector/front-end/ElementsPanel.js b/Source/WebCore/inspector/front-end/ElementsPanel.js
index 9299479..094f209 100644
--- a/Source/WebCore/inspector/front-end/ElementsPanel.js
+++ b/Source/WebCore/inspector/front-end/ElementsPanel.js
@@ -255,8 +255,7 @@ WebInspector.ElementsPanel.prototype = {
             return false;
 
         // Add resource-related actions.
-        // Keep these consistent with those added in WebInspector.StylesSidebarPane.prototype._populateHrefContextMenu().
-        contextMenu.appendItem(WebInspector.UIString("Open Link in New Window"), WebInspector.openResource.bind(null, resourceURL, false));
+        contextMenu.appendItem(WebInspector.openLinkExternallyLabel(), WebInspector.openResource.bind(null, resourceURL, false));
         if (WebInspector.resourceForURL(resourceURL))
             contextMenu.appendItem(WebInspector.UIString("Open Link in Resources Panel"), WebInspector.openResource.bind(null, resourceURL, true));
         return true;
diff --git a/Source/WebCore/inspector/front-end/inspector.js b/Source/WebCore/inspector/front-end/inspector.js
index 14437be..f4b868b 100644
--- a/Source/WebCore/inspector/front-end/inspector.js
+++ b/Source/WebCore/inspector/front-end/inspector.js
@@ -449,6 +449,11 @@ var WebInspector = {
     resourceForURL: function(url)
     {
         return this.resourceTreeModel.resourceForURL(url);
+    },
+
+    openLinkExternallyLabel: function()
+    {
+        return WebInspector.UIString("Open Link in New Window");
     }
 }
 
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 6633433..29314d6 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-01  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: [Chromium] Wrongly labelled context-menu item for links in Web Inspector's side-pane
+        https://bugs.webkit.org/show_bug.cgi?id=53482
+
+        * src/js/DevTools.js:
+        (WebInspector.openLinkExternallyLabel): Override to customize a context menu item label
+
 2011-02-01  Darin Fisher  <darin at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/Source/WebKit/chromium/src/js/DevTools.js b/Source/WebKit/chromium/src/js/DevTools.js
index 637fd1f..3d61be7 100644
--- a/Source/WebKit/chromium/src/js/DevTools.js
+++ b/Source/WebKit/chromium/src/js/DevTools.js
@@ -89,6 +89,18 @@ WebInspector.UIString = function(string)
 };
 
 
+/*
+ * This label must be kept consistent with that in English.lproj/localizedStrings.js
+ *
+ * http://code.google.com/p/chromium/issues/detail?id=61302 requires a custom label for Chromium,
+ * since its behavior is different.
+ */
+WebInspector.openLinkExternallyLabel = function()
+{
+    return WebInspector.UIString("Open Link in New Tab");
+};
+
+
 /** Pending WebKit upstream by apavlov). Fixes iframe vs drag problem. */
 (function()
 {

-- 
WebKit Debian packaging