From 5f06db2f4da7610d25f22bc3603ce0727325ab9a Mon Sep 17 00:00:00 2001 From: Gustavo Martin Morcuende Date: Sun, 16 Aug 2015 22:48:51 +0200 Subject: [PATCH] showcase: ng-app vs angular.bootstrap, in my case using ng-app --- angularjs/showcase/app/app.config.js | 5 ++-- angularjs/showcase/app/app.module.js | 1 + angularjs/showcase/app/index.html | 47 +++++++++++++++++++++++++----------- 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/angularjs/showcase/app/app.config.js b/angularjs/showcase/app/app.config.js index bc41983..b86a7f0 100644 --- a/angularjs/showcase/app/app.config.js +++ b/angularjs/showcase/app/app.config.js @@ -9,12 +9,13 @@ function($stateProvider, $urlRouterProvider) { var welcome = { + abstract: false, url: '/welcome', templateUrl: 'app/welcome/welcome.html' }; - $urlRouterProvider.otherwise('app/welcome'); - $stateProvider.state('app.welcome', welcome); + $urlRouterProvider.otherwise('welcome'); + $stateProvider.state('welcome', welcome); } ]); }()); \ No newline at end of file diff --git a/angularjs/showcase/app/app.module.js b/angularjs/showcase/app/app.module.js index 678ef64..cc245ef 100644 --- a/angularjs/showcase/app/app.module.js +++ b/angularjs/showcase/app/app.module.js @@ -7,4 +7,5 @@ 'ui.bootstrap', 'ui.bootstrap.modal' ]); + }()); \ No newline at end of file diff --git a/angularjs/showcase/app/index.html b/angularjs/showcase/app/index.html index 7a6a354..b684204 100644 --- a/angularjs/showcase/app/index.html +++ b/angularjs/showcase/app/index.html @@ -46,19 +46,6 @@ - - @@ -70,10 +57,42 @@ -

+ +

+ + Hello World!!! You should never see this if ui-router works as expected. + +

+ + -- 2.1.4