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

Updated toggle and moved to view inheritance

Browse Source
This commit is contained in:
Max Lynch
2013-11-08 17:57:04 -06:00
parent 6058afeb51
commit c73cc43c21
7 changed files with 74 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
dist/js/ionic.js vendored
View File

@ -3465,33 +3465,33 @@ window.ionic = {
(function(ionic) {
'use strict';
ionic.views.SlideBox = function(opts) {
var _this = this;
ionic.views.SlideBox = ionic.views.View.inherit({
initialize: function(opts) {
var _this = this;
this.el = opts.el;
this.pager = this.el.querySelector('.slide-box-pager');
this.el = opts.el;
this.pager = this.el.querySelector('.slide-box-pager');
// The drag threshold is the pixel delta that will trigger a drag (to
// avoid accidental dragging)
this.dragThresholdX = opts.dragThresholdX || 10;
// The velocity threshold is a velocity of drag that indicates a "swipe". This
// number is taken from hammer.js's calculations
this.velocityXThreshold = opts.velocityXThreshold || 0.3;
// The drag threshold is the pixel delta that will trigger a drag (to
// avoid accidental dragging)
this.dragThresholdX = opts.dragThresholdX || 10;
// The velocity threshold is a velocity of drag that indicates a "swipe". This
// number is taken from hammer.js's calculations
this.velocityXThreshold = opts.velocityXThreshold || 0.3;
// Initialize the slide index to the first page and update the pager
this.slideIndex = 0;
this._updatePager();
// Initialize the slide index to the first page and update the pager
this.slideIndex = 0;
this._updatePager();
// Listen for drag and release events
window.ionic.onGesture('drag', function(e) {
_this._handleDrag(e);
}, this.el);
window.ionic.onGesture('release', function(e) {
_this._handleEndDrag(e);
}, this.el);
};
// Listen for drag and release events
window.ionic.onGesture('drag', function(e) {
_this._handleDrag(e);
}, this.el);
window.ionic.onGesture('release', function(e) {
_this._handleEndDrag(e);
}, this.el);
},
ionic.views.SlideBox.prototype = {
/**
* Tell the pager to update itself if content is added or
* removed.
@ -3780,7 +3780,7 @@ window.ionic = {
}
});
}
};
});
})(window.ionic);
;
@ -3989,14 +3989,13 @@ ionic.views.TabBar.prototype = {
(function(ionic) {
'use strict';
ionic.views.Toggle = function(opts) {
this.el = opts.el;
this.checkbox = opts.checkbox;
this.handle = opts.handle;
this.openPercent = -1;
};
ionic.views.Toggle.prototype = {
ionic.views.Toggle = ionic.views.View.inherit({
initialize: function(opts) {
this.el = opts.el;
this.checkbox = opts.checkbox;
this.handle = opts.handle;
this.openPercent = -1;
},
tap: function(e) {
this.val( !this.checkbox.checked );
@ -4047,7 +4046,7 @@ ionic.views.TabBar.prototype = {
return this.checkbox.checked;
}
};
});
})(ionic);
;