javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 06:57:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup code

Browse Source
This commit is contained in:
Max Lynch
2013-10-16 06:52:34 -05:00
parent 1fcf7e6fbe
commit 7706149a9a
2 changed files with 60 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
js/views/slideBox.js
View File

@ -29,17 +29,29 @@
/**
* Slide to the given slide index.
*
* @param {integer} the index of the slide to animate to.
* @param {int} the index of the slide to animate to.
*/
slideToSlide: function(index) {
var content = this.el.firstElementChild;
if(!content) {
return;
}
// Get the width of one slide
var slideWidth = content.offsetWidth;
// Calculate the new offsetX position which is just
// N slides to the left, where N is the given index
var offsetX = index * slideWidth;
// Calculate the max X position we'd allow based on how many slides
// there are.
var maxX = Math.max(0, content.children.length - 1) * slideWidth;
// Bounds the offset X position in the range maxX >= offsetX >= 0
offsetX = offsetX < 0 ? 0 : offsetX > maxX ? maxX : offsetX;
// Animate and slide the slides over
content.classList.add('slide-box-animating');
content.style.webkitTransform = 'translate3d(' + -offsetX + 'px, 0, 0)';
@ -47,6 +59,13 @@
this.slideIndex = Math.ceil(offsetX / slideWidth);
},
/**
* Get the currently set slide index. This method
* is updated before any transitions run, so the
* value could be early.
*
* @return {int} the current slide index
*/
getSlideIndex: function() {
return this.slideIndex;
},
@ -70,7 +89,9 @@
return;
}
// Snap to the correct spot
// We did have a drag, so we need to snap to the correct spot
// Grab the content layer
content = _this._drag.content;
// Enable transition duration
@ -78,6 +99,8 @@
// Grab the current offset X position
offsetX = parseFloat(content.style.webkitTransform.replace('translate3d(', '').split(',')[0]) || 0;
// Calculate how wide a single slide is, and their total width
slideWidth = content.offsetWidth;
totalWidth = content.offsetWidth * content.children.length;
@ -85,19 +108,21 @@
ratio = (offsetX % slideWidth) / slideWidth;
if(ratio >= 0) {
// Anything greater than zero is too far left
// Anything greater than zero is too far left, this is an extreme case
// TODO: Do we need this anymore?
finalOffsetX = 0;
} else if(ratio >= -0.5) {
// We are more than half-way through a drag
// Sliiide to the left
finalOffsetX = Math.max(0, Math.floor(Math.abs(offsetX) / slideWidth) * slideWidth);
} else {
// We are less than half-way through a drag
// Sliiide to the right
finalOffsetX = Math.min(totalWidth - slideWidth, Math.ceil(Math.abs(offsetX) / slideWidth) * slideWidth);
}
_this.slideIndex = Math.ceil(finalOffsetX / slideWidth);
console.log('Slide index', slideIndex);
// Negative offsetX to slide correctly
content.style.webkitTransform = 'translate3d(' + -finalOffsetX + 'px, 0, 0)';