Merge branch 'develop' into fix/styling-esri-directions-print-button

cmv · Dec 18, 2016 · 4051352 · 4051352
2 parents 8544b24 + 5276b6c
commit 4051352
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/viewer/js/gis/dijit/Print.js b/viewer/js/gis/dijit/Print.js
@@ -12,6 +12,7 @@ define([
     'dojo/dom-style',
     'dojo/dom-construct',
     'dojo/dom-class',
+    'dojo/date/locale',
     'dojo/text!./Print/templates/Print.html',
     'dojo/text!./Print/templates/PrintResult.html',
     'esri/tasks/PrintTemplate',
@@ -31,7 +32,7 @@ define([
     'dijit/TooltipDialog',
     'dijit/form/RadioButton',
     'xstyle/css!./Print/css/Print.css'
-], function (declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, PrintTask, Memory, lang, array, topic, Style, domConstruct, domClass, printTemplate, printResultTemplate, PrintTemplate, PrintParameters, esriRequest, urlUtils, i18n) {
+], function (declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, PrintTask, Memory, lang, array, topic, Style, domConstruct, domClass, locale, printTemplate, printResultTemplate, PrintTemplate, PrintParameters, esriRequest, urlUtils, i18n) {
 
     // Print result dijit
     var PrintResultDijit = declare([_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
@@ -40,6 +41,8 @@ define([
         i18n: i18n,
         url: null,
         fileHandle: null,
+        resultOrder: 'last', // first or last
+
         postCreate: function () {
             this.inherited(arguments);
             this.fileHandle.then(lang.hitch(this, '_onPrintComplete'), lang.hitch(this, '_onPrintError'));
@@ -229,9 +232,9 @@ define([
                     count: this.count.toString(),
                     icon: (form.format === 'PDF') ? this.pdfIcon : this.imageIcon,
                     docName: form.title,
-                    title: form.format + ', ' + form.layout,
+                    title: form.format + ', ' + form.layout + ', ' + locale.format(new Date(), {formatLength: 'short'}),
                     fileHandle: fileHandle
-                }).placeAt(this.printResultsNode, 'last');
+                }).placeAt(this.printResultsNode, this.resultOrder);
 
                 if (this.printTask.async) {
                     result.own(this.printTask.printGp.on('status-update', lang.hitch(result, '_handleStatusUpdate')));