feat(ui): add export timeout error notice markup

Added extra markup to display a timeout error notice when the print service doesn't respond quickly. Just need to catch the error. Signed-off-by: Aleksuei Riabtsev <aleksuei.riabtsev@ec.gc.ca>
RAMP-PCAR · Jul 6, 2015 · 10a7686 · 10a7686
1 parent 5052936
commit 10a7686
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/site/includes/mapexport.hbs b/site/includes/mapexport.hbs
@@ -13,6 +13,10 @@
                             <h3>{{t "mapExport.error.generalTitle"}}</h3>
                             <p>{{t "mapExport.error.generalMessage"}}</p>
                         </section>
+                        <section class="map-export-notice notice-timeout alert alert-danger">
+                            <h3>{{t "mapExport.error.generalTitle"}}</h3>
+                            <p>{{t "mapExport.error.timeoutMessage"}}</p>
+                        </section>
                         <section class="map-export-notice notice-ie alert alert-warning">
                             <h3>{{t "mapExport.ie.generalTitle"}}</h3>
                             <p>{{t "mapExport.ie.generalMessage"}}</p>

diff --git a/src/js/RAMP/Modules/imageExport.js b/src/js/RAMP/Modules/imageExport.js
@@ -63,6 +63,7 @@ define([
                 mapExportNoticeContainer,
                 mapExportNotice,
                 mapExportNoticeIE,
+                mapExportNoticeTimeout,
                 downloadButton,
 
                 mapExportCloseButton,
@@ -158,7 +159,7 @@ define([
                                 }
                             });
                         }
-                        
+
                         // wait for the image to fully load
                         mapExportImg.on("load", function (event) {
 
@@ -212,10 +213,8 @@ define([
                     },
                     function (error) {
                         // show error notice
-                        tl
-                            .set(mapExportSpinner, { display: "none" })
-                            .set(mapExportNotice, { display: "block" })
-                        ;
+                        mapExportSpinner.css({ display: "none" });
+                        mapExportNotice.css({ display: "block" });
 
                         console.log(error);
                     }
@@ -241,6 +240,7 @@ define([
                     mapExportNoticeContainer = mapExportStretcher.find(".map-export-notice-container");
                     mapExportNotice = mapExportStretcher.find(".map-export-notice.notice-error");
                     mapExportNoticeIE = mapExportStretcher.find(".map-export-notice.notice-ie");
+                    mapExportNoticeTimeout = mapExportStretcher.find(".map-export-notice.notice-timeout");
                     downloadButton = $(".map-export-controls .download-buttons > .btn");
 
                     downloadDropdown = $(".map-export-controls .download-buttons .download-dropdown");

diff --git a/src/locales/en-CA/translation.json b/src/locales/en-CA/translation.json
@@ -563,10 +563,11 @@
         "downloadPNGdesc": "Download as PNG",
         "error": {
             "generalMessage": "Image cannot be generated. Please try again later.",
-            "generalTitle": "Error"
+            "generalTitle": "Error",
+            "timeoutMessage": "The print service did not respond in a timely fashion. Please try again later."
         },
         "ie": {
-            "generalMessage": "You have IE9... no CORS image manipulations for you.",
+            "generalMessage": "Exporting file-based user-added layers is unsupported in versions of Internet Explorer 10 or lower. Please upgrade your browser, or use an alternative.",
             "generalTitle": "Warning"
         },
         "includeLegend": "Include Legend",

diff --git a/src/locales/fr-CA/translation.json b/src/locales/fr-CA/translation.json
@@ -563,10 +563,11 @@
         "downloadPNGdesc": "Télécharger en PNG",
         "error": {
             "generalMessage": "L’image ne peut être générée. Veuillez essayer de nouveau plus tard.",
-            "generalTitle": "Erreur"
+            "generalTitle": "Erreur",
+            "timeoutMessage": "[fr] The print service did not respond in a timely fashion. Please try again later."
         },
         "ie": {
-            "generalMessage": "[fr] You have IE9...",
+            "generalMessage": "[fr] Exporting file-based user-added layers is unsupported in versions of Internet Explorer 10 or lower. Please upgrade your browser, or use an alternative.",
             "generalTitle": "[fr] Warning"
         },
         "includeLegend": "Ajouter la légende",