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

…-static.js
safatshahin · Sep 25, 2008 · 77241d9 · 77241d9
1 parent 830c58b
commit 77241d9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git 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
@@ -30,16 +30,6 @@
 </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)) {