javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-08 23:58:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Header and platform fix

Browse Source
This commit is contained in:
Max Lynch
2013-11-19 19:05:47 -06:00
parent 14028987e4
commit 55084bfc2a
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dist/js/ionic-angular.js vendored
View File

@ -24219,7 +24219,7 @@ angular.module('ionic.service.platform', [])
var isReady = function() { var isReady = function() {
if(platform == 'cordova') { if(platform == 'cordova') {
return window.device; return window.device || window.Cordova;
} }
return true; return true;
}; };
@ -25537,6 +25537,10 @@ angular.module('ionic.ui.navRouter', [])
var oldTitle = $scope.currentTitle; var oldTitle = $scope.currentTitle;
$scope.oldTitle = oldTitle; $scope.oldTitle = oldTitle;
if(typeof data.title !== 'undefined') {
$scope.currentTitle = data.title;
}
if(data.animate !== false && typeof data.title !== 'undefined') { if(data.animate !== false && typeof data.title !== 'undefined') {
animate($scope, $element, oldTitle, data, function() { animate($scope, $element, oldTitle, data, function() {
hb.align(); hb.align();

4
js/ext/angular/src/directive/ionicNavRouter.js vendored
View File

@ -260,6 +260,10 @@ angular.module('ionic.ui.navRouter', [])
var oldTitle = $scope.currentTitle; var oldTitle = $scope.currentTitle;
$scope.oldTitle = oldTitle; $scope.oldTitle = oldTitle;
if(typeof data.title !== 'undefined') {
$scope.currentTitle = data.title;
}
if(data.animate !== false && typeof data.title !== 'undefined') { if(data.animate !== false && typeof data.title !== 'undefined') {
animate($scope, $element, oldTitle, data, function() { animate($scope, $element, oldTitle, data, function() {
hb.align(); hb.align();

2
js/ext/angular/src/service/ionicPlatform.js vendored
View File

@ -20,7 +20,7 @@ angular.module('ionic.service.platform', [])
var isReady = function() { var isReady = function() {
if(platform == 'cordova') { if(platform == 'cordova') {
return window.device; return window.device || window.Cordova;
} }
return true; return true;
}; };