diff --git a/dist/css/ionic.css b/dist/css/ionic.css index f2619006d7..a7a257ff42 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; /*! * Copyright 2013 Drifty Co. * http://drifty.com/ @@ -3222,9 +3223,6 @@ a.subdued { right: 0; } .menu-animated { - -webkit-transition: transform 200ms ease; - -moz-transition: transform 200ms ease; - transition: transform 200ms ease; -webkit-transition: -webkit-transform 200ms ease; -moz-transition: -moz-transform 200ms ease; transition: transform 200ms ease; } diff --git a/dist/css/themes/ionic-ios7.css b/dist/css/themes/ionic-ios7.css index 23bcd03921..1e5a055c50 100644 --- a/dist/css/themes/ionic-ios7.css +++ b/dist/css/themes/ionic-ios7.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; /*! * Copyright 2013 Drifty Co. * http://drifty.com/ diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js index 249ee3a8b3..6c3512c833 100644 --- a/dist/js/ionic-angular.js +++ b/dist/js/ionic-angular.js @@ -2066,49 +2066,47 @@ angular.module('ionic.ui.tabs', ['ngAnimate']) * on a tab bar. Modelled off of UITabBarController. */ -.controller('TabsCtrl', ['$scope', '$element', '$animate', function($scope, $element, $animate) { - var _this = this; - - angular.extend(this, ionic.controllers.TabBarController.prototype); - - ionic.controllers.TabBarController.call(this, { - controllerChanged: function(oldC, oldI, newC, newI) { - $scope.controllerChanged && $scope.controllerChanged({ - oldController: oldC, - oldIndex: oldI, - newController: newC, - newIndex: newI - }); - }, - tabBar: { - tryTabSelect: function() {}, - setSelectedItem: function(index) {}, - addItem: function(item) {} - } - }); - - this.add = function(controller) { - this.addController(controller); - this.select(0); - }; - - this.select = function(controllerIndex) { - $scope.activeAnimation = $scope.animation; - _this.selectController(controllerIndex); - }; - - $scope.controllers = this.controllers; - - $scope.tabsController = this; -}]) - .directive('tabs', function() { return { restrict: 'E', replace: true, scope: true, transclude: true, - controller: 'TabsCtrl', + controller: ['$scope', '$element', '$animate', function($scope, $element, $animate) { + var _this = this; + + angular.extend(this, ionic.controllers.TabBarController.prototype); + + ionic.controllers.TabBarController.call(this, { + controllerChanged: function(oldC, oldI, newC, newI) { + $scope.controllerChanged && $scope.controllerChanged({ + oldController: oldC, + oldIndex: oldI, + newController: newC, + newIndex: newI + }); + }, + tabBar: { + tryTabSelect: function() {}, + setSelectedItem: function(index) {}, + addItem: function(item) {} + } + }); + + this.add = function(controller) { + this.addController(controller); + this.select(0); + }; + + this.select = function(controllerIndex) { + $scope.activeAnimation = $scope.animation; + _this.selectController(controllerIndex); + }; + + $scope.controllers = this.controllers; + + $scope.tabsController = this; + }], //templateUrl: 'ext/angular/tmpl/ionicTabBar.tmpl.html', template: '
', compile: function(element, attr, transclude, tabsCtrl) { diff --git a/js/ext/angular/src/directive/ionicTabBar.js b/js/ext/angular/src/directive/ionicTabBar.js index e7567fe9ba..7cf200b0a8 100644 --- a/js/ext/angular/src/directive/ionicTabBar.js +++ b/js/ext/angular/src/directive/ionicTabBar.js @@ -7,49 +7,47 @@ angular.module('ionic.ui.tabs', ['ngAnimate']) * on a tab bar. Modelled off of UITabBarController. */ -.controller('TabsCtrl', ['$scope', '$element', '$animate', function($scope, $element, $animate) { - var _this = this; - - angular.extend(this, ionic.controllers.TabBarController.prototype); - - ionic.controllers.TabBarController.call(this, { - controllerChanged: function(oldC, oldI, newC, newI) { - $scope.controllerChanged && $scope.controllerChanged({ - oldController: oldC, - oldIndex: oldI, - newController: newC, - newIndex: newI - }); - }, - tabBar: { - tryTabSelect: function() {}, - setSelectedItem: function(index) {}, - addItem: function(item) {} - } - }); - - this.add = function(controller) { - this.addController(controller); - this.select(0); - }; - - this.select = function(controllerIndex) { - $scope.activeAnimation = $scope.animation; - _this.selectController(controllerIndex); - }; - - $scope.controllers = this.controllers; - - $scope.tabsController = this; -}]) - .directive('tabs', function() { return { restrict: 'E', replace: true, scope: true, transclude: true, - controller: 'TabsCtrl', + controller: ['$scope', '$element', '$animate', function($scope, $element, $animate) { + var _this = this; + + angular.extend(this, ionic.controllers.TabBarController.prototype); + + ionic.controllers.TabBarController.call(this, { + controllerChanged: function(oldC, oldI, newC, newI) { + $scope.controllerChanged && $scope.controllerChanged({ + oldController: oldC, + oldIndex: oldI, + newController: newC, + newIndex: newI + }); + }, + tabBar: { + tryTabSelect: function() {}, + setSelectedItem: function(index) {}, + addItem: function(item) {} + } + }); + + this.add = function(controller) { + this.addController(controller); + this.select(0); + }; + + this.select = function(controllerIndex) { + $scope.activeAnimation = $scope.animation; + _this.selectController(controllerIndex); + }; + + $scope.controllers = this.controllers; + + $scope.tabsController = this; + }], //templateUrl: 'ext/angular/tmpl/ionicTabBar.tmpl.html', template: '
', compile: function(element, attr, transclude, tabsCtrl) {