Mirrors/ICEcoder
2
0
Fork 0
mirror of https://github.com/icecoder/ICEcoder.git synced 2026-03-03 07:13:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

codeAssist set from settings, fixes to updating

Browse Source 
codeAssist is now set along with other settings in index.php
solarized and xq-light should have lighter active lines too
If codeAssist isn't the same as out session setting, set it to the
updated setting and toggle the switch
Adjusts to CSS stylesheet targeting. New CSS file meant it's now
position 4 in the array and child item 4 where we'll find the content
style
I also changed background to background-color on the activeLine style
This commit is contained in:
Matt Pass
2013-07-10 17:29:58 +01:00
parent 11465d1946
commit 934d353537
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ice-coder.js
View File

@@ -25,7 +25,6 @@ var ICEcoder = {
findMode: false, // States if we're in find/replace mode
lockedNav: true, // Nav is locked or not
htmlTagArray: [], // Array storing the nest of tags
codeAssist: true, // Assist user with their coding
mouseDown: false, // If the mouse is down or not
draggingFilesW: false, // If we're dragging the file manager width or not
draggingTab: false, // If we're dragging a tab
@@ -1653,11 +1652,14 @@ var ICEcoder = {
styleNode.setAttribute('type', 'text/css');
styleNode.setAttribute('href', themeURL);
top.ICEcoder.content.contentWindow.document.getElementsByTagName('head')[0].appendChild(styleNode);
activeLineBG = ["eclipse","elegant","neat"].indexOf(top.ICEcoder.theme)>-1 ? "#ccc": "#000";
activeLineBG = ["eclipse","elegant","neat","solarized","xq-light"].indexOf(top.ICEcoder.theme)>-1 ? "#ccc": "#000";
top.ICEcoder.switchTab(top.ICEcoder.selectedTab);
// Check/uncheck Code Assist setting
top.get('codeAssist').checked = codeAssist;
if (codeAssist != top.ICEcoder.codeAssist) {
top.get('codeAssist').checked = codeAssist;
top.ICEcoder.codeAssistToggle();
}
// Unlock/lock the file manager
if (lockedNav != top.ICEcoder.lockedNav) {top.ICEcoder.lockUnlockNav()};
@@ -1666,11 +1668,11 @@ var ICEcoder = {
top.ICEcoder.hideFileMenu();
}
cMCSS = ICEcoder.content.contentWindow.document.styleSheets[3];
cMCSS = ICEcoder.content.contentWindow.document.styleSheets[4];
strCSS = cMCSS.rules ? 'rules' : 'cssRules';
cMCSS[strCSS][0].style['fontSize'] = fontSize;
cMCSS[strCSS][5].style['content'] = visibleTabs ? '"\\21e5"' : '" "';
cMCSS[strCSS][2].style.cssText = "background: " + activeLineBG + " !important";
cMCSS[strCSS][4].style['content'] = visibleTabs ? '"\\21e5"' : '" "';
cMCSS[strCSS][2].style.cssText = "background-color: " + activeLineBG + " !important";
top.ICEcoder.lineWrapping = lineWrapping;
top.ICEcoder.indentWithTabs = indentWithTabs;