mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-10 22:44:13 +08:00
Progress on #37
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
},
|
||||
end: function(e) {
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var SlideDrag = function(opts) {
|
||||
this.dragThresholdX = opts.dragThresholdX || 10;
|
||||
@@ -117,7 +117,7 @@
|
||||
content.classList.remove('list-item-sliding');
|
||||
}
|
||||
e.target.removeEventListener('webkitTransitionEnd', onRestingAnimationEnd);
|
||||
}
|
||||
};
|
||||
|
||||
window.requestAnimationFrame(function() {
|
||||
var currentX = parseFloat(_this._currentDrag.content.style.webkitTransform.replace('translate3d(', '').split(',')[0]) || 0;
|
||||
@@ -134,12 +134,13 @@
|
||||
// We are done, notify caller
|
||||
doneCallback && doneCallback();
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
var ReorderDrag = function(opts) {
|
||||
this.dragThresholdY = opts.dragThresholdY || 0;
|
||||
this.el = opts.el;
|
||||
};
|
||||
|
||||
ReorderDrag.prototype = new DragOp();
|
||||
|
||||
ReorderDrag.prototype.start = function(e) {
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
(function(ionic) {
|
||||
|
||||
ionic.views.NavBar = function(opts) {
|
||||
@@ -38,7 +37,7 @@
|
||||
this._currentBackButton = back;
|
||||
this._currentBackButton.onclick = function(event) {
|
||||
_this.shouldGoBack && _this.shouldGoBack();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
if(shouldShow && !this._currentBackButton.parentNode) {
|
||||
|
||||
Reference in New Issue
Block a user