Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update videoJS to 5.4 #11821

Merged
merged 3 commits into from
Feb 3, 2016
Merged

update videoJS to 5.4 #11821

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d598d9c
update videoJS to 5.4
jamesgorrie Feb 3, 2016
4c13e70
move dev reference to new videojs and remove old file
jamesgorrie Feb 3, 2016
14e9109
remove last reference to video.min
jamesgorrie Feb 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/app/model/Encoding.scala
View file
Open in desktop
Original file line number Diff 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)
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The IDE is doing it due to the editor config.

4 changes: 2 additions & 2 deletions static/src/javascripts/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not 100% sure if I have to update this elsewhere for isProd?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope, that is all

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity, how come we changed this? Makes it easier to debug, that's for sure—and it's still minised later by Uglify through us :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was actually another place to change it

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

apologies! And Olly makes a good point.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You will also have to update the require config:

frontend/grunt-configs/requirejs.js

Line 26 in 9e11025

videojs: 'components/video.js/video.min',

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must be horrible coming from a jspm world? :-P

"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",
Expand Down
Loading