option to try beta version in desktop app

This commit is contained in:
antelle 2016-04-10 11:26:40 +03:00
parent df3d3a7209
commit 64a6124b86
5 changed files with 21 additions and 2 deletions

View File

@ -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',

View File

@ -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 {}.',

View File

@ -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;
}
}
});

View File

@ -122,6 +122,7 @@
{{#if devTools}}
<h2>{{res 'setGenAdvanced'}}</h2>
<a class="settings__general-dev-tools-link">{{res 'setGenDevTools'}}</a>
<button class="btn-silent settings__general-dev-tools-link">{{res 'setGenDevTools'}}</button>
<button class="btn-silent settings__general-try-beta-link">{{res 'setGenTryBeta'}}</button>
{{/if}}
</div>

View File

@ -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