Merge pull request #8 from Stanford-Online/giulio/fix-empty-xblock-save

Make empty xblock fail gracefully
Stanford-Online · Feb 22, 2017 · 7790363 · 7790363
2 parents 2213aad + 38d7572
commit 7790363
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/invideoquiz/invideoquiz.py b/invideoquiz/invideoquiz.py
@@ -48,7 +48,7 @@ class InVideoQuizXBlock(StudioEditableXBlockMixin, XBlock):
 
     timemap = String(
         display_name=_('Problem Timemap'),
-        default='',
+        default={},
         scope=Scope.settings,
         help=_(
             'A simple string field to define problem IDs '

diff --git a/invideoquiz/public/js/src/invideoquiz.js b/invideoquiz/public/js/src/invideoquiz.js
@@ -1,8 +1,11 @@
 /* Javascript for InVideoQuizXBlock. */
 function InVideoQuizXBlock(runtime, element) {
     var videoId = $('.in-video-quiz-block').data('videoid');
+    if (!videoId || !InVideoQuizXBlock.config.hasOwnProperty(videoId)) {
+        return;
+    }
+    var problemTimesMap = InVideoQuizXBlock.config[videoId];
     var studentMode = $('.in-video-quiz-block').data('mode') !== 'staff';
-    var problemTimesMap = InVideoQuizXBlock.config[videoId] || {};
     var extraVideoButton = '<button class="in-video-continue">Continue</button>';
     var video;
     var videoState;
@@ -18,10 +21,6 @@ function InVideoQuizXBlock(runtime, element) {
     $(function () {
         $('.in-video-quiz-block').closest('.vert').hide();
 
-        if (!videoId || !problemTimesMap) {
-            return;
-        }
-
         $('#seq_content .vert-mod .vert').each(function () {
             var component = $(this);
 

diff --git a/setup.py b/setup.py
@@ -45,7 +45,7 @@ def run_tests(self):
 
 setup(
     name='invideoquiz-xblock',
-    version='0.1.3',
+    version='0.2.0',
     description='Helper XBlock to locate CAPA problems within videos.',
     license='AGPL v3',
     packages=[