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

Added Video Support #137

Open
wants to merge 30 commits into
base: dev
Choose a base branch
from
Open

Added Video Support #137

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
dc68d00
Added Video Support
Jan 2, 2017
a84b2bb
Added Video Support
Jan 2, 2017
a341970
Added Video Support
Jan 2, 2017
6b5ec5f
Added Video Support
Jan 2, 2017
e4b95f7
Added Video Support
Jan 2, 2017
662130e
Added Video Support
Jan 2, 2017
fd0bb45
Added Video Support
Jan 2, 2017
ef8639d
Removed Console Logs
Jan 2, 2017
1ef2c62
Removed Console Logs
Jan 2, 2017
24935f8
Removed Console Logs
Jan 2, 2017
7f5f62d
Removing Dist File
Jan 3, 2017
9827746
Removed Dist Files
Jan 3, 2017
3828e6d
Removed Dist Files
Jan 3, 2017
9a17e2b
Removed Dist Files
Jan 3, 2017
8f558e4
Removing Unmodified Files
Jan 3, 2017
4f05c46
Removing Unmodified Files
Jan 3, 2017
8d6b47d
Reverted changes
Jan 3, 2017
8f9faf1
Revereted Changes
Jan 3, 2017
0034778
Reverted Changes
Jan 3, 2017
c49d9f4
Reverted Changes
Jan 3, 2017
87ac750
Updating Linting Errors
Jan 4, 2017
39e4152
Removed unecessary empty space
Jan 4, 2017
12b0eeb
Updated Linting Warnings
Jan 4, 2017
af7da8b
Fixed the issues mentioned by @XhmikosR
May 22, 2017
250e5a3
Fixed the issues mentioned by @XhmikosR #2
May 22, 2017
acf93a1
Fixed the issues mentioned by @XhmikosR #3
May 22, 2017
f8d7c97
Fixed the issues mentioned by @XhmikosR #4
May 22, 2017
44e4819
Fixed the issues mentioned by @XhmikosR #5 (Merged)
May 22, 2017
ef25913
Update index.html
May 30, 2017
a4cb9b8
Update baguetteBox.js
May 30, 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
17 changes: 8 additions & 9 deletions src/baguetteBox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@

function pauseAnyVideoPlaying(){
[].forEach.call(imagesElements, function(imageElement) {
if(imageElement.getElementsByTagName('video').length > 0){
if (imageElement.getElementsByTagName('video').length > 0){
Copy link
Contributor

Choose a reason for hiding this comment

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

Space before brackets.

Copy link
Author

Choose a reason for hiding this comment

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

hi, do you want me to remove the spaces before brackets

Copy link
Contributor

Choose a reason for hiding this comment

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

No, you should always use it as per the rest of the codebase.

Copy link
Author

Choose a reason for hiding this comment

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

ok, fixing

imageElement.getElementsByTagName('video')[0].pause();
}
});
Expand All @@ -487,13 +487,13 @@
var imageContainer = imagesElements[index];
var galleryItem = currentGallery[index];
var isVideo = false;
if(imageContainer !== undefined) {
if typeof imageContainer !== 'undefined' {
Copy link
Contributor

Choose a reason for hiding this comment

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

This is wrong now; you are missing the parentheses.

Copy link
Author

Choose a reason for hiding this comment

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

fixing

isVideo = videoRegex.test(galleryItem.imageElement.href);
}

// Return if the index exceeds prepared images in the overlay
// or if the current gallery has been changed / closed
if (imageContainer === undefined || galleryItem === undefined) {
if (typeof imageContainer === 'undefined'|| typeof galleryItem === 'undefined') {
Copy link
Contributor

Choose a reason for hiding this comment

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

space before ||

return;
}

Expand All @@ -516,17 +516,16 @@
// Get element reference, optional caption and source path
var imageElement = galleryItem.imageElement;
var thumbnailElement = null;
Copy link
Contributor

Choose a reason for hiding this comment

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

You could change this whole thing into a one liner

var thumbnailElement = isvideo ? imageElement.getElementsByTagName('video')[0] : imageElement.getElementsByTagName('img')[0];

Copy link
Author

Choose a reason for hiding this comment

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

thank you fixing

if(isVideo) {
if (isVideo) {
thumbnailElement = imageElement.getElementsByTagName('video')[0];
}
else {
} else {
thumbnailElement = imageElement.getElementsByTagName('img')[0];
}
var imageCaption = typeof options.captions === 'function' ?
options.captions.call(currentGallery, imageElement) :
imageElement.getAttribute('data-caption') || imageElement.title;
var imageSrc = null;
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here as https://github.com/feimosi/baguetteBox.js/pull/137/files#r117660076

if(isVideo) {
if (isVideo) {
imageSrc = getVideoSrc(imageElement);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

You should use else in the same line as the brackets.

else {
Expand All @@ -549,7 +548,7 @@
}
imageContainer.appendChild(figure);

if(isVideo){
if (isVideo){
// Prepare gallery video element
var video = create('video');
//video.onload = function(){
Expand Down Expand Up @@ -715,7 +714,7 @@
slider.style.transform = slider.style.webkitTransform = 'translate3d(' + offset + ',0,0)'
: slider.style.left = offset;
}
if(imagesElements[currentIndex].getElementsByTagName('video').length > 0) {
if (imagesElements[currentIndex].getElementsByTagName('video').length > 0) {
imagesElements[currentIndex].getElementsByTagName('video')[0].play();
}
}
Expand Down