javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Starting to move over to content directive

Browse Source
This commit is contained in:
Max Lynch
2013-11-27 15:15:28 -06:00
parent 4e42d7c996
commit 0d8ba0f067
5 changed files with 33 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dist/js/ionic-angular.js vendored
View File

@@ -679,7 +679,7 @@ angular.module('ionic.ui.content', [])
if(attr.refreshComplete) {
$scope.refreshComplete = function() {
if($scope.scrollView) {
$scope.scrollView.doneRefreshing();
//$scope.scrollView.doneRefreshing();
$scope.$parent.$broadcast('scroll.onRefreshComplete');
}
};
@@ -702,17 +702,8 @@ angular.module('ionic.ui.content', [])
}
$element.append(sc);
// Otherwise, supercharge this baby!
sv = new ionic.views.Scroll({
el: $element[0].firstElementChild,
hasPullToRefresh: (typeof $scope.onRefresh !== 'undefined'),
onRefresh: function() {
$scope.onRefresh();
$scope.$parent.$broadcast('scroll.onRefresh');
},
onRefreshOpening: function(amt) {
$scope.onRefreshOpening({amount: amt});
$scope.$parent.$broadcast('scroll.onRefreshOpening', amt);
}
sv = new ionic.views.Scroller({
el: $element[0]
});
// Let child scopes access this
$scope.scrollView = sv;

23
dist/js/ionic.js vendored
View File

@@ -3118,14 +3118,14 @@ var Scroller;
ionic.views.Scroller = ionic.views.View.inherit({
initialize: function(options) {
this.__container = options.content;
this.__content = options.content.firstElementChild;
this.__container = options.el;
this.__content = options.el.firstElementChild;
this.options = {
/** Enable scrolling on x-axis */
scrollingX: true,
/** Disable scrolling on x-axis by default */
scrollingX: false,
/** Enable scrolling on y-axis */
scrollingY: true,
@@ -3344,7 +3344,10 @@ var Scroller;
__initEventHandlers: function() {
var self = this;
// Event Handler
var container = this.__container;
if ('ontouchstart' in window) {
@@ -3354,16 +3357,16 @@ var Scroller;
return;
}
scroller.doTouchStart(e.touches, e.timeStamp);
self.doTouchStart(e.touches, e.timeStamp);
e.preventDefault();
}, false);
document.addEventListener("touchmove", function(e) {
scroller.doTouchMove(e.touches, e.timeStamp);
self.doTouchMove(e.touches, e.timeStamp);
}, false);
document.addEventListener("touchend", function(e) {
scroller.doTouchEnd(e.timeStamp);
self.doTouchEnd(e.timeStamp);
}, false);
} else {
@@ -3376,7 +3379,7 @@ var Scroller;
return;
}
scroller.doTouchStart([{
self.doTouchStart([{
pageX: e.pageX,
pageY: e.pageY
}], e.timeStamp);
@@ -3389,7 +3392,7 @@ var Scroller;
return;
}
scroller.doTouchMove([{
self.doTouchMove([{
pageX: e.pageX,
pageY: e.pageY
}], e.timeStamp);
@@ -3402,7 +3405,7 @@ var Scroller;
return;
}
scroller.doTouchEnd(e.timeStamp);
self.doTouchEnd(e.timeStamp);
mousedown = false;
}, false);

15
js/ext/angular/src/directive/ionicContent.js vendored
View File

@@ -55,7 +55,7 @@ angular.module('ionic.ui.content', [])
if(attr.refreshComplete) {
$scope.refreshComplete = function() {
if($scope.scrollView) {
$scope.scrollView.doneRefreshing();
//$scope.scrollView.doneRefreshing();
$scope.$parent.$broadcast('scroll.onRefreshComplete');
}
};
@@ -78,17 +78,8 @@ angular.module('ionic.ui.content', [])
}
$element.append(sc);
// Otherwise, supercharge this baby!
sv = new ionic.views.Scroll({
el: $element[0].firstElementChild,
hasPullToRefresh: (typeof $scope.onRefresh !== 'undefined'),
onRefresh: function() {
$scope.onRefresh();
$scope.$parent.$broadcast('scroll.onRefresh');
},
onRefreshOpening: function(amt) {
$scope.onRefreshOpening({amount: amt});
$scope.$parent.$broadcast('scroll.onRefreshOpening', amt);
}
sv = new ionic.views.Scroller({
el: $element[0]
});
// Let child scopes access this
$scope.scrollView = sv;

23
js/views/scrollZyng.js
View File

@@ -284,14 +284,14 @@ var Scroller;
ionic.views.Scroller = ionic.views.View.inherit({
initialize: function(options) {
this.__container = options.content;
this.__content = options.content.firstElementChild;
this.__container = options.el;
this.__content = options.el.firstElementChild;
this.options = {
/** Enable scrolling on x-axis */
scrollingX: true,
/** Disable scrolling on x-axis by default */
scrollingX: false,
/** Enable scrolling on y-axis */
scrollingY: true,
@@ -510,7 +510,10 @@ var Scroller;
__initEventHandlers: function() {
var self = this;
// Event Handler
var container = this.__container;
if ('ontouchstart' in window) {
@@ -520,16 +523,16 @@ var Scroller;
return;
}
scroller.doTouchStart(e.touches, e.timeStamp);
self.doTouchStart(e.touches, e.timeStamp);
e.preventDefault();
}, false);
document.addEventListener("touchmove", function(e) {
scroller.doTouchMove(e.touches, e.timeStamp);
self.doTouchMove(e.touches, e.timeStamp);
}, false);
document.addEventListener("touchend", function(e) {
scroller.doTouchEnd(e.timeStamp);
self.doTouchEnd(e.timeStamp);
}, false);
} else {
@@ -542,7 +545,7 @@ var Scroller;
return;
}
scroller.doTouchStart([{
self.doTouchStart([{
pageX: e.pageX,
pageY: e.pageY
}], e.timeStamp);
@@ -555,7 +558,7 @@ var Scroller;
return;
}
scroller.doTouchMove([{
self.doTouchMove([{
pageX: e.pageX,
pageY: e.pageY
}], e.timeStamp);
@@ -568,7 +571,7 @@ var Scroller;
return;
}
scroller.doTouchEnd(e.timeStamp);
self.doTouchEnd(e.timeStamp);
mousedown = false;
}, false);

2
test/scroll_z.html
View File

@@ -53,7 +53,7 @@
// Initialize Scroller
var scroller = new ionic.views.Scroller({
content: container,
el: container,
scrollingX: false
});