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

ES6 Default args and interpolation #2015

Closed
wants to merge 4 commits into from
Closed

ES6 Default args and interpolation #2015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a34e1a9
Updating documentation comments (removing vjs references)
mmcc Apr 21, 2015
562ae81
string interpolation + default args
mmcc Apr 21, 2015
1d94676
moved time controls into their own directory
mmcc Apr 21, 2015
d94e17e
switching to use iojs for travis
mmcc Apr 22, 2015
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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- 0.10
- "iojs"
before_script:
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then curl https://gist.githubusercontent.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash; fi
before_install:
Expand Down
2 changes: 1 addition & 1 deletion src/js/big-play-button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Button from './button';
/**
* Initial play button. Shows before the video has played. The hiding of the
* big play button is done via CSS and player states.
* @param {vjs.Player|Object} player
* @param {Player|Object} player
* @param {Object=} options
* @class
* @constructor
Expand Down
4 changes: 2 additions & 2 deletions src/js/button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import document from 'global/document';
================================================================================ */
/**
* Base class for all buttons
* @param {vjs.Player|Object} player
* @param {Player|Object} player
* @param {Object=} options
* @class
* @constructor
Expand Down Expand Up @@ -56,7 +56,7 @@ class Button extends Component {

buildCSSClass() {
// TODO: Change vjs-control to vjs-button?
return 'vjs-control ' + super.buildCSSClass();
return `vjs-control ${super.buildCSSClass()}`;
}

// Click - Override with specific functionality for button
Expand Down
Loading