mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-07 15:07:13 +08:00
Cleanup code
This commit is contained in:
35
dist/js/ionic.js
vendored
35
dist/js/ionic.js
vendored
@ -2295,17 +2295,29 @@ window.ionic = {
|
|||||||
/**
|
/**
|
||||||
* Slide to the given slide index.
|
* 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) {
|
slideToSlide: function(index) {
|
||||||
var content = this.el.firstElementChild;
|
var content = this.el.firstElementChild;
|
||||||
if(!content) {
|
if(!content) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Get the width of one slide
|
||||||
var slideWidth = content.offsetWidth;
|
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;
|
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;
|
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;
|
offsetX = offsetX < 0 ? 0 : offsetX > maxX ? maxX : offsetX;
|
||||||
|
|
||||||
|
// Animate and slide the slides over
|
||||||
content.classList.add('slide-box-animating');
|
content.classList.add('slide-box-animating');
|
||||||
content.style.webkitTransform = 'translate3d(' + -offsetX + 'px, 0, 0)';
|
content.style.webkitTransform = 'translate3d(' + -offsetX + 'px, 0, 0)';
|
||||||
|
|
||||||
@ -2313,6 +2325,13 @@ window.ionic = {
|
|||||||
this.slideIndex = Math.ceil(offsetX / slideWidth);
|
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() {
|
getSlideIndex: function() {
|
||||||
return this.slideIndex;
|
return this.slideIndex;
|
||||||
},
|
},
|
||||||
@ -2336,7 +2355,9 @@ window.ionic = {
|
|||||||
return;
|
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;
|
content = _this._drag.content;
|
||||||
|
|
||||||
// Enable transition duration
|
// Enable transition duration
|
||||||
@ -2344,6 +2365,8 @@ window.ionic = {
|
|||||||
|
|
||||||
// Grab the current offset X position
|
// Grab the current offset X position
|
||||||
offsetX = parseFloat(content.style.webkitTransform.replace('translate3d(', '').split(',')[0]) || 0;
|
offsetX = parseFloat(content.style.webkitTransform.replace('translate3d(', '').split(',')[0]) || 0;
|
||||||
|
|
||||||
|
// Calculate how wide a single slide is, and their total width
|
||||||
slideWidth = content.offsetWidth;
|
slideWidth = content.offsetWidth;
|
||||||
totalWidth = content.offsetWidth * content.children.length;
|
totalWidth = content.offsetWidth * content.children.length;
|
||||||
|
|
||||||
@ -2351,19 +2374,21 @@ window.ionic = {
|
|||||||
ratio = (offsetX % slideWidth) / slideWidth;
|
ratio = (offsetX % slideWidth) / slideWidth;
|
||||||
|
|
||||||
if(ratio >= 0) {
|
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;
|
finalOffsetX = 0;
|
||||||
} else if(ratio >= -0.5) {
|
} 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);
|
finalOffsetX = Math.max(0, Math.floor(Math.abs(offsetX) / slideWidth) * slideWidth);
|
||||||
} else {
|
} else {
|
||||||
|
// We are less than half-way through a drag
|
||||||
// Sliiide to the right
|
// Sliiide to the right
|
||||||
finalOffsetX = Math.min(totalWidth - slideWidth, Math.ceil(Math.abs(offsetX) / slideWidth) * slideWidth);
|
finalOffsetX = Math.min(totalWidth - slideWidth, Math.ceil(Math.abs(offsetX) / slideWidth) * slideWidth);
|
||||||
}
|
}
|
||||||
|
|
||||||
_this.slideIndex = Math.ceil(finalOffsetX / slideWidth);
|
_this.slideIndex = Math.ceil(finalOffsetX / slideWidth);
|
||||||
|
|
||||||
console.log('Slide index', slideIndex);
|
|
||||||
|
|
||||||
// Negative offsetX to slide correctly
|
// Negative offsetX to slide correctly
|
||||||
content.style.webkitTransform = 'translate3d(' + -finalOffsetX + 'px, 0, 0)';
|
content.style.webkitTransform = 'translate3d(' + -finalOffsetX + 'px, 0, 0)';
|
||||||
|
|
||||||
|
|||||||
@ -29,17 +29,29 @@
|
|||||||
/**
|
/**
|
||||||
* Slide to the given slide index.
|
* 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) {
|
slideToSlide: function(index) {
|
||||||
var content = this.el.firstElementChild;
|
var content = this.el.firstElementChild;
|
||||||
if(!content) {
|
if(!content) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Get the width of one slide
|
||||||
var slideWidth = content.offsetWidth;
|
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;
|
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;
|
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;
|
offsetX = offsetX < 0 ? 0 : offsetX > maxX ? maxX : offsetX;
|
||||||
|
|
||||||
|
// Animate and slide the slides over
|
||||||
content.classList.add('slide-box-animating');
|
content.classList.add('slide-box-animating');
|
||||||
content.style.webkitTransform = 'translate3d(' + -offsetX + 'px, 0, 0)';
|
content.style.webkitTransform = 'translate3d(' + -offsetX + 'px, 0, 0)';
|
||||||
|
|
||||||
@ -47,6 +59,13 @@
|
|||||||
this.slideIndex = Math.ceil(offsetX / slideWidth);
|
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() {
|
getSlideIndex: function() {
|
||||||
return this.slideIndex;
|
return this.slideIndex;
|
||||||
},
|
},
|
||||||
@ -70,7 +89,9 @@
|
|||||||
return;
|
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;
|
content = _this._drag.content;
|
||||||
|
|
||||||
// Enable transition duration
|
// Enable transition duration
|
||||||
@ -78,6 +99,8 @@
|
|||||||
|
|
||||||
// Grab the current offset X position
|
// Grab the current offset X position
|
||||||
offsetX = parseFloat(content.style.webkitTransform.replace('translate3d(', '').split(',')[0]) || 0;
|
offsetX = parseFloat(content.style.webkitTransform.replace('translate3d(', '').split(',')[0]) || 0;
|
||||||
|
|
||||||
|
// Calculate how wide a single slide is, and their total width
|
||||||
slideWidth = content.offsetWidth;
|
slideWidth = content.offsetWidth;
|
||||||
totalWidth = content.offsetWidth * content.children.length;
|
totalWidth = content.offsetWidth * content.children.length;
|
||||||
|
|
||||||
@ -85,19 +108,21 @@
|
|||||||
ratio = (offsetX % slideWidth) / slideWidth;
|
ratio = (offsetX % slideWidth) / slideWidth;
|
||||||
|
|
||||||
if(ratio >= 0) {
|
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;
|
finalOffsetX = 0;
|
||||||
} else if(ratio >= -0.5) {
|
} 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);
|
finalOffsetX = Math.max(0, Math.floor(Math.abs(offsetX) / slideWidth) * slideWidth);
|
||||||
} else {
|
} else {
|
||||||
|
// We are less than half-way through a drag
|
||||||
// Sliiide to the right
|
// Sliiide to the right
|
||||||
finalOffsetX = Math.min(totalWidth - slideWidth, Math.ceil(Math.abs(offsetX) / slideWidth) * slideWidth);
|
finalOffsetX = Math.min(totalWidth - slideWidth, Math.ceil(Math.abs(offsetX) / slideWidth) * slideWidth);
|
||||||
}
|
}
|
||||||
|
|
||||||
_this.slideIndex = Math.ceil(finalOffsetX / slideWidth);
|
_this.slideIndex = Math.ceil(finalOffsetX / slideWidth);
|
||||||
|
|
||||||
console.log('Slide index', slideIndex);
|
|
||||||
|
|
||||||
// Negative offsetX to slide correctly
|
// Negative offsetX to slide correctly
|
||||||
content.style.webkitTransform = 'translate3d(' + -finalOffsetX + 'px, 0, 0)';
|
content.style.webkitTransform = 'translate3d(' + -finalOffsetX + 'px, 0, 0)';
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user