diff --git a/dist/ionic-angular.js b/dist/ionic-angular.js
index b8786f532b..f568acea58 100644
--- a/dist/ionic-angular.js
+++ b/dist/ionic-angular.js
@@ -180,24 +180,27 @@ angular.module('ionic.ui.content', [])
}
})
;
-angular.module('ionic.ui.list', ['ionic.service'])
+angular.module('ionic.ui.list', ['ionic.service', 'ngAnimate'])
.directive('listItem', function() {
return {
restrict: 'E',
replace: true,
transclude: true,
- template: '
' +
+ template: '' +
' ' +
' ' +
'
' +
' ' +
'
' +
' ' +
- ' ' +
+ ' ' +
'
' +
'',
link: function($scope, $element, $attr) {
+ $scope.buttonClicked = function(button) {
+ button.buttonClicked && button.buttonClicked($scope.item);
+ }
}
}
})
@@ -209,10 +212,11 @@ angular.module('ionic.ui.list', ['ionic.service'])
transclude: true,
scope: {
isEditing: '=',
- items: '='
+ items: '=',
+ animation: '='
},
template: '' +
- '' +
+ '' +
' {{item.text}}' +
' ' +
'' +
@@ -221,6 +225,10 @@ angular.module('ionic.ui.list', ['ionic.service'])
return function($scope, $element, $attr) {
var lv = new ionic.views.List({el: $element[0]});
+ if(attr.animation) {
+ $element.addClass(attr.animation);
+ }
+
$element.append(transclude($scope));
}
}
diff --git a/dist/ionic-ios7.css b/dist/ionic-ios7.css
index e678c6c001..f7501c1f6e 100644
--- a/dist/ionic-ios7.css
+++ b/dist/ionic-ios7.css
@@ -1073,7 +1073,7 @@ a.list-item {
background-color: #fff;
z-index: 1;
padding: 15px 15px;
- -webkit-transition: left 0.2s ease-in-out; }
+ -webkit-transition: left 0.2s ease-in-out, right 0.2s ease-in-out; }
.list-item-content > i:last-child {
float: right; }
diff --git a/dist/ionic.css b/dist/ionic.css
index 99038b4791..820af4798d 100644
--- a/dist/ionic.css
+++ b/dist/ionic.css
@@ -1161,7 +1161,7 @@ a.list-item {
background-color: #fff;
z-index: 1;
padding: 15px 15px;
- -webkit-transition: left 0.2s ease-in-out; }
+ -webkit-transition: left 0.2s ease-in-out, right 0.2s ease-in-out; }
.list-item-content > i:last-child {
float: right; }
diff --git a/js/ext/angular/src/directive/ionicList.js b/js/ext/angular/src/directive/ionicList.js
index 605028884c..49304e9cf0 100644
--- a/js/ext/angular/src/directive/ionicList.js
+++ b/js/ext/angular/src/directive/ionicList.js
@@ -1,21 +1,24 @@
-angular.module('ionic.ui.list', ['ionic.service'])
+angular.module('ionic.ui.list', ['ionic.service', 'ngAnimate'])
.directive('listItem', function() {
return {
restrict: 'E',
replace: true,
transclude: true,
- template: '- ' +
+ template: '
- ' +
'
' +
' ' +
'
' +
' ' +
'
' +
' ' +
- ' ' +
+ ' ' +
'
' +
' ',
link: function($scope, $element, $attr) {
+ $scope.buttonClicked = function(button) {
+ button.buttonClicked && button.buttonClicked($scope.item);
+ }
}
}
})
@@ -27,10 +30,11 @@ angular.module('ionic.ui.list', ['ionic.service'])
transclude: true,
scope: {
isEditing: '=',
- items: '='
+ items: '=',
+ animation: '='
},
template: '' +
- '' +
+ '' +
' {{item.text}}' +
' ' +
'' +
@@ -39,6 +43,10 @@ angular.module('ionic.ui.list', ['ionic.service'])
return function($scope, $element, $attr) {
var lv = new ionic.views.List({el: $element[0]});
+ if(attr.animation) {
+ $element.addClass(attr.animation);
+ }
+
$element.append(transclude($scope));
}
}
diff --git a/js/ext/angular/test/list.html b/js/ext/angular/test/list.html
index f278d85add..844ccb5a82 100644
--- a/js/ext/angular/test/list.html
+++ b/js/ext/angular/test/list.html
@@ -11,30 +11,39 @@
@@ -73,7 +82,7 @@
-
+
@@ -81,7 +90,7 @@