Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Added support for force save errors.

Browse source
This commit is contained in:
Julia Radzhabova 2018-01-26 15:39:21 +03:00
parent d3f81b3dfb
commit b3499e7361
6 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/documenteditor/main/app/controller/Main.js
View file

@ -1365,6 +1365,15 @@ define([
config.msg = this.errorBadImageUrl;
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:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@ -1420,7 +1429,8 @@ define([
}, this);
}
Common.UI.alert(config);
if (id !== Asc.c_oAscError.ID.ForceSaveTimeout)
Common.UI.alert(config);
Common.component.Analytics.trackEvent('Internal Error', id.toString());
},
@ -2223,7 +2233,8 @@ define([
txtSameAsPrev: "Same as Previous",
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.',
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 || {}))
});

1
apps/documenteditor/main/locale/en.json
View file

@ -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.warnProcessRightsChange": "You have been denied the right to edit the file.",
"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.textTrackChanges": "The document is opened with the Track Changes mode enabled",
"DE.Controllers.Statusbar.tipReview": "Track changes",

15
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1104,6 +1104,15 @@ define([
config.msg = this.errorBadImageUrl;
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:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@ -1157,7 +1166,8 @@ define([
}, this);
}
Common.UI.alert(config);
if (id !== Asc.c_oAscError.ID.ForceSaveTimeout)
Common.UI.alert(config);
Common.component.Analytics.trackEvent('Internal Error', id.toString());
},
@ -1990,7 +2000,8 @@ define([
saveTextText: 'Saving document...',
txtLoading: 'Loading...',
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 || {}))
});

1
apps/presentationeditor/main/locale/en.json
View file

@ -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.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.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.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",

14
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1271,6 +1271,15 @@ define([
config.msg = this.errorLockedCellPivot;
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:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@ -1307,7 +1316,7 @@ define([
}, 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.component.Analytics.trackEvent('Internal Error', id.toString());
}
@ -2177,7 +2186,8 @@ define([
txtStyle_Currency: 'Currency',
txtStyle_Percent: 'Percent',
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 || {}))
});

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -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.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.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.textWarning": "Warning",
"SSE.Controllers.Print.warnCheckMargings": "Margins are incorrect",