[Embedded][Forms] Fix Bug 54104

apps/documenteditor/embed/js/ApplicationController.js

@@ -121,6 +121,7 @@ DE.ApplicationController = new(function(){
             docInfo.put_Format(docConfig.fileType);
             docInfo.put_VKey(docConfig.vkey);
             docInfo.put_UserInfo(_user);
+            docInfo.put_CallbackUrl(config.callbackUrl);
             docInfo.put_Token(docConfig.token);
             docInfo.put_Permissions(_permissions);
             docInfo.put_EncryptedInfo(config.encryptionKeys);
@@ -693,6 +694,10 @@ DE.ApplicationController = new(function(){
                 message = me.convertationErrorText;
                 break;
 
+            case Asc.c_oAscError.ID.ConvertationOpenError:
+                message = me.openErrorText;
+                break;
+
             case Asc.c_oAscError.ID.DownloadError:
                 message = me.downloadErrorText;
                 break;
@@ -945,6 +950,7 @@ DE.ApplicationController = new(function(){
         txtEmpty: '(Empty)',
         txtPressLink: 'Press Ctrl and click link',
         errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.',
-        errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.'
+        errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.',
+        openErrorText: 'An error has occurred while opening the file'
     }
 })();

apps/documenteditor/embed/locale/en.json

@@ -38,6 +38,7 @@
   "DE.ApplicationController.unknownErrorText": "Unknown error.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
   "DE.ApplicationController.waitText": "Please, wait...",
+  "DE.ApplicationController.openErrorText": "An error has occurred while opening the file.",
   "DE.ApplicationView.txtDownload": "Download",
   "DE.ApplicationView.txtDownloadDocx": "Download as docx",
   "DE.ApplicationView.txtDownloadPdf": "Download as pdf",

apps/documenteditor/forms/app/controller/ApplicationController.js

@@ -189,6 +189,10 @@ define([
                     config.msg = this.convertationErrorText;
                     break;
 
+                case Asc.c_oAscError.ID.ConvertationOpenError:
+                    config.msg = this.openErrorText;
+                    break;
+
                 case Asc.c_oAscError.ID.DownloadError:
                     config.msg = this.downloadErrorText;
                     break;
@@ -1535,7 +1539,8 @@ define([
         txtArt: 'Your text here',
         txtChoose: 'Choose an item',
         txtEnterDate: 'Enter a date',
-        txtClickToLoad: 'Click to load image'
+        txtClickToLoad: 'Click to load image',
+        openErrorText: 'An error has occurred while opening the file'
 
     }, DE.Controllers.ApplicationController));
 

apps/documenteditor/forms/locale/en.json

@@ -112,6 +112,7 @@
   "DE.Controllers.ApplicationController.txtClickToLoad": "Click to load image",
   "DE.Controllers.ApplicationController.txtArt": "Your text here",
   "DE.Controllers.ApplicationController.txtEnterDate": "Enter a date",
+  "DE.Controllers.ApplicationController.openErrorText": "An error has occurred while opening the file.",
   "DE.Views.ApplicationView.textClear": "Clear All Fields",
   "DE.Views.ApplicationView.textCopy": "Copy",
   "DE.Views.ApplicationView.textCut": "Cut",

apps/presentationeditor/embed/js/ApplicationController.js

@@ -119,6 +119,7 @@ PE.ApplicationController = new(function(){
             docInfo.put_Format(docConfig.fileType);
             docInfo.put_VKey(docConfig.vkey);
             docInfo.put_UserInfo(_user);
+            docInfo.put_CallbackUrl(config.callbackUrl);
             docInfo.put_Token(docConfig.token);
             docInfo.put_Permissions(_permissions);
             docInfo.put_EncryptedInfo(config.encryptionKeys);
@@ -538,6 +539,10 @@ PE.ApplicationController = new(function(){
                 message = me.convertationErrorText;
                 break;
 
+            case Asc.c_oAscError.ID.ConvertationOpenError:
+                message = me.openErrorText;
+                break;
+
             case Asc.c_oAscError.ID.DownloadError:
                 message = me.downloadErrorText;
                 break;
@@ -740,6 +745,7 @@ PE.ApplicationController = new(function(){
         textAnonymous: 'Anonymous',
         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.",
         errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.',
-        errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.'
+        errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.',
+        openErrorText: 'An error has occurred while opening the file'
     }
 })();

apps/presentationeditor/embed/locale/en.json

@@ -28,6 +28,7 @@
   "PE.ApplicationController.unknownErrorText": "Unknown error.",
   "PE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
   "PE.ApplicationController.waitText": "Please, wait...",
+  "PE.ApplicationController.openErrorText": "An error has occurred while opening the file.",
   "PE.ApplicationView.txtDownload": "Download",
   "PE.ApplicationView.txtEmbed": "Embed",
   "PE.ApplicationView.txtFileLocation": "Open file location",

apps/spreadsheeteditor/embed/js/ApplicationController.js

@@ -119,6 +119,7 @@ SSE.ApplicationController = new(function(){
             docInfo.put_Format(docConfig.fileType);
             docInfo.put_VKey(docConfig.vkey);
             docInfo.put_UserInfo(_user);
+            docInfo.put_CallbackUrl(config.callbackUrl);
             docInfo.put_Token(docConfig.token);
             docInfo.put_Permissions(_permissions);
             docInfo.put_EncryptedInfo(config.encryptionKeys);
@@ -449,6 +450,10 @@ SSE.ApplicationController = new(function(){
                 message = me.convertationErrorText;
                 break;
 
+            case Asc.c_oAscError.ID.ConvertationOpenError:
+                message = me.openErrorText;
+                break;
+
             case Asc.c_oAscError.ID.DownloadError:
                 message = me.downloadErrorText;
                 break;
@@ -689,6 +694,7 @@ SSE.ApplicationController = new(function(){
         textAnonymous: 'Anonymous',
         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.",
         errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.',
-        errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.'
+        errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.',
+        openErrorText: 'An error has occurred while opening the file'
     }
 })();

apps/spreadsheeteditor/embed/locale/en.json

@@ -28,6 +28,7 @@
   "SSE.ApplicationController.unknownErrorText": "Unknown error.",
   "SSE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
   "SSE.ApplicationController.waitText": "Please, wait...",
+  "SSE.ApplicationController.openErrorText": "An error has occurred while opening the file.",
   "SSE.ApplicationView.txtDownload": "Download",
   "SSE.ApplicationView.txtEmbed": "Embed",
   "SSE.ApplicationView.txtFileLocation": "Open file location",