Permalink
Browse files

Merge branch 'm19_MDL-32388' of git://github.com/danmarsden/moodle in…

…to MOODLE_19_STABLE
  • Loading branch information...
2 parents 0bbd045 + 6db00e4 commit 96d8c696ce7a192962ac1c59a0421d56b05af9c6 Sam Hemelryk committed Apr 16, 2012
Showing with 7 additions and 7 deletions.
  1. +7 −7 mod/scorm/player.php
View
@@ -297,19 +297,19 @@
//<![CDATA[
scorm_resize(<?php echo $scorm->width.", ". $scorm->height; ?>);
function openpopup(url,name,options,width,height) {
- fullurl = "<?php echo $CFG->wwwroot.'/mod/scorm/' ?>" + url;
- windowobj = window.open(fullurl,name,options);
- if ((width==100) && (height==100)) {
- // Fullscreen
- windowobj.moveTo(0,0);
- }
if (width<=100) {
width = Math.round(screen.availWidth * width / 100);
}
if (height<=100) {
height = Math.round(screen.availHeight * height / 100);
}
- windowobj.resizeTo(width,height);
+ options += ",width="+width+",height="+height;
+ fullurl = "<?php echo $CFG->wwwroot.'/mod/scorm/' ?>" + url;
+ windowobj = window.open(fullurl,name,options);
+ if ((width==100) && (height==100)) {
+ // Fullscreen
+ windowobj.moveTo(0,0);
+ }
windowobj.focus();
return windowobj;
}

0 comments on commit 96d8c69

Please sign in to comment.