From: tjhunt <tjhunt>
Date: Thu, 25 Sep 2008 03:14:24 +0000 (+0000)
Subject: MDL-16671 - Move openpopup out of javascript.php and in to javascript-static.js
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=77241d9bd17072a41eddce67fe8701d99c9b2af8;p=moodle.git

MDL-16671 - Move openpopup out of javascript.php and in to javascript-static.js
---

diff --git a/lib/javascript-static.js b/lib/javascript-static.js
index f76d1a87a8..48bbb5a07b 100644
--- a/lib/javascript-static.js
+++ b/lib/javascript-static.js
@@ -534,3 +534,14 @@ function getElementsByClassName(oElm, strTagName, oClassNames){
     }
     return (arrReturnElements)
 }
+
+function openpopup(url, name, options, fullscreen) {
+    var fullurl = moodle_config.wwwroot + url;
+    var windowobj = window.open(fullurl,name,options);
+    if (fullscreen) {
+        windowobj.moveTo(0,0);
+        windowobj.resizeTo(screen.availWidth,screen.availHeight);
+    }
+    windowobj.focus();
+    return false;
+}
diff --git a/lib/javascript.php b/lib/javascript.php
index 03d34fcaa8..69a273cbb4 100644
--- a/lib/javascript.php
+++ b/lib/javascript.php
@@ -30,16 +30,6 @@ setTimeout('fix_column_widths()', 20);
 </script>
 <script type="text/javascript">
 //<![CDATA[
-function openpopup(url,name,options,fullscreen) {
-  fullurl = "<?php echo $CFG->httpswwwroot ?>" + url;
-  windowobj = window.open(fullurl,name,options);
-  if (fullscreen) {
-     windowobj.moveTo(0,0);
-     windowobj.resizeTo(screen.availWidth,screen.availHeight);
-  }
-  windowobj.focus();
-  return false;
-}
 <?php
     echo "function inserttext(text) {\n";
     if (!empty($SESSION->inserttextform)) {