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

Update swipe.js #442

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update swipe.js #442

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d5bc48
Update swipe.js
stephaneerard Mar 25, 2014
e5e3db9
Update swipe.js
stephaneerard Mar 28, 2014
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
106 changes: 63 additions & 43 deletions swipe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,39 +434,77 @@ function Swipe(container, options) {
}

}

// trigger setup
setup();

// start auto slideshow if applicable
if (delay) begin();


// add event listeners
if (browser.addEventListener) {

// set touchstart event on element
if (browser.touch) element.addEventListener('touchstart', events, false);

if (browser.transitions) {
element.addEventListener('webkitTransitionEnd', events, false);
element.addEventListener('msTransitionEnd', events, false);
element.addEventListener('oTransitionEnd', events, false);
element.addEventListener('otransitionend', events, false);
element.addEventListener('transitionend', events, false);


function bindEvents() {
// add event listeners
if (browser.addEventListener) {

// set touchstart event on element
if (browser.touch) element.addEventListener('touchstart', events, false);

if (browser.transitions) {
element.addEventListener('webkitTransitionEnd', events, false);
element.addEventListener('msTransitionEnd', events, false);
element.addEventListener('oTransitionEnd', events, false);
element.addEventListener('otransitionend', events, false);
element.addEventListener('transitionend', events, false);
}

// set resize event on window
window.addEventListener('resize', events, false);

} else {

window.onresize = function () { setup() }; // to play nice with old IE

}
}

function unbindEvents(){
// removed event listeners
if (browser.addEventListener) {

// set resize event on window
window.addEventListener('resize', events, false);
// remove current event listeners
element.removeEventListener('touchstart', events, false);
element.removeEventListener('webkitTransitionEnd', events, false);
element.removeEventListener('msTransitionEnd', events, false);
element.removeEventListener('oTransitionEnd', events, false);
element.removeEventListener('otransitionend', events, false);
element.removeEventListener('transitionend', events, false);
window.removeEventListener('resize', events, false);

} else {
}
else {

window.onresize = function () { setup() }; // to play nice with old IE
window.onresize = null;

}
}

// trigger setup
setup();

// start auto slideshow if applicable
if (delay) begin();

// bind events
bindEvents();

// expose the Swipe API
return {
bindEvents: function(){

// unbinding before binding avoids double-binding
unbindEvents();
bindEvents();

}
unbindEvents: function(){

unbindEvents();

},
setup: function() {

setup();
Expand Down Expand Up @@ -534,25 +572,7 @@ function Swipe(container, options) {

}

// removed event listeners
if (browser.addEventListener) {

// remove current event listeners
element.removeEventListener('touchstart', events, false);
element.removeEventListener('webkitTransitionEnd', events, false);
element.removeEventListener('msTransitionEnd', events, false);
element.removeEventListener('oTransitionEnd', events, false);
element.removeEventListener('otransitionend', events, false);
element.removeEventListener('transitionend', events, false);
window.removeEventListener('resize', events, false);

}
else {

window.onresize = null;

}

unbindEvents();
}
}

Expand Down