Changeset 160585 in webkit

Timestamp:

Dec 13, 2013 8:55:55 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Exception: TypeError: undefined is not a function (evaluating 'marker.find()')
​https://bugs.webkit.org/show_bug.cgi?id=125724

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2013-12-13
Reviewed by Darin Adler.

• UserInterface/CSSStyleDeclarationTextEditor.js:

(WebInspector.CSSStyleDeclarationTextEditor.prototype.):
(WebInspector.CSSStyleDeclarationTextEditor.prototype._createColorSwatches):
The callback changed to returning WebInspector.TextMarkers, however
this class expected a raw CodeMirror marker. Since this class knows
about CodeMirror and expects to access these markers later go
directly to the CodeMirror marker.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/CSSStyleDeclarationTextEditor.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2013-12-13  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Exception: TypeError: undefined is not a function (evaluating 'marker.find()')
+        https://bugs.webkit.org/show_bug.cgi?id=125724
+
+        Reviewed by Darin Adler.
+
+        * UserInterface/CSSStyleDeclarationTextEditor.js:
+        (WebInspector.CSSStyleDeclarationTextEditor.prototype.):
+        (WebInspector.CSSStyleDeclarationTextEditor.prototype._createColorSwatches):
+        The callback changed to returning WebInspector.TextMarkers, however
+        this class expected a raw CodeMirror marker. Since this class knows
+        about CodeMirror and expects to access these markers later go
+        directly to the CodeMirror marker.
+
 2013-12-13  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/CSSStyleDeclarationTextEditor.js

@@ -401 +401 @@
                 swatchInnerElement.style.backgroundColor = colorString;
                 swatchElement.appendChild(swatchInnerElement);
-                            
-                var swatchMarker = this._codeMirror.setUniqueBookmark(marker.find().from, swatchElement);
-                            
-                swatchInnerElement.__colorTextMarker = marker;
+
+                var codeMirrorTextMarker = marker.codeMirrorTextMarker;
+                var swatchMarker = this._codeMirror.setUniqueBookmark(codeMirrorTextMarker.find().from, swatchElement);
+
+                swatchInnerElement.__colorTextMarker = codeMirrorTextMarker;
                 swatchInnerElement.__color = color;
             }.bind(this));