From 732c87699bd749cfa526798bcba72d27bd48becf Mon Sep 17 00:00:00 2001 From: Antelle Date: Wed, 4 Nov 2015 23:23:55 +0300 Subject: [PATCH] logging errors for devs --- .editorconfig | 3 +++ .jshintrc | 3 ++- app/scripts/comp/dropbox-link.js | 1 + app/scripts/comp/launcher.js | 1 + app/scripts/models/app-settings-model.js | 8 ++++++-- app/scripts/models/file-model.js | 2 ++ app/scripts/views/app-view.js | 1 + app/scripts/views/open-view.js | 1 + app/scripts/views/settings/settings-file-view.js | 1 + 9 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index 480f0272..25ef5727 100644 --- a/.editorconfig +++ b/.editorconfig @@ -19,5 +19,8 @@ trim_trailing_whitespace = false [*.json] indent_size = 2 +[.jshintrc] +indent_size = 2 + [*.scss] indent_size = 2 diff --git a/.jshintrc b/.jshintrc index e0b25059..083e6f6c 100644 --- a/.jshintrc +++ b/.jshintrc @@ -88,7 +88,8 @@ "globals" : { "require": true, "module": true, + "console": true, "$": true, "_": true } -} \ No newline at end of file +} diff --git a/app/scripts/comp/dropbox-link.js b/app/scripts/comp/dropbox-link.js index 19bc6bde..d4b10c38 100644 --- a/app/scripts/comp/dropbox-link.js +++ b/app/scripts/comp/dropbox-link.js @@ -74,6 +74,7 @@ var DropboxLink = { header: 'Dropbox Sync Error', body: 'Something went wrong during Dropbox sync. Please, try again later. Error: ' + err }); + console.error('Dropbox error', err); break; } callback(false); diff --git a/app/scripts/comp/launcher.js b/app/scripts/comp/launcher.js index 9a678195..e424835f 100644 --- a/app/scripts/comp/launcher.js +++ b/app/scripts/comp/launcher.js @@ -51,6 +51,7 @@ if (window.process && window.process.versions && window.process.versions.electro Backbone.trigger('launcher-open-file', path); }; if (window.launcherOpenedFile) { + console.log('Open file request', window.launcherOpenedFile); Backbone.trigger('launcher-open-file', window.launcherOpenedFile); delete window.launcherOpenedFile; } diff --git a/app/scripts/models/app-settings-model.js b/app/scripts/models/app-settings-model.js index d51c733d..f9d2a135 100644 --- a/app/scripts/models/app-settings-model.js +++ b/app/scripts/models/app-settings-model.js @@ -26,7 +26,9 @@ var AppSettingsModel = Backbone.Model.extend({ if (data) { this.set(data, {silent: true}); } - } catch (e) { /* TODO: log failed to load settings */ } + } catch (e) { + console.error('Error loading settings', e); + } }, save: function() { @@ -36,7 +38,9 @@ var AppSettingsModel = Backbone.Model.extend({ } else if (typeof localStorage !== 'undefined') { localStorage.appSettings = JSON.stringify(this.attributes); } - } catch (e) { /* TODO: log failed to save settings */ } + } catch (e) { + console.error('Error saving settings', e); + } } }); diff --git a/app/scripts/models/file-model.js b/app/scripts/models/file-model.js index fc251ed9..40849590 100644 --- a/app/scripts/models/file-model.js +++ b/app/scripts/models/file-model.js @@ -54,6 +54,7 @@ var FileModel = Backbone.Model.extend({ kdbxweb.Kdbx.load(fileData, credentials, (function(db, err) { if (err) { this.set({error: true, opening: false}); + console.error('Error opening file', err.code, err.message, err); } else { this.db = db; this.readModel(this.get('name')); @@ -61,6 +62,7 @@ var FileModel = Backbone.Model.extend({ } }).bind(this)); } catch (e) { + console.error('Error opening file', e, e.code, e.message, e); this.set({ error: true, opening: false }); } }, diff --git a/app/scripts/views/app-view.js b/app/scripts/views/app-view.js index 8dd52889..c4191c33 100644 --- a/app/scripts/views/app-view.js +++ b/app/scripts/views/app-view.js @@ -250,6 +250,7 @@ var AppView = Backbone.View.extend({ try { file.autoSave(); } catch (e) { + console.error('Failed to auto-save file', file.get('path'), e); fileId = file.cid; } } else if (!fileId) { diff --git a/app/scripts/views/open-view.js b/app/scripts/views/open-view.js index dc9fba9f..94c9865a 100644 --- a/app/scripts/views/open-view.js +++ b/app/scripts/views/open-view.js @@ -109,6 +109,7 @@ var OpenView = Backbone.View.extend({ }); this.views.openFile.setFile(file); } catch (e) { + console.log('Failed to show local file', e); } } } diff --git a/app/scripts/views/settings/settings-file-view.js b/app/scripts/views/settings/settings-file-view.js index 8eb75adb..6d4419b9 100644 --- a/app/scripts/views/settings/settings-file-view.js +++ b/app/scripts/views/settings/settings-file-view.js @@ -131,6 +131,7 @@ var SettingsAboutView = Backbone.View.extend({ AppSettingsModel.instance.set('lastOpenFile', path); } } catch (e) { + console.error('Error saving file', path, e); Alerts.error({ header: 'Save error', body: 'Error saving to file ' + path + ': \n' + e