keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix #369: removed additional webdav request

This commit is contained in:
antelle 2016-09-18 09:41:50 +03:00
parent b29e30cb1a
commit e0799a3488
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/scripts/models/app-model.js
View File

@ -357,17 +357,17 @@ var AppModel = Backbone.Model.extend({
} else if (!params.storage) {
logger.info('Open file from cache as main storage');
this.openFileFromCache(params, callback, fileInfo);
} else if (fileInfo && fileInfo.openDate && fileInfo.get('rev') === params.rev && fileInfo.get('storage') !== 'file') {
} else if (fileInfo && fileInfo.get('openDate') && fileInfo.get('rev') === params.rev && fileInfo.get('storage') !== 'file') {
logger.info('Open file from cache because it is latest');
this.openFileFromCache(params, callback, fileInfo);
} else if (!fileInfo || !fileInfo.openDate || params.storage === 'file') {
} else if (!fileInfo || !fileInfo.get('openDate') || params.storage === 'file') {
logger.info('Open file from storage', params.storage);
var storage = Storage[params.storage];
var storageLoad = () => {
logger.info('Load from storage');
storage.load(params.path, params.opts, (err, data, stat) => {
if (err) {
if (fileInfo && fileInfo.openDate) {
if (fileInfo && fileInfo.get('openDate')) {
logger.info('Open file from cache because of storage load error', err);
this.openFileFromCache(params, callback, fileInfo);
} else {

1
release-notes.md
View File

@ -2,6 +2,7 @@ Release notes
-------------
##### v1.3.3 (WIP)
`-` fix #368: desktop file save error
`-` fix #369: removed additional webdav request
##### v1.3.2 (2016-09-13)
`-` fix #342: url detection in Microsoft Edge