From b45e110c3ac4afaa6add07e925d658b0a5ab099e Mon Sep 17 00:00:00 2001
From: David Balch <david.balch@conted.ox.ac.uk>
Date: Tue, 28 Oct 2014 16:55:10 +0000
Subject: [PATCH 1/3] MDL-46116 mod_imscp: Don't create links on items without
 content.

---
 mod/imscp/locallib.php | 18 +++++++++++-------
 mod/imscp/module.js    | 22 ++++++++++++----------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/mod/imscp/locallib.php b/mod/imscp/locallib.php
index 3ebd1060af0..2604bc04f49 100644
--- a/mod/imscp/locallib.php
+++ b/mod/imscp/locallib.php
@@ -60,15 +60,19 @@ function imscp_print_content($imscp, $cm, $course) {
 function imscp_htmllize_item($item, $imscp, $cm) {
     global $CFG;
 
-    if (preg_match('|^https?://|', $item['href'])) {
-        $url = $item['href'];
+    if ($item['href']) {
+        if (preg_match('|^https?://|', $item['href'])) {
+            $url = $item['href'];
+        } else {
+            $context = context_module::instance($cm->id);
+            $urlbase = "$CFG->wwwroot/pluginfile.php";
+            $path = '/'.$context->id.'/mod_imscp/content/'.$imscp->revision.'/'.$item['href'];
+            $url = file_encode_url($urlbase, $path, false);
+        }
+        $result = "<li><a href=\"$url\">".$item['title'].'</a>';
     } else {
-        $context = context_module::instance($cm->id);
-        $urlbase = "$CFG->wwwroot/pluginfile.php";
-        $path = '/'.$context->id.'/mod_imscp/content/'.$imscp->revision.'/'.$item['href'];
-        $url = file_encode_url($urlbase, $path, false);
+        $result = '<li>'.$item['title'];
     }
-    $result = "<li><a href=\"$url\">".$item['title'].'</a>';
     if ($item['subitems']) {
         $result .= '<ul>';
         foreach ($item['subitems'] as $subitem) {
diff --git a/mod/imscp/module.js b/mod/imscp/module.js
index 8933d561d39..364fdfe036f 100644
--- a/mod/imscp/module.js
+++ b/mod/imscp/module.js
@@ -41,20 +41,22 @@ M.mod_imscp.init = function(Y) {
             imscp_current_node.highlight();
 
             var content = new Y.YUI2.util.Element('imscp_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
-                var obj = document.createElement('<iframe id="imscp_object" src="'+node.href+'">');
-            } catch (e) {
-                var obj = document.createElement('object');
-                obj.setAttribute('id', 'imscp_object');
-                obj.setAttribute('type', 'text/html');
-                obj.setAttribute('data', node.href);
+            if (node.href) {
+                try {
+                    // First try IE way - it can not set name attribute later
+                    // and also it has some restrictions on DOM access from object tag.
+                    var obj = document.createElement('<iframe id="imscp_object" src="' + node.href + '">');
+                } catch (e) {
+                    var obj = document.createElement('object');
+                    obj.setAttribute('id', 'imscp_object');
+                    obj.setAttribute('type', 'text/html');
+                    obj.setAttribute('data', node.href);
+                }
             }
             var old = Y.YUI2.util.Dom.get('imscp_object');
             if (old) {
                 content.replaceChild(obj, old);
-            } else {
+            } else if (obj) {
                 content.appendChild(obj);
             }
             imscp_resize_frame();

From 7805d03a9e4a660f3e0686e18d35c2c5f7a69cb7 Mon Sep 17 00:00:00 2001
From: David Balch <david.balch@conted.ox.ac.uk>
Date: Tue, 11 Nov 2014 18:31:35 +0000
Subject: [PATCH 2/3] MDL-46116 mod_imscp: Display first item with content on
 load.

---
 mod/imscp/module.js | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/mod/imscp/module.js b/mod/imscp/module.js
index 364fdfe036f..a3ee2d13947 100644
--- a/mod/imscp/module.js
+++ b/mod/imscp/module.js
@@ -33,6 +33,10 @@ M.mod_imscp.init = function(Y) {
 
     Y.use('yui2-resize', 'yui2-dragdrop', 'yui2-container', 'yui2-button', 'yui2-layout', 'yui2-treeview', 'yui2-json', 'yui2-event', function(Y) {
 
+        var imscp_activate_item_by_index = function(index) {
+            imscp_activate_item(Y.YUI2.widget.TreeView.getNode('imscp_tree', index));
+        }
+
         var imscp_activate_item = function(node) {
             if (!node) {
                 return;
@@ -56,8 +60,13 @@ M.mod_imscp.init = function(Y) {
             var old = Y.YUI2.util.Dom.get('imscp_object');
             if (old) {
                 content.replaceChild(obj, old);
-            } else if (obj) {
-                content.appendChild(obj);
+            } else {
+                old = Y.YUI2.util.Dom.get('imscp_child_list');
+                if (old) {
+                    content.replaceChild(obj, old);
+                } else {
+                    content.appendChild(obj);
+                }
             }
             imscp_resize_frame();
 
@@ -141,6 +150,17 @@ M.mod_imscp.init = function(Y) {
             }
         };
 
+        var imscp_firstlinked = function(node) {
+            // Return first item with an href
+            if (node.href) {
+                return node;
+            } else if (node.children) {
+                return imscp_firstlinked(node.children[0]);
+            } else {
+                return null
+            }
+        };
+
         var imscp_up = function(node) {
             if (node.depth > 0) {
                 return node.parent;
@@ -273,7 +293,7 @@ M.mod_imscp.init = function(Y) {
         });
 
         // finally activate the first item
-        imscp_activate_item(tree.getRoot().children[0]);
+        imscp_activate_item(imscp_firstlinked(tree.getRoot().children[0]));
 
         // resizing
         imscp_resize_layout(false);

From 186f4563cb9a14464a3f24c8114b8992a4eb6cb8 Mon Sep 17 00:00:00 2001
From: David Balch <david.balch@conted.ox.ac.uk>
Date: Tue, 2 Dec 2014 11:17:40 +0000
Subject: [PATCH 3/3] MDL-46116 mod_imscp: Fix some jshint issues.

---
 mod/imscp/module.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/mod/imscp/module.js b/mod/imscp/module.js
index a3ee2d13947..39ab383dcf2 100644
--- a/mod/imscp/module.js
+++ b/mod/imscp/module.js
@@ -33,10 +33,6 @@ M.mod_imscp.init = function(Y) {
 
     Y.use('yui2-resize', 'yui2-dragdrop', 'yui2-container', 'yui2-button', 'yui2-layout', 'yui2-treeview', 'yui2-json', 'yui2-event', function(Y) {
 
-        var imscp_activate_item_by_index = function(index) {
-            imscp_activate_item(Y.YUI2.widget.TreeView.getNode('imscp_tree', index));
-        }
-
         var imscp_activate_item = function(node) {
             if (!node) {
                 return;
@@ -45,13 +41,14 @@ M.mod_imscp.init = function(Y) {
             imscp_current_node.highlight();
 
             var content = new Y.YUI2.util.Element('imscp_content');
+            var obj;
             if (node.href) {
                 try {
                     // First try IE way - it can not set name attribute later
                     // and also it has some restrictions on DOM access from object tag.
-                    var obj = document.createElement('<iframe id="imscp_object" src="' + node.href + '">');
+                    obj = document.createElement('<iframe id="imscp_object" src="' + node.href + '">');
                 } catch (e) {
-                    var obj = document.createElement('object');
+                    obj = document.createElement('object');
                     obj.setAttribute('id', 'imscp_object');
                     obj.setAttribute('type', 'text/html');
                     obj.setAttribute('data', node.href);
@@ -157,7 +154,7 @@ M.mod_imscp.init = function(Y) {
             } else if (node.children) {
                 return imscp_firstlinked(node.children[0]);
             } else {
-                return null
+                return null;
             }
         };