Skip to content

Commit

Permalink
fix(core): add map export image options back
Browse files Browse the repository at this point in the history 
Relates #10512
  • Loading branch information
@AleksueiR
AleksueiR committed Jun 11, 2015
1 parent 39e0971 commit 918e80f
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 52 deletions.
33 changes: 18 additions & 15 deletions site/includes/mapexport.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<section id="map-export-modal" class="mfp-hide modal-dialog modal-content overlay-def">

<div class="modal-body">
<div class="row">
<div class="map-export-preview">
Expand All @@ -15,31 +16,33 @@
</div>
<div class="map-export-controls">
<header>
<h2 class="mrgn-tp-sm mrgn-bttm-md h3">{{t "mapExport.title"}}</h2>
<h2 class="mrgn-tp-sm mrgn-bttm-sm page-header h3">{{t "mapExport.title"}}</h2>
</header>
<button class="button-none button-close _tooltip popup-modal-dismiss" title="{{t "gui.actions.close"}}">
<span class="wb-invisible">{{t "gui.actions.close"}}</span>
</button>
<div class="">
<!--<div class="checkbox">
<label>{{t "mapExport.includeLegend"}}<input type="checkbox" value="" /></label>
<label>{{t "mapExport.includeLegend"}}<input type="checkbox" value="" /></label>
</div>-->

<div class="download-buttons mrgn-tp-lg">
<!--<button class="btn btn-primary" type="button">
<i class="fa fa-download"></i><span class="on-right">{{t "mapExport.downloadImage"}}</span>
</button>-->
<a class="btn btn-primary" href="" target="_blank" download="">
<i class="fa fa-download"></i><span class="on-right">{{t "mapExport.downloadImage"}}</span>
</a>
<!--<button class="btn btn-primary" type="button">
<i class="fa fa-download"></i><span class="on-right">{{t "mapExport.downloadPNG"}}</span>
</button>-->
<!--<button class="btn btn-primary" type="button">
<i class="fa fa-download"></i><span class="on-right">{{t "mapExport.downloadJPG"}}</span>
</button>-->

<div class="btn-group open download-dropdown">
<a class="btn btn-primary download-default" href="#" target="_blank" download=""><i class="fa fa-download fa-fw on-left"></i>{{t "mapExport.downloadImage"}}</a>
<button class="btn btn-primary toggle" data-toggle="dropdown">
<span class="fa fa-caret-down"></span>
</button>
<ul class="dropdown-menu">
<li><a class="btn btn-none btn-download download-png" target="_blank" href="#" download=""><span class="fa fa-file-image-o fa-fw on-left"></span>{{t "mapExport.downloadPNG"}}</a></li>
<li><a class="btn btn-none btn-download download-jpg" target="_blank" href="#" download=""><span class="fa fa-file-image-o fa-fw on-left"></span>{{t "mapExport.downloadJPG"}}</a></li>
</ul>
</div>
</div>

</div>
</div>
</div>
</div>
</section>

</section>
33 changes: 15 additions & 18 deletions site/includes/mapexport_new.hbs → site/includes/mapexport_old.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<section id="map-export-modal" class="mfp-hide modal-dialog modal-content overlay-def">

<div class="modal-body">
<div class="row">
<div class="map-export-preview">
Expand All @@ -16,33 +15,31 @@
</div>
<div class="map-export-controls">
<header>
<h2 class="mrgn-tp-sm mrgn-bttm-sm page-header h3">{{t "mapExport.title"}}</h2>
<h2 class="mrgn-tp-sm mrgn-bttm-md h3">{{t "mapExport.title"}}</h2>
</header>
<button class="button-none button-close _tooltip popup-modal-dismiss" title="{{t "gui.actions.close"}}">
<span class="wb-invisible">{{t "gui.actions.close"}}</span>
</button>
<div class="">
<!--<div class="checkbox">
<label>{{t "mapExport.includeLegend"}}<input type="checkbox" value="" /></label>
<label>{{t "mapExport.includeLegend"}}<input type="checkbox" value="" /></label>
</div>-->

<div class="download-buttons mrgn-tp-lg">

<div class="btn-group open download-dropdown">
<a class="btn btn-primary download-default" href="#" target="_blank" download=""><i class="fa fa-download fa-fw on-left"></i>{{t "mapExport.downloadImage"}}</a>
<button class="btn btn-primary toggle" data-toggle="dropdown">
<span class="fa fa-caret-down"></span>
</button>
<ul class="dropdown-menu">
<li><a class="btn btn-none btn-download download-png" target="_blank" href="#" download=""><span class="fa fa-file-image-o fa-fw on-left"></span>{{t "mapExport.downloadPNG"}}</a></li>
<li><a class="btn btn-none btn-download download-jpg" target="_blank" href="#" download=""><span class="fa fa-file-image-o fa-fw on-left"></span>{{t "mapExport.downloadJPG"}}</a></li>
</ul>
</div>
<!--<button class="btn btn-primary" type="button">
<i class="fa fa-download"></i><span class="on-right">{{t "mapExport.downloadImage"}}</span>
</button>-->
<a class="btn btn-primary" href="" target="_blank" download="">
<i class="fa fa-download"></i><span class="on-right">{{t "mapExport.downloadImage"}}</span>
</a>
<!--<button class="btn btn-primary" type="button">
<i class="fa fa-download"></i><span class="on-right">{{t "mapExport.downloadPNG"}}</span>
</button>-->
<!--<button class="btn btn-primary" type="button">
<i class="fa fa-download"></i><span class="on-right">{{t "mapExport.downloadJPG"}}</span>
</button>-->
</div>

</div>
</div>
</div>
</div>

</section>
</section>
33 changes: 14 additions & 19 deletions src/js/RAMP/Modules/imageExport.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ define([
"esri/tasks/PrintTemplate", "esri/tasks/PrintParameters", "esri/tasks/PrintTask",

/* RAMP */
"ramp/eventManager", "ramp/map"
"ramp/eventManager", "ramp/map",

/* UTIL */

// "utils/util", "utils/popupManager"
"utils/util", "utils/popupManager"
],

function (
Expand All @@ -46,10 +46,10 @@ define([
PrintTemplate, PrintParameters, PrintTask,

/* RAMP */
EventManager, RampMap
EventManager, RampMap,

/* UTIL */
// MiscUtil, PopupManager
MiscUtil, PopupManager
) {
"use strict";

Expand All @@ -60,7 +60,7 @@ define([
mapExportSpinner,
mapExportNotice,
downloadButton,
/*

mapExportCloseButton,

downloadDropdownToggle,
Expand All @@ -73,11 +73,11 @@ define([
downloadButtonPNG,

downloadPopup,
*/

promise,

jWindow,
//cssButtonPressedClass = "button-pressed",
cssButtonPressedClass = "button-pressed",
transitionDuration = 0.4;

/**
Expand All @@ -100,8 +100,7 @@ define([
promise = result.promise;

tl
.call(function () { downloadButton.attr({ disabled: true, href: "" }); }) // disabled download button
/* .call(function () {
.call(function () {
downloadDropdown
.find(".btn")
.attr({ disabled: true })
Expand All @@ -112,7 +111,7 @@ define([

//downloadButtonPNG.attr({ disabled: true, href: "" });
//downloadButtonJPG.attr({ disabled: true, href: "" });
}) */
})
.set(mapExportNotice, { display: "none" }) // hide error notice
.set(mapExportSpinner, { display: "inline-block" }) // show loading animation
.set(mapExportImg, { display: "none" }) // hide image
Expand All @@ -122,7 +121,6 @@ define([

promise.then(
function (event) {
/*
mapExportImg.on("load", function (event) {
var canvas = MiscUtil.convertImageToCanvas(event.target),
dataPNG = "",
Expand All @@ -144,10 +142,9 @@ define([

mapExportImg.off("load");
});
*/

tl
.call(function () { downloadButton.attr({ disabled: false, href: event.result.url }); }) // enabled download button
//.call(function () { downloadButtonPNG.attr({ disabled: false, href: event.result.url }); })
.call(function () { downloadButtonPNG.attr({ disabled: false, href: event.result.url }); })
.set(mapExportSpinner, { display: "none" }) // hide loading animation
.set(mapExportImg, { display: "block" }) // show image
.call(function () { mapExportImg.attr("src", event.result.url); })
Expand Down Expand Up @@ -185,7 +182,7 @@ define([
mapExportSpinner = mapExportStretcher.find(".loading-simple");
mapExportNotice = mapExportStretcher.find(".map-export-notice");
downloadButton = $(".map-export-controls .download-buttons > .btn");
/*

downloadDropdown = $(".map-export-controls .download-buttons .download-dropdown");
downloadDropdownMenu = $(".map-export-controls .download-buttons .dropdown-menu");

Expand All @@ -195,13 +192,12 @@ define([
downloadDefault = downloadDropdown.find(".btn.download-default");

mapExportCloseButton = $("#map-export-modal .button-close");
*/


mapExportToggle
.removeClass('disabled')
.attr('aria-disabled', false)
.on('click', generateExportImage);
/*

downloadPopup = PopupManager.registerPopup(downloadDropdownToggle, "click",
function (d) {
downloadDropdownMenu.show();
Expand All @@ -226,7 +222,6 @@ define([

mapExportImg.attr("src", "");
});
*/
}
};
}()),
Expand Down

0 comments on commit 918e80f

Please sign in to comment.