Skip to content

Commit

Permalink
works
Browse files Browse the repository at this point in the history
  • Loading branch information
cfjedimaster committed Jul 23, 2015
1 parent 06551f5 commit 56fb4ce
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
6 changes: 3 additions & 3 deletions rssreader_electron/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
url: '/root',
abstract: true,
controller:'RootCtrl',
template:'<ui-view />'
template:'<ion-nav-view />'
})
.state('root.Home', {
url: '/home',
Expand All @@ -37,12 +37,12 @@
templateUrl: 'partials/offline.html'
});

$urlRouterProvider.otherwise("/home");
$urlRouterProvider.otherwise("/root/home");

}])

.run(['$ionicPlatform','$rootScope','$state', function($ionicPlatform, $rootScope, $state) {
$state.go("root.Home");

$rootScope.goHome = function() {
$state.go("root.Entries");
};
Expand Down
2 changes: 1 addition & 1 deletion rssreader_electron/js/controllers.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

console.log('test ctrl');
$scope.$on('$ionicView.afterEnter', function(ev, data) {
//ev.stopPropagation();
ev.stopPropagation();
});

})
Expand Down
3 changes: 2 additions & 1 deletion rssreader_electron/partials/entries.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<ion-view view-title="Ray">
<ion-view view-title="{{title}}">

<ion-content class="padding has-header">

<ion-list class="list list-inset">
Expand Down
2 changes: 1 addition & 1 deletion rssreader_electron/partials/home.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ion-view view-title="Home">
<ion-view>

<ion-content class="padding">

Expand Down

0 comments on commit 56fb4ce

Please sign in to comment.