diff --git a/js/ext/angular/src/directive/ionicSlideBox.js b/js/ext/angular/src/directive/ionicSlideBox.js index 80288a9d66..099f461b20 100644 --- a/js/ext/angular/src/directive/ionicSlideBox.js +++ b/js/ext/angular/src/directive/ionicSlideBox.js @@ -58,10 +58,10 @@ angular.module('ionic.ui.slideBox', []) 'slide', /** * @ngdoc method - * @name $ionicSlideBoxDelegate#prev + * @name $ionicSlideBoxDelegate#previous * @description Go to the previous slide. Wraps around if at the beginning. */ - 'prev', + 'previous', /** * @ngdoc method * @name $ionicSlideBoxDelegate#next diff --git a/js/ext/angular/test/directive/ionicBar.unit.js b/js/ext/angular/test/directive/ionicBar.unit.js index cec6e39b32..07296bd27b 100644 --- a/js/ext/angular/test/directive/ionicBar.unit.js +++ b/js/ext/angular/test/directive/ionicBar.unit.js @@ -56,12 +56,10 @@ describe('bar directives', function() { angular.forEach([{ tag: 'ion-header-bar', - className: 'bar bar-header', - controllerBind: '$ionicHeaderBarController' + className: 'bar bar-header' }, { tag: 'ion-footer-bar', - className: 'bar bar-footer', - controllerBind: '$ionicFooterBarController' + className: 'bar bar-footer' }], function(data) { describe(data.tag, function() { diff --git a/js/ext/angular/test/header.html b/js/ext/angular/test/header.html index 16858916fd..fdb68e7f9b 100644 --- a/js/ext/angular/test/header.html +++ b/js/ext/angular/test/header.html @@ -9,7 +9,7 @@ - +
+ - + @@ -235,11 +235,16 @@ $urlRouterProvider.otherwise("/event/home"); }) - .controller('MainCtrl', function($scope) { - console.log('MainCtrl'); + .controller('MainCtrl', function($scope, $ionicSideMenuDelegate) { $scope.closeMenu = function() { - $scope.sideMenuController.toggleLeft(false); + $ionicSideMenuDelegate.toggleLeft(false); + }; + $scope.toggleLeft = function() { + $ionicSideMenuDelegate.toggleLeft(); + }; + $scope.toggleRight = function() { + $ionicSideMenuDelegate.toggleRight(); }; $scope.range = []; diff --git a/js/views/sliderView.js b/js/views/sliderView.js index 0c22fbfc86..59e06ead28 100644 --- a/js/views/sliderView.js +++ b/js/views/sliderView.js @@ -475,7 +475,7 @@ ionic.views.Slider = ionic.views.View.inherit({ slide(to, speed); }; - this.prev = function() { + this.prev = this.previous = function() { // cancel slideshow stop();