mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-07 23:16:52 +08:00
Fixed #102
This commit is contained in:
1
dist/css/ionic.css
vendored
1
dist/css/ionic.css
vendored
@ -3553,7 +3553,6 @@ button.item-button-right:after {
|
||||
*/
|
||||
.list {
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
margin-bottom: 20px;
|
||||
padding-top: 1px;
|
||||
padding-bottom: 1px;
|
||||
|
||||
68
dist/js/ionic-angular.js
vendored
68
dist/js/ionic-angular.js
vendored
@ -489,7 +489,8 @@ angular.module('ionic.ui.content', [])
|
||||
transclude: true,
|
||||
scope: {
|
||||
onRefresh: '&',
|
||||
onRefreshOpening: '&'
|
||||
onRefreshOpening: '&',
|
||||
scroll: '@'
|
||||
},
|
||||
compile: function(element, attr, transclude) {
|
||||
return function($scope, $element, $attr) {
|
||||
@ -510,7 +511,9 @@ angular.module('ionic.ui.content', [])
|
||||
}
|
||||
|
||||
// If they want plain overflows scrolling, add that as a class
|
||||
if(attr.overflowScroll === "true") {
|
||||
if($scope.scroll === "false") {
|
||||
// Do nothing for now
|
||||
} else if(attr.overflowScroll === "true") {
|
||||
c.addClass('overflow-scroll');
|
||||
} else {
|
||||
// Otherwise, supercharge this baby!
|
||||
@ -638,7 +641,9 @@ angular.module('ionic.ui.list', ['ngAnimate'])
|
||||
scope: {
|
||||
isEditing: '=',
|
||||
deleteIcon: '@',
|
||||
reorderIcon: '@'
|
||||
reorderIcon: '@',
|
||||
onRefresh: '&',
|
||||
onRefreshOpening: '&'
|
||||
},
|
||||
|
||||
controller: function($scope) {
|
||||
@ -656,66 +661,25 @@ angular.module('ionic.ui.list', ['ngAnimate'])
|
||||
|
||||
compile: function(element, attr, transclude) {
|
||||
return function($scope, $element, $attr) {
|
||||
var lv = new ionic.views.ListView({
|
||||
el: $element[0],
|
||||
listEl: $element[0].children[0]
|
||||
});
|
||||
|
||||
if(attr.animation) {
|
||||
$element.addClass(attr.animation);
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
})
|
||||
|
||||
.directive('virtualList', function() {
|
||||
return {
|
||||
restrict: 'E',
|
||||
replace: true,
|
||||
transclude: true,
|
||||
|
||||
scope: {
|
||||
isEditing: '=',
|
||||
deleteIcon: '@',
|
||||
reorderIcon: '@',
|
||||
itemHeight: '@'
|
||||
},
|
||||
|
||||
controller: function($scope, $element) {
|
||||
var _this = this;
|
||||
|
||||
this.scope = $scope;
|
||||
|
||||
this.element = $element;
|
||||
|
||||
var lv = new ionic.views.ListView({
|
||||
el: $element[0],
|
||||
listEl: $element[0].children[0],
|
||||
isVirtual: true,
|
||||
itemHeight: $scope.itemHeight,
|
||||
});
|
||||
|
||||
this.listView = lv;
|
||||
|
||||
|
||||
$scope.$watch('isEditing', function(v) {
|
||||
_this.isEditing = true;
|
||||
});
|
||||
hasPullToRefresh: (typeof $scope.onRefresh !== 'undefined'),
|
||||
onRefresh: function() {
|
||||
$scope.onRefresh();
|
||||
},
|
||||
onRefreshOpening: function(amt) {
|
||||
$scope.onRefreshOpening({amount: amt});
|
||||
}
|
||||
});
|
||||
|
||||
template: '<div class="scroll"><ul class="list" ng-class="{\'list-editing\': isEditing}" ng-transclude>\
|
||||
</ul></div>',
|
||||
|
||||
compile: function(element, attr, transclude) {
|
||||
return function($scope, $element, $attr) {
|
||||
if(attr.animation) {
|
||||
$element.addClass(attr.animation);
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
})
|
||||
});
|
||||
|
||||
})();
|
||||
;
|
||||
|
||||
7
js/ext/angular/src/directive/ionicContent.js
vendored
7
js/ext/angular/src/directive/ionicContent.js
vendored
@ -22,7 +22,8 @@ angular.module('ionic.ui.content', [])
|
||||
transclude: true,
|
||||
scope: {
|
||||
onRefresh: '&',
|
||||
onRefreshOpening: '&'
|
||||
onRefreshOpening: '&',
|
||||
scroll: '@'
|
||||
},
|
||||
compile: function(element, attr, transclude) {
|
||||
return function($scope, $element, $attr) {
|
||||
@ -43,7 +44,9 @@ angular.module('ionic.ui.content', [])
|
||||
}
|
||||
|
||||
// If they want plain overflows scrolling, add that as a class
|
||||
if(attr.overflowScroll === "true") {
|
||||
if($scope.scroll === "false") {
|
||||
// Do nothing for now
|
||||
} else if(attr.overflowScroll === "true") {
|
||||
c.addClass('overflow-scroll');
|
||||
} else {
|
||||
// Otherwise, supercharge this baby!
|
||||
|
||||
61
js/ext/angular/src/directive/ionicList.js
vendored
61
js/ext/angular/src/directive/ionicList.js
vendored
@ -89,7 +89,9 @@ angular.module('ionic.ui.list', ['ngAnimate'])
|
||||
scope: {
|
||||
isEditing: '=',
|
||||
deleteIcon: '@',
|
||||
reorderIcon: '@'
|
||||
reorderIcon: '@',
|
||||
onRefresh: '&',
|
||||
onRefreshOpening: '&'
|
||||
},
|
||||
|
||||
controller: function($scope) {
|
||||
@ -107,65 +109,24 @@ angular.module('ionic.ui.list', ['ngAnimate'])
|
||||
|
||||
compile: function(element, attr, transclude) {
|
||||
return function($scope, $element, $attr) {
|
||||
var lv = new ionic.views.ListView({
|
||||
el: $element[0],
|
||||
listEl: $element[0].children[0]
|
||||
});
|
||||
|
||||
if(attr.animation) {
|
||||
$element.addClass(attr.animation);
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
})
|
||||
|
||||
.directive('virtualList', function() {
|
||||
return {
|
||||
restrict: 'E',
|
||||
replace: true,
|
||||
transclude: true,
|
||||
|
||||
scope: {
|
||||
isEditing: '=',
|
||||
deleteIcon: '@',
|
||||
reorderIcon: '@',
|
||||
itemHeight: '@'
|
||||
},
|
||||
|
||||
controller: function($scope, $element) {
|
||||
var _this = this;
|
||||
|
||||
this.scope = $scope;
|
||||
|
||||
this.element = $element;
|
||||
|
||||
var lv = new ionic.views.ListView({
|
||||
el: $element[0],
|
||||
listEl: $element[0].children[0],
|
||||
isVirtual: true,
|
||||
itemHeight: $scope.itemHeight,
|
||||
});
|
||||
|
||||
this.listView = lv;
|
||||
|
||||
|
||||
$scope.$watch('isEditing', function(v) {
|
||||
_this.isEditing = true;
|
||||
});
|
||||
hasPullToRefresh: (typeof $scope.onRefresh !== 'undefined'),
|
||||
onRefresh: function() {
|
||||
$scope.onRefresh();
|
||||
},
|
||||
onRefreshOpening: function(amt) {
|
||||
$scope.onRefreshOpening({amount: amt});
|
||||
}
|
||||
});
|
||||
|
||||
template: '<div class="scroll"><ul class="list" ng-class="{\'list-editing\': isEditing}" ng-transclude>\
|
||||
</ul></div>',
|
||||
|
||||
compile: function(element, attr, transclude) {
|
||||
return function($scope, $element, $attr) {
|
||||
if(attr.animation) {
|
||||
$element.addClass(attr.animation);
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
})
|
||||
});
|
||||
|
||||
})();
|
||||
|
||||
@ -48,7 +48,11 @@
|
||||
</style>
|
||||
</head>
|
||||
<body ng-controller="RootCtrl">
|
||||
<tabs animation="fade-in-out" tabs-type="tabs-icon-only" tabs-style="tabs-primary" controller-changed="onControllerChanged(oldController, oldIndex, newController, newIndex)">
|
||||
<tabs
|
||||
animation="fade-in-out"
|
||||
tabs-type="tabs-icon-only"
|
||||
tabs-style="tabs-primary"
|
||||
controller-changed="onControllerChanged(oldController, oldIndex, newController, newIndex)">
|
||||
|
||||
<tab title="Home" icon-on="icon ion-ios7-filing" icon-off="icon ion-ios7-filing-outline" ng-controller="HomeCtrl">
|
||||
<header class="bar bar-header bar-secondary">
|
||||
@ -56,8 +60,14 @@
|
||||
<h1 class="title">Tasks</h1>
|
||||
<button class="button button-clear button-primary" ng-click="isEditingItems = !isEditingItems">Edit</button>
|
||||
</header>
|
||||
<content has-header="true" has-tabs="true">
|
||||
<list is-editing="isEditingItems" animation="fade-out" delete-icon="icon ion-minus-circled" reorder-icon="icon ion-navicon">
|
||||
<content has-header="true" has-tabs="true" scroll="false">
|
||||
<list on-refresh="onRefresh()" is-editing="isEditingItems" animation="fade-out" delete-icon="icon ion-minus-circled" reorder-icon="icon ion-navicon">
|
||||
<refresher>
|
||||
<div id="refresh-content">
|
||||
Refreshing
|
||||
<i class="icon ion-ios7-reloading"></i>
|
||||
</div>
|
||||
</refresher>
|
||||
<list-item ng-repeat="item in items"
|
||||
item="item"
|
||||
buttons="item.buttons"
|
||||
@ -145,6 +155,9 @@
|
||||
item.isCompleted = true;
|
||||
};
|
||||
|
||||
$scope.onRefresh = function() {
|
||||
console.log('ON REFRESH');
|
||||
}
|
||||
|
||||
$scope.removeItem = function(item) {
|
||||
removeItem(item);
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
|
||||
.list {
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
margin-bottom: 20px;
|
||||
padding-top: $item-border-width;
|
||||
padding-bottom: $item-border-width;
|
||||
|
||||
Reference in New Issue
Block a user