From d2bdf4302bbdd7c9ffd66888082ac11f5b64f44c Mon Sep 17 00:00:00 2001 From: Andy Joslin Date: Tue, 25 Mar 2014 07:48:26 -0600 Subject: [PATCH] refactor(): remove deprecated $parse dependency from controllers --- js/ext/angular/src/controller/ionicScrollController.js | 3 +-- js/ext/angular/src/directive/ionicBar.js | 2 +- js/ext/angular/src/directive/ionicContent.js | 3 +-- js/ext/angular/src/directive/ionicScroll.js | 6 +++++- js/ext/angular/src/directive/ionicSlideBox.js | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/js/ext/angular/src/controller/ionicScrollController.js b/js/ext/angular/src/controller/ionicScrollController.js index 1c70a9fa0a..b199241354 100644 --- a/js/ext/angular/src/controller/ionicScrollController.js +++ b/js/ext/angular/src/controller/ionicScrollController.js @@ -187,8 +187,7 @@ angular.module('ionic.ui.scroll') '$rootScope', '$document', '$ionicScrollDelegate', - '$parse', //DEPRECATED -function($scope, scrollViewOptions, $timeout, $window, $$scrollValueCache, $location, $rootScope, $document, $ionicScrollDelegate, $parse) { +function($scope, scrollViewOptions, $timeout, $window, $$scrollValueCache, $location, $rootScope, $document, $ionicScrollDelegate) { var self = this; diff --git a/js/ext/angular/src/directive/ionicBar.js b/js/ext/angular/src/directive/ionicBar.js index 73d15dd838..c976b7aaf9 100644 --- a/js/ext/angular/src/directive/ionicBar.js +++ b/js/ext/angular/src/directive/ionicBar.js @@ -97,7 +97,7 @@ function tapScrollToTopDirective() { function barDirective(isHeader) { - return [function($parse) { + return [function() { return { restrict: 'E', compile: function($element, $attr) { diff --git a/js/ext/angular/src/directive/ionicContent.js b/js/ext/angular/src/directive/ionicContent.js index 129daa0a73..1125b94568 100644 --- a/js/ext/angular/src/directive/ionicContent.js +++ b/js/ext/angular/src/directive/ionicContent.js @@ -56,11 +56,10 @@ angular.module('ionic.ui.content', ['ionic.ui.scroll']) * @param {expression=} on-scroll-complete Expression to evaluate when a scroll action completes. */ .directive('ionContent', [ - '$parse', '$timeout', '$controller', '$ionicBind', -function($parse, $timeout, $controller, $ionicBind) { +function($timeout, $controller, $ionicBind) { return { restrict: 'E', require: '^?ionNavView', diff --git a/js/ext/angular/src/directive/ionicScroll.js b/js/ext/angular/src/directive/ionicScroll.js index 5d5b49baea..c160336b48 100644 --- a/js/ext/angular/src/directive/ionicScroll.js +++ b/js/ext/angular/src/directive/ionicScroll.js @@ -21,7 +21,11 @@ angular.module('ionic.ui.scroll', []) * @param {boolean=} scrollbar-x Whether to show the horizontal scrollbar. Default false. * @param {boolean=} scrollbar-x Whether to show the vertical scrollbar. Default true. */ -.directive('ionScroll', ['$parse', '$timeout', '$controller', '$ionicBind', function($parse, $timeout, $controller, $ionicBind) { +.directive('ionScroll', [ + '$timeout', + '$controller', + '$ionicBind', +function($timeout, $controller, $ionicBind) { return { restrict: 'E', scope: true, diff --git a/js/ext/angular/src/directive/ionicSlideBox.js b/js/ext/angular/src/directive/ionicSlideBox.js index 099f461b20..f7c9fdf7c7 100644 --- a/js/ext/angular/src/directive/ionicSlideBox.js +++ b/js/ext/angular/src/directive/ionicSlideBox.js @@ -154,7 +154,7 @@ function($timeout, $compile, $ionicSlideBoxDelegate) { onSlideChanged: '&', activeSlide: '=?' }, - controller: ['$scope', '$element', '$attrs', '$parse', function($scope, $element, $attrs) { + controller: ['$scope', '$element', '$attrs', function($scope, $element, $attrs) { var _this = this; var continuous = $scope.$eval($scope.doesContinue) === true;