Use get function where possible

mattpass · mattpass · commit fd8b77a9df35 · 2013-07-07T15:38:58.000+01:00
diff --git a/lib/multiple-results.php b/lib/multiple-results.php
@@ -14,7 +14,7 @@
 <link rel="stylesheet" type="text/css" href="multiple-results.css">
 </head>
 
-<body class="results" onLoad="top.document.getElementById('loadingMask').style.visibility = 'hidden'">
+<body class="results" onLoad="top.get('loadingMask').style.visibility = 'hidden'">
 
 <h1 id="title"></h1>
 <div class="resultsPane" id="resultsPane">
@@ -90,7 +90,7 @@
 					}
 				}
 				if (userTarget.indexOf("all")>-1 || (userTarget.indexOf("selected")>-1 && foundInSelected)) {
-					resultsDisplay += '<a href="javascript:top.ICEcoder.openFile(\'<?php echo $docRoot;?>'+targetURL.replace(/\|/g,"/").replace(/_perms/g,"")+'\');top.ICEcoder.showHide(\'hide\',top.document.getElementById(\'blackMask\'))">';
+					resultsDisplay += '<a href="javascript:top.ICEcoder.openFile(\'<?php echo $docRoot;?>'+targetURL.replace(/\|/g,"/").replace(/_perms/g,"")+'\');top.ICEcoder.showHide(\'hide\',top.get(\'blackMask\'))">';
 					resultsDisplay += targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strtolower($findText)); ?>/g,"<b>"+findText.toLowerCase()+"</b>");
 					resultsDisplay += '</a><br>';
 					<?php if (!isset($_GET['replace'])) { ?>
@@ -135,7 +135,7 @@ function phpGrep($q, $path, $base) {
 					}
 				}
 				if (!$bFile && (count($selectedFiles)==0 || count($selectedFiles)>0 && $foundInSelFile)) {
-					$ret .= "<a href=\\\"javascript:top.ICEcoder.openFile('".$fullPath."');top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'))\\\">";
+					$ret .= "<a href=\\\"javascript:top.ICEcoder.openFile('".$fullPath."');top.ICEcoder.showHide('hide',top.get('blackMask'))\\\">";
 					$ret .= str_replace($base,"",$fullPath)."</a><div id=\\\"foundCount".$r."\\\">Found ".substr_count(strtolower(toUTF8noBOM(file_get_contents($fullPath,false,$context),false)),$q)." times</div>";
 					if (isset($_GET['replace'])) {
 						$ret .= "<div class=\\\"replace\\\" id=\\\"replace\\\" onClick=\\\"replaceInFileSingle('".$fullPath."');this.style.display=\'none\'\\\">replace</div>";
@@ -157,7 +157,7 @@ function phpGrep($q, $path, $base) {
 }
 ?>
 showHide = foundArray.length==0 ? "hide" : "show";
-top.ICEcoder.showHide(showHide,top.document.getElementById('blackMask'));
+top.ICEcoder.showHide(showHide,top.get('blackMask'));
 if (foundArray.length==0) {top.ICEcoder.message('No matches found')};
 <?php if (isset($_GET['replace'])) { ?>
 if (foundArray.length!=0) {document.getElementById('replaceAll').style.opacity = 1};
@@ -170,22 +170,22 @@ function phpGrep($q, $path, $base) {
 
 var gotoTab = function(tab) {
 	top.ICEcoder.switchTab(tab);
-	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
+	top.ICEcoder.showHide('hide',top.get('blackMask'));
 }
 
 var replaceSingle = function(tab) {
 	top.ICEcoder.switchTab(tab);
 	cM = top.ICEcoder.getcMInstance();
 	content = cM.getValue();
-	cM.setValue(cM.getValue().replace(rExp,top.document.getElementById('replace').value));
+	cM.setValue(cM.getValue().replace(rExp,top.get('replace').value));
 	document.getElementById('foundCount'+tab).innerHTML = document.getElementById('foundCount'+tab).innerHTML.replace('Found','Replaced');
 }
 
 var replaceAll = function() {
 	for (var i=0;i<=foundArray.length-1;i++) {
 		replaceSingle(foundArray[i]);
 	}
-	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
+	top.ICEcoder.showHide('hide',top.get('blackMask'));
 }
 
 var replaceInFileSingle = function(fileRef) {
@@ -196,7 +196,7 @@ function phpGrep($q, $path, $base) {
 	for (var i=0;i<=foundArray.length-1;i++) {
 		replaceInFileSingle(foundArray[i]);
 	}
-	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
+	top.ICEcoder.showHide('hide',top.get('blackMask'));
 }
 
 var renameSingle = function(arrayRef) {
@@ -209,7 +209,7 @@ function phpGrep($q, $path, $base) {
 	for (var i=0;i<=foundArray.length-1;i++) {
 		renameSingle(foundArray[i]);
 	}
-	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
+	top.ICEcoder.showHide('hide',top.get('blackMask'));
 }
 </script>
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`<link rel="stylesheet" type="text/css" href="multiple-results.css">`
`15`	`15`	`</head>`
`16`	`16`
`17`		`-<body class="results" onLoad="top.document.getElementById('loadingMask').style.visibility = 'hidden'">`
	`17`	`+<body class="results" onLoad="top.get('loadingMask').style.visibility = 'hidden'">`
`18`	`18`
`19`	`19`	`<h1 id="title"></h1>`
`20`	`20`	`<div class="resultsPane" id="resultsPane">`
`@@ -90,7 +90,7 @@`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`if (userTarget.indexOf("all")>-1 \|\| (userTarget.indexOf("selected")>-1 && foundInSelected)) {`
`93`		`- resultsDisplay += '<a href="javascript:top.ICEcoder.openFile(\'<?php echo $docRoot;?>'+targetURL.replace(/\\|/g,"/").replace(/_perms/g,"")+'\');top.ICEcoder.showHide(\'hide\',top.document.getElementById(\'blackMask\'))">';`
	`93`	`+ resultsDisplay += '<a href="javascript:top.ICEcoder.openFile(\'<?php echo $docRoot;?>'+targetURL.replace(/\\|/g,"/").replace(/_perms/g,"")+'\');top.ICEcoder.showHide(\'hide\',top.get(\'blackMask\'))">';`
`94`	`94`	`resultsDisplay += targetURL.replace(/\\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strtolower($findText)); ?>/g,"<b>"+findText.toLowerCase()+"</b>");`
`95`	`95`	`resultsDisplay += '</a><br>';`
`96`	`96`	`<?php if (!isset($_GET['replace'])) { ?>`
`@@ -135,7 +135,7 @@ function phpGrep($q, $path, $base) {`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`if (!$bFile && (count($selectedFiles)==0 \|\| count($selectedFiles)>0 && $foundInSelFile)) {`
`138`		`- $ret .= "<a href=\\\"javascript:top.ICEcoder.openFile('".$fullPath."');top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'))\\\">";`
	`138`	`+ $ret .= "<a href=\\\"javascript:top.ICEcoder.openFile('".$fullPath."');top.ICEcoder.showHide('hide',top.get('blackMask'))\\\">";`
`139`	`139`	`$ret .= str_replace($base,"",$fullPath)."</a><div id=\\\"foundCount".$r."\\\">Found ".substr_count(strtolower(toUTF8noBOM(file_get_contents($fullPath,false,$context),false)),$q)." times</div>";`
`140`	`140`	`if (isset($_GET['replace'])) {`
`141`	`141`	`$ret .= "<div class=\\\"replace\\\" id=\\\"replace\\\" onClick=\\\"replaceInFileSingle('".$fullPath."');this.style.display=\'none\'\\\">replace</div>";`
`@@ -157,7 +157,7 @@ function phpGrep($q, $path, $base) {`
`157`	`157`	`}`
`158`	`158`	`?>`
`159`	`159`	`showHide = foundArray.length==0 ? "hide" : "show";`
`160`		`-top.ICEcoder.showHide(showHide,top.document.getElementById('blackMask'));`
	`160`	`+top.ICEcoder.showHide(showHide,top.get('blackMask'));`
`161`	`161`	`if (foundArray.length==0) {top.ICEcoder.message('No matches found')};`
`162`	`162`	`<?php if (isset($_GET['replace'])) { ?>`
`163`	`163`	`if (foundArray.length!=0) {document.getElementById('replaceAll').style.opacity = 1};`
`@@ -170,22 +170,22 @@ function phpGrep($q, $path, $base) {`
`170`	`170`
`171`	`171`	`var gotoTab = function(tab) {`
`172`	`172`	`top.ICEcoder.switchTab(tab);`
`173`		`- top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));`
	`173`	`+ top.ICEcoder.showHide('hide',top.get('blackMask'));`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`var replaceSingle = function(tab) {`
`177`	`177`	`top.ICEcoder.switchTab(tab);`
`178`	`178`	`cM = top.ICEcoder.getcMInstance();`
`179`	`179`	`content = cM.getValue();`
`180`		`- cM.setValue(cM.getValue().replace(rExp,top.document.getElementById('replace').value));`
	`180`	`+ cM.setValue(cM.getValue().replace(rExp,top.get('replace').value));`
`181`	`181`	`document.getElementById('foundCount'+tab).innerHTML = document.getElementById('foundCount'+tab).innerHTML.replace('Found','Replaced');`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`var replaceAll = function() {`
`185`	`185`	`for (var i=0;i<=foundArray.length-1;i++) {`
`186`	`186`	`replaceSingle(foundArray[i]);`
`187`	`187`	`}`
`188`		`- top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));`
	`188`	`+ top.ICEcoder.showHide('hide',top.get('blackMask'));`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`var replaceInFileSingle = function(fileRef) {`
`@@ -196,7 +196,7 @@ function phpGrep($q, $path, $base) {`
`196`	`196`	`for (var i=0;i<=foundArray.length-1;i++) {`
`197`	`197`	`replaceInFileSingle(foundArray[i]);`
`198`	`198`	`}`
`199`		`- top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));`
	`199`	`+ top.ICEcoder.showHide('hide',top.get('blackMask'));`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`var renameSingle = function(arrayRef) {`
`@@ -209,7 +209,7 @@ function phpGrep($q, $path, $base) {`
`209`	`209`	`for (var i=0;i<=foundArray.length-1;i++) {`
`210`	`210`	`renameSingle(foundArray[i]);`
`211`	`211`	`}`
`212`		`- top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));`
	`212`	`+ top.ICEcoder.showHide('hide',top.get('blackMask'));`
`213`	`213`	`}`
`214`	`214`	`</script>`
`215`	`215`