From 64a6124b86583c743843b45f5760576c53d961a1 Mon Sep 17 00:00:00 2001 From: antelle Date: Sun, 10 Apr 2016 11:26:40 +0300 Subject: [PATCH] option to try beta version in desktop app --- app/scripts/const/links.js | 1 + app/scripts/util/locale.js | 3 +++ .../views/settings/settings-general-view.js | 15 ++++++++++++++- app/templates/settings/settings-general.hbs | 3 ++- release-notes.md | 1 + 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/scripts/const/links.js b/app/scripts/const/links.js index 2096e496..f1a3137d 100644 --- a/app/scripts/const/links.js +++ b/app/scripts/const/links.js @@ -4,6 +4,7 @@ var Links = { Repo: 'https://github.com/antelle/keeweb', Desktop: 'https://github.com/antelle/keeweb/releases/latest', WebApp: 'https://app.keeweb.info', + BetaWebApp: 'https://beta.keeweb.info', License: 'https://github.com/antelle/keeweb/blob/master/LICENSE.txt', LicenseApache: 'https://opensource.org/licenses/Apache-2.0', UpdateDesktop: 'https://github.com/antelle/keeweb/releases/download/v{ver}/UpdateDesktop.zip', diff --git a/app/scripts/util/locale.js b/app/scripts/util/locale.js index 2b63f1d9..f31a89d2 100644 --- a/app/scripts/util/locale.js +++ b/app/scripts/util/locale.js @@ -287,6 +287,9 @@ var Locale = { setGenStorage: 'Storage', setGenAdvanced: 'Advanced', setGenDevTools: 'Show dev tools', + setGenTryBeta: 'Try beta version for one time', + setGenTryBetaWarning: 'Unsaved files', + setGenTryBetaWarningBody: 'Please save all files and click this button again', setFilePath: 'File path', setFileStorage: 'This file is opened from {}.', diff --git a/app/scripts/views/settings/settings-general-view.js b/app/scripts/views/settings/settings-general-view.js index 02d2a5da..d82aef3d 100644 --- a/app/scripts/views/settings/settings-general-view.js +++ b/app/scripts/views/settings/settings-general-view.js @@ -8,6 +8,7 @@ var Backbone = require('backbone'), AppSettingsModel = require('../../models/app-settings-model'), UpdateModel = require('../../models/update-model'), RuntimeInfo = require('../../comp/runtime-info'), + Alerts = require('../../comp/alerts'), Storage = require('../../storage'), FeatureDetector = require('../../util/feature-detector'), Locale = require('../../util/locale'), @@ -34,7 +35,8 @@ var SettingsGeneralView = Backbone.View.extend({ 'click .settings__general-download-update-btn': 'downloadUpdate', 'click .settings__general-update-found-btn': 'installFoundUpdate', 'change .settings__general-prv-check': 'changeStorageEnabled', - 'click .settings__general-dev-tools-link': 'openDevTools' + 'click .settings__general-dev-tools-link': 'openDevTools', + 'click .settings__general-try-beta-link': 'tryBeta' }, views: {}, @@ -260,6 +262,17 @@ var SettingsGeneralView = Backbone.View.extend({ if (Launcher) { Launcher.openDevTools(); } + }, + + tryBeta: function() { + if (this.appModel.files.hasUnsavedFiles()) { + Alerts.info({ + header: Locale.setGenTryBetaWarning, + body: Locale.setGenTryBetaWarningBody + }); + } else { + location.href = Links.BetaWebApp; + } } }); diff --git a/app/templates/settings/settings-general.hbs b/app/templates/settings/settings-general.hbs index 8ea1c697..5f593d24 100644 --- a/app/templates/settings/settings-general.hbs +++ b/app/templates/settings/settings-general.hbs @@ -122,6 +122,7 @@ {{#if devTools}}

{{res 'setGenAdvanced'}}

- {{res 'setGenDevTools'}} + + {{/if}} diff --git a/release-notes.md b/release-notes.md index 96ea5324..e91ead25 100644 --- a/release-notes.md +++ b/release-notes.md @@ -3,6 +3,7 @@ Release notes ##### v1.1.2 (2016-04-*) Hotfix +`+` option to try beta version in desktop app `-` fix notes field text color `-` fix some console assertions `-` fix message about not found files