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

Merge branch 'master' of https://github.com/driftyco/ionic

Browse Source 
Conflicts:
	dist/css/ionic-scoped.css
This commit is contained in:
Max Lynch
2013-10-21 21:01:14 -05:00
parent d331c657c0 fddff7c100
commit 95280cd629
15 changed files with 166 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -367,7 +367,7 @@ angular.module('ionic.ui.content', [])
(function() {
'use strict';
angular.module('ionic.ui.list', ['ionic.service.gesture', 'ngAnimate'])
angular.module('ionic.ui.list', ['ionic.service', 'ngAnimate'])
.directive('listItem', function() {
return {
@ -384,7 +384,7 @@ angular.module('ionic.ui.list', ['ionic.service.gesture', 'ngAnimate'])
canSwipe: '@',
buttons: '=',
},
template: '<li class="list-item" ng-click="onSelect()">\
template: '<li class="list-item">\
<div class="list-item-edit" ng-if="canDelete && isEditing">\
<button class="button button-icon" ng-click="onDelete()"><i ng-class="deleteIcon"></i></button>\
</div>\
@ -413,15 +413,6 @@ angular.module('ionic.ui.list', ['ionic.service.gesture', 'ngAnimate'])
};
})
.directive('listRefresher', function() {
return {
restrict: 'E',
replace: true,
transclude: true,
template: '<div class="list-refresher"><div class="list-refresher-content" ng-transclude></div></div>'
}
})
.directive('list', function() {
return {
restrict: 'E',
@ -431,10 +422,7 @@ angular.module('ionic.ui.list', ['ionic.service.gesture', 'ngAnimate'])
scope: {
isEditing: '=',
deleteIcon: '@',
reorderIcon: '@',
onRefreshOpening: '&',
onRefreshHolding: '&',
onRefresh: '&',
reorderIcon: '@'
},
// So we can require being under this
@ -453,12 +441,7 @@ angular.module('ionic.ui.list', ['ionic.service.gesture', 'ngAnimate'])
compile: function(element, attr, transclude) {
return function($scope, $element, $attr) {
var lv = new ionic.views.List({
el: $element[0],
onRefreshOpening: function(ratio) { $scope.onRefreshOpening({ratio: ratio}) },
onRefreshHolding: function() { $scope.onRefreshHolding(); },
onRefresh: function() { $scope.onRefresh(); }
});
var lv = new ionic.views.List({el: $element[0]});
if(attr.animation) {
$element.addClass(attr.animation);