https://bugs.eclipse.org/bugs/show_bug.cgi?id=527136

eclipse · Nov 13, 2017 · 6805d77 · 6805d77
1 parent 728d2bc
commit 6805d77
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/bundles/org.eclipse.orion.client.ui/web/embeddedEditor/demo/demoCodeEdit.js b/bundles/org.eclipse.orion.client.ui/web/embeddedEditor/demo/demoCodeEdit.js
@@ -194,9 +194,47 @@ Deferred) {
 
 	var startup = function() {
 		createJSEditorInstance();
-		embeddedEditor.create({parent: "embeddedEditor1",
+/*		
+var defaults = {
+		autoSave: true,
+		autoSaveTimeout: 250,
+		autoLoad: true,
+		saveDiffs: true,
+		contentAssistAutoTrigger: true,
+		showOccurrences: true,
+		autoPairParentheses: true,
+		autoPairBraces: true,
+		autoPairSquareBrackets: true,
+		autoPairAngleBrackets: false,
+		autoPairQuotations: true,
+		autoCompleteComments: true,
+		smartIndentation: true,
+		trimTrailingWhiteSpace: false,
+		tabSize: 4,
+		expandTab: false,
+		scrollAnimation: true,
+		scrollAnimationTimeout: 300,
+		annotationRuler: true,
+		lineNumberRuler: true,
+		foldingRuler: true,
+		overviewRuler: true,
+		zoomRuler: false,
+		showWhitespaces: false,
+		wordWrap: false,
+		showMargin: false,
+		marginOffset: 80,
+		keyBindings: "Default",
+		diffService: false
+	};	
+	*/
+		embeddedEditor.create({parent: "embeddedEditor1", singleMode: true, editorConfig: {lineNumberRuler: false, overviewRuler: false},
 							   contentType: "application/json",
-							   contents: contents1});
+							   contents: contents1}).then(function(editorViewer){
+			var height = editorViewer.editor.getTextView().computeSize().height;
+			var parent = document.getElementById("embeddedEditor1");
+			parent.style.height = height + "px"; //$NON-NLS-0$
+		});
+
 		embeddedEditor.create({parent: "embeddedEditor2",
 							   contentType: "foo/bar",
 							   contents: contents2}).then(function(editorViewer){
@@ -245,6 +283,7 @@ Deferred) {
 			editorViewer.serviceRegistry.registerService('orion.edit.occurrences',
 				{computeOccurrences: computeOccurrences}, {contentType: ["foo/bar"]});	
 		});
+
 	};
 
 	var files2create = [

diff --git a/bundles/org.eclipse.orion.client.ui/web/embeddedEditor/helper/editorSetup.js b/bundles/org.eclipse.orion.client.ui/web/embeddedEditor/helper/editorSetup.js
@@ -78,8 +78,9 @@ define([
 				commandRegistry: this._commandRegistry,
 				contentTypeRegistry: this._contentTypeRegistry,
 				editorCommands: this._editorCommands,
-				editorConfig: this._editorConfig,
+				editorConfig: options.editorConfig ? options.editorConfig: this._editorConfig,
 				statusReporter: options.statusReporter,
+				singleMode: options.singleMode,
 				progressService: this._progressService,
 				inputManager: this._inputManager, // fake it
 				fileService: this._fileClient, // fake it

diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/editorView.js b/bundles/org.eclipse.orion.client.ui/web/orion/editorView.js
@@ -98,6 +98,7 @@ define([
 		this.inputManager = options.inputManager;
 		this.preferences = options.preferences;
 		this.readonly = options.readonly;
+		this.singleMode = options.singleMode;
 		this.searcher = options.searcher;
 		this.statusReporter = options.statusReporter;
 		this.model = options.model;
@@ -208,6 +209,7 @@ define([
 			}
 			return {
 				readonly: this.readonly || this.inputManager.getReadOnly(),
+				singleMode: this.singleMode,
 				tabSize: prefs.tabSize || 4,
 				expandTab: prefs.expandTab,
 				wrapMode: prefs.wordWrap,