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 f76d1a87a8debc30125b3f7edda82fce62dd8b59..48bbb5a07b58b7a3e62d8e69df1d1c3729eb7b90 100644 (file)
--- 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 03d34fcaa899eb6530e9376c57cc4d08d5189f19..69a273cbb4727c716c76347668391c024734285f 100644 (file)
--- 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)) {