Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2018)

Unified Diff: Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js

Issue 676393003: Revert of DevTools: [CodeMirrro] defer autocomplete controller initialization (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/inspector/editor/text-editor-autocomplete.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js
diff --git a/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js b/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js
index c4619484c530cdbadbaa6577a9ce7fde4e1f4c8d..f31409bdb0ffc421581eed6223b593f0ff5861b4 100644
--- a/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js
+++ b/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js
@@ -1961,12 +1961,17 @@
this._changes = this._changes.bind(this);
this._beforeChange = this._beforeChange.bind(this);
this._blur = this._blur.bind(this);
+ this._codeMirror.on("scroll", this._onScroll);
+ this._codeMirror.on("cursorActivity", this._onCursorActivity);
+ this._codeMirror.on("changes", this._changes);
+ this._codeMirror.on("beforeChange", this._beforeChange);
+ this._codeMirror.on("blur", this._blur);
this._additionalWordChars = WebInspector.CodeMirrorTextEditor._NoAdditionalWordChars;
this._enabled = true;
this._dictionary = dictionary;
- this._initialized = false;
+ this._addTextToCompletionDictionary(this._textEditor.text());
}
WebInspector.CodeMirrorTextEditor.AutocompleteController.Dummy = new WebInspector.CodeMirrorTextEditor.DummyAutocompleteController();
@@ -1974,23 +1979,8 @@
WebInspector.CodeMirrorTextEditor._CSSAdditionalWordChars = { ".": true, "-": true };
WebInspector.CodeMirrorTextEditor.AutocompleteController.prototype = {
- _initializeIfNeeded: function()
- {
- if (this._initialized)
- return;
- this._initialized = true;
- this._codeMirror.on("scroll", this._onScroll);
- this._codeMirror.on("cursorActivity", this._onCursorActivity);
- this._codeMirror.on("changes", this._changes);
- this._codeMirror.on("beforeChange", this._beforeChange);
- this._codeMirror.on("blur", this._blur);
- this._addTextToCompletionDictionary(this._textEditor.text());
- },
-
dispose: function()
{
- if (!this._initialized)
- return;
this._codeMirror.off("scroll", this._onScroll);
this._codeMirror.off("cursorActivity", this._onCursorActivity);
this._codeMirror.off("changes", this._changes);
@@ -2153,7 +2143,6 @@
autocomplete: function()
{
- this._initializeIfNeeded();
var dictionary = this._dictionary;
if (this._codeMirror.somethingSelected()) {
this.finishAutocomplete();
« no previous file with comments | « LayoutTests/inspector/editor/text-editor-autocomplete.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698