Merge pull request #11821 from guardian/update-videojs

update videoJS to 5.4
guardian · Feb 3, 2016 · cca8bff · cca8bff
2 parents d14f739 + 14e9109
commit cca8bff
Show file tree

Hide file tree

Showing 6 changed files with 21,649 additions and 27 deletions.
diff --git a/common/app/model/Encoding.scala b/common/app/model/Encoding.scala
@@ -32,4 +32,4 @@ object EncodingOrdering extends Ordering[Encoding] {
 
   //Returns a negative integer, zero, or a positive integer as the first argument is less than, equal to, or greater than the second.
   def compare(x: Encoding, y: Encoding): Int = precedenceOf(x) - precedenceOf(y)
-}
+}
diff --git a/common/app/templates/inlineJS/blocking/curlConfig.scala.js b/common/app/templates/inlineJS/blocking/curlConfig.scala.js
@@ -35,7 +35,7 @@ window.curlConfig = {
             'prebid.js':                    'vendor/prebid/0.5.0/prebid.js',
             svgs:                           '../inline-svgs',
             'bootstraps/enhanced/media/video-player': 'bootstraps/enhanced/media/video-player-dev.js',
-            videojs:                        'components/video.js/video.min.js',
+            videojs:                        'components/video.js/video.js',
             videojsads:                     'components/videojs-contrib-ads/videojs.ads.min.js',
             videojsembed:                   'components/videojs-embed/videojs.embed.js',
             videojsima:                     'components/videojs-ima/videojs.ima.js',

diff --git a/grunt-configs/requirejs.js b/grunt-configs/requirejs.js
@@ -23,7 +23,7 @@ module.exports = function (grunt, options) {
                 reqwest:              'components/reqwest/reqwest',
                 stripe:               'vendor/stripe/stripe.min',
                 svgs:                 '../../../common/conf/assets/inline-svgs',
-                videojs:              'components/video.js/video.min',
+                videojs:              'components/video.js/video',
                 videojsads:           'components/videojs-contrib-ads/videojs.ads.min',
                 videojsembed:         'components/videojs-embed/videojs.embed',
                 videojsima:           'components/videojs-ima/videojs.ima',

diff --git a/static/src/javascripts/bower.json b/static/src/javascripts/bower.json
@@ -16,7 +16,7 @@
     "raven-js": "~1.1.16",
     "requirejs-text": "~2.0.12",
     "when": "3.7.3",
-    "video.js": "5.0.0",
+    "video.js": "5.4.6",
     "videojs-playlist-audio": "guardian/videojs-playlist#v0.1.0",
     "videojs-contrib-ads": "guardian/videojs-contrib-ads#v3.0.0",
     "videojs-persistvolume": "guardian/videojs-persistvolume#0.1.3",
@@ -36,7 +36,7 @@
       "lodash-amd": "bower_components/lodash-amd/compat/**",
       "domready": "bower_components/domready/ready.js",
       "when": "bower_components/when/es6-shim/Promise.js",
-      "video.js": "bower_components/video.js/dist/video.min.js",
+      "video.js": "bower_components/video.js/dist/video.js",
       "videojs-contrib-ads": "bower_components/videojs-contrib-ads/dist/videojs.ads.min.js",
       "videojs-ima": "bower_components/videojs-ima/src/videojs.ima.js",
       "videojs-playlist-audio": "bower_components/videojs-playlist-audio/javascripts/videojs.playlist.js",
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,4 +32,4 @@ object EncodingOrdering extends Ordering[Encoding] { @@
       //Returns a negative integer, zero, or a positive integer as the first argument is less than, equal to, or greater than the second.
       def compare(x: Encoding, y: Encoding): Int = precedenceOf(x) - precedenceOf(y)
-    }
+    }