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

Allow setting a custom incompatible video message. fixes #636 #638

Merged
merged 3 commits into from
Aug 27, 2013
Merged

Allow setting a custom incompatible video message. fixes #636 #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
918ee04
Allow setting a custom incompatible video message. fixes #636
jelbourn Jul 12, 2013
ff9165b
Default incompatibility msg w/ other global options fixes #636
jelbourn Aug 5, 2013
20e2d4e
Merge branch 'master' of https://github.com/videojs/video.js into 636…
jelbourn Aug 5, 2013
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
8 changes: 7 additions & 1 deletion src/js/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,13 @@ vjs.options = {
'loadingSpinner': {},
'bigPlayButton': {},
'controlBar': {}
}
},

// Default message to show when a video cannot be played.
incompatibleVideoMessage: 'Sorry, no compatible source and playback ' +
'technology were found for this video. Try using another browser ' +
'like <a href="http://bit.ly/ccMUEC">Chrome</a> or download the ' +
'latest <a href="http://adobe.ly/mwfN1">Adobe Flash Player</a>.'
};

// Set CDN Version of swf
Expand Down
2 changes: 1 addition & 1 deletion src/js/player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ vjs.Player.prototype.src = function(source){
}
} else {
this.el_.appendChild(vjs.createEl('p', {
innerHTML: 'Sorry, no compatible source and playback technology were found for this video. Try using another browser like <a href="http://bit.ly/ccMUEC">Chrome</a> or download the latest <a href="http://adobe.ly/mwfN1">Adobe Flash Player</a>.'
innerHTML: this.options()['incompatibleVideoMessage']
}));
}

Expand Down
20 changes: 20 additions & 0 deletions test/unit/player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,3 +247,23 @@ test('should set controls and trigger event', function() {
// player.requestFullScreen();
// });

test('should use custom message when encountering an unsupported video type',
function() {
videojs.options['incompatibleVideoMessage'] = 'Video no go';
var fixture = document.getElementById('qunit-fixture');

var html =
'<video id="example_1">' +
'<source src="fake.foo" type="video/foo">' +
'</video>';

fixture.innerHTML += html;

var tag = document.getElementById('example_1');
var player = new vjs.Player(tag);

var incompatibilityMessage = player.el().getElementsByTagName('p')[0];
equal(incompatibilityMessage.textContent, 'Video no go');
Copy link
Member

Choose a reason for hiding this comment

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

node.textContent is only IE9+
https://developer.mozilla.org/en-US/docs/Web/API/Node.textContent

innerHTML?

Copy link
Member

Choose a reason for hiding this comment

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

I think textContent is the way to go. Having an innerHTML fallback is alright.
What's the likely hood that someone will run these tests in IE8 or below?

Copy link
Member

Choose a reason for hiding this comment

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

Guaranteed, unfortunately. Before a release I run all the tests in the top browsers/devices, which still includes IE8.

Is there any case where innerHTML wouldn't work for this?

Copy link
Member

Choose a reason for hiding this comment

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

Oh, this is just for reading. Hm... It probably is alright to use innerHTML, though, I'd rather avoid it. It may be different depending on the exactly content of the incompatibilityMessage. Depending on the HTML structure, innerHTML and textContent will give you different results but probably not a problem in this particular case.
I would still rather have it fallback to innerHTML if textContent isn't available in the spirit of moving forward.

Copy link
Member

Choose a reason for hiding this comment

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

Could that be as simple as incompatibilityMessage.textContent || incompatibilityMessage.innerHTML ?

Copy link
Member

Choose a reason for hiding this comment

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

assuming IE8 doesn't yell about textContent not being available, yes.
Might need to do something like typeof incompatibilityMessage.textContent !== undefined ? incompatibilityMessage.textContent : incompatibilityMessage.innerHTML

Copy link
Member

Choose a reason for hiding this comment

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

Well, hang on, we're setting the value with innerHTML, so we should probably be reading it with innerHTML.
https://github.com/videojs/video.js/pull/638/files#L1L743

Otherwise we'll get different results if there's any child nodes.

For other node types, textContent returns the concatenation of the textContent attribute value of every child node, excluding comments and processing instruction nodes.

The fallback message isn't meant to be limited to just text, in fact the actual default message has links.


player.dispose();
});