1
0
mirror of https://github.com/keeweb/keeweb.git synced 2024-06-26 07:39:04 +02:00

Merge branch 'release-1.1' into develop

This commit is contained in:
antelle 2016-04-10 09:46:45 +03:00
commit e07055f7df
4 changed files with 10 additions and 2 deletions

View File

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

View File

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

View File

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

View File

@ -4,6 +4,8 @@ Release notes
##### v1.1.2 (2016-04-*)
Hotfix
`-` fix notes field text color
`-` fix some console assertions
`-` fix message about not found files
##### v1.1.1 (2016-04-07)
Hotfix