From 4bf7bbe73fcd8e6dbde2352d2c0f70a2c6cabb7b Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 18 Sep 2014 19:34:27 -0300 Subject: [PATCH] defaults to localStorage --- config.js | 4 ++-- js/controllers/more.js | 1 + js/services/pluginManager.js | 1 - test/unit/controllers/controllersSpec.js | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config.js b/config.js index d4772c096..811431cd6 100644 --- a/config.js +++ b/config.js @@ -53,8 +53,8 @@ var defaultConfig = { verbose: 1, plugins: { - //LocalStorage: true, - GoogleDrive: true, + LocalStorage: true, + //GoogleDrive: true, }, GoogleDrive: { diff --git a/js/controllers/more.js b/js/controllers/more.js index 5bd705d90..4fb673256 100644 --- a/js/controllers/more.js +++ b/js/controllers/more.js @@ -25,6 +25,7 @@ angular.module('copayApp.controllers').controller('MoreController', value: 100000000, decimals: 8 }]; + $scope.selectedAlternative = { name: w.settings.alternativeName, isoCode: w.settings.alternativeIsoCode diff --git a/js/services/pluginManager.js b/js/services/pluginManager.js index f5e6e165c..1b85d15a6 100644 --- a/js/services/pluginManager.js +++ b/js/services/pluginManager.js @@ -2,7 +2,6 @@ angular.module('copayApp.services').factory('pluginManager', function(angularLoad){ var pm = new copay.PluginManager(config); - var scripts = pm.scripts; for(var ii in scripts){ diff --git a/test/unit/controllers/controllersSpec.js b/test/unit/controllers/controllersSpec.js index 9d06092d2..748ae7a5d 100644 --- a/test/unit/controllers/controllersSpec.js +++ b/test/unit/controllers/controllersSpec.js @@ -15,12 +15,14 @@ saveAs = function(blob, filename) { var startServer = require('../../mocks/FakePayProServer'); describe("Unit: Controllers", function() { + config.plugins.LocalStorage=null; + config.plugins.GoogleDrive=null; + var invalidForm = { $invalid: true }; var scope; - var server; beforeEach(module('copayApp.services')); @@ -37,6 +39,7 @@ describe("Unit: Controllers", function() { alternativeIsoCode: 'LOL' }; + describe('More Controller', function() { var ctrl; beforeEach(inject(function($controller, $rootScope) {