ID selectors added to iFrames in mediaContainer, can Enter or Esc

This commit is contained in:
mattpass
2020-03-14 10:58:10 +00:00
parent 3b53ef54ca
commit e666f38124
8 changed files with 31 additions and 16 deletions

View File

@@ -50,7 +50,7 @@ echo ($ICEcoder["theme"] === "default"
<link rel="stylesheet" href="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/scroll/simplescrollbars.css?microtime=<?php echo microtime(true);?>">
</head>
<body class="backup-versions">
<body class="backup-versions" onkeydown="parent.ICEcoder.handleModalKeyUp(event, 'versions')" onload="this.focus();">
<h1 id="title"><?php echo $versions." ".($versions != 1 ? $t["backups"] : $t["backup"])." ".$t['available for'].":";?></h1>
<h2><?php echo $file;?></h2>

View File

@@ -127,7 +127,7 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset
<link rel="stylesheet" type="text/css" href="ftp-manager.css?microtime=<?php echo microtime(true);?>">
</head>
<body class="ftpManager">
<body class="ftpManager" onkeydown="parent.ICEcoder.handleModalKeyUp(event, 'ftpManager')" onload="this.focus();">
<h1><?php echo $t['ftp manager'];?></h1>

View File

@@ -13,7 +13,7 @@ $t = $text['help'];
<link rel="stylesheet" type="text/css" href="help.css?microtime=<?php echo microtime(true);?>">
</head>
<body class="help">
<body class="help" onkeydown="parent.ICEcoder.handleModalKeyUp(event, 'help')" onload="this.focus();">
<h1 id="title"><?php echo $t['shortcuts'];?></h1>

View File

@@ -2585,7 +2585,7 @@ var ICEcoder = {
find = find.replace(/\'/g, '\&#39;');
find != encodeURIComponent(find) ? find = 'ICEcoder:'+encodeURIComponent(find) : find;
this.showHide('show',get('loadingMask'));
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/multiple-results.php?find='+find+replaceQS+targetQS+filesQS+'&csrf='+this.csrf+'" class="whiteGlow" style="width: 700px; height: 500px"></iframe>';
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/multiple-results.php?find='+find+replaceQS+targetQS+filesQS+'&csrf='+this.csrf+'" id="multipleResultsIFrame" class="whiteGlow" style="width: 700px; height: 500px"></iframe>';
// 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 = '<iframe src="'+iceLoc+'/lib/settings-screen.php" class="whiteGlow" style="width: 970px; height: 610px"></iframe>';
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/settings-screen.php" id="settingsIFrame" class="whiteGlow" style="width: 970px; height: 610px"></iframe>';
}
this.showHide(hide?'hide':'show',get('blackMask'));
},
// Show the help screen
helpScreen: function() {
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/help.php" class="whiteGlow" style="width: 840px; height: 485px"></iframe>';
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/help.php" id="helpIFrame" class="whiteGlow" style="width: 840px; height: 485px"></iframe>';
this.showHide('show',get('blackMask'));
},
// Show the backup versions screen
versionsScreen: function(file,versions) {
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/backup-versions.php?file='+file+'&csrf='+this.csrf+'" class="whiteGlow" style="width: 970px; height: 640px"></iframe>';
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/backup-versions.php?file='+file+'&csrf='+this.csrf+'" id="versionsIFrame" class="whiteGlow" style="width: 970px; height: 640px"></iframe>';
this.showHide('show',get('blackMask'));
},
@@ -3208,13 +3208,13 @@ var ICEcoder = {
var sectionExtra;
sectionExtra = section ? "#"+section : "";
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/https://this.net/manual?version='+version+sectionExtra+'" class="whiteGlow" style="width: 800px; height: 470px"></iframe>';
get('mediaContainer').innerHTML = '<iframe src="https://icecoder.net/manual?version='+version+sectionExtra+'" id="manualIFrame" class="whiteGlow" style="width: 800px; height: 470px"></iframe>';
this.showHide('show',get('blackMask'));
},
// Show the properties screen
propertiesScreen: function(fileName) {
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/properties.php?fileName='+fileName.replace(/\//g,"|")+'&csrf='+this.csrf+'" class="whiteGlow" style="width: 660px; height: 330px"></iframe>';
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/properties.php?fileName='+fileName.replace(/\//g,"|")+'&csrf='+this.csrf+'" id="propertiesIFrame" class="whiteGlow" style="width: 660px; height: 330px"></iframe>';
this.showHide('show',get('blackMask'));
},
@@ -3226,7 +3226,7 @@ var ICEcoder = {
// Show the plugins manager
pluginsManager: function() {
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/plugins-manager.php" class="whiteGlow" style="width: 800px; height: 450px"></iframe>';
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/plugins-manager.php" id="pluginsManagerIFrame" class="whiteGlow" style="width: 800px; height: 450px"></iframe>';
this.showHide('show',get('blackMask'));
},
@@ -3237,7 +3237,7 @@ var ICEcoder = {
// Show the FTP manager
ftpManager: function() {
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/ftp-manager.php" class="whiteGlow" style="width: 660px; height: 550px"></iframe>';
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/ftp-manager.php" id="ftpManagerIFrame" class="whiteGlow" style="width: 660px; height: 550px"></iframe>';
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;

View File

@@ -19,7 +19,7 @@ if(isset($_GET['selectedFiles'])) {
<script>ICEcoder = parent.ICEcoder;</script>
</head>
<body class="results" onLoad="get('loadingMask').style.visibility = 'hidden'">
<body class="results" onkeydown="parent.ICEcoder.handleModalKeyUp(event, 'multipleResults')" onload="get('loadingMask').style.visibility = 'hidden'; this.focus();">
<h1 id="title"></h1>
<div class="resultsPane" id="resultsPane">

View File

@@ -180,7 +180,7 @@ function deletePlugin($dir) {
<link rel="stylesheet" type="text/css" href="plugins-manager.css?microtime=<?php echo microtime(true);?>">
</head>
<body class="pluginsManager">
<body class="pluginsManager" onkeydown="parent.ICEcoder.handleModalKeyUp(event, 'pluginsManager')" onload="this.focus();">
<h1><?php echo $t['plugins'];?></h1>

View File

@@ -20,7 +20,7 @@ if (!file_exists($fileName) || strpos(str_replace("\\","/",$fileName),$docRoot)
<link rel="stylesheet" type="text/css" href="properties.css?microtime=<?php echo microtime(true);?>">
</head>
<body class="properties">
<body class="properties" onkeydown="parent.ICEcoder.handleModalKeyUp(event, 'properties')" onload="this.focus();">
<h1 id="title"><?php echo $t['properties'];?></h1>

View File

@@ -38,7 +38,7 @@ for ($i=0;$i<count($themeArray);$i++) {
<link rel="stylesheet" href="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/scroll/simplescrollbars.css?microtime=<?php echo microtime(true);?>">
</head>
<body class="settings">
<body class="settings" onkeydown="parent.ICEcoder.handleModalKeyUp(event, 'settings')" onload="this.focus();">
<div class="infoPane">
<a href="https://icecoder.net" target="_blank"><img src="../images/icecoder.png" alt="ICEcoder" class="logo"></a>
@@ -443,9 +443,13 @@ var switchTab = function(tab) {
}
editor.refresh();
}
var submitSettings = function() {
<?php echo $ICEcoder['demoMode'] ? "parent.parent.ICEcoder.message('Sorry, can\'t commit settings in demo mode')" : "validatePasswords()"; ?>;
}
</script>
<div class="update" id="updateButton" onClick="<?php echo $ICEcoder['demoMode'] ? "parent.parent.ICEcoder.message('Sorry, can\'t commit settings in demo mode')" : "validatePasswords()"; ?>">update</div>
<div class="update" id="updateButton" onClick="submitSettings()">update</div>
<input type="hidden" name="csrf" value="<?php echo $_SESSION["csrf"]; ?>">
</form>