Merge pull request #68 from nextcloud/use_videojs

Fix videoplayback on NC15
nextcloud · Nov 21, 2018 · 7b2f239 · 7b2f239
2 parents 8fe2593 + 5a3b5b1
commit 7b2f239
Show file tree

Hide file tree

Showing 26 changed files with 13 additions and 3 deletions.
diff --git a/videojs/src/font/vjs.eot → js/videojs/font/vjs.eot b/videojs/src/font/vjs.eot → js/videojs/font/vjs.eot
diff --git a/videojs/src/font/vjs.svg → js/videojs/font/vjs.svg b/videojs/src/font/vjs.svg → js/videojs/font/vjs.svg
diff --git a/videojs/src/font/vjs.ttf → js/videojs/font/vjs.ttf b/videojs/src/font/vjs.ttf → js/videojs/font/vjs.ttf
diff --git a/videojs/src/font/vjs.woff → js/videojs/font/vjs.woff b/videojs/src/font/vjs.woff → js/videojs/font/vjs.woff
diff --git a/videojs/src/lang/ar.js → js/videojs/lang/ar.js b/videojs/src/lang/ar.js → js/videojs/lang/ar.js
diff --git a/videojs/src/lang/bg.js → js/videojs/lang/bg.js b/videojs/src/lang/bg.js → js/videojs/lang/bg.js
diff --git a/videojs/src/lang/ca.js → js/videojs/lang/ca.js b/videojs/src/lang/ca.js → js/videojs/lang/ca.js
diff --git a/videojs/src/lang/cs.js → js/videojs/lang/cs.js b/videojs/src/lang/cs.js → js/videojs/lang/cs.js
diff --git a/videojs/src/lang/de.js → js/videojs/lang/de.js b/videojs/src/lang/de.js → js/videojs/lang/de.js
diff --git a/videojs/src/lang/es.js → js/videojs/lang/es.js b/videojs/src/lang/es.js → js/videojs/lang/es.js
diff --git a/videojs/src/lang/fr.js → js/videojs/lang/fr.js b/videojs/src/lang/fr.js → js/videojs/lang/fr.js
diff --git a/videojs/src/lang/hu.js → js/videojs/lang/hu.js b/videojs/src/lang/hu.js → js/videojs/lang/hu.js
diff --git a/videojs/src/lang/it.js → js/videojs/lang/it.js b/videojs/src/lang/it.js → js/videojs/lang/it.js
diff --git a/videojs/src/lang/ja.js → js/videojs/lang/ja.js b/videojs/src/lang/ja.js → js/videojs/lang/ja.js
diff --git a/videojs/src/lang/ko.js → js/videojs/lang/ko.js b/videojs/src/lang/ko.js → js/videojs/lang/ko.js
diff --git a/videojs/src/lang/nl.js → js/videojs/lang/nl.js b/videojs/src/lang/nl.js → js/videojs/lang/nl.js
diff --git a/videojs/src/lang/pt-BR.js → js/videojs/lang/pt-BR.js b/videojs/src/lang/pt-BR.js → js/videojs/lang/pt-BR.js
diff --git a/videojs/src/lang/ru.js → js/videojs/lang/ru.js b/videojs/src/lang/ru.js → js/videojs/lang/ru.js
diff --git a/videojs/src/lang/tr.js → js/videojs/lang/tr.js b/videojs/src/lang/tr.js → js/videojs/lang/tr.js
diff --git a/videojs/src/lang/uk.js → js/videojs/lang/uk.js b/videojs/src/lang/uk.js → js/videojs/lang/uk.js
diff --git a/videojs/src/lang/vi.js → js/videojs/lang/vi.js b/videojs/src/lang/vi.js → js/videojs/lang/vi.js
diff --git a/videojs/src/lang/zh-CN.js → js/videojs/lang/zh-CN.js b/videojs/src/lang/zh-CN.js → js/videojs/lang/zh-CN.js
diff --git a/videojs/src/lang/zh-TW.js → js/videojs/lang/zh-TW.js b/videojs/src/lang/zh-TW.js → js/videojs/lang/zh-TW.js
diff --git a/videojs/src/video-js.css → js/videojs/video-js.css b/videojs/src/video-js.css → js/videojs/video-js.css
diff --git a/videojs/src/video.js → js/videojs/video.js b/videojs/src/video.js → js/videojs/video.js
diff --git a/js/viewer.js b/js/viewer.js
@@ -5,10 +5,20 @@ var videoViewer = {
 				return $.when();
 			} else {
 				this.videoJSLoaded = true;
-				var stylePath = OC.filePath('files_videoplayer', 'videojs', 'src/video-js.css');
+				var stylePath = OC.filePath('files_videoplayer', 'js', 'videojs/video-js.css');
 				$('head').append($('<link rel="stylesheet" type="text/css" href="' + stylePath + '"/>'));
-				var scriptPath = OC.filePath('files_videoplayer', 'videojs', 'src/video.js');
-				return $.getScript(scriptPath, function (xhr) {eval(xhr);});
+				var scriptPath = OC.filePath('files_videoplayer', 'js', 'videojs/video.js');
+
+				var deferred = $.Deferred();
+				var script = document.createElement('script');
+				script.src = scriptPath;
+				script.setAttribute('nonce', btoa(OC.requestToken));
+				script.onload = function() {
+					deferred.resolve();
+				};
+				document.head.appendChild(script);
+
+				return deferred;
 			}
 		},
 		videoJSLoaded: false,