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

fix(ustream): corrects the url for ustream #215

Merged
merged 7 commits into from
Mar 8, 2017
Merged

fix(ustream): corrects the url for ustream #215

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f1fafbe
corrects the url for ustream
SnehaMidha Mar 6, 2017
3c7b6ef
check for the presence of www. in the ustream link
SnehaMidha Mar 7, 2017
ef07e5c
checks for both integer and string
SnehaMidha Mar 7, 2017
d2f9bbe
Merge branch 'master' of https://github.com/ritz078/embed.js
SnehaMidha Mar 7, 2017
45baa98
Update ustream function
SnehaMidha Mar 8, 2017
c6d0078
Merge pull request #1 from SnehaMidha/ustream
SnehaMidha Mar 8, 2017
ed34018
Merge branch 'master' into master
ritz078 Mar 8, 2017
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
9 changes: 8 additions & 1 deletion src/js/modules/template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,14 @@ export default {
if (match.indexOf('/embed/') < 0) {
id.splice(1, 0, 'embed')
}
return `<div class="ejs-embed ejs-ustream"><iframe src="//www.${id.join('/')}" height="${options.videoHeight}" width="${options.videoWidth}"></iframe></div>`
console.log("ustream");
Copy link
Owner

Choose a reason for hiding this comment

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

remove this

console.log(id);
//check if '//www.' is there in the link
if(match.indexOf('/www\.ustream\.tv/') < 0){
return `<div class="ejs-embed ejs-ustream"><iframe src="//www.${id.join('/')}" height="${options.videoHeight}" width="${options.videoWidth}"></iframe></div>`
Copy link
Owner

Choose a reason for hiding this comment

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

prevent multiple returns instead assign the src to a variable and use that in the template.

}

return `<div class="ejs-embed ejs-ustream"><iframe src="${id.join('/')}" height="${options.videoHeight}" width="${options.videoWidth}"></iframe></div>`
},

detailsVimeo (data, fullData, embedUrl) {
Expand Down
4 changes: 2 additions & 2 deletions test/modules/utils.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ test('trucate() method', t => {
});

test('getUnique() method', t => {
const actual = getUnique([1, 3, 'a', 'a', 1, 5]);
const expected = [1, 3, 'a', 5];
const actual = getUnique([1, 3, 'a', 'a', 1,'1', 5]);
const expected = [1, 3, 'a','1' 5];
t.same(actual, expected)
});

Expand Down