[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 30b2a19069e87a60f2638f632a8b6ed4759ae6bc
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 21 11:10:56 2009 +0000

    2009-12-20  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Can’t copy outer html of selected node.
            Also adds "Copy as HTML" context menu item.
    
            https://bugs.webkit.org/show_bug.cgi?id=32802
    
            * English.lproj/localizedStrings.js:
            * inspector/front-end/ElementsTreeOutline.js:
            (WebInspector.ElementsTreeElement.prototype._populateTagContextMenu):
            * inspector/front-end/inspector.js:
            (WebInspector.documentCanCopy):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52440 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index baecc94..e9cfbd0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,20 @@
 2009-12-20  Pavel Feldman  <pfeldman at chromium.org>
 
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Can’t copy outer html of selected node.
+        Also adds "Copy as HTML" context menu item.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32802
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/ElementsTreeOutline.js:
+        (WebInspector.ElementsTreeElement.prototype._populateTagContextMenu):
+        * inspector/front-end/inspector.js:
+        (WebInspector.documentCanCopy):
+
+2009-12-20  Pavel Feldman  <pfeldman at chromium.org>
+
         Reviewed by Eric Seidel.
 
         Web Inspector: extract syntax highlighters into separate files.
diff --git a/WebCore/English.lproj/localizedStrings.js b/WebCore/English.lproj/localizedStrings.js
index dea8b05..5eba2ea 100644
Binary files a/WebCore/English.lproj/localizedStrings.js and b/WebCore/English.lproj/localizedStrings.js differ
diff --git a/WebCore/inspector/front-end/ElementsTreeOutline.js b/WebCore/inspector/front-end/ElementsTreeOutline.js
index 8bfae7a..b865316 100644
--- a/WebCore/inspector/front-end/ElementsTreeOutline.js
+++ b/WebCore/inspector/front-end/ElementsTreeOutline.js
@@ -603,6 +603,7 @@ WebInspector.ElementsTreeElement.prototype = {
         contextMenu.appendSeparator();
 
         // Add node-related actions.
+        contextMenu.appendItem(WebInspector.UIString("Copy as HTML"), this._copyHTML.bind(this));
         contextMenu.appendItem(WebInspector.UIString("Delete Node"), this.remove.bind(this));
     },
 
@@ -959,6 +960,11 @@ WebInspector.ElementsTreeElement.prototype = {
 
         var callId = WebInspector.Callback.wrap(removeNodeCallback);
         InspectorBackend.removeNode(callId, this.representedObject.id);
+    },
+
+    _copyHTML: function(node)
+    {
+        InspectorBackend.copyNode(this.representedObject.id);
     }
 }
 
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index b0f4b48..d75affd 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -727,7 +727,8 @@ WebInspector.documentKeyDown = function(event)
 
 WebInspector.documentCanCopy = function(event)
 {
-    return this.currentPanel && this.currentPanel.handleCopyEvent;
+    if (this.currentPanel && this.currentPanel.handleCopyEvent)
+        event.preventDefault();
 }
 
 WebInspector.documentCopy = function(event)

-- 
WebKit Debian packaging