diff --git a/index.html b/index.html index a531e0d0c..ff0f49607 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + Copay - Multisignature Wallet @@ -106,6 +106,15 @@ + + + diff --git a/js/controllers/settings.js b/js/controllers/settings.js index c8f1532f8..4a09d30b3 100644 --- a/js/controllers/settings.js +++ b/js/controllers/settings.js @@ -74,8 +74,6 @@ angular.module('copayApp.controllers').controller('SettingsController', unitToSatoshi: $scope.selectedUnit.value, })); - var target = ($window.location.origin !== 'null' ? $window.location.origin : ''); - - $window.location.href = target; + $location.path('/copayers'); }; }); diff --git a/js/routes.js b/js/routes.js index 3f7308341..9db46fdc1 100644 --- a/js/routes.js +++ b/js/routes.js @@ -67,7 +67,7 @@ angular .module('copayApp') .config(function($locationProvider) { $locationProvider - .html5Mode(true) + .html5Mode(false) .hashPrefix('!'); }) .run(function($rootScope, $location) { diff --git a/js/services/uriHandler.js b/js/services/uriHandler.js index 59a8304c0..da9dd8695 100644 --- a/js/services/uriHandler.js +++ b/js/services/uriHandler.js @@ -4,8 +4,11 @@ var UriHandler = function() {}; UriHandler.prototype.register = function() { var base = window.location.origin + '/'; - var url = base + '#/uri-payment/%s'; - navigator.registerProtocolHandler('bitcoin', url, 'Copay'); + var url = base + '#!/uri-payment/%s'; + + if(navigator.registerProtocolHandler) { + navigator.registerProtocolHandler('bitcoin', url, 'Copay'); + } }; angular.module('copayApp.services').value('uriHandler', new UriHandler()); diff --git a/mobile/build.sh b/mobile/build.sh index 50ece436a..de4f83362 100644 --- a/mobile/build.sh +++ b/mobile/build.sh @@ -54,7 +54,7 @@ checkOK # Copy all app files echo "${OpenColor}${Green}* Copying all app files...${CloseColor}" cd $BUILDDIR/.. -cp -af {css,font,img,js,lib,sound,config.js,version.js,$BUILDDIR/cordova.js,$BUILDDIR/cordova_plugins.js,$BUILDDIR/plugins} $APPDIR +cp -af {css,font,img,js,lib,sound,views,config.js,version.js,$BUILDDIR/cordova.js,$BUILDDIR/cordova_plugins.js,$BUILDDIR/plugins} $APPDIR checkOK sed "s/<\!-- PLACEHOLDER: CORDOVA SRIPT -->/