third_party/WebKit/Source/devtools/front_end/text_editor/CodeMirrorTextEditor.js - Issue 2331053002: DevTools: Implement the console prompt with CodeMirror

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/devtools/front_end/text_editor/CodeMirrorTextEditor.js

Issue 2331053002: DevTools: Implement the console prompt with CodeMirror (Closed)

Patch Set: Merge Created 4 years, 3 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

« third_party/WebKit/Source/devtools/front_end/main/module.json ('K') | « third_party/WebKit/Source/devtools/front_end/main/module.json ('k') | third_party/WebKit/Source/devtools/front_end/text_editor/TextEditorAutocompleteController.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/text_editor/CodeMirrorTextEditor.js

diff --git a/third_party/WebKit/Source/devtools/front_end/text_editor/CodeMirrorTextEditor.js b/third_party/WebKit/Source/devtools/front_end/text_editor/CodeMirrorTextEditor.js

index 4f27a0a3805a1d69bb03aaf5dbc67c65481c5507..ad20610c0064b8d5666d888fb959aa45e29ec7d5 100644

--- a/third_party/WebKit/Source/devtools/front_end/text_editor/CodeMirrorTextEditor.js

+++ b/third_party/WebKit/Source/devtools/front_end/text_editor/CodeMirrorTextEditor.js

@@ -162,6 +162,8 @@ WebInspector.CodeMirrorTextEditor = function(options)

this.element.tabIndex = 0;

if (options.mimeType)

this.setMimeType(options.mimeType);

+ if (options.autoHeight)

+ this._codeMirror.setSize(null, "auto");

}

WebInspector.CodeMirrorTextEditor.maxHighlightLength = 1000;

@@ -979,8 +981,12 @@ WebInspector.CodeMirrorTextEditor.prototype = {

var scrollTop = this._codeMirror.doc.scrollTop;

var width = parentElement.offsetWidth;

var height = parentElement.offsetHeight - this.element.offsetTop;

- this._codeMirror.setSize(width, height);

- this._updatePaddingBottom(width, height);

+ if (this._options.autoHeight) {

+ this._codeMirror.setSize(width, "auto");

+ } else {

+ this._codeMirror.setSize(width, height);

+ this._updatePaddingBottom(width, height);

+ }

this._codeMirror.scrollTo(scrollLeft, scrollTop);