From 55084bfc2a3a324f6139d2f9df1d0c29c9db4451 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Tue, 19 Nov 2013 19:05:47 -0600 Subject: [PATCH] Header and platform fix --- dist/js/ionic-angular.js | 6 +++++- js/ext/angular/src/directive/ionicNavRouter.js | 4 ++++ js/ext/angular/src/service/ionicPlatform.js | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js index 29c9b5655c..071898bc09 100644 --- a/dist/js/ionic-angular.js +++ b/dist/js/ionic-angular.js @@ -24219,7 +24219,7 @@ angular.module('ionic.service.platform', []) var isReady = function() { if(platform == 'cordova') { - return window.device; + return window.device || window.Cordova; } return true; }; @@ -25537,6 +25537,10 @@ angular.module('ionic.ui.navRouter', []) var oldTitle = $scope.currentTitle; $scope.oldTitle = oldTitle; + if(typeof data.title !== 'undefined') { + $scope.currentTitle = data.title; + } + if(data.animate !== false && typeof data.title !== 'undefined') { animate($scope, $element, oldTitle, data, function() { hb.align(); diff --git a/js/ext/angular/src/directive/ionicNavRouter.js b/js/ext/angular/src/directive/ionicNavRouter.js index 95ac37bdc1..14a898257c 100644 --- a/js/ext/angular/src/directive/ionicNavRouter.js +++ b/js/ext/angular/src/directive/ionicNavRouter.js @@ -260,6 +260,10 @@ angular.module('ionic.ui.navRouter', []) var oldTitle = $scope.currentTitle; $scope.oldTitle = oldTitle; + if(typeof data.title !== 'undefined') { + $scope.currentTitle = data.title; + } + if(data.animate !== false && typeof data.title !== 'undefined') { animate($scope, $element, oldTitle, data, function() { hb.align(); diff --git a/js/ext/angular/src/service/ionicPlatform.js b/js/ext/angular/src/service/ionicPlatform.js index fc8b43cca8..f8974c9105 100644 --- a/js/ext/angular/src/service/ionicPlatform.js +++ b/js/ext/angular/src/service/ionicPlatform.js @@ -20,7 +20,7 @@ angular.module('ionic.service.platform', []) var isReady = function() { if(platform == 'cordova') { - return window.device; + return window.device || window.Cordova; } return true; };