Merge pull request #10706 from edx/clrux/ac-188-no-draggabilly

Video: Adding closed captioning to the video player (not draggable)
2015-12-14 11:07:12 -05:00
parent 06caf65b5b b883d52722
commit a6e8383489
14 changed files with 462 additions and 103 deletions
--- a/cms/static/cms/js/require-config.js
+++ b/cms/static/cms/js/require-config.js
@@ -283,7 +283,7 @@ require.config({
        "osda":{
            exports: "osda",
            deps: ["annotator", "annotator-harvardx", "video.dev", "vjs.youtube", "rangeslider", "share-annotator", "richText-annotator", "reply-annotator", "tags-annotator", "flagging-annotator", "grouping-annotator", "diacritic-annotator", "openseadragon", "jquery-Watch", "catch", "handlebars", "URI"]
-        },
+        }
        // end of annotation tool files
    }
 });