Merge pull request #5349 from benjaoming/videojs-upgrade

Video-js and VTT.js upgrade

Makefile

@@ -88,7 +88,7 @@ assets:
 	KALITE_HOME=.kalite_dist_tmp bin/kalite manage migrate
 	mkdir -p kalite/database/templates/
 	cp .kalite_dist_tmp/database/data.sqlite kalite/database/templates/
-	bin/kalite manage retrievecontentpack download en --minimal --foreground --template
+	# bin/kalite manage retrievecontentpack download en --minimal --foreground --template
 
 release: dist man
 	ls -l dist

circle.yml

@@ -16,6 +16,7 @@ dependencies:
 test:
   override:
     - make assets
+    - bin/kalite manage retrievecontentpack download en --minimal --foreground --template
     - make docs
     - kalite start --traceback -v2
     - kalite status

docs/installguide/release_notes.rst

@@ -33,6 +33,7 @@ Bug fixes
  * Redirect to front page if user logs in from the signup page :url-issue:`3926`
  * Progress bar missing when decimals in progress percentage :url-issue:`5321`
  * Missing cache invalidation for JavaScript meant client-side breakage: Upgraded CherryPy HTTP server to 3.3.0 :url-issue:`5317`
+ * **Dev** Loading subtitles now works in ``bin/kalite manage runserver --settings=kalite.project.settings.dev``
 
 
 Known issues

kalite/distributed/static/js/distributed/video/views.js

@@ -2,7 +2,7 @@ var _ = require("underscore");
 var BaseView = require("base/baseview");
 var Handlebars = require("base/handlebars");
 
-var vtt = require("videojs-vtt.js");  // Must precede video.js
+var vtt = require("vtt.js");  // Must precede video.js
 global.WebVTT = vtt.WebVTT;  // Required to be in the global scope by video.js
 
 var _V_ = require("video.js");

kalite/settings/base.py

@@ -209,8 +209,11 @@
 
 # Content path-related settings
 CONTENT_ROOT = os.path.realpath(os.getenv('KALITE_CONTENT_ROOT', getattr(local_settings, "CONTENT_ROOT", os.path.join(USER_DATA_ROOT, 'content'))))
+SRT_ROOT = os.path.join(STATIC_ROOT, "srt")
 if not os.path.exists(CONTENT_ROOT):
     os.makedirs(CONTENT_ROOT)
+if not os.path.exists(SRT_ROOT):
+    os.makedirs(SRT_ROOT)
 CONTENT_URL = getattr(local_settings, "CONTENT_URL", "/content/")
 
 
@@ -358,6 +361,7 @@
 STATICFILES_DIRS = (
     os.path.join(PACKAGE_PATH, 'static-libraries'),
     USER_STATIC_FILES,
+    ('srt', SRT_ROOT)
 )
 
 DEFAULT_ENCODING = 'utf-8'

package.json

@@ -84,8 +84,8 @@
     "through": "2.3.8",
     "underscore": "1.8.3",
     "url": "0.10.3",
-    "video.js": "5.8.0",
-    "videojs-vtt.js": "0.12.1",
+    "video.js": "git://github.com/learningequality/video.js.git#firefox50-dist",
+    "vtt.js": "git://github.com/benjaoming/vtt.js.git#cuestuff",
     "watchify": "3.4.0"
   }
 }