From f80eacbd32ec7242f3e2fc894095c866f6a711a5 Mon Sep 17 00:00:00 2001 From: koseelg Date: Wed, 27 Aug 2014 14:15:27 +0200 Subject: [PATCH 1/7] Update norwegian.php Done cosmetic changes ..... --- lang/norwegian.php | 126 ++++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/lang/norwegian.php b/lang/norwegian.php index 2c3c90c..0eeb789 100644 --- a/lang/norwegian.php +++ b/lang/norwegian.php @@ -11,7 +11,7 @@ $text = array( "editor" => array( - "Click icons for..." => "Klikk ikoner
for hjelp &
bruk av info", + "Click icons for..." => "Klikk på ikoner
for hjelp &
bruk av info", "server" => "server", "Server name, OS..." => "Server navn, OS & IP:", "Root" => "Root:", @@ -22,7 +22,7 @@ $text = array( "Browser" => "Nettleser:", "Your IP" => "Din IP:", "files" => "filer", - "Last 10 files..." => "Siste 10 filer åpnet:", + "Last 10 files..." => "Siste 10 åpne filer:", "none" => "[none]", "test suite" => "test suite", "Run unit tests" => "Kjø unit tests", @@ -47,10 +47,10 @@ $text = array( "UPDATE INFO" => "UPDATE INFO", "now available" => "Nå tilgjengelig", "Your version is" => "Din versjon er", - "Update now" => "Update now", + "Update now" => "Oppdater nå", "You have some..." => "Du har noe ulagrede endringer", "working" => "arbeider", - "Color picker" => "Color picker", + "Color picker" => "Fargevelger", "New File" => "Ny Fil", "New Folder" => "Ny Mappe", "Upload File(s)" => "Last opp Fil(er)", @@ -65,17 +65,17 @@ $text = array( "Properties" => "Egenskaper", "File" => "Fil", "Edit" => "Redigere", - "Remote" => "Remote", + "Remote" => "Ekstern", "Help" => "Hjelp", "Save" => "Lagre", "Save As" => "Lagre Som", - "Live Preview" => "Live Forhåndsvisning", + "Live Preview" => "Direkte Forhåndsvisning", "Upload" => "Last opp", "Zip" => "Zip", "Print" => "Skriv ut", "Fullscreen toggle" => "Fullskjerm svitsj", "Logout" => "Loggut", - "Undo" => "Ange", + "Undo" => "Angre", "Redo" => "Gjenta", "Indent more" => "Større innrykk", "Indent less" => "Mindre innrykk", @@ -89,12 +89,12 @@ $text = array( "website" => "webside", "Close all tabs" => "Lukk alle faner", "Alphabetize tabs" => "Ordne faner alfabetisk", - "Find" => "Find", + "Find" => "Finn", "in" => "i", "and" => "og", "replace" => "erstatt", "replace all" => "erstatt alt", - "this document" => "this document", + "this document" => "dette dokumentet", "open documents" => "åpne dokumenter", "all files" => "alle filer", "all filenames" => "alle filenavn", @@ -124,7 +124,7 @@ $text = array( "Sorry, cannot upload" => "Beklager, kan ikke laste opp", "Sorry, cannot upload..." => "Beklager, kan ikke laste opp i demo-modus", "Sorry, cannot rename" => "Beklager, kan ikke endre navn", - "Maybe public write..." => "Kanskje offentlige skriverettigheter trengs på denne, eller overordnede mappen?", + "Maybe public write..." => "Kanskje det trengs offentlige skriverettigheter på denne, eller overordnede mappen?", "Sorry, cannot move" => "Beklager, kan ikke flytte", "Sorry, cannot save" => "Beklager, kan ikke lagre", "Sorry, cannot replace..." => "Beklager, kan ikke erstatte tekst i", @@ -142,15 +142,15 @@ $text = array( "get-branch" => array( - "There are no..." => "Det er ingen forskjeller mellom det lokale og GitHub repo. Gå tilbake til vanlig modus?", + "There are no..." => "Det er ingen forskjeller mellom det lokale og GitHub lagringssted. Gå tilbake til vanlig modus?", "Sorry, there was..." => "Beklager, det var en feil, kode:", - "Your local folder..." => "Your local folder is empty, would you like to clone" + "Your local folder..." => "Din lokale mappe er tom, ønsker du å klone" ), "github-manager" => array( "Sorry, cannot create..." => "Beklager, kan ikke opprette mappe på", - "Cannot update config..." => "Kan ikke oppdatere konfigurasjonsfilen. Vennligst sett offentlige skriverettigheter på", + "Cannot update config..." => "Kan ikke oppdatere konfigurasjonsfilen. Vennligst sett offentlige skriverettigheter", "and try again" => "og prøv igjen", "saving github paths" => "lagre GitHub stier...", "github paths" => "github stier", @@ -163,15 +163,15 @@ $text = array( "Add new path" => "Legg til ny sti", "Add" => "Legg til", "Usage Info" => "Bruksinfo:", - "Enter relative local..." => "Oppgi relative lokale stier (f.e. /server/myfiles) og absolutte GitHub stier (f.e. https://github.com/user/repo eller https://github.com/user/repo/tree/branch for grener), som per eksemplene. Med dette har du etablert kilde stier på begge steder, som et par.", + "Enter relative local..." => "Oppgi relative lokale stier (f.e. /server/myfiles) og absolutte GitHub stier (f.e. https://github.com/user/repo eller https://github.com/user/repo/tree/branch for grener), som eksemplene. Med dette har du etablert kildestier på begge steder, som et par.", "You can then..." => "Du kan deretter velge en sti par og dette blir da den nye rot stien i ICEcoder.", - "The file manager..." => "Filbehandleren viser deretter et ny GitHub-ikon, som du kan klikke på, for å utføre en sjekk og vise en forskjell mellom de 2 kildene. Disse forskjellene kan da være forpliktene og flyttet til den eksterne stien på GitHub eller klonet til din lokale sti, for å synkronisere filene dine.", - "If you want..." => "Hvis du ønsker å velge en annen rot sti, kan dette gjøres i skjermbildet Innstillinger." + "The file manager..." => "Filbehandleren viser deretter et ny GitHub-ikon, som du kan klikke på, for å utføre en sjekk og vise forskjell mellom de 2 kildene. Disse forskjellene kan da være påkrevd, og flyttes til den eksterne stien på GitHub eller klonet til din lokale sti, for å synkronisere filene dine.", + "If you want..." => "Hvis du ønsker å velge en annen root sti, kan dette gjøres i skjermbildet Innstillinger." ), "github" => array( - "Sorry, you do..." => "Beklager, det ser ikke ut til å ha OpenSSL lastet inn på PHP instans, så https er ikke tilgjengelig. Dette er nødvendig for GitHub dataoverføring, du kan endre php.ini innstillingene, start serveren på nytt og prøv igjen" + "Sorry, you do..." => "Beklager, det ser ikke ut til å ha lastet inn OpenSSL på PHP instans, så https er ikke tilgjengelig. Dette er nødvendig for GitHub dataoverføring, du kan endre php.ini innstillingene, start serveren på nytt og prøv igjen" ), "headers" => @@ -186,7 +186,7 @@ $text = array( "On Tabs" => "På faner", "Within file manager" => "Innenfor filbehandler", "Anywhere" => "Hvor som helst", - "Space" => "Mellomrom", // is this the key on keyboard ? otherwise it bust be "Sted" or "Plass" + "Space" => "Mellomrom", "Click" => "Klikk", "or" => "eller", "Left click" => "Venstre klikk", @@ -195,7 +195,7 @@ $text = array( "Right click" => "Høyre klikk", "Middle scrollwheel" => "Middel rullehjul", "Drag" => "Dra", - "Autocomplete add snippet" => "Autofullfør / legg til kodebiten", + "Autocomplete add snippet" => "Autofullfør/legg til kodebiten", "Multiple select" => "Flere valg", "Move line up" => "Flytt linje opp", "Move line down" => "Flytt linje ned", @@ -204,39 +204,39 @@ $text = array( "Insert line before" => "Sett inn linje før", "Insert line after" => "Sett inn linje etter", "Search for selected" => "Søk etter valgt", - "Jump to definition" => "Hopp til definisjon / hopp tilbake", - "Comment uncomment" => "Kommentar / fjern kommentar", - "Insert tab indent" => "Sett inn innrykk / valgt innrykk", + "Jump to definition" => "Hopp til definisjon/hopp tilbake", + "Comment uncomment" => "Kommentar/fjern kommentar", + "Insert tab indent" => "Sett inn innrykk/valgt innrykk", "Wrap with div" => "Wrap med <div>", "Wrap with span" => "Wrap med <span>", - "Wrap unwrap p" => "Wrap / uwrap med <p>", - "Wrap unwrap a" => "Wrap / uwrap med <a>", - "Wrap unwrap b" => "Wrap / uwrap med <b>", - "Wrap unwrap i" => "Wrap / uwrap med <i>", - "Wrap unwrap strong" => "Wrap / uwrap med <strong>", - "Wrap unwrap em" => "Wrap / uwrap med <em>", - "Wrap unwrap li" => "Wrap / uwrap med <li>", - "Wrap unwrap h1..." => "Wrap / uwrap med <h1> - <h3>", + "Wrap unwrap p" => "Wrap/uwrap med <p>", + "Wrap unwrap a" => "Wrap/uwrap med <a>", + "Wrap unwrap b" => "Wrap/uwrap med <b>", + "Wrap unwrap i" => "Wrap/uwrap med <i>", + "Wrap unwrap strong" => "Wrap/uwrap med <strong>", + "Wrap unwrap em" => "Wrap/uwrap med <em>", + "Wrap unwrap li" => "Wrap/uwrap med <li>", + "Wrap unwrap h1..." => "Wrap/uwrap med <h1> - <h3>", "End line with..." => "Avslutt linje med <br>", "Close tab" => "Lukk fane", - "Select file folder" => "Velg fil / mappe", + "Select file folder" => "Velg fil/mappe", "Open file" => "Åpne fil", - "Range select" => "Velg onråde", + "Range select" => "Velg område", "Options for selected" => "Egenskaper for valgt", "Delete selected" => "Slett valgt", - "Next previous tab" => "Neste / forige fane", + "Next previous tab" => "Neste/forige fane", "Next tab" => "Neste fane", "Previous tab" => "Forige fane", "New tab" => "Ny fane", "Close current tab" => "Lukk gjeldende fane", "Open file prompt" => "Åpne fil prompt", - "Find" => "Find", + "Find" => "Finn", "Focus on Go..." => "Fokus på Go til linje inndata", "Save" => "Lagre", "Save as" => "Lagre som...", "View webpage" => "Vis webside", - "Contract expand file..." => "Trekk sammen / utvid filbehandler", - "Fold unfold current..." => "Brett / utfold gjeldende linje", + "Contract expand file..." => "Trekk sammen/utvid filbehandler", + "Fold unfold current..." => "Brett/utfold gjeldende linje", "Refocus on document" => "Refokusere på dokument", "Cancel tasks" => "Avbryt oppgaver" ), @@ -258,10 +258,10 @@ $text = array( "Nothing to paste..." => "Ingenting å lime inn, kopiere en fil/mappe først!", "Replacing text in" => "Erstatte tekst i", "Cancelled tasks" => "Kansellerte oppgaver", - "Open previous files" => "Åpne forrige filer?", + "Open previous files" => "Åpne siste filer?", "Please enter your..." => "Skriv inn GitHub token (enten personlig tilgang token eller kunde/hemmelig par token). Se verktøytips ved siden av Github Auth Token på Hjelp-skjermbildet > Innstillinger for mer info", - "This will compare..." => "Dette vil sammenligne og vise en forskjell mellom din lokale mappe og repo. OK?", - "Please note for..." => "Vennligst merk: for at oppdatering skal fungere skikkelig, må du ha skrive/slette tilgang til alle ICEcoder kataloger og filer. Hvis du trenger å gjenopprette denne versjonen av ICEcoder av en eller annen grunn, vil du finne den i /tmp mappen. Klikk OK for å fortsette med en auto-oppdatering eller avbryt for å besøke ICEcoder området slik at du kan ta tak i zip og oppdatere manuelt.", + "This will compare..." => "Det vil sammenlignes og vise en forskjell mellom din lokale mappe og lagringsstedet. OK?", + "Please note for..." => "Vennligst merk: for at oppdatering skal fungere skikkelig, må du ha skrive/slette tilgang til alle ICEcoder kataloger og filer. Hvis du trenger å gjenopprette denne versjonen av ICEcoder av en eller annen grunn, vil du finne den i /tmp mappen. Klikk OK for å fortsette med en auto-oppdatering eller avbryt for å besøke ICEcoder området slik at du kan ta tak i zip-filen og oppdatere manuelt.", "You can start..." => "Du kan starte feilrapportering i Hjelp > Innstillinger", "Error cannot find..." => "Feil: kan ikke finne/få tilgang til feil filstier", "No new errors..." => "Ingen feil funnet", @@ -276,7 +276,7 @@ $text = array( "To disable registration..." => "Hvis du vil deaktivere registreringsmodus, åpne innstillingsmenyen eller åpne lib/config ___ settings.php og endre/aktiver Påmelding til 'false', deretter laste siden om igjen", "Registration mode enabled" => "Registreringsmodus aktivert", "auto-check for updates" => "auto-sjekk for oppdateringer", - "To put into..." => "Å sette inn i flerbrukermodus, åpne innstillingsmenyen eller åpen lib/config ___ settings.php og endre flerbruker til 'true', deretter laste siden om igjen", + "To put into..." => "Å sette til flerbrukermodus, åpne innstillingsmenyen eller åpen lib/config ___ settings.php og endre flerbruker til 'true', deretter laste siden om igjen", "multi-user" => "flerbruker" ), @@ -300,19 +300,19 @@ $text = array( "plugins-manager" => array( - "ICEcoder needs to..." => "ICEcoder må startes om igjen, for å gjøre dette programtillegg kjørbar. Start om igjen nå?", + "ICEcoder needs to..." => "ICEcoder må startes om igjen, for å gjøre programtillegget kjørbar. Start om igjen nå?", "saving plugins" => "lagre programtillegg...", - "Cannot update config..." => "Kan ikke oppdatere konfigurasjonsfilen. Vennligst sett offentlige skriverettigheter på", + "Cannot update config..." => "Kan ikke oppdatere konfigurasjonsfilen. Vennligst sett offentlige skriverettigheter", "and try again" => "og prøv igjen", "couldnt delete dir" => "kan ikke slette mappe", "couldnt delete file" => "kan ikke slette fil", "plugins" => "programtillegg", - "Guide to writing..." => "Guide til skriving programtillegg", - "Manage Installed" => "Administrer installert", + "Guide to writing..." => "Guide til skriving av programtillegg", + "Manage Installed" => "Administrer installerte", "URL" => "URL", "Target" => "Mål", "Timer" => "Tidsur", - "Update" => "Update", + "Update" => "Oppdater", "Install" => "Installer", "Uninstall" => "Avinstaller", "Reload after install..." => "Omstart etter installasjon nødvendig" @@ -325,7 +325,7 @@ $text = array( "Modified" => "Endret", "Last access" => "Siste tilgang", "Type" => "Type", - "Readable Writeable" => "Lesbar/Skrivbart", + "Readable Writeable" => "Lesbar/Skrivbar", "Relative path" => "Relativ sti", "Absolute path" => "Absolute sti", "Contains" => "Inneholder", @@ -347,7 +347,7 @@ $text = array( "settings-save-current-files" => array( - "Cannot update config..." => "Kan ikke oppdatere konfigurasjonsfilen. Vennligst sett offentlige skriverettigheter på", + "Cannot update config..." => "Kan ikke oppdatere konfigurasjonsfilen. Vennligst sett offentlige skriverettigheter", "and try again" => "og prøv igjen" ), @@ -364,54 +364,54 @@ $text = array( "functionality" => "funksjonalitet", "check for updates..." => "se etter oppdateringer ved start", "auto open last..." => "åpne automatisk siste filer ved innlogging", - "when finding in..." => "når funnet i filer, utelukke", + "when finding in..." => "når funnet blant filer, utelukke", "assisting" => "assistere", "code assist" => "code assistent", "visible tabs" => "synlige faner", - "locked nav" => "låst nav", + "locked nav" => "låst navi", "tag wrapper command" => "tag wrapper kommando", "auto-complete on" => "autokompletering på", "security" => "sikkerhet", "new password" => "nytt passord", - "8 chars min" => "8 tegn min", - "confirm password" => "bekrefte passord", + "8 chars min" => "min. 8 tegn", + "confirm password" => "bekreft passord", "banned files/folders" => "forbudte filer/mapper", "banned paths" => "forbudte stier", "ip addresses" => "ip adresser", - "Slash prefixed comma..." => "Slash prefiks, komma avgrenset", - "Comma delimited" => "Komma avgrenset", + "Slash prefixed comma..." => "Slash som prefiks, komma som skille", + "Comma delimited" => "Skilled med komma", "style" => "stil", "theme" => "tema", "line wrapping" => "linjebryting", - "indent type" => "innrykk typen", - "indent size" => "innrykk størrelse", - "font size" => "skriftstørrelse", + "indent type" => "innrykk type", + "indent size" => "innrykk størr.", + "font size" => "skrift størr.", "layout" => "layout", - "plugin panel aligned" => "programtillegg panel justert", + "plugin panel aligned" => "programtilleggspanel justert", "file manager" => "filbehandler", "root" => "root", "Slash prefixed" => "Slash prefiks", "bug reporting" => "feil rapportering", - "check in files" => "sjekke i filer", + "check in files" => "sjekke blant filer", "every" => "hver", "secs getting last" => "sek., får siste", "lines" => "linjer", "multi-user" => "flerbruker", - "Make sure you..." => "Pass på at du ikke låser deg ut selv", + "Make sure you..." => "Pass på, at du ikke låser deg ut selv", "Registration" => "Registrering", "auth token" => "auth token", - "Required to get..." => "Nødvendig for å få forskjell, bestemme seg til din på GitHub lagret repo etc. Hvis du ikke har en, kan du bruke en:".PHP_EOL.PHP_EOL. + "Required to get..." => "Nødvendig for å skille, bestemme ditt lagringssted på GitHub lageret etc. Hvis du ikke har en, kan du bruke en:".PHP_EOL.PHP_EOL. "- personal access token (https://help.github.com/articles/creating-an-access-token-for-command-line-use), eller".PHP_EOL. "- full client/secret pair token (http://developer.github.com/v3/oauth).".PHP_EOL.PHP_EOL. - "Det anbefales ikke at du setter token din her midlertidig, og vær sikrere på å oppgi det, når du blir bedt av ICEcoder, som som vil holde den i økten sin.".PHP_EOL.PHP_EOL. + "Det anbefales ikke, at du setter token din her midlertidig, og vær sikre på å oppgi den, når du blir bedt av ICEcoder, som vil holde den i økten sin.".PHP_EOL.PHP_EOL. "Men hvis du jobber i et trygt og sikkert miljø, er det mer effektivt å sette den her.", "Beklager, kan ikke bekrefte..." => "Beklager, kan ikke bekrefte innstillinger i demo-modus", - "update" => "update" + "update" => "oppdatere" ), "settings-update" => array( - "Cannot update config..." => "Kan ikke oppdatere konfigurasjonsfilen. Vennligst sett offentlige skriverettigheter på", + "Cannot update config..." => "Kan ikke oppdatere konfigurasjonsfilen. Vennligst sett offentlige skriverettigheter;", "and try again" => "og prøv igjen", "and press refresh" => "og trykker refresh" ), From 86b62d52a04fb5224745946103dc4c8c381e68c5 Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Thu, 28 Aug 2014 20:50:52 +0100 Subject: [PATCH 2/7] Remove extra closing bold tag --- test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test.php b/test.php index 62366ac..d2a9b08 100644 --- a/test.php +++ b/test.php @@ -13,7 +13,7 @@ echo "Test date, time & microtime:
".date("jS M Y g:i:sa")." (".microt $success = 0; -echo 'TEST 1 of 3: PHP Version:
ICEcoder needs at least PHP 5.0, tho 5.3 and above is recommended:

'; +echo 'TEST 1 of 3: PHP Version:
ICEcoder needs at least PHP 5.0, tho 5.3 and above is recommended:

'; echo "Your PHP Version: ".phpversion()."

"; echo 'TEST RESULT: '; @@ -78,4 +78,4 @@ echo $success." of 3 tests passed successfully

"; - \ No newline at end of file + From 5f0d7a5a19c84de60cac8adea1bde474a1d620b2 Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Thu, 28 Aug 2014 21:28:51 +0100 Subject: [PATCH 3/7] xssClean needs HTML context --- lib/github.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/github.php b/lib/github.php index be35d5d..7444f5d 100644 --- a/lib/github.php +++ b/lib/github.php @@ -28,7 +28,7 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset - \ No newline at end of file + From 28881db771ebd26d9d2129567246015cfb6e9022 Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Fri, 29 Aug 2014 19:22:39 +0100 Subject: [PATCH 5/7] Path reference fixes Replace iceRoot with nothing on location If we have no location, it should be a nothing to start with, not a slash Use this.childNodes[1].id instead of made up hardcoded ref onClick event added also, wasn't there previously?! --- lib/ice-coder.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/ice-coder.js b/lib/ice-coder.js index a908b96..807fe82 100644 --- a/lib/ice-coder.js +++ b/lib/ice-coder.js @@ -1003,20 +1003,19 @@ var ICEcoder = { var actionElemType, cssStyle, perms, targetElem, locNest, newText, innerLI, newUL, newLI, elemType, nameLI, shortURL, newMouseOver; // Adding files - if (action=="add" && !top.get('filesFrame').contentWindow.document.getElementById(location.replace(/\/$/, "").replace(/\//g,"|")+"|"+file)) { + if (action=="add" && !top.get('filesFrame').contentWindow.document.getElementById(location.replace(top.iceRoot,"").replace(/\/$/, "").replace(/\//g,"|")+"|"+file)) { // Is this is a file or folder and based on that, set the CSS styling & link actionElemType = fileOrFolder; cssStyle = actionElemType=="file" ? "pft-file ext-" + file.substr(file.indexOf(".")+1) : "pft-directory"; perms = actionElemType=="file" ? 664 : 705; // Identify our target element & the first child element in it's location - if (!location) {location="/"} - location = location.replace(top.iceRoot,""); + if (!location) {location=""} + location = location.replace(top.iceRoot,"/"); targetElem = top.get('filesFrame').contentWindow.document.getElementById(location.replace(/\//g,"|")); locNest = targetElem.parentNode.parentNode.nextSibling; newText = document.createTextNode("\n"); - innerLI = '        '+file+' '+perms+''; - + innerLI = '        '+file+' '+perms+''; // If we don't have at least 3 DOM items in here, it's an empty folder if(locNest.childNodes.length<3) { // We now need to begin a new UL list From 4cb2ac98d360daf36136e63a6d9a2a592b7547cb Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Fri, 29 Aug 2014 19:28:42 +0100 Subject: [PATCH 6/7] Deleted files show up now Excluded array paths have slashes not pipes Don't add deleted files to diffPaths array also, keep them seperate Can't use a for loop to add deleted files, only adds last reference as happens before a tickover Instead use a setInterval as a loop, with k as the counter instead of j to avoid confusion Check if it's not excluded dir/file as an outer if statement, with path fix for root 3 cases set up for adding deleted dirs/files in a sub-dir, plus folder or file in the root Clear the interval when finished looping --- lib/get-branch.php | 44 ++++++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/lib/get-branch.php b/lib/get-branch.php index 14e80f8..db80d22 100644 --- a/lib/get-branch.php +++ b/lib/get-branch.php @@ -93,9 +93,9 @@ function parseGitignore($file) { # $file = '/absolute/path/to/.gitignore' // Cycle through all .gitignore files running above function to get a list of $excluded files // Exclude the .git dir as first item as we don't want to see that -$excluded = array("|.git"); +$excluded = array("/.git"); foreach ($gi as $scanpath) { - $excludedTest = (parseGitignore($scanpath)); + $excludedTest = (parseGitignore($scanpath)); if (count($excludedTest) > 0) { $excluded = array_merge($excluded, $excludedTest); } @@ -246,7 +246,6 @@ if ($_SESSION['githubDiff']) { // DELETED FILES are kept // ====================== } else { - diffPaths.push(tree[i].path); deletedPaths.push(tree[i].path); } } @@ -338,15 +337,36 @@ if ($_SESSION['githubDiff']) { showContent = showContent.slice(0,-2); // If we've got some deleted files (as we're in GitHub diff mode), add those into the file manager if ("undefined" != typeof deletedPaths && deletedPaths.length > 0) { - for (var j=0; j" == "/"+thePath && excludedArray.indexOf("/"+thePath+"/"+theFile) == -1) { - setTimeout(function(){top.ICEcoder.updateFileManagerList('add','/'+thePath,theFile,false,false,false,'file');},4); + k = 0; + top.addDeletedFiles = setInterval(function() { + fSplit = deletedPaths[k].lastIndexOf("/"); + thePath = deletedPaths[k].substr(0,fSplit); + theFile = deletedPaths[k].substr(fSplit+1); + + // If it's not excluded + if (excludedArray.indexOf((thePath == "" ? "" : "/" + thePath)+"/"+theFile) == -1) { + + // If we're adding a deleted dir/file in a sub-dir + if ("" == "/"+thePath) { + top.ICEcoder.updateFileManagerList('add','/'+thePath,theFile,false,false,false,'file'); + // If we're adding a deleted dir/file at the root level + } else { + // Folder + if (thePath != "") { + top.ICEcoder.updateFileManagerList('add',top.iceRoot,thePath,false,false,false,'folder'); + // File + } else { + top.ICEcoder.updateFileManagerList('add',top.iceRoot+thePath,theFile,false,false,false,'file'); + } + } + } - } + k++; + if ("undefined" == typeof deletedPaths[k]) { + clearInterval(top.addDeletedFiles); + } + + },20); } setTimeout(function(){top.ICEcoder.redoTabHighlight(top.ICEcoder.selectedTab);},4); if (!top.ICEcoder.fmReady) {top.ICEcoder.fmReady=true;}; @@ -376,4 +396,4 @@ if ($_SESSION['githubDiff']) { } - + \ No newline at end of file From 7115b9e22cf57421fb8452e1b6e377e064af30c5 Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Fri, 29 Aug 2014 19:31:49 +0100 Subject: [PATCH 7/7] Updated to match main JS file --- lib/ice-coder.min.js | 55 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/lib/ice-coder.min.js b/lib/ice-coder.min.js index 3a902ca..5487961 100644 --- a/lib/ice-coder.min.js +++ b/lib/ice-coder.min.js @@ -20,8 +20,8 @@ top.ICEcoder.origCurorPos)a.setCursor(top.ICEcoder.origCurorPos);else for(top.IC pasteURL:function(a){var b;b=ICEcoder.getcMInstance();"CTRL"==top.ICEcoder.draggingWithKey&&(a=window.location.protocol+"//"+window.location.hostname+a);b.replaceSelection(a,"around")},searchForSelected:function(){if(top.ICEcoder.caretLocType)if(""!=top.ICEcoder.getcMInstance().getSelection()){var a=top.ICEcoder.caretLocType.toLowerCase()+" ";"Content"==top.ICEcoder.caretLocType&&(a="");window.open("http://www.google.com/#output=search&q="+a+top.ICEcoder.getcMInstance().getSelection())}else top.ICEcoder.message(top.t["No text selected..."])}, openCloseDir:function(a,b){var c,d;a.onclick=function(a){a.ctrlKey||top.ICEcoder.cmdKey||top.ICEcoder.openCloseDir(this,!1)};c=a.parentNode;c.nextSibling&&(c=c.nextSibling);c&&"UL"==c.tagName&&((d="none"==c.style.display)?b=!0:c.style.display="none",a.parentNode.className=a.className=d?"pft-directory dirOpen":"pft-directory");b&&(top.ICEcoder.filesFrame.contentWindow.frames.fileControl.location.href="lib/get-branch.php?location="+a.childNodes[1].id+"&csrf="+top.ICEcoder.csrf);return!1},overFileFolder:function(a, b){ICEcoder.thisFileFolderType=a;ICEcoder.thisFileFolderLink=b},selectFileFolder:function(a,b){var c,d,e,f,g,m;if(""==top.ICEcoder.thisFileFolderLink)b||a.ctrlKey||top.ICEcoder.cmdKey||top.ICEcoder.deselectAllFiles();else if(top.ICEcoder.thisFileFolderLink)if(d=top.ICEcoder.thisFileFolderLink.replace(/\//g,"|"),c=ICEcoder.filesFrame.contentWindow.document.getElementById(d),b||a.ctrlKey||top.ICEcoder.cmdKey)-1g.replace(/\d+/g,h)?d:g;if(0d&&("LI"!=f.childNodes[d].nodeName&& -d++,c=f.childNodes[d].childNodes[0].childNodes[1],c.id==m&&(e=!0),!0==e&&-1==top.ICEcoder.selectedFiles.indexOf(c.id)&&(ICEcoder.selectDeselectFile("select",c),top.ICEcoder.selectedFiles.push(c.id)),c.id!=g);d+=2);else ICEcoder.selectDeselectFile("select",c),top.ICEcoder.selectedFiles.push(d)}else top.ICEcoder.deselectAllFiles(),ICEcoder.selectDeselectFile("select",c),top.ICEcoder.selectedFiles.push(d);top.ICEcoder.githubDiff&&(top.get("githubNavSelectedCount").innerHTML="Selected: "+top.ICEcoder.selectedFiles.length, +1)):(ICEcoder.selectDeselectFile("select",c),top.ICEcoder.selectedFiles.push(d));else if(a.shiftKey){var h=function(a,b,c,d){return("00000000000000000000"+a).substr(-20)};e=!1;f=c.parentNode.parentNode.parentNode;g=top.ICEcoder.selectedFiles[top.ICEcoder.selectedFiles.length-1];m=d.replace(/\d+/g,h)g.replace(/\d+/g,h)?d:g;if(0d&&("LI"!=f.childNodes[d].nodeName&& +d++,c=f.childNodes[d].childNodes[0].childNodes[1],c.id==m&&(e=!0),1==e&&-1==top.ICEcoder.selectedFiles.indexOf(c.id)&&(ICEcoder.selectDeselectFile("select",c),top.ICEcoder.selectedFiles.push(c.id)),c.id!=g);d+=2);else ICEcoder.selectDeselectFile("select",c),top.ICEcoder.selectedFiles.push(d)}else top.ICEcoder.deselectAllFiles(),ICEcoder.selectDeselectFile("select",c),top.ICEcoder.selectedFiles.push(d);top.ICEcoder.githubDiff&&(top.get("githubNavSelectedCount").innerHTML="Selected: "+top.ICEcoder.selectedFiles.length, top.get("githubNavCommit").style.color=0c&&(b-=b+a-c),top.get("fileMenu").style.top=b+"px");return!1},showFileMenu:function(){top.get("fileMenu").style.display="inline-block";setTimeout(function(){top.get("fileMenu").style.opacity= -"1"},4)},hideFileMenu:function(){top.get("fileMenu").style.display="none";top.get("fileMenu").style.opacity="0"},updateFileManagerList:function(a,b,c,d,e,f,g){var m,h,k,n,p,l,r;if("add"==a&&!top.get("filesFrame").contentWindow.document.getElementById(b.replace(/\/$/,"").replace(/\//g,"|")+"|"+c)){m="file"==g?"pft-file ext-"+c.substr(c.indexOf(".")+1):"pft-directory";d="file"==g?664:705;b||(b="/");b=b.replace(top.iceRoot,"");h=top.get("filesFrame").contentWindow.document.getElementById(b.replace(/\//g, -"|"));k=h.parentNode.parentNode.nextSibling;n=document.createTextNode("\n");p='        '+c+' '+d+"";if(3>k.childNodes.length)l=document.createElement("ul"),k=h.parentNode.parentNode,k.parentNode.insertBefore(l,k.nextSibling),l=document.createElement("li"),l.className=m,l.draggable=!0,l.ondrag=function(a){top.ICEcoder.draggingWithKeyTest(a);top.ICEcoder.getcMInstance()&&top.ICEcoder.getcMInstance().focus()},l.ondragend=function(){top.ICEcoder.dropFile(this)},l.innerHTML=p,k.nextSibling.appendChild(l),k.nextSibling.appendChild(n);else for(h= -0;hc||"folder"==g&&"file"==l||h==k.childNodes.length-1)){l=document.createElement("li");l.className=m;l.draggable=!0;l.ondrag=function(a){top.ICEcoder.draggingWithKeyTest(a);top.ICEcoder.getcMInstance()&&top.ICEcoder.getcMInstance().focus()};l.ondragend=function(){top.ICEcoder.dropFile(this)};l.innerHTML=p;h== -k.childNodes.length-1?(k.appendChild(l),k.appendChild(n)):(k.insertBefore(l,k.childNodes[h]),k.insertBefore(n,k.childNodes[h+1]));break}"file"!=g||f||(top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1]=b+c)}"rename"==a&&(f=e.replace(/\//g,"|"),h=top.get("filesFrame").contentWindow.document.getElementById(f),h.innerHTML=c,h.id=b.replace(/\//g,"|")+"|"+c,h.parentNode.title=h.id.replace(/\|/g,"/"),targetElemPerms=top.get("filesFrame").contentWindow.document.getElementById(f+"_perms"),targetElemPerms.id= -b.replace(/\//g,"|")+"|"+c+"_perms");"move"==a&&(top.ICEcoder.updateFileManagerList("add",b,c,!1,!1,!1,g),top.ICEcoder.updateFileManagerList("delete",e.substr(0,e.lastIndexOf("/")),c));"chmod"==a&&(f=top.ICEcoder.selectedFiles[top.ICEcoder.selectedFiles.length-1].replace(/\|/g,"/"),h=top.get("filesFrame").contentWindow.document.getElementById(f.replace(/\//g,"|")+"_perms"),h.innerHTML=d);"delete"==a&&(h=top.get("filesFrame").contentWindow.document.getElementById((""==top.iceRoot?b.replace(/\/$/,"").replace(/\//g, -"|"):"")+"|"+c).parentNode.parentNode,top.ICEcoder.openCloseDir(h.childNodes[0],!1),h.parentNode.removeChild(h))},refreshFileManager:function(){top.ICEcoder.showHide("show",top.get("loadingMask"));top.ICEcoder.filesFrame.contentWindow.location.reload();top.ICEcoder.filesFrame.style.opacity="0";top.ICEcoder.filesFrame.onload=function(){top.ICEcoder.filesFrame.style.opacity="1";top.ICEcoder.showHide("hide",top.get("loadingMask"))}},draggingWithKeyTest:function(a){var b;b=a.keyCode?a.keyCode:a.which? -a.which:a.charCode;if(224==b||91==b||93==b)top.ICEcoder.cmdKey=!0;top.ICEcoder.draggingWithKey=a.ctrlKey||top.ICEcoder.cmdKey?"CTRL":!1},dropFile:function(a){var b,c;b=a.childNodes[0].childNodes[1].id.replace(/\|/g,"/");fileName=b.substr(b.lastIndexOf("/")+1);"editor"==top.ICEcoder.area&&top.ICEcoder.pasteURL(b);"files"==top.ICEcoder.area&&setTimeout(function(){c="folder"==ICEcoder.thisFileFolderType?ICEcoder.thisFileFolderLink:ICEcoder.thisFileFolderLink.substr(0,ICEcoder.thisFileFolderLink.lastIndexOf("|")); -"CTRL"==top.ICEcoder.draggingWithKey?(top.ICEcoder.copyFiles(top.ICEcoder.selectedFiles),top.ICEcoder.pasteFiles(c)):top.ICEcoder.moveFile(b,c.replace(/\|/g,"/")+"/"+fileName)},4);top.ICEcoder.mouseDown=!1},findReplaceOptions:function(){top.get("rText").style.display=top.get("replace").style.display=top.get("rTarget").style.display="and"==document.findAndReplace.connector.value?"inline-block":"none"},findReplace:function(a,b,c){var d,e,f;d=a.toLowerCase();e=top.get("replace").value;f=top.get("results"); -if((a=ICEcoder.getcMInstance())&&0a.getScrollInfo().clientHeight;if(b)f.innerHTML=ICEcoder.results.length+" results";else{for(e=ICEcoder.findResult=0;eICEcoder.results.length-1&&(ICEcoder.findResult=0);f.innerHTML="Highlighted result "+(ICEcoder.findResult+1)+" of "+ICEcoder.results.length+" results";b=a.getSearchCursor(d,a.getCursor(),!0);b.findNext();b.from()||(b=a.getSearchCursor(d,{line:0,ch:0},!0),b.findNext());a.setSelection(b.from(),b.to());top.ICEcoder.focus();top.ICEcoder.findMode=!0}d=c?parseInt(top.ICEcoder.content.style.height,10)/a.lineCount():a.defaultTextHeight();b=c?0:a.heightAtLine(0);top.ICEcoder.content.contentWindow.document.getElementById("resultsBar").style.right= -c?"17px":"0";f="";for(e=1;e<=a.lineCount();e++)c=-1';top.ICEcoder.content.contentWindow.document.getElementById("resultsBar").innerHTML=f;top.ICEcoder.content.contentWindow.document.getElementById("resultsBar").style.display="inline-block";return!0}f.innerHTML="No results";top.ICEcoder.content.contentWindow.document.getElementById("resultsBar").innerHTML= -"";top.ICEcoder.content.contentWindow.document.getElementById("resultsBar").style.display="none";return!1}""!=d&&c?(f=b=a="","and"==document.findAndReplace.connector.value&&(a="&replace="+e),0<=document.findAndReplace.target.value.indexOf("file")&&(b="&target="+document.findAndReplace.target.value.replace(/ /g,"-")),"selected files"==document.findAndReplace.target.value&&(f="&selectedFiles="+top.ICEcoder.selectedFiles.join(":")),d=d.replace(/\'/g,"'"),d!=encodeURIComponent(d)?d="ICEcoder:"+encodeURIComponent(d): -d,top.ICEcoder.showHide("show",top.get("loadingMask")),top.get("mediaContainer").innerHTML=''):(f.innerHTML="No results",top.ICEcoder.content.contentWindow.document.getElementById("resultsBar").innerHTML="",top.ICEcoder.content.contentWindow.document.getElementById("resultsBar").style.display="none")},replaceInFile:function(a,b,c){top.ICEcoder.serverQueue("add", -"lib/file-control.php?action=replaceText&fileRef="+a.replace(/\//g,"|")+"&find="+b+"&replace="+c+"&csrf="+top.ICEcoder.csrf);top.ICEcoder.serverMessage(""+top.t["Replacing text in"]+"
"+a)},getNestLocation:function(a){var b,c,d;if(b=ICEcoder.getcMInstance()){c=b.getValue();b=b.getTokenAt(b.getCursor()).state;d=!1;"undefined"!=typeof b&&(d=b.context);"undefined"!=typeof b.curState&&"undefined"!=typeof b.curState.htmlState&&(d=b.curState.htmlState.context);ICEcoder.htmlTagArray=[];if(d)for(;d;d= -d.prev)"undefined"!=typeof d.tagName&&ICEcoder.htmlTagArray.unshift(d.tagName);ICEcoder.tagString=ICEcoder.htmlTagArray[ICEcoder.htmlTagArray.length-1];"JavaScript"==ICEcoder.caretLocType&&(ICEcoder.tagString="script");a&&!top.ICEcoder.dontUpdateNest&&(ICEcoder.nestDisplay.innerHTML="","undefined"!=typeof ICEcoder.openFiles[ICEcoder.selectedTab-1]&&(a=ICEcoder.openFiles[ICEcoder.selectedTab-1],ICEcoder.getNestLocationSub(c,a)))}},getCaretPosition:function(){var a,b,c,d;a=ICEcoder.getcMInstance(); -b=a.getCursor().line;c=a.getCursor().ch;for(var e=d=0;e=a||10<=a)&&top.ICEcoder.mouseX>parseInt(top.ICEcoder.files.style.width, -10)&&(top.ICEcoder.tabDragMouseX=top.ICEcoder.mouseX-parseInt(top.ICEcoder.files.style.width,10)-top.ICEcoder.tabDragMouseXStart,top.ICEcoder.tabDragMove());if(top.ICEcoder.ready&&(top.ICEcoder.mouseDown||(top.ICEcoder.draggingFilesW=!1),a=!ICEcoder.draggingTab&&(top.ICEcoder.mouseX>top.ICEcoder.filesW-7&&top.ICEcoder.mouseX").replace(/\<\/b\>/g,"").replace(/\<br\>/g,"
"),b.style.left="0"):setTimeout(function(){b.style.left="2000px"},200);b.style.opacity=a?1:0},cssColorPreview:function(){var a,b,c,d;if(a=ICEcoder.getcMInstance()){b= -a.getLine(a.getCursor().line);for(c=/(#[\da-f]{3}(?:[\da-f]{3})?\b|\b(?:rgb|hsl)a?\([\s\d%,.-]+\)|\b[a-z]+\b)/gi;(d=c.exec(b))&&a.getCursor().ch>d.index+d[0].length;);(b=top.get("content").contentWindow.document.getElementById("cssColor"))&&b.parentNode.removeChild(b);top.ICEcoder.codeAssist&&"CSS"==top.ICEcoder.caretLocType&&(b=top.document.createElement("div"),b.id="cssColor",b.style.position="absolute",b.style.display="block",b.style.width=b.style.height="20px",b.style.zIndex="1000",b.style.background= -d?d[0]:"",b.style.cursor="pointer",b.onclick=function(){top.ICEcoder.showColorPicker(d[0])},""==b.style.backgroundColor&&(b.style.display="none"),top.get("header").appendChild(b),a.addWidget(a.getCursor(),top.get("cssColor"),!0))}},showColorPicker:function(a){top.get("blackMask").style.visibility="visible";top.get("mediaContainer").innerHTML='



'; -farbtastic("picker","color");a&&top.get("picker").farbtastic.setColor(a)},drawCanvasImage:function(a){var b,c,d,e,f,g,m,h,k,n,p;b=top.get("canvasPicker").getContext("2d");c=new Image;c.src=a.src;c.onload=function(){top.get("canvasPicker").width=a.width;top.get("canvasPicker").height=a.height;b.drawImage(c,0,0,a.width,a.height)};top.get("canvasPicker").onmousemove=function(a){d=a.pageX-this.offsetLeft;e=a.pageY-this.offsetTop;f=b.getImageData(d,e,1,1).data;g=f[0];m=f[1];h=f[2];k=g+","+m+","+h;n=top.ICEcoder.rgbToHex(g, +"1"},4)},hideFileMenu:function(){top.get("fileMenu").style.display="none";top.get("fileMenu").style.opacity="0"},updateFileManagerList:function(a,b,c,d,e,f,g){var m,h,k,n,p,l,r;if("add"==a&&!top.get("filesFrame").contentWindow.document.getElementById(b.replace(top.iceRoot,"").replace(/\/$/,"").replace(/\//g,"|")+"|"+c)){m="file"==g?"pft-file ext-"+c.substr(c.indexOf(".")+1):"pft-directory";d="file"==g?664:705;b||(b="");b=b.replace(top.iceRoot,"/");h=top.get("filesFrame").contentWindow.document.getElementById(b.replace(/\//g, +"|"));k=h.parentNode.parentNode.nextSibling;n=document.createTextNode("\n");p='        '+c+' '+d+"";if(3>k.childNodes.length)l=document.createElement("ul"),k=h.parentNode.parentNode,k.parentNode.insertBefore(l,k.nextSibling),l=document.createElement("li"),l.className=m,l.draggable=!0,l.ondrag=function(a){top.ICEcoder.draggingWithKeyTest(a);top.ICEcoder.getcMInstance()&&top.ICEcoder.getcMInstance().focus()},l.ondragend= +function(){top.ICEcoder.dropFile(this)},l.innerHTML=p,k.nextSibling.appendChild(l),k.nextSibling.appendChild(n);else for(h=0;hc||"folder"==g&&"file"==l||h==k.childNodes.length-1)){l=document.createElement("li");l.className=m;l.draggable=!0;l.ondrag=function(a){top.ICEcoder.draggingWithKeyTest(a);top.ICEcoder.getcMInstance()&& +top.ICEcoder.getcMInstance().focus()};l.ondragend=function(){top.ICEcoder.dropFile(this)};l.innerHTML=p;h==k.childNodes.length-1?(k.appendChild(l),k.appendChild(n)):(k.insertBefore(l,k.childNodes[h]),k.insertBefore(n,k.childNodes[h+1]));break}"file"!=g||f||(top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1]=b+c)}"rename"==a&&(f=e.replace(/\//g,"|"),h=top.get("filesFrame").contentWindow.document.getElementById(f),h.innerHTML=c,h.id=b.replace(/\//g,"|")+"|"+c,h.parentNode.title=h.id.replace(/\|/g,"/"), +targetElemPerms=top.get("filesFrame").contentWindow.document.getElementById(f+"_perms"),targetElemPerms.id=b.replace(/\//g,"|")+"|"+c+"_perms");"move"==a&&(top.ICEcoder.updateFileManagerList("add",b,c,!1,!1,!1,g),top.ICEcoder.updateFileManagerList("delete",e.substr(0,e.lastIndexOf("/")),c));"chmod"==a&&(f=top.ICEcoder.selectedFiles[top.ICEcoder.selectedFiles.length-1].replace(/\|/g,"/"),h=top.get("filesFrame").contentWindow.document.getElementById(f.replace(/\//g,"|")+"_perms"),h.innerHTML=d);"delete"== +a&&(h=top.get("filesFrame").contentWindow.document.getElementById((""==top.iceRoot?b.replace(/\/$/,"").replace(/\//g,"|"):"")+"|"+c).parentNode.parentNode,top.ICEcoder.openCloseDir(h.childNodes[0],!1),h.parentNode.removeChild(h))},refreshFileManager:function(){top.ICEcoder.showHide("show",top.get("loadingMask"));top.ICEcoder.filesFrame.contentWindow.location.reload();top.ICEcoder.filesFrame.style.opacity="0";top.ICEcoder.filesFrame.onload=function(){top.ICEcoder.filesFrame.style.opacity="1";top.ICEcoder.showHide("hide", +top.get("loadingMask"))}},draggingWithKeyTest:function(a){var b;b=a.keyCode?a.keyCode:a.which?a.which:a.charCode;if(224==b||91==b||93==b)top.ICEcoder.cmdKey=!0;top.ICEcoder.draggingWithKey=a.ctrlKey||top.ICEcoder.cmdKey?"CTRL":!1},dropFile:function(a){var b,c;b=a.childNodes[0].childNodes[1].id.replace(/\|/g,"/");fileName=b.substr(b.lastIndexOf("/")+1);"editor"==top.ICEcoder.area&&top.ICEcoder.pasteURL(b);"files"==top.ICEcoder.area&&setTimeout(function(){c="folder"==ICEcoder.thisFileFolderType?ICEcoder.thisFileFolderLink: +ICEcoder.thisFileFolderLink.substr(0,ICEcoder.thisFileFolderLink.lastIndexOf("|"));"CTRL"==top.ICEcoder.draggingWithKey?(top.ICEcoder.copyFiles(top.ICEcoder.selectedFiles),top.ICEcoder.pasteFiles(c)):top.ICEcoder.moveFile(b,c.replace(/\|/g,"/")+"/"+fileName)},4);top.ICEcoder.mouseDown=!1},findReplaceOptions:function(){top.get("rText").style.display=top.get("replace").style.display=top.get("rTarget").style.display="and"==document.findAndReplace.connector.value?"inline-block":"none"},findReplace:function(a, +b,c){var d,e,f;d=a.toLowerCase();e=top.get("replace").value;f=top.get("results");if((a=ICEcoder.getcMInstance())&&0a.getScrollInfo().clientHeight;if(b)f.innerHTML=ICEcoder.results.length+ +" results";else{for(e=ICEcoder.findResult=0;eICEcoder.results.length-1&&(ICEcoder.findResult=0);f.innerHTML="Highlighted result "+(ICEcoder.findResult+1)+" of "+ICEcoder.results.length+" results";b=a.getSearchCursor(d,a.getCursor(),!0);b.findNext();b.from()||(b=a.getSearchCursor(d,{line:0,ch:0},!0),b.findNext());a.setSelection(b.from(),b.to());top.ICEcoder.focus();top.ICEcoder.findMode= +!0}d=c?parseInt(top.ICEcoder.content.style.height,10)/a.lineCount():a.defaultTextHeight();b=c?0:a.heightAtLine(0);top.ICEcoder.content.contentWindow.document.getElementById("resultsBar").style.right=c?"17px":"0";f="";for(e=1;e<=a.lineCount();e++)c=-1';top.ICEcoder.content.contentWindow.document.getElementById("resultsBar").innerHTML= +f;top.ICEcoder.content.contentWindow.document.getElementById("resultsBar").style.display="inline-block";return!0}f.innerHTML="No results";top.ICEcoder.content.contentWindow.document.getElementById("resultsBar").innerHTML="";top.ICEcoder.content.contentWindow.document.getElementById("resultsBar").style.display="none";return!1}""!=d&&c?(f=b=a="","and"==document.findAndReplace.connector.value&&(a="&replace="+e),0<=document.findAndReplace.target.value.indexOf("file")&&(b="&target="+document.findAndReplace.target.value.replace(/ /g, +"-")),"selected files"==document.findAndReplace.target.value&&(f="&selectedFiles="+top.ICEcoder.selectedFiles.join(":")),d=d.replace(/\'/g,"'"),d!=encodeURIComponent(d)?d="ICEcoder:"+encodeURIComponent(d):d,top.ICEcoder.showHide("show",top.get("loadingMask")),top.get("mediaContainer").innerHTML=''):(f.innerHTML="No results",top.ICEcoder.content.contentWindow.document.getElementById("resultsBar").innerHTML= +"",top.ICEcoder.content.contentWindow.document.getElementById("resultsBar").style.display="none")},replaceInFile:function(a,b,c){top.ICEcoder.serverQueue("add","lib/file-control.php?action=replaceText&fileRef="+a.replace(/\//g,"|")+"&find="+b+"&replace="+c+"&csrf="+top.ICEcoder.csrf);top.ICEcoder.serverMessage(""+top.t["Replacing text in"]+"
"+a)},getNestLocation:function(a){var b,c,d;if(b=ICEcoder.getcMInstance()){c=b.getValue();b=b.getTokenAt(b.getCursor()).state;d=!1;"undefined"!=typeof b&& +(d=b.context);"undefined"!=typeof b.curState&&"undefined"!=typeof b.curState.htmlState&&(d=b.curState.htmlState.context);ICEcoder.htmlTagArray=[];if(d)for(;d;d=d.prev)"undefined"!=typeof d.tagName&&ICEcoder.htmlTagArray.unshift(d.tagName);ICEcoder.tagString=ICEcoder.htmlTagArray[ICEcoder.htmlTagArray.length-1];"JavaScript"==ICEcoder.caretLocType&&(ICEcoder.tagString="script");a&&!top.ICEcoder.dontUpdateNest&&(ICEcoder.nestDisplay.innerHTML="","undefined"!=typeof ICEcoder.openFiles[ICEcoder.selectedTab- +1]&&(a=ICEcoder.openFiles[ICEcoder.selectedTab-1],ICEcoder.getNestLocationSub(c,a)))}},getCaretPosition:function(){var a,b,c,d;a=ICEcoder.getcMInstance();b=a.getCursor().line;c=a.getCursor().ch;for(var e=d=0;e=a||10<=a)&&top.ICEcoder.mouseX>parseInt(top.ICEcoder.files.style.width,10)&&(top.ICEcoder.tabDragMouseX=top.ICEcoder.mouseX-parseInt(top.ICEcoder.files.style.width,10)-top.ICEcoder.tabDragMouseXStart,top.ICEcoder.tabDragMove());if(top.ICEcoder.ready&&(top.ICEcoder.mouseDown||(top.ICEcoder.draggingFilesW=!1),a=!ICEcoder.draggingTab&&(top.ICEcoder.mouseX>top.ICEcoder.filesW-7&&top.ICEcoder.mouseX").replace(/\<\/b\>/g,"").replace(/\<br\>/g, +"
"),b.style.left="0"):setTimeout(function(){b.style.left="2000px"},200);b.style.opacity=a?1:0},cssColorPreview:function(){var a,b,c,d;if(a=ICEcoder.getcMInstance()){b=a.getLine(a.getCursor().line);for(c=/(#[\da-f]{3}(?:[\da-f]{3})?\b|\b(?:rgb|hsl)a?\([\s\d%,.-]+\)|\b[a-z]+\b)/gi;(d=c.exec(b))&&a.getCursor().ch>d.index+d[0].length;);(b=top.get("content").contentWindow.document.getElementById("cssColor"))&&b.parentNode.removeChild(b);top.ICEcoder.codeAssist&&"CSS"==top.ICEcoder.caretLocType&&(b= +top.document.createElement("div"),b.id="cssColor",b.style.position="absolute",b.style.display="block",b.style.width=b.style.height="20px",b.style.zIndex="1000",b.style.background=d?d[0]:"",b.style.cursor="pointer",b.onclick=function(){top.ICEcoder.showColorPicker(d[0])},""==b.style.backgroundColor&&(b.style.display="none"),top.get("header").appendChild(b),a.addWidget(a.getCursor(),top.get("cssColor"),!0))}},showColorPicker:function(a){top.get("blackMask").style.visibility="visible";top.get("mediaContainer").innerHTML= +'



';farbtastic("picker", +"color");a&&top.get("picker").farbtastic.setColor(a)},drawCanvasImage:function(a){var b,c,d,e,f,g,m,h,k,n,p;b=top.get("canvasPicker").getContext("2d");c=new Image;c.src=a.src;c.onload=function(){top.get("canvasPicker").width=a.width;top.get("canvasPicker").height=a.height;b.drawImage(c,0,0,a.width,a.height)};top.get("canvasPicker").onmousemove=function(a){d=a.pageX-this.offsetLeft;e=a.pageY-this.offsetTop;f=b.getImageData(d,e,1,1).data;g=f[0];m=f[1];h=f[2];k=g+","+m+","+h;n=top.ICEcoder.rgbToHex(g, m,h);top.get("rgbMouseXY").value=k;top.get("hexMouseXY").value="#"+n;top.get("hexMouseXY").style.backgroundColor=top.get("rgbMouseXY").style.backgroundColor="#"+n;p=128>g||128>m||128>h&&200>g&&200>m&&50