Skip to content
This repository was archived by the owner on Dec 14, 2023. It is now read-only.

Commit 9b16ad9

Browse files
author
mattpass
committed
icecoder.js now using indentType
1 parent abb1c2b commit 9b16ad9

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

assets/js/icecoder.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2025,7 +2025,7 @@ var ICEcoder = {
20252025
parser: parser,
20262026
plugins: prettierPlugins,
20272027
tabWidth: this.indentSize,
2028-
useTabs: this.indentWithTabs
2028+
useTabs: "tabs" === this.indentType
20292029
}
20302030
));
20312031
} catch(err) {
@@ -3501,7 +3501,7 @@ var ICEcoder = {
35013501
},
35023502

35033503
// Update the settings used when we make a change to them
3504-
useNewSettings: function(themeURL,codeAssist,lockedNav,tagWrapperCommand,autoComplete,visibleTabs,fontSize,lineWrapping,lineNumbers,showTrailingSpace,matchBrackets,autoCloseTags,autoCloseBrackets,indentWithTabs,indentAuto,indentSize,pluginPanelAligned,scrollbarStyle,bugFilePaths,bugFileCheckTimer,bugFileMaxLines,updateDiffOnSave,autoLogoutMins,refreshFM) {
3504+
useNewSettings: function(themeURL,codeAssist,lockedNav,tagWrapperCommand,autoComplete,visibleTabs,fontSize,lineWrapping,lineNumbers,showTrailingSpace,matchBrackets,autoCloseTags,autoCloseBrackets,indentType,indentAuto,indentSize,pluginPanelAligned,scrollbarStyle,bugFilePaths,bugFileCheckTimer,bugFileMaxLines,updateDiffOnSave,autoLogoutMins,refreshFM) {
35053505
var styleNode, thisCSS, strCSS, activeLineBG;
35063506

35073507
// cut out ?microtime= at the end
@@ -3564,7 +3564,7 @@ var ICEcoder = {
35643564
this.matchBrackets = matchBrackets;
35653565
this.autoCloseTags = autoCloseTags;
35663566
this.autoCloseBrackets = autoCloseBrackets;
3567-
this.indentWithTabs = indentWithTabs;
3567+
this.indentType = indentType;
35683568
this.indentSize = indentSize;
35693569
this.indentAuto = indentAuto;
35703570
this.scrollbarStyle = scrollbarStyle;
@@ -3576,7 +3576,7 @@ var ICEcoder = {
35763576
this.content.contentWindow['cM'+this.cMInstances[i]].setOption("matchBrackets", this.matchBrackets);
35773577
this.content.contentWindow['cM'+this.cMInstances[i]].setOption("autoCloseTags", this.autoCloseTags);
35783578
this.content.contentWindow['cM'+this.cMInstances[i]].setOption("autoCloseBrackets", this.autoCloseBrackets);
3579-
this.content.contentWindow['cM'+this.cMInstances[i]].setOption("indentWithTabs", this.indentWithTabs);
3579+
this.content.contentWindow['cM'+this.cMInstances[i]].setOption("indentWithTabs", "tabs" === this.indentType);
35803580
this.content.contentWindow['cM'+this.cMInstances[i]].setOption("indentUnit", this.indentSize);
35813581
this.content.contentWindow['cM'+this.cMInstances[i]].setOption("tabSize", this.indentSize);
35823582
this.content.contentWindow['cM'+this.cMInstances[i]].setOption("scrollbarStyle", this.scrollbarStyle);
@@ -3588,7 +3588,7 @@ var ICEcoder = {
35883588
this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("matchBrackets", this.matchBrackets);
35893589
this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("autoCloseTags", this.autoCloseTags);
35903590
this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("autoCloseBrackets", this.autoCloseBrackets);
3591-
this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("indentWithTabs", this.indentWithTabs);
3591+
this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("indentWithTabs", "tabs" === this.indentType);
35923592
this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("indentUnit", this.indentSize);
35933593
this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("tabSize", this.indentSize);
35943594
this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("scrollbarStyle", this.scrollbarStyle);

0 commit comments

Comments
 (0)