Added support for force save errors.
This commit is contained in:
parent
d3f81b3dfb
commit
b3499e7361
|
@ -1365,6 +1365,15 @@ define([
|
||||||
config.msg = this.errorBadImageUrl;
|
config.msg = this.errorBadImageUrl;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case Asc.c_oAscError.ID.ForceSaveButton:
|
||||||
|
config.msg = this.errorForceSave;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Asc.c_oAscError.ID.ForceSaveTimeout:
|
||||||
|
config.msg = this.errorForceSave;
|
||||||
|
console.warn(config.msg);
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
config.msg = this.errorDefaultMessage.replace('%1', id);
|
config.msg = this.errorDefaultMessage.replace('%1', id);
|
||||||
break;
|
break;
|
||||||
|
@ -1420,6 +1429,7 @@ define([
|
||||||
}, this);
|
}, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (id !== Asc.c_oAscError.ID.ForceSaveTimeout)
|
||||||
Common.UI.alert(config);
|
Common.UI.alert(config);
|
||||||
|
|
||||||
Common.component.Analytics.trackEvent('Internal Error', id.toString());
|
Common.component.Analytics.trackEvent('Internal Error', id.toString());
|
||||||
|
@ -2223,7 +2233,8 @@ define([
|
||||||
txtSameAsPrev: "Same as Previous",
|
txtSameAsPrev: "Same as Previous",
|
||||||
txtCurrentDocument: "Current Document",
|
txtCurrentDocument: "Current Document",
|
||||||
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
|
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
|
||||||
txtNoTableOfContents: "No table of contents entries found."
|
txtNoTableOfContents: "No table of contents entries found.",
|
||||||
|
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later."
|
||||||
}
|
}
|
||||||
})(), DE.Controllers.Main || {}))
|
})(), DE.Controllers.Main || {}))
|
||||||
});
|
});
|
|
@ -432,6 +432,7 @@
|
||||||
"DE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
|
"DE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
|
||||||
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
|
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
|
||||||
"DE.Controllers.Main.txtNoTableOfContents": "No table of contents entries found.",
|
"DE.Controllers.Main.txtNoTableOfContents": "No table of contents entries found.",
|
||||||
|
"DE.Controllers.Main.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
|
||||||
"DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
|
"DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
|
||||||
"DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
|
"DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
|
||||||
"DE.Controllers.Statusbar.tipReview": "Track changes",
|
"DE.Controllers.Statusbar.tipReview": "Track changes",
|
||||||
|
|
|
@ -1104,6 +1104,15 @@ define([
|
||||||
config.msg = this.errorBadImageUrl;
|
config.msg = this.errorBadImageUrl;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case Asc.c_oAscError.ID.ForceSaveButton:
|
||||||
|
config.msg = this.errorForceSave;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Asc.c_oAscError.ID.ForceSaveTimeout:
|
||||||
|
config.msg = this.errorForceSave;
|
||||||
|
console.warn(config.msg);
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
config.msg = this.errorDefaultMessage.replace('%1', id);
|
config.msg = this.errorDefaultMessage.replace('%1', id);
|
||||||
break;
|
break;
|
||||||
|
@ -1157,6 +1166,7 @@ define([
|
||||||
}, this);
|
}, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (id !== Asc.c_oAscError.ID.ForceSaveTimeout)
|
||||||
Common.UI.alert(config);
|
Common.UI.alert(config);
|
||||||
|
|
||||||
Common.component.Analytics.trackEvent('Internal Error', id.toString());
|
Common.component.Analytics.trackEvent('Internal Error', id.toString());
|
||||||
|
@ -1990,7 +2000,8 @@ define([
|
||||||
saveTextText: 'Saving document...',
|
saveTextText: 'Saving document...',
|
||||||
txtLoading: 'Loading...',
|
txtLoading: 'Loading...',
|
||||||
txtAddNotes: 'Click to add notes',
|
txtAddNotes: 'Click to add notes',
|
||||||
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.'
|
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
|
||||||
|
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later."
|
||||||
}
|
}
|
||||||
})(), PE.Controllers.Main || {}))
|
})(), PE.Controllers.Main || {}))
|
||||||
});
|
});
|
||||||
|
|
|
@ -363,6 +363,7 @@
|
||||||
"PE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
|
"PE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
|
||||||
"PE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
|
"PE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
|
||||||
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
|
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
|
||||||
|
"PE.Controllers.Main.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
|
||||||
"PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
|
"PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
|
||||||
"PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
|
"PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
|
||||||
"PE.Controllers.Toolbar.textAccent": "Accents",
|
"PE.Controllers.Toolbar.textAccent": "Accents",
|
||||||
|
|
|
@ -1271,6 +1271,15 @@ define([
|
||||||
config.msg = this.errorLockedCellPivot;
|
config.msg = this.errorLockedCellPivot;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case Asc.c_oAscError.ID.ForceSaveButton:
|
||||||
|
config.msg = this.errorForceSave;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Asc.c_oAscError.ID.ForceSaveTimeout:
|
||||||
|
config.msg = this.errorForceSave;
|
||||||
|
console.warn(config.msg);
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
config.msg = this.errorDefaultMessage.replace('%1', id);
|
config.msg = this.errorDefaultMessage.replace('%1', id);
|
||||||
break;
|
break;
|
||||||
|
@ -1307,7 +1316,7 @@ define([
|
||||||
}, this);
|
}, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($('.asc-window.modal.alert:visible').length < 1) {
|
if ($('.asc-window.modal.alert:visible').length < 1 && (id !== Asc.c_oAscError.ID.ForceSaveTimeout)) {
|
||||||
Common.UI.alert(config);
|
Common.UI.alert(config);
|
||||||
Common.component.Analytics.trackEvent('Internal Error', id.toString());
|
Common.component.Analytics.trackEvent('Internal Error', id.toString());
|
||||||
}
|
}
|
||||||
|
@ -2177,7 +2186,8 @@ define([
|
||||||
txtStyle_Currency: 'Currency',
|
txtStyle_Currency: 'Currency',
|
||||||
txtStyle_Percent: 'Percent',
|
txtStyle_Percent: 'Percent',
|
||||||
txtStyle_Comma: 'Comma',
|
txtStyle_Comma: 'Comma',
|
||||||
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.'
|
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
|
||||||
|
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later."
|
||||||
}
|
}
|
||||||
})(), SSE.Controllers.Main || {}))
|
})(), SSE.Controllers.Main || {}))
|
||||||
});
|
});
|
||||||
|
|
|
@ -479,6 +479,7 @@
|
||||||
"SSE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
|
"SSE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
|
||||||
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
|
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
|
||||||
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
|
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
|
||||||
|
"SSE.Controllers.Main.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
|
||||||
"SSE.Controllers.Print.strAllSheets": "All Sheets",
|
"SSE.Controllers.Print.strAllSheets": "All Sheets",
|
||||||
"SSE.Controllers.Print.textWarning": "Warning",
|
"SSE.Controllers.Print.textWarning": "Warning",
|
||||||
"SSE.Controllers.Print.warnCheckMargings": "Margins are incorrect",
|
"SSE.Controllers.Print.warnCheckMargings": "Margins are incorrect",
|
||||||
|
|
Loading…
Reference in a new issue