Merge branch 'release-1.1'

Gruntfile.js

@@ -240,7 +240,7 @@ module.exports = function(grunt) {
                 },
                 plugins: [
                     new webpack.optimize.CommonsChunkPlugin('vendor', 'vendor.js'),
-                    new webpack.BannerPlugin('keeweb v' + pkg.version + ', (c) 2015 ' + pkg.author +
+                    new webpack.BannerPlugin('keeweb v' + pkg.version + ', (c) 2015 ' + pkg.author.name +
                         ', opensource.org/licenses/' + pkg.license),
                     new webpack.optimize.OccurenceOrderPlugin(),
                     new webpack.ProvidePlugin({ _: 'underscore', $: 'jquery' }),
@@ -401,6 +401,7 @@ module.exports = function(grunt) {
                     info: {
                         arch: 'amd64',
                         targetDir: 'tmp/desktop',
+                        appName: 'KeeWeb',
                         scripts: {
                             postinst: 'package/deb/scripts/postinst'
                         }

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

app/scripts/util/locale.js

@@ -118,7 +118,8 @@ var Locale = {
     openDropHere: 'drop files here',
     openFailedRead: 'Failed to read file',
     openNothingFound: 'Nothing found',
-    openNothingFoundBody: 'No files which could be opened (files are searched inside {} folder).',
+    openNothingFoundBody: 'No files which could be opened.',
+    openNothingFoundBodyFolder: 'Files are searched inside {} folder',
     openAppFolder: 'app',
     openRootFolder: 'root',
     openSelectFile: 'Select a file',
@@ -286,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 {}.',

app/scripts/views/details/details-view.js

@@ -386,6 +386,7 @@ var DetailsView = Backbone.View.extend({
     },
 
     copyKeyPress: function(editView) {
+        if (this.isHidden()) { return; }
         if (!window.getSelection().toString()) {
             var fieldValue = editView.value;
             var fieldText = fieldValue && fieldValue.isProtected ? fieldValue.getText() : fieldValue;

app/scripts/views/open-view.js

@@ -535,9 +535,13 @@ var OpenView = Backbone.View.extend({
                 allStorageFiles[file.path] = file;
             });
             if (!buttons.length) {
+                var body = Locale.openNothingFoundBody;
+                if (dir) {
+                    body += ' ' + Locale.openNothingFoundBodyFolder.replace('{}', dir);
+                }
                 Alerts.error({
                     header: Locale.openNothingFound,
-                    body: Locale.openNothingFoundBody.replace('{}', dir)
+                    body: body
                 });
                 return;
             }

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

app/styles/base/_forms.scss

@@ -47,6 +47,7 @@ input[type=text], input[type=password], textarea, input:not([type]) {
   &::-ms-clear { display: none; }
 
   @include th {
+    color: text-color();
     background-color: background-color();
     border: base-border();
     box-shadow: form-box-shadow();

app/templates/settings/settings-general.hbs

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

bower.json

@@ -27,7 +27,7 @@
     "bourbon": "~4.2.5",
     "dropbox": "antelle/dropbox-js#0.10.6",
     "font-awesome": "~4.5.0",
-    "kdbxweb": "~0.3.10",
+    "kdbxweb": "~0.3.11",
     "normalize.css": "~4.0.0",
     "pikaday": "~1.4.0",
     "FileSaver.js": "eligrey/FileSaver.js",

electron/app.js

@@ -46,6 +46,7 @@ app.on('window-all-closed', function() {
     }
 });
 app.on('ready', function() {
+    setAppOptions();
     createMainWindow();
     setGlobalShortcuts();
 });
@@ -90,6 +91,10 @@ app.getMainWindow = function() {
     return mainWindow;
 };
 
+function setAppOptions() {
+    app.commandLine.appendSwitch('disable-background-timer-throttling');
+}
+
 function createMainWindow() {
     mainWindow = new BrowserWindow({
         show: false,

electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "KeeWeb",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "KeePass web app",
   "main": "main.js",
   "repository": "https://github.com/antelle/keeweb",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "keeweb",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Free cross-platform password manager compatible with KeePass",
   "main": "Gruntfile.js",
   "homepage": "https://keeweb.info",
@@ -20,7 +20,7 @@
     "grunt-contrib-clean": "^1.0.0",
     "grunt-contrib-compress": "^1.2.0",
     "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-deb": "github:antelle/grunt-contrib-deb#01300ea",
+    "grunt-contrib-deb": "github:antelle/grunt-contrib-deb#ddb2ef4",
     "grunt-contrib-jshint": "^1.0.0",
     "grunt-contrib-htmlmin": "^1.2.0",
     "grunt-contrib-uglify": "^1.0.1",

release-notes.md

@@ -1,5 +1,14 @@
 Release notes
 -------------
+
+##### v1.1.2 (2016-04-10)
+Hotfix  
+`+` option to try beta version in desktop app  
+`-` fix notes field text color  
+`-` fix some console assertions  
+`-` fix message about not found files  
+`-` fix deletion to trash when there's no trash folder  
+
 ##### v1.1.1 (2016-04-07)
 Hotfix  
 `+` minimize app on linux