diff --git a/examples/starters/flickr/index.html b/examples/starters/flickr/index.html index e2f084d539..9f75dcd71f 100644 --- a/examples/starters/flickr/index.html +++ b/examples/starters/flickr/index.html @@ -19,6 +19,7 @@ + diff --git a/examples/starters/list/index.html b/examples/starters/list/index.html index 6a8183483e..ce06a296a1 100644 --- a/examples/starters/list/index.html +++ b/examples/starters/list/index.html @@ -14,6 +14,7 @@ + @@ -24,20 +25,19 @@ - + - + diff --git a/examples/starters/list/js/app.js b/examples/starters/list/js/app.js index ec82ea2e8a..a85bf58153 100644 --- a/examples/starters/list/js/app.js +++ b/examples/starters/list/js/app.js @@ -3,34 +3,29 @@ // the 2nd parameter is an array or 'requires' // 'listExample.services' is found in services.js // 'listExample.controllers' is found in controllers.js -angular.module('listExample', ['ionic', 'ngRoute', 'ngAnimate', 'listExample.services', 'listExample.controllers']) +angular.module('listExample', ['ionic', 'listExample.services', 'listExample.controllers']) -.config(function ($compileProvider){ - // Needed for routing to work - $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|tel):/); -}) - -.config(function($routeProvider, $locationProvider) { +.config(function($stateProvider, $urlRouterProvider) { // Set up the initial routes that our app will respond to. // These are then tied up to our nav router which animates and // updates a navigation bar - $routeProvider.when('/', { - templateUrl: '/index.html', - controller: 'MovieIndexCtrl' - }); + $stateProvider + .state('movieIndex', { + url: '/', + templateUrl: '/index.html', + controller: 'MovieIndexCtrl' + }) - // if the url matches something like /movie/88 then this route - // will fire off the MovieDetailCtrl (controllers.js) - $routeProvider.when('/movie/:movieId', { - templateUrl: '/movie.html', - controller: 'MovieDetailCtrl' - }); + // if the url matches something like /movie/88 then this route + // will fire off the MovieDetailCtrl (controllers.js) + .state('movieDetail', { + url: '/movie/:movieId', + templateUrl: '/movie.html', + controller: 'MovieDetailCtrl' + }); // if none of the above routes are met, use this fallback - $routeProvider.otherwise({ - redirectTo: '/' - }); + $urlRouterProvider.otherwise('/'); }); - diff --git a/examples/starters/list/js/controllers.js b/examples/starters/list/js/controllers.js index ff72f71568..020af47d86 100644 --- a/examples/starters/list/js/controllers.js +++ b/examples/starters/list/js/controllers.js @@ -13,8 +13,8 @@ angular.module('listExample.controllers', []) }) // Controller that shows more detailed info about a movie -.controller('MovieDetailCtrl', function($scope, $routeParams, MovieService) { +.controller('MovieDetailCtrl', function($scope, $stateParams, MovieService) { // "MovieService" is a service returning mock data (services.js) - $scope.movie = MovieService.get($routeParams.movieId); + $scope.movie = MovieService.get($stateParams.movieId); $scope.title = "Movie Info"; }); diff --git a/examples/starters/map/index.html b/examples/starters/map/index.html index 6ca49a3b4a..10c1efd494 100644 --- a/examples/starters/map/index.html +++ b/examples/starters/map/index.html @@ -24,6 +24,7 @@ + diff --git a/examples/starters/profile/index.html b/examples/starters/profile/index.html index 82c8b6e515..6402b93245 100644 --- a/examples/starters/profile/index.html +++ b/examples/starters/profile/index.html @@ -105,6 +105,7 @@ + diff --git a/examples/starters/profile/me.jpg b/examples/starters/profile/me.jpg deleted file mode 100644 index 1d6c8ffb59..0000000000 Binary files a/examples/starters/profile/me.jpg and /dev/null differ diff --git a/examples/starters/tabs/index.html b/examples/starters/tabs/index.html index 0d7bb11894..be41793568 100644 --- a/examples/starters/tabs/index.html +++ b/examples/starters/tabs/index.html @@ -16,6 +16,7 @@ + diff --git a/examples/starters/weather/index.html b/examples/starters/weather/index.html index 1749d3a57d..0a386109e2 100644 --- a/examples/starters/weather/index.html +++ b/examples/starters/weather/index.html @@ -16,6 +16,7 @@ + diff --git a/js/ext/angular/test/actionSheet.html b/js/ext/angular/test/actionSheet.html index 37878313d8..00df79006d 100644 --- a/js/ext/angular/test/actionSheet.html +++ b/js/ext/angular/test/actionSheet.html @@ -19,119 +19,123 @@ + -
-
-
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- + + + +