Merge pull request #36 from happibum/master

[TASK] Remove soft tabs option (ODP-142)

Author: happibum

apps/ide/src/plugins/codeeditor/codemirror.js

@@ -189,7 +189,7 @@ function (require, vmi, _, codemirror, loadCSSList, Snippet) {
                 return undefined;
             }
         }
-        if (cm.__instance.useSoftTabs) {
+        if (!cm.__instance.options.indentWithTabs) {
             codemirror.commands.insertSoftTab(cm);
         } else {
             return codemirror.Pass;
@@ -1308,9 +1308,6 @@ function (require, vmi, _, codemirror, loadCSSList, Snippet) {
         }
     };
 
-    CodeEditor.prototype.setUseSoftTabs = function (softTabs) {
-        this.useSoftTabs = softTabs;
-    };
     CodeEditor.prototype.setTabSize = function (tabSize) {
         if (tabSize !== undefined) {
             this.options.tabSize = tabSize;

apps/ide/src/plugins/codeeditor/configloader.js

@@ -174,7 +174,6 @@ function (ide, _) {
             instance.setIndentWithTabs(config.indentWithTabs);
             instance.setIndentUnit(config.indentUnit);
             instance.setTabSize(config.tabSize);
-            instance.setIndentOnPaste(config.indentOnPaste);
             instance.setTrimTrailingWhitespaces(config.trimTrailingWhitespaces);
             instance.setInsertFinalNewLine(config.insertFinalNewLine);
         }

apps/ide/src/plugins/codeeditor/plugin.js

@@ -104,7 +104,6 @@ define(['other-lib/underscore/lodash.min',
         // 'codeeditor:indentguides': ['setDisplayIndentGuides', true],
         'codeeditor:highlightselection': ['setHighlightSelection', true],
         'codeeditor:wordWrap': ['setLineWrapping', false],
-        'codeeditor:softtabs': ['setUseSoftTabs', false],
         'codeeditor:indentWithTabs' : ['setIndentWithTabs', false],
         'codeeditor:indentunit': ['setIndentUnit', 4],
         'codeeditor:indentOnPaste' : ['setIndentOnPaste', true],

apps/ide/src/plugins/codeeditor/preference-editor.js

@@ -57,10 +57,6 @@ define([], function () {
                 name: 'Use indents with tabs',
                 'default': false
             });
-            fieldCreator.addField('codeeditor:softtabs', 'checkbox', {
-                name: 'Use soft tabs',
-                'default': false
-            });
             fieldCreator.addField('codeeditor:indentOnPaste', 'checkbox', {
                 name: 'Indent lines on paste',
                 'default': true