Skip to content

Commit

Permalink
feat(text): add strings for map export IE notice
Browse files Browse the repository at this point in the history
Signed-off-by: Aleksuei Riabtsev <aleksuei.riabtsev@ec.gc.ca>
  • Loading branch information
AleksueiR committed Jul 6, 2015
1 parent e47cfc5 commit 6e6348a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/js/RAMP/Modules/imageExport.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,7 @@ define([
.call(function () { mapExportImg.attr("src", event.result.url); })
// animate popup; 2 needed to account for the border
.to(mapExportStretcher, transitionDuration, { height: stretcherHeight + 2, width: stretcherWidth + 2, ease: "easeOutCirc" }, 0)
.to(mapExportNoticeContainer, transitionDuration, { width: stretcherWidth - 15 }, 0)
//.to(mapExportNoticeContainer, transitionDuration, { width: stretcherWidth + 2 })
.to(mapExportNoticeContainer, transitionDuration, { width: stretcherWidth }, 0)
;

console.log(event);
Expand Down Expand Up @@ -235,8 +234,7 @@ define([
.attr('aria-disabled', false)
.on('click', generateExportImage);

mapExportNoticeContainer.css({ width: mapExportStretcher.width() - 15 });
//mapExportNoticeContainer.css({ width: mapExportStretcher.width() + 2 });
mapExportNoticeContainer.css({ width: mapExportStretcher.width() - 2 });

// disable for IE9 and IE10
// IE10 does not support CORS for canvases: http://stackoverflow.com/questions/18112047/canvas-todataurl-working-in-all-browsers-except-ie10; http://stackoverflow.com/questions/16956295/ie10-and-cross-origin-resource-sharing-cors-issues-with-image-canvas
Expand Down
4 changes: 4 additions & 0 deletions src/locales/en-CA/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,10 @@
"generalMessage": "Image cannot be generated. Please try again later.",
"generalTitle": "Error"
},
"ie": {
"generalMessage": "You have IE9... no CORS image manipulations for you.",
"generalTitle": "Warning"
},
"includeLegend": "Include Legend",
"loading": "Generating image. Please wait.",
"title": "Map Export"
Expand Down
4 changes: 4 additions & 0 deletions src/locales/fr-CA/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,10 @@
"generalMessage": "L’image ne peut être générée. Veuillez essayer de nouveau plus tard.",
"generalTitle": "Erreur"
},
"ie": {
"generalMessage": "[fr] You have IE9...",
"generalTitle": "[fr] Warning"
},
"includeLegend": "Ajouter la légende",
"loading": "Génération de l’image Veuillez attendre.",
"title": "Exportation de carte"
Expand Down

0 comments on commit 6e6348a

Please sign in to comment.