Some minor js problems. MDL-7811 and MDL-6481

Merged from MOODLE_17_STABLE

diff --git a/mod/resource/type/ims/ims.html b/mod/resource/type/ims/ims.html
index f92f0caf3aaf30dd401c5c11e46a1d166907a216..f8da4bbcbfc6a176be38a4bc7cfe8a24fe54ce09 100644 (file)
--- a/mod/resource/type/ims/ims.html
+++ b/mod/resource/type/ims/ims.html
@@ -163,10 +163,6 @@
                 echo "<script type=\"text/javascript\">\n//<![CDATA[\n";
                 echo "lockoptions('form','windowpopup[1]', popupitems);";
                 echo "\n//]]>\n</script>";
-            } else {
-                echo "<script type=\"text/javascript\">\n//<![CDATA[\n";
-                echo "lockoptions('form','windowpopup[0]', frameitem);";
-                echo "\n//]]>\n</script>";
             }
         ?>
         </fieldset>