diff --git a/test/html/component-test.html b/test/html/component-test.html index 3bc3848f74a..212b930c654 100644 --- a/test/html/component-test.html +++ b/test/html/component-test.html @@ -141,7 +141,6 @@

Search

if (window.cordova && window.cordova.plugins.Keyboard) { cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true); cordova.plugins.Keyboard.disableScroll(true); - } if (window.StatusBar) { // org.apache.cordova.statusbar required @@ -153,7 +152,7 @@

Search

.config(function($stateProvider, $urlRouterProvider) { $stateProvider - .state('app', { + .state('app', { url: '/app', abstract: true, templateUrl: 'templates/menu.html', @@ -170,22 +169,23 @@

Search

}) .state('app.browse', { - url: '/browse', - views: { - 'menuContent': { - templateUrl: 'templates/browse.html' - } + url: '/browse', + views: { + 'menuContent': { + templateUrl: 'templates/browse.html' } - }) - .state('app.playlists', { - url: '/playlists', - views: { - 'menuContent': { - templateUrl: 'templates/playlists.html', - controller: 'PlaylistsCtrl' - } + } + }) + + .state('app.playlists', { + url: '/playlists', + views: { + 'menuContent': { + templateUrl: 'templates/playlists.html', + controller: 'PlaylistsCtrl' } - }) + } + }) .state('app.single', { url: '/playlists/:playlistId', @@ -265,7 +265,6 @@

Search

users.push({imagePath: gandalf, name: 'Gandalf the Grey', subTitle: 'You shall not pass!'}); users.push({imagePath: sam, name: 'Samwise Gamgee', subTitle: 'I made a promise, Mr. Frodo! Don\'t you leave him Samwise Gamgee'}); $scope.users = users; - }) .component('userCell', { @@ -275,7 +274,6 @@

Search

subTitle: "=" }, controller: function(){ - this.$onInit = function(){ console.log("$onInit called: ", this); } diff --git a/test/html/sidemenu-starter.html b/test/html/sidemenu-starter.html index ce6d1eba65f..6f8fd93d925 100644 --- a/test/html/sidemenu-starter.html +++ b/test/html/sidemenu-starter.html @@ -149,7 +149,6 @@

Search

if (window.cordova && window.cordova.plugins.Keyboard) { cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true); cordova.plugins.Keyboard.disableScroll(true); - } if (window.StatusBar) { // org.apache.cordova.statusbar required @@ -161,7 +160,7 @@

Search

.config(function($stateProvider, $urlRouterProvider) { $stateProvider - .state('app', { + .state('app', { url: '/app', abstract: true, templateUrl: 'templates/menu.html', @@ -178,22 +177,23 @@

Search

}) .state('app.browse', { - url: '/browse', - views: { - 'menuContent': { - templateUrl: 'templates/browse.html' - } + url: '/browse', + views: { + 'menuContent': { + templateUrl: 'templates/browse.html' } - }) - .state('app.playlists', { - url: '/playlists', - views: { - 'menuContent': { - templateUrl: 'templates/playlists.html', - controller: 'PlaylistsCtrl' - } + } + }) + + .state('app.playlists', { + url: '/playlists', + views: { + 'menuContent': { + templateUrl: 'templates/playlists.html', + controller: 'PlaylistsCtrl' } - }) + } + }) .state('app.single', { url: '/playlists/:playlistId', diff --git a/test/html/tabs-starter.html b/test/html/tabs-starter.html index d84b0d7a870..0affbfdabce 100644 --- a/test/html/tabs-starter.html +++ b/test/html/tabs-starter.html @@ -107,7 +107,6 @@

Welcome to Ionic

- @@ -139,7 +138,7 @@

Welcome to Ionic

$stateProvider // setup an abstract state for the tabs directive - .state('tab', { + .state('tab', { url: '/tab', abstract: true, templateUrl: 'templates/tabs.html' @@ -158,23 +157,24 @@

Welcome to Ionic

}) .state('tab.chats', { - url: '/chats', - views: { - 'tab-chats': { - templateUrl: 'templates/tab-chats.html', - controller: 'ChatsCtrl' - } + url: '/chats', + views: { + 'tab-chats': { + templateUrl: 'templates/tab-chats.html', + controller: 'ChatsCtrl' } - }) - .state('tab.chat-detail', { - url: '/chats/:chatId', - views: { - 'tab-chats': { - templateUrl: 'templates/chat-detail.html', - controller: 'ChatDetailCtrl' - } + } + }) + + .state('tab.chat-detail', { + url: '/chats/:chatId', + views: { + 'tab-chats': { + templateUrl: 'templates/chat-detail.html', + controller: 'ChatDetailCtrl' } - }) + } + }) .state('tab.account', { url: '/account', @@ -193,84 +193,83 @@

Welcome to Ionic

angular.module('starter.controllers', []) -.controller('DashCtrl', function($scope) {}) - -.controller('ChatsCtrl', function($scope, Chats) { - // With the new view caching in Ionic, Controllers are only called - // when they are recreated or on app start, instead of every page change. - // To listen for when this page is active (for example, to refresh data), - // listen for the $ionicView.enter event: - // - //$scope.$on('$ionicView.enter', function(e) { - //}); - - $scope.chats = Chats.all(); - $scope.remove = function(chat) { - Chats.remove(chat); - }; -}) - -.controller('ChatDetailCtrl', function($scope, $stateParams, Chats) { - $scope.chat = Chats.get($stateParams.chatId); -}) - -.controller('AccountCtrl', function($scope) { - $scope.settings = { - enableFriends: true - }; -}); - -angular.module('starter.services', []) - -.factory('Chats', function() { - // Might use a resource here that returns a JSON array - - // Some fake testing data - var chats = [{ - id: 0, - name: 'Ben Sparrow', - lastText: 'You on your way?', - face: 'img/ben.png' - }, { - id: 1, - name: 'Max Lynx', - lastText: 'Hey, it\'s me', - face: 'img/max.png' - }, { - id: 2, - name: 'Adam Bradleyson', - lastText: 'I should buy a boat', - face: 'img/adam.jpg' - }, { - id: 3, - name: 'Perry Governor', - lastText: 'Look at my mukluks!', - face: 'img/perry.png' - }, { - id: 4, - name: 'Mike Harrington', - lastText: 'This is wicked good ice cream.', - face: 'img/mike.png' - }]; - - return { - all: function() { - return chats; - }, - remove: function(chat) { - chats.splice(chats.indexOf(chat), 1); - }, - get: function(chatId) { - for (var i = 0; i < chats.length; i++) { - if (chats[i].id === parseInt(chatId)) { - return chats[i]; + .controller('DashCtrl', function($scope) {}) + + .controller('ChatsCtrl', function($scope, Chats) { + // With the new view caching in Ionic, Controllers are only called + // when they are recreated or on app start, instead of every page change. + // To listen for when this page is active (for example, to refresh data), + // listen for the $ionicView.enter event: + // + //$scope.$on('$ionicView.enter', function(e) { + //}); + + $scope.chats = Chats.all(); + $scope.remove = function(chat) { + Chats.remove(chat); + }; + }) + + .controller('ChatDetailCtrl', function($scope, $stateParams, Chats) { + $scope.chat = Chats.get($stateParams.chatId); + }) + + .controller('AccountCtrl', function($scope) { + $scope.settings = { + enableFriends: true + }; + }); + + angular.module('starter.services', []) + + .factory('Chats', function() { + // Might use a resource here that returns a JSON array + + // Some fake testing data + var chats = [{ + id: 0, + name: 'Ben Sparrow', + lastText: 'You on your way?', + face: 'img/ben.png' + }, { + id: 1, + name: 'Max Lynx', + lastText: 'Hey, it\'s me', + face: 'img/max.png' + }, { + id: 2, + name: 'Adam Bradleyson', + lastText: 'I should buy a boat', + face: 'img/adam.jpg' + }, { + id: 3, + name: 'Perry Governor', + lastText: 'Look at my mukluks!', + face: 'img/perry.png' + }, { + id: 4, + name: 'Mike Harrington', + lastText: 'This is wicked good ice cream.', + face: 'img/mike.png' + }]; + + return { + all: function() { + return chats; + }, + remove: function(chat) { + chats.splice(chats.indexOf(chat), 1); + }, + get: function(chatId) { + for (var i = 0; i < chats.length; i++) { + if (chats[i].id === parseInt(chatId)) { + return chats[i]; + } } + return null; } - return null; - } - }; -}); - + }; + });