From e666f381244b86dc08472be68e83a7f4ffbfef56 Mon Sep 17 00:00:00 2001 From: mattpass Date: Sat, 14 Mar 2020 10:58:10 +0000 Subject: [PATCH] ID selectors added to iFrames in mediaContainer, can Enter or Esc --- lib/backup-versions.php | 2 +- lib/ftp-manager.php | 2 +- lib/help.php | 2 +- lib/icecoder.js | 27 +++++++++++++++++++-------- lib/multiple-results.php | 2 +- lib/plugins-manager.php | 2 +- lib/properties.php | 2 +- lib/settings-screen.php | 8 ++++++-- 8 files changed, 31 insertions(+), 16 deletions(-) diff --git a/lib/backup-versions.php b/lib/backup-versions.php index 39aa19d..9baca3a 100644 --- a/lib/backup-versions.php +++ b/lib/backup-versions.php @@ -50,7 +50,7 @@ echo ($ICEcoder["theme"] === "default" /addon/scroll/simplescrollbars.css?microtime="> - +

diff --git a/lib/ftp-manager.php b/lib/ftp-manager.php index 83189b5..acaf553 100644 --- a/lib/ftp-manager.php +++ b/lib/ftp-manager.php @@ -127,7 +127,7 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset - +

diff --git a/lib/help.php b/lib/help.php index ddbc845..03aa441 100644 --- a/lib/help.php +++ b/lib/help.php @@ -13,7 +13,7 @@ $t = $text['help']; - +

diff --git a/lib/icecoder.js b/lib/icecoder.js index 52fb5d3..294e9b1 100644 --- a/lib/icecoder.js +++ b/lib/icecoder.js @@ -2585,7 +2585,7 @@ var ICEcoder = { find = find.replace(/\'/g, '\''); find != encodeURIComponent(find) ? find = 'ICEcoder:'+encodeURIComponent(find) : find; this.showHide('show',get('loadingMask')); - get('mediaContainer').innerHTML = ''; + get('mediaContainer').innerHTML = ''; // We have nothing to search for, blank it all out } else { results.innerHTML = "No results"; @@ -3186,20 +3186,20 @@ var ICEcoder = { // Show the settings screen settingsScreen: function(hide) { if (!hide) { - get('mediaContainer').innerHTML = ''; + get('mediaContainer').innerHTML = ''; } this.showHide(hide?'hide':'show',get('blackMask')); }, // Show the help screen helpScreen: function() { - get('mediaContainer').innerHTML = ''; + get('mediaContainer').innerHTML = ''; this.showHide('show',get('blackMask')); }, // Show the backup versions screen versionsScreen: function(file,versions) { - get('mediaContainer').innerHTML = ''; + get('mediaContainer').innerHTML = ''; this.showHide('show',get('blackMask')); }, @@ -3208,13 +3208,13 @@ var ICEcoder = { var sectionExtra; sectionExtra = section ? "#"+section : ""; - get('mediaContainer').innerHTML = ''; + get('mediaContainer').innerHTML = ''; this.showHide('show',get('blackMask')); }, // Show the properties screen propertiesScreen: function(fileName) { - get('mediaContainer').innerHTML = ''; + get('mediaContainer').innerHTML = ''; this.showHide('show',get('blackMask')); }, @@ -3226,7 +3226,7 @@ var ICEcoder = { // Show the plugins manager pluginsManager: function() { - get('mediaContainer').innerHTML = ''; + get('mediaContainer').innerHTML = ''; this.showHide('show',get('blackMask')); }, @@ -3237,7 +3237,7 @@ var ICEcoder = { // Show the FTP manager ftpManager: function() { - get('mediaContainer').innerHTML = ''; + get('mediaContainer').innerHTML = ''; this.showHide('show',get('blackMask')); }, @@ -4447,6 +4447,17 @@ var ICEcoder = { this.cmdKey = false; }, + handleModalKeyUp: function(evt, page) { + key = evt.keyCode ? evt.keyCode : evt.which ? evt.which : evt.charCode; + + if ("settings" === page && 13 === key) { + get(page + 'IFrame').contentWindow.submitSettings(); + } + if (27 === key) { + parent.ICEcoder.showHide('hide',parent.get('blackMask')); + } + }, + // Add snippet code completion addSnippet: function() { var cM, cMdiff, thisCM, lineNo, whiteSpace, content; diff --git a/lib/multiple-results.php b/lib/multiple-results.php index 0929a63..120e8ca 100644 --- a/lib/multiple-results.php +++ b/lib/multiple-results.php @@ -19,7 +19,7 @@ if(isset($_GET['selectedFiles'])) { - +

diff --git a/lib/plugins-manager.php b/lib/plugins-manager.php index fb4e027..bbfe303 100644 --- a/lib/plugins-manager.php +++ b/lib/plugins-manager.php @@ -180,7 +180,7 @@ function deletePlugin($dir) { - +

diff --git a/lib/properties.php b/lib/properties.php index a252ee4..3f2912b 100644 --- a/lib/properties.php +++ b/lib/properties.php @@ -20,7 +20,7 @@ if (!file_exists($fileName) || strpos(str_replace("\\","/",$fileName),$docRoot) - +

diff --git a/lib/settings-screen.php b/lib/settings-screen.php index 6b73476..1e1e355 100644 --- a/lib/settings-screen.php +++ b/lib/settings-screen.php @@ -38,7 +38,7 @@ for ($i=0;$i/addon/scroll/simplescrollbars.css?microtime="> - +
@@ -443,9 +443,13 @@ var switchTab = function(tab) { } editor.refresh(); } + +var submitSettings = function() { + ; +} -
">update
+
update
">