Skip to content

Commit

Permalink
Merge pull request #9 from Stanford-Online/giulio/preempt-empty-dict-bug
Browse files Browse the repository at this point in the history
Default value should be empty dict literal string
  • Loading branch information
caesar2164 authored Feb 28, 2017
2 parents 7790363 + 05de477 commit fa93bca
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion invideoquiz/invideoquiz.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 '
Expand Down
4 changes: 1 addition & 3 deletions invideoquiz/public/html/invideoquiz.html
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
<div class="in-video-quiz-block" data-videoid="{video_id}" data-mode='{user_mode}'>
<p>This is an XBlock to display problem components inside of videos.</p>
</div>
<div class="in-video-quiz-block" data-videoid="{video_id}" data-mode='{user_mode}'></div>
3 changes: 1 addition & 2 deletions invideoquiz/public/js/src/invideoquiz.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* Javascript for InVideoQuizXBlock. */
function InVideoQuizXBlock(runtime, element) {
$('.in-video-quiz-block').closest('.vert').hide();
var videoId = $('.in-video-quiz-block').data('videoid');
if (!videoId || !InVideoQuizXBlock.config.hasOwnProperty(videoId)) {
return;
Expand All @@ -19,8 +20,6 @@ function InVideoQuizXBlock(runtime, element) {
var intervalTimeout = 1500;

$(function () {
$('.in-video-quiz-block').closest('.vert').hide();

$('#seq_content .vert-mod .vert').each(function () {
var component = $(this);

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def run_tests(self):

setup(
name='invideoquiz-xblock',
version='0.2.0',
version='0.1.4',
description='Helper XBlock to locate CAPA problems within videos.',
license='AGPL v3',
packages=[
Expand Down

0 comments on commit fa93bca

Please sign in to comment.