diff --git a/Gruntfile.js b/Gruntfile.js index d9a9b4cd2a..242186c807 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -48,11 +48,11 @@ module.exports = function(grunt) { }, distAngular: { src: [ - 'vendor/angular/1.2.0/angular.min.js', - 'vendor/angular/1.2.0/angular-animate.min.js', - 'vendor/angular/1.2.0/angular-resource.min.js', - 'vendor/angular/1.2.0/angular-sanitize.min.js', - 'vendor/angular/1.2.0/angular-touch.min.js', + 'vendor/angular/1.2.0/angular.js', + 'vendor/angular/1.2.0/angular-animate.js', + 'vendor/angular/1.2.0/angular-resource.js', + 'vendor/angular/1.2.0/angular-sanitize.js', + 'vendor/angular/1.2.0/angular-touch.js', 'js/ext/angular/src/ionicAngular.js', 'js/ext/angular/src/service/**/*.js', 'js/ext/angular/src/directive/**/*.js' diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js index a6b430d467..104f03c0ae 100644 --- a/dist/js/ionic-angular.js +++ b/dist/js/ionic-angular.js @@ -1009,7 +1009,7 @@ angular.module('ionic.ui.list', ['ngAnimate']) buttons: '=', type: '@' }, - template: '\ + template: '
  • \
    \ \
    \ @@ -1021,7 +1021,7 @@ angular.module('ionic.ui.list', ['ngAnimate'])
    \ \
    \ -
    ', +
  • ', link: function($scope, $element, $attr, list) { // Grab the parent list controller @@ -1620,23 +1620,23 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture']) return function($scope, $element, $attr, sideMenuCtrl) { $scope.side = $attr.side; + sideMenuCtrl.left.pushDown = function() { + $element[0].style.zIndex = -1; + }; + sideMenuCtrl.left.bringUp = function() { + $element[0].style.zIndex = 0; + }; + sideMenuCtrl.right.pushDown = function() { + $element[0].style.zIndex = -1; + }; + sideMenuCtrl.right.bringUp = function() { + $element[0].style.zIndex = 0; + }; if($scope.side == 'left') { sideMenuCtrl.left.isEnabled = true; - sideMenuCtrl.left.pushDown = function() { - $element[0].style.zIndex = -1; - }; - sideMenuCtrl.left.bringUp = function() { - $element[0].style.zIndex = 0; - }; } else if($scope.side == 'right') { sideMenuCtrl.right.isEnabled = true; - sideMenuCtrl.right.pushDown = function() { - $element[0].style.zIndex = -1; - }; - sideMenuCtrl.right.bringUp = function() { - $element[0].style.zIndex = 0; - }; } $element.append(transclude($scope)); diff --git a/js/ext/angular/src/directive/ionicList.js b/js/ext/angular/src/directive/ionicList.js index cdae57f300..628dd79334 100644 --- a/js/ext/angular/src/directive/ionicList.js +++ b/js/ext/angular/src/directive/ionicList.js @@ -19,7 +19,7 @@ angular.module('ionic.ui.list', ['ngAnimate']) buttons: '=', type: '@' }, - template: '\ + template: '
  • \
    \ \
    \ @@ -31,7 +31,7 @@ angular.module('ionic.ui.list', ['ngAnimate'])
    \ \
    \ -
    ', +
  • ', link: function($scope, $element, $attr, list) { // Grab the parent list controller diff --git a/js/ext/angular/src/directive/ionicSideMenu.js b/js/ext/angular/src/directive/ionicSideMenu.js index 2c1a7b798f..178bf059f5 100644 --- a/js/ext/angular/src/directive/ionicSideMenu.js +++ b/js/ext/angular/src/directive/ionicSideMenu.js @@ -126,23 +126,23 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture']) return function($scope, $element, $attr, sideMenuCtrl) { $scope.side = $attr.side; + sideMenuCtrl.left.pushDown = function() { + $element[0].style.zIndex = -1; + }; + sideMenuCtrl.left.bringUp = function() { + $element[0].style.zIndex = 0; + }; + sideMenuCtrl.right.pushDown = function() { + $element[0].style.zIndex = -1; + }; + sideMenuCtrl.right.bringUp = function() { + $element[0].style.zIndex = 0; + }; if($scope.side == 'left') { sideMenuCtrl.left.isEnabled = true; - sideMenuCtrl.left.pushDown = function() { - $element[0].style.zIndex = -1; - }; - sideMenuCtrl.left.bringUp = function() { - $element[0].style.zIndex = 0; - }; } else if($scope.side == 'right') { sideMenuCtrl.right.isEnabled = true; - sideMenuCtrl.right.pushDown = function() { - $element[0].style.zIndex = -1; - }; - sideMenuCtrl.right.bringUp = function() { - $element[0].style.zIndex = 0; - }; } $element.append(transclude($scope)); diff --git a/test/actionsheet.html b/test/actionsheet.html index 4997400035..b6e25c71ab 100644 --- a/test/actionsheet.html +++ b/test/actionsheet.html @@ -5,8 +5,7 @@ - - +