Changeset 157966 in webkit

Timestamp:

Oct 24, 2013 5:15:38 PM (10 years ago)

Author:

timothy@apple.com

Message:

Allow editing CSS resources after they have been pretty printed.

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

Reviewed by Joseph Pecoraro.

• UserInterface/TextEditor.js:

(WebInspector.TextEditor): Remove the need for _readOnly.
(WebInspector.TextEditor.prototype.set readOnly): Set CodeMirror readOnly directly.
(WebInspector.TextEditor.prototype.set formatted): Don't call _updateCodeMirrorReadOnly.
(WebInspector.TextEditor.prototype._updateCodeMirrorReadOnly): Removed.
(WebInspector.TextEditor.prototype._contentChanged): Clear _formatted and _formatterSourceMap
on edit and notify the delegate and fire the FormattingDidChange event.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/TextEditor.js (modified) (4 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2013-10-24  Timothy Hatcher  <timothy@apple.com>
+
+        Allow editing CSS resources after they have been pretty printed.
+
+        https://bugs.webkit.org/show_bug.cgi?id=123297
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/TextEditor.js:
+        (WebInspector.TextEditor): Remove the need for _readOnly.
+        (WebInspector.TextEditor.prototype.set readOnly): Set CodeMirror readOnly directly.
+        (WebInspector.TextEditor.prototype.set formatted): Don't call _updateCodeMirrorReadOnly.
+        (WebInspector.TextEditor.prototype._updateCodeMirrorReadOnly): Removed.
+        (WebInspector.TextEditor.prototype._contentChanged): Clear _formatted and _formatterSourceMap
+        on edit and notify the delegate and fire the FormattingDidChange event.
+
 2013-10-24  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/TextEditor.js

@@ -33 +33 @@
     this._element.classList.add(WebInspector.SyntaxHighlightedStyleClassName);
 
-    this._readOnly = true;
-
     this._codeMirror = CodeMirror(this.element, {
-        readOnly: this._readOnly,
+        readOnly: true,
         indentWithTabs: true,
         indentUnit: 4,
@@ -149 +147 @@
     set readOnly(readOnly)
     {
-        this._readOnly = readOnly;
-        this._updateCodeMirrorReadOnly();
+        this._codeMirror.setOption("readOnly", readOnly);
     },
 
@@ -172 +169 @@
 
         this._formatted = formatted;
-        this._updateCodeMirrorReadOnly();
 
         this.dispatchEventToListeners(WebInspector.TextEditor.Event.FormattingDidChange);
@@ -595 +591 @@
     // Private
 
-    _updateCodeMirrorReadOnly: function()
-    {
-        this._codeMirror.setOption("readOnly", this._readOnly || this._formatted);
-    },
-
     _contentChanged: function(codeMirror, change)
     {
         if (this._ignoreCodeMirrorContentDidChangeEvent)
             return;
+
+        if (this._formatted) {
+            this._formatterSourceMap = null;
+            this._formatted = false;
+
+            if (this._delegate && typeof this._delegate.textEditorUpdatedFormatting === "function")
+                this._delegate.textEditorUpdatedFormatting(this);
+
+            this.dispatchEventToListeners(WebInspector.TextEditor.Event.FormattingDidChange);
+        }
+
         this.dispatchEventToListeners(WebInspector.TextEditor.Event.ContentDidChange);
     },