Changeset 62487 in webkit

Timestamp:

Jul 5, 2010 7:23:51 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-07-05 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: Problem with copying a code from Scripts panel.

​https://bugs.webkit.org/show_bug.cgi?id=40432

• inspector/front-end/TextViewer.js: (WebInspector.TextViewer.prototype._getSelection): (WebInspector.TextViewer.prototype._selectionToPosition):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-05  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: Problem with copying a code from Scripts panel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=40432
+
+        * inspector/front-end/TextViewer.js:
+        (WebInspector.TextViewer.prototype._getSelection):
+        (WebInspector.TextViewer.prototype._selectionToPosition):
+
 2010-07-05  Nikolas Zimmermann  <nzimmermann@rim.com>
 

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

@@ -552 +552 @@
 
         var column = 0;
-        if (lineRow.chunk) {
-            // This is chunk.
-            var text = lineRow.lastChild.textContent;
+        var node = lineRow.lastChild.traverseNextTextNode(lineRow.lastChild);
+        while (node && node !== container) {
+            column += node.textContent.length;
+            node = node.traverseNextTextNode(lineRow.lastChild);
+        }
+
+        // This may be chunk and chunks may contain \n.
+        if (node === container && offset) {
+            var text = node.textContent;
             for (var i = 0; i < offset; ++i) {
                 if (text.charAt(i) === "\n") {
@@ -560 +566 @@
                     column = 0;
                 } else
-                    column++; 
+                    column++;
             }
-            return { line: lineNumber, column: column };
-        }
-
-        // This is individul line.
-        var column = 0;
-        var node = lineRow.lastChild.traverseNextTextNode(lineRow.lastChild);
-        while (node && node !== container) {
-            column += node.textContent.length;
-            node = node.traverseNextTextNode(lineRow.lastChild);
-        }
-        column += offset;
-        return { line: lineRow.lineNumber, column: column };
+        }
+        return { line: lineNumber, column: column };
     },