From 927471e1652bf5cfd05ee8e39d79279a7b35bf67 Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Tue, 17 Sep 2013 09:19:00 +0100 Subject: [PATCH] Settings 10px taller, offset tabs & autocomplete Settings screen now 10px taller to help accomodate new Autocomplete setting Visible tabs have -1px margin left offset Autocomplete updated live in session on settings change --- lib/ice-coder.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/ice-coder.js b/lib/ice-coder.js index c7d2ad7..5b03551 100644 --- a/lib/ice-coder.js +++ b/lib/ice-coder.js @@ -1675,7 +1675,7 @@ var ICEcoder = { // Show the settings screen settingsScreen: function(hide) { if (!hide) { - top.get('mediaContainer').innerHTML = ''; + top.get('mediaContainer').innerHTML = ''; } top.ICEcoder.showHide(hide?'hide':'show',top.get('blackMask')); }, @@ -1699,7 +1699,7 @@ var ICEcoder = { }, // Update the settings used when we make a change to them - useNewSettings: function(themeURL,codeAssist,lockedNav,tagWrapperCommand,visibleTabs,fontSize,lineWrapping,indentWithTabs,indentSize,refreshFM) { + useNewSettings: function(themeURL,codeAssist,lockedNav,tagWrapperCommand,autoComplete,visibleTabs,fontSize,lineWrapping,indentWithTabs,indentSize,refreshFM) { var styleNode, strCSS, cMCSS, activeLineBG; // Add new stylesheet for selected theme @@ -1730,6 +1730,7 @@ var ICEcoder = { strCSS = cMCSS.rules ? 'rules' : 'cssRules'; cMCSS[strCSS][0].style['fontSize'] = fontSize; cMCSS[strCSS][4].style['border-left-width'] = visibleTabs ? '1px' : '0'; + cMCSS[strCSS][4].style['margin-left'] = visibleTabs ? '-1px' : '0'; cMCSS[strCSS][2].style.cssText = "background-color: " + activeLineBG + " !important"; top.ICEcoder.lineWrapping = lineWrapping; @@ -1746,6 +1747,10 @@ var ICEcoder = { top.ICEcoder.tagWrapperCommand = tagWrapperCommand; } + if (autoComplete != top.ICEcoder.autoComplete) { + top.ICEcoder.autoComplete = autoComplete; + } + // Finally, refresh the file manager if we need to if (refreshFM) {top.ICEcoder.refreshFileManager()}; },