Merge pull request #537 from edx/mroytman/fixup-create-worker

prepend LMS Root URL to relative Javascript URLs if LMS Root URL is d…

edx_proctoring/__init__.py

@@ -5,6 +5,6 @@
 from __future__ import absolute_import
 
 # Be sure to update the version number in edx_proctoring/package.json
-__version__ = '1.5.11'
+__version__ = '1.5.12'
 
 default_app_config = 'edx_proctoring.apps.EdxProctoringConfig'  # pylint: disable=invalid-name

edx_proctoring/backends/rest.py

@@ -11,6 +11,8 @@
 from webpack_loader.utils import get_files
 from webpack_loader.exceptions import BaseWebpackLoaderException, WebpackBundleLookupError
 
+from django.conf import settings
+
 from edx_proctoring.backends.backend import ProctoringBackendProvider
 from edx_proctoring.exceptions import (
     BackendProviderCannotRegisterAttempt,
@@ -122,6 +124,13 @@ def get_javascript(self):
                 u'Webpack stats file corresponding to WebWorkers not found: {}'
                 .format(str(err))
             )
+
+        # if the Javascript URL is not an absolute URL (i.e. doesn't have a scheme), prepend
+        # the LMS Root URL to it, if it is defined, to make it an absolute URL
+        if not js_url.startswith('http'):
+            if hasattr(settings, 'LMS_ROOT_URL'):
+                js_url = settings.LMS_ROOT_URL + js_url
+
         return js_url
 
     def get_software_download_url(self):
@@ -297,7 +306,6 @@ def _get_language_headers(self):
         # This import is here because developers writing backends which subclass this class
         # may want to import this module and use the other methods, without having to run in the context
         # of django settings, etc.
-        from django.conf import settings
         from django.utils.translation import get_language
 
         current_lang = get_language()

edx_proctoring/static/proctoring/js/exam_action_handler.js

@@ -50,7 +50,7 @@ var edx = edx || {};
   };
 
   function createWorker(url) {
-    var blob = new Blob(["importScripts('" + location.origin + url + "');"], { "type": 'application/javascript' });
+    var blob = new Blob(["importScripts('" + url + "');"], { "type": 'application/javascript' });
     var blobUrl = window.URL.createObjectURL(blob);
     return new Worker(blobUrl);
   }

package.json

@@ -2,7 +2,7 @@
   "name": "@edx/edx-proctoring",
   "//": "Be sure to update the version number in edx_proctoring/__init__.py",
   "//": "Note that the version format is slightly different than that of the Python version when using prereleases.",
-  "version": "1.5.11",
+  "version": "1.5.12",
   "main": "edx_proctoring/static/index.js",
   "repository": {
     "type": "git",