From 1d37c643c80699637b5e26fb5998ba4c1d002695 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Thu, 20 Jun 2013 14:08:08 +0200 Subject: [PATCH 01/61] Allow multiple swipviews in the same document (multitouch support) --- src/swipeview.js | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/src/swipeview.js b/src/swipeview.js index 56b0a00..6d5fbab 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -286,9 +286,10 @@ var SwipeView = (function (window, document) { if (this.initiated) return; - var point = hasTouch ? e.touches[0] : e; + var point = hasTouch ? e.targetTouches[0] : e; this.initiated = true; + this.identifier = point.identifier; this.moved = false; this.thresholdExceeded = false; this.startX = point.pageX; @@ -310,9 +311,19 @@ var SwipeView = (function (window, document) { __move: function (e) { if (!this.initiated) return; + var i, l, point; + + if (hasTouch) { + i = 0; + l = e.changedTouches.length; + for(;i Date: Thu, 20 Jun 2013 14:12:06 +0200 Subject: [PATCH 02/61] oops, forgot to test without touch events --- src/swipeview.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/swipeview.js b/src/swipeview.js index 6d5fbab..0c248f8 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -322,6 +322,9 @@ var SwipeView = (function (window, document) { } if (!point) return; } + else { + point = e; + } var deltaX = point.pageX - this.pointX, deltaY = point.pageY - this.pointY, From 4fd3af86734d253ef6fc642d9bfbfe0972b0daa3 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Thu, 20 Jun 2013 16:14:34 +0200 Subject: [PATCH 03/61] rm div id --- src/swipeview.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/swipeview.js b/src/swipeview.js index 0c248f8..0d4ddb9 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -78,7 +78,7 @@ var SwipeView = (function (window, document) { this.masterPages = []; div = document.createElement('div'); - div.id = 'swipeview-slider'; + div.className = 'swipeview-slider'; div.style.cssText = 'position:relative;top:0;height:100%;width:100%;' + cssVendor + 'transition-duration:0;' + cssVendor + 'transform:translateZ(0);' + cssVendor + 'transition-timing-function:ease-out'; this.wrapper.appendChild(div); this.slider = div; @@ -87,7 +87,6 @@ var SwipeView = (function (window, document) { for (i=-1; i<2; i++) { div = document.createElement('div'); - div.id = 'swipeview-masterpage-' + (i+1); div.style.cssText = cssVendor + 'transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;left:' + i*100 + '%'; if (!div.dataset) div.dataset = {}; pageIndex = i == -1 ? this.options.numberOfPages - 1 : i; From a6c49eb4a23ccda9c360224e2d8e73f4a7743a4c Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Thu, 20 Jun 2013 16:59:44 +0200 Subject: [PATCH 04/61] add a new demo with 5 swipe views --- demo/gallery2/index.html | 112 +++++++++++++++++++++++++++++++++++++++ demo/gallery2/style.css | 83 +++++++++++++++++++++++++++++ 2 files changed, 195 insertions(+) create mode 100644 demo/gallery2/index.html create mode 100644 demo/gallery2/style.css diff --git a/demo/gallery2/index.html b/demo/gallery2/index.html new file mode 100644 index 0000000..fd51a58 --- /dev/null +++ b/demo/gallery2/index.html @@ -0,0 +1,112 @@ + + + + + + + + SwipeView + + + + + +
+
+
+
+
+ + + + diff --git a/demo/gallery2/style.css b/demo/gallery2/style.css new file mode 100644 index 0000000..8f9b852 --- /dev/null +++ b/demo/gallery2/style.css @@ -0,0 +1,83 @@ +html, body { height:100%; } +body { + padding:0; + margin:0; + background:#333; + -webkit-user-select:none; + -moz-user-select:none; + -ms-user-select:none; + -o-user-select:none; + user-select:none; + -webkit-text-size-adjust:none; + -moz-text-size-adjust:none; + -ms-text-size-adjust:none; + -o-text-size-adjust:none; + text-size-adjust:none; + color:#eee; + font-family:helvetica; + font-size:12px; +} + +.wrapper { + width:1024px; + min-width:320px; + height:145px; + margin:10px auto; + border: 5px solid rgb(43, 38, 38); +} + +.swipeview-slider > div { + position:relative; + display:-webkit-box; + display:-moz-box; + display:-ms-box; + display:-o-box; + display:box; + -webkit-box-orient:vertical; + -moz-box-orient:vertical; + -ms-box-orient:vertical; + -o-box-orient:vertical; + box-orient:vertical; + -webkit-box-pack:center; + -moz-box-pack:center; + -ms-box-pack:center; + -o-box-pack:center; + box-pack:center; + -webkit-box-align:center; + -mox-box-align:center; + -ms-box-align:center; + -o-box-align:center; + box-align:center; + overflow:hidden; +} + +.swipeview-slider img { + display:block; + -webkit-transition-duration:.4s; + -moz-transition-duration:.4s; + -ms-transition-duration:.4s; + -o-transition-duration:.4s; + transition-duration:.4s; + -webkit-transition-property:opacity; + -moz-transition-property:opacity; + -ms-transition-property:opacity; + -o-transition-property:opacity; + transition-property:opacity; + opacity:1; + pointer-events:none; + visibility:visible; +} + +.swipeview-slider .set-container { + margin:auto; +} + +.swipeview-slider .container { + background: rgb(197, 197, 197); + float: left; + margin: 0 5px; +} + +.swipeview-slider img.loading { + visibility:hidden; +} From f922ae7ff50ac1fa5752e92471c79325c3a7d43d Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Thu, 20 Jun 2013 17:11:49 +0200 Subject: [PATCH 05/61] fix demo --- demo/gallery/style.css | 12 ++++++------ demo/inline/style.css | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/demo/gallery/style.css b/demo/gallery/style.css index c1217be..229f0f6 100644 --- a/demo/gallery/style.css +++ b/demo/gallery/style.css @@ -72,7 +72,7 @@ body { background:rgba(255,255,255,0.4); } -#swipeview-slider > div { +.swipeview-slider > div { position:relative; display:-webkit-box; display:-moz-box; @@ -97,7 +97,7 @@ body { overflow:hidden; } -#swipeview-slider img { +.swipeview-slider img { display:block; border:5px solid #eee; -webkit-box-shadow:0 2px 6px #000; @@ -124,7 +124,7 @@ body { pointer-events:none; } -#swipeview-slider span { +.swipeview-slider span { position:absolute; bottom:0; left:0; @@ -165,7 +165,7 @@ body { transform:translate(0,100%) translateZ(0); } -#swipeview-slider .swipeview-active span { +.swipeview-slider .swipeview-active span { -webkit-transform:translate(0,0) translateZ(0); -moz-transform:translate(0,0) translateZ(0); -ms-transform:translate(0,0); @@ -184,7 +184,7 @@ body { } #wrapper > div > .swipeview-loading img, -#swipeview-slider img.loading { +.swipeview-slider img.loading { -webkit-transition-duration:0s; opacity:0; } @@ -202,4 +202,4 @@ body { -o-transform:translate(0,100%); -o-transform:translate(0,100%) translateZ(0); transform:translate(0,100%) translateZ(0); -} \ No newline at end of file +} diff --git a/demo/inline/style.css b/demo/inline/style.css index 830a1b2..79c3961 100644 --- a/demo/inline/style.css +++ b/demo/inline/style.css @@ -66,7 +66,7 @@ h1 { background:rgba(255,255,255,0.4); } -#swipeview-slider > div { +.swipeview-slider > div { position:relative; display:-webkit-box; -webkit-box-orient:vertical; @@ -75,7 +75,7 @@ h1 { overflow:hidden; } -#swipeview-slider span { +.swipeview-slider span { -webkit-box-sizing:border-box; display:block; text-align:center; From 000c80f1cbc661862a294bf8a8e874ebc2811562 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Thu, 20 Jun 2013 17:21:16 +0200 Subject: [PATCH 06/61] update readme --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f1c7a95..ceb4d06 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,10 @@ Read more at [cubiq.org](http://cubiq.org/swipeview) Gallery Demo: [http://cubiq.org/dropbox/SwipeView/demo/gallery](http://cubiq.org/dropbox/SwipeView/demo/gallery) +Multiple SwipeViews in the same document: [http://peutetre.github.io/SwipeView/demo/gallery2/](http://peutetre.github.io/SwipeView/demo/gallery2/) + eReader Demo: [http://cubiq.org/dropbox/SwipeView/demo/ereader](http://cubiq.org/dropbox/SwipeView/demo/ereader) Inline Demo: [http://cubiq.org/dropbox/SwipeView/demo/inline](http://cubiq.org/dropbox/SwipeView/demo/inline) -Screencast: [http://www.youtube.com/watch?v=Hhes5JHs8jQ](http://www.youtube.com/watch?v=Hhes5JHs8jQ) \ No newline at end of file +Screencast: [http://www.youtube.com/watch?v=Hhes5JHs8jQ](http://www.youtube.com/watch?v=Hhes5JHs8jQ) From e42f36abdc012d591829fe493b2fc34f07fefe1b Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Fri, 21 Jun 2013 10:10:32 +0200 Subject: [PATCH 07/61] rm onMouveOut cb in demo/gallery2 --- demo/gallery2/index.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/demo/gallery2/index.html b/demo/gallery2/index.html index fd51a58..6eb0b22 100644 --- a/demo/gallery2/index.html +++ b/demo/gallery2/index.html @@ -76,10 +76,6 @@ el.onload = function () { this.className = ''; } } - gallery.onMoveOut(function () { - console.log("onMoveOut"); - }); - gallery.onFlip(function () { var el, upcoming, From 2d764b9e53c5f4eefc1186b91bb8b43a447e2938 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Fri, 21 Jun 2013 11:18:02 +0200 Subject: [PATCH 08/61] add mouseout listener on the swipe view wrapper --- src/swipeview.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/swipeview.js b/src/swipeview.js index 0d4ddb9..1040ef1 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -110,9 +110,9 @@ var SwipeView = (function (window, document) { // in Opera >= 12 the transitionend event is lowercase so we register both events if ( vendor == 'O' ) this.slider.addEventListener(transitionEndEvent.toLowerCase(), this, false); -/* if (!hasTouch) { + if (!hasTouch) { this.wrapper.addEventListener('mouseout', this, false); - }*/ + } }; SwipeView.prototype = { @@ -155,9 +155,9 @@ var SwipeView = (function (window, document) { this.wrapper.removeEventListener(endEvent, this, false); this.slider.removeEventListener(transitionEndEvent, this, false); -/* if (!hasTouch) { + if (!hasTouch) { this.wrapper.removeEventListener('mouseout', this, false); - }*/ + } }, refreshSize: function () { @@ -250,6 +250,7 @@ var SwipeView = (function (window, document) { this.__move(e); break; case cancelEvent: + case "mouseout": case endEvent: this.__end(e); break; From 9913092880351e2e660ad2ddd50ac031ba9c403a Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Fri, 21 Jun 2013 13:12:15 +0200 Subject: [PATCH 09/61] demo gallery2, keep global references for testing --- demo/gallery2/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/demo/gallery2/index.html b/demo/gallery2/index.html index 6eb0b22..616a010 100644 --- a/demo/gallery2/index.html +++ b/demo/gallery2/index.html @@ -97,11 +97,11 @@ return gallery; } -generateSwipeView("#wrapper1", genData(100)); -generateSwipeView("#wrapper2", genData(100)); -generateSwipeView("#wrapper3", genData(100)); -generateSwipeView("#wrapper4", genData(100)); -generateSwipeView("#wrapper5", genData(100)); +var g1 = generateSwipeView("#wrapper1", genData(100)); +var g2 = generateSwipeView("#wrapper2", genData(100)); +var g3 = generateSwipeView("#wrapper3", genData(100)); +var g4 = generateSwipeView("#wrapper4", genData(100)); +var g5 = generateSwipeView("#wrapper5", genData(100)); From 16e7dd253678fc6a0aabf808ae7299aa513330c9 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Fri, 21 Jun 2013 13:13:41 +0200 Subject: [PATCH 10/61] =?UTF-8?q?demo:=20gallery2=20refacto,=20getting=20d?= =?UTF-8?q?ata=20from=20a=20=C6=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/gallery2/index.html | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/demo/gallery2/index.html b/demo/gallery2/index.html index 616a010..bdc427d 100644 --- a/demo/gallery2/index.html +++ b/demo/gallery2/index.html @@ -35,27 +35,32 @@ i = 0; tmp = []; } } - return data; + return { + get: function (i) { + return data[i]; + }, + length : data.length + }; } -function generateSwipeView(id, data) { +function generateSwipeView(id, dataO) { var gallery = new SwipeView(id, { hastyPageFlip:true, - numberOfPages: data.length + numberOfPages: dataO.length }), i, page; - function genImgs(container, page, data) { + function genImgs(container, page, d) { var img, div; for(var i=0; i< 5; i++) { div = document.createElement('div'); div.className = 'container'; img = document.createElement('img'); img.className = 'loading'; - img.src = data[page].imgs[i]; - img.width = data[page].width; - img.height = data[page].height; - div.style.width = data[page].width + "px"; - div.style.height = data[page].height + "px"; + img.src = d.get(page).imgs[i]; + img.width = d.get(page).width; + img.height = d.get(page).height; + div.style.width = d.get(page).width + "px"; + div.style.height = d.get(page).height + "px"; img.onload = function () { this.className = ''; } div.appendChild(img); container.appendChild(div); @@ -63,10 +68,10 @@ } for(i=0; i<3; i++) { - page = i==0 ? data.length-1 : i-1; + page = i==0 ? dataO.length-1 : i-1; div = document.createElement('div'); div.className = 'set-container'; - genImgs(div, page, data); + genImgs(div, page, dataO); gallery.masterPages[i].appendChild(div); } @@ -86,11 +91,11 @@ if (upcoming != gallery.masterPages[i].dataset.pageIndex) { els = gallery.masterPages[i].querySelectorAll('img'); - setImg(els[0], data[upcoming].imgs[0]); - setImg(els[1], data[upcoming].imgs[1]); - setImg(els[2], data[upcoming].imgs[2]); - setImg(els[3], data[upcoming].imgs[3]); - setImg(els[4], data[upcoming].imgs[4]); + setImg(els[0], dataO.get(upcoming).imgs[0]); + setImg(els[1], dataO.get(upcoming).imgs[1]); + setImg(els[2], dataO.get(upcoming).imgs[2]); + setImg(els[3], dataO.get(upcoming).imgs[3]); + setImg(els[4], dataO.get(upcoming).imgs[4]); } } }); From 027e2b60bb8767268db3e13bdbb8e0a40f4c2046 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Fri, 21 Jun 2013 16:24:06 +0200 Subject: [PATCH 11/61] fix on __end() --- src/swipeview.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/swipeview.js b/src/swipeview.js index 1040ef1..a726cab 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -389,6 +389,7 @@ var SwipeView = (function (window, document) { if(e.changedTouches.item(i).identifier === this.identifier) point = e.changedTouches.item(i); } + if (!point) return; } else { point = e; From c44bc3fcccf6304b5c9915af8aa00c641b649376 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Fri, 21 Jun 2013 17:22:18 +0200 Subject: [PATCH 12/61] handle touch cancel properly! --- src/swipeview.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/swipeview.js b/src/swipeview.js index a726cab..850999d 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -389,7 +389,11 @@ var SwipeView = (function (window, document) { if(e.changedTouches.item(i).identifier === this.identifier) point = e.changedTouches.item(i); } - if (!point) return; + if (!point) { + this.__pos(-this.page * this.pageWidth); + this.initiated = false; + return; + } } else { point = e; From 3081d49bf4bbef6a050d9f2dc6983a9fdfb82de2 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Tue, 25 Jun 2013 14:28:16 +0200 Subject: [PATCH 13/61] wip VerticalSwipeView --- src/verticalswipeview.js | 509 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 509 insertions(+) create mode 100644 src/verticalswipeview.js diff --git a/src/verticalswipeview.js b/src/verticalswipeview.js new file mode 100644 index 0000000..bcb5af1 --- /dev/null +++ b/src/verticalswipeview.js @@ -0,0 +1,509 @@ +/*! + * VerticalSwipeView + * Fork from SwipeView v1.0 ~ Copyright (c) 2012 Matteo Spinelli, http://cubiq.org + * Released under MIT license, http://cubiq.org/license + */ +var VerticalSwipeView = (function (window, document) { + var dummyStyle = document.createElement('div').style, + vendor = (function () { + var vendors = 't,webkitT,MozT,msT,OT'.split(','), + t, + i = 0, + l = vendors.length; + + for ( ; i < l; i++ ) { + t = vendors[i] + 'ransform'; + if ( t in dummyStyle ) { + return vendors[i].substr(0, vendors[i].length - 1); + } + } + + return false; + })(), + cssVendor = vendor ? '-' + vendor.toLowerCase() + '-' : '', + + // Style properties + transform = prefixStyle('transform'), + transitionDuration = prefixStyle('transitionDuration'), + + // Browser capabilities + has3d = prefixStyle('perspective') in dummyStyle, + hasTouch = 'ontouchstart' in window, + hasTransform = !!vendor, + hasTransitionEnd = prefixStyle('transition') in dummyStyle, + + // Helpers + translateZ = has3d ? ' translateZ(0)' : '', + + // Events + resizeEvent = 'onorientationchange' in window ? 'orientationchange' : 'resize', + startEvent = hasTouch ? 'touchstart' : 'mousedown', + moveEvent = hasTouch ? 'touchmove' : 'mousemove', + endEvent = hasTouch ? 'touchend' : 'mouseup', + cancelEvent = hasTouch ? 'touchcancel' : 'mouseup', + transitionEndEvent = (function () { + if ( vendor === false ) return false; + + var transitionEnd = { + '' : 'transitionend', + 'webkit' : 'webkitTransitionEnd', + 'Moz' : 'transitionend', + 'O' : 'oTransitionEnd', + 'ms' : 'MSTransitionEnd' + }; + + return transitionEnd[vendor]; + })(), + + VerticalSwipeView = function (el, options) { + var i, + div, + className, + pageIndex; + + this.wrapper = typeof el == 'string' ? document.querySelector(el) : el; + this.options = { + text: null, + numberOfPages: 3, + snapThreshold: null, + hastyPageFlip: false, + loop: true + }; + + // User defined options + for (i in options) this.options[i] = options[i]; + + this.wrapper.style.overflow = 'hidden'; + this.wrapper.style.position = 'relative'; + + this.masterPages = []; + + div = document.createElement('div'); + div.className = 'swipeview-slider'; + div.style.cssText = 'position:relative;top:0;height:100%;width:100%;' + cssVendor + 'transition-duration:0;' + cssVendor + 'transform:translateZ(0);' + cssVendor + 'transition-timing-function:ease-out'; + this.wrapper.appendChild(div); + this.slider = div; + + this.refreshSize(); + + for (i=-1; i<2; i++) { + div = document.createElement('div'); + div.style.cssText = cssVendor + 'transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;left:' + i*100 + '%'; + if (!div.dataset) div.dataset = {}; + pageIndex = i == -1 ? this.options.numberOfPages - 1 : i; + div.dataset.pageIndex = pageIndex; + div.dataset.upcomingPageIndex = pageIndex; + + if (!this.options.loop && i == -1) div.style.visibility = 'hidden'; + + this.slider.appendChild(div); + this.masterPages.push(div); + } + + className = this.masterPages[1].className; + this.masterPages[1].className = !className ? 'swipeview-active' : className + ' swipeview-active'; + + window.addEventListener(resizeEvent, this, false); + this.wrapper.addEventListener(startEvent, this, false); + this.wrapper.addEventListener(moveEvent, this, false); + this.wrapper.addEventListener(endEvent, this, false); + this.slider.addEventListener(transitionEndEvent, this, false); + // in Opera >= 12 the transitionend event is lowercase so we register both events + if ( vendor == 'O' ) this.slider.addEventListener(transitionEndEvent.toLowerCase(), this, false); + + if (!hasTouch) { + this.wrapper.addEventListener('mouseout', this, false); + } + }; + + VerticalSwipeView.prototype = { + currentMasterPage: 1, + x: 0, + page: 0, + pageIndex: 0, + customEvents: [], + + onFlip: function (fn) { + this.wrapper.addEventListener('swipeview-flip', fn, false); + this.customEvents.push(['flip', fn]); + }, + + onMoveOut: function (fn) { + this.wrapper.addEventListener('swipeview-moveout', fn, false); + this.customEvents.push(['moveout', fn]); + }, + + onMoveIn: function (fn) { + this.wrapper.addEventListener('swipeview-movein', fn, false); + this.customEvents.push(['movein', fn]); + }, + + onTouchStart: function (fn) { + this.wrapper.addEventListener('swipeview-touchstart', fn, false); + this.customEvents.push(['touchstart', fn]); + }, + + destroy: function () { + while ( this.customEvents.length ) { + this.wrapper.removeEventListener('swipeview-' + this.customEvents[0][0], this.customEvents[0][1], false); + this.customEvents.shift(); + } + + // Remove the event listeners + window.removeEventListener(resizeEvent, this, false); + this.wrapper.removeEventListener(startEvent, this, false); + this.wrapper.removeEventListener(moveEvent, this, false); + this.wrapper.removeEventListener(endEvent, this, false); + this.slider.removeEventListener(transitionEndEvent, this, false); + + if (!hasTouch) { + this.wrapper.removeEventListener('mouseout', this, false); + } + }, + + refreshSize: function () { + this.wrapperWidth = this.wrapper.clientWidth; + this.wrapperHeight = this.wrapper.clientHeight; + this.pageWidth = this.wrapperWidth; + this.maxX = -this.options.numberOfPages * this.pageWidth + this.wrapperWidth; + this.snapThreshold = this.options.snapThreshold === null ? + Math.round(this.pageWidth * 0.15) : + /%/.test(this.options.snapThreshold) ? + Math.round(this.pageWidth * this.options.snapThreshold.replace('%', '') / 100) : + this.options.snapThreshold; + }, + + updatePageCount: function (n) { + this.options.numberOfPages = n; + this.maxX = -this.options.numberOfPages * this.pageWidth + this.wrapperWidth; + }, + + goToPage: function (p) { + var i; + + this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/, ''); + for (i=0; i<3; i++) { + className = this.masterPages[i].className; + /(^|\s)swipeview-loading(\s|$)/.test(className) || (this.masterPages[i].className = !className ? 'swipeview-loading' : className + ' swipeview-loading'); + } + + p = p < 0 ? 0 : p > this.options.numberOfPages-1 ? this.options.numberOfPages-1 : p; + this.page = p; + this.pageIndex = p; + this.slider.style[transitionDuration] = '0s'; + this.__pos(-p * this.pageWidth); + + this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; + + this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className + ' swipeview-active'; + + if (this.currentMasterPage === 0) { + this.masterPages[2].style.left = this.page * 100 - 100 + '%'; + this.masterPages[0].style.left = this.page * 100 + '%'; + this.masterPages[1].style.left = this.page * 100 + 100 + '%'; + + this.masterPages[2].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; + this.masterPages[0].dataset.upcomingPageIndex = this.page; + this.masterPages[1].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; + } else if (this.currentMasterPage == 1) { + this.masterPages[0].style.left = this.page * 100 - 100 + '%'; + this.masterPages[1].style.left = this.page * 100 + '%'; + this.masterPages[2].style.left = this.page * 100 + 100 + '%'; + + this.masterPages[0].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; + this.masterPages[1].dataset.upcomingPageIndex = this.page; + this.masterPages[2].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; + } else { + this.masterPages[1].style.left = this.page * 100 - 100 + '%'; + this.masterPages[2].style.left = this.page * 100 + '%'; + this.masterPages[0].style.left = this.page * 100 + 100 + '%'; + + this.masterPages[1].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; + this.masterPages[2].dataset.upcomingPageIndex = this.page; + this.masterPages[0].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; + } + + this.__flip(); + }, + + next: function () { + if (!this.options.loop && this.x == this.maxX) return; + + this.directionX = -1; + this.x -= 1; + this.__checkPosition(); + }, + + prev: function () { + if (!this.options.loop && this.x === 0) return; + + this.directionX = 1; + this.x += 1; + this.__checkPosition(); + }, + + handleEvent: function (e) { + switch (e.type) { + case startEvent: + this.__start(e); + break; + case moveEvent: + this.__move(e); + break; + case cancelEvent: + case "mouseout": + case endEvent: + this.__end(e); + break; + case resizeEvent: + this.__resize(); + break; + case transitionEndEvent: + case 'otransitionend': + if (e.target == this.slider && !this.options.hastyPageFlip) this.__flip(); + break; + } + }, + + + /** + * + * Pseudo private methods + * + */ + __pos: function (x) { + this.x = x; + this.slider.style[transform] = 'translate(' + x + 'px,0)' + translateZ; + }, + + __resize: function () { + this.refreshSize(); + this.slider.style[transitionDuration] = '0s'; + this.__pos(-this.page * this.pageWidth); + }, + + __start: function (e) { + //e.preventDefault(); + + if (this.initiated) return; + + var point = hasTouch ? e.targetTouches[0] : e; + + this.initiated = true; + this.identifier = point.identifier; + this.moved = false; + this.thresholdExceeded = false; + this.startX = point.pageX; + this.startY = point.pageY; + this.pointX = point.pageX; + this.pointY = point.pageY; + this.stepsX = 0; + this.stepsY = 0; + this.directionX = 0; + this.directionLocked = false; + +/* var matrix = getComputedStyle(this.slider, null).webkitTransform.replace(/[^0-9-.,]/g, '').split(','); + this.x = matrix[4] * 1;*/ + + this.slider.style[transitionDuration] = '0s'; + + this.__event('touchstart'); + }, + + __move: function (e) { + if (!this.initiated) return; + var i, l, point; + + if (hasTouch) { + i = 0; + l = e.changedTouches.length; + for(;i 0 ? 1 : deltaX < 0 ? -1 : 0; + this.stepsX += Math.abs(deltaX); + this.stepsY += Math.abs(deltaY); + + // We take a 10px buffer to figure out the direction of the swipe + if (this.stepsX < 10 && this.stepsY < 10) { +// e.preventDefault(); + return; + } + + // We are scrolling vertically, so skip VerticalSwipeView and give the control back to the browser + if (!this.directionLocked && this.stepsY > this.stepsX) { + this.initiated = false; + return; + } + + e.preventDefault(); + + this.directionLocked = true; + + if (!this.options.loop && (newX > 0 || newX < this.maxX)) { + newX = this.x + (deltaX / 2); + } + + if (!this.thresholdExceeded && dist >= this.snapThreshold) { + this.thresholdExceeded = true; + this.__event('moveout'); + } else if (this.thresholdExceeded && dist < this.snapThreshold) { + this.thresholdExceeded = false; + this.__event('movein'); + } + +/* if (newX > 0 || newX < this.maxX) { + newX = this.x + (deltaX / 2); + }*/ + + this.__pos(newX); + }, + + __end: function (e) { + if (!this.initiated) return; + + var point; + + if(hasTouch) { + var i=0, l=e.touches.length; + for(;i 0 || this.x < this.maxX)) { + dist = 0; + this.__event('movein'); + } + + // Check if we exceeded the snap threshold + if (dist < this.snapThreshold) { + this.slider.style[transitionDuration] = Math.floor(300 * dist / this.snapThreshold) + 'ms'; + this.__pos(-this.page * this.pageWidth); + return; + } + + this.__checkPosition(); + }, + + __checkPosition: function () { + var pageFlip, + pageFlipIndex, + className; + + this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/, ''); + + // Flip the page + if (this.directionX > 0) { + this.page = -Math.ceil(this.x / this.pageWidth); + this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; + this.pageIndex = this.pageIndex === 0 ? this.options.numberOfPages - 1 : this.pageIndex - 1; + + pageFlip = this.currentMasterPage - 1; + pageFlip = pageFlip < 0 ? 2 : pageFlip; + this.masterPages[pageFlip].style.left = this.page * 100 - 100 + '%'; + + pageFlipIndex = this.page - 1; + } else { + this.page = -Math.floor(this.x / this.pageWidth); + this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; + this.pageIndex = this.pageIndex == this.options.numberOfPages - 1 ? 0 : this.pageIndex + 1; + + pageFlip = this.currentMasterPage + 1; + pageFlip = pageFlip > 2 ? 0 : pageFlip; + this.masterPages[pageFlip].style.left = this.page * 100 + 100 + '%'; + + pageFlipIndex = this.page + 1; + } + + // Add active class to current page + className = this.masterPages[this.currentMasterPage].className; + /(^|\s)swipeview-active(\s|$)/.test(className) || (this.masterPages[this.currentMasterPage].className = !className ? 'swipeview-active' : className + ' swipeview-active'); + + // Add loading class to flipped page + className = this.masterPages[pageFlip].className; + /(^|\s)swipeview-loading(\s|$)/.test(className) || (this.masterPages[pageFlip].className = !className ? 'swipeview-loading' : className + ' swipeview-loading'); + + pageFlipIndex = pageFlipIndex - Math.floor(pageFlipIndex / this.options.numberOfPages) * this.options.numberOfPages; + this.masterPages[pageFlip].dataset.upcomingPageIndex = pageFlipIndex; // Index to be loaded in the newly flipped page + + newX = -this.page * this.pageWidth; + + this.slider.style[transitionDuration] = Math.floor(500 * Math.abs(this.x - newX) / this.pageWidth) + 'ms'; + + // Hide the next page if we decided to disable looping + if (!this.options.loop) { + this.masterPages[pageFlip].style.visibility = newX === 0 || newX == this.maxX ? 'hidden' : ''; + } + + if (this.x == newX) { + this.__flip(); // If we swiped all the way long to the next page (extremely rare but still) + } else { + this.__pos(newX); + if (this.options.hastyPageFlip) this.__flip(); + } + }, + + __flip: function () { + this.__event('flip'); + + for (var i=0; i<3; i++) { + this.masterPages[i].className = this.masterPages[i].className.replace(/(^|\s)swipeview-loading(\s|$)/, ''); // Remove the loading class + this.masterPages[i].dataset.pageIndex = this.masterPages[i].dataset.upcomingPageIndex; + } + }, + + __event: function (type) { + var ev = document.createEvent("Event"); + + ev.initEvent('swipeview-' + type, true, true); + + this.wrapper.dispatchEvent(ev); + } + }; + + function prefixStyle (style) { + if ( vendor === '' ) return style; + + style = style.charAt(0).toUpperCase() + style.substr(1); + return vendor + style; + } + + return VerticalSwipeView; +})(window, document); From 39aff26f49b7cb6e1a5d8edf7279db2b2b339bd2 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Tue, 25 Jun 2013 14:28:16 +0200 Subject: [PATCH 14/61] wip VerticalSwipeView --- src/verticalswipeview.js | 509 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 509 insertions(+) create mode 100644 src/verticalswipeview.js diff --git a/src/verticalswipeview.js b/src/verticalswipeview.js new file mode 100644 index 0000000..0271f61 --- /dev/null +++ b/src/verticalswipeview.js @@ -0,0 +1,509 @@ +/*! + * VerticalSwipeView + * Fork from SwipeView v1.0 ~ Copyright (c) 2012 Matteo Spinelli, http://cubiq.org + * Released under MIT license, http://cubiq.org/license + */ +var VerticalSwipeView = (function (window, document) { + var dummyStyle = document.createElement('div').style, + vendor = (function () { + var vendors = 't,webkitT,MozT,msT,OT'.split(','), + t, + i = 0, + l = vendors.length; + + for ( ; i < l; i++ ) { + t = vendors[i] + 'ransform'; + if ( t in dummyStyle ) { + return vendors[i].substr(0, vendors[i].length - 1); + } + } + + return false; + })(), + cssVendor = vendor ? '-' + vendor.toLowerCase() + '-' : '', + + // Style properties + transform = prefixStyle('transform'), + transitionDuration = prefixStyle('transitionDuration'), + + // Browser capabilities + has3d = prefixStyle('perspective') in dummyStyle, + hasTouch = 'ontouchstart' in window, + hasTransform = !!vendor, + hasTransitionEnd = prefixStyle('transition') in dummyStyle, + + // Helpers + translateZ = has3d ? ' translateZ(0)' : '', + + // Events + resizeEvent = 'onorientationchange' in window ? 'orientationchange' : 'resize', + startEvent = hasTouch ? 'touchstart' : 'mousedown', + moveEvent = hasTouch ? 'touchmove' : 'mousemove', + endEvent = hasTouch ? 'touchend' : 'mouseup', + cancelEvent = hasTouch ? 'touchcancel' : 'mouseup', + transitionEndEvent = (function () { + if ( vendor === false ) return false; + + var transitionEnd = { + '' : 'transitionend', + 'webkit' : 'webkitTransitionEnd', + 'Moz' : 'transitionend', + 'O' : 'oTransitionEnd', + 'ms' : 'MSTransitionEnd' + }; + + return transitionEnd[vendor]; + })(), + + VerticalSwipeView = function (el, options) { + var i, + div, + className, + pageIndex; + + this.wrapper = typeof el == 'string' ? document.querySelector(el) : el; + this.options = { + text: null, + numberOfPages: 3, + snapThreshold: null, + hastyPageFlip: false, + loop: true + }; + + // User defined options + for (i in options) this.options[i] = options[i]; + + this.wrapper.style.overflow = 'hidden'; + this.wrapper.style.position = 'relative'; + + this.masterPages = []; + + div = document.createElement('div'); + div.className = 'swipeview-slider'; + div.style.cssText = 'position:relative;top:0;height:100%;width:100%;' + cssVendor + 'transition-duration:0;' + cssVendor + 'transform:translateZ(0);' + cssVendor + 'transition-timing-function:ease-out'; + this.wrapper.appendChild(div); + this.slider = div; + + this.refreshSize(); + + for (i=-1; i<2; i++) { + div = document.createElement('div'); + div.style.cssText = cssVendor + 'transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;top:' + i*100 + '%'; + if (!div.dataset) div.dataset = {}; + pageIndex = i == -1 ? this.options.numberOfPages - 1 : i; + div.dataset.pageIndex = pageIndex; + div.dataset.upcomingPageIndex = pageIndex; + + if (!this.options.loop && i == -1) div.style.visibility = 'hidden'; + + this.slider.appendChild(div); + this.masterPages.push(div); + } + + className = this.masterPages[1].className; + this.masterPages[1].className = !className ? 'swipeview-active' : className + ' swipeview-active'; + + window.addEventListener(resizeEvent, this, false); + this.wrapper.addEventListener(startEvent, this, false); + this.wrapper.addEventListener(moveEvent, this, false); + this.wrapper.addEventListener(endEvent, this, false); + this.slider.addEventListener(transitionEndEvent, this, false); + // in Opera >= 12 the transitionend event is lowercase so we register both events + if ( vendor == 'O' ) this.slider.addEventListener(transitionEndEvent.toLowerCase(), this, false); + + if (!hasTouch) { + this.wrapper.addEventListener('mouseout', this, false); + } + }; + + VerticalSwipeView.prototype = { + currentMasterPage: 1, + x: 0, + page: 0, + pageIndex: 0, + customEvents: [], + + onFlip: function (fn) { + this.wrapper.addEventListener('swipeview-flip', fn, false); + this.customEvents.push(['flip', fn]); + }, + + onMoveOut: function (fn) { + this.wrapper.addEventListener('swipeview-moveout', fn, false); + this.customEvents.push(['moveout', fn]); + }, + + onMoveIn: function (fn) { + this.wrapper.addEventListener('swipeview-movein', fn, false); + this.customEvents.push(['movein', fn]); + }, + + onTouchStart: function (fn) { + this.wrapper.addEventListener('swipeview-touchstart', fn, false); + this.customEvents.push(['touchstart', fn]); + }, + + destroy: function () { + while ( this.customEvents.length ) { + this.wrapper.removeEventListener('swipeview-' + this.customEvents[0][0], this.customEvents[0][1], false); + this.customEvents.shift(); + } + + // Remove the event listeners + window.removeEventListener(resizeEvent, this, false); + this.wrapper.removeEventListener(startEvent, this, false); + this.wrapper.removeEventListener(moveEvent, this, false); + this.wrapper.removeEventListener(endEvent, this, false); + this.slider.removeEventListener(transitionEndEvent, this, false); + + if (!hasTouch) { + this.wrapper.removeEventListener('mouseout', this, false); + } + }, + + refreshSize: function () { + this.wrapperWidth = this.wrapper.clientWidth; + this.wrapperHeight = this.wrapper.clientHeight; + this.pageWidth = this.wrapperWidth; + this.maxX = -this.options.numberOfPages * this.pageWidth + this.wrapperWidth; + this.snapThreshold = this.options.snapThreshold === null ? + Math.round(this.pageWidth * 0.15) : + /%/.test(this.options.snapThreshold) ? + Math.round(this.pageWidth * this.options.snapThreshold.replace('%', '') / 100) : + this.options.snapThreshold; + }, + + updatePageCount: function (n) { + this.options.numberOfPages = n; + this.maxX = -this.options.numberOfPages * this.pageWidth + this.wrapperWidth; + }, + + goToPage: function (p) { + var i; + + this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/, ''); + for (i=0; i<3; i++) { + className = this.masterPages[i].className; + /(^|\s)swipeview-loading(\s|$)/.test(className) || (this.masterPages[i].className = !className ? 'swipeview-loading' : className + ' swipeview-loading'); + } + + p = p < 0 ? 0 : p > this.options.numberOfPages-1 ? this.options.numberOfPages-1 : p; + this.page = p; + this.pageIndex = p; + this.slider.style[transitionDuration] = '0s'; + this.__pos(-p * this.pageWidth); + + this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; + + this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className + ' swipeview-active'; + + if (this.currentMasterPage === 0) { + this.masterPages[2].style.left = this.page * 100 - 100 + '%'; + this.masterPages[0].style.left = this.page * 100 + '%'; + this.masterPages[1].style.left = this.page * 100 + 100 + '%'; + + this.masterPages[2].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; + this.masterPages[0].dataset.upcomingPageIndex = this.page; + this.masterPages[1].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; + } else if (this.currentMasterPage == 1) { + this.masterPages[0].style.left = this.page * 100 - 100 + '%'; + this.masterPages[1].style.left = this.page * 100 + '%'; + this.masterPages[2].style.left = this.page * 100 + 100 + '%'; + + this.masterPages[0].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; + this.masterPages[1].dataset.upcomingPageIndex = this.page; + this.masterPages[2].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; + } else { + this.masterPages[1].style.left = this.page * 100 - 100 + '%'; + this.masterPages[2].style.left = this.page * 100 + '%'; + this.masterPages[0].style.left = this.page * 100 + 100 + '%'; + + this.masterPages[1].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; + this.masterPages[2].dataset.upcomingPageIndex = this.page; + this.masterPages[0].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; + } + + this.__flip(); + }, + + next: function () { + if (!this.options.loop && this.x == this.maxX) return; + + this.directionX = -1; + this.x -= 1; + this.__checkPosition(); + }, + + prev: function () { + if (!this.options.loop && this.x === 0) return; + + this.directionX = 1; + this.x += 1; + this.__checkPosition(); + }, + + handleEvent: function (e) { + switch (e.type) { + case startEvent: + this.__start(e); + break; + case moveEvent: + this.__move(e); + break; + case cancelEvent: + case "mouseout": + case endEvent: + this.__end(e); + break; + case resizeEvent: + this.__resize(); + break; + case transitionEndEvent: + case 'otransitionend': + if (e.target == this.slider && !this.options.hastyPageFlip) this.__flip(); + break; + } + }, + + + /** + * + * Pseudo private methods + * + */ + __pos: function (x) { + this.x = x; + this.slider.style[transform] = 'translate(' + x + 'px,0)' + translateZ; + }, + + __resize: function () { + this.refreshSize(); + this.slider.style[transitionDuration] = '0s'; + this.__pos(-this.page * this.pageWidth); + }, + + __start: function (e) { + //e.preventDefault(); + + if (this.initiated) return; + + var point = hasTouch ? e.targetTouches[0] : e; + + this.initiated = true; + this.identifier = point.identifier; + this.moved = false; + this.thresholdExceeded = false; + this.startX = point.pageX; + this.startY = point.pageY; + this.pointX = point.pageX; + this.pointY = point.pageY; + this.stepsX = 0; + this.stepsY = 0; + this.directionX = 0; + this.directionLocked = false; + +/* var matrix = getComputedStyle(this.slider, null).webkitTransform.replace(/[^0-9-.,]/g, '').split(','); + this.x = matrix[4] * 1;*/ + + this.slider.style[transitionDuration] = '0s'; + + this.__event('touchstart'); + }, + + __move: function (e) { + if (!this.initiated) return; + var i, l, point; + + if (hasTouch) { + i = 0; + l = e.changedTouches.length; + for(;i 0 ? 1 : deltaX < 0 ? -1 : 0; + this.stepsX += Math.abs(deltaX); + this.stepsY += Math.abs(deltaY); + + // We take a 10px buffer to figure out the direction of the swipe + if (this.stepsX < 10 && this.stepsY < 10) { +// e.preventDefault(); + return; + } + + // We are scrolling vertically, so skip VerticalSwipeView and give the control back to the browser + if (!this.directionLocked && this.stepsY > this.stepsX) { + this.initiated = false; + return; + } + + e.preventDefault(); + + this.directionLocked = true; + + if (!this.options.loop && (newX > 0 || newX < this.maxX)) { + newX = this.x + (deltaX / 2); + } + + if (!this.thresholdExceeded && dist >= this.snapThreshold) { + this.thresholdExceeded = true; + this.__event('moveout'); + } else if (this.thresholdExceeded && dist < this.snapThreshold) { + this.thresholdExceeded = false; + this.__event('movein'); + } + +/* if (newX > 0 || newX < this.maxX) { + newX = this.x + (deltaX / 2); + }*/ + + this.__pos(newX); + }, + + __end: function (e) { + if (!this.initiated) return; + + var point; + + if(hasTouch) { + var i=0, l=e.touches.length; + for(;i 0 || this.x < this.maxX)) { + dist = 0; + this.__event('movein'); + } + + // Check if we exceeded the snap threshold + if (dist < this.snapThreshold) { + this.slider.style[transitionDuration] = Math.floor(300 * dist / this.snapThreshold) + 'ms'; + this.__pos(-this.page * this.pageWidth); + return; + } + + this.__checkPosition(); + }, + + __checkPosition: function () { + var pageFlip, + pageFlipIndex, + className; + + this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/, ''); + + // Flip the page + if (this.directionX > 0) { + this.page = -Math.ceil(this.x / this.pageWidth); + this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; + this.pageIndex = this.pageIndex === 0 ? this.options.numberOfPages - 1 : this.pageIndex - 1; + + pageFlip = this.currentMasterPage - 1; + pageFlip = pageFlip < 0 ? 2 : pageFlip; + this.masterPages[pageFlip].style.left = this.page * 100 - 100 + '%'; + + pageFlipIndex = this.page - 1; + } else { + this.page = -Math.floor(this.x / this.pageWidth); + this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; + this.pageIndex = this.pageIndex == this.options.numberOfPages - 1 ? 0 : this.pageIndex + 1; + + pageFlip = this.currentMasterPage + 1; + pageFlip = pageFlip > 2 ? 0 : pageFlip; + this.masterPages[pageFlip].style.left = this.page * 100 + 100 + '%'; + + pageFlipIndex = this.page + 1; + } + + // Add active class to current page + className = this.masterPages[this.currentMasterPage].className; + /(^|\s)swipeview-active(\s|$)/.test(className) || (this.masterPages[this.currentMasterPage].className = !className ? 'swipeview-active' : className + ' swipeview-active'); + + // Add loading class to flipped page + className = this.masterPages[pageFlip].className; + /(^|\s)swipeview-loading(\s|$)/.test(className) || (this.masterPages[pageFlip].className = !className ? 'swipeview-loading' : className + ' swipeview-loading'); + + pageFlipIndex = pageFlipIndex - Math.floor(pageFlipIndex / this.options.numberOfPages) * this.options.numberOfPages; + this.masterPages[pageFlip].dataset.upcomingPageIndex = pageFlipIndex; // Index to be loaded in the newly flipped page + + newX = -this.page * this.pageWidth; + + this.slider.style[transitionDuration] = Math.floor(500 * Math.abs(this.x - newX) / this.pageWidth) + 'ms'; + + // Hide the next page if we decided to disable looping + if (!this.options.loop) { + this.masterPages[pageFlip].style.visibility = newX === 0 || newX == this.maxX ? 'hidden' : ''; + } + + if (this.x == newX) { + this.__flip(); // If we swiped all the way long to the next page (extremely rare but still) + } else { + this.__pos(newX); + if (this.options.hastyPageFlip) this.__flip(); + } + }, + + __flip: function () { + this.__event('flip'); + + for (var i=0; i<3; i++) { + this.masterPages[i].className = this.masterPages[i].className.replace(/(^|\s)swipeview-loading(\s|$)/, ''); // Remove the loading class + this.masterPages[i].dataset.pageIndex = this.masterPages[i].dataset.upcomingPageIndex; + } + }, + + __event: function (type) { + var ev = document.createEvent("Event"); + + ev.initEvent('swipeview-' + type, true, true); + + this.wrapper.dispatchEvent(ev); + } + }; + + function prefixStyle (style) { + if ( vendor === '' ) return style; + + style = style.charAt(0).toUpperCase() + style.substr(1); + return vendor + style; + } + + return VerticalSwipeView; +})(window, document); From e2db487115a747707bddc1ed5b7c8b4cfd2ebf63 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Tue, 25 Jun 2013 14:45:46 +0200 Subject: [PATCH 15/61] progress on VerticalSwipeView --- demo/gallery4/images/pic01.jpg | Bin 0 -> 22534 bytes demo/gallery4/images/pic02.jpg | Bin 0 -> 8275 bytes demo/gallery4/images/pic03.jpg | Bin 0 -> 19425 bytes demo/gallery4/images/pic04.jpg | Bin 0 -> 29554 bytes demo/gallery4/images/pic05.jpg | Bin 0 -> 20107 bytes demo/gallery4/images/pic06.jpg | Bin 0 -> 23859 bytes demo/gallery4/index.html | 126 ++++++++++++++++++++ demo/gallery4/style.css | 205 +++++++++++++++++++++++++++++++++ src/verticalswipeview.js | 98 ++++++++-------- 9 files changed, 380 insertions(+), 49 deletions(-) create mode 100644 demo/gallery4/images/pic01.jpg create mode 100644 demo/gallery4/images/pic02.jpg create mode 100644 demo/gallery4/images/pic03.jpg create mode 100644 demo/gallery4/images/pic04.jpg create mode 100644 demo/gallery4/images/pic05.jpg create mode 100644 demo/gallery4/images/pic06.jpg create mode 100644 demo/gallery4/index.html create mode 100644 demo/gallery4/style.css diff --git a/demo/gallery4/images/pic01.jpg b/demo/gallery4/images/pic01.jpg new file mode 100644 index 0000000000000000000000000000000000000000..97dd2657c5d3f9069fb1753bdd24d06c48628ec9 GIT binary patch literal 22534 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 literal 0 HcmV?d00001 diff --git a/demo/gallery4/images/pic03.jpg b/demo/gallery4/images/pic03.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ae8f45363e5e1fa682f905784323161ee71b5851 GIT binary patch literal 19425 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

mg{r#QXR#|Zu4_|H#rL83!0Kt4T#5y|Pu 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

+ + + + + diff --git a/demo/gallery4/style.css b/demo/gallery4/style.css new file mode 100644 index 0000000..229f0f6 --- /dev/null +++ b/demo/gallery4/style.css @@ -0,0 +1,205 @@ +html, body { height:100%; } +body { + padding:0; + margin:0; + background:#333; + -webkit-user-select:none; + -moz-user-select:none; + -ms-user-select:none; + -o-user-select:none; + user-select:none; + -webkit-text-size-adjust:none; + -moz-text-size-adjust:none; + -ms-text-size-adjust:none; + -o-text-size-adjust:none; + text-size-adjust:none; + color:#eee; + font-family:helvetica; + font-size:12px; +} + +#wrapper { + width:100%; + min-width:320px; + height:100%; +} + +#nav { + position:absolute; + z-index:100; + top:8px; + width:200px; + height:20px; + left:50%; + background:rgba(0,0,0,0.75); + padding:0; + margin:0 0 0 -100px; + -webkit-border-radius:10px; + -moz-border-radius:10px; + -ms-border-radius:10px; + -o-border-radius:10px; + border-radius:10px; +} + +#nav li { + display:block; + float:left; + width:14px; + height:14px; line-height:14px; + -webkit-border-radius:7px; + -moz-border-radius:7px; + -ms-border-radius:7px; + -o-border-radius:7px; + border-radius:7px; + background:rgba(255,255,255,0.1); + overflow:hidden; + padding:0; + margin:3px 11px 0 0; + text-align:center; +} + +#nav li#prev { + margin-left:5px; + background:transparent; +} + +#nav li#next { + margin-right:0; + background:transparent; +} + +#nav li.selected { + background:rgba(255,255,255,0.4); +} + +.swipeview-slider > div { + position:relative; + display:-webkit-box; + display:-moz-box; + display:-ms-box; + display:-o-box; + display:box; + -webkit-box-orient:vertical; + -moz-box-orient:vertical; + -ms-box-orient:vertical; + -o-box-orient:vertical; + box-orient:vertical; + -webkit-box-pack:center; + -moz-box-pack:center; + -ms-box-pack:center; + -o-box-pack:center; + box-pack:center; + -webkit-box-align:center; + -mox-box-align:center; + -ms-box-align:center; + -o-box-align:center; + box-align:center; + overflow:hidden; +} + +.swipeview-slider img { + display:block; + border:5px solid #eee; + -webkit-box-shadow:0 2px 6px #000; + -moz-box-shadow:0 2px 6px #000; + -ms-box-shadow:0 2px 6px #000; + -o-box-shadow:0 2px 6px #000; + box-shadow:0 2px 6px #000; + -webkit-border-radius:2px; + -moz-border-radius:2px; + -ms-border-radius:2px; + -o-border-radius:2px; + border-radius:2px; + -webkit-transition-duration:.4s; + -moz-transition-duration:.4s; + -ms-transition-duration:.4s; + -o-transition-duration:.4s; + transition-duration:.4s; + -webkit-transition-property:opacity; + -moz-transition-property:opacity; + -ms-transition-property:opacity; + -o-transition-property:opacity; + transition-property:opacity; + opacity:1; + pointer-events:none; +} + +.swipeview-slider span { + position:absolute; + bottom:0; + left:0; + width:100%; + padding:20px 0; + display:block; + background:rgba(0,0,0,0.75); + font-size:20px; + text-align:center; + text-shadow:0 1px 0 #000; + border-top:1px solid rgba(255,255,255,0.2); + -webkit-border-top-left-radius:10px; + -moz-border-top-left-radius:10px; + -ms-border-top-left-radius:10px; + -o-border-top-left-radius:10px; + border-top-left-radius:10px; + -webkit-border-top-right-radius:10px; + -moz-border-top-right-radius:10px; + -ms-border-top-right-radius:10px; + -o-border-top-right-radius:10px; + border-top-right-radius:10px; + -webkit-transition-duration:.3s; + -moz-transition-duration:.3s; + -ms-transition-duration:.3s; + -o-transition-duration:.3s; + transition-duration:.3s; + -webkit-transition-property:-webkit-transform; + -moz-transition-property:-moz-transform; + -ms-transition-property:-ms-transform; + -o-transition-property:-o-transform; + transition-property:transform; + -webkit-transform:translate(0,100%) translateZ(0); + -moz-transform:translate(0,100%) translateZ(0); + -ms-transform:translate(0,100%); + -ms-transform:translate(0,100%) translateZ(0); + -o-transform:translate(0,100%); + -o-transform:translate(0,100%) translateZ(0); + transform:translate(0,100%) translateZ(0); +} + +.swipeview-slider .swipeview-active span { + -webkit-transform:translate(0,0) translateZ(0); + -moz-transform:translate(0,0) translateZ(0); + -ms-transform:translate(0,0); + -ms-transform:translate(0,0) translateZ(0); + -o-transform:translate(0,0); + -o-transform:translate(0,0) translateZ(0); + transform:translate(0,0) translateZ(0); +} + +#wrapper > div > .swipeview-loading { + background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#444), to(#555)), + -webkit-gradient(linear, 0 0, 100% 0, from(#777), to(#777)); + background-position:50% 50%, 50% 50%; + background-size:200px 140px, 210px 150px; + background-repeat:no-repeat; +} + +#wrapper > div > .swipeview-loading img, +.swipeview-slider img.loading { + -webkit-transition-duration:0s; + opacity:0; +} + +#wrapper > div > .swipeview-loading span { + -webkit-transition-duration:0s; + -moz-transition-duration:0s; + -ms-transition-duration:0s; + -o-transition-duration:0s; + transition-duration:0s; + -webkit-transform:translate(0,100%) translateZ(0); + -moz-transform:translate(0,100%) translateZ(0); + -ms-transform:translate(0,100%); + -ms-transform:translate(0,100%) translateZ(0); + -o-transform:translate(0,100%); + -o-transform:translate(0,100%) translateZ(0); + transform:translate(0,100%) translateZ(0); +} diff --git a/src/verticalswipeview.js b/src/verticalswipeview.js index 0271f61..1564e85 100644 --- a/src/verticalswipeview.js +++ b/src/verticalswipeview.js @@ -118,7 +118,7 @@ var VerticalSwipeView = (function (window, document) { VerticalSwipeView.prototype = { currentMasterPage: 1, - x: 0, + y: 0, page: 0, pageIndex: 0, customEvents: [], @@ -164,18 +164,18 @@ var VerticalSwipeView = (function (window, document) { refreshSize: function () { this.wrapperWidth = this.wrapper.clientWidth; this.wrapperHeight = this.wrapper.clientHeight; - this.pageWidth = this.wrapperWidth; - this.maxX = -this.options.numberOfPages * this.pageWidth + this.wrapperWidth; + this.pageHeight = this.wrapperHeight; + this.maxY = -this.options.numberOfPages * this.pageHeight + this.wrapperHeight; this.snapThreshold = this.options.snapThreshold === null ? - Math.round(this.pageWidth * 0.15) : + Math.round(this.pageHeight * 0.15) : /%/.test(this.options.snapThreshold) ? - Math.round(this.pageWidth * this.options.snapThreshold.replace('%', '') / 100) : + Math.round(this.pageHeight * this.options.snapThreshold.replace('%', '') / 100) : this.options.snapThreshold; }, updatePageCount: function (n) { this.options.numberOfPages = n; - this.maxX = -this.options.numberOfPages * this.pageWidth + this.wrapperWidth; + this.maxY = -this.options.numberOfPages * this.pageHeight + this.wrapperHeight; }, goToPage: function (p) { @@ -191,32 +191,32 @@ var VerticalSwipeView = (function (window, document) { this.page = p; this.pageIndex = p; this.slider.style[transitionDuration] = '0s'; - this.__pos(-p * this.pageWidth); + this.__pos(-p * this.pageHeight); this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className + ' swipeview-active'; if (this.currentMasterPage === 0) { - this.masterPages[2].style.left = this.page * 100 - 100 + '%'; - this.masterPages[0].style.left = this.page * 100 + '%'; - this.masterPages[1].style.left = this.page * 100 + 100 + '%'; + this.masterPages[2].style.top = this.page * 100 - 100 + '%'; + this.masterPages[0].style.top = this.page * 100 + '%'; + this.masterPages[1].style.top = this.page * 100 + 100 + '%'; this.masterPages[2].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; this.masterPages[0].dataset.upcomingPageIndex = this.page; this.masterPages[1].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; } else if (this.currentMasterPage == 1) { - this.masterPages[0].style.left = this.page * 100 - 100 + '%'; - this.masterPages[1].style.left = this.page * 100 + '%'; - this.masterPages[2].style.left = this.page * 100 + 100 + '%'; + this.masterPages[0].style.top = this.page * 100 - 100 + '%'; + this.masterPages[1].style.top = this.page * 100 + '%'; + this.masterPages[2].style.top = this.page * 100 + 100 + '%'; this.masterPages[0].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; this.masterPages[1].dataset.upcomingPageIndex = this.page; this.masterPages[2].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; } else { - this.masterPages[1].style.left = this.page * 100 - 100 + '%'; - this.masterPages[2].style.left = this.page * 100 + '%'; - this.masterPages[0].style.left = this.page * 100 + 100 + '%'; + this.masterPages[1].style.top = this.page * 100 - 100 + '%'; + this.masterPages[2].style.top = this.page * 100 + '%'; + this.masterPages[0].style.top = this.page * 100 + 100 + '%'; this.masterPages[1].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; this.masterPages[2].dataset.upcomingPageIndex = this.page; @@ -227,18 +227,18 @@ var VerticalSwipeView = (function (window, document) { }, next: function () { - if (!this.options.loop && this.x == this.maxX) return; + if (!this.options.loop && this.y == this.maxY) return; - this.directionX = -1; - this.x -= 1; + this.directionY = -1; + this.y -= 1; this.__checkPosition(); }, prev: function () { - if (!this.options.loop && this.x === 0) return; + if (!this.options.loop && this.y === 0) return; - this.directionX = 1; - this.x += 1; + this.directionY = 1; + this.y += 1; this.__checkPosition(); }, @@ -271,15 +271,15 @@ var VerticalSwipeView = (function (window, document) { * Pseudo private methods * */ - __pos: function (x) { - this.x = x; - this.slider.style[transform] = 'translate(' + x + 'px,0)' + translateZ; + __pos: function (y) { + this.y = y; + this.slider.style[transform] = 'translate(0, ' + y + 'px)' + translateZ; }, __resize: function () { this.refreshSize(); this.slider.style[transitionDuration] = '0s'; - this.__pos(-this.page * this.pageWidth); + this.__pos(-this.page * this.pageHeight); }, __start: function (e) { @@ -299,7 +299,7 @@ var VerticalSwipeView = (function (window, document) { this.pointY = point.pageY; this.stepsX = 0; this.stepsY = 0; - this.directionX = 0; + this.directionY = 0; this.directionLocked = false; /* var matrix = getComputedStyle(this.slider, null).webkitTransform.replace(/[^0-9-.,]/g, '').split(','); @@ -329,13 +329,13 @@ var VerticalSwipeView = (function (window, document) { var deltaX = point.pageX - this.pointX, deltaY = point.pageY - this.pointY, - newX = this.x + deltaX, - dist = Math.abs(point.pageX - this.startX); + newY = this.y + deltaY, + dist = Math.abs(point.pageY - this.startY); this.moved = true; this.pointX = point.pageX; this.pointY = point.pageY; - this.directionX = deltaX > 0 ? 1 : deltaX < 0 ? -1 : 0; + this.directionY = deltaY > 0 ? 1 : deltaY < 0 ? -1 : 0; this.stepsX += Math.abs(deltaX); this.stepsY += Math.abs(deltaY); @@ -345,8 +345,8 @@ var VerticalSwipeView = (function (window, document) { return; } - // We are scrolling vertically, so skip VerticalSwipeView and give the control back to the browser - if (!this.directionLocked && this.stepsY > this.stepsX) { + // We are scrolling horizontaly, so skip VerticalSwipeView and give the control back to the browser + if (!this.directionLocked && this.stepsX > this.stepsY) { this.initiated = false; return; } @@ -355,8 +355,8 @@ var VerticalSwipeView = (function (window, document) { this.directionLocked = true; - if (!this.options.loop && (newX > 0 || newX < this.maxX)) { - newX = this.x + (deltaX / 2); + if (!this.options.loop && (newY > 0 || newY < this.maxY)) { + newY = this.y + (deltaY / 2); } if (!this.thresholdExceeded && dist >= this.snapThreshold) { @@ -371,7 +371,7 @@ var VerticalSwipeView = (function (window, document) { newX = this.x + (deltaX / 2); }*/ - this.__pos(newX); + this.__pos(newY); }, __end: function (e) { @@ -391,7 +391,7 @@ var VerticalSwipeView = (function (window, document) { point = e.changedTouches.item(i); } if (!point) { - this.__pos(-this.page * this.pageWidth); + this.__pos(-this.page * this.pageHeight); this.initiated = false; return; } @@ -400,14 +400,14 @@ var VerticalSwipeView = (function (window, document) { point = e; } - var dist = Math.abs(point.pageX - this.startX); + var dist = Math.abs(point.pageY - this.startY); this.initiated = false; if (!this.moved) return; - if (!this.options.loop && (this.x > 0 || this.x < this.maxX)) { + if (!this.options.loop && (this.y > 0 || this.y < this.maxY)) { dist = 0; this.__event('movein'); } @@ -415,7 +415,7 @@ var VerticalSwipeView = (function (window, document) { // Check if we exceeded the snap threshold if (dist < this.snapThreshold) { this.slider.style[transitionDuration] = Math.floor(300 * dist / this.snapThreshold) + 'ms'; - this.__pos(-this.page * this.pageWidth); + this.__pos(-this.page * this.pageHeight); return; } @@ -430,24 +430,24 @@ var VerticalSwipeView = (function (window, document) { this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/, ''); // Flip the page - if (this.directionX > 0) { - this.page = -Math.ceil(this.x / this.pageWidth); + if (this.directionY > 0) { + this.page = -Math.ceil(this.y / this.pageHeight); this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; this.pageIndex = this.pageIndex === 0 ? this.options.numberOfPages - 1 : this.pageIndex - 1; pageFlip = this.currentMasterPage - 1; pageFlip = pageFlip < 0 ? 2 : pageFlip; - this.masterPages[pageFlip].style.left = this.page * 100 - 100 + '%'; + this.masterPages[pageFlip].style.top = this.page * 100 - 100 + '%'; pageFlipIndex = this.page - 1; } else { - this.page = -Math.floor(this.x / this.pageWidth); + this.page = -Math.floor(this.y / this.pageHeight); this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; this.pageIndex = this.pageIndex == this.options.numberOfPages - 1 ? 0 : this.pageIndex + 1; pageFlip = this.currentMasterPage + 1; pageFlip = pageFlip > 2 ? 0 : pageFlip; - this.masterPages[pageFlip].style.left = this.page * 100 + 100 + '%'; + this.masterPages[pageFlip].style.top = this.page * 100 + 100 + '%'; pageFlipIndex = this.page + 1; } @@ -463,19 +463,19 @@ var VerticalSwipeView = (function (window, document) { pageFlipIndex = pageFlipIndex - Math.floor(pageFlipIndex / this.options.numberOfPages) * this.options.numberOfPages; this.masterPages[pageFlip].dataset.upcomingPageIndex = pageFlipIndex; // Index to be loaded in the newly flipped page - newX = -this.page * this.pageWidth; + newY = -this.page * this.pageHeight; - this.slider.style[transitionDuration] = Math.floor(500 * Math.abs(this.x - newX) / this.pageWidth) + 'ms'; + this.slider.style[transitionDuration] = Math.floor(500 * Math.abs(this.y - newY) / this.pageHeight) + 'ms'; // Hide the next page if we decided to disable looping if (!this.options.loop) { - this.masterPages[pageFlip].style.visibility = newX === 0 || newX == this.maxX ? 'hidden' : ''; + this.masterPages[pageFlip].style.visibility = newY === 0 || newY == this.maxY ? 'hidden' : ''; } - if (this.x == newX) { + if (this.y == newY) { this.__flip(); // If we swiped all the way long to the next page (extremely rare but still) } else { - this.__pos(newX); + this.__pos(newY); if (this.options.hastyPageFlip) this.__flip(); } }, From 200dd6a4187a4fe81c471e067ec08a0035ccd071 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Tue, 25 Jun 2013 14:51:58 +0200 Subject: [PATCH 16/61] wip gallery4 demo --- demo/gallery4/index.html | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/demo/gallery4/index.html b/demo/gallery4/index.html index 77526be..2785d69 100644 --- a/demo/gallery4/index.html +++ b/demo/gallery4/index.html @@ -12,16 +12,6 @@
- + + + + +
+
+
+
+
+ + + + diff --git a/demo/gallery3/infinitegraphset.js b/demo/gallery3/infinitegraphset.js new file mode 100644 index 0000000..e9ddffe --- /dev/null +++ b/demo/gallery3/infinitegraphset.js @@ -0,0 +1,66 @@ +/* + * infinitegraphset.js + */ +(function (win, doc) { + + function InfiniteGraphSet(id, dataO) { + var gallery = new SwipeView(id, { + hastyPageFlip:true, + numberOfPages: dataO.length + }), i, page; + + function genImgs(container, page, d) { + var img, div; + for(var i=0; i< 5; i++) { + div = doc.createElement('div'); + div.className = 'container'; + img = doc.createElement('img'); + img.className = 'loading'; + img.src = d.get(page).imgs[i]; + img.width = d.get(page).width; + img.height = d.get(page).height; + div.style.width = d.get(page).width + "px"; + div.style.height = d.get(page).height + "px"; + img.onload = function () { this.className = ''; } + div.appendChild(img); + container.appendChild(div); + } + } + + for(i=0; i<3; i++) { + page = i==0 ? dataO.length-1 : i-1; + div = doc.createElement('div'); + div.className = 'set-container'; + genImgs(div, page, dataO); + gallery.masterPages[i].appendChild(div); + } + + function setImg(el, src) { + el.className = 'loading'; + el.src = src; + el.onload = function () { this.className = ''; } + } + + gallery.onFlip(function () { + var el, + upcoming, + i; + + for (i=0; i<3; i++) { + upcoming = gallery.masterPages[i].dataset.upcomingPageIndex; + + if (upcoming != gallery.masterPages[i].dataset.pageIndex) { + els = gallery.masterPages[i].querySelectorAll('img'); + setImg(els[0], dataO.get(upcoming).imgs[0]); + setImg(els[1], dataO.get(upcoming).imgs[1]); + setImg(els[2], dataO.get(upcoming).imgs[2]); + setImg(els[3], dataO.get(upcoming).imgs[3]); + setImg(els[4], dataO.get(upcoming).imgs[4]); + } + } + }); + return gallery; + } + + win.InfiniteGraphSet = InfiniteGraphSet; +})(window, window.document); diff --git a/demo/gallery3/style.css b/demo/gallery3/style.css new file mode 100644 index 0000000..8f9b852 --- /dev/null +++ b/demo/gallery3/style.css @@ -0,0 +1,83 @@ +html, body { height:100%; } +body { + padding:0; + margin:0; + background:#333; + -webkit-user-select:none; + -moz-user-select:none; + -ms-user-select:none; + -o-user-select:none; + user-select:none; + -webkit-text-size-adjust:none; + -moz-text-size-adjust:none; + -ms-text-size-adjust:none; + -o-text-size-adjust:none; + text-size-adjust:none; + color:#eee; + font-family:helvetica; + font-size:12px; +} + +.wrapper { + width:1024px; + min-width:320px; + height:145px; + margin:10px auto; + border: 5px solid rgb(43, 38, 38); +} + +.swipeview-slider > div { + position:relative; + display:-webkit-box; + display:-moz-box; + display:-ms-box; + display:-o-box; + display:box; + -webkit-box-orient:vertical; + -moz-box-orient:vertical; + -ms-box-orient:vertical; + -o-box-orient:vertical; + box-orient:vertical; + -webkit-box-pack:center; + -moz-box-pack:center; + -ms-box-pack:center; + -o-box-pack:center; + box-pack:center; + -webkit-box-align:center; + -mox-box-align:center; + -ms-box-align:center; + -o-box-align:center; + box-align:center; + overflow:hidden; +} + +.swipeview-slider img { + display:block; + -webkit-transition-duration:.4s; + -moz-transition-duration:.4s; + -ms-transition-duration:.4s; + -o-transition-duration:.4s; + transition-duration:.4s; + -webkit-transition-property:opacity; + -moz-transition-property:opacity; + -ms-transition-property:opacity; + -o-transition-property:opacity; + transition-property:opacity; + opacity:1; + pointer-events:none; + visibility:visible; +} + +.swipeview-slider .set-container { + margin:auto; +} + +.swipeview-slider .container { + background: rgb(197, 197, 197); + float: left; + margin: 0 5px; +} + +.swipeview-slider img.loading { + visibility:hidden; +} From 4a013975cfc018595f2aefbf61668f3aec590ebe Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Tue, 25 Jun 2013 15:02:43 +0200 Subject: [PATCH 18/61] oops --- demo/gallery4/index.html | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/demo/gallery4/index.html b/demo/gallery4/index.html index 2785d69..c867ac3 100644 --- a/demo/gallery4/index.html +++ b/demo/gallery4/index.html @@ -53,7 +53,7 @@ } ]; -gallery = new VerticalSwipeView('#wrapper', { numberOfPages: slides.length }); +gallery = new VerticalSwipeView('#wrapper', { numberOfPages: slides.length, hastyPageFlip:true }); // Load initial data for (i=0; i<3; i++) { @@ -86,15 +86,6 @@ }); -gallery.onMoveOut(function () { - gallery.masterPages[gallery.currentMasterPage].className = gallery.masterPages[gallery.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/, ''); -}); - -gallery.onMoveIn(function () { - var className = gallery.masterPages[gallery.currentMasterPage].className; - /(^|\s)swipeview-active(\s|$)/.test(className) || (gallery.masterPages[gallery.currentMasterPage].className = !className ? 'swipeview-active' : className + ' swipeview-active'); -}); - From ee0107978a867f0c16f5cb7a5cb7afce8eb9e249 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Tue, 25 Jun 2013 15:06:34 +0200 Subject: [PATCH 19/61] re oops --- demo/gallery4/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/demo/gallery4/index.html b/demo/gallery4/index.html index c867ac3..1553e51 100644 --- a/demo/gallery4/index.html +++ b/demo/gallery4/index.html @@ -14,7 +14,6 @@
+ + + + + +
+ + + + diff --git a/demo/gallery5/infinitegraphset.js b/demo/gallery5/infinitegraphset.js new file mode 100644 index 0000000..e9ddffe --- /dev/null +++ b/demo/gallery5/infinitegraphset.js @@ -0,0 +1,66 @@ +/* + * infinitegraphset.js + */ +(function (win, doc) { + + function InfiniteGraphSet(id, dataO) { + var gallery = new SwipeView(id, { + hastyPageFlip:true, + numberOfPages: dataO.length + }), i, page; + + function genImgs(container, page, d) { + var img, div; + for(var i=0; i< 5; i++) { + div = doc.createElement('div'); + div.className = 'container'; + img = doc.createElement('img'); + img.className = 'loading'; + img.src = d.get(page).imgs[i]; + img.width = d.get(page).width; + img.height = d.get(page).height; + div.style.width = d.get(page).width + "px"; + div.style.height = d.get(page).height + "px"; + img.onload = function () { this.className = ''; } + div.appendChild(img); + container.appendChild(div); + } + } + + for(i=0; i<3; i++) { + page = i==0 ? dataO.length-1 : i-1; + div = doc.createElement('div'); + div.className = 'set-container'; + genImgs(div, page, dataO); + gallery.masterPages[i].appendChild(div); + } + + function setImg(el, src) { + el.className = 'loading'; + el.src = src; + el.onload = function () { this.className = ''; } + } + + gallery.onFlip(function () { + var el, + upcoming, + i; + + for (i=0; i<3; i++) { + upcoming = gallery.masterPages[i].dataset.upcomingPageIndex; + + if (upcoming != gallery.masterPages[i].dataset.pageIndex) { + els = gallery.masterPages[i].querySelectorAll('img'); + setImg(els[0], dataO.get(upcoming).imgs[0]); + setImg(els[1], dataO.get(upcoming).imgs[1]); + setImg(els[2], dataO.get(upcoming).imgs[2]); + setImg(els[3], dataO.get(upcoming).imgs[3]); + setImg(els[4], dataO.get(upcoming).imgs[4]); + } + } + }); + return gallery; + } + + win.InfiniteGraphSet = InfiniteGraphSet; +})(window, window.document); diff --git a/demo/gallery5/style.css b/demo/gallery5/style.css new file mode 100644 index 0000000..9efea9b --- /dev/null +++ b/demo/gallery5/style.css @@ -0,0 +1,89 @@ +html, body { height:100%; } +body { + padding:0; + margin:0; + background:#333; + -webkit-user-select:none; + -moz-user-select:none; + -ms-user-select:none; + -o-user-select:none; + user-select:none; + -webkit-text-size-adjust:none; + -moz-text-size-adjust:none; + -ms-text-size-adjust:none; + -o-text-size-adjust:none; + text-size-adjust:none; + color:#eee; + font-family:helvetica; + font-size:12px; +} + +#wrapper { + width:100%; + height:100%; + position:relative; +} + +.wrapper { + width:1024px; + min-width:320px; + height:145px; + margin:10px auto; + border: 5px solid rgb(43, 38, 38); +} + +.swipeview-slider > div , .vertical-swipeview-slider > div{ + position:relative; + display:-webkit-box; + display:-moz-box; + display:-ms-box; + display:-o-box; + display:box; + -webkit-box-orient:vertical; + -moz-box-orient:vertical; + -ms-box-orient:vertical; + -o-box-orient:vertical; + box-orient:vertical; + -webkit-box-pack:center; + -moz-box-pack:center; + -ms-box-pack:center; + -o-box-pack:center; + box-pack:center; + -webkit-box-align:center; + -mox-box-align:center; + -ms-box-align:center; + -o-box-align:center; + box-align:center; + overflow:hidden; +} + +.swipeview-slider img { + display:block; + -webkit-transition-duration:.4s; + -moz-transition-duration:.4s; + -ms-transition-duration:.4s; + -o-transition-duration:.4s; + transition-duration:.4s; + -webkit-transition-property:opacity; + -moz-transition-property:opacity; + -ms-transition-property:opacity; + -o-transition-property:opacity; + transition-property:opacity; + opacity:1; + pointer-events:none; + visibility:visible; +} + +.swipeview-slider .set-container { + margin:auto; +} + +.swipeview-slider .container { + background: rgb(197, 197, 197); + float: left; + margin: 0 5px; +} + +.swipeview-slider img.loading { + visibility:hidden; +} From caeea2290ac11a9640906454582b1026a1c180fd Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Tue, 25 Jun 2013 17:26:37 +0200 Subject: [PATCH 22/61] wip demo5 --- demo/gallery5/index.html | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/demo/gallery5/index.html b/demo/gallery5/index.html index 5b24e2d..11e5e2c 100644 --- a/demo/gallery5/index.html +++ b/demo/gallery5/index.html @@ -79,7 +79,7 @@ } ]; -gallery = new VerticalSwipeView('#wrapper', { numberOfPages: slides.length }); +gallery = new VerticalSwipeView('#wrapper', { numberOfPages: slides.length, hastyPageFlip:true}); // Load initial data for (i=0; i<3; i++) { @@ -115,23 +115,20 @@ upcoming = gallery.masterPages[i].dataset.upcomingPageIndex; if (upcoming != gallery.masterPages[i].dataset.pageIndex) { - el = gallery.masterPages[i].querySelector('#wrap1-' + i); + els = gallery.masterPages[i].querySelectorAll('.wrapper'); + console.log(els); gallery.masterPages[i].swipeview1.destroy(); - el.innerHTML = ""; - gallery.masterPages[i].swipeview1 = null; - gallery.masterPages[i].swipeview1 = InfiniteGraphSet(el, genData(100)); - - el = gallery.masterPages[i].querySelector('#wrap2-' + i); gallery.masterPages[i].swipeview2.destroy(); - el.innerHTML = ""; - gallery.masterPages[i].swipeview2 = null; - gallery.masterPages[i].swipeview2 = InfiniteGraphSet(el, genData(100)); - - el = gallery.masterPages[i].querySelector('#wrap3-' + i); gallery.masterPages[i].swipeview3.destroy(); - el.innerHTML = ""; + els[0].innerHTML = ""; + els[1].innerHTML = ""; + els[2].innerHTML = ""; + gallery.masterPages[i].swipeview1 = null; + gallery.masterPages[i].swipeview2 = null; gallery.masterPages[i].swipeview3 = null; - gallery.masterPages[i].swipeview3 = InfiniteGraphSet(el, genData(100)); + gallery.masterPages[i].swipeview1 = InfiniteGraphSet(els[0], genData(100)); + gallery.masterPages[i].swipeview2 = InfiniteGraphSet(els[1], genData(100)); + gallery.masterPages[i].swipeview3 = InfiniteGraphSet(els[2], genData(100)); } } From 2ede772624ee481866caa91847e8d9148224351d Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Wed, 26 Jun 2013 14:51:44 +0200 Subject: [PATCH 23/61] style+ add a set of graph --- demo/gallery5/index.html | 50 +++++++++++----------------------------- demo/gallery5/style.css | 4 ++-- 2 files changed, 16 insertions(+), 38 deletions(-) diff --git a/demo/gallery5/index.html b/demo/gallery5/index.html index 11e5e2c..ba29849 100644 --- a/demo/gallery5/index.html +++ b/demo/gallery5/index.html @@ -45,45 +45,13 @@ var gallery, el, i, - page, - slides = [ - { - img: 'images/pic01.jpg', - width: 300, - height: 213 - }, - { - img: 'images/pic02.jpg', - width: 300, - height: 164 - }, - { - img: 'images/pic03.jpg', - width: 300, - height: 213 - }, - { - img: 'images/pic04.jpg', - width: 147, - height: 220 - }, - { - img: 'images/pic05.jpg', - width: 300, - height: 213 - }, - { - img: 'images/pic06.jpg', - width: 165, - height: 220 - } - ]; + page; -gallery = new VerticalSwipeView('#wrapper', { numberOfPages: slides.length, hastyPageFlip:true}); +gallery = new VerticalSwipeView('#wrapper', { numberOfPages: 100, hastyPageFlip:true}); // Load initial data for (i=0; i<3; i++) { - page = i==0 ? slides.length-1 : i-1; + page = i==0 ? 100-1 : i-1; el = document.createElement('div'); el.className = 'wrapper'; el.id = "wrap1-" + i; @@ -105,6 +73,13 @@ gallery.masterPages[i].swipeview3 = InfiniteGraphSet(el, genData(100)); gallery.masterPages[i].appendChild(el); + el = document.createElement('div'); + el.className = 'wrapper'; + el.id = "wrap4-" + i; + + gallery.masterPages[i].swipeview4 = InfiniteGraphSet(el, genData(100)); + gallery.masterPages[i].appendChild(el); + } gallery.onFlip(function () { @@ -116,19 +91,22 @@ if (upcoming != gallery.masterPages[i].dataset.pageIndex) { els = gallery.masterPages[i].querySelectorAll('.wrapper'); - console.log(els); gallery.masterPages[i].swipeview1.destroy(); gallery.masterPages[i].swipeview2.destroy(); gallery.masterPages[i].swipeview3.destroy(); + gallery.masterPages[i].swipeview4.destroy(); els[0].innerHTML = ""; els[1].innerHTML = ""; els[2].innerHTML = ""; + els[3].innerHTML = ""; gallery.masterPages[i].swipeview1 = null; gallery.masterPages[i].swipeview2 = null; gallery.masterPages[i].swipeview3 = null; + gallery.masterPages[i].swipeview4 = null; gallery.masterPages[i].swipeview1 = InfiniteGraphSet(els[0], genData(100)); gallery.masterPages[i].swipeview2 = InfiniteGraphSet(els[1], genData(100)); gallery.masterPages[i].swipeview3 = InfiniteGraphSet(els[2], genData(100)); + gallery.masterPages[i].swipeview4 = InfiniteGraphSet(els[3], genData(100)); } } diff --git a/demo/gallery5/style.css b/demo/gallery5/style.css index 9efea9b..8a119db 100644 --- a/demo/gallery5/style.css +++ b/demo/gallery5/style.css @@ -28,8 +28,8 @@ body { width:1024px; min-width:320px; height:145px; - margin:10px auto; - border: 5px solid rgb(43, 38, 38); + margin:20px auto; + background-color: rgb(43, 38, 38); } .swipeview-slider > div , .vertical-swipeview-slider > div{ From c91e827ae587ff65338b18c4fb8d862e93db6178 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Wed, 26 Jun 2013 14:51:44 +0200 Subject: [PATCH 24/61] style+ add a set of graph --- demo/gallery5/index.html | 50 +++++++++++----------------------------- demo/gallery5/style.css | 4 ++-- 2 files changed, 16 insertions(+), 38 deletions(-) diff --git a/demo/gallery5/index.html b/demo/gallery5/index.html index 11e5e2c..ba29849 100644 --- a/demo/gallery5/index.html +++ b/demo/gallery5/index.html @@ -45,45 +45,13 @@ var gallery, el, i, - page, - slides = [ - { - img: 'images/pic01.jpg', - width: 300, - height: 213 - }, - { - img: 'images/pic02.jpg', - width: 300, - height: 164 - }, - { - img: 'images/pic03.jpg', - width: 300, - height: 213 - }, - { - img: 'images/pic04.jpg', - width: 147, - height: 220 - }, - { - img: 'images/pic05.jpg', - width: 300, - height: 213 - }, - { - img: 'images/pic06.jpg', - width: 165, - height: 220 - } - ]; + page; -gallery = new VerticalSwipeView('#wrapper', { numberOfPages: slides.length, hastyPageFlip:true}); +gallery = new VerticalSwipeView('#wrapper', { numberOfPages: 100, hastyPageFlip:true}); // Load initial data for (i=0; i<3; i++) { - page = i==0 ? slides.length-1 : i-1; + page = i==0 ? 100-1 : i-1; el = document.createElement('div'); el.className = 'wrapper'; el.id = "wrap1-" + i; @@ -105,6 +73,13 @@ gallery.masterPages[i].swipeview3 = InfiniteGraphSet(el, genData(100)); gallery.masterPages[i].appendChild(el); + el = document.createElement('div'); + el.className = 'wrapper'; + el.id = "wrap4-" + i; + + gallery.masterPages[i].swipeview4 = InfiniteGraphSet(el, genData(100)); + gallery.masterPages[i].appendChild(el); + } gallery.onFlip(function () { @@ -116,19 +91,22 @@ if (upcoming != gallery.masterPages[i].dataset.pageIndex) { els = gallery.masterPages[i].querySelectorAll('.wrapper'); - console.log(els); gallery.masterPages[i].swipeview1.destroy(); gallery.masterPages[i].swipeview2.destroy(); gallery.masterPages[i].swipeview3.destroy(); + gallery.masterPages[i].swipeview4.destroy(); els[0].innerHTML = ""; els[1].innerHTML = ""; els[2].innerHTML = ""; + els[3].innerHTML = ""; gallery.masterPages[i].swipeview1 = null; gallery.masterPages[i].swipeview2 = null; gallery.masterPages[i].swipeview3 = null; + gallery.masterPages[i].swipeview4 = null; gallery.masterPages[i].swipeview1 = InfiniteGraphSet(els[0], genData(100)); gallery.masterPages[i].swipeview2 = InfiniteGraphSet(els[1], genData(100)); gallery.masterPages[i].swipeview3 = InfiniteGraphSet(els[2], genData(100)); + gallery.masterPages[i].swipeview4 = InfiniteGraphSet(els[3], genData(100)); } } diff --git a/demo/gallery5/style.css b/demo/gallery5/style.css index 9efea9b..8a119db 100644 --- a/demo/gallery5/style.css +++ b/demo/gallery5/style.css @@ -28,8 +28,8 @@ body { width:1024px; min-width:320px; height:145px; - margin:10px auto; - border: 5px solid rgb(43, 38, 38); + margin:20px auto; + background-color: rgb(43, 38, 38); } .swipeview-slider > div , .vertical-swipeview-slider > div{ From 639b8740477fd934fd2e3c50a474975754e47d8e Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Wed, 26 Jun 2013 16:57:07 +0200 Subject: [PATCH 25/61] add reset method to allow reuse of a SwipeView --- src/swipeview.js | 11 +++++++++-- src/verticalswipeview.js | 8 +++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/swipeview.js b/src/swipeview.js index 9e6f662..1b4e571 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -63,7 +63,7 @@ var SwipeView = (function (window, document) { pageIndex; this.wrapper = typeof el == 'string' ? document.querySelector(el) : el; - this.id = this.wrapper.id || ++uuid; + this.id = this.wrapper.id || 'sw-id' + (++uuid); this.options = { text: null, numberOfPages: 3, @@ -124,7 +124,13 @@ var SwipeView = (function (window, document) { page: 0, pageIndex: 0, customEvents: [], - + + reset : function (pageCount) { + this.goToPage(0); + this.updatePageCount(); + this.refreshSize(pageCount); + }, + onFlip: function (fn) { this.wrapper.addEventListener(this.id + 'swipeview-flip', fn, false); this.customEvents.push(['flip', fn]); @@ -164,6 +170,7 @@ var SwipeView = (function (window, document) { }, refreshSize: function () { + // FIXME, get container width/height if wrapper width/height equals 0 this.wrapperWidth = this.wrapper.clientWidth === 0 ? 1024 : this.wrapper.clientWidth; this.wrapperHeight = this.wrapper.clientHeight === 0 ? 145 : this.wrapper.clientHeight; this.pageWidth = this.wrapperWidth; diff --git a/src/verticalswipeview.js b/src/verticalswipeview.js index db169ad..22399e7 100644 --- a/src/verticalswipeview.js +++ b/src/verticalswipeview.js @@ -125,7 +125,13 @@ var VerticalSwipeView = (function (window, document) { page: 0, pageIndex: 0, customEvents: [], - + + reset : function (pageCount) { + this.goToPage(0); + this.updatePageCount(pageCount); + this.refreshSize(); + }, + onFlip: function (fn) { this.wrapper.addEventListener(this.id + 'vertical-swipeview-flip', fn, false); this.customEvents.push(['flip', fn]); From 6ea5bd3c7b9dcc2c3a3e9e6a0ae97c658406e3b4 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Wed, 26 Jun 2013 16:58:30 +0200 Subject: [PATCH 26/61] wip vertical/horizontal infinite scroll with reusing swipeviews --- demo/gallery6/imgs/1.png | Bin 0 -> 3597 bytes demo/gallery6/imgs/10.png | Bin 0 -> 11155 bytes demo/gallery6/imgs/11.png | Bin 0 -> 4436 bytes demo/gallery6/imgs/12.png | Bin 0 -> 9914 bytes demo/gallery6/imgs/2.png | Bin 0 -> 8627 bytes demo/gallery6/imgs/3.png | Bin 0 -> 9913 bytes demo/gallery6/imgs/4.png | Bin 0 -> 6120 bytes demo/gallery6/imgs/5.png | Bin 0 -> 8915 bytes demo/gallery6/imgs/6.png | Bin 0 -> 10941 bytes demo/gallery6/imgs/7.png | Bin 0 -> 6251 bytes demo/gallery6/imgs/8.png | Bin 0 -> 11073 bytes demo/gallery6/imgs/9.png | Bin 0 -> 10888 bytes demo/gallery6/index.html | 138 ++++++++++++++++++++++++++++++ demo/gallery6/infinitegraphset.js | 86 +++++++++++++++++++ demo/gallery6/style.css | 89 +++++++++++++++++++ 15 files changed, 313 insertions(+) create mode 100644 demo/gallery6/imgs/1.png create mode 100644 demo/gallery6/imgs/10.png create mode 100644 demo/gallery6/imgs/11.png create mode 100644 demo/gallery6/imgs/12.png create mode 100644 demo/gallery6/imgs/2.png create mode 100644 demo/gallery6/imgs/3.png create mode 100644 demo/gallery6/imgs/4.png create mode 100644 demo/gallery6/imgs/5.png create mode 100644 demo/gallery6/imgs/6.png create mode 100644 demo/gallery6/imgs/7.png create mode 100644 demo/gallery6/imgs/8.png create mode 100644 demo/gallery6/imgs/9.png create mode 100644 demo/gallery6/index.html create mode 100644 demo/gallery6/infinitegraphset.js create mode 100644 demo/gallery6/style.css diff --git a/demo/gallery6/imgs/1.png b/demo/gallery6/imgs/1.png new file mode 100644 index 0000000000000000000000000000000000000000..d167e8d447348a72d8627a23fa8de755881791cf GIT binary patch literal 3597 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 literal 0 HcmV?d00001 diff --git a/demo/gallery6/imgs/11.png b/demo/gallery6/imgs/11.png new file mode 100644 index 0000000000000000000000000000000000000000..4a895e9306e513a4a83d673ec94d246b60d2268c GIT binary patch literal 4436 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 Mu89u*?$gl!0kv>z#Q*>R literal 0 HcmV?d00001 diff --git a/demo/gallery6/imgs/12.png b/demo/gallery6/imgs/12.png new file mode 100644 index 0000000000000000000000000000000000000000..f67b51b9361cfb6d16332822c4ea93644b7f7e21 GIT binary patch literal 9914 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 literal 0 HcmV?d00001 diff --git a/demo/gallery6/imgs/2.png b/demo/gallery6/imgs/2.png new file mode 100644 index 0000000000000000000000000000000000000000..46b1fb8117486cae1a745c74c92f3cae3ea1aa6b GIT binary patch literal 8627 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 FV1mn~lU4u# literal 0 HcmV?d00001 diff --git a/demo/gallery6/imgs/3.png b/demo/gallery6/imgs/3.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e90e5ea838f550edf5ae1c06f93fb4cfcd99ad GIT binary patch literal 9913 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 rA`A2(Q%5!<15g44IvIH#oId>vp<(%tZQ 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 literal 0 HcmV?d00001 diff --git a/demo/gallery6/imgs/6.png b/demo/gallery6/imgs/6.png new file mode 100644 index 0000000000000000000000000000000000000000..55114b694cb6c401a6fb9054b1bf9c5686a6d741 GIT binary patch literal 10941 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

K&>7MbPCQ9#DLU4YQ$wp$ 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 literal 0 HcmV?d00001 diff --git a/demo/gallery6/imgs/7.png b/demo/gallery6/imgs/7.png new file mode 100644 index 0000000000000000000000000000000000000000..8fe30ca6434655151295d35b925b56b40eb7e722 GIT binary patch literal 6251 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 Ml2-+m$$km`Kir`*PXGV_ literal 0 HcmV?d00001 diff --git a/demo/gallery6/imgs/8.png b/demo/gallery6/imgs/8.png new file mode 100644 index 0000000000000000000000000000000000000000..e57c754d6cfd60f13b5c94d745557bf12bcc4f1f GIT binary patch literal 11073 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 Hu0mjfgoH|E literal 0 HcmV?d00001 diff --git a/demo/gallery6/imgs/9.png b/demo/gallery6/imgs/9.png new file mode 100644 index 0000000000000000000000000000000000000000..0362b54b57e24776272b92ec0163d86a727f18ae GIT binary patch literal 10888 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 eBd^00$o~h|I>I!iU1q!h0000 + + + + + + + SwipeView + + + + + + + +

+ + + + diff --git a/demo/gallery6/infinitegraphset.js b/demo/gallery6/infinitegraphset.js new file mode 100644 index 0000000..cc869bb --- /dev/null +++ b/demo/gallery6/infinitegraphset.js @@ -0,0 +1,86 @@ +/* + * infinitegraphset.js + */ +(function (win, doc) { + + function InfiniteGraphSet(id, dataO) { + var gallery = new SwipeView(id, { + hastyPageFlip:true, + numberOfPages: dataO.length + }), i, page, df = dataO; + + function genImgs(container, page, d) { + var img, div; + for(var i=0; i< 5; i++) { + div = doc.createElement('div'); + div.className = 'container'; + img = doc.createElement('img'); + img.className = 'loading'; + img.src = d.get(page).imgs[i]; + img.width = d.get(page).width; + img.height = d.get(page).height; + div.style.width = d.get(page).width + "px"; + div.style.height = d.get(page).height + "px"; + img.onload = function () { this.className = ''; } + div.appendChild(img); + container.appendChild(div); + } + } + + for(i=0; i<3; i++) { + page = i==0 ? df.length-1 : i-1; + div = doc.createElement('div'); + div.className = 'set-container'; + genImgs(div, page, df); + gallery.masterPages[i].appendChild(div); + } + + function setImg(el, src) { + el.className = 'loading'; + el.src = src; + el.onload = function () { this.className = ''; } + } + + function init(newdf) { + df = newdf; + var el, page, i; + for (i=0; i<3; i++) { + page = i==0 ? newdf.length-1 : i-1; + els = gallery.masterPages[i].querySelectorAll('img'); + setImg(els[0], newdf.get(page).imgs[0]); + setImg(els[1], newdf.get(page).imgs[1]); + setImg(els[2], newdf.get(page).imgs[2]); + setImg(els[3], newdf.get(page).imgs[3]); + setImg(els[4], newdf.get(page).imgs[4]); + } + } + + gallery.onFlip(function () { + var els, + upcoming, + i; + + for (i=0; i<3; i++) { + upcoming = gallery.masterPages[i].dataset.upcomingPageIndex; + + if (upcoming != gallery.masterPages[i].dataset.pageIndex) { + els = gallery.masterPages[i].querySelectorAll('img'); + setImg(els[0], df.get(upcoming).imgs[0]); + setImg(els[1], df.get(upcoming).imgs[1]); + setImg(els[2], df.get(upcoming).imgs[2]); + setImg(els[3], df.get(upcoming).imgs[3]); + setImg(els[4], df.get(upcoming).imgs[4]); + } + } + }); + return { + gallery: gallery, + reset:function (newdf) { + gallery.reset(); + init(newdf); + } + }; + } + + win.InfiniteGraphSet = InfiniteGraphSet; +})(window, window.document); diff --git a/demo/gallery6/style.css b/demo/gallery6/style.css new file mode 100644 index 0000000..8a119db --- /dev/null +++ b/demo/gallery6/style.css @@ -0,0 +1,89 @@ +html, body { height:100%; } +body { + padding:0; + margin:0; + background:#333; + -webkit-user-select:none; + -moz-user-select:none; + -ms-user-select:none; + -o-user-select:none; + user-select:none; + -webkit-text-size-adjust:none; + -moz-text-size-adjust:none; + -ms-text-size-adjust:none; + -o-text-size-adjust:none; + text-size-adjust:none; + color:#eee; + font-family:helvetica; + font-size:12px; +} + +#wrapper { + width:100%; + height:100%; + position:relative; +} + +.wrapper { + width:1024px; + min-width:320px; + height:145px; + margin:20px auto; + background-color: rgb(43, 38, 38); +} + +.swipeview-slider > div , .vertical-swipeview-slider > div{ + position:relative; + display:-webkit-box; + display:-moz-box; + display:-ms-box; + display:-o-box; + display:box; + -webkit-box-orient:vertical; + -moz-box-orient:vertical; + -ms-box-orient:vertical; + -o-box-orient:vertical; + box-orient:vertical; + -webkit-box-pack:center; + -moz-box-pack:center; + -ms-box-pack:center; + -o-box-pack:center; + box-pack:center; + -webkit-box-align:center; + -mox-box-align:center; + -ms-box-align:center; + -o-box-align:center; + box-align:center; + overflow:hidden; +} + +.swipeview-slider img { + display:block; + -webkit-transition-duration:.4s; + -moz-transition-duration:.4s; + -ms-transition-duration:.4s; + -o-transition-duration:.4s; + transition-duration:.4s; + -webkit-transition-property:opacity; + -moz-transition-property:opacity; + -ms-transition-property:opacity; + -o-transition-property:opacity; + transition-property:opacity; + opacity:1; + pointer-events:none; + visibility:visible; +} + +.swipeview-slider .set-container { + margin:auto; +} + +.swipeview-slider .container { + background: rgb(197, 197, 197); + float: left; + margin: 0 5px; +} + +.swipeview-slider img.loading { + visibility:hidden; +} From 6e290f58b9819e9102cdc982f72a4015c7a79de9 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Thu, 27 Jun 2013 15:51:07 +0200 Subject: [PATCH 27/61] fix mouse out issues --- src/swipeview.js | 5 ++++- src/verticalswipeview.js | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/swipeview.js b/src/swipeview.js index 1b4e571..d5f0034 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -259,8 +259,11 @@ var SwipeView = (function (window, document) { case moveEvent: this.__move(e); break; - case cancelEvent: case "mouseout": + if (!this.initiated) { break; } + else if ( e.toElement == document.childNodes[1]) { } + else if ( e.toElement != this.wrapper.parentNode ) { break; } + case cancelEvent: case endEvent: this.__end(e); break; diff --git a/src/verticalswipeview.js b/src/verticalswipeview.js index 22399e7..8a852b3 100644 --- a/src/verticalswipeview.js +++ b/src/verticalswipeview.js @@ -259,8 +259,11 @@ var VerticalSwipeView = (function (window, document) { case moveEvent: this.__move(e); break; - case cancelEvent: - case "mouseout": + case "mouseout": + if (!this.initiated) { break; } + else if ( e.toElement == document.childNodes[1]) { } + else if ( e.toElement != this.wrapper.parentNode ) { break; } + case cancelEvent: case endEvent: this.__end(e); break; From 6343c9b5f3c3cf3f97aa180ada69f6b4683b76ff Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Thu, 27 Jun 2013 15:51:07 +0200 Subject: [PATCH 28/61] fix mouse out issues --- src/swipeview.js | 5 ++++- src/verticalswipeview.js | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/swipeview.js b/src/swipeview.js index 1b4e571..d5f0034 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -259,8 +259,11 @@ var SwipeView = (function (window, document) { case moveEvent: this.__move(e); break; - case cancelEvent: case "mouseout": + if (!this.initiated) { break; } + else if ( e.toElement == document.childNodes[1]) { } + else if ( e.toElement != this.wrapper.parentNode ) { break; } + case cancelEvent: case endEvent: this.__end(e); break; diff --git a/src/verticalswipeview.js b/src/verticalswipeview.js index 22399e7..8a852b3 100644 --- a/src/verticalswipeview.js +++ b/src/verticalswipeview.js @@ -259,8 +259,11 @@ var VerticalSwipeView = (function (window, document) { case moveEvent: this.__move(e); break; - case cancelEvent: - case "mouseout": + case "mouseout": + if (!this.initiated) { break; } + else if ( e.toElement == document.childNodes[1]) { } + else if ( e.toElement != this.wrapper.parentNode ) { break; } + case cancelEvent: case endEvent: this.__end(e); break; From d6997723558291ee4044caee080af71e55cd97cf Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Mon, 1 Jul 2013 11:26:19 +0200 Subject: [PATCH 29/61] wip adding a vertical option in SwipeView rm VerticalSwipeView --- demo/gallery4/index.html | 4 +- demo/gallery5/index.html | 3 +- demo/gallery6/index.html | 3 +- demo/gallery7/index.html | 137 ++++++++ demo/gallery7/infinitegraphset.js | 86 +++++ demo/gallery7/style.css | 89 +++++ src/swipeview.js | 108 +++---- src/verticalswipeview.js | 521 ------------------------------ 8 files changed, 369 insertions(+), 582 deletions(-) create mode 100644 demo/gallery7/index.html create mode 100644 demo/gallery7/infinitegraphset.js create mode 100644 demo/gallery7/style.css delete mode 100644 src/verticalswipeview.js diff --git a/demo/gallery4/index.html b/demo/gallery4/index.html index 1553e51..8936ed2 100644 --- a/demo/gallery4/index.html +++ b/demo/gallery4/index.html @@ -7,7 +7,7 @@ SwipeView - + @@ -52,7 +52,7 @@ } ]; -gallery = new VerticalSwipeView('#wrapper', { numberOfPages: slides.length, hastyPageFlip:true }); +gallery = new SwipeView('#wrapper', { numberOfPages: slides.length, hastyPageFlip:true, vertical:true}); // Load initial data for (i=0; i<3; i++) { diff --git a/demo/gallery5/index.html b/demo/gallery5/index.html index ba29849..9a1cb2d 100644 --- a/demo/gallery5/index.html +++ b/demo/gallery5/index.html @@ -7,7 +7,6 @@ SwipeView - @@ -47,7 +46,7 @@ i, page; -gallery = new VerticalSwipeView('#wrapper', { numberOfPages: 100, hastyPageFlip:true}); +gallery = new SwipeView('#wrapper', { numberOfPages: 100, hastyPageFlip:true, vertical:true}); // Load initial data for (i=0; i<3; i++) { diff --git a/demo/gallery6/index.html b/demo/gallery6/index.html index 77ec427..287c2d1 100644 --- a/demo/gallery6/index.html +++ b/demo/gallery6/index.html @@ -7,7 +7,6 @@ SwipeView - @@ -70,7 +69,7 @@ i, page; -gallery = new VerticalSwipeView('#wrapper', { numberOfPages: 100, hastyPageFlip:true}); +gallery = new SwipeView('#wrapper', { numberOfPages: 100, hastyPageFlip:true, vertical:true}); // Load initial data for (i=0; i<3; i++) { diff --git a/demo/gallery7/index.html b/demo/gallery7/index.html new file mode 100644 index 0000000..6170433 --- /dev/null +++ b/demo/gallery7/index.html @@ -0,0 +1,137 @@ + + + + + + + + SwipeView + + + + + + +
+ + + + diff --git a/demo/gallery7/infinitegraphset.js b/demo/gallery7/infinitegraphset.js new file mode 100644 index 0000000..cc869bb --- /dev/null +++ b/demo/gallery7/infinitegraphset.js @@ -0,0 +1,86 @@ +/* + * infinitegraphset.js + */ +(function (win, doc) { + + function InfiniteGraphSet(id, dataO) { + var gallery = new SwipeView(id, { + hastyPageFlip:true, + numberOfPages: dataO.length + }), i, page, df = dataO; + + function genImgs(container, page, d) { + var img, div; + for(var i=0; i< 5; i++) { + div = doc.createElement('div'); + div.className = 'container'; + img = doc.createElement('img'); + img.className = 'loading'; + img.src = d.get(page).imgs[i]; + img.width = d.get(page).width; + img.height = d.get(page).height; + div.style.width = d.get(page).width + "px"; + div.style.height = d.get(page).height + "px"; + img.onload = function () { this.className = ''; } + div.appendChild(img); + container.appendChild(div); + } + } + + for(i=0; i<3; i++) { + page = i==0 ? df.length-1 : i-1; + div = doc.createElement('div'); + div.className = 'set-container'; + genImgs(div, page, df); + gallery.masterPages[i].appendChild(div); + } + + function setImg(el, src) { + el.className = 'loading'; + el.src = src; + el.onload = function () { this.className = ''; } + } + + function init(newdf) { + df = newdf; + var el, page, i; + for (i=0; i<3; i++) { + page = i==0 ? newdf.length-1 : i-1; + els = gallery.masterPages[i].querySelectorAll('img'); + setImg(els[0], newdf.get(page).imgs[0]); + setImg(els[1], newdf.get(page).imgs[1]); + setImg(els[2], newdf.get(page).imgs[2]); + setImg(els[3], newdf.get(page).imgs[3]); + setImg(els[4], newdf.get(page).imgs[4]); + } + } + + gallery.onFlip(function () { + var els, + upcoming, + i; + + for (i=0; i<3; i++) { + upcoming = gallery.masterPages[i].dataset.upcomingPageIndex; + + if (upcoming != gallery.masterPages[i].dataset.pageIndex) { + els = gallery.masterPages[i].querySelectorAll('img'); + setImg(els[0], df.get(upcoming).imgs[0]); + setImg(els[1], df.get(upcoming).imgs[1]); + setImg(els[2], df.get(upcoming).imgs[2]); + setImg(els[3], df.get(upcoming).imgs[3]); + setImg(els[4], df.get(upcoming).imgs[4]); + } + } + }); + return { + gallery: gallery, + reset:function (newdf) { + gallery.reset(); + init(newdf); + } + }; + } + + win.InfiniteGraphSet = InfiniteGraphSet; +})(window, window.document); diff --git a/demo/gallery7/style.css b/demo/gallery7/style.css new file mode 100644 index 0000000..8a119db --- /dev/null +++ b/demo/gallery7/style.css @@ -0,0 +1,89 @@ +html, body { height:100%; } +body { + padding:0; + margin:0; + background:#333; + -webkit-user-select:none; + -moz-user-select:none; + -ms-user-select:none; + -o-user-select:none; + user-select:none; + -webkit-text-size-adjust:none; + -moz-text-size-adjust:none; + -ms-text-size-adjust:none; + -o-text-size-adjust:none; + text-size-adjust:none; + color:#eee; + font-family:helvetica; + font-size:12px; +} + +#wrapper { + width:100%; + height:100%; + position:relative; +} + +.wrapper { + width:1024px; + min-width:320px; + height:145px; + margin:20px auto; + background-color: rgb(43, 38, 38); +} + +.swipeview-slider > div , .vertical-swipeview-slider > div{ + position:relative; + display:-webkit-box; + display:-moz-box; + display:-ms-box; + display:-o-box; + display:box; + -webkit-box-orient:vertical; + -moz-box-orient:vertical; + -ms-box-orient:vertical; + -o-box-orient:vertical; + box-orient:vertical; + -webkit-box-pack:center; + -moz-box-pack:center; + -ms-box-pack:center; + -o-box-pack:center; + box-pack:center; + -webkit-box-align:center; + -mox-box-align:center; + -ms-box-align:center; + -o-box-align:center; + box-align:center; + overflow:hidden; +} + +.swipeview-slider img { + display:block; + -webkit-transition-duration:.4s; + -moz-transition-duration:.4s; + -ms-transition-duration:.4s; + -o-transition-duration:.4s; + transition-duration:.4s; + -webkit-transition-property:opacity; + -moz-transition-property:opacity; + -ms-transition-property:opacity; + -o-transition-property:opacity; + transition-property:opacity; + opacity:1; + pointer-events:none; + visibility:visible; +} + +.swipeview-slider .set-container { + margin:auto; +} + +.swipeview-slider .container { + background: rgb(197, 197, 197); + float: left; + margin: 0 5px; +} + +.swipeview-slider img.loading { + visibility:hidden; +} diff --git a/src/swipeview.js b/src/swipeview.js index d5f0034..215a2f0 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -69,6 +69,7 @@ var SwipeView = (function (window, document) { numberOfPages: 3, snapThreshold: null, hastyPageFlip: false, + vertical: false, loop: true }; @@ -90,7 +91,7 @@ var SwipeView = (function (window, document) { for (i=-1; i<2; i++) { div = document.createElement('div'); - div.style.cssText = cssVendor + 'transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;left:' + i*100 + '%'; + div.style.cssText = cssVendor + 'transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;' + (this.options.vertical ? 'top' : 'left') + ':' + i*100 + '%'; if (!div.dataset) div.dataset = {}; pageIndex = i == -1 ? this.options.numberOfPages - 1 : i; div.dataset.pageIndex = pageIndex; @@ -120,15 +121,15 @@ var SwipeView = (function (window, document) { SwipeView.prototype = { currentMasterPage: 1, - x: 0, + k: 0, page: 0, pageIndex: 0, customEvents: [], reset : function (pageCount) { this.goToPage(0); - this.updatePageCount(); - this.refreshSize(pageCount); + this.updatePageCount(pageCount); + this.refreshSize(); }, onFlip: function (fn) { @@ -173,18 +174,19 @@ var SwipeView = (function (window, document) { // FIXME, get container width/height if wrapper width/height equals 0 this.wrapperWidth = this.wrapper.clientWidth === 0 ? 1024 : this.wrapper.clientWidth; this.wrapperHeight = this.wrapper.clientHeight === 0 ? 145 : this.wrapper.clientHeight; - this.pageWidth = this.wrapperWidth; - this.maxX = -this.options.numberOfPages * this.pageWidth + this.wrapperWidth; + this.wrapperSize = this.options.vertical ? this.wrapperHeight : this.wrapperWidth; + this.pageSize = this.options.vertical ? this.wrapperHeight : this.wrapperWidth; + this.maxX = -this.options.numberOfPages * this.pageSize + this.wrapperSize; this.snapThreshold = this.options.snapThreshold === null ? - Math.round(this.pageWidth * 0.15) : + Math.round(this.pageSize * 0.15) : /%/.test(this.options.snapThreshold) ? - Math.round(this.pageWidth * this.options.snapThreshold.replace('%', '') / 100) : + Math.round(this.pageSize * this.options.snapThreshold.replace('%', '') / 100) : this.options.snapThreshold; }, updatePageCount: function (n) { this.options.numberOfPages = n; - this.maxX = -this.options.numberOfPages * this.pageWidth + this.wrapperWidth; + this.maxX = -this.options.numberOfPages * this.pageSize + this.wrapperSize; }, goToPage: function (p) { @@ -200,32 +202,32 @@ var SwipeView = (function (window, document) { this.page = p; this.pageIndex = p; this.slider.style[transitionDuration] = '0s'; - this.__pos(-p * this.pageWidth); + this.__pos(-p * this.pageSize); this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className + ' swipeview-active'; if (this.currentMasterPage === 0) { - this.masterPages[2].style.left = this.page * 100 - 100 + '%'; - this.masterPages[0].style.left = this.page * 100 + '%'; - this.masterPages[1].style.left = this.page * 100 + 100 + '%'; + this.masterPages[2].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; + this.masterPages[0].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + '%'; + this.masterPages[1].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; this.masterPages[2].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; this.masterPages[0].dataset.upcomingPageIndex = this.page; this.masterPages[1].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; } else if (this.currentMasterPage == 1) { - this.masterPages[0].style.left = this.page * 100 - 100 + '%'; - this.masterPages[1].style.left = this.page * 100 + '%'; - this.masterPages[2].style.left = this.page * 100 + 100 + '%'; + this.masterPages[0].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; + this.masterPages[1].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + '%'; + this.masterPages[2].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; this.masterPages[0].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; this.masterPages[1].dataset.upcomingPageIndex = this.page; this.masterPages[2].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; } else { - this.masterPages[1].style.left = this.page * 100 - 100 + '%'; - this.masterPages[2].style.left = this.page * 100 + '%'; - this.masterPages[0].style.left = this.page * 100 + 100 + '%'; + this.masterPages[1].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; + this.masterPages[2].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + '%'; + this.masterPages[0].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; this.masterPages[1].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; this.masterPages[2].dataset.upcomingPageIndex = this.page; @@ -236,18 +238,18 @@ var SwipeView = (function (window, document) { }, next: function () { - if (!this.options.loop && this.x == this.maxX) return; + if (!this.options.loop && this.k == this.maxX) return; - this.directionX = -1; - this.x -= 1; + this.direction = -1; + this.k -= 1; this.__checkPosition(); }, prev: function () { - if (!this.options.loop && this.x === 0) return; + if (!this.options.loop && this.k === 0) return; - this.directionX = 1; - this.x += 1; + this.direction = 1; + this.k += 1; this.__checkPosition(); }, @@ -283,15 +285,15 @@ var SwipeView = (function (window, document) { * Pseudo private methods * */ - __pos: function (x) { - this.x = x; - this.slider.style[transform] = 'translate(' + x + 'px,0)' + translateZ; + __pos: function (k) { + this.k = k; + this.slider.style[transform] = (this.options.vertical ? 'translate(0,' + k + 'px)' : 'translate(' + k + 'px,0)') + translateZ; }, __resize: function () { this.refreshSize(); this.slider.style[transitionDuration] = '0s'; - this.__pos(-this.page * this.pageWidth); + this.__pos(-this.page * this.pageSize); }, __start: function (e) { @@ -311,7 +313,7 @@ var SwipeView = (function (window, document) { this.pointY = point.pageY; this.stepsX = 0; this.stepsY = 0; - this.directionX = 0; + this.direction = 0; this.directionLocked = false; /* var matrix = getComputedStyle(this.slider, null).webkitTransform.replace(/[^0-9-.,]/g, '').split(','); @@ -341,13 +343,13 @@ var SwipeView = (function (window, document) { var deltaX = point.pageX - this.pointX, deltaY = point.pageY - this.pointY, - newX = this.x + deltaX, - dist = Math.abs(point.pageX - this.startX); + newC = this.options.vertical ? this.k + deltaY : this.k + deltaX, + dist = this.options.vertical ? Math.abs(point.pageY - this.startY): Math.abs(point.pageX - this.startX); this.moved = true; this.pointX = point.pageX; this.pointY = point.pageY; - this.directionX = deltaX > 0 ? 1 : deltaX < 0 ? -1 : 0; + this.direction = this.options.vertical ? (deltaY > 0 ? 1 : deltaY < 0 ? -1 : 0): (deltaX > 0 ? 1 : deltaX < 0 ? -1 : 0); this.stepsX += Math.abs(deltaX); this.stepsY += Math.abs(deltaY); @@ -358,7 +360,7 @@ var SwipeView = (function (window, document) { } // We are scrolling vertically, so skip SwipeView and give the control back to the browser - if (!this.directionLocked && this.stepsY > this.stepsX) { + if (!this.directionLocked && (this.options.vertical ? this.stepsX > this.stepsY : this.stepsY > this.stepsX)) { this.initiated = false; return; } @@ -367,8 +369,8 @@ var SwipeView = (function (window, document) { this.directionLocked = true; - if (!this.options.loop && (newX > 0 || newX < this.maxX)) { - newX = this.x + (deltaX / 2); + if (!this.options.loop && (newC > 0 || newC < this.maxC)) { + newC = this.k + ((this.options.vertical ?deltaY : deltaX) / 2); } if (!this.thresholdExceeded && dist >= this.snapThreshold) { @@ -379,11 +381,7 @@ var SwipeView = (function (window, document) { this.__event('movein'); } -/* if (newX > 0 || newX < this.maxX) { - newX = this.x + (deltaX / 2); - }*/ - - this.__pos(newX); + this.__pos(newC); }, __end: function (e) { @@ -403,7 +401,7 @@ var SwipeView = (function (window, document) { point = e.changedTouches.item(i); } if (!point) { - this.__pos(-this.page * this.pageWidth); + this.__pos(-this.page * this.pageSize); this.initiated = false; return; } @@ -412,14 +410,14 @@ var SwipeView = (function (window, document) { point = e; } - var dist = Math.abs(point.pageX - this.startX); + var dist = this.options.vertical ? Math.abs(point.pageY - this.startY) : Math.abs(point.pageX - this.startX); this.initiated = false; if (!this.moved) return; - if (!this.options.loop && (this.x > 0 || this.x < this.maxX)) { + if (!this.options.loop && (this.k > 0 || this.k < this.maxX)) { dist = 0; this.__event('movein'); } @@ -427,7 +425,7 @@ var SwipeView = (function (window, document) { // Check if we exceeded the snap threshold if (dist < this.snapThreshold) { this.slider.style[transitionDuration] = Math.floor(300 * dist / this.snapThreshold) + 'ms'; - this.__pos(-this.page * this.pageWidth); + this.__pos(-this.page * this.pageSize); return; } @@ -442,24 +440,24 @@ var SwipeView = (function (window, document) { this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/, ''); // Flip the page - if (this.directionX > 0) { - this.page = -Math.ceil(this.x / this.pageWidth); + if (this.direction > 0) { + this.page = -Math.ceil(this.k / this.pageSize); this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; this.pageIndex = this.pageIndex === 0 ? this.options.numberOfPages - 1 : this.pageIndex - 1; pageFlip = this.currentMasterPage - 1; pageFlip = pageFlip < 0 ? 2 : pageFlip; - this.masterPages[pageFlip].style.left = this.page * 100 - 100 + '%'; + this.masterPages[pageFlip].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; pageFlipIndex = this.page - 1; } else { - this.page = -Math.floor(this.x / this.pageWidth); + this.page = -Math.floor(this.k / this.pageSize); this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; this.pageIndex = this.pageIndex == this.options.numberOfPages - 1 ? 0 : this.pageIndex + 1; pageFlip = this.currentMasterPage + 1; pageFlip = pageFlip > 2 ? 0 : pageFlip; - this.masterPages[pageFlip].style.left = this.page * 100 + 100 + '%'; + this.masterPages[pageFlip].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; pageFlipIndex = this.page + 1; } @@ -475,19 +473,19 @@ var SwipeView = (function (window, document) { pageFlipIndex = pageFlipIndex - Math.floor(pageFlipIndex / this.options.numberOfPages) * this.options.numberOfPages; this.masterPages[pageFlip].dataset.upcomingPageIndex = pageFlipIndex; // Index to be loaded in the newly flipped page - newX = -this.page * this.pageWidth; + newC = -this.page * this.pageSize; - this.slider.style[transitionDuration] = Math.floor(500 * Math.abs(this.x - newX) / this.pageWidth) + 'ms'; + this.slider.style[transitionDuration] = Math.floor(500 * Math.abs(this.k - newC) / this.pageSize) + 'ms'; // Hide the next page if we decided to disable looping if (!this.options.loop) { - this.masterPages[pageFlip].style.visibility = newX === 0 || newX == this.maxX ? 'hidden' : ''; + this.masterPages[pageFlip].style.visibility = newC === 0 || newC == this.maxX ? 'hidden' : ''; } - if (this.x == newX) { + if (this.k == newC) { this.__flip(); // If we swiped all the way long to the next page (extremely rare but still) } else { - this.__pos(newX); + this.__pos(newC); if (this.options.hastyPageFlip) this.__flip(); } }, diff --git a/src/verticalswipeview.js b/src/verticalswipeview.js deleted file mode 100644 index 8a852b3..0000000 --- a/src/verticalswipeview.js +++ /dev/null @@ -1,521 +0,0 @@ -/*! - * VerticalSwipeView - * Fork from SwipeView v1.0 ~ Copyright (c) 2012 Matteo Spinelli, http://cubiq.org - * Released under MIT license, http://cubiq.org/license - */ -var VerticalSwipeView = (function (window, document) { - var dummyStyle = document.createElement('div').style, - vendor = (function () { - var vendors = 't,webkitT,MozT,msT,OT'.split(','), - t, - i = 0, - l = vendors.length; - - for ( ; i < l; i++ ) { - t = vendors[i] + 'ransform'; - if ( t in dummyStyle ) { - return vendors[i].substr(0, vendors[i].length - 1); - } - } - - return false; - })(), - cssVendor = vendor ? '-' + vendor.toLowerCase() + '-' : '', - - // Style properties - transform = prefixStyle('transform'), - transitionDuration = prefixStyle('transitionDuration'), - - // Browser capabilities - has3d = prefixStyle('perspective') in dummyStyle, - hasTouch = 'ontouchstart' in window, - hasTransform = !!vendor, - hasTransitionEnd = prefixStyle('transition') in dummyStyle, - - // Helpers - translateZ = has3d ? ' translateZ(0)' : '', - - // Events - resizeEvent = 'onorientationchange' in window ? 'orientationchange' : 'resize', - startEvent = hasTouch ? 'touchstart' : 'mousedown', - moveEvent = hasTouch ? 'touchmove' : 'mousemove', - endEvent = hasTouch ? 'touchend' : 'mouseup', - cancelEvent = hasTouch ? 'touchcancel' : 'mouseup', - transitionEndEvent = (function () { - if ( vendor === false ) return false; - - var transitionEnd = { - '' : 'transitionend', - 'webkit' : 'webkitTransitionEnd', - 'Moz' : 'transitionend', - 'O' : 'oTransitionEnd', - 'ms' : 'MSTransitionEnd' - }; - - return transitionEnd[vendor]; - })(), - - uuid = 0, - - VerticalSwipeView = function (el, options) { - var i, - div, - className, - pageIndex; - - this.wrapper = typeof el == 'string' ? document.querySelector(el) : el; - this.id = this.wrapper.id || ++uuid; - this.options = { - text: null, - numberOfPages: 3, - snapThreshold: null, - hastyPageFlip: false, - loop: true - }; - - // User defined options - for (i in options) this.options[i] = options[i]; - - this.wrapper.style.overflow = 'hidden'; - this.wrapper.style.position = 'relative'; - - this.masterPages = []; - - div = document.createElement('div'); - div.className = 'vertical-swipeview-slider'; - div.style.cssText = 'position:relative;top:0;height:100%;width:100%;' + cssVendor + 'transition-duration:0;' + cssVendor + 'transform:translateZ(0);' + cssVendor + 'transition-timing-function:ease-out'; - this.wrapper.appendChild(div); - this.slider = div; - - this.refreshSize(); - - for (i=-1; i<2; i++) { - div = document.createElement('div'); - div.style.cssText = cssVendor + 'transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;top:' + i*100 + '%'; - if (!div.dataset) div.dataset = {}; - pageIndex = i == -1 ? this.options.numberOfPages - 1 : i; - div.dataset.pageIndex = pageIndex; - div.dataset.upcomingPageIndex = pageIndex; - - if (!this.options.loop && i == -1) div.style.visibility = 'hidden'; - - this.slider.appendChild(div); - this.masterPages.push(div); - } - - className = this.masterPages[1].className; - this.masterPages[1].className = !className ? 'vertical-swipeview-active' : className + ' vertical-swipeview-active'; - - window.addEventListener(resizeEvent, this, false); - this.wrapper.addEventListener(startEvent, this, false); - this.wrapper.addEventListener(moveEvent, this, false); - this.wrapper.addEventListener(endEvent, this, false); - this.slider.addEventListener(transitionEndEvent, this, false); - // in Opera >= 12 the transitionend event is lowercase so we register both events - if ( vendor == 'O' ) this.slider.addEventListener(transitionEndEvent.toLowerCase(), this, false); - - if (!hasTouch) { - this.wrapper.addEventListener('mouseout', this, false); - } - }; - - VerticalSwipeView.prototype = { - currentMasterPage: 1, - y: 0, - page: 0, - pageIndex: 0, - customEvents: [], - - reset : function (pageCount) { - this.goToPage(0); - this.updatePageCount(pageCount); - this.refreshSize(); - }, - - onFlip: function (fn) { - this.wrapper.addEventListener(this.id + 'vertical-swipeview-flip', fn, false); - this.customEvents.push(['flip', fn]); - }, - - onMoveOut: function (fn) { - this.wrapper.addEventListener(this.id + 'vertical-swipeview-moveout', fn, false); - this.customEvents.push(['moveout', fn]); - }, - - onMoveIn: function (fn) { - this.wrapper.addEventListener(this.id + 'vertical-swipeview-movein', fn, false); - this.customEvents.push(['movein', fn]); - }, - - onTouchStart: function (fn) { - this.wrapper.addEventListener(this.id + 'vertical-swipeview-touchstart', fn, false); - this.customEvents.push(['touchstart', fn]); - }, - - destroy: function () { - while ( this.customEvents.length ) { - this.wrapper.removeEventListener(this.id + 'vertical-swipeview-' + this.customEvents[0][0], this.customEvents[0][1], false); - this.customEvents.shift(); - } - - // Remove the event listeners - window.removeEventListener(resizeEvent, this, false); - this.wrapper.removeEventListener(startEvent, this, false); - this.wrapper.removeEventListener(moveEvent, this, false); - this.wrapper.removeEventListener(endEvent, this, false); - this.slider.removeEventListener(transitionEndEvent, this, false); - - if (!hasTouch) { - this.wrapper.removeEventListener('mouseout', this, false); - } - }, - - refreshSize: function () { - this.wrapperWidth = this.wrapper.clientWidth; - this.wrapperHeight = this.wrapper.clientHeight; - this.pageHeight = this.wrapperHeight; - this.maxY = -this.options.numberOfPages * this.pageHeight + this.wrapperHeight; - this.snapThreshold = this.options.snapThreshold === null ? - Math.round(this.pageHeight * 0.15) : - /%/.test(this.options.snapThreshold) ? - Math.round(this.pageHeight * this.options.snapThreshold.replace('%', '') / 100) : - this.options.snapThreshold; - }, - - updatePageCount: function (n) { - this.options.numberOfPages = n; - this.maxY = -this.options.numberOfPages * this.pageHeight + this.wrapperHeight; - }, - - goToPage: function (p) { - var i; - - this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className.replace(/(^|\s)vertical-swipeview-active(\s|$)/, ''); - for (i=0; i<3; i++) { - className = this.masterPages[i].className; - /(^|\s)vertical-swipeview-loading(\s|$)/.test(className) || (this.masterPages[i].className = !className ? 'vertical-swipeview-loading' : className + ' swipeview-loading'); - } - - p = p < 0 ? 0 : p > this.options.numberOfPages-1 ? this.options.numberOfPages-1 : p; - this.page = p; - this.pageIndex = p; - this.slider.style[transitionDuration] = '0s'; - this.__pos(-p * this.pageHeight); - - this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; - - this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className + ' vertical-swipeview-active'; - - if (this.currentMasterPage === 0) { - this.masterPages[2].style.top = this.page * 100 - 100 + '%'; - this.masterPages[0].style.top = this.page * 100 + '%'; - this.masterPages[1].style.top = this.page * 100 + 100 + '%'; - - this.masterPages[2].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; - this.masterPages[0].dataset.upcomingPageIndex = this.page; - this.masterPages[1].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; - } else if (this.currentMasterPage == 1) { - this.masterPages[0].style.top = this.page * 100 - 100 + '%'; - this.masterPages[1].style.top = this.page * 100 + '%'; - this.masterPages[2].style.top = this.page * 100 + 100 + '%'; - - this.masterPages[0].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; - this.masterPages[1].dataset.upcomingPageIndex = this.page; - this.masterPages[2].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; - } else { - this.masterPages[1].style.top = this.page * 100 - 100 + '%'; - this.masterPages[2].style.top = this.page * 100 + '%'; - this.masterPages[0].style.top = this.page * 100 + 100 + '%'; - - this.masterPages[1].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; - this.masterPages[2].dataset.upcomingPageIndex = this.page; - this.masterPages[0].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; - } - - this.__flip(); - }, - - next: function () { - if (!this.options.loop && this.y == this.maxY) return; - - this.directionY = -1; - this.y -= 1; - this.__checkPosition(); - }, - - prev: function () { - if (!this.options.loop && this.y === 0) return; - - this.directionY = 1; - this.y += 1; - this.__checkPosition(); - }, - - handleEvent: function (e) { - switch (e.type) { - case startEvent: - this.__start(e); - break; - case moveEvent: - this.__move(e); - break; - case "mouseout": - if (!this.initiated) { break; } - else if ( e.toElement == document.childNodes[1]) { } - else if ( e.toElement != this.wrapper.parentNode ) { break; } - case cancelEvent: - case endEvent: - this.__end(e); - break; - case resizeEvent: - this.__resize(); - break; - case transitionEndEvent: - case 'otransitionend': - if (e.target == this.slider && !this.options.hastyPageFlip) this.__flip(); - break; - } - }, - - - /** - * - * Pseudo private methods - * - */ - __pos: function (y) { - this.y = y; - this.slider.style[transform] = 'translate(0, ' + y + 'px)' + translateZ; - }, - - __resize: function () { - this.refreshSize(); - this.slider.style[transitionDuration] = '0s'; - this.__pos(-this.page * this.pageHeight); - }, - - __start: function (e) { - //e.preventDefault(); - - if (this.initiated) return; - - var point = hasTouch ? e.targetTouches[0] : e; - - this.initiated = true; - this.identifier = point.identifier; - this.moved = false; - this.thresholdExceeded = false; - this.startX = point.pageX; - this.startY = point.pageY; - this.pointX = point.pageX; - this.pointY = point.pageY; - this.stepsX = 0; - this.stepsY = 0; - this.directionY = 0; - this.directionLocked = false; - -/* var matrix = getComputedStyle(this.slider, null).webkitTransform.replace(/[^0-9-.,]/g, '').split(','); - this.x = matrix[4] * 1;*/ - - this.slider.style[transitionDuration] = '0s'; - - this.__event('touchstart'); - }, - - __move: function (e) { - if (!this.initiated) return; - var i, l, point; - - if (hasTouch) { - i = 0; - l = e.changedTouches.length; - for(;i 0 ? 1 : deltaY < 0 ? -1 : 0; - this.stepsX += Math.abs(deltaX); - this.stepsY += Math.abs(deltaY); - - // We take a 10px buffer to figure out the direction of the swipe - if (this.stepsX < 10 && this.stepsY < 10) { -// e.preventDefault(); - return; - } - - // We are scrolling horizontaly, so skip VerticalSwipeView and give the control back to the browser - if (!this.directionLocked && this.stepsX > this.stepsY) { - this.initiated = false; - return; - } - - e.preventDefault(); - - this.directionLocked = true; - - if (!this.options.loop && (newY > 0 || newY < this.maxY)) { - newY = this.y + (deltaY / 2); - } - - if (!this.thresholdExceeded && dist >= this.snapThreshold) { - this.thresholdExceeded = true; - this.__event('moveout'); - } else if (this.thresholdExceeded && dist < this.snapThreshold) { - this.thresholdExceeded = false; - this.__event('movein'); - } - -/* if (newX > 0 || newX < this.maxX) { - newX = this.x + (deltaX / 2); - }*/ - - this.__pos(newY); - }, - - __end: function (e) { - if (!this.initiated) return; - - var point; - - if(hasTouch) { - var i=0, l=e.touches.length; - for(;i 0 || this.y < this.maxY)) { - dist = 0; - this.__event('movein'); - } - - // Check if we exceeded the snap threshold - if (dist < this.snapThreshold) { - this.slider.style[transitionDuration] = Math.floor(300 * dist / this.snapThreshold) + 'ms'; - this.__pos(-this.page * this.pageHeight); - return; - } - - this.__checkPosition(); - }, - - __checkPosition: function () { - var pageFlip, - pageFlipIndex, - className; - - this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className.replace(/(^|\s)vertical-swipeview-active(\s|$)/, ''); - - // Flip the page - if (this.directionY > 0) { - this.page = -Math.ceil(this.y / this.pageHeight); - this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; - this.pageIndex = this.pageIndex === 0 ? this.options.numberOfPages - 1 : this.pageIndex - 1; - - pageFlip = this.currentMasterPage - 1; - pageFlip = pageFlip < 0 ? 2 : pageFlip; - this.masterPages[pageFlip].style.top = this.page * 100 - 100 + '%'; - - pageFlipIndex = this.page - 1; - } else { - this.page = -Math.floor(this.y / this.pageHeight); - this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; - this.pageIndex = this.pageIndex == this.options.numberOfPages - 1 ? 0 : this.pageIndex + 1; - - pageFlip = this.currentMasterPage + 1; - pageFlip = pageFlip > 2 ? 0 : pageFlip; - this.masterPages[pageFlip].style.top = this.page * 100 + 100 + '%'; - - pageFlipIndex = this.page + 1; - } - - // Add active class to current page - className = this.masterPages[this.currentMasterPage].className; - /(^|\s)vertical-swipeview-active(\s|$)/.test(className) || (this.masterPages[this.currentMasterPage].className = !className ? 'vertical-swipeview-active' : className + ' vertical-swipeview-active'); - - // Add loading class to flipped page - className = this.masterPages[pageFlip].className; - /(^|\s)vertical-swipeview-loading(\s|$)/.test(className) || (this.masterPages[pageFlip].className = !className ? 'vertical-swipeview-loading' : className + ' vertical-swipeview-loading'); - - pageFlipIndex = pageFlipIndex - Math.floor(pageFlipIndex / this.options.numberOfPages) * this.options.numberOfPages; - this.masterPages[pageFlip].dataset.upcomingPageIndex = pageFlipIndex; // Index to be loaded in the newly flipped page - - newY = -this.page * this.pageHeight; - - this.slider.style[transitionDuration] = Math.floor(500 * Math.abs(this.y - newY) / this.pageHeight) + 'ms'; - - // Hide the next page if we decided to disable looping - if (!this.options.loop) { - this.masterPages[pageFlip].style.visibility = newY === 0 || newY == this.maxY ? 'hidden' : ''; - } - - if (this.y == newY) { - this.__flip(); // If we swiped all the way long to the next page (extremely rare but still) - } else { - this.__pos(newY); - if (this.options.hastyPageFlip) this.__flip(); - } - }, - - __flip: function () { - this.__event('flip'); - - for (var i=0; i<3; i++) { - this.masterPages[i].className = this.masterPages[i].className.replace(/(^|\s)vertical-swipeview-loading(\s|$)/, ''); // Remove the loading class - this.masterPages[i].dataset.pageIndex = this.masterPages[i].dataset.upcomingPageIndex; - } - }, - - __event: function (type) { - var ev = document.createEvent("Event"); - - ev.initEvent(this.id + 'vertical-swipeview-' + type, true, true); - - this.wrapper.dispatchEvent(ev); - } - }; - - function prefixStyle (style) { - if ( vendor === '' ) return style; - - style = style.charAt(0).toUpperCase() + style.substr(1); - return vendor + style; - } - - return VerticalSwipeView; -})(window, document); From 97ec3a27e271f31f2bdb26f5641f6623dcb131e5 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Mon, 1 Jul 2013 15:03:46 +0200 Subject: [PATCH 30/61] %s/\t/ /g --- src/swipeview.js | 986 +++++++++++++++++++++++------------------------ 1 file changed, 493 insertions(+), 493 deletions(-) diff --git a/src/swipeview.js b/src/swipeview.js index 215a2f0..7b12c13 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -3,517 +3,517 @@ * Released under MIT license, http://cubiq.org/license */ var SwipeView = (function (window, document) { - var dummyStyle = document.createElement('div').style, - vendor = (function () { - var vendors = 't,webkitT,MozT,msT,OT'.split(','), - t, - i = 0, - l = vendors.length; - - for ( ; i < l; i++ ) { - t = vendors[i] + 'ransform'; - if ( t in dummyStyle ) { - return vendors[i].substr(0, vendors[i].length - 1); - } - } - - return false; - })(), - cssVendor = vendor ? '-' + vendor.toLowerCase() + '-' : '', - - // Style properties - transform = prefixStyle('transform'), - transitionDuration = prefixStyle('transitionDuration'), - - // Browser capabilities - has3d = prefixStyle('perspective') in dummyStyle, - hasTouch = 'ontouchstart' in window, - hasTransform = !!vendor, - hasTransitionEnd = prefixStyle('transition') in dummyStyle, - - // Helpers - translateZ = has3d ? ' translateZ(0)' : '', - - // Events - resizeEvent = 'onorientationchange' in window ? 'orientationchange' : 'resize', - startEvent = hasTouch ? 'touchstart' : 'mousedown', - moveEvent = hasTouch ? 'touchmove' : 'mousemove', - endEvent = hasTouch ? 'touchend' : 'mouseup', - cancelEvent = hasTouch ? 'touchcancel' : 'mouseup', - transitionEndEvent = (function () { - if ( vendor === false ) return false; - - var transitionEnd = { - '' : 'transitionend', - 'webkit' : 'webkitTransitionEnd', - 'Moz' : 'transitionend', - 'O' : 'oTransitionEnd', - 'ms' : 'MSTransitionEnd' - }; - - return transitionEnd[vendor]; - })(), - + var dummyStyle = document.createElement('div').style, + vendor = (function () { + var vendors = 't,webkitT,MozT,msT,OT'.split(','), + t, + i = 0, + l = vendors.length; + + for ( ; i < l; i++ ) { + t = vendors[i] + 'ransform'; + if ( t in dummyStyle ) { + return vendors[i].substr(0, vendors[i].length - 1); + } + } + + return false; + })(), + cssVendor = vendor ? '-' + vendor.toLowerCase() + '-' : '', + + // Style properties + transform = prefixStyle('transform'), + transitionDuration = prefixStyle('transitionDuration'), + + // Browser capabilities + has3d = prefixStyle('perspective') in dummyStyle, + hasTouch = 'ontouchstart' in window, + hasTransform = !!vendor, + hasTransitionEnd = prefixStyle('transition') in dummyStyle, + + // Helpers + translateZ = has3d ? ' translateZ(0)' : '', + + // Events + resizeEvent = 'onorientationchange' in window ? 'orientationchange' : 'resize', + startEvent = hasTouch ? 'touchstart' : 'mousedown', + moveEvent = hasTouch ? 'touchmove' : 'mousemove', + endEvent = hasTouch ? 'touchend' : 'mouseup', + cancelEvent = hasTouch ? 'touchcancel' : 'mouseup', + transitionEndEvent = (function () { + if ( vendor === false ) return false; + + var transitionEnd = { + '' : 'transitionend', + 'webkit' : 'webkitTransitionEnd', + 'Moz' : 'transitionend', + 'O' : 'oTransitionEnd', + 'ms' : 'MSTransitionEnd' + }; + + return transitionEnd[vendor]; + })(), + uuid = 0, - SwipeView = function (el, options) { - var i, - div, - className, - pageIndex; + SwipeView = function (el, options) { + var i, + div, + className, + pageIndex; - this.wrapper = typeof el == 'string' ? document.querySelector(el) : el; + this.wrapper = typeof el == 'string' ? document.querySelector(el) : el; this.id = this.wrapper.id || 'sw-id' + (++uuid); - this.options = { - text: null, - numberOfPages: 3, - snapThreshold: null, - hastyPageFlip: false, + this.options = { + text: null, + numberOfPages: 3, + snapThreshold: null, + hastyPageFlip: false, vertical: false, - loop: true - }; - - // User defined options - for (i in options) this.options[i] = options[i]; - - this.wrapper.style.overflow = 'hidden'; - this.wrapper.style.position = 'relative'; - - this.masterPages = []; - - div = document.createElement('div'); - div.className = 'swipeview-slider'; - div.style.cssText = 'position:relative;top:0;height:100%;width:100%;' + cssVendor + 'transition-duration:0;' + cssVendor + 'transform:translateZ(0);' + cssVendor + 'transition-timing-function:ease-out'; - this.wrapper.appendChild(div); - this.slider = div; - - this.refreshSize(); - - for (i=-1; i<2; i++) { - div = document.createElement('div'); - div.style.cssText = cssVendor + 'transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;' + (this.options.vertical ? 'top' : 'left') + ':' + i*100 + '%'; - if (!div.dataset) div.dataset = {}; - pageIndex = i == -1 ? this.options.numberOfPages - 1 : i; - div.dataset.pageIndex = pageIndex; - div.dataset.upcomingPageIndex = pageIndex; - - if (!this.options.loop && i == -1) div.style.visibility = 'hidden'; - - this.slider.appendChild(div); - this.masterPages.push(div); - } - - className = this.masterPages[1].className; - this.masterPages[1].className = !className ? 'swipeview-active' : className + ' swipeview-active'; - - window.addEventListener(resizeEvent, this, false); - this.wrapper.addEventListener(startEvent, this, false); - this.wrapper.addEventListener(moveEvent, this, false); - this.wrapper.addEventListener(endEvent, this, false); - this.slider.addEventListener(transitionEndEvent, this, false); - // in Opera >= 12 the transitionend event is lowercase so we register both events - if ( vendor == 'O' ) this.slider.addEventListener(transitionEndEvent.toLowerCase(), this, false); - - if (!hasTouch) { - this.wrapper.addEventListener('mouseout', this, false); - } - }; - - SwipeView.prototype = { - currentMasterPage: 1, - k: 0, - page: 0, - pageIndex: 0, - customEvents: [], - + loop: true + }; + + // User defined options + for (i in options) this.options[i] = options[i]; + + this.wrapper.style.overflow = 'hidden'; + this.wrapper.style.position = 'relative'; + + this.masterPages = []; + + div = document.createElement('div'); + div.className = 'swipeview-slider'; + div.style.cssText = 'position:relative;top:0;height:100%;width:100%;' + cssVendor + 'transition-duration:0;' + cssVendor + 'transform:translateZ(0);' + cssVendor + 'transition-timing-function:ease-out'; + this.wrapper.appendChild(div); + this.slider = div; + + this.refreshSize(); + + for (i=-1; i<2; i++) { + div = document.createElement('div'); + div.style.cssText = cssVendor + 'transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;' + (this.options.vertical ? 'top' : 'left') + ':' + i*100 + '%'; + if (!div.dataset) div.dataset = {}; + pageIndex = i == -1 ? this.options.numberOfPages - 1 : i; + div.dataset.pageIndex = pageIndex; + div.dataset.upcomingPageIndex = pageIndex; + + if (!this.options.loop && i == -1) div.style.visibility = 'hidden'; + + this.slider.appendChild(div); + this.masterPages.push(div); + } + + className = this.masterPages[1].className; + this.masterPages[1].className = !className ? 'swipeview-active' : className + ' swipeview-active'; + + window.addEventListener(resizeEvent, this, false); + this.wrapper.addEventListener(startEvent, this, false); + this.wrapper.addEventListener(moveEvent, this, false); + this.wrapper.addEventListener(endEvent, this, false); + this.slider.addEventListener(transitionEndEvent, this, false); + // in Opera >= 12 the transitionend event is lowercase so we register both events + if ( vendor == 'O' ) this.slider.addEventListener(transitionEndEvent.toLowerCase(), this, false); + + if (!hasTouch) { + this.wrapper.addEventListener('mouseout', this, false); + } + }; + + SwipeView.prototype = { + currentMasterPage: 1, + k: 0, + page: 0, + pageIndex: 0, + customEvents: [], + reset : function (pageCount) { this.goToPage(0); this.updatePageCount(pageCount); this.refreshSize(); }, - onFlip: function (fn) { - this.wrapper.addEventListener(this.id + 'swipeview-flip', fn, false); - this.customEvents.push(['flip', fn]); - }, - - onMoveOut: function (fn) { - this.wrapper.addEventListener(this.id + 'swipeview-moveout', fn, false); - this.customEvents.push(['moveout', fn]); - }, - - onMoveIn: function (fn) { - this.wrapper.addEventListener(this.id + 'swipeview-movein', fn, false); - this.customEvents.push(['movein', fn]); - }, - - onTouchStart: function (fn) { - this.wrapper.addEventListener(this.id + 'swipeview-touchstart', fn, false); - this.customEvents.push(['touchstart', fn]); - }, - - destroy: function () { - while ( this.customEvents.length ) { - this.wrapper.removeEventListener(this.id + 'swipeview-' + this.customEvents[0][0], this.customEvents[0][1], false); - this.customEvents.shift(); - } - - // Remove the event listeners - window.removeEventListener(resizeEvent, this, false); - this.wrapper.removeEventListener(startEvent, this, false); - this.wrapper.removeEventListener(moveEvent, this, false); - this.wrapper.removeEventListener(endEvent, this, false); - this.slider.removeEventListener(transitionEndEvent, this, false); - - if (!hasTouch) { - this.wrapper.removeEventListener('mouseout', this, false); - } - }, - - refreshSize: function () { + onFlip: function (fn) { + this.wrapper.addEventListener(this.id + 'swipeview-flip', fn, false); + this.customEvents.push(['flip', fn]); + }, + + onMoveOut: function (fn) { + this.wrapper.addEventListener(this.id + 'swipeview-moveout', fn, false); + this.customEvents.push(['moveout', fn]); + }, + + onMoveIn: function (fn) { + this.wrapper.addEventListener(this.id + 'swipeview-movein', fn, false); + this.customEvents.push(['movein', fn]); + }, + + onTouchStart: function (fn) { + this.wrapper.addEventListener(this.id + 'swipeview-touchstart', fn, false); + this.customEvents.push(['touchstart', fn]); + }, + + destroy: function () { + while ( this.customEvents.length ) { + this.wrapper.removeEventListener(this.id + 'swipeview-' + this.customEvents[0][0], this.customEvents[0][1], false); + this.customEvents.shift(); + } + + // Remove the event listeners + window.removeEventListener(resizeEvent, this, false); + this.wrapper.removeEventListener(startEvent, this, false); + this.wrapper.removeEventListener(moveEvent, this, false); + this.wrapper.removeEventListener(endEvent, this, false); + this.slider.removeEventListener(transitionEndEvent, this, false); + + if (!hasTouch) { + this.wrapper.removeEventListener('mouseout', this, false); + } + }, + + refreshSize: function () { // FIXME, get container width/height if wrapper width/height equals 0 - this.wrapperWidth = this.wrapper.clientWidth === 0 ? 1024 : this.wrapper.clientWidth; - this.wrapperHeight = this.wrapper.clientHeight === 0 ? 145 : this.wrapper.clientHeight; - this.wrapperSize = this.options.vertical ? this.wrapperHeight : this.wrapperWidth; - this.pageSize = this.options.vertical ? this.wrapperHeight : this.wrapperWidth; - this.maxX = -this.options.numberOfPages * this.pageSize + this.wrapperSize; - this.snapThreshold = this.options.snapThreshold === null ? - Math.round(this.pageSize * 0.15) : - /%/.test(this.options.snapThreshold) ? - Math.round(this.pageSize * this.options.snapThreshold.replace('%', '') / 100) : - this.options.snapThreshold; - }, - - updatePageCount: function (n) { - this.options.numberOfPages = n; - this.maxX = -this.options.numberOfPages * this.pageSize + this.wrapperSize; - }, - - goToPage: function (p) { - var i; - - this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/, ''); - for (i=0; i<3; i++) { - className = this.masterPages[i].className; - /(^|\s)swipeview-loading(\s|$)/.test(className) || (this.masterPages[i].className = !className ? 'swipeview-loading' : className + ' swipeview-loading'); - } - - p = p < 0 ? 0 : p > this.options.numberOfPages-1 ? this.options.numberOfPages-1 : p; - this.page = p; - this.pageIndex = p; - this.slider.style[transitionDuration] = '0s'; - this.__pos(-p * this.pageSize); - - this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; - - this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className + ' swipeview-active'; - - if (this.currentMasterPage === 0) { - this.masterPages[2].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; - this.masterPages[0].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + '%'; - this.masterPages[1].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; - - this.masterPages[2].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; - this.masterPages[0].dataset.upcomingPageIndex = this.page; - this.masterPages[1].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; - } else if (this.currentMasterPage == 1) { - this.masterPages[0].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; - this.masterPages[1].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + '%'; - this.masterPages[2].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; - - this.masterPages[0].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; - this.masterPages[1].dataset.upcomingPageIndex = this.page; - this.masterPages[2].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; - } else { - this.masterPages[1].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; - this.masterPages[2].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + '%'; - this.masterPages[0].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; - - this.masterPages[1].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; - this.masterPages[2].dataset.upcomingPageIndex = this.page; - this.masterPages[0].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; - } - - this.__flip(); - }, - - next: function () { - if (!this.options.loop && this.k == this.maxX) return; - - this.direction = -1; - this.k -= 1; - this.__checkPosition(); - }, - - prev: function () { - if (!this.options.loop && this.k === 0) return; - - this.direction = 1; - this.k += 1; - this.__checkPosition(); - }, - - handleEvent: function (e) { - switch (e.type) { - case startEvent: - this.__start(e); - break; - case moveEvent: - this.__move(e); - break; - case "mouseout": + this.wrapperWidth = this.wrapper.clientWidth === 0 ? 1024 : this.wrapper.clientWidth; + this.wrapperHeight = this.wrapper.clientHeight === 0 ? 145 : this.wrapper.clientHeight; + this.wrapperSize = this.options.vertical ? this.wrapperHeight : this.wrapperWidth; + this.pageSize = this.options.vertical ? this.wrapperHeight : this.wrapperWidth; + this.maxX = -this.options.numberOfPages * this.pageSize + this.wrapperSize; + this.snapThreshold = this.options.snapThreshold === null ? + Math.round(this.pageSize * 0.15) : + /%/.test(this.options.snapThreshold) ? + Math.round(this.pageSize * this.options.snapThreshold.replace('%', '') / 100) : + this.options.snapThreshold; + }, + + updatePageCount: function (n) { + this.options.numberOfPages = n; + this.maxX = -this.options.numberOfPages * this.pageSize + this.wrapperSize; + }, + + goToPage: function (p) { + var i; + + this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/, ''); + for (i=0; i<3; i++) { + className = this.masterPages[i].className; + /(^|\s)swipeview-loading(\s|$)/.test(className) || (this.masterPages[i].className = !className ? 'swipeview-loading' : className + ' swipeview-loading'); + } + + p = p < 0 ? 0 : p > this.options.numberOfPages-1 ? this.options.numberOfPages-1 : p; + this.page = p; + this.pageIndex = p; + this.slider.style[transitionDuration] = '0s'; + this.__pos(-p * this.pageSize); + + this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; + + this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className + ' swipeview-active'; + + if (this.currentMasterPage === 0) { + this.masterPages[2].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; + this.masterPages[0].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + '%'; + this.masterPages[1].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; + + this.masterPages[2].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; + this.masterPages[0].dataset.upcomingPageIndex = this.page; + this.masterPages[1].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; + } else if (this.currentMasterPage == 1) { + this.masterPages[0].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; + this.masterPages[1].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + '%'; + this.masterPages[2].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; + + this.masterPages[0].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; + this.masterPages[1].dataset.upcomingPageIndex = this.page; + this.masterPages[2].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; + } else { + this.masterPages[1].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; + this.masterPages[2].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + '%'; + this.masterPages[0].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; + + this.masterPages[1].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; + this.masterPages[2].dataset.upcomingPageIndex = this.page; + this.masterPages[0].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; + } + + this.__flip(); + }, + + next: function () { + if (!this.options.loop && this.k == this.maxX) return; + + this.direction = -1; + this.k -= 1; + this.__checkPosition(); + }, + + prev: function () { + if (!this.options.loop && this.k === 0) return; + + this.direction = 1; + this.k += 1; + this.__checkPosition(); + }, + + handleEvent: function (e) { + switch (e.type) { + case startEvent: + this.__start(e); + break; + case moveEvent: + this.__move(e); + break; + case "mouseout": if (!this.initiated) { break; } else if ( e.toElement == document.childNodes[1]) { } else if ( e.toElement != this.wrapper.parentNode ) { break; } case cancelEvent: - case endEvent: - this.__end(e); - break; - case resizeEvent: - this.__resize(); - break; - case transitionEndEvent: - case 'otransitionend': - if (e.target == this.slider && !this.options.hastyPageFlip) this.__flip(); - break; - } - }, - - - /** - * - * Pseudo private methods - * - */ - __pos: function (k) { - this.k = k; - this.slider.style[transform] = (this.options.vertical ? 'translate(0,' + k + 'px)' : 'translate(' + k + 'px,0)') + translateZ; - }, - - __resize: function () { - this.refreshSize(); - this.slider.style[transitionDuration] = '0s'; - this.__pos(-this.page * this.pageSize); - }, - - __start: function (e) { - //e.preventDefault(); - - if (this.initiated) return; - - var point = hasTouch ? e.targetTouches[0] : e; - - this.initiated = true; - this.identifier = point.identifier; - this.moved = false; - this.thresholdExceeded = false; - this.startX = point.pageX; - this.startY = point.pageY; - this.pointX = point.pageX; - this.pointY = point.pageY; - this.stepsX = 0; - this.stepsY = 0; - this.direction = 0; - this.directionLocked = false; - -/* var matrix = getComputedStyle(this.slider, null).webkitTransform.replace(/[^0-9-.,]/g, '').split(','); - this.x = matrix[4] * 1;*/ - - this.slider.style[transitionDuration] = '0s'; - - this.__event('touchstart'); - }, - - __move: function (e) { - if (!this.initiated) return; - var i, l, point; - - if (hasTouch) { - i = 0; - l = e.changedTouches.length; - for(;i 0 ? 1 : deltaY < 0 ? -1 : 0): (deltaX > 0 ? 1 : deltaX < 0 ? -1 : 0); - this.stepsX += Math.abs(deltaX); - this.stepsY += Math.abs(deltaY); - - // We take a 10px buffer to figure out the direction of the swipe - if (this.stepsX < 10 && this.stepsY < 10) { -// e.preventDefault(); - return; - } - - // We are scrolling vertically, so skip SwipeView and give the control back to the browser - if (!this.directionLocked && (this.options.vertical ? this.stepsX > this.stepsY : this.stepsY > this.stepsX)) { - this.initiated = false; - return; - } - - e.preventDefault(); - - this.directionLocked = true; - - if (!this.options.loop && (newC > 0 || newC < this.maxC)) { - newC = this.k + ((this.options.vertical ?deltaY : deltaX) / 2); - } - - if (!this.thresholdExceeded && dist >= this.snapThreshold) { - this.thresholdExceeded = true; - this.__event('moveout'); - } else if (this.thresholdExceeded && dist < this.snapThreshold) { - this.thresholdExceeded = false; - this.__event('movein'); - } - - this.__pos(newC); - }, - - __end: function (e) { - if (!this.initiated) return; - - var point; - - if(hasTouch) { - var i=0, l=e.touches.length; - for(;i 0 ? 1 : deltaY < 0 ? -1 : 0): (deltaX > 0 ? 1 : deltaX < 0 ? -1 : 0); + this.stepsX += Math.abs(deltaX); + this.stepsY += Math.abs(deltaY); + + // We take a 10px buffer to figure out the direction of the swipe + if (this.stepsX < 10 && this.stepsY < 10) { +// e.preventDefault(); + return; + } + + // We are scrolling vertically, so skip SwipeView and give the control back to the browser + if (!this.directionLocked && (this.options.vertical ? this.stepsX > this.stepsY : this.stepsY > this.stepsX)) { + this.initiated = false; + return; + } + + e.preventDefault(); + + this.directionLocked = true; + + if (!this.options.loop && (newC > 0 || newC < this.maxC)) { + newC = this.k + ((this.options.vertical ?deltaY : deltaX) / 2); + } + + if (!this.thresholdExceeded && dist >= this.snapThreshold) { + this.thresholdExceeded = true; + this.__event('moveout'); + } else if (this.thresholdExceeded && dist < this.snapThreshold) { + this.thresholdExceeded = false; + this.__event('movein'); + } + + this.__pos(newC); + }, + + __end: function (e) { + if (!this.initiated) return; + + var point; + + if(hasTouch) { + var i=0, l=e.touches.length; + for(;i 0 || this.k < this.maxX)) { - dist = 0; - this.__event('movein'); - } - - // Check if we exceeded the snap threshold - if (dist < this.snapThreshold) { - this.slider.style[transitionDuration] = Math.floor(300 * dist / this.snapThreshold) + 'ms'; - this.__pos(-this.page * this.pageSize); - return; - } - - this.__checkPosition(); - }, - - __checkPosition: function () { - var pageFlip, - pageFlipIndex, - className; - - this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/, ''); - - // Flip the page - if (this.direction > 0) { - this.page = -Math.ceil(this.k / this.pageSize); - this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; - this.pageIndex = this.pageIndex === 0 ? this.options.numberOfPages - 1 : this.pageIndex - 1; - - pageFlip = this.currentMasterPage - 1; - pageFlip = pageFlip < 0 ? 2 : pageFlip; - this.masterPages[pageFlip].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; - - pageFlipIndex = this.page - 1; - } else { - this.page = -Math.floor(this.k / this.pageSize); - this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; - this.pageIndex = this.pageIndex == this.options.numberOfPages - 1 ? 0 : this.pageIndex + 1; - - pageFlip = this.currentMasterPage + 1; - pageFlip = pageFlip > 2 ? 0 : pageFlip; - this.masterPages[pageFlip].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; - - pageFlipIndex = this.page + 1; - } - - // Add active class to current page - className = this.masterPages[this.currentMasterPage].className; - /(^|\s)swipeview-active(\s|$)/.test(className) || (this.masterPages[this.currentMasterPage].className = !className ? 'swipeview-active' : className + ' swipeview-active'); - - // Add loading class to flipped page - className = this.masterPages[pageFlip].className; - /(^|\s)swipeview-loading(\s|$)/.test(className) || (this.masterPages[pageFlip].className = !className ? 'swipeview-loading' : className + ' swipeview-loading'); - - pageFlipIndex = pageFlipIndex - Math.floor(pageFlipIndex / this.options.numberOfPages) * this.options.numberOfPages; - this.masterPages[pageFlip].dataset.upcomingPageIndex = pageFlipIndex; // Index to be loaded in the newly flipped page - - newC = -this.page * this.pageSize; - - this.slider.style[transitionDuration] = Math.floor(500 * Math.abs(this.k - newC) / this.pageSize) + 'ms'; - - // Hide the next page if we decided to disable looping - if (!this.options.loop) { - this.masterPages[pageFlip].style.visibility = newC === 0 || newC == this.maxX ? 'hidden' : ''; - } - - if (this.k == newC) { - this.__flip(); // If we swiped all the way long to the next page (extremely rare but still) - } else { - this.__pos(newC); - if (this.options.hastyPageFlip) this.__flip(); - } - }, - - __flip: function () { - this.__event('flip'); - - for (var i=0; i<3; i++) { - this.masterPages[i].className = this.masterPages[i].className.replace(/(^|\s)swipeview-loading(\s|$)/, ''); // Remove the loading class - this.masterPages[i].dataset.pageIndex = this.masterPages[i].dataset.upcomingPageIndex; - } - }, - - __event: function (type) { - var ev = document.createEvent("Event"); - - ev.initEvent(this.id + '-swipeview-' + type, true, true); - - this.wrapper.dispatchEvent(ev); - } - }; - - function prefixStyle (style) { - if ( vendor === '' ) return style; - - style = style.charAt(0).toUpperCase() + style.substr(1); - return vendor + style; - } - - return SwipeView; + } + else { + point = e; + } + + var dist = this.options.vertical ? Math.abs(point.pageY - this.startY) : Math.abs(point.pageX - this.startX); + + + this.initiated = false; + + if (!this.moved) return; + + if (!this.options.loop && (this.k > 0 || this.k < this.maxX)) { + dist = 0; + this.__event('movein'); + } + + // Check if we exceeded the snap threshold + if (dist < this.snapThreshold) { + this.slider.style[transitionDuration] = Math.floor(300 * dist / this.snapThreshold) + 'ms'; + this.__pos(-this.page * this.pageSize); + return; + } + + this.__checkPosition(); + }, + + __checkPosition: function () { + var pageFlip, + pageFlipIndex, + className; + + this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/, ''); + + // Flip the page + if (this.direction > 0) { + this.page = -Math.ceil(this.k / this.pageSize); + this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; + this.pageIndex = this.pageIndex === 0 ? this.options.numberOfPages - 1 : this.pageIndex - 1; + + pageFlip = this.currentMasterPage - 1; + pageFlip = pageFlip < 0 ? 2 : pageFlip; + this.masterPages[pageFlip].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; + + pageFlipIndex = this.page - 1; + } else { + this.page = -Math.floor(this.k / this.pageSize); + this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; + this.pageIndex = this.pageIndex == this.options.numberOfPages - 1 ? 0 : this.pageIndex + 1; + + pageFlip = this.currentMasterPage + 1; + pageFlip = pageFlip > 2 ? 0 : pageFlip; + this.masterPages[pageFlip].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; + + pageFlipIndex = this.page + 1; + } + + // Add active class to current page + className = this.masterPages[this.currentMasterPage].className; + /(^|\s)swipeview-active(\s|$)/.test(className) || (this.masterPages[this.currentMasterPage].className = !className ? 'swipeview-active' : className + ' swipeview-active'); + + // Add loading class to flipped page + className = this.masterPages[pageFlip].className; + /(^|\s)swipeview-loading(\s|$)/.test(className) || (this.masterPages[pageFlip].className = !className ? 'swipeview-loading' : className + ' swipeview-loading'); + + pageFlipIndex = pageFlipIndex - Math.floor(pageFlipIndex / this.options.numberOfPages) * this.options.numberOfPages; + this.masterPages[pageFlip].dataset.upcomingPageIndex = pageFlipIndex; // Index to be loaded in the newly flipped page + + newC = -this.page * this.pageSize; + + this.slider.style[transitionDuration] = Math.floor(500 * Math.abs(this.k - newC) / this.pageSize) + 'ms'; + + // Hide the next page if we decided to disable looping + if (!this.options.loop) { + this.masterPages[pageFlip].style.visibility = newC === 0 || newC == this.maxX ? 'hidden' : ''; + } + + if (this.k == newC) { + this.__flip(); // If we swiped all the way long to the next page (extremely rare but still) + } else { + this.__pos(newC); + if (this.options.hastyPageFlip) this.__flip(); + } + }, + + __flip: function () { + this.__event('flip'); + + for (var i=0; i<3; i++) { + this.masterPages[i].className = this.masterPages[i].className.replace(/(^|\s)swipeview-loading(\s|$)/, ''); // Remove the loading class + this.masterPages[i].dataset.pageIndex = this.masterPages[i].dataset.upcomingPageIndex; + } + }, + + __event: function (type) { + var ev = document.createEvent("Event"); + + ev.initEvent(this.id + '-swipeview-' + type, true, true); + + this.wrapper.dispatchEvent(ev); + } + }; + + function prefixStyle (style) { + if ( vendor === '' ) return style; + + style = style.charAt(0).toUpperCase() + style.substr(1); + return vendor + style; + } + + return SwipeView; })(window, document); From b965bc11629c2966406db2002a9527afc1ec30e4 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Mon, 1 Jul 2013 15:19:31 +0200 Subject: [PATCH 31/61] allow to specify clientHeight and clientWidth in the option needed when, the wrapper is not visible and has no size yet --- src/swipeview.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/swipeview.js b/src/swipeview.js index 7b12c13..c78e9d0 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -70,7 +70,9 @@ var SwipeView = (function (window, document) { snapThreshold: null, hastyPageFlip: false, vertical: false, - loop: true + loop: true, + clientWidth: 1024, + clientHeight: 145 }; // User defined options @@ -171,9 +173,8 @@ var SwipeView = (function (window, document) { }, refreshSize: function () { - // FIXME, get container width/height if wrapper width/height equals 0 - this.wrapperWidth = this.wrapper.clientWidth === 0 ? 1024 : this.wrapper.clientWidth; - this.wrapperHeight = this.wrapper.clientHeight === 0 ? 145 : this.wrapper.clientHeight; + this.wrapperWidth = this.wrapper.clientWidth === 0 ? this.options.clientWidth : this.wrapper.clientWidth; + this.wrapperHeight = this.wrapper.clientHeight === 0 ? this.options.clientHeight : this.wrapper.clientHeight; this.wrapperSize = this.options.vertical ? this.wrapperHeight : this.wrapperWidth; this.pageSize = this.options.vertical ? this.wrapperHeight : this.wrapperWidth; this.maxX = -this.options.numberOfPages * this.pageSize + this.wrapperSize; From e5d766ffb74d073c469c34648b73236134858496 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Mon, 1 Jul 2013 18:08:01 +0200 Subject: [PATCH 32/61] tiny refactoring --- src/swipeview.js | 73 ++++++++++++++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/src/swipeview.js b/src/swipeview.js index c78e9d0..00980c9 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -78,6 +78,29 @@ var SwipeView = (function (window, document) { // User defined options for (i in options) this.options[i] = options[i]; + this.currentMasterPage = 1; + this.k = 0; + this.maxK = 0; + this.page = 0; + this.pageIndex = 0; + this.customEvents = []; + this.wrapperWidth = 0; + this.wrapperHeight = 0; + this.pageSize = 0; + this.initiated = false; + this.identifier = null; + this.moved = false; + this.thresholdExceeded = false; + this.startX = 0; + this.startX = 0; + this.pointX = 0; + this.pointY = 0; + this.stepsX = 0; + this.stepsY = 0; + this.direction = 0; + this.directionLocked = false; + this.cssPosition = this.options.vertical ? 'top' : 'left'; + this.wrapper.style.overflow = 'hidden'; this.wrapper.style.position = 'relative'; @@ -85,7 +108,10 @@ var SwipeView = (function (window, document) { div = document.createElement('div'); div.className = 'swipeview-slider'; - div.style.cssText = 'position:relative;top:0;height:100%;width:100%;' + cssVendor + 'transition-duration:0;' + cssVendor + 'transform:translateZ(0);' + cssVendor + 'transition-timing-function:ease-out'; + div.style.cssText = 'position:relative;top:0;height:100%;width:100%;' + + cssVendor + 'transition-duration:0;' + + cssVendor + 'transform:translateZ(0);' + + cssVendor + 'transition-timing-function:ease-out'; this.wrapper.appendChild(div); this.slider = div; @@ -93,7 +119,9 @@ var SwipeView = (function (window, document) { for (i=-1; i<2; i++) { div = document.createElement('div'); - div.style.cssText = cssVendor + 'transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;' + (this.options.vertical ? 'top' : 'left') + ':' + i*100 + '%'; + div.style.cssText = cssVendor + + 'transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;' + + this.cssPosition + ':' + i*100 + '%'; if (!div.dataset) div.dataset = {}; pageIndex = i == -1 ? this.options.numberOfPages - 1 : i; div.dataset.pageIndex = pageIndex; @@ -122,12 +150,6 @@ var SwipeView = (function (window, document) { }; SwipeView.prototype = { - currentMasterPage: 1, - k: 0, - page: 0, - pageIndex: 0, - customEvents: [], - reset : function (pageCount) { this.goToPage(0); this.updatePageCount(pageCount); @@ -177,7 +199,7 @@ var SwipeView = (function (window, document) { this.wrapperHeight = this.wrapper.clientHeight === 0 ? this.options.clientHeight : this.wrapper.clientHeight; this.wrapperSize = this.options.vertical ? this.wrapperHeight : this.wrapperWidth; this.pageSize = this.options.vertical ? this.wrapperHeight : this.wrapperWidth; - this.maxX = -this.options.numberOfPages * this.pageSize + this.wrapperSize; + this.maxK = -this.options.numberOfPages * this.pageSize + this.wrapperSize; this.snapThreshold = this.options.snapThreshold === null ? Math.round(this.pageSize * 0.15) : /%/.test(this.options.snapThreshold) ? @@ -187,7 +209,7 @@ var SwipeView = (function (window, document) { updatePageCount: function (n) { this.options.numberOfPages = n; - this.maxX = -this.options.numberOfPages * this.pageSize + this.wrapperSize; + this.maxK = -this.options.numberOfPages * this.pageSize + this.wrapperSize; }, goToPage: function (p) { @@ -210,25 +232,25 @@ var SwipeView = (function (window, document) { this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className + ' swipeview-active'; if (this.currentMasterPage === 0) { - this.masterPages[2].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; - this.masterPages[0].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + '%'; - this.masterPages[1].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; + this.masterPages[2].style[this.cssPosition] = this.page * 100 - 100 + '%'; + this.masterPages[0].style[this.cssPosition] = this.page * 100 + '%'; + this.masterPages[1].style[this.cssPosition] = this.page * 100 + 100 + '%'; this.masterPages[2].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; this.masterPages[0].dataset.upcomingPageIndex = this.page; this.masterPages[1].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; } else if (this.currentMasterPage == 1) { - this.masterPages[0].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; - this.masterPages[1].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + '%'; - this.masterPages[2].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; + this.masterPages[0].style[this.cssPosition] = this.page * 100 - 100 + '%'; + this.masterPages[1].style[this.cssPosition] = this.page * 100 + '%'; + this.masterPages[2].style[this.cssPosition] = this.page * 100 + 100 + '%'; this.masterPages[0].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; this.masterPages[1].dataset.upcomingPageIndex = this.page; this.masterPages[2].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; } else { - this.masterPages[1].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; - this.masterPages[2].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + '%'; - this.masterPages[0].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; + this.masterPages[1].style[this.cssPosition] = this.page * 100 - 100 + '%'; + this.masterPages[2].style[this.cssPosition] = this.page * 100 + '%'; + this.masterPages[0].style[this.cssPosition] = this.page * 100 + 100 + '%'; this.masterPages[1].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; this.masterPages[2].dataset.upcomingPageIndex = this.page; @@ -239,7 +261,7 @@ var SwipeView = (function (window, document) { }, next: function () { - if (!this.options.loop && this.k == this.maxX) return; + if (!this.options.loop && this.k == this.maxK) return; this.direction = -1; this.k -= 1; @@ -317,9 +339,6 @@ var SwipeView = (function (window, document) { this.direction = 0; this.directionLocked = false; -/* var matrix = getComputedStyle(this.slider, null).webkitTransform.replace(/[^0-9-.,]/g, '').split(','); - this.x = matrix[4] * 1;*/ - this.slider.style[transitionDuration] = '0s'; this.__event('touchstart'); @@ -418,7 +437,7 @@ var SwipeView = (function (window, document) { if (!this.moved) return; - if (!this.options.loop && (this.k > 0 || this.k < this.maxX)) { + if (!this.options.loop && (this.k > 0 || this.k < this.maxK)) { dist = 0; this.__event('movein'); } @@ -448,7 +467,7 @@ var SwipeView = (function (window, document) { pageFlip = this.currentMasterPage - 1; pageFlip = pageFlip < 0 ? 2 : pageFlip; - this.masterPages[pageFlip].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 - 100 + '%'; + this.masterPages[pageFlip].style[this.cssPosition] = this.page * 100 - 100 + '%'; pageFlipIndex = this.page - 1; } else { @@ -458,7 +477,7 @@ var SwipeView = (function (window, document) { pageFlip = this.currentMasterPage + 1; pageFlip = pageFlip > 2 ? 0 : pageFlip; - this.masterPages[pageFlip].style[this.options.vertical ? 'top' : 'left'] = this.page * 100 + 100 + '%'; + this.masterPages[pageFlip].style[this.cssPosition] = this.page * 100 + 100 + '%'; pageFlipIndex = this.page + 1; } @@ -480,7 +499,7 @@ var SwipeView = (function (window, document) { // Hide the next page if we decided to disable looping if (!this.options.loop) { - this.masterPages[pageFlip].style.visibility = newC === 0 || newC == this.maxX ? 'hidden' : ''; + this.masterPages[pageFlip].style.visibility = newC === 0 || newC == this.maxK ? 'hidden' : ''; } if (this.k == newC) { From a2e444d43ba6d67f459df531c1cce9a16b93fdda Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Mon, 1 Jul 2013 18:16:59 +0200 Subject: [PATCH 33/61] improve README --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ceb4d06..eb3b23a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ -SwipeView v1.0 - 2012-08-25 -============================ +SwipeView v1.0.4 - 2013-07-01 +============================= + +Modified version of Matteo's SwipeView which allows vertical swipe (with the `vertical` option) and also allows multiple SwipeViews in the same document: + +example: Multiple SwipeViews in the same document + vertical swipe: [http://peutetre.github.io/SwipeView/demo/gallery7/](http://peutetre.github.io/SwipeView/demo/gallery7/) Virtually infinite loop-able horizontal carousel for desktop and mobile browsers. @@ -7,8 +11,6 @@ Read more at [cubiq.org](http://cubiq.org/swipeview) Gallery Demo: [http://cubiq.org/dropbox/SwipeView/demo/gallery](http://cubiq.org/dropbox/SwipeView/demo/gallery) -Multiple SwipeViews in the same document: [http://peutetre.github.io/SwipeView/demo/gallery2/](http://peutetre.github.io/SwipeView/demo/gallery2/) - eReader Demo: [http://cubiq.org/dropbox/SwipeView/demo/ereader](http://cubiq.org/dropbox/SwipeView/demo/ereader) Inline Demo: [http://cubiq.org/dropbox/SwipeView/demo/inline](http://cubiq.org/dropbox/SwipeView/demo/inline) From 9b9d50278d66da984f6a0d8af8e9b02116abfbdc Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Mon, 1 Jul 2013 18:16:59 +0200 Subject: [PATCH 34/61] improve README --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ceb4d06..eb3b23a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ -SwipeView v1.0 - 2012-08-25 -============================ +SwipeView v1.0.4 - 2013-07-01 +============================= + +Modified version of Matteo's SwipeView which allows vertical swipe (with the `vertical` option) and also allows multiple SwipeViews in the same document: + +example: Multiple SwipeViews in the same document + vertical swipe: [http://peutetre.github.io/SwipeView/demo/gallery7/](http://peutetre.github.io/SwipeView/demo/gallery7/) Virtually infinite loop-able horizontal carousel for desktop and mobile browsers. @@ -7,8 +11,6 @@ Read more at [cubiq.org](http://cubiq.org/swipeview) Gallery Demo: [http://cubiq.org/dropbox/SwipeView/demo/gallery](http://cubiq.org/dropbox/SwipeView/demo/gallery) -Multiple SwipeViews in the same document: [http://peutetre.github.io/SwipeView/demo/gallery2/](http://peutetre.github.io/SwipeView/demo/gallery2/) - eReader Demo: [http://cubiq.org/dropbox/SwipeView/demo/ereader](http://cubiq.org/dropbox/SwipeView/demo/ereader) Inline Demo: [http://cubiq.org/dropbox/SwipeView/demo/inline](http://cubiq.org/dropbox/SwipeView/demo/inline) From 8a730100802bf2e788b88eaeaf9c400908ece6dd Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Tue, 2 Jul 2013 11:18:47 +0200 Subject: [PATCH 35/61] refactoring demo gallery7 --- demo/gallery7/app.js | 60 ++++++++++++++++ demo/gallery7/index.html | 149 ++++----------------------------------- 2 files changed, 75 insertions(+), 134 deletions(-) create mode 100644 demo/gallery7/app.js diff --git a/demo/gallery7/app.js b/demo/gallery7/app.js new file mode 100644 index 0000000..c97bafc --- /dev/null +++ b/demo/gallery7/app.js @@ -0,0 +1,60 @@ +/** + * app.js + */ + +function genData(size) { + + function getImgURL() { + return "http://lorempixel.com/186/125/?t=" + Math.ceil(Math.random()*100000); + } + + return { + get : function (i) { + return { + imgs : [getImgURL(), getImgURL(), getImgURL(), getImgURL(), getImgURL()], + height : 125, + width : 186 + }; + }, + length : size + }; +} + +var gallery, el, i = 0, page; + +gallery = new SwipeView('#wrapper', { + numberOfPages: 100, + vertical: true, + hastyPageFlip:true +}); + +function init(domElt, myGallery, id, idx) { + domElt = document.createElement('div'); + domElt.className = 'wrapper'; + domElt.id = "wrap" + idx + "-" + id; + + myGallery.masterPages[id]['swipeview'+idx] = InfiniteGraphSet(domElt, genData(100)); + myGallery.masterPages[id].appendChild(domElt); +} + +// Load initial data +for (; i<3; i++) { + page = i==0 ? 100-1 : i-1; + init(el, gallery, i, 0); + init(el, gallery, i, 1); + init(el, gallery, i, 2); + init(el, gallery, i, 3); +} + +gallery.onFlip(function () { + var upcoming, i=0; + for (; i<3; i++) { + upcoming = gallery.masterPages[i].dataset.upcomingPageIndex; + if (upcoming != gallery.masterPages[i].dataset.pageIndex) { + gallery.masterPages[i].swipeview0.reset(genData(100)); + gallery.masterPages[i].swipeview1.reset(genData(100)); + gallery.masterPages[i].swipeview2.reset(genData(100)); + gallery.masterPages[i].swipeview3.reset(genData(100)); + } + } +}); diff --git a/demo/gallery7/index.html b/demo/gallery7/index.html index 6170433..c9a862b 100644 --- a/demo/gallery7/index.html +++ b/demo/gallery7/index.html @@ -1,137 +1,18 @@ - - - - - - SwipeView - - - - - - -
- - - + + + + + + SwipeView + + + + +
+ + + + From 6398e7415e2c5bc292e059fca023166aed07f05f Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Thu, 4 Jul 2013 15:15:33 +0200 Subject: [PATCH 36/61] add package.json + Gruntfile.js + pass jshint --- .gitignore | 3 +- Gruntfile.js | 32 ++++++++++++++++++++ dist/swipeview.min.js | 2 ++ package.json | 30 +++++++++++++++++++ src/swipeview.js | 69 ++++++++++++++++++++++--------------------- 5 files changed, 102 insertions(+), 34 deletions(-) create mode 100644 Gruntfile.js create mode 100644 dist/swipeview.min.js create mode 100644 package.json diff --git a/.gitignore b/.gitignore index 6b319f8..365a945 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .DS_Store -*-min.js \ No newline at end of file +*-min.js +/node_modules/ \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 0000000..b1f7010 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,32 @@ +module.exports = function(grunt) { + + grunt.initConfig({ + pkg: grunt.file.readJSON('package.json'), + uglify: { + options: { + banner: '/*! <%= pkg.name %> <%= pkg.version %> - <%= pkg.description %> */\n' + }, + build: { + src: 'src/<%= pkg.name %>.js', + dest: 'dist/<%= pkg.name %>.min.js' + } + }, + jshint: { + all: { + src: ['src/<%= pkg.name %>.js'] + } + }, + watch: { + all: { + files: ['src/*.js'], + tasks: ['default'] + } + } + }); + + grunt.loadNpmTasks('grunt-contrib-watch'); + grunt.loadNpmTasks('grunt-contrib-uglify'); + grunt.loadNpmTasks('grunt-contrib-jshint'); + + grunt.registerTask('default', ['jshint', 'uglify']); +}; diff --git a/dist/swipeview.min.js b/dist/swipeview.min.js new file mode 100644 index 0000000..2e2c835 --- /dev/null +++ b/dist/swipeview.min.js @@ -0,0 +1,2 @@ +/*! swipeview 1.0.4 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo */ +var SwipeView=function(a,b){function c(a){return""===e?a:(a=a.charAt(0).toUpperCase()+a.substr(1),e+a)}var d=b.createElement("div").style,e=function(){for(var a,b="t,webkitT,MozT,msT,OT".split(","),c=0,e=b.length;e>c;c++)if(a=b[c]+"ransform",a in d)return b[c].substr(0,b[c].length-1);return!1}(),f=e?"-"+e.toLowerCase()+"-":"",g=c("transform"),h=c("transitionDuration"),i=c("perspective")in d,j="ontouchstart"in a,k=(c("transition")in d,i?" translateZ(0)":""),l="onorientationchange"in a?"orientationchange":"resize",m=j?"touchstart":"mousedown",n=j?"touchmove":"mousemove",o=j?"touchend":"mouseup",p=j?"touchcancel":"mouseup",q=function(){if(e===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[e]}(),r=0,s=function(c,d){var g,h,i,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++r,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(g in d)this.options[g]=d[g];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],h=b.createElement("div"),h.className="swipeview-slider",h.style.cssText="position:relative;top:0;height:100%;width:100%;"+f+"transition-duration:0;"+f+"transform:translateZ(0);"+f+"transition-timing-function:ease-out",this.wrapper.appendChild(h),this.slider=h,this.refreshSize(),g=-1;2>g;g++)h=b.createElement("div"),h.style.cssText=f+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*g+"%",h.dataset||(h.dataset={}),k=-1==g?this.options.numberOfPages-1:g,h.dataset.pageIndex=k,h.dataset.upcomingPageIndex=k,this.options.loop||-1!=g||(h.style.visibility="hidden"),this.slider.appendChild(h),this.masterPages.push(h);i=this.masterPages[1].className,this.masterPages[1].className=i?i+" swipeview-active":"swipeview-active",a.addEventListener(l,this,!1),this.wrapper.addEventListener(m,this,!1),this.wrapper.addEventListener(n,this,!1),this.wrapper.addEventListener(o,this,!1),this.slider.addEventListener(q,this,!1),"O"==e&&this.slider.addEventListener(q.toLowerCase(),this,!1),j||this.wrapper.addEventListener("mouseout",this,!1)};return s.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.wrapper.addEventListener(this.id+"swipeview-flip",a,!1),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.wrapper.addEventListener(this.id+"swipeview-moveout",a,!1),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.wrapper.addEventListener(this.id+"swipeview-movein",a,!1),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.wrapper.addEventListener(this.id+"swipeview-touchstart",a,!1),this.customEvents.push(["touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.wrapper.removeEventListener(this.id+"swipeview-"+this.customEvents[0][0],this.customEvents[0][1],!1),this.customEvents.shift();a.removeEventListener(l,this,!1),this.wrapper.removeEventListener(m,this,!1),this.wrapper.removeEventListener(n,this,!1),this.wrapper.removeEventListener(o,this,!1),this.slider.removeEventListener(q,this,!1),j||this.wrapper.removeEventListener("mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[h]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case m:this.__start(a);break;case n:this.__move(a);break;case"mouseout":this.initiated&&a.toElement==b.childNodes[1]&&this.__end();break;case p:case o:this.__end(a);break;case l:this.__resize();break;case q:case"otransitionend":a.target!=this.slider||this.options.hastyPageFlip||this.__flip()}},__pos:function(a){this.k=a,this.slider.style[g]=(this.options.vertical?"translate(0,"+a+"px)":"translate("+a+"px,0)")+k},__resize:function(){this.refreshSize(),this.slider.style[h]="0s",this.__pos(-this.page*this.pageSize)},__start:function(a){if(!this.initiated){var b=j?a.targetTouches[0]:a;this.initiated=!0,this.identifier=b.identifier,this.moved=!1,this.thresholdExceeded=!1,this.startX=b.pageX,this.startY=b.pageY,this.pointX=b.pageX,this.pointY=b.pageY,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.slider.style[h]="0s",this.__event("touchstart")}},__move:function(a){if(this.initiated){var b,c,d;if(j){for(b=0,c=a.changedTouches.length;c>b;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=d.pageX-this.pointX,f=d.pageY-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(d.pageY-this.startY):Math.abs(d.pageX-this.startX);if(this.moved=!0,this.pointX=d.pageX,this.pointY=d.pageY,this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),!(this.stepsX<10&&this.stepsY<10)){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;a.preventDefault(),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.__event("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(b.pageY-this.startY):Math.abs(b.pageX-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[h]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.__event("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex},__event:function(a){var c=b.createEvent("Event");c.initEvent(this.id+"-swipeview-"+a,!0,!0),this.wrapper.dispatchEvent(c)}},s}(window,document); \ No newline at end of file diff --git a/package.json b/package.json new file mode 100644 index 0000000..14c0066 --- /dev/null +++ b/package.json @@ -0,0 +1,30 @@ +{ + "name": "swipeview", + "version": "1.0.5", + "description": "Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo", + "keywords": [ + "swipe", + "mobile", + "carousel", + "infinite" + ], + "author": "Matteo Spinelli (http://cubiq.org/)", + "contributors": [{ + "name" : "Paul Panserrieu", + "email": "paul@42loops.com", + "url" : "http://42loops.com" + }], + "dependencies" : { }, + "devDependencies": { + "grunt": "~0.4.1", + "grunt-contrib-jshint": "~0.6.0", + "grunt-contrib-uglify": "~0.2.2", + "grunt-contrib-watch": "~0.4.4" + }, + "main": "src/swipeview.js", + "license": "MIT", + "repository": { + "type": "git", + "url": "git@github.com:peutetre/SwipeView.git" + } +} diff --git a/src/swipeview.js b/src/swipeview.js index 00980c9..d51beea 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -2,6 +2,7 @@ * SwipeView v1.0 ~ Copyright (c) 2012 Matteo Spinelli, http://cubiq.org * Released under MIT license, http://cubiq.org/license */ + var SwipeView = (function (window, document) { var dummyStyle = document.createElement('div').style, vendor = (function () { @@ -108,10 +109,10 @@ var SwipeView = (function (window, document) { div = document.createElement('div'); div.className = 'swipeview-slider'; - div.style.cssText = 'position:relative;top:0;height:100%;width:100%;' - + cssVendor + 'transition-duration:0;' - + cssVendor + 'transform:translateZ(0);' - + cssVendor + 'transition-timing-function:ease-out'; + div.style.cssText = 'position:relative;top:0;height:100%;width:100%;' + + cssVendor + 'transition-duration:0;' + + cssVendor + 'transform:translateZ(0);' + + cssVendor + 'transition-timing-function:ease-out'; this.wrapper.appendChild(div); this.slider = div; @@ -119,9 +120,9 @@ var SwipeView = (function (window, document) { for (i=-1; i<2; i++) { div = document.createElement('div'); - div.style.cssText = cssVendor - + 'transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;' - + this.cssPosition + ':' + i*100 + '%'; + div.style.cssText = cssVendor + + 'transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;' + + this.cssPosition + ':' + i*100 + '%'; if (!div.dataset) div.dataset = {}; pageIndex = i == -1 ? this.options.numberOfPages - 1 : i; div.dataset.pageIndex = pageIndex; @@ -218,7 +219,8 @@ var SwipeView = (function (window, document) { this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/, ''); for (i=0; i<3; i++) { className = this.masterPages[i].className; - /(^|\s)swipeview-loading(\s|$)/.test(className) || (this.masterPages[i].className = !className ? 'swipeview-loading' : className + ' swipeview-loading'); + if(!/(^|\s)swipeview-loading(\s|$)/.test(className)) + this.masterPages[i].className = !className ? 'swipeview-loading' : className + ' swipeview-loading'; } p = p < 0 ? 0 : p > this.options.numberOfPages-1 ? this.options.numberOfPages-1 : p; @@ -278,27 +280,26 @@ var SwipeView = (function (window, document) { handleEvent: function (e) { switch (e.type) { - case startEvent: - this.__start(e); - break; - case moveEvent: - this.__move(e); - break; - case "mouseout": - if (!this.initiated) { break; } - else if ( e.toElement == document.childNodes[1]) { } - else if ( e.toElement != this.wrapper.parentNode ) { break; } - case cancelEvent: - case endEvent: - this.__end(e); - break; - case resizeEvent: - this.__resize(); - break; - case transitionEndEvent: - case 'otransitionend': - if (e.target == this.slider && !this.options.hastyPageFlip) this.__flip(); - break; + case startEvent: + this.__start(e); + break; + case moveEvent: + this.__move(e); + break; + case "mouseout": + if (this.initiated && e.toElement == document.childNodes[1]) this.__end(); + break; + case cancelEvent: + case endEvent: + this.__end(e); + break; + case resizeEvent: + this.__resize(); + break; + case transitionEndEvent: + case 'otransitionend': + if (e.target == this.slider && !this.options.hastyPageFlip) this.__flip(); + break; } }, @@ -410,12 +411,12 @@ var SwipeView = (function (window, document) { var point; if(hasTouch) { - var i=0, l=e.touches.length; + var i=0, l = e.touches.length; for(;i Date: Thu, 4 Jul 2013 15:18:30 +0200 Subject: [PATCH 37/61] update read me --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eb3b23a..94deb76 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -SwipeView v1.0.4 - 2013-07-01 +SwipeView v1.0.5 - 2013-07-04 ============================= Modified version of Matteo's SwipeView which allows vertical swipe (with the `vertical` option) and also allows multiple SwipeViews in the same document: From d6a314f6932de4026fcb8e681e837aebcca1a5a9 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Thu, 4 Jul 2013 15:22:33 +0200 Subject: [PATCH 38/61] add version in dist filename --- Gruntfile.js | 2 +- dist/{swipeview.min.js => swipeview-1.0.5.min.js} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename dist/{swipeview.min.js => swipeview-1.0.5.min.js} (99%) diff --git a/Gruntfile.js b/Gruntfile.js index b1f7010..945ad21 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -8,7 +8,7 @@ module.exports = function(grunt) { }, build: { src: 'src/<%= pkg.name %>.js', - dest: 'dist/<%= pkg.name %>.min.js' + dest: 'dist/<%= pkg.name %>-<%= pkg.version %>.min.js' } }, jshint: { diff --git a/dist/swipeview.min.js b/dist/swipeview-1.0.5.min.js similarity index 99% rename from dist/swipeview.min.js rename to dist/swipeview-1.0.5.min.js index 2e2c835..c68a73d 100644 --- a/dist/swipeview.min.js +++ b/dist/swipeview-1.0.5.min.js @@ -1,2 +1,2 @@ -/*! swipeview 1.0.4 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo */ +/*! swipeview 1.0.5 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo */ var SwipeView=function(a,b){function c(a){return""===e?a:(a=a.charAt(0).toUpperCase()+a.substr(1),e+a)}var d=b.createElement("div").style,e=function(){for(var a,b="t,webkitT,MozT,msT,OT".split(","),c=0,e=b.length;e>c;c++)if(a=b[c]+"ransform",a in d)return b[c].substr(0,b[c].length-1);return!1}(),f=e?"-"+e.toLowerCase()+"-":"",g=c("transform"),h=c("transitionDuration"),i=c("perspective")in d,j="ontouchstart"in a,k=(c("transition")in d,i?" translateZ(0)":""),l="onorientationchange"in a?"orientationchange":"resize",m=j?"touchstart":"mousedown",n=j?"touchmove":"mousemove",o=j?"touchend":"mouseup",p=j?"touchcancel":"mouseup",q=function(){if(e===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[e]}(),r=0,s=function(c,d){var g,h,i,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++r,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(g in d)this.options[g]=d[g];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],h=b.createElement("div"),h.className="swipeview-slider",h.style.cssText="position:relative;top:0;height:100%;width:100%;"+f+"transition-duration:0;"+f+"transform:translateZ(0);"+f+"transition-timing-function:ease-out",this.wrapper.appendChild(h),this.slider=h,this.refreshSize(),g=-1;2>g;g++)h=b.createElement("div"),h.style.cssText=f+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*g+"%",h.dataset||(h.dataset={}),k=-1==g?this.options.numberOfPages-1:g,h.dataset.pageIndex=k,h.dataset.upcomingPageIndex=k,this.options.loop||-1!=g||(h.style.visibility="hidden"),this.slider.appendChild(h),this.masterPages.push(h);i=this.masterPages[1].className,this.masterPages[1].className=i?i+" swipeview-active":"swipeview-active",a.addEventListener(l,this,!1),this.wrapper.addEventListener(m,this,!1),this.wrapper.addEventListener(n,this,!1),this.wrapper.addEventListener(o,this,!1),this.slider.addEventListener(q,this,!1),"O"==e&&this.slider.addEventListener(q.toLowerCase(),this,!1),j||this.wrapper.addEventListener("mouseout",this,!1)};return s.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.wrapper.addEventListener(this.id+"swipeview-flip",a,!1),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.wrapper.addEventListener(this.id+"swipeview-moveout",a,!1),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.wrapper.addEventListener(this.id+"swipeview-movein",a,!1),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.wrapper.addEventListener(this.id+"swipeview-touchstart",a,!1),this.customEvents.push(["touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.wrapper.removeEventListener(this.id+"swipeview-"+this.customEvents[0][0],this.customEvents[0][1],!1),this.customEvents.shift();a.removeEventListener(l,this,!1),this.wrapper.removeEventListener(m,this,!1),this.wrapper.removeEventListener(n,this,!1),this.wrapper.removeEventListener(o,this,!1),this.slider.removeEventListener(q,this,!1),j||this.wrapper.removeEventListener("mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[h]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case m:this.__start(a);break;case n:this.__move(a);break;case"mouseout":this.initiated&&a.toElement==b.childNodes[1]&&this.__end();break;case p:case o:this.__end(a);break;case l:this.__resize();break;case q:case"otransitionend":a.target!=this.slider||this.options.hastyPageFlip||this.__flip()}},__pos:function(a){this.k=a,this.slider.style[g]=(this.options.vertical?"translate(0,"+a+"px)":"translate("+a+"px,0)")+k},__resize:function(){this.refreshSize(),this.slider.style[h]="0s",this.__pos(-this.page*this.pageSize)},__start:function(a){if(!this.initiated){var b=j?a.targetTouches[0]:a;this.initiated=!0,this.identifier=b.identifier,this.moved=!1,this.thresholdExceeded=!1,this.startX=b.pageX,this.startY=b.pageY,this.pointX=b.pageX,this.pointY=b.pageY,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.slider.style[h]="0s",this.__event("touchstart")}},__move:function(a){if(this.initiated){var b,c,d;if(j){for(b=0,c=a.changedTouches.length;c>b;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=d.pageX-this.pointX,f=d.pageY-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(d.pageY-this.startY):Math.abs(d.pageX-this.startX);if(this.moved=!0,this.pointX=d.pageX,this.pointY=d.pageY,this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),!(this.stepsX<10&&this.stepsY<10)){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;a.preventDefault(),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.__event("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(b.pageY-this.startY):Math.abs(b.pageX-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[h]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.__event("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex},__event:function(a){var c=b.createEvent("Event");c.initEvent(this.id+"-swipeview-"+a,!0,!0),this.wrapper.dispatchEvent(c)}},s}(window,document); \ No newline at end of file From dbf6d89062b1ed309686d6ce1ad95feed5b6c1e2 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Fri, 5 Jul 2013 00:00:26 +0200 Subject: [PATCH 39/61] oops --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 14c0066..2ac8e42 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "swipeview", "version": "1.0.5", - "description": "Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo", + "description": "Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli", "keywords": [ "swipe", "mobile", From e3ee9355d1e0a2762b5a0197186ed08da280fed0 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Tue, 9 Jul 2013 12:16:52 +0200 Subject: [PATCH 40/61] add grunt-contrib-connect --- Gruntfile.js | 14 ++++++++++++-- package.json | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 945ad21..d782015 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -2,6 +2,14 @@ module.exports = function(grunt) { grunt.initConfig({ pkg: grunt.file.readJSON('package.json'), + connect: { + server: { + options: { + base: "", + port: 9999 + } + } + }, uglify: { options: { banner: '/*! <%= pkg.name %> <%= pkg.version %> - <%= pkg.description %> */\n' @@ -18,15 +26,17 @@ module.exports = function(grunt) { }, watch: { all: { - files: ['src/*.js'], - tasks: ['default'] + files: ['src/*.js', 'demo/*/*.js'], + tasks: ['default', 'dev'] } } }); grunt.loadNpmTasks('grunt-contrib-watch'); + grunt.loadNpmTasks('grunt-contrib-connect'); grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.registerTask('default', ['jshint', 'uglify']); + grunt.registerTask("dev", ["connect", "watch"]); }; diff --git a/package.json b/package.json index 2ac8e42..572350e 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "devDependencies": { "grunt": "~0.4.1", "grunt-contrib-jshint": "~0.6.0", + "grunt-contrib-connect" : "~0.1.2", "grunt-contrib-uglify": "~0.2.2", "grunt-contrib-watch": "~0.4.4" }, From b00696bfe4d2033ebf0b8331933ab116cdbccafa Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Tue, 9 Jul 2013 12:17:45 +0200 Subject: [PATCH 41/61] new demos... --- demo/gallery7/style.css | 2 +- demo/gallery8/app.js | 60 +++++++++++++ demo/gallery8/index.html | 18 ++++ demo/gallery8/infinitegraphset.js | 135 +++++++++++++++++++++++++++++ demo/gallery8/style.css | 33 ++++++++ demo/gallery9/app.js | 60 +++++++++++++ demo/gallery9/index.html | 20 +++++ demo/gallery9/infinitegraphset.js | 136 ++++++++++++++++++++++++++++++ demo/gallery9/style.css | 88 +++++++++++++++++++ 9 files changed, 551 insertions(+), 1 deletion(-) create mode 100644 demo/gallery8/app.js create mode 100644 demo/gallery8/index.html create mode 100644 demo/gallery8/infinitegraphset.js create mode 100644 demo/gallery8/style.css create mode 100644 demo/gallery9/app.js create mode 100644 demo/gallery9/index.html create mode 100644 demo/gallery9/infinitegraphset.js create mode 100644 demo/gallery9/style.css diff --git a/demo/gallery7/style.css b/demo/gallery7/style.css index 8a119db..5b48ebd 100644 --- a/demo/gallery7/style.css +++ b/demo/gallery7/style.css @@ -50,7 +50,7 @@ body { -o-box-pack:center; box-pack:center; -webkit-box-align:center; - -mox-box-align:center; + -moz-box-align:center; -ms-box-align:center; -o-box-align:center; box-align:center; diff --git a/demo/gallery8/app.js b/demo/gallery8/app.js new file mode 100644 index 0000000..c97bafc --- /dev/null +++ b/demo/gallery8/app.js @@ -0,0 +1,60 @@ +/** + * app.js + */ + +function genData(size) { + + function getImgURL() { + return "http://lorempixel.com/186/125/?t=" + Math.ceil(Math.random()*100000); + } + + return { + get : function (i) { + return { + imgs : [getImgURL(), getImgURL(), getImgURL(), getImgURL(), getImgURL()], + height : 125, + width : 186 + }; + }, + length : size + }; +} + +var gallery, el, i = 0, page; + +gallery = new SwipeView('#wrapper', { + numberOfPages: 100, + vertical: true, + hastyPageFlip:true +}); + +function init(domElt, myGallery, id, idx) { + domElt = document.createElement('div'); + domElt.className = 'wrapper'; + domElt.id = "wrap" + idx + "-" + id; + + myGallery.masterPages[id]['swipeview'+idx] = InfiniteGraphSet(domElt, genData(100)); + myGallery.masterPages[id].appendChild(domElt); +} + +// Load initial data +for (; i<3; i++) { + page = i==0 ? 100-1 : i-1; + init(el, gallery, i, 0); + init(el, gallery, i, 1); + init(el, gallery, i, 2); + init(el, gallery, i, 3); +} + +gallery.onFlip(function () { + var upcoming, i=0; + for (; i<3; i++) { + upcoming = gallery.masterPages[i].dataset.upcomingPageIndex; + if (upcoming != gallery.masterPages[i].dataset.pageIndex) { + gallery.masterPages[i].swipeview0.reset(genData(100)); + gallery.masterPages[i].swipeview1.reset(genData(100)); + gallery.masterPages[i].swipeview2.reset(genData(100)); + gallery.masterPages[i].swipeview3.reset(genData(100)); + } + } +}); diff --git a/demo/gallery8/index.html b/demo/gallery8/index.html new file mode 100644 index 0000000..c9a862b --- /dev/null +++ b/demo/gallery8/index.html @@ -0,0 +1,18 @@ + + + + + + + + SwipeView + + + + +
+ + + + + diff --git a/demo/gallery8/infinitegraphset.js b/demo/gallery8/infinitegraphset.js new file mode 100644 index 0000000..006bdc8 --- /dev/null +++ b/demo/gallery8/infinitegraphset.js @@ -0,0 +1,135 @@ +/* + * infinitegraphset.js + */ +(function (win, doc) { + + function InfiniteGraphSet(id, dataO, f) { + var gallery = new SwipeView(id, { + hastyPageFlip:true, + numberOfPages: dataO.length + }), i, page, df = dataO, + ƒ = f || function () { + console.log("tap cb"); + }, + locked = false, + x = 0, y = 0, id; + + function onTouchStart(evt) { + console.log('touchstart'); + if (locked) return; + locked = true; + x = evt.targetTouches.item(0).pageX; + y = evt.targetTouches.item(0).pageY; + id = evt.targetTouches.item(0).identifier; + } + function onTouchMove(evt) { + console.log('touchmove'); + if(!locked) return; + var i,l= evt.changedTouches.length, point; + for(; i + + + + + + + SwipeView + + + + +
+
+
+ + + + + diff --git a/demo/gallery9/infinitegraphset.js b/demo/gallery9/infinitegraphset.js new file mode 100644 index 0000000..4349413 --- /dev/null +++ b/demo/gallery9/infinitegraphset.js @@ -0,0 +1,136 @@ +/* + * infinitegraphset.js + */ +(function (win, doc) { + + function InfiniteGraphSet(id, dataO, f, n, w, h) { + var gallery = new SwipeView(id, { + hastyPageFlip:true, + numberOfPages: dataO.length, + clientWidth : w, + clientHeight : h + }), i, page, df = dataO, + ƒ = f || function () { + console.log("tap cb"); + }, + n = n || 5; + locked = false, + x = 0, y = 0, id; + + // FIXME + /*function onTouchStart(evt) { + console.log('touchstart'); + if (locked) return; + locked = true; + x = evt.targetTouches.item(0).pageX; + y = evt.targetTouches.item(0).pageY; + id = evt.targetTouches.item(0).identifier; + } + function onTouchMove(evt) { + console.log('touchmove'); + if(!locked) return; + var i,l= evt.changedTouches.length, point; + for(; i div , .vertical-swipeview-slider > div{ + position:relative; + display:-webkit-box; + display:-moz-box; + display:-ms-box; + display:-o-box; + display:box; + -webkit-box-orient:vertical; + -moz-box-orient:vertical; + -ms-box-orient:vertical; + -o-box-orient:vertical; + box-orient:vertical; + -webkit-box-pack:center; + -moz-box-pack:center; + -ms-box-pack:center; + -o-box-pack:center; + box-pack:center; + -webkit-box-align:center; + -mox-box-align:center; + -ms-box-align:center; + -o-box-align:center; + box-align:center; + overflow:hidden; +} From a5ad40fad508b64e7fbcbb148690ec5512ffa0ce Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Tue, 9 Jul 2013 12:18:26 +0200 Subject: [PATCH 42/61] fix desktop mouse stuff --- dist/swipeview-1.0.5.min.js | 4 ++-- src/swipeview.js | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dist/swipeview-1.0.5.min.js b/dist/swipeview-1.0.5.min.js index c68a73d..679dd8e 100644 --- a/dist/swipeview-1.0.5.min.js +++ b/dist/swipeview-1.0.5.min.js @@ -1,2 +1,2 @@ -/*! swipeview 1.0.5 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo */ -var SwipeView=function(a,b){function c(a){return""===e?a:(a=a.charAt(0).toUpperCase()+a.substr(1),e+a)}var d=b.createElement("div").style,e=function(){for(var a,b="t,webkitT,MozT,msT,OT".split(","),c=0,e=b.length;e>c;c++)if(a=b[c]+"ransform",a in d)return b[c].substr(0,b[c].length-1);return!1}(),f=e?"-"+e.toLowerCase()+"-":"",g=c("transform"),h=c("transitionDuration"),i=c("perspective")in d,j="ontouchstart"in a,k=(c("transition")in d,i?" translateZ(0)":""),l="onorientationchange"in a?"orientationchange":"resize",m=j?"touchstart":"mousedown",n=j?"touchmove":"mousemove",o=j?"touchend":"mouseup",p=j?"touchcancel":"mouseup",q=function(){if(e===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[e]}(),r=0,s=function(c,d){var g,h,i,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++r,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(g in d)this.options[g]=d[g];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],h=b.createElement("div"),h.className="swipeview-slider",h.style.cssText="position:relative;top:0;height:100%;width:100%;"+f+"transition-duration:0;"+f+"transform:translateZ(0);"+f+"transition-timing-function:ease-out",this.wrapper.appendChild(h),this.slider=h,this.refreshSize(),g=-1;2>g;g++)h=b.createElement("div"),h.style.cssText=f+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*g+"%",h.dataset||(h.dataset={}),k=-1==g?this.options.numberOfPages-1:g,h.dataset.pageIndex=k,h.dataset.upcomingPageIndex=k,this.options.loop||-1!=g||(h.style.visibility="hidden"),this.slider.appendChild(h),this.masterPages.push(h);i=this.masterPages[1].className,this.masterPages[1].className=i?i+" swipeview-active":"swipeview-active",a.addEventListener(l,this,!1),this.wrapper.addEventListener(m,this,!1),this.wrapper.addEventListener(n,this,!1),this.wrapper.addEventListener(o,this,!1),this.slider.addEventListener(q,this,!1),"O"==e&&this.slider.addEventListener(q.toLowerCase(),this,!1),j||this.wrapper.addEventListener("mouseout",this,!1)};return s.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.wrapper.addEventListener(this.id+"swipeview-flip",a,!1),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.wrapper.addEventListener(this.id+"swipeview-moveout",a,!1),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.wrapper.addEventListener(this.id+"swipeview-movein",a,!1),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.wrapper.addEventListener(this.id+"swipeview-touchstart",a,!1),this.customEvents.push(["touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.wrapper.removeEventListener(this.id+"swipeview-"+this.customEvents[0][0],this.customEvents[0][1],!1),this.customEvents.shift();a.removeEventListener(l,this,!1),this.wrapper.removeEventListener(m,this,!1),this.wrapper.removeEventListener(n,this,!1),this.wrapper.removeEventListener(o,this,!1),this.slider.removeEventListener(q,this,!1),j||this.wrapper.removeEventListener("mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[h]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case m:this.__start(a);break;case n:this.__move(a);break;case"mouseout":this.initiated&&a.toElement==b.childNodes[1]&&this.__end();break;case p:case o:this.__end(a);break;case l:this.__resize();break;case q:case"otransitionend":a.target!=this.slider||this.options.hastyPageFlip||this.__flip()}},__pos:function(a){this.k=a,this.slider.style[g]=(this.options.vertical?"translate(0,"+a+"px)":"translate("+a+"px,0)")+k},__resize:function(){this.refreshSize(),this.slider.style[h]="0s",this.__pos(-this.page*this.pageSize)},__start:function(a){if(!this.initiated){var b=j?a.targetTouches[0]:a;this.initiated=!0,this.identifier=b.identifier,this.moved=!1,this.thresholdExceeded=!1,this.startX=b.pageX,this.startY=b.pageY,this.pointX=b.pageX,this.pointY=b.pageY,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.slider.style[h]="0s",this.__event("touchstart")}},__move:function(a){if(this.initiated){var b,c,d;if(j){for(b=0,c=a.changedTouches.length;c>b;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=d.pageX-this.pointX,f=d.pageY-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(d.pageY-this.startY):Math.abs(d.pageX-this.startX);if(this.moved=!0,this.pointX=d.pageX,this.pointY=d.pageY,this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),!(this.stepsX<10&&this.stepsY<10)){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;a.preventDefault(),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.__event("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(b.pageY-this.startY):Math.abs(b.pageX-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[h]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.__event("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex},__event:function(a){var c=b.createEvent("Event");c.initEvent(this.id+"-swipeview-"+a,!0,!0),this.wrapper.dispatchEvent(c)}},s}(window,document); \ No newline at end of file +/*! swipeview 1.0.5 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ +var SwipeView=function(a,b){function c(a){return""===e?a:(a=a.charAt(0).toUpperCase()+a.substr(1),e+a)}var d=b.createElement("div").style,e=function(){for(var a,b="t,webkitT,MozT,msT,OT".split(","),c=0,e=b.length;e>c;c++)if(a=b[c]+"ransform",a in d)return b[c].substr(0,b[c].length-1);return!1}(),f=e?"-"+e.toLowerCase()+"-":"",g=c("transform"),h=c("transitionDuration"),i=c("perspective")in d,j="ontouchstart"in a,k=(c("transition")in d,i?" translateZ(0)":""),l="onorientationchange"in a?"orientationchange":"resize",m=j?"touchstart":"mousedown",n=j?"touchmove":"mousemove",o=j?"touchend":"mouseup",p=j?"touchcancel":"mouseup",q=function(){if(e===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[e]}(),r=0,s=function(c,d){var g,h,i,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++r,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(g in d)this.options[g]=d[g];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],h=b.createElement("div"),h.className="swipeview-slider",h.style.cssText="position:relative;top:0;height:100%;width:100%;"+f+"transition-duration:0;"+f+"transform:translateZ(0);"+f+"transition-timing-function:ease-out",this.wrapper.appendChild(h),this.slider=h,this.refreshSize(),g=-1;2>g;g++)h=b.createElement("div"),h.style.cssText=f+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*g+"%",h.dataset||(h.dataset={}),k=-1==g?this.options.numberOfPages-1:g,h.dataset.pageIndex=k,h.dataset.upcomingPageIndex=k,this.options.loop||-1!=g||(h.style.visibility="hidden"),this.slider.appendChild(h),this.masterPages.push(h);i=this.masterPages[1].className,this.masterPages[1].className=i?i+" swipeview-active":"swipeview-active",a.addEventListener(l,this,!1),this.wrapper.addEventListener(m,this,!1),this.wrapper.addEventListener(n,this,!1),this.wrapper.addEventListener(o,this,!1),this.slider.addEventListener(q,this,!1),"O"==e&&this.slider.addEventListener(q.toLowerCase(),this,!1),j||this.wrapper.addEventListener("mouseout",this,!1)};return s.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.wrapper.addEventListener(this.id+"swipeview-flip",a,!1),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.wrapper.addEventListener(this.id+"swipeview-moveout",a,!1),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.wrapper.addEventListener(this.id+"swipeview-movein",a,!1),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.wrapper.addEventListener(this.id+"swipeview-touchstart",a,!1),this.customEvents.push(["touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.wrapper.removeEventListener(this.id+"swipeview-"+this.customEvents[0][0],this.customEvents[0][1],!1),this.customEvents.shift();a.removeEventListener(l,this,!1),this.wrapper.removeEventListener(m,this,!1),this.wrapper.removeEventListener(n,this,!1),this.wrapper.removeEventListener(o,this,!1),this.slider.removeEventListener(q,this,!1),j||this.wrapper.removeEventListener("mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[h]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case m:this.__start(a);break;case n:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=d.pageX-this.pointX,f=d.pageY-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(d.pageY-this.startY):Math.abs(d.pageX-this.startX);if(this.moved=!0,this.pointX=d.pageX,this.pointY=d.pageY,this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),!(this.stepsX<10&&this.stepsY<10)){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;a.preventDefault(),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.__event("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(b.pageY-this.startY):Math.abs(b.pageX-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[h]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.__event("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex},__event:function(a){var c=b.createEvent("Event");c.initEvent(this.id+"-swipeview-"+a,!0,!0),this.wrapper.dispatchEvent(c)}},s}(window,document); \ No newline at end of file diff --git a/src/swipeview.js b/src/swipeview.js index d51beea..960b6be 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -287,7 +287,12 @@ var SwipeView = (function (window, document) { this.__move(e); break; case "mouseout": - if (this.initiated && e.toElement == document.childNodes[1]) this.__end(); + if (this.initiated) { + var elts = this.wrapper.getElementsByTagName('*'); + for (var i=0; i< elts.length; i++) + if( e.toElement == elts[i]) return; + this.__end(e); + } break; case cancelEvent: case endEvent: From 9eb73cefa9c6687dcf7cd0b554c68ecce42ba70e Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Tue, 9 Jul 2013 12:20:38 +0200 Subject: [PATCH 43/61] bump version to 1.0.6 * fix desktop mouse events --- dist/{swipeview-1.0.5.min.js => swipeview-1.0.6.min.js} | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename dist/{swipeview-1.0.5.min.js => swipeview-1.0.6.min.js} (99%) diff --git a/dist/swipeview-1.0.5.min.js b/dist/swipeview-1.0.6.min.js similarity index 99% rename from dist/swipeview-1.0.5.min.js rename to dist/swipeview-1.0.6.min.js index 679dd8e..b40be4a 100644 --- a/dist/swipeview-1.0.5.min.js +++ b/dist/swipeview-1.0.6.min.js @@ -1,2 +1,2 @@ -/*! swipeview 1.0.5 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ +/*! swipeview 1.0.6 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ var SwipeView=function(a,b){function c(a){return""===e?a:(a=a.charAt(0).toUpperCase()+a.substr(1),e+a)}var d=b.createElement("div").style,e=function(){for(var a,b="t,webkitT,MozT,msT,OT".split(","),c=0,e=b.length;e>c;c++)if(a=b[c]+"ransform",a in d)return b[c].substr(0,b[c].length-1);return!1}(),f=e?"-"+e.toLowerCase()+"-":"",g=c("transform"),h=c("transitionDuration"),i=c("perspective")in d,j="ontouchstart"in a,k=(c("transition")in d,i?" translateZ(0)":""),l="onorientationchange"in a?"orientationchange":"resize",m=j?"touchstart":"mousedown",n=j?"touchmove":"mousemove",o=j?"touchend":"mouseup",p=j?"touchcancel":"mouseup",q=function(){if(e===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[e]}(),r=0,s=function(c,d){var g,h,i,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++r,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(g in d)this.options[g]=d[g];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],h=b.createElement("div"),h.className="swipeview-slider",h.style.cssText="position:relative;top:0;height:100%;width:100%;"+f+"transition-duration:0;"+f+"transform:translateZ(0);"+f+"transition-timing-function:ease-out",this.wrapper.appendChild(h),this.slider=h,this.refreshSize(),g=-1;2>g;g++)h=b.createElement("div"),h.style.cssText=f+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*g+"%",h.dataset||(h.dataset={}),k=-1==g?this.options.numberOfPages-1:g,h.dataset.pageIndex=k,h.dataset.upcomingPageIndex=k,this.options.loop||-1!=g||(h.style.visibility="hidden"),this.slider.appendChild(h),this.masterPages.push(h);i=this.masterPages[1].className,this.masterPages[1].className=i?i+" swipeview-active":"swipeview-active",a.addEventListener(l,this,!1),this.wrapper.addEventListener(m,this,!1),this.wrapper.addEventListener(n,this,!1),this.wrapper.addEventListener(o,this,!1),this.slider.addEventListener(q,this,!1),"O"==e&&this.slider.addEventListener(q.toLowerCase(),this,!1),j||this.wrapper.addEventListener("mouseout",this,!1)};return s.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.wrapper.addEventListener(this.id+"swipeview-flip",a,!1),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.wrapper.addEventListener(this.id+"swipeview-moveout",a,!1),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.wrapper.addEventListener(this.id+"swipeview-movein",a,!1),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.wrapper.addEventListener(this.id+"swipeview-touchstart",a,!1),this.customEvents.push(["touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.wrapper.removeEventListener(this.id+"swipeview-"+this.customEvents[0][0],this.customEvents[0][1],!1),this.customEvents.shift();a.removeEventListener(l,this,!1),this.wrapper.removeEventListener(m,this,!1),this.wrapper.removeEventListener(n,this,!1),this.wrapper.removeEventListener(o,this,!1),this.slider.removeEventListener(q,this,!1),j||this.wrapper.removeEventListener("mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[h]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case m:this.__start(a);break;case n:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=d.pageX-this.pointX,f=d.pageY-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(d.pageY-this.startY):Math.abs(d.pageX-this.startX);if(this.moved=!0,this.pointX=d.pageX,this.pointY=d.pageY,this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),!(this.stepsX<10&&this.stepsY<10)){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;a.preventDefault(),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.__event("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(b.pageY-this.startY):Math.abs(b.pageX-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[h]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.__event("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex},__event:function(a){var c=b.createEvent("Event");c.initEvent(this.id+"-swipeview-"+a,!0,!0),this.wrapper.dispatchEvent(c)}},s}(window,document); \ No newline at end of file diff --git a/package.json b/package.json index 572350e..dde8183 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "swipeview", - "version": "1.0.5", + "version": "1.0.6", "description": "Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli", "keywords": [ "swipe", From 7a7b42e5389d3c52dd4a9b91428304cd4ce22fff Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Tue, 9 Jul 2013 15:12:09 +0200 Subject: [PATCH 44/61] fix when swipeview < viewport --- dist/{swipeview-1.0.6.min.js => swipeview-1.1.0.min.js} | 4 ++-- package.json | 2 +- src/swipeview.js | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) rename dist/{swipeview-1.0.6.min.js => swipeview-1.1.0.min.js} (70%) diff --git a/dist/swipeview-1.0.6.min.js b/dist/swipeview-1.1.0.min.js similarity index 70% rename from dist/swipeview-1.0.6.min.js rename to dist/swipeview-1.1.0.min.js index b40be4a..17eb642 100644 --- a/dist/swipeview-1.0.6.min.js +++ b/dist/swipeview-1.1.0.min.js @@ -1,2 +1,2 @@ -/*! swipeview 1.0.6 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ -var SwipeView=function(a,b){function c(a){return""===e?a:(a=a.charAt(0).toUpperCase()+a.substr(1),e+a)}var d=b.createElement("div").style,e=function(){for(var a,b="t,webkitT,MozT,msT,OT".split(","),c=0,e=b.length;e>c;c++)if(a=b[c]+"ransform",a in d)return b[c].substr(0,b[c].length-1);return!1}(),f=e?"-"+e.toLowerCase()+"-":"",g=c("transform"),h=c("transitionDuration"),i=c("perspective")in d,j="ontouchstart"in a,k=(c("transition")in d,i?" translateZ(0)":""),l="onorientationchange"in a?"orientationchange":"resize",m=j?"touchstart":"mousedown",n=j?"touchmove":"mousemove",o=j?"touchend":"mouseup",p=j?"touchcancel":"mouseup",q=function(){if(e===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[e]}(),r=0,s=function(c,d){var g,h,i,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++r,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(g in d)this.options[g]=d[g];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],h=b.createElement("div"),h.className="swipeview-slider",h.style.cssText="position:relative;top:0;height:100%;width:100%;"+f+"transition-duration:0;"+f+"transform:translateZ(0);"+f+"transition-timing-function:ease-out",this.wrapper.appendChild(h),this.slider=h,this.refreshSize(),g=-1;2>g;g++)h=b.createElement("div"),h.style.cssText=f+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*g+"%",h.dataset||(h.dataset={}),k=-1==g?this.options.numberOfPages-1:g,h.dataset.pageIndex=k,h.dataset.upcomingPageIndex=k,this.options.loop||-1!=g||(h.style.visibility="hidden"),this.slider.appendChild(h),this.masterPages.push(h);i=this.masterPages[1].className,this.masterPages[1].className=i?i+" swipeview-active":"swipeview-active",a.addEventListener(l,this,!1),this.wrapper.addEventListener(m,this,!1),this.wrapper.addEventListener(n,this,!1),this.wrapper.addEventListener(o,this,!1),this.slider.addEventListener(q,this,!1),"O"==e&&this.slider.addEventListener(q.toLowerCase(),this,!1),j||this.wrapper.addEventListener("mouseout",this,!1)};return s.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.wrapper.addEventListener(this.id+"swipeview-flip",a,!1),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.wrapper.addEventListener(this.id+"swipeview-moveout",a,!1),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.wrapper.addEventListener(this.id+"swipeview-movein",a,!1),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.wrapper.addEventListener(this.id+"swipeview-touchstart",a,!1),this.customEvents.push(["touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.wrapper.removeEventListener(this.id+"swipeview-"+this.customEvents[0][0],this.customEvents[0][1],!1),this.customEvents.shift();a.removeEventListener(l,this,!1),this.wrapper.removeEventListener(m,this,!1),this.wrapper.removeEventListener(n,this,!1),this.wrapper.removeEventListener(o,this,!1),this.slider.removeEventListener(q,this,!1),j||this.wrapper.removeEventListener("mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[h]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case m:this.__start(a);break;case n:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=d.pageX-this.pointX,f=d.pageY-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(d.pageY-this.startY):Math.abs(d.pageX-this.startX);if(this.moved=!0,this.pointX=d.pageX,this.pointY=d.pageY,this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),!(this.stepsX<10&&this.stepsY<10)){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;a.preventDefault(),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.__event("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(b.pageY-this.startY):Math.abs(b.pageX-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[h]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.__event("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex},__event:function(a){var c=b.createEvent("Event");c.initEvent(this.id+"-swipeview-"+a,!0,!0),this.wrapper.dispatchEvent(c)}},s}(window,document); \ No newline at end of file +/*! swipeview 1.1.0 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ +var SwipeView=function(a,b){function c(a){return""===e?a:(a=a.charAt(0).toUpperCase()+a.substr(1),e+a)}var d=b.createElement("div").style,e=function(){for(var a,b="t,webkitT,MozT,msT,OT".split(","),c=0,e=b.length;e>c;c++)if(a=b[c]+"ransform",a in d)return b[c].substr(0,b[c].length-1);return!1}(),f=e?"-"+e.toLowerCase()+"-":"",g=c("transform"),h=c("transitionDuration"),i=c("perspective")in d,j="ontouchstart"in a,k=(c("transition")in d,i?" translateZ(0)":""),l="onorientationchange"in a?"orientationchange":"resize",m=j?"touchstart":"mousedown",n=j?"touchmove":"mousemove",o=j?"touchend":"mouseup",p=j?"touchcancel":"mouseup",q=function(){if(e===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[e]}(),r=0,s=function(c,d){var g,h,i,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++r,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(g in d)this.options[g]=d[g];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],h=b.createElement("div"),h.className="swipeview-slider",h.style.cssText="position:relative;top:0;height:100%;width:100%;"+f+"transition-duration:0;"+f+"transform:translateZ(0);"+f+"transition-timing-function:ease-out",this.wrapper.appendChild(h),this.slider=h,this.refreshSize(),g=-1;2>g;g++)h=b.createElement("div"),h.style.cssText=f+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*g+"%",h.dataset||(h.dataset={}),k=-1==g?this.options.numberOfPages-1:g,h.dataset.pageIndex=k,h.dataset.upcomingPageIndex=k,this.options.loop||-1!=g||(h.style.visibility="hidden"),this.slider.appendChild(h),this.masterPages.push(h);i=this.masterPages[1].className,this.masterPages[1].className=i?i+" swipeview-active":"swipeview-active",a.addEventListener(l,this,!1),this.wrapper.addEventListener(m,this,!1),this.wrapper.addEventListener(n,this,!1),this.wrapper.addEventListener(o,this,!1),this.slider.addEventListener(q,this,!1),"O"==e&&this.slider.addEventListener(q.toLowerCase(),this,!1),j||this.wrapper.addEventListener("mouseout",this,!1)};return s.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.wrapper.addEventListener(this.id+"swipeview-flip",a,!1),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.wrapper.addEventListener(this.id+"swipeview-moveout",a,!1),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.wrapper.addEventListener(this.id+"swipeview-movein",a,!1),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.wrapper.addEventListener(this.id+"swipeview-touchstart",a,!1),this.customEvents.push(["touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.wrapper.removeEventListener(this.id+"swipeview-"+this.customEvents[0][0],this.customEvents[0][1],!1),this.customEvents.shift();a.removeEventListener(l,this,!1),this.wrapper.removeEventListener(m,this,!1),this.wrapper.removeEventListener(n,this,!1),this.wrapper.removeEventListener(o,this,!1),this.slider.removeEventListener(q,this,!1),j||this.wrapper.removeEventListener("mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[h]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case m:this.__start(a);break;case n:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=d.pageX-this.pointX,f=d.pageY-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(d.pageY-this.startY):Math.abs(d.pageX-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=d.pageX,this.pointY=d.pageY,this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;a.preventDefault(),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.__event("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(b.pageY-this.startY):Math.abs(b.pageX-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[h]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.__event("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex},__event:function(a){var c=b.createEvent("Event");c.initEvent(this.id+"-swipeview-"+a,!0,!0),this.wrapper.dispatchEvent(c)}},s}(window,document); \ No newline at end of file diff --git a/package.json b/package.json index dde8183..0230e92 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "swipeview", - "version": "1.0.6", + "version": "1.1.0", "description": "Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli", "keywords": [ "swipe", diff --git a/src/swipeview.js b/src/swipeview.js index 960b6be..1e88091 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -372,6 +372,8 @@ var SwipeView = (function (window, document) { newC = this.options.vertical ? this.k + deltaY : this.k + deltaX, dist = this.options.vertical ? Math.abs(point.pageY - this.startY): Math.abs(point.pageX - this.startX); + if (Math.abs(dist) >= this.pageSize) { return; } + this.moved = true; this.pointX = point.pageX; this.pointY = point.pageY; From 9d91b06a97993365599b0e2e469f50d7ef2b0230 Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Wed, 10 Jul 2013 16:54:51 +0200 Subject: [PATCH 45/61] fix inner swipeview events --- src/swipeview.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/swipeview.js b/src/swipeview.js index 1e88091..fb942db 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -159,22 +159,22 @@ var SwipeView = (function (window, document) { onFlip: function (fn) { this.wrapper.addEventListener(this.id + 'swipeview-flip', fn, false); - this.customEvents.push(['flip', fn]); + this.customEvents.push([this.id + 'flip', fn]); }, onMoveOut: function (fn) { this.wrapper.addEventListener(this.id + 'swipeview-moveout', fn, false); - this.customEvents.push(['moveout', fn]); + this.customEvents.push([this.id + 'moveout', fn]); }, onMoveIn: function (fn) { this.wrapper.addEventListener(this.id + 'swipeview-movein', fn, false); - this.customEvents.push(['movein', fn]); + this.customEvents.push([this.id + 'movein', fn]); }, onTouchStart: function (fn) { this.wrapper.addEventListener(this.id + 'swipeview-touchstart', fn, false); - this.customEvents.push(['touchstart', fn]); + this.customEvents.push([this.id + 'touchstart', fn]); }, destroy: function () { @@ -532,7 +532,7 @@ var SwipeView = (function (window, document) { __event: function (type) { var ev = document.createEvent("Event"); - ev.initEvent(this.id + '-swipeview-' + type, true, true); + ev.initEvent(this.id + 'swipeview-' + type, true, true); this.wrapper.dispatchEvent(ev); } From 016c937ba4a10e0dff1160c8e8fd27b1c89913ba Mon Sep 17 00:00:00 2001 From: Paul Panserrieu Date: Wed, 10 Jul 2013 16:56:02 +0200 Subject: [PATCH 46/61] 1.1.1 --- dist/swipeview-1.1.0.min.js | 2 -- dist/swipeview-1.1.1.min.js | 2 ++ package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 dist/swipeview-1.1.0.min.js create mode 100644 dist/swipeview-1.1.1.min.js diff --git a/dist/swipeview-1.1.0.min.js b/dist/swipeview-1.1.0.min.js deleted file mode 100644 index 17eb642..0000000 --- a/dist/swipeview-1.1.0.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! swipeview 1.1.0 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ -var SwipeView=function(a,b){function c(a){return""===e?a:(a=a.charAt(0).toUpperCase()+a.substr(1),e+a)}var d=b.createElement("div").style,e=function(){for(var a,b="t,webkitT,MozT,msT,OT".split(","),c=0,e=b.length;e>c;c++)if(a=b[c]+"ransform",a in d)return b[c].substr(0,b[c].length-1);return!1}(),f=e?"-"+e.toLowerCase()+"-":"",g=c("transform"),h=c("transitionDuration"),i=c("perspective")in d,j="ontouchstart"in a,k=(c("transition")in d,i?" translateZ(0)":""),l="onorientationchange"in a?"orientationchange":"resize",m=j?"touchstart":"mousedown",n=j?"touchmove":"mousemove",o=j?"touchend":"mouseup",p=j?"touchcancel":"mouseup",q=function(){if(e===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[e]}(),r=0,s=function(c,d){var g,h,i,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++r,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(g in d)this.options[g]=d[g];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],h=b.createElement("div"),h.className="swipeview-slider",h.style.cssText="position:relative;top:0;height:100%;width:100%;"+f+"transition-duration:0;"+f+"transform:translateZ(0);"+f+"transition-timing-function:ease-out",this.wrapper.appendChild(h),this.slider=h,this.refreshSize(),g=-1;2>g;g++)h=b.createElement("div"),h.style.cssText=f+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*g+"%",h.dataset||(h.dataset={}),k=-1==g?this.options.numberOfPages-1:g,h.dataset.pageIndex=k,h.dataset.upcomingPageIndex=k,this.options.loop||-1!=g||(h.style.visibility="hidden"),this.slider.appendChild(h),this.masterPages.push(h);i=this.masterPages[1].className,this.masterPages[1].className=i?i+" swipeview-active":"swipeview-active",a.addEventListener(l,this,!1),this.wrapper.addEventListener(m,this,!1),this.wrapper.addEventListener(n,this,!1),this.wrapper.addEventListener(o,this,!1),this.slider.addEventListener(q,this,!1),"O"==e&&this.slider.addEventListener(q.toLowerCase(),this,!1),j||this.wrapper.addEventListener("mouseout",this,!1)};return s.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.wrapper.addEventListener(this.id+"swipeview-flip",a,!1),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.wrapper.addEventListener(this.id+"swipeview-moveout",a,!1),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.wrapper.addEventListener(this.id+"swipeview-movein",a,!1),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.wrapper.addEventListener(this.id+"swipeview-touchstart",a,!1),this.customEvents.push(["touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.wrapper.removeEventListener(this.id+"swipeview-"+this.customEvents[0][0],this.customEvents[0][1],!1),this.customEvents.shift();a.removeEventListener(l,this,!1),this.wrapper.removeEventListener(m,this,!1),this.wrapper.removeEventListener(n,this,!1),this.wrapper.removeEventListener(o,this,!1),this.slider.removeEventListener(q,this,!1),j||this.wrapper.removeEventListener("mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[h]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case m:this.__start(a);break;case n:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=d.pageX-this.pointX,f=d.pageY-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(d.pageY-this.startY):Math.abs(d.pageX-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=d.pageX,this.pointY=d.pageY,this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;a.preventDefault(),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.__event("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(b.pageY-this.startY):Math.abs(b.pageX-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[h]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.__event("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex},__event:function(a){var c=b.createEvent("Event");c.initEvent(this.id+"-swipeview-"+a,!0,!0),this.wrapper.dispatchEvent(c)}},s}(window,document); \ No newline at end of file diff --git a/dist/swipeview-1.1.1.min.js b/dist/swipeview-1.1.1.min.js new file mode 100644 index 0000000..c31a819 --- /dev/null +++ b/dist/swipeview-1.1.1.min.js @@ -0,0 +1,2 @@ +/*! swipeview 1.1.1 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ +var SwipeView=function(a,b){function c(a){return""===e?a:(a=a.charAt(0).toUpperCase()+a.substr(1),e+a)}var d=b.createElement("div").style,e=function(){for(var a,b="t,webkitT,MozT,msT,OT".split(","),c=0,e=b.length;e>c;c++)if(a=b[c]+"ransform",a in d)return b[c].substr(0,b[c].length-1);return!1}(),f=e?"-"+e.toLowerCase()+"-":"",g=c("transform"),h=c("transitionDuration"),i=c("perspective")in d,j="ontouchstart"in a,k=(c("transition")in d,i?" translateZ(0)":""),l="onorientationchange"in a?"orientationchange":"resize",m=j?"touchstart":"mousedown",n=j?"touchmove":"mousemove",o=j?"touchend":"mouseup",p=j?"touchcancel":"mouseup",q=function(){if(e===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[e]}(),r=0,s=function(c,d){var g,h,i,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++r,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(g in d)this.options[g]=d[g];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],h=b.createElement("div"),h.className="swipeview-slider",h.style.cssText="position:relative;top:0;height:100%;width:100%;"+f+"transition-duration:0;"+f+"transform:translateZ(0);"+f+"transition-timing-function:ease-out",this.wrapper.appendChild(h),this.slider=h,this.refreshSize(),g=-1;2>g;g++)h=b.createElement("div"),h.style.cssText=f+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*g+"%",h.dataset||(h.dataset={}),k=-1==g?this.options.numberOfPages-1:g,h.dataset.pageIndex=k,h.dataset.upcomingPageIndex=k,this.options.loop||-1!=g||(h.style.visibility="hidden"),this.slider.appendChild(h),this.masterPages.push(h);i=this.masterPages[1].className,this.masterPages[1].className=i?i+" swipeview-active":"swipeview-active",a.addEventListener(l,this,!1),this.wrapper.addEventListener(m,this,!1),this.wrapper.addEventListener(n,this,!1),this.wrapper.addEventListener(o,this,!1),this.slider.addEventListener(q,this,!1),"O"==e&&this.slider.addEventListener(q.toLowerCase(),this,!1),j||this.wrapper.addEventListener("mouseout",this,!1)};return s.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.wrapper.addEventListener(this.id+"swipeview-flip",a,!1),this.customEvents.push([this.id+"flip",a])},onMoveOut:function(a){this.wrapper.addEventListener(this.id+"swipeview-moveout",a,!1),this.customEvents.push([this.id+"moveout",a])},onMoveIn:function(a){this.wrapper.addEventListener(this.id+"swipeview-movein",a,!1),this.customEvents.push([this.id+"movein",a])},onTouchStart:function(a){this.wrapper.addEventListener(this.id+"swipeview-touchstart",a,!1),this.customEvents.push([this.id+"touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.wrapper.removeEventListener(this.id+"swipeview-"+this.customEvents[0][0],this.customEvents[0][1],!1),this.customEvents.shift();a.removeEventListener(l,this,!1),this.wrapper.removeEventListener(m,this,!1),this.wrapper.removeEventListener(n,this,!1),this.wrapper.removeEventListener(o,this,!1),this.slider.removeEventListener(q,this,!1),j||this.wrapper.removeEventListener("mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[h]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case m:this.__start(a);break;case n:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=d.pageX-this.pointX,f=d.pageY-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(d.pageY-this.startY):Math.abs(d.pageX-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=d.pageX,this.pointY=d.pageY,this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;a.preventDefault(),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.__event("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(b.pageY-this.startY):Math.abs(b.pageX-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[h]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.__event("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex},__event:function(a){var c=b.createEvent("Event");c.initEvent(this.id+"swipeview-"+a,!0,!0),this.wrapper.dispatchEvent(c)}},s}(window,document); \ No newline at end of file diff --git a/package.json b/package.json index 0230e92..afba7c2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "swipeview", - "version": "1.1.0", + "version": "1.1.1", "description": "Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli", "keywords": [ "swipe", From f938534b88e5913ab7a8a02e30752dc7d1087cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Tue, 16 Jul 2013 18:25:30 +0200 Subject: [PATCH 47/61] Add .abort() method --- dist/swipeview-1.1.1.min.js | 2 +- src/swipeview.js | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dist/swipeview-1.1.1.min.js b/dist/swipeview-1.1.1.min.js index c31a819..bc7d833 100644 --- a/dist/swipeview-1.1.1.min.js +++ b/dist/swipeview-1.1.1.min.js @@ -1,2 +1,2 @@ /*! swipeview 1.1.1 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ -var SwipeView=function(a,b){function c(a){return""===e?a:(a=a.charAt(0).toUpperCase()+a.substr(1),e+a)}var d=b.createElement("div").style,e=function(){for(var a,b="t,webkitT,MozT,msT,OT".split(","),c=0,e=b.length;e>c;c++)if(a=b[c]+"ransform",a in d)return b[c].substr(0,b[c].length-1);return!1}(),f=e?"-"+e.toLowerCase()+"-":"",g=c("transform"),h=c("transitionDuration"),i=c("perspective")in d,j="ontouchstart"in a,k=(c("transition")in d,i?" translateZ(0)":""),l="onorientationchange"in a?"orientationchange":"resize",m=j?"touchstart":"mousedown",n=j?"touchmove":"mousemove",o=j?"touchend":"mouseup",p=j?"touchcancel":"mouseup",q=function(){if(e===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[e]}(),r=0,s=function(c,d){var g,h,i,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++r,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(g in d)this.options[g]=d[g];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],h=b.createElement("div"),h.className="swipeview-slider",h.style.cssText="position:relative;top:0;height:100%;width:100%;"+f+"transition-duration:0;"+f+"transform:translateZ(0);"+f+"transition-timing-function:ease-out",this.wrapper.appendChild(h),this.slider=h,this.refreshSize(),g=-1;2>g;g++)h=b.createElement("div"),h.style.cssText=f+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*g+"%",h.dataset||(h.dataset={}),k=-1==g?this.options.numberOfPages-1:g,h.dataset.pageIndex=k,h.dataset.upcomingPageIndex=k,this.options.loop||-1!=g||(h.style.visibility="hidden"),this.slider.appendChild(h),this.masterPages.push(h);i=this.masterPages[1].className,this.masterPages[1].className=i?i+" swipeview-active":"swipeview-active",a.addEventListener(l,this,!1),this.wrapper.addEventListener(m,this,!1),this.wrapper.addEventListener(n,this,!1),this.wrapper.addEventListener(o,this,!1),this.slider.addEventListener(q,this,!1),"O"==e&&this.slider.addEventListener(q.toLowerCase(),this,!1),j||this.wrapper.addEventListener("mouseout",this,!1)};return s.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.wrapper.addEventListener(this.id+"swipeview-flip",a,!1),this.customEvents.push([this.id+"flip",a])},onMoveOut:function(a){this.wrapper.addEventListener(this.id+"swipeview-moveout",a,!1),this.customEvents.push([this.id+"moveout",a])},onMoveIn:function(a){this.wrapper.addEventListener(this.id+"swipeview-movein",a,!1),this.customEvents.push([this.id+"movein",a])},onTouchStart:function(a){this.wrapper.addEventListener(this.id+"swipeview-touchstart",a,!1),this.customEvents.push([this.id+"touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.wrapper.removeEventListener(this.id+"swipeview-"+this.customEvents[0][0],this.customEvents[0][1],!1),this.customEvents.shift();a.removeEventListener(l,this,!1),this.wrapper.removeEventListener(m,this,!1),this.wrapper.removeEventListener(n,this,!1),this.wrapper.removeEventListener(o,this,!1),this.slider.removeEventListener(q,this,!1),j||this.wrapper.removeEventListener("mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[h]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case m:this.__start(a);break;case n:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=d.pageX-this.pointX,f=d.pageY-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(d.pageY-this.startY):Math.abs(d.pageX-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=d.pageX,this.pointY=d.pageY,this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;a.preventDefault(),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.__event("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(b.pageY-this.startY):Math.abs(b.pageX-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[h]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.__event("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex},__event:function(a){var c=b.createEvent("Event");c.initEvent(this.id+"swipeview-"+a,!0,!0),this.wrapper.dispatchEvent(c)}},s}(window,document); \ No newline at end of file +var SwipeView=function(a,b){function c(a){return""===e?a:(a=a.charAt(0).toUpperCase()+a.substr(1),e+a)}var d=b.createElement("div").style,e=function(){for(var a,b="t,webkitT,MozT,msT,OT".split(","),c=0,e=b.length;e>c;c++)if(a=b[c]+"ransform",a in d)return b[c].substr(0,b[c].length-1);return!1}(),f=e?"-"+e.toLowerCase()+"-":"",g=c("transform"),h=c("transitionDuration"),i=c("perspective")in d,j="ontouchstart"in a,k=(c("transition")in d,i?" translateZ(0)":""),l="onorientationchange"in a?"orientationchange":"resize",m=j?"touchstart":"mousedown",n=j?"touchmove":"mousemove",o=j?"touchend":"mouseup",p=j?"touchcancel":"mouseup",q=function(){if(e===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[e]}(),r=0,s=function(c,d){var g,h,i,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++r,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(g in d)this.options[g]=d[g];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],h=b.createElement("div"),h.className="swipeview-slider",h.style.cssText="position:relative;top:0;height:100%;width:100%;"+f+"transition-duration:0;"+f+"transform:translateZ(0);"+f+"transition-timing-function:ease-out",this.wrapper.appendChild(h),this.slider=h,this.refreshSize(),g=-1;2>g;g++)h=b.createElement("div"),h.style.cssText=f+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*g+"%",h.dataset||(h.dataset={}),k=-1==g?this.options.numberOfPages-1:g,h.dataset.pageIndex=k,h.dataset.upcomingPageIndex=k,this.options.loop||-1!=g||(h.style.visibility="hidden"),this.slider.appendChild(h),this.masterPages.push(h);i=this.masterPages[1].className,this.masterPages[1].className=i?i+" swipeview-active":"swipeview-active",a.addEventListener(l,this,!1),this.wrapper.addEventListener(m,this,!1),this.wrapper.addEventListener(n,this,!1),this.wrapper.addEventListener(o,this,!1),this.slider.addEventListener(q,this,!1),"O"==e&&this.slider.addEventListener(q.toLowerCase(),this,!1),j||this.wrapper.addEventListener("mouseout",this,!1)};return s.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.wrapper.addEventListener(this.id+"swipeview-flip",a,!1),this.customEvents.push([this.id+"flip",a])},onMoveOut:function(a){this.wrapper.addEventListener(this.id+"swipeview-moveout",a,!1),this.customEvents.push([this.id+"moveout",a])},onMoveIn:function(a){this.wrapper.addEventListener(this.id+"swipeview-movein",a,!1),this.customEvents.push([this.id+"movein",a])},onTouchStart:function(a){this.wrapper.addEventListener(this.id+"swipeview-touchstart",a,!1),this.customEvents.push([this.id+"touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.wrapper.removeEventListener(this.id+"swipeview-"+this.customEvents[0][0],this.customEvents[0][1],!1),this.customEvents.shift();a.removeEventListener(l,this,!1),this.wrapper.removeEventListener(m,this,!1),this.wrapper.removeEventListener(n,this,!1),this.wrapper.removeEventListener(o,this,!1),this.slider.removeEventListener(q,this,!1),j||this.wrapper.removeEventListener("mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[h]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case m:this.__start(a);break;case n:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=d.pageX-this.pointX,f=d.pageY-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(d.pageY-this.startY):Math.abs(d.pageX-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=d.pageX,this.pointY=d.pageY,this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;a.preventDefault(),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.__event("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(b.pageY-this.startY):Math.abs(b.pageX-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[h]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.__event("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex},__event:function(a){var c=b.createEvent("Event");c.initEvent(this.id+"swipeview-"+a,!0,!0),this.wrapper.dispatchEvent(c)}},s}(window,document); \ No newline at end of file diff --git a/src/swipeview.js b/src/swipeview.js index fb942db..9be8155 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -460,6 +460,12 @@ var SwipeView = (function (window, document) { this.__checkPosition(); }, + abort: function () { + if (!this.initiated) return; + this.__pos(-this.page * this.pageSize); + this.initiated = false; + }, + __checkPosition: function () { var pageFlip, pageFlipIndex, From 7309f9564b212d00398fd426023e225e11ba3a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Wed, 17 Jul 2013 11:26:37 +0200 Subject: [PATCH 48/61] Increment version 1.1.2 --- dist/swipeview-1.1.2.min.js | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 dist/swipeview-1.1.2.min.js diff --git a/dist/swipeview-1.1.2.min.js b/dist/swipeview-1.1.2.min.js new file mode 100644 index 0000000..b7dc22f --- /dev/null +++ b/dist/swipeview-1.1.2.min.js @@ -0,0 +1,2 @@ +/*! swipeview 1.1.2 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ +var SwipeView=function(a,b){function c(a){return""===e?a:(a=a.charAt(0).toUpperCase()+a.substr(1),e+a)}var d=b.createElement("div").style,e=function(){for(var a,b="t,webkitT,MozT,msT,OT".split(","),c=0,e=b.length;e>c;c++)if(a=b[c]+"ransform",a in d)return b[c].substr(0,b[c].length-1);return!1}(),f=e?"-"+e.toLowerCase()+"-":"",g=c("transform"),h=c("transitionDuration"),i=c("perspective")in d,j="ontouchstart"in a,k=(c("transition")in d,i?" translateZ(0)":""),l="onorientationchange"in a?"orientationchange":"resize",m=j?"touchstart":"mousedown",n=j?"touchmove":"mousemove",o=j?"touchend":"mouseup",p=j?"touchcancel":"mouseup",q=function(){if(e===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[e]}(),r=0,s=function(c,d){var g,h,i,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++r,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(g in d)this.options[g]=d[g];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],h=b.createElement("div"),h.className="swipeview-slider",h.style.cssText="position:relative;top:0;height:100%;width:100%;"+f+"transition-duration:0;"+f+"transform:translateZ(0);"+f+"transition-timing-function:ease-out",this.wrapper.appendChild(h),this.slider=h,this.refreshSize(),g=-1;2>g;g++)h=b.createElement("div"),h.style.cssText=f+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*g+"%",h.dataset||(h.dataset={}),k=-1==g?this.options.numberOfPages-1:g,h.dataset.pageIndex=k,h.dataset.upcomingPageIndex=k,this.options.loop||-1!=g||(h.style.visibility="hidden"),this.slider.appendChild(h),this.masterPages.push(h);i=this.masterPages[1].className,this.masterPages[1].className=i?i+" swipeview-active":"swipeview-active",a.addEventListener(l,this,!1),this.wrapper.addEventListener(m,this,!1),this.wrapper.addEventListener(n,this,!1),this.wrapper.addEventListener(o,this,!1),this.slider.addEventListener(q,this,!1),"O"==e&&this.slider.addEventListener(q.toLowerCase(),this,!1),j||this.wrapper.addEventListener("mouseout",this,!1)};return s.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.wrapper.addEventListener(this.id+"swipeview-flip",a,!1),this.customEvents.push([this.id+"flip",a])},onMoveOut:function(a){this.wrapper.addEventListener(this.id+"swipeview-moveout",a,!1),this.customEvents.push([this.id+"moveout",a])},onMoveIn:function(a){this.wrapper.addEventListener(this.id+"swipeview-movein",a,!1),this.customEvents.push([this.id+"movein",a])},onTouchStart:function(a){this.wrapper.addEventListener(this.id+"swipeview-touchstart",a,!1),this.customEvents.push([this.id+"touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.wrapper.removeEventListener(this.id+"swipeview-"+this.customEvents[0][0],this.customEvents[0][1],!1),this.customEvents.shift();a.removeEventListener(l,this,!1),this.wrapper.removeEventListener(m,this,!1),this.wrapper.removeEventListener(n,this,!1),this.wrapper.removeEventListener(o,this,!1),this.slider.removeEventListener(q,this,!1),j||this.wrapper.removeEventListener("mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[h]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case m:this.__start(a);break;case n:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=d.pageX-this.pointX,f=d.pageY-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(d.pageY-this.startY):Math.abs(d.pageX-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=d.pageX,this.pointY=d.pageY,this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;a.preventDefault(),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.__event("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(b.pageY-this.startY):Math.abs(b.pageX-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[h]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.__event("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex},__event:function(a){var c=b.createEvent("Event");c.initEvent(this.id+"swipeview-"+a,!0,!0),this.wrapper.dispatchEvent(c)}},s}(window,document); \ No newline at end of file diff --git a/package.json b/package.json index afba7c2..ca60c5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "swipeview", - "version": "1.1.1", + "version": "1.1.2", "description": "Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli", "keywords": [ "swipe", From 30eff4dd373ce8f22e1523b089479405869c5d30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Wed, 17 Jul 2013 18:24:02 +0200 Subject: [PATCH 49/61] Making it work on IE8 ! + polyfill for events (on, off, preventDefault) + polyfill for evt.pageX / evt.pageY + using MicroEvent for custom events + Fix examples (img unselectable=on, ondragstart: return false) --- demo/gallery/index.html | 6 +- demo/gallery2/index.html | 3 + demo/gallery3/infinitegraphset.js | 3 + demo/gallery4/index.html | 3 + demo/gallery5/infinitegraphset.js | 3 + demo/gallery6/infinitegraphset.js | 3 + demo/gallery7/infinitegraphset.js | 3 + demo/gallery8/infinitegraphset.js | 3 + demo/gallery9/infinitegraphset.js | 3 + dist/swipeview-1.1.2.min.js | 2 +- dist/swipeview-1.2.0.min.js | 2 + package.json | 2 +- src/swipeview.js | 182 ++++++++++++++++++++++-------- 13 files changed, 170 insertions(+), 48 deletions(-) create mode 100644 dist/swipeview-1.2.0.min.js diff --git a/demo/gallery/index.html b/demo/gallery/index.html index 8feb43b..e017211 100644 --- a/demo/gallery/index.html +++ b/demo/gallery/index.html @@ -81,6 +81,10 @@ el.width = slides[page].width; el.height = slides[page].height; el.onload = function () { this.className = ''; } + // fixes for IE + el.setAttribute("unselectable", "on"); + el.ondragstart = function() { return false; }; + gallery.masterPages[i].appendChild(el); el = document.createElement('span'); @@ -123,4 +127,4 @@ - \ No newline at end of file + diff --git a/demo/gallery2/index.html b/demo/gallery2/index.html index bdc427d..360199d 100644 --- a/demo/gallery2/index.html +++ b/demo/gallery2/index.html @@ -59,6 +59,9 @@ img.src = d.get(page).imgs[i]; img.width = d.get(page).width; img.height = d.get(page).height; + // fixes for IE + img.setAttribute("unselectable", "on"); + img.ondragstart = function() { return false; }; div.style.width = d.get(page).width + "px"; div.style.height = d.get(page).height + "px"; img.onload = function () { this.className = ''; } diff --git a/demo/gallery3/infinitegraphset.js b/demo/gallery3/infinitegraphset.js index e9ddffe..0785645 100644 --- a/demo/gallery3/infinitegraphset.js +++ b/demo/gallery3/infinitegraphset.js @@ -22,6 +22,9 @@ div.style.width = d.get(page).width + "px"; div.style.height = d.get(page).height + "px"; img.onload = function () { this.className = ''; } + // fixes for IE + img.setAttribute("unselectable", "on"); + img.ondragstart = function() { return false; }; div.appendChild(img); container.appendChild(div); } diff --git a/demo/gallery4/index.html b/demo/gallery4/index.html index 8936ed2..9521d5d 100644 --- a/demo/gallery4/index.html +++ b/demo/gallery4/index.html @@ -63,6 +63,9 @@ el.width = slides[page].width; el.height = slides[page].height; el.onload = function () { this.className = ''; } + // fixes for IE + el.setAttribute("unselectable", "on"); + el.ondragstart = function() { return false; }; gallery.masterPages[i].appendChild(el); } diff --git a/demo/gallery5/infinitegraphset.js b/demo/gallery5/infinitegraphset.js index e9ddffe..8b85a07 100644 --- a/demo/gallery5/infinitegraphset.js +++ b/demo/gallery5/infinitegraphset.js @@ -19,6 +19,9 @@ img.src = d.get(page).imgs[i]; img.width = d.get(page).width; img.height = d.get(page).height; + // fixes for IE + img.setAttribute("unselectable", "on"); + img.ondragstart = function() { return false; }; div.style.width = d.get(page).width + "px"; div.style.height = d.get(page).height + "px"; img.onload = function () { this.className = ''; } diff --git a/demo/gallery6/infinitegraphset.js b/demo/gallery6/infinitegraphset.js index cc869bb..42bcebd 100644 --- a/demo/gallery6/infinitegraphset.js +++ b/demo/gallery6/infinitegraphset.js @@ -19,6 +19,9 @@ img.src = d.get(page).imgs[i]; img.width = d.get(page).width; img.height = d.get(page).height; + // fixes for IE + img.setAttribute("unselectable", "on"); + img.ondragstart = function() { return false; }; div.style.width = d.get(page).width + "px"; div.style.height = d.get(page).height + "px"; img.onload = function () { this.className = ''; } diff --git a/demo/gallery7/infinitegraphset.js b/demo/gallery7/infinitegraphset.js index cc869bb..42bcebd 100644 --- a/demo/gallery7/infinitegraphset.js +++ b/demo/gallery7/infinitegraphset.js @@ -19,6 +19,9 @@ img.src = d.get(page).imgs[i]; img.width = d.get(page).width; img.height = d.get(page).height; + // fixes for IE + img.setAttribute("unselectable", "on"); + img.ondragstart = function() { return false; }; div.style.width = d.get(page).width + "px"; div.style.height = d.get(page).height + "px"; img.onload = function () { this.className = ''; } diff --git a/demo/gallery8/infinitegraphset.js b/demo/gallery8/infinitegraphset.js index 006bdc8..fcb2108 100644 --- a/demo/gallery8/infinitegraphset.js +++ b/demo/gallery8/infinitegraphset.js @@ -65,6 +65,9 @@ img.src = d.get(page).imgs[i]; img.width = d.get(page).width; img.height = d.get(page).height; + // fixes for IE + img.setAttribute("unselectable", "on"); + img.ondragstart = function() { return false; }; div.style.width = d.get(page).width + "px"; div.style.height = d.get(page).height + "px"; img.onload = function () { this.className = ''; } diff --git a/demo/gallery9/infinitegraphset.js b/demo/gallery9/infinitegraphset.js index 4349413..31071c2 100644 --- a/demo/gallery9/infinitegraphset.js +++ b/demo/gallery9/infinitegraphset.js @@ -72,6 +72,9 @@ div.style.width = d.get(page).width + "px"; div.style.height = d.get(page).height + "px"; img.onload = function () { this.className = ''; } + // fixes for IE + img.setAttribute("unselectable", "on"); + img.ondragstart = function() { return false; }; // FIXME /*div.ontouchstart = onTouchStart; div.ontouchmove = onTouchMove; diff --git a/dist/swipeview-1.1.2.min.js b/dist/swipeview-1.1.2.min.js index b7dc22f..4893cc7 100644 --- a/dist/swipeview-1.1.2.min.js +++ b/dist/swipeview-1.1.2.min.js @@ -1,2 +1,2 @@ /*! swipeview 1.1.2 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ -var SwipeView=function(a,b){function c(a){return""===e?a:(a=a.charAt(0).toUpperCase()+a.substr(1),e+a)}var d=b.createElement("div").style,e=function(){for(var a,b="t,webkitT,MozT,msT,OT".split(","),c=0,e=b.length;e>c;c++)if(a=b[c]+"ransform",a in d)return b[c].substr(0,b[c].length-1);return!1}(),f=e?"-"+e.toLowerCase()+"-":"",g=c("transform"),h=c("transitionDuration"),i=c("perspective")in d,j="ontouchstart"in a,k=(c("transition")in d,i?" translateZ(0)":""),l="onorientationchange"in a?"orientationchange":"resize",m=j?"touchstart":"mousedown",n=j?"touchmove":"mousemove",o=j?"touchend":"mouseup",p=j?"touchcancel":"mouseup",q=function(){if(e===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[e]}(),r=0,s=function(c,d){var g,h,i,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++r,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(g in d)this.options[g]=d[g];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],h=b.createElement("div"),h.className="swipeview-slider",h.style.cssText="position:relative;top:0;height:100%;width:100%;"+f+"transition-duration:0;"+f+"transform:translateZ(0);"+f+"transition-timing-function:ease-out",this.wrapper.appendChild(h),this.slider=h,this.refreshSize(),g=-1;2>g;g++)h=b.createElement("div"),h.style.cssText=f+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*g+"%",h.dataset||(h.dataset={}),k=-1==g?this.options.numberOfPages-1:g,h.dataset.pageIndex=k,h.dataset.upcomingPageIndex=k,this.options.loop||-1!=g||(h.style.visibility="hidden"),this.slider.appendChild(h),this.masterPages.push(h);i=this.masterPages[1].className,this.masterPages[1].className=i?i+" swipeview-active":"swipeview-active",a.addEventListener(l,this,!1),this.wrapper.addEventListener(m,this,!1),this.wrapper.addEventListener(n,this,!1),this.wrapper.addEventListener(o,this,!1),this.slider.addEventListener(q,this,!1),"O"==e&&this.slider.addEventListener(q.toLowerCase(),this,!1),j||this.wrapper.addEventListener("mouseout",this,!1)};return s.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.wrapper.addEventListener(this.id+"swipeview-flip",a,!1),this.customEvents.push([this.id+"flip",a])},onMoveOut:function(a){this.wrapper.addEventListener(this.id+"swipeview-moveout",a,!1),this.customEvents.push([this.id+"moveout",a])},onMoveIn:function(a){this.wrapper.addEventListener(this.id+"swipeview-movein",a,!1),this.customEvents.push([this.id+"movein",a])},onTouchStart:function(a){this.wrapper.addEventListener(this.id+"swipeview-touchstart",a,!1),this.customEvents.push([this.id+"touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.wrapper.removeEventListener(this.id+"swipeview-"+this.customEvents[0][0],this.customEvents[0][1],!1),this.customEvents.shift();a.removeEventListener(l,this,!1),this.wrapper.removeEventListener(m,this,!1),this.wrapper.removeEventListener(n,this,!1),this.wrapper.removeEventListener(o,this,!1),this.slider.removeEventListener(q,this,!1),j||this.wrapper.removeEventListener("mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[h]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case m:this.__start(a);break;case n:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=d.pageX-this.pointX,f=d.pageY-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(d.pageY-this.startY):Math.abs(d.pageX-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=d.pageX,this.pointY=d.pageY,this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;a.preventDefault(),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.__event("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(b.pageY-this.startY):Math.abs(b.pageX-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[h]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.__event("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex},__event:function(a){var c=b.createEvent("Event");c.initEvent(this.id+"swipeview-"+a,!0,!0),this.wrapper.dispatchEvent(c)}},s}(window,document); \ No newline at end of file +var SwipeView=function(a,b){function c(a){return""===e?a:(a=a.charAt(0).toUpperCase()+a.substr(1),e+a)}var d=b.createElement("div").style,e=function(){for(var a,b="t,webkitT,MozT,msT,OT".split(","),c=0,e=b.length;e>c;c++)if(a=b[c]+"ransform",a in d)return b[c].substr(0,b[c].length-1);return!1}(),f=e?"-"+e.toLowerCase()+"-":"",g=c("transform"),h=c("transitionDuration"),i=c("perspective")in d,j="ontouchstart"in a,k=(c("transition")in d,i?" translateZ(0)":""),l="onorientationchange"in a?"orientationchange":"resize",m=j?"touchstart":"mousedown",n=j?"touchmove":"mousemove",o=j?"touchend":"mouseup",p=j?"touchcancel":"mouseup",q=function(){if(e===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[e]}(),r=function(a,b,c,d){"addEventListener"in a?a.addEventListener(b,c,d):"attachEvent"in a&&("object"==typeof c&&c.handleEvent?a.attachEvent("on"+b,function(a){c.handleEvent.call(c,a)}):a.attachEvent("on"+b,c))},s=0,t=function(c,d){var g,h,i,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++s,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(g in d)this.options[g]=d[g];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],h=b.createElement("div"),h.className="swipeview-slider",h.style.cssText="position:relative;top:0;height:100%;width:100%;"+f+"transition-duration:0;"+f+"transform:translateZ(0);"+f+"transition-timing-function:ease-out",this.wrapper.appendChild(h),this.slider=h,this.refreshSize(),g=-1;2>g;g++)h=b.createElement("div"),h.style.cssText=f+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*g+"%",h.dataset||(h.dataset={}),k=-1==g?this.options.numberOfPages-1:g,h.dataset.pageIndex=k,h.dataset.upcomingPageIndex=k,this.options.loop||-1!=g||(h.style.visibility="hidden"),this.slider.appendChild(h),this.masterPages.push(h);i=this.masterPages[1].className,this.masterPages[1].className=i?i+" swipeview-active":"swipeview-active",r(a,l,this,!1),r(this.wrapper,m,this,!1),r(this.wrapper,n,this,!1),r(this.wrapper,o,this,!1),r(this.slider,q,this,!1),"O"==e&&r(this.slider,q.toLowerCase(),this,!1),j||r(this.wrapper,"mouseout",this,!1)};return t.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){r(this.wrapper,this.id+"swipeview-flip",a,!1),this.customEvents.push([this.id+"flip",a])},onMoveOut:function(a){r(this.wrapper,this.id+"swipeview-moveout",a,!1),this.customEvents.push([this.id+"moveout",a])},onMoveIn:function(a){r(this.wrapper,this.id+"swipeview-movein",a,!1),this.customEvents.push([this.id+"movein",a])},onTouchStart:function(a){r(this.wrapper,this.id+"swipeview-touchstart",a,!1),this.customEvents.push([this.id+"touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.wrapper.removeEventListener(this.id+"swipeview-"+this.customEvents[0][0],this.customEvents[0][1],!1),this.customEvents.shift();a.removeEventListener(l,this,!1),this.wrapper.removeEventListener(m,this,!1),this.wrapper.removeEventListener(n,this,!1),this.wrapper.removeEventListener(o,this,!1),this.slider.removeEventListener(q,this,!1),j||this.wrapper.removeEventListener("mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[h]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case m:this.__start(a);break;case n:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=d.pageX-this.pointX,f=d.pageY-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(d.pageY-this.startY):Math.abs(d.pageX-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=d.pageX,this.pointY=d.pageY,this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;a.preventDefault(),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.__event("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(b.pageY-this.startY):Math.abs(b.pageX-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[h]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.__event("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex},__event:function(a){var c=b.createEvent("Event");c.initEvent(this.id+"swipeview-"+a,!0,!0),this.wrapper.dispatchEvent(c)}},t}(window,document); \ No newline at end of file diff --git a/dist/swipeview-1.2.0.min.js b/dist/swipeview-1.2.0.min.js new file mode 100644 index 0000000..b84ef36 --- /dev/null +++ b/dist/swipeview-1.2.0.min.js @@ -0,0 +1,2 @@ +/*! swipeview 1.2.0 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ +var SwipeView=function(a,b){function c(a){return""===f?a:(a=a.charAt(0).toUpperCase()+a.substr(1),f+a)}var d=function(){};d.prototype={bind:function(a,b){this._events=this._events||{},this._events[a]=this._events[a]||[],this._events[a].push(b)},unbind:function(a,b){this._events=this._events||{},a in this._events!=!1&&this._events[a].splice(this._events[a].indexOf(b),1)},trigger:function(a){if(this._events=this._events||{},a in this._events!=!1)for(var b=0;bc;c++)if(a=b[c]+"ransform",a in e)return b[c].substr(0,b[c].length-1);return!1}(),g=f?"-"+f.toLowerCase()+"-":"",h=c("transform"),i=c("transitionDuration"),j=c("perspective")in e,k="ontouchstart"in a,l=!!f,m=(c("transition")in e,j?" translateZ(0)":""),n="onorientationchange"in a?"orientationchange":"resize",o=k?"touchstart":"mousedown",p=k?"touchmove":"mousemove",q=k?"touchend":"mouseup",r=k?"touchcancel":"mouseup",s=function(){if(f===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[f]}(),t=function(a,b,c,d){"addEventListener"in a?a.addEventListener(b,c,d):"attachEvent"in a&&("object"==typeof c&&c.handleEvent?a.attachEvent("on"+b,function(a){c.handleEvent.call(c,a)}):a.attachEvent("on"+b,c))},u=function(a,b,c){"removeEventListener"in a?a.removeEventListener(b,c):"detachEvent"in a&&a.detachEvent(b,c)},v=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},w=function(a){return"pageX"in a?a.pageX:a.clientX+b.body.scrollLeft+b.documentElement.scrollLeft},x=function(a){return"pageY"in a?a.pageY:a.clientY+b.body.scrollTop+b.documentElement.scrollTop},y=0,z=function(c,e){var h,i,j,l;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++y,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(h in e)this.options[h]=e[h];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.E=new d,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],i=b.createElement("div"),i.className="swipeview-slider",i.style.cssText="position:relative;top:0;height:100%;width:100%;"+g+"transition-duration:0;"+g+"transform:translateZ(0);"+g+"transition-timing-function:ease-out",this.wrapper.appendChild(i),this.slider=i,this.refreshSize(),h=-1;2>h;h++)i=b.createElement("div"),i.style.cssText=g+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*h+"%",i.dataset||(i.dataset={}),l=-1==h?this.options.numberOfPages-1:h,i.dataset.pageIndex=l,i.dataset.upcomingPageIndex=l,this.options.loop||-1!=h||(i.style.visibility="hidden"),this.slider.appendChild(i),this.masterPages.push(i);j=this.masterPages[1].className,this.masterPages[1].className=j?j+" swipeview-active":"swipeview-active",t(a,n,this,!1),t(this.wrapper,o,this,!1),t(this.wrapper,p,this,!1),t(this.wrapper,q,this,!1),t(this.slider,s,this,!1),"O"==f&&t(this.slider,s.toLowerCase(),this,!1),k||t(this.wrapper,"mouseout",this,!1)};return z.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.E.bind(this.id+"flip",a),this.customEvents.push([this.id+"flip",a])},onMoveOut:function(a){this.E.bind(this.id+"moveout",a),this.customEvents.push([this.id+"moveout",a])},onMoveIn:function(a){this.E.bind(this.id+"movein",a),this.customEvents.push([this.id+"movein",a])},onTouchStart:function(a){this.E.bind(this.id+"touchstart",a),this.customEvents.push([this.id+"touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.E.unbind(this.customEvents[0][0],this.customEvents[0][1]),this.customEvents.shift();u(a,n,this,!1),u(this.wrapper,o,this,!1),u(this.wrapper,p,this,!1),u(this.wrapper,q,this,!1),u(this.slider,s,this,!1),k||u(this.wrapper,"mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[i]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case o:this.__start(a);break;case p:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=w(d)-this.pointX,f=x(d)-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(x(d)-this.startY):Math.abs(w(d)-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=w(d),this.pointY=x(d),this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;v(a),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.E.trigger("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(x(b)-this.startY):Math.abs(w(b)-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[i]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.E.trigger("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex}},z}(window,document); \ No newline at end of file diff --git a/package.json b/package.json index ca60c5c..bb56140 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "swipeview", - "version": "1.1.2", + "version": "1.2.0", "description": "Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli", "keywords": [ "swipe", diff --git a/src/swipeview.js b/src/swipeview.js index 9be8155..11e654f 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -4,7 +4,54 @@ */ var SwipeView = (function (window, document) { - var dummyStyle = document.createElement('div').style, + + /** + * MicroEvent - https://github.com/jeromeetienne/microevent.js + * +Copyright (c) 2011 Jerome Etienne, http://jetienne.com + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + var MicroEvent = function(){}; + MicroEvent.prototype = { + bind: function(event, fct){ + this._events = this._events || {}; + this._events[event] = this._events[event] || []; + this._events[event].push(fct); + }, + unbind: function(event, fct){ + this._events = this._events || {}; + if( event in this._events === false ) return; + this._events[event].splice(this._events[event].indexOf(fct), 1); + }, + trigger: function(event /* , args... */){ + this._events = this._events || {}; + if( event in this._events === false ) return; + for(var i = 0; i < this._events[event].length; i++){ + this._events[event][i].apply(this, Array.prototype.slice.call(arguments, 1)); + } + } + }; + + + var dummyStyle = document.createElement('div').style, vendor = (function () { var vendors = 't,webkitT,MozT,msT,OT'.split(','), t, @@ -55,6 +102,48 @@ var SwipeView = (function (window, document) { return transitionEnd[vendor]; })(), + //~~~ IE polyfills + on = function (el, evt, fn, bubble) { + if("addEventListener" in el) { + el.addEventListener(evt, fn, bubble); + } else if("attachEvent" in el) { + if(typeof fn == "object" && fn.handleEvent) { + el.attachEvent("on" + evt, function(e){ + fn.handleEvent.call(fn, e); + }); + } else { + el.attachEvent("on" + evt, fn); + } + } + }, + off = function (el, evt, fn) { + if("removeEventListener" in el) { + el.removeEventListener(evt, fn); + } + else if ("detachEvent" in el) { + el.detachEvent(evt, fn); + } + }, + preventDefault = function (e) { + if (e.preventDefault) e.preventDefault(); + else e.returnValue = false; + }, + getPageX = function (e) { + if ('pageX' in e) + return e.pageX; + else + return e.clientX + document.body.scrollLeft + document.documentElement.scrollLeft; + return 0; + }, + getPageY = function (e) { + if ('pageY' in e) + return e.pageY; + else + return e.clientY + document.body.scrollTop + document.documentElement.scrollTop; + return 0; + }, + //~~~ end of IE polyfills + uuid = 0, SwipeView = function (el, options) { @@ -84,6 +173,7 @@ var SwipeView = (function (window, document) { this.maxK = 0; this.page = 0; this.pageIndex = 0; + this.E = new MicroEvent(); this.customEvents = []; this.wrapperWidth = 0; this.wrapperHeight = 0; @@ -137,16 +227,16 @@ var SwipeView = (function (window, document) { className = this.masterPages[1].className; this.masterPages[1].className = !className ? 'swipeview-active' : className + ' swipeview-active'; - window.addEventListener(resizeEvent, this, false); - this.wrapper.addEventListener(startEvent, this, false); - this.wrapper.addEventListener(moveEvent, this, false); - this.wrapper.addEventListener(endEvent, this, false); - this.slider.addEventListener(transitionEndEvent, this, false); + on(window, resizeEvent, this, false); + on(this.wrapper, startEvent, this, false); + on(this.wrapper, moveEvent, this, false); + on(this.wrapper, endEvent, this, false); + on(this.slider, transitionEndEvent, this, false); // in Opera >= 12 the transitionend event is lowercase so we register both events - if ( vendor == 'O' ) this.slider.addEventListener(transitionEndEvent.toLowerCase(), this, false); + if ( vendor == 'O' ) on(this.slider, transitionEndEvent.toLowerCase(), this, false); if (!hasTouch) { - this.wrapper.addEventListener('mouseout', this, false); + on(this.wrapper, 'mouseout', this, false); } }; @@ -158,40 +248,40 @@ var SwipeView = (function (window, document) { }, onFlip: function (fn) { - this.wrapper.addEventListener(this.id + 'swipeview-flip', fn, false); - this.customEvents.push([this.id + 'flip', fn]); + this.E.bind(this.id + 'flip', fn); + this.customEvents.push([this.id + 'flip', fn]); }, onMoveOut: function (fn) { - this.wrapper.addEventListener(this.id + 'swipeview-moveout', fn, false); + this.E.bind(this.id + 'moveout', fn); this.customEvents.push([this.id + 'moveout', fn]); }, onMoveIn: function (fn) { - this.wrapper.addEventListener(this.id + 'swipeview-movein', fn, false); + this.E.bind(this.id + 'movein', fn); this.customEvents.push([this.id + 'movein', fn]); }, onTouchStart: function (fn) { - this.wrapper.addEventListener(this.id + 'swipeview-touchstart', fn, false); + this.E.bind(this.id + 'touchstart', fn); this.customEvents.push([this.id + 'touchstart', fn]); }, destroy: function () { while ( this.customEvents.length ) { - this.wrapper.removeEventListener(this.id + 'swipeview-' + this.customEvents[0][0], this.customEvents[0][1], false); + this.E.unbind(this.customEvents[0][0], this.customEvents[0][1]); this.customEvents.shift(); } // Remove the event listeners - window.removeEventListener(resizeEvent, this, false); - this.wrapper.removeEventListener(startEvent, this, false); - this.wrapper.removeEventListener(moveEvent, this, false); - this.wrapper.removeEventListener(endEvent, this, false); - this.slider.removeEventListener(transitionEndEvent, this, false); + off(window, resizeEvent, this, false); + off(this.wrapper, startEvent, this, false); + off(this.wrapper, moveEvent, this, false); + off(this.wrapper, endEvent, this, false); + off(this.slider, transitionEndEvent, this, false); if (!hasTouch) { - this.wrapper.removeEventListener('mouseout', this, false); + off(this.wrapper, 'mouseout', this, false); } }, @@ -316,7 +406,17 @@ var SwipeView = (function (window, document) { */ __pos: function (k) { this.k = k; - this.slider.style[transform] = (this.options.vertical ? 'translate(0,' + k + 'px)' : 'translate(' + k + 'px,0)') + translateZ; + if (hasTransform) { + this.slider.style[transform] = (this.options.vertical ? 'translate(0,' + k + 'px)' : 'translate(' + k + 'px,0)') + translateZ; + } + else { + if (this.options.vertical) { + this.slider.style.top = k+"px"; + } + else { + this.slider.style.left = k+"px"; + } + } }, __resize: function () { @@ -336,10 +436,10 @@ var SwipeView = (function (window, document) { this.identifier = point.identifier; this.moved = false; this.thresholdExceeded = false; - this.startX = point.pageX; - this.startY = point.pageY; - this.pointX = point.pageX; - this.pointY = point.pageY; + this.startX = getPageX(point); + this.startY = getPageY(point); + this.pointX = getPageX(point); + this.pointY = getPageY(point); this.stepsX = 0; this.stepsY = 0; this.direction = 0; @@ -347,7 +447,7 @@ var SwipeView = (function (window, document) { this.slider.style[transitionDuration] = '0s'; - this.__event('touchstart'); + this.E.trigger('touchstart'); }, __move: function (e) { @@ -367,16 +467,16 @@ var SwipeView = (function (window, document) { point = e; } - var deltaX = point.pageX - this.pointX, - deltaY = point.pageY - this.pointY, + var deltaX = getPageX(point) - this.pointX, + deltaY = getPageY(point) - this.pointY, newC = this.options.vertical ? this.k + deltaY : this.k + deltaX, - dist = this.options.vertical ? Math.abs(point.pageY - this.startY): Math.abs(point.pageX - this.startX); + dist = this.options.vertical ? Math.abs(getPageY(point) - this.startY): Math.abs(getPageX(point) - this.startX); if (Math.abs(dist) >= this.pageSize) { return; } this.moved = true; - this.pointX = point.pageX; - this.pointY = point.pageY; + this.pointX = getPageX(point); + this.pointY = getPageY(point); this.direction = this.options.vertical ? (deltaY > 0 ? 1 : deltaY < 0 ? -1 : 0): (deltaX > 0 ? 1 : deltaX < 0 ? -1 : 0); this.stepsX += Math.abs(deltaX); this.stepsY += Math.abs(deltaY); @@ -393,7 +493,7 @@ var SwipeView = (function (window, document) { return; } - e.preventDefault(); + preventDefault(e); this.directionLocked = true; @@ -403,10 +503,10 @@ var SwipeView = (function (window, document) { if (!this.thresholdExceeded && dist >= this.snapThreshold) { this.thresholdExceeded = true; - this.__event('moveout'); + this.E.trigger('moveout'); } else if (this.thresholdExceeded && dist < this.snapThreshold) { this.thresholdExceeded = false; - this.__event('movein'); + this.E.trigger('movein'); } this.__pos(newC); @@ -438,7 +538,7 @@ var SwipeView = (function (window, document) { point = e; } - var dist = this.options.vertical ? Math.abs(point.pageY - this.startY) : Math.abs(point.pageX - this.startX); + var dist = this.options.vertical ? Math.abs(getPageY(point) - this.startY) : Math.abs(getPageX(point) - this.startX); this.initiated = false; @@ -447,7 +547,7 @@ var SwipeView = (function (window, document) { if (!this.options.loop && (this.k > 0 || this.k < this.maxK)) { dist = 0; - this.__event('movein'); + this.E.trigger('movein'); } // Check if we exceeded the snap threshold @@ -527,20 +627,12 @@ var SwipeView = (function (window, document) { }, __flip: function () { - this.__event('flip'); + this.E.trigger('flip'); for (var i=0; i<3; i++) { this.masterPages[i].className = this.masterPages[i].className.replace(/(^|\s)swipeview-loading(\s|$)/, ''); // Remove the loading class this.masterPages[i].dataset.pageIndex = this.masterPages[i].dataset.upcomingPageIndex; } - }, - - __event: function (type) { - var ev = document.createEvent("Event"); - - ev.initEvent(this.id + 'swipeview-' + type, true, true); - - this.wrapper.dispatchEvent(ev); } }; From a8c135450b151b41507fb93d11d2f8cde8d11ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Thu, 18 Jul 2013 11:20:04 +0200 Subject: [PATCH 50/61] Making the destroy function working on IE + indexOf polyfill + on/off polyfill only support functions + handleEvent: it was hard to handle the handleEvent for IE case, because we needed to create a new function which is not referenced anywhere and can't be unbound when doing a off(). --- src/swipeview.js | 67 ++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/src/swipeview.js b/src/swipeview.js index 11e654f..93c54cb 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -5,6 +5,13 @@ var SwipeView = (function (window, document) { + + function indexOf (array, el) { + var i; + for (i=array.length-1; i>-1 && array[i]!==el; --i); + return i; + } + /** * MicroEvent - https://github.com/jeromeetienne/microevent.js * @@ -39,7 +46,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. unbind: function(event, fct){ this._events = this._events || {}; if( event in this._events === false ) return; - this._events[event].splice(this._events[event].indexOf(fct), 1); + this._events[event].splice(indexOf(this._events[event], fct), 1); }, trigger: function(event /* , args... */){ this._events = this._events || {}; @@ -107,13 +114,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. if("addEventListener" in el) { el.addEventListener(evt, fn, bubble); } else if("attachEvent" in el) { - if(typeof fn == "object" && fn.handleEvent) { - el.attachEvent("on" + evt, function(e){ - fn.handleEvent.call(fn, e); - }); - } else { - el.attachEvent("on" + evt, fn); - } + el.attachEvent("on" + evt, fn); } }, off = function (el, evt, fn) { @@ -121,7 +122,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. el.removeEventListener(evt, fn); } else if ("detachEvent" in el) { - el.detachEvent(evt, fn); + el.detachEvent("on" + evt, fn); } }, preventDefault = function (e) { @@ -227,16 +228,22 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. className = this.masterPages[1].className; this.masterPages[1].className = !className ? 'swipeview-active' : className + ' swipeview-active'; - on(window, resizeEvent, this, false); - on(this.wrapper, startEvent, this, false); - on(this.wrapper, moveEvent, this, false); - on(this.wrapper, endEvent, this, false); - on(this.slider, transitionEndEvent, this, false); + // handleEventF is used for binding function (required for IE) + var self = this; + this.handleEventF = function (e) { + self.handleEvent(e); + }; + + on(window, resizeEvent, this.handleEventF, false); + on(this.wrapper, startEvent, this.handleEventF, false); + on(this.wrapper, moveEvent, this.handleEventF, false); + on(this.wrapper, endEvent, this.handleEventF, false); + on(this.slider, transitionEndEvent, this.handleEventF, false); // in Opera >= 12 the transitionend event is lowercase so we register both events - if ( vendor == 'O' ) on(this.slider, transitionEndEvent.toLowerCase(), this, false); + if ( vendor == 'O' ) on(this.slider, transitionEndEvent.toLowerCase(), this.handleEventF, false); if (!hasTouch) { - on(this.wrapper, 'mouseout', this, false); + on(this.wrapper, 'mouseout', this.handleEventF, false); } }; @@ -248,23 +255,23 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. }, onFlip: function (fn) { - this.E.bind(this.id + 'flip', fn); - this.customEvents.push([this.id + 'flip', fn]); + this.E.bind('flip', fn); + this.customEvents.push(['flip', fn]); }, onMoveOut: function (fn) { - this.E.bind(this.id + 'moveout', fn); - this.customEvents.push([this.id + 'moveout', fn]); + this.E.bind('moveout', fn); + this.customEvents.push(['moveout', fn]); }, onMoveIn: function (fn) { - this.E.bind(this.id + 'movein', fn); - this.customEvents.push([this.id + 'movein', fn]); + this.E.bind('movein', fn); + this.customEvents.push(['movein', fn]); }, onTouchStart: function (fn) { - this.E.bind(this.id + 'touchstart', fn); - this.customEvents.push([this.id + 'touchstart', fn]); + this.E.bind('touchstart', fn); + this.customEvents.push(['touchstart', fn]); }, destroy: function () { @@ -274,14 +281,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. } // Remove the event listeners - off(window, resizeEvent, this, false); - off(this.wrapper, startEvent, this, false); - off(this.wrapper, moveEvent, this, false); - off(this.wrapper, endEvent, this, false); - off(this.slider, transitionEndEvent, this, false); + off(window, resizeEvent, this.handleEventF); + off(this.wrapper, startEvent, this.handleEventF); + off(this.wrapper, moveEvent, this.handleEventF); + off(this.wrapper, endEvent, this.handleEventF); + off(this.slider, transitionEndEvent, this.handleEventF); if (!hasTouch) { - off(this.wrapper, 'mouseout', this, false); + off(this.wrapper, 'mouseout', this.handleEventF); } }, From bd5df63a2045b31cb96c4a83f87ffd9c03411a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Thu, 18 Jul 2013 11:49:06 +0200 Subject: [PATCH 51/61] compile --- dist/swipeview-1.2.0.min.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/swipeview-1.2.0.min.js b/dist/swipeview-1.2.0.min.js index b84ef36..cccd49f 100644 --- a/dist/swipeview-1.2.0.min.js +++ b/dist/swipeview-1.2.0.min.js @@ -1,2 +1,2 @@ /*! swipeview 1.2.0 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ -var SwipeView=function(a,b){function c(a){return""===f?a:(a=a.charAt(0).toUpperCase()+a.substr(1),f+a)}var d=function(){};d.prototype={bind:function(a,b){this._events=this._events||{},this._events[a]=this._events[a]||[],this._events[a].push(b)},unbind:function(a,b){this._events=this._events||{},a in this._events!=!1&&this._events[a].splice(this._events[a].indexOf(b),1)},trigger:function(a){if(this._events=this._events||{},a in this._events!=!1)for(var b=0;bc;c++)if(a=b[c]+"ransform",a in e)return b[c].substr(0,b[c].length-1);return!1}(),g=f?"-"+f.toLowerCase()+"-":"",h=c("transform"),i=c("transitionDuration"),j=c("perspective")in e,k="ontouchstart"in a,l=!!f,m=(c("transition")in e,j?" translateZ(0)":""),n="onorientationchange"in a?"orientationchange":"resize",o=k?"touchstart":"mousedown",p=k?"touchmove":"mousemove",q=k?"touchend":"mouseup",r=k?"touchcancel":"mouseup",s=function(){if(f===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[f]}(),t=function(a,b,c,d){"addEventListener"in a?a.addEventListener(b,c,d):"attachEvent"in a&&("object"==typeof c&&c.handleEvent?a.attachEvent("on"+b,function(a){c.handleEvent.call(c,a)}):a.attachEvent("on"+b,c))},u=function(a,b,c){"removeEventListener"in a?a.removeEventListener(b,c):"detachEvent"in a&&a.detachEvent(b,c)},v=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},w=function(a){return"pageX"in a?a.pageX:a.clientX+b.body.scrollLeft+b.documentElement.scrollLeft},x=function(a){return"pageY"in a?a.pageY:a.clientY+b.body.scrollTop+b.documentElement.scrollTop},y=0,z=function(c,e){var h,i,j,l;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++y,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(h in e)this.options[h]=e[h];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.E=new d,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],i=b.createElement("div"),i.className="swipeview-slider",i.style.cssText="position:relative;top:0;height:100%;width:100%;"+g+"transition-duration:0;"+g+"transform:translateZ(0);"+g+"transition-timing-function:ease-out",this.wrapper.appendChild(i),this.slider=i,this.refreshSize(),h=-1;2>h;h++)i=b.createElement("div"),i.style.cssText=g+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*h+"%",i.dataset||(i.dataset={}),l=-1==h?this.options.numberOfPages-1:h,i.dataset.pageIndex=l,i.dataset.upcomingPageIndex=l,this.options.loop||-1!=h||(i.style.visibility="hidden"),this.slider.appendChild(i),this.masterPages.push(i);j=this.masterPages[1].className,this.masterPages[1].className=j?j+" swipeview-active":"swipeview-active",t(a,n,this,!1),t(this.wrapper,o,this,!1),t(this.wrapper,p,this,!1),t(this.wrapper,q,this,!1),t(this.slider,s,this,!1),"O"==f&&t(this.slider,s.toLowerCase(),this,!1),k||t(this.wrapper,"mouseout",this,!1)};return z.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.E.bind(this.id+"flip",a),this.customEvents.push([this.id+"flip",a])},onMoveOut:function(a){this.E.bind(this.id+"moveout",a),this.customEvents.push([this.id+"moveout",a])},onMoveIn:function(a){this.E.bind(this.id+"movein",a),this.customEvents.push([this.id+"movein",a])},onTouchStart:function(a){this.E.bind(this.id+"touchstart",a),this.customEvents.push([this.id+"touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.E.unbind(this.customEvents[0][0],this.customEvents[0][1]),this.customEvents.shift();u(a,n,this,!1),u(this.wrapper,o,this,!1),u(this.wrapper,p,this,!1),u(this.wrapper,q,this,!1),u(this.slider,s,this,!1),k||u(this.wrapper,"mouseout",this,!1)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[i]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case o:this.__start(a);break;case p:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=w(d)-this.pointX,f=x(d)-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(x(d)-this.startY):Math.abs(w(d)-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=w(d),this.pointY=x(d),this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;v(a),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.E.trigger("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(x(b)-this.startY):Math.abs(w(b)-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[i]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.E.trigger("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex}},z}(window,document); \ No newline at end of file +var SwipeView=function(a,b){function c(a,b){var c;for(c=a.length-1;c>-1&&a[c]!==b;--c);return c}function d(a){return""===g?a:(a=a.charAt(0).toUpperCase()+a.substr(1),g+a)}var e=function(){};e.prototype={bind:function(a,b){this._events=this._events||{},this._events[a]=this._events[a]||[],this._events[a].push(b)},unbind:function(a,b){this._events=this._events||{},a in this._events!=!1&&this._events[a].splice(c(this._events[a],b),1)},trigger:function(a){if(this._events=this._events||{},a in this._events!=!1)for(var b=0;bc;c++)if(a=b[c]+"ransform",a in f)return b[c].substr(0,b[c].length-1);return!1}(),h=g?"-"+g.toLowerCase()+"-":"",i=d("transform"),j=d("transitionDuration"),k=d("perspective")in f,l="ontouchstart"in a,m=!!g,n=(d("transition")in f,k?" translateZ(0)":""),o="onorientationchange"in a?"orientationchange":"resize",p=l?"touchstart":"mousedown",q=l?"touchmove":"mousemove",r=l?"touchend":"mouseup",s=l?"touchcancel":"mouseup",t=function(){if(g===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[g]}(),u=function(a,b,c,d){"addEventListener"in a?a.addEventListener(b,c,d):"attachEvent"in a&&a.attachEvent("on"+b,c)},v=function(a,b,c){"removeEventListener"in a?a.removeEventListener(b,c):"detachEvent"in a&&a.detachEvent("on"+b,c)},w=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},x=function(a){return"pageX"in a?a.pageX:a.clientX+b.body.scrollLeft+b.documentElement.scrollLeft},y=function(a){return"pageY"in a?a.pageY:a.clientY+b.body.scrollTop+b.documentElement.scrollTop},z=0,A=function(c,d){var f,i,j,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++z,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(f in d)this.options[f]=d[f];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.E=new e,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],i=b.createElement("div"),i.className="swipeview-slider",i.style.cssText="position:relative;top:0;height:100%;width:100%;"+h+"transition-duration:0;"+h+"transform:translateZ(0);"+h+"transition-timing-function:ease-out",this.wrapper.appendChild(i),this.slider=i,this.refreshSize(),f=-1;2>f;f++)i=b.createElement("div"),i.style.cssText=h+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*f+"%",i.dataset||(i.dataset={}),k=-1==f?this.options.numberOfPages-1:f,i.dataset.pageIndex=k,i.dataset.upcomingPageIndex=k,this.options.loop||-1!=f||(i.style.visibility="hidden"),this.slider.appendChild(i),this.masterPages.push(i);j=this.masterPages[1].className,this.masterPages[1].className=j?j+" swipeview-active":"swipeview-active";var m=this;this.handleEventF=function(a){m.handleEvent(a)},u(a,o,this.handleEventF,!1),u(this.wrapper,p,this.handleEventF,!1),u(this.wrapper,q,this.handleEventF,!1),u(this.wrapper,r,this.handleEventF,!1),u(this.slider,t,this.handleEventF,!1),"O"==g&&u(this.slider,t.toLowerCase(),this.handleEventF,!1),l||u(this.wrapper,"mouseout",this.handleEventF,!1)};return A.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.E.bind("flip",a),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.E.bind("moveout",a),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.E.bind("movein",a),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.E.bind("touchstart",a),this.customEvents.push(["touchstart",a])},destroy:function(){for(;this.customEvents.length;)this.E.unbind(this.customEvents[0][0],this.customEvents[0][1]),this.customEvents.shift();v(a,o,this.handleEventF),v(this.wrapper,p,this.handleEventF),v(this.wrapper,q,this.handleEventF),v(this.wrapper,r,this.handleEventF),v(this.slider,t,this.handleEventF),l||v(this.wrapper,"mouseout",this.handleEventF)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[j]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case p:this.__start(a);break;case q:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=x(d)-this.pointX,f=y(d)-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(y(d)-this.startY):Math.abs(x(d)-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=x(d),this.pointY=y(d),this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;w(a),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.E.trigger("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(y(b)-this.startY):Math.abs(x(b)-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[j]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.E.trigger("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex}},A}(window,document); \ No newline at end of file From 6af4c132c9a9c1629d7888c173684aaba13c1efb Mon Sep 17 00:00:00 2001 From: Alex S Date: Wed, 7 Aug 2013 15:49:15 +0200 Subject: [PATCH 52/61] Provide a way to unbind the external events without destroying --- src/swipeview.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/swipeview.js b/src/swipeview.js index 93c54cb..7dfdd01 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -274,11 +274,18 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. this.customEvents.push(['touchstart', fn]); }, - destroy: function () { + /** + * Removes all external events callbacks + */ + unbind : function(){ while ( this.customEvents.length ) { this.E.unbind(this.customEvents[0][0], this.customEvents[0][1]); this.customEvents.shift(); } + }, + + destroy: function () { + this.unbind(); // Remove the event listeners off(window, resizeEvent, this.handleEventF); From eed82a53e3f057b55ca6a6dc1c5560f8c16b665b Mon Sep 17 00:00:00 2001 From: Alex S Date: Wed, 7 Aug 2013 16:38:39 +0200 Subject: [PATCH 53/61] Bump to v1.2.1 --- dist/swipeview-1.2.1.min.js | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 dist/swipeview-1.2.1.min.js diff --git a/dist/swipeview-1.2.1.min.js b/dist/swipeview-1.2.1.min.js new file mode 100644 index 0000000..b3030a1 --- /dev/null +++ b/dist/swipeview-1.2.1.min.js @@ -0,0 +1,2 @@ +/*! swipeview 1.2.1 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ +var SwipeView=function(a,b){function c(a,b){var c;for(c=a.length-1;c>-1&&a[c]!==b;--c);return c}function d(a){return""===g?a:(a=a.charAt(0).toUpperCase()+a.substr(1),g+a)}var e=function(){};e.prototype={bind:function(a,b){this._events=this._events||{},this._events[a]=this._events[a]||[],this._events[a].push(b)},unbind:function(a,b){this._events=this._events||{},a in this._events!=!1&&this._events[a].splice(c(this._events[a],b),1)},trigger:function(a){if(this._events=this._events||{},a in this._events!=!1)for(var b=0;bc;c++)if(a=b[c]+"ransform",a in f)return b[c].substr(0,b[c].length-1);return!1}(),h=g?"-"+g.toLowerCase()+"-":"",i=d("transform"),j=d("transitionDuration"),k=d("perspective")in f,l="ontouchstart"in a,m=!!g,n=(d("transition")in f,k?" translateZ(0)":""),o="onorientationchange"in a?"orientationchange":"resize",p=l?"touchstart":"mousedown",q=l?"touchmove":"mousemove",r=l?"touchend":"mouseup",s=l?"touchcancel":"mouseup",t=function(){if(g===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[g]}(),u=function(a,b,c,d){"addEventListener"in a?a.addEventListener(b,c,d):"attachEvent"in a&&a.attachEvent("on"+b,c)},v=function(a,b,c){"removeEventListener"in a?a.removeEventListener(b,c):"detachEvent"in a&&a.detachEvent("on"+b,c)},w=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},x=function(a){return"pageX"in a?a.pageX:a.clientX+b.body.scrollLeft+b.documentElement.scrollLeft},y=function(a){return"pageY"in a?a.pageY:a.clientY+b.body.scrollTop+b.documentElement.scrollTop},z=0,A=function(c,d){var f,i,j,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++z,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(f in d)this.options[f]=d[f];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.E=new e,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],i=b.createElement("div"),i.className="swipeview-slider",i.style.cssText="position:relative;top:0;height:100%;width:100%;"+h+"transition-duration:0;"+h+"transform:translateZ(0);"+h+"transition-timing-function:ease-out",this.wrapper.appendChild(i),this.slider=i,this.refreshSize(),f=-1;2>f;f++)i=b.createElement("div"),i.style.cssText=h+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*f+"%",i.dataset||(i.dataset={}),k=-1==f?this.options.numberOfPages-1:f,i.dataset.pageIndex=k,i.dataset.upcomingPageIndex=k,this.options.loop||-1!=f||(i.style.visibility="hidden"),this.slider.appendChild(i),this.masterPages.push(i);j=this.masterPages[1].className,this.masterPages[1].className=j?j+" swipeview-active":"swipeview-active";var m=this;this.handleEventF=function(a){m.handleEvent(a)},u(a,o,this.handleEventF,!1),u(this.wrapper,p,this.handleEventF,!1),u(this.wrapper,q,this.handleEventF,!1),u(this.wrapper,r,this.handleEventF,!1),u(this.slider,t,this.handleEventF,!1),"O"==g&&u(this.slider,t.toLowerCase(),this.handleEventF,!1),l||u(this.wrapper,"mouseout",this.handleEventF,!1)};return A.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.E.bind("flip",a),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.E.bind("moveout",a),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.E.bind("movein",a),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.E.bind("touchstart",a),this.customEvents.push(["touchstart",a])},unbind:function(){for(;this.customEvents.length;)this.E.unbind(this.customEvents[0][0],this.customEvents[0][1]),this.customEvents.shift()},destroy:function(){this.unbind(),v(a,o,this.handleEventF),v(this.wrapper,p,this.handleEventF),v(this.wrapper,q,this.handleEventF),v(this.wrapper,r,this.handleEventF),v(this.slider,t,this.handleEventF),l||v(this.wrapper,"mouseout",this.handleEventF)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[j]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip()},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case p:this.__start(a);break;case q:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=x(d)-this.pointX,f=y(d)-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(y(d)-this.startY):Math.abs(x(d)-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=x(d),this.pointY=y(d),this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;w(a),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.E.trigger("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(y(b)-this.startY):Math.abs(x(b)-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[j]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(){this.E.trigger("flip");for(var a=0;3>a;a++)this.masterPages[a].className=this.masterPages[a].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[a].dataset.pageIndex=this.masterPages[a].dataset.upcomingPageIndex}},A}(window,document); \ No newline at end of file diff --git a/package.json b/package.json index bb56140..10b3665 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "swipeview", - "version": "1.2.0", + "version": "1.2.1", "description": "Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli", "keywords": [ "swipe", From 5afdbd0a5ed350149ac1499c3cb557dc2a68fd98 Mon Sep 17 00:00:00 2001 From: Alex S Date: Mon, 12 Aug 2013 14:07:22 +0200 Subject: [PATCH 54/61] Add origin information in onFlip callback --- dist/swipeview-1.2.2.min.js | 2 ++ package.json | 2 +- src/swipeview.js | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 dist/swipeview-1.2.2.min.js diff --git a/dist/swipeview-1.2.2.min.js b/dist/swipeview-1.2.2.min.js new file mode 100644 index 0000000..b849f08 --- /dev/null +++ b/dist/swipeview-1.2.2.min.js @@ -0,0 +1,2 @@ +/*! swipeview 1.2.2 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ +var SwipeView=function(a,b){function c(a,b){var c;for(c=a.length-1;c>-1&&a[c]!==b;--c);return c}function d(a){return""===g?a:(a=a.charAt(0).toUpperCase()+a.substr(1),g+a)}var e=function(){};e.prototype={bind:function(a,b){this._events=this._events||{},this._events[a]=this._events[a]||[],this._events[a].push(b)},unbind:function(a,b){this._events=this._events||{},a in this._events!=!1&&this._events[a].splice(c(this._events[a],b),1)},trigger:function(a){if(this._events=this._events||{},a in this._events!=!1)for(var b=0;bc;c++)if(a=b[c]+"ransform",a in f)return b[c].substr(0,b[c].length-1);return!1}(),h=g?"-"+g.toLowerCase()+"-":"",i=d("transform"),j=d("transitionDuration"),k=d("perspective")in f,l="ontouchstart"in a,m=!!g,n=(d("transition")in f,k?" translateZ(0)":""),o="onorientationchange"in a?"orientationchange":"resize",p=l?"touchstart":"mousedown",q=l?"touchmove":"mousemove",r=l?"touchend":"mouseup",s=l?"touchcancel":"mouseup",t=function(){if(g===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[g]}(),u=function(a,b,c,d){"addEventListener"in a?a.addEventListener(b,c,d):"attachEvent"in a&&a.attachEvent("on"+b,c)},v=function(a,b,c){"removeEventListener"in a?a.removeEventListener(b,c):"detachEvent"in a&&a.detachEvent("on"+b,c)},w=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},x=function(a){return"pageX"in a?a.pageX:a.clientX+b.body.scrollLeft+b.documentElement.scrollLeft},y=function(a){return"pageY"in a?a.pageY:a.clientY+b.body.scrollTop+b.documentElement.scrollTop},z=0,A=function(c,d){var f,i,j,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++z,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(f in d)this.options[f]=d[f];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.E=new e,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],i=b.createElement("div"),i.className="swipeview-slider",i.style.cssText="position:relative;top:0;height:100%;width:100%;"+h+"transition-duration:0;"+h+"transform:translateZ(0);"+h+"transition-timing-function:ease-out",this.wrapper.appendChild(i),this.slider=i,this.refreshSize(),f=-1;2>f;f++)i=b.createElement("div"),i.style.cssText=h+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*f+"%",i.dataset||(i.dataset={}),k=-1==f?this.options.numberOfPages-1:f,i.dataset.pageIndex=k,i.dataset.upcomingPageIndex=k,this.options.loop||-1!=f||(i.style.visibility="hidden"),this.slider.appendChild(i),this.masterPages.push(i);j=this.masterPages[1].className,this.masterPages[1].className=j?j+" swipeview-active":"swipeview-active";var m=this;this.handleEventF=function(a){m.handleEvent(a)},u(a,o,this.handleEventF,!1),u(this.wrapper,p,this.handleEventF,!1),u(this.wrapper,q,this.handleEventF,!1),u(this.wrapper,r,this.handleEventF,!1),u(this.slider,t,this.handleEventF,!1),"O"==g&&u(this.slider,t.toLowerCase(),this.handleEventF,!1),l||u(this.wrapper,"mouseout",this.handleEventF,!1)};return A.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.E.bind("flip",a),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.E.bind("moveout",a),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.E.bind("movein",a),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.E.bind("touchstart",a),this.customEvents.push(["touchstart",a])},unbind:function(){for(;this.customEvents.length;)this.E.unbind(this.customEvents[0][0],this.customEvents[0][1]),this.customEvents.shift()},destroy:function(){this.unbind(),v(a,o,this.handleEventF),v(this.wrapper,p,this.handleEventF),v(this.wrapper,q,this.handleEventF),v(this.wrapper,r,this.handleEventF),v(this.slider,t,this.handleEventF),l||v(this.wrapper,"mouseout",this.handleEventF)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[j]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip(!0)},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case p:this.__start(a);break;case q:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=x(d)-this.pointX,f=y(d)-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(y(d)-this.startY):Math.abs(x(d)-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=x(d),this.pointY=y(d),this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;w(a),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.E.trigger("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(y(b)-this.startY):Math.abs(x(b)-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[j]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(a){this.E.trigger("flip",{triggeredByGoto:!!a});for(var b=0;3>b;b++)this.masterPages[b].className=this.masterPages[b].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[b].dataset.pageIndex=this.masterPages[b].dataset.upcomingPageIndex}},A}(window,document); \ No newline at end of file diff --git a/package.json b/package.json index 10b3665..cb2d7be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "swipeview", - "version": "1.2.1", + "version": "1.2.2", "description": "Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli", "keywords": [ "swipe", diff --git a/src/swipeview.js b/src/swipeview.js index 7dfdd01..4dc043a 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -363,7 +363,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. this.masterPages[0].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; } - this.__flip(); + this.__flip( true ); }, next: function () { @@ -640,8 +640,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. } }, - __flip: function () { - this.E.trigger('flip'); + __flip: function ( fromGoTo ) { + this.E.trigger('flip', { triggeredByGoto : !!fromGoTo }); for (var i=0; i<3; i++) { this.masterPages[i].className = this.masterPages[i].className.replace(/(^|\s)swipeview-loading(\s|$)/, ''); // Remove the loading class From c278ab62f1f8b046351fed793a761e9ea13da0a0 Mon Sep 17 00:00:00 2001 From: Alex S Date: Tue, 13 Aug 2013 17:00:04 +0200 Subject: [PATCH 55/61] GoToPage fix --- src/swipeview.js | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/src/swipeview.js b/src/swipeview.js index 4dc043a..89bd26e 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -337,31 +337,22 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. this.masterPages[this.currentMasterPage].className = this.masterPages[this.currentMasterPage].className + ' swipeview-active'; - if (this.currentMasterPage === 0) { - this.masterPages[2].style[this.cssPosition] = this.page * 100 - 100 + '%'; - this.masterPages[0].style[this.cssPosition] = this.page * 100 + '%'; - this.masterPages[1].style[this.cssPosition] = this.page * 100 + 100 + '%'; - - this.masterPages[2].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; - this.masterPages[0].dataset.upcomingPageIndex = this.page; - this.masterPages[1].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; - } else if (this.currentMasterPage == 1) { - this.masterPages[0].style[this.cssPosition] = this.page * 100 - 100 + '%'; - this.masterPages[1].style[this.cssPosition] = this.page * 100 + '%'; - this.masterPages[2].style[this.cssPosition] = this.page * 100 + 100 + '%'; - - this.masterPages[0].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; - this.masterPages[1].dataset.upcomingPageIndex = this.page; - this.masterPages[2].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; - } else { - this.masterPages[1].style[this.cssPosition] = this.page * 100 - 100 + '%'; - this.masterPages[2].style[this.cssPosition] = this.page * 100 + '%'; - this.masterPages[0].style[this.cssPosition] = this.page * 100 + 100 + '%'; - this.masterPages[1].dataset.upcomingPageIndex = this.page === 0 ? this.options.numberOfPages-1 : this.page - 1; - this.masterPages[2].dataset.upcomingPageIndex = this.page; - this.masterPages[0].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? 0 : this.page + 1; - } + var indices = (function calculatePagesIndexFromCurrent( currentMasterPage ){ + if (currentMasterPage === 0) return [2, 0, 1]; + else if (currentMasterPage === 1) return [0, 1, 2]; + else return [1, 2, 0]; + })(this.currentMasterPage); + + this.masterPages[ indices[0] ].style[this.cssPosition] = this.page * 100 - 100 + '%'; + this.masterPages[ indices[1] ].style[this.cssPosition] = this.page * 100 + '%'; + this.masterPages[ indices[2] ].style[this.cssPosition] = this.page * 100 + 100 + '%'; + + this.masterPages[ indices[0] ].dataset.upcomingPageIndex = this.page === 0 ? + (this.options.loop ? this.options.numberOfPages-1 : undefined ): this.page - 1; + this.masterPages[ indices[1] ].dataset.upcomingPageIndex = this.page; + this.masterPages[ indices[2] ].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? + (this.options.loop ? 0 : undefined ): this.page + 1; this.__flip( true ); }, From 714b56b1b9e37eaa90a2eb113a72cac40b7e99c4 Mon Sep 17 00:00:00 2001 From: Alex S Date: Tue, 13 Aug 2013 18:38:54 +0200 Subject: [PATCH 56/61] Fix no loop when swipe --- src/swipeview.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/swipeview.js b/src/swipeview.js index 89bd26e..c756678 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -589,6 +589,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. this.masterPages[pageFlip].style[this.cssPosition] = this.page * 100 - 100 + '%'; pageFlipIndex = this.page - 1; + pageFlipIndex = pageFlipIndex - Math.floor(pageFlipIndex / this.options.numberOfPages) * this.options.numberOfPages; + pageFlipIndex = pageFlipIndex === this.options.numberOfPages && !this.options.loop ? undefined : pageFlipIndex; } else { this.page = -Math.floor(this.k / this.pageSize); this.currentMasterPage = (this.page + 1) - Math.floor((this.page + 1) / 3) * 3; @@ -599,6 +601,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. this.masterPages[pageFlip].style[this.cssPosition] = this.page * 100 + 100 + '%'; pageFlipIndex = this.page + 1; + pageFlipIndex = pageFlipIndex - Math.floor(pageFlipIndex / this.options.numberOfPages) * this.options.numberOfPages; + pageFlipIndex = pageFlipIndex === 0 && !this.options.loop ? undefined : pageFlipIndex; } // Add active class to current page @@ -611,7 +615,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. if(!/(^|\s)swipeview-loading(\s|$)/.test(className)) this.masterPages[pageFlip].className = !className ? 'swipeview-loading' : className + ' swipeview-loading'; - pageFlipIndex = pageFlipIndex - Math.floor(pageFlipIndex / this.options.numberOfPages) * this.options.numberOfPages; this.masterPages[pageFlip].dataset.upcomingPageIndex = pageFlipIndex; // Index to be loaded in the newly flipped page newC = -this.page * this.pageSize; From 84ef88f9062794f6304270cff85607835fba804d Mon Sep 17 00:00:00 2001 From: Alex S Date: Mon, 19 Aug 2013 14:17:38 +0200 Subject: [PATCH 57/61] Correctly bump version 1.2.2 --- dist/swipeview-1.2.2.min.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/swipeview-1.2.2.min.js b/dist/swipeview-1.2.2.min.js index b849f08..611accf 100644 --- a/dist/swipeview-1.2.2.min.js +++ b/dist/swipeview-1.2.2.min.js @@ -1,2 +1,2 @@ /*! swipeview 1.2.2 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ -var SwipeView=function(a,b){function c(a,b){var c;for(c=a.length-1;c>-1&&a[c]!==b;--c);return c}function d(a){return""===g?a:(a=a.charAt(0).toUpperCase()+a.substr(1),g+a)}var e=function(){};e.prototype={bind:function(a,b){this._events=this._events||{},this._events[a]=this._events[a]||[],this._events[a].push(b)},unbind:function(a,b){this._events=this._events||{},a in this._events!=!1&&this._events[a].splice(c(this._events[a],b),1)},trigger:function(a){if(this._events=this._events||{},a in this._events!=!1)for(var b=0;bc;c++)if(a=b[c]+"ransform",a in f)return b[c].substr(0,b[c].length-1);return!1}(),h=g?"-"+g.toLowerCase()+"-":"",i=d("transform"),j=d("transitionDuration"),k=d("perspective")in f,l="ontouchstart"in a,m=!!g,n=(d("transition")in f,k?" translateZ(0)":""),o="onorientationchange"in a?"orientationchange":"resize",p=l?"touchstart":"mousedown",q=l?"touchmove":"mousemove",r=l?"touchend":"mouseup",s=l?"touchcancel":"mouseup",t=function(){if(g===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[g]}(),u=function(a,b,c,d){"addEventListener"in a?a.addEventListener(b,c,d):"attachEvent"in a&&a.attachEvent("on"+b,c)},v=function(a,b,c){"removeEventListener"in a?a.removeEventListener(b,c):"detachEvent"in a&&a.detachEvent("on"+b,c)},w=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},x=function(a){return"pageX"in a?a.pageX:a.clientX+b.body.scrollLeft+b.documentElement.scrollLeft},y=function(a){return"pageY"in a?a.pageY:a.clientY+b.body.scrollTop+b.documentElement.scrollTop},z=0,A=function(c,d){var f,i,j,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++z,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(f in d)this.options[f]=d[f];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.E=new e,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],i=b.createElement("div"),i.className="swipeview-slider",i.style.cssText="position:relative;top:0;height:100%;width:100%;"+h+"transition-duration:0;"+h+"transform:translateZ(0);"+h+"transition-timing-function:ease-out",this.wrapper.appendChild(i),this.slider=i,this.refreshSize(),f=-1;2>f;f++)i=b.createElement("div"),i.style.cssText=h+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*f+"%",i.dataset||(i.dataset={}),k=-1==f?this.options.numberOfPages-1:f,i.dataset.pageIndex=k,i.dataset.upcomingPageIndex=k,this.options.loop||-1!=f||(i.style.visibility="hidden"),this.slider.appendChild(i),this.masterPages.push(i);j=this.masterPages[1].className,this.masterPages[1].className=j?j+" swipeview-active":"swipeview-active";var m=this;this.handleEventF=function(a){m.handleEvent(a)},u(a,o,this.handleEventF,!1),u(this.wrapper,p,this.handleEventF,!1),u(this.wrapper,q,this.handleEventF,!1),u(this.wrapper,r,this.handleEventF,!1),u(this.slider,t,this.handleEventF,!1),"O"==g&&u(this.slider,t.toLowerCase(),this.handleEventF,!1),l||u(this.wrapper,"mouseout",this.handleEventF,!1)};return A.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.E.bind("flip",a),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.E.bind("moveout",a),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.E.bind("movein",a),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.E.bind("touchstart",a),this.customEvents.push(["touchstart",a])},unbind:function(){for(;this.customEvents.length;)this.E.unbind(this.customEvents[0][0],this.customEvents[0][1]),this.customEvents.shift()},destroy:function(){this.unbind(),v(a,o,this.handleEventF),v(this.wrapper,p,this.handleEventF),v(this.wrapper,q,this.handleEventF),v(this.wrapper,r,this.handleEventF),v(this.slider,t,this.handleEventF),l||v(this.wrapper,"mouseout",this.handleEventF)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[j]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active",0===this.currentMasterPage?(this.masterPages[2].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[2].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[0].dataset.upcomingPageIndex=this.page,this.masterPages[1].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):1==this.currentMasterPage?(this.masterPages[0].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[1].style[this.cssPosition]=100*this.page+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[0].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[1].dataset.upcomingPageIndex=this.page,this.masterPages[2].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1):(this.masterPages[1].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[2].style[this.cssPosition]=100*this.page+"%",this.masterPages[0].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[1].dataset.upcomingPageIndex=0===this.page?this.options.numberOfPages-1:this.page-1,this.masterPages[2].dataset.upcomingPageIndex=this.page,this.masterPages[0].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?0:this.page+1),this.__flip(!0)},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case p:this.__start(a);break;case q:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=x(d)-this.pointX,f=y(d)-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(y(d)-this.startY):Math.abs(x(d)-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=x(d),this.pointY=y(d),this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;w(a),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.E.trigger("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(y(b)-this.startY):Math.abs(x(b)-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[j]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(a){this.E.trigger("flip",{triggeredByGoto:!!a});for(var b=0;3>b;b++)this.masterPages[b].className=this.masterPages[b].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[b].dataset.pageIndex=this.masterPages[b].dataset.upcomingPageIndex}},A}(window,document); \ No newline at end of file +var SwipeView=function(a,b){function c(a,b){var c;for(c=a.length-1;c>-1&&a[c]!==b;--c);return c}function d(a){return""===g?a:(a=a.charAt(0).toUpperCase()+a.substr(1),g+a)}var e=function(){};e.prototype={bind:function(a,b){this._events=this._events||{},this._events[a]=this._events[a]||[],this._events[a].push(b)},unbind:function(a,b){this._events=this._events||{},a in this._events!=!1&&this._events[a].splice(c(this._events[a],b),1)},trigger:function(a){if(this._events=this._events||{},a in this._events!=!1)for(var b=0;bc;c++)if(a=b[c]+"ransform",a in f)return b[c].substr(0,b[c].length-1);return!1}(),h=g?"-"+g.toLowerCase()+"-":"",i=d("transform"),j=d("transitionDuration"),k=d("perspective")in f,l="ontouchstart"in a,m=!!g,n=(d("transition")in f,k?" translateZ(0)":""),o="onorientationchange"in a?"orientationchange":"resize",p=l?"touchstart":"mousedown",q=l?"touchmove":"mousemove",r=l?"touchend":"mouseup",s=l?"touchcancel":"mouseup",t=function(){if(g===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[g]}(),u=function(a,b,c,d){"addEventListener"in a?a.addEventListener(b,c,d):"attachEvent"in a&&a.attachEvent("on"+b,c)},v=function(a,b,c){"removeEventListener"in a?a.removeEventListener(b,c):"detachEvent"in a&&a.detachEvent("on"+b,c)},w=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},x=function(a){return"pageX"in a?a.pageX:a.clientX+b.body.scrollLeft+b.documentElement.scrollLeft},y=function(a){return"pageY"in a?a.pageY:a.clientY+b.body.scrollTop+b.documentElement.scrollTop},z=0,A=function(c,d){var f,i,j,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++z,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(f in d)this.options[f]=d[f];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.E=new e,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],i=b.createElement("div"),i.className="swipeview-slider",i.style.cssText="position:relative;top:0;height:100%;width:100%;"+h+"transition-duration:0;"+h+"transform:translateZ(0);"+h+"transition-timing-function:ease-out",this.wrapper.appendChild(i),this.slider=i,this.refreshSize(),f=-1;2>f;f++)i=b.createElement("div"),i.style.cssText=h+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*f+"%",i.dataset||(i.dataset={}),k=-1==f?this.options.numberOfPages-1:f,i.dataset.pageIndex=k,i.dataset.upcomingPageIndex=k,this.options.loop||-1!=f||(i.style.visibility="hidden"),this.slider.appendChild(i),this.masterPages.push(i);j=this.masterPages[1].className,this.masterPages[1].className=j?j+" swipeview-active":"swipeview-active";var m=this;this.handleEventF=function(a){m.handleEvent(a)},u(a,o,this.handleEventF,!1),u(this.wrapper,p,this.handleEventF,!1),u(this.wrapper,q,this.handleEventF,!1),u(this.wrapper,r,this.handleEventF,!1),u(this.slider,t,this.handleEventF,!1),"O"==g&&u(this.slider,t.toLowerCase(),this.handleEventF,!1),l||u(this.wrapper,"mouseout",this.handleEventF,!1)};return A.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.E.bind("flip",a),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.E.bind("moveout",a),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.E.bind("movein",a),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.E.bind("touchstart",a),this.customEvents.push(["touchstart",a])},unbind:function(){for(;this.customEvents.length;)this.E.unbind(this.customEvents[0][0],this.customEvents[0][1]),this.customEvents.shift()},destroy:function(){this.unbind(),v(a,o,this.handleEventF),v(this.wrapper,p,this.handleEventF),v(this.wrapper,q,this.handleEventF),v(this.wrapper,r,this.handleEventF),v(this.slider,t,this.handleEventF),l||v(this.wrapper,"mouseout",this.handleEventF)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[j]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active";var c=function(a){return 0===a?[2,0,1]:1===a?[0,1,2]:[1,2,0]}(this.currentMasterPage);this.masterPages[c[0]].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[c[1]].style[this.cssPosition]=100*this.page+"%",this.masterPages[c[2]].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[c[0]].dataset.upcomingPageIndex=0===this.page?this.options.loop?this.options.numberOfPages-1:void 0:this.page-1,this.masterPages[c[1]].dataset.upcomingPageIndex=this.page,this.masterPages[c[2]].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?this.options.loop?0:void 0:this.page+1,this.__flip(!0)},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case p:this.__start(a);break;case q:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=x(d)-this.pointX,f=y(d)-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(y(d)-this.startY):Math.abs(x(d)-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=x(d),this.pointY=y(d),this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;w(a),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.E.trigger("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(y(b)-this.startY):Math.abs(x(b)-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1,b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,b=b!==this.options.numberOfPages||this.options.loop?b:void 0):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1,b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,b=0!==b||this.options.loop?b:void 0),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[j]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(a){this.E.trigger("flip",{triggeredByGoto:!!a});for(var b=0;3>b;b++)this.masterPages[b].className=this.masterPages[b].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[b].dataset.pageIndex=this.masterPages[b].dataset.upcomingPageIndex}},A}(window,document); \ No newline at end of file From 23844de670ec6235b3b0a4011cd89a2570c300e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Wed, 18 Sep 2013 17:19:37 +0200 Subject: [PATCH 58/61] Using loop:false fix the initial state of pages (sometimes was hidden) --- dist/swipeview-1.2.3.min.js | 2 ++ package.json | 2 +- src/swipeview.js | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 dist/swipeview-1.2.3.min.js diff --git a/dist/swipeview-1.2.3.min.js b/dist/swipeview-1.2.3.min.js new file mode 100644 index 0000000..7eff245 --- /dev/null +++ b/dist/swipeview-1.2.3.min.js @@ -0,0 +1,2 @@ +/*! swipeview 1.2.3 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ +var SwipeView=function(a,b){function c(a,b){var c;for(c=a.length-1;c>-1&&a[c]!==b;--c);return c}function d(a){return""===g?a:(a=a.charAt(0).toUpperCase()+a.substr(1),g+a)}var e=function(){};e.prototype={bind:function(a,b){this._events=this._events||{},this._events[a]=this._events[a]||[],this._events[a].push(b)},unbind:function(a,b){this._events=this._events||{},a in this._events!=!1&&this._events[a].splice(c(this._events[a],b),1)},trigger:function(a){if(this._events=this._events||{},a in this._events!=!1)for(var b=0;bc;c++)if(a=b[c]+"ransform",a in f)return b[c].substr(0,b[c].length-1);return!1}(),h=g?"-"+g.toLowerCase()+"-":"",i=d("transform"),j=d("transitionDuration"),k=d("perspective")in f,l="ontouchstart"in a,m=!!g,n=(d("transition")in f,k?" translateZ(0)":""),o="onorientationchange"in a?"orientationchange":"resize",p=l?"touchstart":"mousedown",q=l?"touchmove":"mousemove",r=l?"touchend":"mouseup",s=l?"touchcancel":"mouseup",t=function(){if(g===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[g]}(),u=function(a,b,c,d){"addEventListener"in a?a.addEventListener(b,c,d):"attachEvent"in a&&a.attachEvent("on"+b,c)},v=function(a,b,c){"removeEventListener"in a?a.removeEventListener(b,c):"detachEvent"in a&&a.detachEvent("on"+b,c)},w=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},x=function(a){return"pageX"in a?a.pageX:a.clientX+b.body.scrollLeft+b.documentElement.scrollLeft},y=function(a){return"pageY"in a?a.pageY:a.clientY+b.body.scrollTop+b.documentElement.scrollTop},z=0,A=function(c,d){var f,i,j,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++z,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(f in d)this.options[f]=d[f];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.E=new e,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],i=b.createElement("div"),i.className="swipeview-slider",i.style.cssText="position:relative;top:0;height:100%;width:100%;"+h+"transition-duration:0;"+h+"transform:translateZ(0);"+h+"transition-timing-function:ease-out",this.wrapper.appendChild(i),this.slider=i,this.refreshSize(),f=-1;2>f;f++)i=b.createElement("div"),i.style.cssText=h+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*f+"%",i.dataset||(i.dataset={}),k=-1==f?this.options.numberOfPages-1:f,i.dataset.pageIndex=k,i.dataset.upcomingPageIndex=k,this.slider.appendChild(i),this.masterPages.push(i);j=this.masterPages[1].className,this.masterPages[1].className=j?j+" swipeview-active":"swipeview-active";var m=this;this.handleEventF=function(a){m.handleEvent(a)},u(a,o,this.handleEventF,!1),u(this.wrapper,p,this.handleEventF,!1),u(this.wrapper,q,this.handleEventF,!1),u(this.wrapper,r,this.handleEventF,!1),u(this.slider,t,this.handleEventF,!1),"O"==g&&u(this.slider,t.toLowerCase(),this.handleEventF,!1),l||u(this.wrapper,"mouseout",this.handleEventF,!1)};return A.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.E.bind("flip",a),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.E.bind("moveout",a),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.E.bind("movein",a),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.E.bind("touchstart",a),this.customEvents.push(["touchstart",a])},unbind:function(){for(;this.customEvents.length;)this.E.unbind(this.customEvents[0][0],this.customEvents[0][1]),this.customEvents.shift()},destroy:function(){this.unbind(),v(a,o,this.handleEventF),v(this.wrapper,p,this.handleEventF),v(this.wrapper,q,this.handleEventF),v(this.wrapper,r,this.handleEventF),v(this.slider,t,this.handleEventF),l||v(this.wrapper,"mouseout",this.handleEventF)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[j]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active";var c=function(a){return 0===a?[2,0,1]:1===a?[0,1,2]:[1,2,0]}(this.currentMasterPage);this.masterPages[c[0]].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[c[1]].style[this.cssPosition]=100*this.page+"%",this.masterPages[c[2]].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[c[0]].dataset.upcomingPageIndex=0===this.page?this.options.loop?this.options.numberOfPages-1:void 0:this.page-1,this.masterPages[c[1]].dataset.upcomingPageIndex=this.page,this.masterPages[c[2]].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?this.options.loop?0:void 0:this.page+1,this.__flip(!0)},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case p:this.__start(a);break;case q:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=x(d)-this.pointX,f=y(d)-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(y(d)-this.startY):Math.abs(x(d)-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=x(d),this.pointY=y(d),this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;w(a),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.E.trigger("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(y(b)-this.startY):Math.abs(x(b)-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1,b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,b=b!==this.options.numberOfPages||this.options.loop?b:void 0):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1,b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,b=0!==b||this.options.loop?b:void 0),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[j]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(a){this.E.trigger("flip",{triggeredByGoto:!!a});for(var b=0;3>b;b++)this.masterPages[b].className=this.masterPages[b].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[b].dataset.pageIndex=this.masterPages[b].dataset.upcomingPageIndex}},A}(window,document); \ No newline at end of file diff --git a/package.json b/package.json index cb2d7be..c4a963c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "swipeview", - "version": "1.2.2", + "version": "1.2.3", "description": "Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli", "keywords": [ "swipe", diff --git a/src/swipeview.js b/src/swipeview.js index c756678..28cb43e 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -219,8 +219,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. div.dataset.pageIndex = pageIndex; div.dataset.upcomingPageIndex = pageIndex; - if (!this.options.loop && i == -1) div.style.visibility = 'hidden'; - this.slider.appendChild(div); this.masterPages.push(div); } From 7ee74268a25f093f0241d5db7610cebfa43361d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Thu, 19 Sep 2013 14:33:33 +0200 Subject: [PATCH 59/61] Really fix the loop:false visibility:hidden bug - goToPage now reset the visibility --- dist/swipeview-1.2.3.min.js | 2 +- src/swipeview.js | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dist/swipeview-1.2.3.min.js b/dist/swipeview-1.2.3.min.js index 7eff245..ab63caf 100644 --- a/dist/swipeview-1.2.3.min.js +++ b/dist/swipeview-1.2.3.min.js @@ -1,2 +1,2 @@ /*! swipeview 1.2.3 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ -var SwipeView=function(a,b){function c(a,b){var c;for(c=a.length-1;c>-1&&a[c]!==b;--c);return c}function d(a){return""===g?a:(a=a.charAt(0).toUpperCase()+a.substr(1),g+a)}var e=function(){};e.prototype={bind:function(a,b){this._events=this._events||{},this._events[a]=this._events[a]||[],this._events[a].push(b)},unbind:function(a,b){this._events=this._events||{},a in this._events!=!1&&this._events[a].splice(c(this._events[a],b),1)},trigger:function(a){if(this._events=this._events||{},a in this._events!=!1)for(var b=0;bc;c++)if(a=b[c]+"ransform",a in f)return b[c].substr(0,b[c].length-1);return!1}(),h=g?"-"+g.toLowerCase()+"-":"",i=d("transform"),j=d("transitionDuration"),k=d("perspective")in f,l="ontouchstart"in a,m=!!g,n=(d("transition")in f,k?" translateZ(0)":""),o="onorientationchange"in a?"orientationchange":"resize",p=l?"touchstart":"mousedown",q=l?"touchmove":"mousemove",r=l?"touchend":"mouseup",s=l?"touchcancel":"mouseup",t=function(){if(g===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[g]}(),u=function(a,b,c,d){"addEventListener"in a?a.addEventListener(b,c,d):"attachEvent"in a&&a.attachEvent("on"+b,c)},v=function(a,b,c){"removeEventListener"in a?a.removeEventListener(b,c):"detachEvent"in a&&a.detachEvent("on"+b,c)},w=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},x=function(a){return"pageX"in a?a.pageX:a.clientX+b.body.scrollLeft+b.documentElement.scrollLeft},y=function(a){return"pageY"in a?a.pageY:a.clientY+b.body.scrollTop+b.documentElement.scrollTop},z=0,A=function(c,d){var f,i,j,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++z,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(f in d)this.options[f]=d[f];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.E=new e,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],i=b.createElement("div"),i.className="swipeview-slider",i.style.cssText="position:relative;top:0;height:100%;width:100%;"+h+"transition-duration:0;"+h+"transform:translateZ(0);"+h+"transition-timing-function:ease-out",this.wrapper.appendChild(i),this.slider=i,this.refreshSize(),f=-1;2>f;f++)i=b.createElement("div"),i.style.cssText=h+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*f+"%",i.dataset||(i.dataset={}),k=-1==f?this.options.numberOfPages-1:f,i.dataset.pageIndex=k,i.dataset.upcomingPageIndex=k,this.slider.appendChild(i),this.masterPages.push(i);j=this.masterPages[1].className,this.masterPages[1].className=j?j+" swipeview-active":"swipeview-active";var m=this;this.handleEventF=function(a){m.handleEvent(a)},u(a,o,this.handleEventF,!1),u(this.wrapper,p,this.handleEventF,!1),u(this.wrapper,q,this.handleEventF,!1),u(this.wrapper,r,this.handleEventF,!1),u(this.slider,t,this.handleEventF,!1),"O"==g&&u(this.slider,t.toLowerCase(),this.handleEventF,!1),l||u(this.wrapper,"mouseout",this.handleEventF,!1)};return A.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.E.bind("flip",a),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.E.bind("moveout",a),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.E.bind("movein",a),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.E.bind("touchstart",a),this.customEvents.push(["touchstart",a])},unbind:function(){for(;this.customEvents.length;)this.E.unbind(this.customEvents[0][0],this.customEvents[0][1]),this.customEvents.shift()},destroy:function(){this.unbind(),v(a,o,this.handleEventF),v(this.wrapper,p,this.handleEventF),v(this.wrapper,q,this.handleEventF),v(this.wrapper,r,this.handleEventF),v(this.slider,t,this.handleEventF),l||v(this.wrapper,"mouseout",this.handleEventF)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[j]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active";var c=function(a){return 0===a?[2,0,1]:1===a?[0,1,2]:[1,2,0]}(this.currentMasterPage);this.masterPages[c[0]].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[c[1]].style[this.cssPosition]=100*this.page+"%",this.masterPages[c[2]].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[c[0]].dataset.upcomingPageIndex=0===this.page?this.options.loop?this.options.numberOfPages-1:void 0:this.page-1,this.masterPages[c[1]].dataset.upcomingPageIndex=this.page,this.masterPages[c[2]].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?this.options.loop?0:void 0:this.page+1,this.__flip(!0)},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case p:this.__start(a);break;case q:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=x(d)-this.pointX,f=y(d)-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(y(d)-this.startY):Math.abs(x(d)-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=x(d),this.pointY=y(d),this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;w(a),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.E.trigger("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(y(b)-this.startY):Math.abs(x(b)-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1,b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,b=b!==this.options.numberOfPages||this.options.loop?b:void 0):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1,b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,b=0!==b||this.options.loop?b:void 0),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[j]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(a){this.E.trigger("flip",{triggeredByGoto:!!a});for(var b=0;3>b;b++)this.masterPages[b].className=this.masterPages[b].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[b].dataset.pageIndex=this.masterPages[b].dataset.upcomingPageIndex}},A}(window,document); \ No newline at end of file +var SwipeView=function(a,b){function c(a,b){var c;for(c=a.length-1;c>-1&&a[c]!==b;--c);return c}function d(a){return""===g?a:(a=a.charAt(0).toUpperCase()+a.substr(1),g+a)}var e=function(){};e.prototype={bind:function(a,b){this._events=this._events||{},this._events[a]=this._events[a]||[],this._events[a].push(b)},unbind:function(a,b){this._events=this._events||{},a in this._events!=!1&&this._events[a].splice(c(this._events[a],b),1)},trigger:function(a){if(this._events=this._events||{},a in this._events!=!1)for(var b=0;bc;c++)if(a=b[c]+"ransform",a in f)return b[c].substr(0,b[c].length-1);return!1}(),h=g?"-"+g.toLowerCase()+"-":"",i=d("transform"),j=d("transitionDuration"),k=d("perspective")in f,l="ontouchstart"in a,m=!!g,n=(d("transition")in f,k?" translateZ(0)":""),o="onorientationchange"in a?"orientationchange":"resize",p=l?"touchstart":"mousedown",q=l?"touchmove":"mousemove",r=l?"touchend":"mouseup",s=l?"touchcancel":"mouseup",t=function(){if(g===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[g]}(),u=function(a,b,c,d){"addEventListener"in a?a.addEventListener(b,c,d):"attachEvent"in a&&a.attachEvent("on"+b,c)},v=function(a,b,c){"removeEventListener"in a?a.removeEventListener(b,c):"detachEvent"in a&&a.detachEvent("on"+b,c)},w=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},x=function(a){return"pageX"in a?a.pageX:a.clientX+b.body.scrollLeft+b.documentElement.scrollLeft},y=function(a){return"pageY"in a?a.pageY:a.clientY+b.body.scrollTop+b.documentElement.scrollTop},z=0,A=function(c,d){var f,i,j,k;this.wrapper="string"==typeof c?b.querySelector(c):c,this.id=this.wrapper.id||"sw-id"+ ++z,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(f in d)this.options[f]=d[f];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.E=new e,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],i=b.createElement("div"),i.className="swipeview-slider",i.style.cssText="position:relative;top:0;height:100%;width:100%;"+h+"transition-duration:0;"+h+"transform:translateZ(0);"+h+"transition-timing-function:ease-out",this.wrapper.appendChild(i),this.slider=i,this.refreshSize(),f=-1;2>f;f++)i=b.createElement("div"),i.style.cssText=h+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*f+"%",i.dataset||(i.dataset={}),k=-1==f?this.options.numberOfPages-1:f,i.dataset.pageIndex=k,i.dataset.upcomingPageIndex=k,this.options.loop||-1!=f||(i.style.visibility="hidden"),this.slider.appendChild(i),this.masterPages.push(i);j=this.masterPages[1].className,this.masterPages[1].className=j?j+" swipeview-active":"swipeview-active";var m=this;this.handleEventF=function(a){m.handleEvent(a)},u(a,o,this.handleEventF,!1),u(this.wrapper,p,this.handleEventF,!1),u(this.wrapper,q,this.handleEventF,!1),u(this.wrapper,r,this.handleEventF,!1),u(this.slider,t,this.handleEventF,!1),"O"==g&&u(this.slider,t.toLowerCase(),this.handleEventF,!1),l||u(this.wrapper,"mouseout",this.handleEventF,!1)};return A.prototype={reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.E.bind("flip",a),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.E.bind("moveout",a),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.E.bind("movein",a),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.E.bind("touchstart",a),this.customEvents.push(["touchstart",a])},unbind:function(){for(;this.customEvents.length;)this.E.unbind(this.customEvents[0][0],this.customEvents[0][1]),this.customEvents.shift()},destroy:function(){this.unbind(),v(a,o,this.handleEventF),v(this.wrapper,p,this.handleEventF),v(this.wrapper,q,this.handleEventF),v(this.wrapper,r,this.handleEventF),v(this.slider,t,this.handleEventF),l||v(this.wrapper,"mouseout",this.handleEventF)},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[j]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active";var c=function(a){return 0===a?[2,0,1]:1===a?[0,1,2]:[1,2,0]}(this.currentMasterPage);this.masterPages[c[0]].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[c[1]].style[this.cssPosition]=100*this.page+"%",this.masterPages[c[2]].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[c[0]].dataset.upcomingPageIndex=0===this.page?this.options.loop?this.options.numberOfPages-1:void 0:this.page-1,this.masterPages[c[1]].dataset.upcomingPageIndex=this.page,this.masterPages[c[2]].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?this.options.loop?0:void 0:this.page+1,this.options.loop||(this.masterPages[c[0]].style.visibility=0===this.page?"hidden":"",this.masterPages[c[1]].style.visibility="",this.masterPages[c[2]].style.visibility=this.page===this.options.numberOfPages-1?"hidden":""),this.__flip(!0)},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case p:this.__start(a);break;case q:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=x(d)-this.pointX,f=y(d)-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(y(d)-this.startY):Math.abs(x(d)-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=x(d),this.pointY=y(d),this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;w(a),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.E.trigger("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(y(b)-this.startY):Math.abs(x(b)-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1,b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,b=b!==this.options.numberOfPages||this.options.loop?b:void 0):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1,b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,b=0!==b||this.options.loop?b:void 0),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[j]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(a){this.E.trigger("flip",{triggeredByGoto:!!a});for(var b=0;3>b;b++)this.masterPages[b].className=this.masterPages[b].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[b].dataset.pageIndex=this.masterPages[b].dataset.upcomingPageIndex}},A}(window,document); \ No newline at end of file diff --git a/src/swipeview.js b/src/swipeview.js index 28cb43e..661f399 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -219,6 +219,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. div.dataset.pageIndex = pageIndex; div.dataset.upcomingPageIndex = pageIndex; + if (!this.options.loop && i == -1) { + div.style.visibility = 'hidden'; + } + this.slider.appendChild(div); this.masterPages.push(div); } @@ -352,6 +356,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. this.masterPages[ indices[2] ].dataset.upcomingPageIndex = this.page == this.options.numberOfPages-1 ? (this.options.loop ? 0 : undefined ): this.page + 1; + if (!this.options.loop) { + this.masterPages[ indices[0] ].style.visibility = this.page === 0 ? "hidden" : ""; + this.masterPages[ indices[1] ].style.visibility = ""; + this.masterPages[ indices[2] ].style.visibility = this.page === this.options.numberOfPages-1 ? "hidden" : ""; + } + this.__flip( true ); }, From 43c85e8119975cf235ac36adc03bd1c00ab2feee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Thu, 28 Nov 2013 16:37:38 +0100 Subject: [PATCH 60/61] Add bind() and unbind() for DOM events - the SwipeView instanciation does not auto-bind anymore - Add bind() and unbind() - the old unbind() has been renamed to offAll() --- README.md | 7 ++++ demo/ereader/index.html | 3 +- demo/gallery/index.html | 1 + demo/gallery2/index.html | 1 + demo/gallery3/infinitegraphset.js | 1 + demo/gallery4/index.html | 1 + demo/gallery5/index.html | 1 + demo/gallery5/infinitegraphset.js | 1 + demo/gallery6/index.html | 1 + demo/gallery6/infinitegraphset.js | 1 + demo/gallery7/app.js | 1 + demo/gallery7/infinitegraphset.js | 1 + demo/gallery8/app.js | 1 + demo/gallery8/infinitegraphset.js | 1 + demo/gallery9/app.js | 1 + demo/gallery9/infinitegraphset.js | 1 + demo/inline/index.html | 3 +- dist/swipeview-1.3.0.min.js | 2 ++ package.json | 2 +- src/swipeview.js | 54 ++++++++++++++++++------------- 20 files changed, 59 insertions(+), 26 deletions(-) create mode 100644 dist/swipeview-1.3.0.min.js diff --git a/README.md b/README.md index 94deb76..0b0c307 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,10 @@ +SwipeView v1.3.0 - 2013-09-28 +============================= + +- the SwipeView instanciation does not auto-bind anymore +- Add bind() and unbind() +- the old unbind() has been renamed to offAll() + SwipeView v1.0.5 - 2013-07-04 ============================= diff --git a/demo/ereader/index.html b/demo/ereader/index.html index d6dec0d..2351857 100644 --- a/demo/ereader/index.html +++ b/demo/ereader/index.html @@ -21,6 +21,7 @@ req = new XMLHttpRequest(); ereader = new SwipeView('#wrapper', { hastyPageFlip:true }); + ereader.bind(); // Ajax request req.open('GET', 'flowers.txt', true); @@ -154,4 +155,4 @@
- \ No newline at end of file + diff --git a/demo/gallery/index.html b/demo/gallery/index.html index e017211..bac9e0d 100644 --- a/demo/gallery/index.html +++ b/demo/gallery/index.html @@ -71,6 +71,7 @@ ]; gallery = new SwipeView('#wrapper', { numberOfPages: slides.length }); +gallery.bind(); // Load initial data for (i=0; i<3; i++) { diff --git a/demo/gallery2/index.html b/demo/gallery2/index.html index 360199d..7beef62 100644 --- a/demo/gallery2/index.html +++ b/demo/gallery2/index.html @@ -48,6 +48,7 @@ hastyPageFlip:true, numberOfPages: dataO.length }), i, page; + gallery.bind(); function genImgs(container, page, d) { var img, div; diff --git a/demo/gallery3/infinitegraphset.js b/demo/gallery3/infinitegraphset.js index 0785645..7486003 100644 --- a/demo/gallery3/infinitegraphset.js +++ b/demo/gallery3/infinitegraphset.js @@ -8,6 +8,7 @@ hastyPageFlip:true, numberOfPages: dataO.length }), i, page; + gallery.bind(); function genImgs(container, page, d) { var img, div; diff --git a/demo/gallery4/index.html b/demo/gallery4/index.html index 9521d5d..983fa4d 100644 --- a/demo/gallery4/index.html +++ b/demo/gallery4/index.html @@ -53,6 +53,7 @@ ]; gallery = new SwipeView('#wrapper', { numberOfPages: slides.length, hastyPageFlip:true, vertical:true}); +gallery.bind(); // Load initial data for (i=0; i<3; i++) { diff --git a/demo/gallery5/index.html b/demo/gallery5/index.html index 9a1cb2d..7ed3a1e 100644 --- a/demo/gallery5/index.html +++ b/demo/gallery5/index.html @@ -47,6 +47,7 @@ page; gallery = new SwipeView('#wrapper', { numberOfPages: 100, hastyPageFlip:true, vertical:true}); +gallery.bind(); // Load initial data for (i=0; i<3; i++) { diff --git a/demo/gallery5/infinitegraphset.js b/demo/gallery5/infinitegraphset.js index 8b85a07..b40c07f 100644 --- a/demo/gallery5/infinitegraphset.js +++ b/demo/gallery5/infinitegraphset.js @@ -8,6 +8,7 @@ hastyPageFlip:true, numberOfPages: dataO.length }), i, page; + gallery.bind(); function genImgs(container, page, d) { var img, div; diff --git a/demo/gallery6/index.html b/demo/gallery6/index.html index 287c2d1..c701674 100644 --- a/demo/gallery6/index.html +++ b/demo/gallery6/index.html @@ -70,6 +70,7 @@ page; gallery = new SwipeView('#wrapper', { numberOfPages: 100, hastyPageFlip:true, vertical:true}); +gallery.bind(); // Load initial data for (i=0; i<3; i++) { diff --git a/demo/gallery6/infinitegraphset.js b/demo/gallery6/infinitegraphset.js index 42bcebd..4b144e4 100644 --- a/demo/gallery6/infinitegraphset.js +++ b/demo/gallery6/infinitegraphset.js @@ -8,6 +8,7 @@ hastyPageFlip:true, numberOfPages: dataO.length }), i, page, df = dataO; + gallery.bind(); function genImgs(container, page, d) { var img, div; diff --git a/demo/gallery7/app.js b/demo/gallery7/app.js index c97bafc..f9c237e 100644 --- a/demo/gallery7/app.js +++ b/demo/gallery7/app.js @@ -27,6 +27,7 @@ gallery = new SwipeView('#wrapper', { vertical: true, hastyPageFlip:true }); +gallery.bind(); function init(domElt, myGallery, id, idx) { domElt = document.createElement('div'); diff --git a/demo/gallery7/infinitegraphset.js b/demo/gallery7/infinitegraphset.js index 42bcebd..4b144e4 100644 --- a/demo/gallery7/infinitegraphset.js +++ b/demo/gallery7/infinitegraphset.js @@ -8,6 +8,7 @@ hastyPageFlip:true, numberOfPages: dataO.length }), i, page, df = dataO; + gallery.bind(); function genImgs(container, page, d) { var img, div; diff --git a/demo/gallery8/app.js b/demo/gallery8/app.js index c97bafc..f9c237e 100644 --- a/demo/gallery8/app.js +++ b/demo/gallery8/app.js @@ -27,6 +27,7 @@ gallery = new SwipeView('#wrapper', { vertical: true, hastyPageFlip:true }); +gallery.bind(); function init(domElt, myGallery, id, idx) { domElt = document.createElement('div'); diff --git a/demo/gallery8/infinitegraphset.js b/demo/gallery8/infinitegraphset.js index fcb2108..a630586 100644 --- a/demo/gallery8/infinitegraphset.js +++ b/demo/gallery8/infinitegraphset.js @@ -13,6 +13,7 @@ }, locked = false, x = 0, y = 0, id; + gallery.bind(); function onTouchStart(evt) { console.log('touchstart'); diff --git a/demo/gallery9/app.js b/demo/gallery9/app.js index eb85be5..b7f0a38 100644 --- a/demo/gallery9/app.js +++ b/demo/gallery9/app.js @@ -27,6 +27,7 @@ gallery = new SwipeView('#wrapper', { vertical: true, hastyPageFlip:true }); +gallery.bind(); function init(domElt, myGallery, id, idx) { domElt = document.createElement('div'); diff --git a/demo/gallery9/infinitegraphset.js b/demo/gallery9/infinitegraphset.js index 31071c2..1501372 100644 --- a/demo/gallery9/infinitegraphset.js +++ b/demo/gallery9/infinitegraphset.js @@ -17,6 +17,7 @@ locked = false, x = 0, y = 0, id; + gallery.bind(); // FIXME /*function onTouchStart(evt) { console.log('touchstart'); diff --git a/demo/inline/index.html b/demo/inline/index.html index 4b6f0e6..3caae11 100644 --- a/demo/inline/index.html +++ b/demo/inline/index.html @@ -45,6 +45,7 @@

Three Laws of Robotics

numberOfPages: slides.length, hastyPageFlip: true }); +carousel.bind(); // Load initial data for (i=0; i<3; i++) { @@ -73,4 +74,4 @@

Three Laws of Robotics

- \ No newline at end of file + diff --git a/dist/swipeview-1.3.0.min.js b/dist/swipeview-1.3.0.min.js new file mode 100644 index 0000000..bac9752 --- /dev/null +++ b/dist/swipeview-1.3.0.min.js @@ -0,0 +1,2 @@ +/*! swipeview 1.3.0 - Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli */ +var SwipeView=function(a,b){function c(a,b){var c;for(c=a.length-1;c>-1&&a[c]!==b;--c);return c}function d(a){return""===g?a:(a=a.charAt(0).toUpperCase()+a.substr(1),g+a)}var e=function(){};e.prototype={bind:function(a,b){this._events=this._events||{},this._events[a]=this._events[a]||[],this._events[a].push(b)},unbind:function(a,b){this._events=this._events||{},a in this._events!=!1&&this._events[a].splice(c(this._events[a],b),1)},trigger:function(a){if(this._events=this._events||{},a in this._events!=!1)for(var b=0;bc;c++)if(a=b[c]+"ransform",a in f)return b[c].substr(0,b[c].length-1);return!1}(),h=g?"-"+g.toLowerCase()+"-":"",i=d("transform"),j=d("transitionDuration"),k=d("perspective")in f,l="ontouchstart"in a,m=!!g,n=(d("transition")in f,k?" translateZ(0)":""),o="onorientationchange"in a?"orientationchange":"resize",p=l?"touchstart":"mousedown",q=l?"touchmove":"mousemove",r=l?"touchend":"mouseup",s=l?"touchcancel":"mouseup",t=function(){if(g===!1)return!1;var a={"":"transitionend",webkit:"webkitTransitionEnd",Moz:"transitionend",O:"oTransitionEnd",ms:"MSTransitionEnd"};return a[g]}(),u=function(a,b,c,d){"addEventListener"in a?a.addEventListener(b,c,d):"attachEvent"in a&&a.attachEvent("on"+b,c)},v=function(a,b,c){"removeEventListener"in a?a.removeEventListener(b,c):"detachEvent"in a&&a.detachEvent("on"+b,c)},w=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},x=function(a){return"pageX"in a?a.pageX:a.clientX+b.body.scrollLeft+b.documentElement.scrollLeft},y=function(a){return"pageY"in a?a.pageY:a.clientY+b.body.scrollTop+b.documentElement.scrollTop},z=0,A=function(a,c){var d,f,g,i;this.wrapper="string"==typeof a?b.querySelector(a):a,this.id=this.wrapper.id||"sw-id"+ ++z,this.options={text:null,numberOfPages:3,snapThreshold:null,hastyPageFlip:!1,vertical:!1,loop:!0,clientWidth:1024,clientHeight:145};for(d in c)this.options[d]=c[d];for(this.currentMasterPage=1,this.k=0,this.maxK=0,this.page=0,this.pageIndex=0,this.E=new e,this.customEvents=[],this.wrapperWidth=0,this.wrapperHeight=0,this.pageSize=0,this.initiated=!1,this.identifier=null,this.moved=!1,this.thresholdExceeded=!1,this.startX=0,this.startX=0,this.pointX=0,this.pointY=0,this.stepsX=0,this.stepsY=0,this.direction=0,this.directionLocked=!1,this.cssPosition=this.options.vertical?"top":"left",this.wrapper.style.overflow="hidden",this.wrapper.style.position="relative",this.masterPages=[],f=b.createElement("div"),f.className="swipeview-slider",f.style.cssText="position:relative;top:0;height:100%;width:100%;"+h+"transition-duration:0;"+h+"transform:translateZ(0);"+h+"transition-timing-function:ease-out",this.wrapper.appendChild(f),this.slider=f,this.refreshSize(),d=-1;2>d;d++)f=b.createElement("div"),f.style.cssText=h+"transform:translateZ(0);position:absolute;top:0;height:100%;width:100%;"+this.cssPosition+":"+100*d+"%",f.dataset||(f.dataset={}),i=-1==d?this.options.numberOfPages-1:d,f.dataset.pageIndex=i,f.dataset.upcomingPageIndex=i,this.options.loop||-1!=d||(f.style.visibility="hidden"),this.slider.appendChild(f),this.masterPages.push(f);g=this.masterPages[1].className,this.masterPages[1].className=g?g+" swipeview-active":"swipeview-active";var j=this;this.handleEventF=function(a){j.handleEvent(a)}};return A.prototype={bind:function(){return u(a,o,this.handleEventF,!1),u(this.wrapper,p,this.handleEventF,!1),u(this.wrapper,q,this.handleEventF,!1),u(this.wrapper,r,this.handleEventF,!1),u(this.slider,t,this.handleEventF,!1),"O"==g&&u(this.slider,t.toLowerCase(),this.handleEventF,!1),l||u(this.wrapper,"mouseout",this.handleEventF,!1),this},unbind:function(){return v(a,o,this.handleEventF),v(this.wrapper,p,this.handleEventF),v(this.wrapper,q,this.handleEventF),v(this.wrapper,r,this.handleEventF),v(this.slider,t,this.handleEventF),l||v(this.wrapper,"mouseout",this.handleEventF),this},offAll:function(){for(;this.customEvents.length;)this.E.unbind(this.customEvents[0][0],this.customEvents[0][1]),this.customEvents.shift()},reset:function(a){this.goToPage(0),this.updatePageCount(a),this.refreshSize()},onFlip:function(a){this.E.bind("flip",a),this.customEvents.push(["flip",a])},onMoveOut:function(a){this.E.bind("moveout",a),this.customEvents.push(["moveout",a])},onMoveIn:function(a){this.E.bind("movein",a),this.customEvents.push(["movein",a])},onTouchStart:function(a){this.E.bind("touchstart",a),this.customEvents.push(["touchstart",a])},destroy:function(){this.unbind(),this.offAll()},refreshSize:function(){this.wrapperWidth=0===this.wrapper.clientWidth?this.options.clientWidth:this.wrapper.clientWidth,this.wrapperHeight=0===this.wrapper.clientHeight?this.options.clientHeight:this.wrapper.clientHeight,this.wrapperSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.pageSize=this.options.vertical?this.wrapperHeight:this.wrapperWidth,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize,this.snapThreshold=null===this.options.snapThreshold?Math.round(.15*this.pageSize):/%/.test(this.options.snapThreshold)?Math.round(this.pageSize*this.options.snapThreshold.replace("%","")/100):this.options.snapThreshold},updatePageCount:function(a){this.options.numberOfPages=a,this.maxK=-this.options.numberOfPages*this.pageSize+this.wrapperSize},goToPage:function(a){var b;for(this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className.replace(/(^|\s)swipeview-active(\s|$)/,""),b=0;3>b;b++)className=this.masterPages[b].className,/(^|\s)swipeview-loading(\s|$)/.test(className)||(this.masterPages[b].className=className?className+" swipeview-loading":"swipeview-loading");a=0>a?0:a>this.options.numberOfPages-1?this.options.numberOfPages-1:a,this.page=a,this.pageIndex=a,this.slider.style[j]="0s",this.__pos(-a*this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.masterPages[this.currentMasterPage].className=this.masterPages[this.currentMasterPage].className+" swipeview-active";var c=function(a){return 0===a?[2,0,1]:1===a?[0,1,2]:[1,2,0]}(this.currentMasterPage);this.masterPages[c[0]].style[this.cssPosition]=100*this.page-100+"%",this.masterPages[c[1]].style[this.cssPosition]=100*this.page+"%",this.masterPages[c[2]].style[this.cssPosition]=100*this.page+100+"%",this.masterPages[c[0]].dataset.upcomingPageIndex=0===this.page?this.options.loop?this.options.numberOfPages-1:void 0:this.page-1,this.masterPages[c[1]].dataset.upcomingPageIndex=this.page,this.masterPages[c[2]].dataset.upcomingPageIndex=this.page==this.options.numberOfPages-1?this.options.loop?0:void 0:this.page+1,this.options.loop||(this.masterPages[c[0]].style.visibility=0===this.page?"hidden":"",this.masterPages[c[1]].style.visibility="",this.masterPages[c[2]].style.visibility=this.page===this.options.numberOfPages-1?"hidden":""),this.__flip(!0)},next:function(){(this.options.loop||this.k!=this.maxK)&&(this.direction=-1,this.k-=1,this.__checkPosition())},prev:function(){(this.options.loop||0!==this.k)&&(this.direction=1,this.k+=1,this.__checkPosition())},handleEvent:function(a){switch(a.type){case p:this.__start(a);break;case q:this.__move(a);break;case"mouseout":if(this.initiated){for(var b=this.wrapper.getElementsByTagName("*"),c=0;cb;b++)a.changedTouches.item(b).identifier===this.identifier&&(d=a.changedTouches.item(b));if(!d)return}else d=a;var e=x(d)-this.pointX,f=y(d)-this.pointY,g=this.options.vertical?this.k+f:this.k+e,h=this.options.vertical?Math.abs(y(d)-this.startY):Math.abs(x(d)-this.startX);if(!(Math.abs(h)>=this.pageSize||(this.moved=!0,this.pointX=x(d),this.pointY=y(d),this.direction=this.options.vertical?f>0?1:0>f?-1:0:e>0?1:0>e?-1:0,this.stepsX+=Math.abs(e),this.stepsY+=Math.abs(f),this.stepsX<10&&this.stepsY<10))){if(!this.directionLocked&&(this.options.vertical?this.stepsX>this.stepsY:this.stepsY>this.stepsX))return this.initiated=!1,void 0;w(a),this.directionLocked=!0,!this.options.loop&&(g>0||g=this.snapThreshold?(this.thresholdExceeded=!0,this.E.trigger("moveout")):this.thresholdExceeded&&hc;c++)if(a.touches.item(c).identifier===this.identifier)return;for(c=0,d=a.changedTouches.length;d>c;c++)a.changedTouches.item(c).identifier===this.identifier&&(b=a.changedTouches.item(c));if(!b)return this.__pos(-this.page*this.pageSize),this.initiated=!1,void 0}else b=a;var e=this.options.vertical?Math.abs(y(b)-this.startY):Math.abs(x(b)-this.startX);if(this.initiated=!1,this.moved)return!this.options.loop&&(this.k>0||this.k0?(this.page=-Math.ceil(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=0===this.pageIndex?this.options.numberOfPages-1:this.pageIndex-1,a=this.currentMasterPage-1,a=0>a?2:a,this.masterPages[a].style[this.cssPosition]=100*this.page-100+"%",b=this.page-1,b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,b=b!==this.options.numberOfPages||this.options.loop?b:void 0):(this.page=-Math.floor(this.k/this.pageSize),this.currentMasterPage=this.page+1-3*Math.floor((this.page+1)/3),this.pageIndex=this.pageIndex==this.options.numberOfPages-1?0:this.pageIndex+1,a=this.currentMasterPage+1,a=a>2?0:a,this.masterPages[a].style[this.cssPosition]=100*this.page+100+"%",b=this.page+1,b-=Math.floor(b/this.options.numberOfPages)*this.options.numberOfPages,b=0!==b||this.options.loop?b:void 0),c=this.masterPages[this.currentMasterPage].className,/(^|\s)swipeview-active(\s|$)/.test(c)||(this.masterPages[this.currentMasterPage].className=c?c+" swipeview-active":"swipeview-active"),c=this.masterPages[a].className,/(^|\s)swipeview-loading(\s|$)/.test(c)||(this.masterPages[a].className=c?c+" swipeview-loading":"swipeview-loading"),this.masterPages[a].dataset.upcomingPageIndex=b,newC=-this.page*this.pageSize,this.slider.style[j]=Math.floor(500*Math.abs(this.k-newC)/this.pageSize)+"ms",this.options.loop||(this.masterPages[a].style.visibility=0===newC||newC==this.maxK?"hidden":""),this.k==newC?this.__flip():(this.__pos(newC),this.options.hastyPageFlip&&this.__flip())},__flip:function(a){this.E.trigger("flip",{triggeredByGoto:!!a});for(var b=0;3>b;b++)this.masterPages[b].className=this.masterPages[b].className.replace(/(^|\s)swipeview-loading(\s|$)/,""),this.masterPages[b].dataset.pageIndex=this.masterPages[b].dataset.upcomingPageIndex}},A}(window,document); \ No newline at end of file diff --git a/package.json b/package.json index c4a963c..b3f09d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "swipeview", - "version": "1.2.3", + "version": "1.3.0", "description": "Virtually infinite loop-able horizontal carousel - a fork of the original SwipeView from Matteo Spinelli", "keywords": [ "swipe", diff --git a/src/swipeview.js b/src/swipeview.js index 661f399..f9c9c02 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -236,6 +236,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. self.handleEvent(e); }; + }; + + SwipeView.prototype = { + bind: function () { on(window, resizeEvent, this.handleEventF, false); on(this.wrapper, startEvent, this.handleEventF, false); on(this.wrapper, moveEvent, this.handleEventF, false); @@ -247,9 +251,33 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. if (!hasTouch) { on(this.wrapper, 'mouseout', this.handleEventF, false); } - }; + return this; + }, + + unbind : function(){ + // Remove the event listeners + off(window, resizeEvent, this.handleEventF); + off(this.wrapper, startEvent, this.handleEventF); + off(this.wrapper, moveEvent, this.handleEventF); + off(this.wrapper, endEvent, this.handleEventF); + off(this.slider, transitionEndEvent, this.handleEventF); + + if (!hasTouch) { + off(this.wrapper, 'mouseout', this.handleEventF); + } + return this; + }, + + /** + * Removes all external events callbacks + */ + offAll: function () { + while ( this.customEvents.length ) { + this.E.unbind(this.customEvents[0][0], this.customEvents[0][1]); + this.customEvents.shift(); + } + }, - SwipeView.prototype = { reset : function (pageCount) { this.goToPage(0); this.updatePageCount(pageCount); @@ -276,29 +304,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. this.customEvents.push(['touchstart', fn]); }, - /** - * Removes all external events callbacks - */ - unbind : function(){ - while ( this.customEvents.length ) { - this.E.unbind(this.customEvents[0][0], this.customEvents[0][1]); - this.customEvents.shift(); - } - }, - destroy: function () { this.unbind(); - - // Remove the event listeners - off(window, resizeEvent, this.handleEventF); - off(this.wrapper, startEvent, this.handleEventF); - off(this.wrapper, moveEvent, this.handleEventF); - off(this.wrapper, endEvent, this.handleEventF); - off(this.slider, transitionEndEvent, this.handleEventF); - - if (!hasTouch) { - off(this.wrapper, 'mouseout', this.handleEventF); - } + this.offAll(); }, refreshSize: function () { From 76a8c9bd454ba236977d62d5e3a715354eace83b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Thu, 28 Nov 2013 17:30:10 +0100 Subject: [PATCH 61/61] throw error if bind / unbind is called when already bound/unbound --- src/swipeview.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/swipeview.js b/src/swipeview.js index f9c9c02..65fb605 100644 --- a/src/swipeview.js +++ b/src/swipeview.js @@ -240,6 +240,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SwipeView.prototype = { bind: function () { + if (this._bound) throw new Error("SwipeView was already bounded"); + this._bound = true; on(window, resizeEvent, this.handleEventF, false); on(this.wrapper, startEvent, this.handleEventF, false); on(this.wrapper, moveEvent, this.handleEventF, false); @@ -255,6 +257,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. }, unbind : function(){ + if (!this._bound) throw new Error("SwipeView was not bounded"); + this._bound = false; // Remove the event listeners off(window, resizeEvent, this.handleEventF); off(this.wrapper, startEvent, this.handleEventF);

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 literal 0 HcmV?d00001 diff --git a/demo/gallery4/index.html b/demo/gallery4/index.html new file mode 100644 index 0000000..77526be --- /dev/null +++ b/demo/gallery4/index.html @@ -0,0 +1,126 @@ + + + + + + + + SwipeView + + + + + +