anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

do not trim output in debuging

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-07-13 13:21:47 -03:00
commit 460b65d9ea
1 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/js/routes.js
View file

@ -28,7 +28,7 @@ angular
var orig = $delegate[level]; var orig = $delegate[level];
$delegate[level] = function() { $delegate[level] = function() {
if (level=='error') if (level == 'error')
console.log(arguments); console.log(arguments);
var args = [].slice.call(arguments); var args = [].slice.call(arguments);
@ -43,9 +43,13 @@ angular
else else
v = JSON.stringify(v); v = JSON.stringify(v);
} }
v = v.toString(); // Trim output in mobile
if (v.length > 200) if ( window.cordova ) {
v = v.substr(0, 197) + '...'; v = v.toString();
if (v.length > 1000) {
v = v.substr(0, 997) + '...';
}
}
} catch (e) { } catch (e) {
console.log('Error at log decorator:', e); console.log('Error at log decorator:', e);
v = 'undefined'; v = 'undefined';
@ -85,7 +89,9 @@ angular
$scope.create = function(noWallet) { $scope.create = function(noWallet) {
$scope.creatingProfile = true; $scope.creatingProfile = true;
profileService.create({noWallet: noWallet}, function(err) { profileService.create({
noWallet: noWallet
}, function(err) {
if (err) { if (err) {
$scope.creatingProfile = false; $scope.creatingProfile = false;
$log.warn(err); $log.warn(err);
@ -100,7 +106,8 @@ angular
} }
} }
} }
}) });
$stateProvider $stateProvider
.state('disclaimer', { .state('disclaimer', {
url: '/disclaimer', url: '/disclaimer',
@ -111,14 +118,14 @@ angular
controller: function($scope, $timeout, storageService, applicationService, go) { controller: function($scope, $timeout, storageService, applicationService, go) {
storageService.getCopayDisclaimerFlag(function(err, val) { storageService.getCopayDisclaimerFlag(function(err, val) {
$scope.agreed = val; $scope.agreed = val;
$timeout(function(){ $timeout(function() {
$scope.$digest(); $scope.$digest();
}, 1); }, 1);
}); });
$scope.agree = function() { $scope.agree = function() {
storageService.setCopayDisclaimerFlag(function(err) { storageService.setCopayDisclaimerFlag(function(err) {
$timeout(function(){ $timeout(function() {
applicationService.restart(); applicationService.restart();
}, 1000); }, 1000);
}); });
@ -256,8 +263,8 @@ angular
}, },
} }
}) })
.state('preferencesAdvanced', { .state('preferencesAdvanced', {
url: '/preferencesAdvanced', url: '/preferencesAdvanced',
templateUrl: 'views/preferencesAdvanced.html', templateUrl: 'views/preferencesAdvanced.html',
walletShouldBeComplete: true, walletShouldBeComplete: true,
@ -438,10 +445,12 @@ angular
if (nodeWebkit.isDefined()) { if (nodeWebkit.isDefined()) {
var gui = require('nw.gui'); var gui = require('nw.gui');
var win = gui.Window.get(); var win = gui.Window.get();
var nativeMenuBar = new gui.Menu({ type: "menubar" }); var nativeMenuBar = new gui.Menu({
type: "menubar"
});
try { try {
nativeMenuBar.createMacBuiltin("Copay"); nativeMenuBar.createMacBuiltin("Copay");
} catch(e) { } catch (e) {
$log.debug('This is not OSX'); $log.debug('This is not OSX');
} }
win.menu = nativeMenuBar; win.menu = nativeMenuBar;
@ -516,7 +525,8 @@ angular
*/ */
function cleanUpLater(e, e2) { function cleanUpLater(e, e2) {
var cleanedUp = false, timeoutID; var cleanedUp = false,
timeoutID;
var cleanUp = function() { var cleanUp = function() {
if (cleanedUp) return; if (cleanedUp) return;
cleanedUp = true; cleanedUp = true;
@ -526,7 +536,7 @@ angular
cachedBackPanel = null; cachedBackPanel = null;
cachedTransitionState = ''; cachedTransitionState = '';
if (timeoutID) { if (timeoutID) {
timeoutID=null; timeoutID = null;
window.clearTimeout(timeoutID); window.clearTimeout(timeoutID);
} }
}; };
@ -551,7 +561,7 @@ angular
var fromName = fromState.name; var fromName = fromState.name;
var toName = toState.name; var toName = toState.name;
if (!fromName || !toName) if (!fromName || !toName)
return true; return true;
var fromWeight = pageWeight[fromName]; var fromWeight = pageWeight[fromName];
@ -569,7 +579,7 @@ angular
entering = 'CslideInRight'; entering = 'CslideInRight';
} }
// Vertical Slide Animation? // Vertical Slide Animation?
} else if (fromName && fromWeight >= 0 && toWeight >= 0) { } else if (fromName && fromWeight >= 0 && toWeight >= 0) {
if (toWeight) { if (toWeight) {
entering = 'CslideInUp'; entering = 'CslideInUp';
@ -577,7 +587,7 @@ angular
leaving = 'CslideOutDown'; leaving = 'CslideOutDown';
} }
// no Animation ? // no Animation ?
} else { } else {
return true; return true;
} }
@ -596,8 +606,8 @@ angular
} else { } else {
var sc; var sc;
// Keep prefDiv scroll // Keep prefDiv scroll
var contentDiv = e.getElementsByClassName('content'); var contentDiv = e.getElementsByClassName('content');
if (contentDiv && contentDiv[0]) if (contentDiv && contentDiv[0])
sc = contentDiv[0].scrollTop; sc = contentDiv[0].scrollTop;
cachedBackPanel = e.cloneNode(true); cachedBackPanel = e.cloneNode(true);
@ -606,7 +616,7 @@ angular
c.appendChild(cachedBackPanel); c.appendChild(cachedBackPanel);
if (sc) if (sc)
cachedBackPanel.getElementsByClassName('content')[0].scrollTop = sc; cachedBackPanel.getElementsByClassName('content')[0].scrollTop = sc;
cachedTransitionState = desiredTransitionState; cachedTransitionState = desiredTransitionState;
//console.log('CACHing animation', cachedTransitionState); //console.log('CACHing animation', cachedTransitionState);