From 4be558d143559de437a9d1777d9eda0c389708af Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Sun, 7 Dec 2014 14:12:58 -0300 Subject: [PATCH] fix hidden sidebars in cordova --- js/controllers/create.js | 4 +++- js/controllers/home.js | 4 +++- js/routes.js | 4 ++-- js/services/applicationService.js | 4 ++-- js/services/go.js | 8 +++++++- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/js/controllers/create.js b/js/controllers/create.js index 49f6daa01..ce727428d 100644 --- a/js/controllers/create.js +++ b/js/controllers/create.js @@ -63,7 +63,9 @@ angular.module('copayApp.controllers').controller('CreateController', } } - $rootScope.$digest(); + $timeout(function(){ + $rootScope.$digest(); + },1); }); }; }); diff --git a/js/controllers/home.js b/js/controllers/home.js index 81a65e3e0..8db396afe 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -164,7 +164,9 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc $scope.askForPin = 1; $rootScope.starting = false; $rootScope.hideNavigation = true; - $rootScope.$digest(); + $timeout(function(){ + $rootScope.$digest(); + }); return; } // no mobile diff --git a/js/routes.js b/js/routes.js index 67f6dce6a..c295994b4 100644 --- a/js/routes.js +++ b/js/routes.js @@ -113,12 +113,12 @@ angular $idleProvider.warningDuration(40); // in seconds $keepaliveProvider.interval(30); // in seconds }) - .run(function($rootScope, $location, $idle, gettextCatalog, uriHandler) { + .run(function($rootScope, $location, $idle, gettextCatalog, uriHandler, isCordova) { gettextCatalog.currentLanguage = config.defaultLanguage; // Register URI handler, not for mobileApp - if (!window.cordova) { + if (!isCordova) { $idle.watch(); uriHandler.register(); } diff --git a/js/services/applicationService.js b/js/services/applicationService.js index 6e114dedd..866442fcf 100644 --- a/js/services/applicationService.js +++ b/js/services/applicationService.js @@ -1,11 +1,11 @@ 'use strict'; angular.module('copayApp.services') - .factory('applicationService', function($rootScope, $location, $timeout, go) { + .factory('applicationService', function($rootScope, $location, $timeout, go, isCordova) { var root = {}; var isChromeApp = window.chrome && chrome.runtime && chrome.runtime.id; root.restart = function() { - if (1 || window.cordova !== undefined) { + if (isCordova) { $rootScope.iden = $rootScope.wallet = undefined; go.go('/'); $timeout(function(){ diff --git a/js/services/go.js b/js/services/go.js index cda2816b1..deddac120 100644 --- a/js/services/go.js +++ b/js/services/go.js @@ -4,15 +4,21 @@ angular.module('copayApp.services').factory('go', function($window, $location) { var root = {}; var hideSidebars = function() { + if (typeof document === 'undefined') + return; + // hack to hide sidebars and use ng-click (no href=) var win = angular.element($window); - var elem = win.find('#off-canvas-wrap'); +console.log('[go.js.8:win:]',win); //TODO + var elem = angular.element(document.querySelector('#off-canvas-wrap')) +console.log('[go.js.10:elem:]',elem); //TODO elem.removeClass('move-right'); elem.removeClass('move-left'); }; root.go = function(path) { var parts = path.split('#'); +console.log('[go.js.15:parts:]',parts); //TODO $location.path(parts[0]); if (parts[1]) $location.hash(parts[1]);