Merge branch 'master' of github.com:RunestoneInteractive/RunestoneTools

Author: bnmnetp

common/js/bookfuncs.js

@@ -829,9 +829,15 @@ function createScratchActivecode() {
     // use the URL to assign a divid - each page should have a unique Activecode block id.
     // Remove everything from the URL but the course and page name
     var divid = document.URL.split('#')[0];
-    divid = divid.split('static')[1];
-    divid = divid.split('?')[0];  // remove any query string (e.g ?lastPosition)
+    if (divid.indexOf('static') > 0 ) {
+        divid = divid.split('static')[1];
+    } else {
+//        divid = divid.split('//')[1];
+        divid = divid.split('?')[0];  // remove any query string (e.g ?lastPosition)        
+    }
+    divid = divid.replaceAll(':','')
     divid = divid.replaceAll('/', '').replace('.html', '');
+    divid = divid.replaceAll('.','')    
 
     // generate the HTML
     var html = '<div id="ac_modal_' + divid + '" class="modal fade">' +
@@ -884,7 +890,17 @@ function createScratchActivecode() {
 }
 
 function toggleScratchActivecode() {
-    var divid = "ac_modal_" + document.URL.split('#')[0].split('static')[1].split('?')[0].replaceAll('/', '').replace('.html', '');
+    var bforeanchor = document.URL.split('#')[0]
+    var suffix = 'index'
+    if (bforeanchor.indexOf('static') > 0) {
+        suffix = bforeanchor.split('static')[1].split('?')[0].replaceAll('/', '').replace('.html', '');
+    } else {
+        suffix = bforeanchor.split('?')[0].replaceAll('/', '').replace('.html', '');
+        suffix = suffix.replaceAll(':','')
+        suffix = suffix.replaceAll('.','')
+    }
+
+    var divid = "ac_modal_" + suffix;
     var div = $("#" + divid);
 
     div.modal('toggle');