From 421f2eca6ea3d7a778e83f4fe4f49503615192dd Mon Sep 17 00:00:00 2001
From: Dan Marsden <dan@danmarsden.com>
Date: Thu, 5 Dec 2013 13:04:11 +1300
Subject: [PATCH] MDL-43019 SCORM: always use iframe instead of object -
 backported from 2.6 - fixes issue with IE 11 SCORM packages not loading

---
 mod/scorm/module.js   | 57 ++++++++++---------------------------------
 mod/scorm/player.php  |  5 ----
 mod/scorm/version.php |  2 +-
 3 files changed, 14 insertions(+), 50 deletions(-)

diff --git a/mod/scorm/module.js b/mod/scorm/module.js
index 10f078fc941..39d03077cba 100644
--- a/mod/scorm/module.js
+++ b/mod/scorm/module.js
@@ -100,41 +100,20 @@ M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launc
             }
 
             var content = new Y.YUI2.util.Element('scorm_content');
-            try {
-                // first try IE way - it can not set name attribute later
-                // and also it has some restrictions on DOM access from object tag
-                if (window_name || node.title == null) {
-                    var obj = document.createElement('<iframe id="scorm_object" src="">');
-                    if (window_name) {
-                        var mine = window.open('','','width=1,height=1,left=0,top=0,scrollbars=no');
-                        if(! mine) {
-                             alert(M.str.scorm.popupsblocked);
-                        }
-                        mine.close()
-                    }
-                }
-                else {
-                    var obj = document.createElement('<iframe id="scorm_object" src="'+url_prefix + node.title+'">');
-                }
-                // fudge IE7 to redraw the screen
-                if (Y.YUI2.env.ua.ie > 5 && Y.YUI2.env.ua.ie < 8) {
-                    obj.attachEvent("onload", scorm_resize_parent);
-                }
-            } catch (e) {
-                var obj = document.createElement('object');
-                obj.setAttribute('id', 'scorm_object');
-                obj.setAttribute('type', 'text/html');
-                if (!window_name && node.title != null) {
-                    obj.setAttribute('data', url_prefix + node.title);
-                }
-                if (window_name) {
-                    var mine = window.open('','','width=1,height=1,left=0,top=0,scrollbars=no');
-                    if(! mine) {
-                         alert(M.str.scorm.popupsblocked);
-                    }
-                    mine.close()
-                }
+            var obj = document.createElement('iframe');
+            obj.setAttribute('id', 'scorm_object');
+            obj.setAttribute('type', 'text/html');
+            if (!window_name && node.title != null) {
+                obj.setAttribute('src', url_prefix + node.title);
             }
+            if (window_name) {
+                var mine = window.open('','','width=1,height=1,left=0,top=0,scrollbars=no');
+                if(! mine) {
+                    alert(M.str.scorm.popupsblocked);
+                }
+                mine.close()
+            }
+
             var old = Y.YUI2.util.Dom.get('scorm_object');
             if (old) {
                 if(window_name) {
@@ -178,16 +157,6 @@ M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launc
                         scoes_nav[launch_sco].hidecontinue == 1));
         };
 
-        var scorm_resize_parent = function() {
-            // fudge  IE7 to redraw the screen
-            parent.resizeBy(-10, -10);
-            parent.resizeBy(10, 10);
-            var ifr = Y.YUI2.util.Dom.get('scorm_object');
-            if (ifr) {
-                ifr.detachEvent("onload", scorm_resize_parent);
-            }
-        };
-
         var scorm_resize_layout = function(alsowidth) {
             if (window_name) {
                 return;
diff --git a/mod/scorm/player.php b/mod/scorm/player.php
index 2c1fc53ecf1..4fa58085e9b 100644
--- a/mod/scorm/player.php
+++ b/mod/scorm/player.php
@@ -235,12 +235,7 @@ if ($result->prerequisites) {
                                                        $scorm->width, $scorm->height)));
         ?>
             <noscript>
-            <!--[if IE]>
                 <iframe id="main" class="scoframe" name="main" src="loadSCO.php?id=<?php echo $cm->id.$scoidstr.$modestr; ?>"></iframe>
-            <![endif]-->
-            <!--[if !IE]>
-                <object id="main" class="scoframe" type="text/html" data="loadSCO.php?id=<?php echo $cm->id.$scoidstr.$modestr; ?>"></object>
-            <![endif]-->
             </noscript>
         <?php
     }
diff --git a/mod/scorm/version.php b/mod/scorm/version.php
index 57e8b16a6f0..1ca0c5d47dc 100644
--- a/mod/scorm/version.php
+++ b/mod/scorm/version.php
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$module->version   = 2013050102;       // The current module version (Date: YYYYMMDDXX)
+$module->version   = 2013050103;       // The current module version (Date: YYYYMMDDXX)
 $module->requires  = 2013050100;    // Requires this Moodle version
 $module->component = 'mod_scorm'; // Full name of the plugin (used for diagnostics)
 $module->cron      = 300;