Merge pull request #68 from nextcloud/use_videojsv15.0.0RC1

Fix videoplayback on NC15

26 files changed, 13 insertions, 3 deletions

diff --git a/videojs/src/font/vjs.eot b/js/videojs/font/vjs.eot
index a2c0f5f..a2c0f5f 100644
--- a/videojs/src/font/vjs.eot
+++ b/js/videojs/font/vjs.eot
diff --git a/videojs/src/font/vjs.svg b/js/videojs/font/vjs.svg
index fa6aa7b..fa6aa7b 100644
--- a/videojs/src/font/vjs.svg
+++ b/js/videojs/font/vjs.svg
diff --git a/videojs/src/font/vjs.ttf b/js/videojs/font/vjs.ttf
index 682a9b2..682a9b2 100644
--- a/videojs/src/font/vjs.ttf
+++ b/js/videojs/font/vjs.ttf
diff --git a/videojs/src/font/vjs.woff b/js/videojs/font/vjs.woff
index a79d0fa..a79d0fa 100644
--- a/videojs/src/font/vjs.woff
+++ b/js/videojs/font/vjs.woff
diff --git a/videojs/src/lang/ar.js b/js/videojs/lang/ar.js
index 4c38b0d..4c38b0d 100644
--- a/videojs/src/lang/ar.js
+++ b/js/videojs/lang/ar.js
diff --git a/videojs/src/lang/bg.js b/js/videojs/lang/bg.js
index 610b393..610b393 100644
--- a/videojs/src/lang/bg.js
+++ b/js/videojs/lang/bg.js
diff --git a/videojs/src/lang/ca.js b/js/videojs/lang/ca.js
index 6ebc379..6ebc379 100644
--- a/videojs/src/lang/ca.js
+++ b/js/videojs/lang/ca.js
diff --git a/videojs/src/lang/cs.js b/js/videojs/lang/cs.js
index c2c8377..c2c8377 100644
--- a/videojs/src/lang/cs.js
+++ b/js/videojs/lang/cs.js
diff --git a/videojs/src/lang/de.js b/js/videojs/lang/de.js
index 88d6189..88d6189 100644
--- a/videojs/src/lang/de.js
+++ b/js/videojs/lang/de.js
diff --git a/videojs/src/lang/es.js b/js/videojs/lang/es.js
index c81b6b7..c81b6b7 100644
--- a/videojs/src/lang/es.js
+++ b/js/videojs/lang/es.js
diff --git a/videojs/src/lang/fr.js b/js/videojs/lang/fr.js
index 670c4a1..670c4a1 100644
--- a/videojs/src/lang/fr.js
+++ b/js/videojs/lang/fr.js
diff --git a/videojs/src/lang/hu.js b/js/videojs/lang/hu.js
index cf685ee..cf685ee 100644
--- a/videojs/src/lang/hu.js
+++ b/js/videojs/lang/hu.js
diff --git a/videojs/src/lang/it.js b/js/videojs/lang/it.js
index 1f64030..1f64030 100644
--- a/videojs/src/lang/it.js
+++ b/js/videojs/lang/it.js
diff --git a/videojs/src/lang/ja.js b/js/videojs/lang/ja.js
index 578383b..578383b 100644
--- a/videojs/src/lang/ja.js
+++ b/js/videojs/lang/ja.js
diff --git a/videojs/src/lang/ko.js b/js/videojs/lang/ko.js
index a794961..a794961 100644
--- a/videojs/src/lang/ko.js
+++ b/js/videojs/lang/ko.js
diff --git a/videojs/src/lang/nl.js b/js/videojs/lang/nl.js
index a849b77..a849b77 100644
--- a/videojs/src/lang/nl.js
+++ b/js/videojs/lang/nl.js
diff --git a/videojs/src/lang/pt-BR.js b/js/videojs/lang/pt-BR.js
index d1e2052..d1e2052 100644
--- a/videojs/src/lang/pt-BR.js
+++ b/js/videojs/lang/pt-BR.js
diff --git a/videojs/src/lang/ru.js b/js/videojs/lang/ru.js
index a0f3255..a0f3255 100644
--- a/videojs/src/lang/ru.js
+++ b/js/videojs/lang/ru.js
diff --git a/videojs/src/lang/tr.js b/js/videojs/lang/tr.js
index d370fc1..d370fc1 100644
--- a/videojs/src/lang/tr.js
+++ b/js/videojs/lang/tr.js
diff --git a/videojs/src/lang/uk.js b/js/videojs/lang/uk.js
index 96c4226..96c4226 100644
--- a/videojs/src/lang/uk.js
+++ b/js/videojs/lang/uk.js
diff --git a/videojs/src/lang/vi.js b/js/videojs/lang/vi.js
index 6e126d7..6e126d7 100644
--- a/videojs/src/lang/vi.js
+++ b/js/videojs/lang/vi.js
diff --git a/videojs/src/lang/zh-CN.js b/js/videojs/lang/zh-CN.js
index fc8b72c..fc8b72c 100644
--- a/videojs/src/lang/zh-CN.js
+++ b/js/videojs/lang/zh-CN.js
diff --git a/videojs/src/lang/zh-TW.js b/js/videojs/lang/zh-TW.js
index 6e3736d..6e3736d 100644
--- a/videojs/src/lang/zh-TW.js
+++ b/js/videojs/lang/zh-TW.js
diff --git a/videojs/src/video-js.css b/js/videojs/video-js.css
index 69cec45..69cec45 100644
--- a/videojs/src/video-js.css
+++ b/js/videojs/video-js.css
diff --git a/videojs/src/video.js b/js/videojs/video.js
index 1e32428..1e32428 100644
--- a/videojs/src/video.js
+++ b/js/videojs/video.js
diff --git a/js/viewer.js b/js/viewer.js
index 3c5c53b..d615ce3 100755
--- 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,