Skip to content
Permalink
Browse files

10.4.6 release

  • Loading branch information...
alderg committed Mar 14, 2019
1 parent 7a1ee7a commit 308727d218299119eabea5da7398cd1a9ee36806
@@ -1,3 +1,10 @@
14-MAR-2019: 10.4.6

- Adds warning dialog for failed autosave after 10 minutes
- Improves error logging in Google Drive client
- Improves error handling for auto conversion
- Fixes shadow for PNG export in dark mode

13-MAR-2019: 10.4.5

- Fixes bug in Confluence cloud
@@ -1 +1 @@
10.4.5
10.4.6
@@ -1,7 +1,7 @@
CACHE MANIFEST

# THIS FILE WAS GENERATED. DO NOT MODIFY!
# 03/13/2019 01:31 PM
# 03/14/2019 11:48 AM

app.html
index.html?offline=1

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -25,7 +25,7 @@ App = function(editor, container, lightbox)

if (file != null && file.constructor == DriveFile && file.isModified() && this.drive != null)
{
EditorUi.logEvent({category: 'DISCARD-SAVE-GOOGLE-' + file.getId() + '.' +
EditorUi.logEvent({category: 'DISCARD-SAVE-FILE-' + file.getHash() + '.' +
file.desc.headRevisionId + '.' + file.desc.modifiedDate,
action: 'time-' + new Date().toISOString() + '-saved-' +
((file.lastSaved != null) ? file.lastSaved.toISOString() : 'never'),
@@ -1195,7 +1195,7 @@ App.prototype.init = function()
var timeoutThread = window.setTimeout(mxUtils.bind(this, function()
{
acceptResponse = false;
EditorUi.logEvent({category: 'Cache', action: 'alive', label: 408});
EditorUi.logEvent({category: 'TIMEOUT-CACHE-CHECK', action: 'timeout', label: 408});
}), this.timeout);

var t0 = new Date().getTime();
@@ -1206,7 +1206,7 @@ App.prototype.init = function()

if (acceptResponse)
{
EditorUi.logEvent({category: 'Cache', action: 'alive', label:
EditorUi.logEvent({category: 'ALIVE-CACHE-CHECK', action: 'alive', label:
req.getStatus() + '.' + (new Date().getTime() - t0)});
}
}));
@@ -2128,14 +2128,7 @@ App.prototype.load = function()
if (urlParams['convert-realtime'] == '1')
{
this.spinner.stop();

this.confirm('You are about to convert realtime files', mxUtils.bind(this, function()
{
this.drive.convertRealtimeFiles();
}), mxUtils.bind(this, function()
{
this.start();
}));
this.drive.convertRealtimeFiles();
}
else
{
@@ -89,6 +89,22 @@ DrawioFile.prototype.autosaveThread = null;
*/
DrawioFile.prototype.lastAutosave = null;

/**
* Stores the timestamp for hte last autosave.
*/
DrawioFile.prototype.lastSaved = null;

/**
* Stores the timestamp for hte last autosave.
*/
DrawioFile.prototype.lastWarned = null;

/**
* Interal to show dialog for unsaved data with autosave.
* Default is 600000 (10 minutes).
*/
DrawioFile.prototype.warnInterval = 600000;

/**
* Stores the modified state.
*/
@@ -490,8 +506,19 @@ DrawioFile.prototype.checksumError = function(error, patches, details, etag, fun
var user = this.getCurrentUser();
var uid = (user != null) ? user.id : 'unknown';

EditorUi.logError('Checksum Error in ' + functionName, null,
this.getMode() + '.' + this.getId(), uid);
EditorUi.logError('Checksum Error in ' + functionName + ' ' + this.getId(),
null, this.getMode() + '.' + this.getId(), uid);

// Logs checksum error for file
try
{
EditorUi.logEvent({category: 'CHECKSUM-ERROR-SYNC-FILE-' + this.getHash(),
action: functionName, label: uid});
}
catch (e)
{
// ignore
}
}
}
catch (e)
@@ -1576,6 +1603,42 @@ DrawioFile.prototype.handleFileError = function(err, manual)
mxUtils.htmlEntities(mxResources.get('error')) +
((msg != null) ? ' (' + mxUtils.htmlEntities(msg) + ')' : '') + '</div>');
}
else if (this.isModified() && !manual && this.isAutosave())
{
if (this.lastWarned == null)
{
this.lastWarned = Date.now();
}
else if (Date.now() - this.lastWarned > this.warnInterval)
{
var msg = '';

if (this.lastSaved != null)
{
var str = this.ui.timeSince(new Date(this.lastSaved));

// Only show if more than a minute ago
if (str != null)
{
msg = mxResources.get('lastSaved', [str]);
}
}

this.ui.showError(mxResources.get('unsavedChanges'), msg, mxResources.get('ignore'),
mxUtils.bind(this, function()
{
this.lastWarned = Date.now();
this.ui.hideDialog();
EditorUi.logEvent({category: 'IGNORE-WARN-SAVE-FILE-' + this.getHash(), action: 'ignore'});
}), null, mxResources.get('save'), mxUtils.bind(this, function()
{
this.lastWarned = Date.now();
this.ui.actions.get((this.ui.mode == null || !this.isEditable()) ?
'saveAs' : 'save').funct();
EditorUi.logEvent({category: 'SAVE-WARN-SAVE-FILE-' + this.getHash(), action: 'save'});
}), null, null, 360, 120);
}
}
}
}
};
@@ -1936,7 +1999,7 @@ DrawioFile.prototype.destroy = function()
var user = this.getCurrentUser();
var uid = (user != null) ? user.id : 'unknown';

EditorUi.logEvent({category: 'RT-END-' + DrawioFile.SYNC,
EditorUi.logEvent({category: DrawioFile.SYNC + '-DESTROY-FILE-' + DrawioFile.SYNC,
action: 'file-' + this.getId() +
'-mode-' + this.getMode() +
'-size-' + this.getSize() +
@@ -942,6 +942,17 @@ DrawioFileSync.prototype.merge = function(patches, checksum, desc, success, erro
this.file.patch(patches,
(DrawioFile.LAST_WRITE_WINS) ?
this.file.backupPatch : null);

// Logs successull patch
try
{
EditorUi.logEvent({category: 'PATCH-SYNC-FILE-' + this.file.getHash(),
action: 'DrawioFileSync.merge', label: this.clientId});
}
catch (e)
{
// ignore
}
}
}

@@ -1100,6 +1111,17 @@ DrawioFileSync.prototype.fileSaved = function(pages, lastDesc, success, error)
'from', etag, 'to', current, data.length,
'bytes', 'diff', diff, 'checksum', checksum);
}

// Logs successull diff
try
{
EditorUi.logEvent({category: 'DIFF-SYNC-FILE-' + this.file.getHash(),
action: 'DrawioFileSync.fileSaved', label: this.clientId});
}
catch (e)
{
// ignore
}
}
}

Oops, something went wrong.

0 comments on commit 308727d

Please sign in to comment.
You can’t perform that action at this time.