From 6512d4895bce0d67c699e7c749e585aeac07e7ed Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Thu, 10 May 2012 18:43:11 +0100 Subject: [PATCH] Nav design improvements & fix to .file types Nav highlighting & changed status indication now improved Fixed problem when adding .files it sees it as a folder --- lib/coder.js | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/coder.js b/lib/coder.js index cb1c356..3d24c57 100644 --- a/lib/coder.js +++ b/lib/coder.js @@ -371,11 +371,13 @@ var ICEcoder = { var bgVPos, tColor; for(var i=1;i<=ICEcoder.changedContent.length;i++) { - ICEcoder.changedContent[i-1]==1 ? bgVPos = -44 : bgVPos = 0; - i==selectedTab ? ICEcoder.changedContent[selectedTab-1]==1 ? bgVPos = -33 : bgVPos = -22 : bgVPos = bgVPos; - bgVPos == 0 ? tColor = "#ffffff" : bgVPos == -44 ? tColor = "#ffffff" : tColor = "#000000"; - document.getElementById('tab'+i).style.backgroundPosition = "0px "+bgVPos+"px"; + if (document.getElementById('closeTabButton'+i)) { + ICEcoder.changedContent[i-1]==1 ? document.getElementById('closeTabButton'+i).style.backgroundColor = "#bb0000" : document.getElementById('closeTabButton'+i).style.backgroundColor = "transparent"; + } + i==selectedTab ? tColor = "#ffffff" : tColor = "#000000"; document.getElementById('tab'+i).style.color = tColor; + i==selectedTab ? bgVPos = -22 : bgVPos = 0; + document.getElementById('tab'+i).style.backgroundPosition = "0px "+bgVPos+"px"; } ICEcoder.changedContent[selectedTab-1]==1 ? top.ICEcoder.fMIconVis('fMSave',1) : top.ICEcoder.fMIconVis('fMSave',0.3); }, @@ -409,7 +411,7 @@ var ICEcoder = { top.ICEcoder.openFiles.push(top.ICEcoder.shortURL); // Setup a new tab - closeTabLink = ''; + closeTabLink = ''; top.document.getElementById('tab'+(top.ICEcoder.openFiles.length)).style.display = "inline-block"; top.document.getElementById('tab'+(top.ICEcoder.openFiles.length)).innerHTML = top.ICEcoder.openFiles[top.ICEcoder.openFiles.length-1] + " " + closeTabLink; @@ -431,7 +433,7 @@ var ICEcoder = { top.ICEcoder.openFiles[tabNum] = newName; // Setup a new tab - closeTabLink = ''; + closeTabLink = ''; top.document.getElementById('tab'+tabNum).innerHTML = top.ICEcoder.openFiles[tabNum] + " " + closeTabLink; }, @@ -534,7 +536,7 @@ var ICEcoder = { ICEcoder.openFiles[i-1] = ICEcoder.openFiles[i]; // reduce the tab reference number on the closeTab link by 1 - top.document.getElementById('tab'+i).innerHTML = top.document.getElementById('tab'+i).innerHTML.replace(("closeTab("+(i+1)+")"),"closeTab("+i+")"); + top.document.getElementById('tab'+i).innerHTML = top.document.getElementById('tab'+i).innerHTML.replace(("closeTab("+(i+1)+")"),"closeTab("+i+")").replace(("closeTabButton("+(i+1)+")"),"closeTabButton("+i+")"); } // hide the instance we're closing by setting the hide class and removing from the array ICEcoder.content.contentWindow['cM'+top.ICEcoder.cMInstances[closeTabNum-1]].setOption('theme',top.theme+' hidden'); @@ -778,7 +780,7 @@ var ICEcoder = { if(top.ICEcoder.openFiles[i]==shortURL.replace(/\|/g,"/")) { // rename array item and the tab top.ICEcoder.openFiles[i] = renamedFile; - closeTabLink = ''; + closeTabLink = ''; top.document.getElementById('tab'+(i+1)).innerHTML = top.ICEcoder.openFiles[i] + " " + closeTabLink; } } @@ -819,7 +821,7 @@ var ICEcoder = { if (!foundFile) {top.ICEcoder.selectFileFolder()}; if ("undefined" != typeof top.ICEcoder.thisFileFolderLink && top.ICEcoder.thisFileFolderLink!="") { - top.ICEcoder.selectedFiles[0].indexOf(".")>0 ? menuType = "file" : menuType = "folder"; + top.ICEcoder.selectedFiles[0].indexOf(".")>-1 ? menuType = "file" : menuType = "folder"; folderMenuItems = top.document.getElementById('folderMenuItems'); menuType == "folder" && top.ICEcoder.selectedFiles.length == 1 ? folderMenuItems.style.display = "block" : folderMenuItems.style.display = "none"; top.ICEcoder.selectedFiles.length > 1 ? singleFileMenuItems.style.display = "none" : singleFileMenuItems.style.display = "block"; @@ -1115,7 +1117,7 @@ var ICEcoder = { if (action=="add") { // Determin if this is a file or folder and based on that, set the CSS styling & link - file.indexOf(".")>0 ? actionElemType = "file" : actionElemType = "folder"; + file.indexOf(".")>-1 ? actionElemType = "file" : actionElemType = "folder"; actionElemType=="file" ? cssStyle = "pft-file ext-" + file.substr(file.indexOf(".")+1,file.length) : cssStyle = "pft-directory"; actionElemType=="file" ? hrefLink = "nohref" : hrefLink = "href=\"#\""; @@ -1287,7 +1289,7 @@ var ICEcoder = { if (ICEcoder.selectedFiles.length==1) { top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink=top.fullPath+top.ICEcoder.selectedFiles[0].replace('|','/'); - if (action=="open" && ICEcoder.selectedFiles[0].indexOf(".")>0) { + if (action=="open" && ICEcoder.selectedFiles[0].indexOf(".")>-1) { top.ICEcoder.thisFileFolderType='file'; top.ICEcoder.openFile(); }