From 4a6fca98bc366d085b2d8d9598ee02c51e856b96 Mon Sep 17 00:00:00 2001
From: Thaum Rystra <stefanzermatten@gmail.com>
Date: Mon, 10 Jul 2017 20:59:00 +0200
Subject: [PATCH] Cleaned up export dialog, fixed copying

---
 .../export/exportDialog/exportDialog.css      |  4 ++
 .../export/exportDialog/exportDialog.html     | 44 ++++++++++---------
 .../export/exportDialog/exportDialog.js       | 25 ++++++++---
 3 files changed, 47 insertions(+), 26 deletions(-)
 create mode 100644 rpg-docs/client/views/character/export/exportDialog/exportDialog.css

diff --git a/rpg-docs/client/views/character/export/exportDialog/exportDialog.css b/rpg-docs/client/views/character/export/exportDialog/exportDialog.css
new file mode 100644
index 000000000..5a7016869
--- /dev/null
+++ b/rpg-docs/client/views/character/export/exportDialog/exportDialog.css
@@ -0,0 +1,4 @@
+.exportDialog .iiexport {
+	overflow-y: auto;
+	width: 100% !important;
+}
diff --git a/rpg-docs/client/views/character/export/exportDialog/exportDialog.html b/rpg-docs/client/views/character/export/exportDialog/exportDialog.html
index 4f575ed16..78ba88a91 100644
--- a/rpg-docs/client/views/character/export/exportDialog/exportDialog.html
+++ b/rpg-docs/client/views/character/export/exportDialog/exportDialog.html
@@ -1,26 +1,28 @@
 <template name="exportDialog">
-	<div class="fit layout vertical">
+	<div class="exportDialog fit layout vertical">
 		{{#with character}}
-			<app-header-layout has-scrolling-region class="export flex">
-				<app-header fixed effects="waterfall">
-					<app-toolbar>
-					  <div main-title>Export Character to Improved Initiative</div>
-					</app-toolbar>
-				</app-header>
-				<div class="form flex layout vertical">
-					<paper-toggle-button id="exportFeatures" checked={{settings.exportFeatures}}>
-						Features
-					</paper-toggle-button>
-					<paper-toggle-button id="exportAttacks" checked={{settings.exportAttacks}}>
-						Attacks
-					</paper-toggle-button>
-					<paper-toggle-button id="exportDescription" checked={{settings.exportDescription}}>
-						Description
-					</paper-toggle-button>
-					<paper-textarea class="flex iiexport" label="JSON" value={{improvedInitiativeJson}}></paper-textarea>
-					<paper-button id="copyExportButton" class="red-button" raised>Copy to Clipboard</paper-button>
-				</div>
-			</app-header-layout>
+			<app-header fixed effects="waterfall">
+				<app-toolbar>
+				  <div main-title>Export Character to Improved Initiative</div>
+				</app-toolbar>
+			</app-header>
+			<div class="form flex layout vertical">
+				<paper-toggle-button id="exportFeatures" checked={{settings.exportFeatures}}>
+					Features
+				</paper-toggle-button>
+				<paper-toggle-button id="exportAttacks" checked={{settings.exportAttacks}}>
+					Attacks
+				</paper-toggle-button>
+				<paper-toggle-button id="exportDescription" checked={{settings.exportDescription}}>
+					Description
+				</paper-toggle-button>
+				<div class="paper-font-title padded">JSON</div>
+				<textarea class="flex iiexport">{{improvedInitiativeJson}}</textarea>
+				<paper-button id="copyExportButton" class="red-button" raised>
+					<iron-icon icon="content-copy"></iron-icon>
+					Copy to Clipboard
+				</paper-button>
+			</div>
 			<div class="buttons layout horizontal end-justified">
 				<paper-button class="doneButton"> Done </paper-button>
 			</div>
diff --git a/rpg-docs/client/views/character/export/exportDialog/exportDialog.js b/rpg-docs/client/views/character/export/exportDialog/exportDialog.js
index e961c33d4..cd3b4ffb9 100644
--- a/rpg-docs/client/views/character/export/exportDialog/exportDialog.js
+++ b/rpg-docs/client/views/character/export/exportDialog/exportDialog.js
@@ -30,16 +30,31 @@ Template.exportDialog.events({
 	},
 	"click #copyExportButton": function(event, template){
 		var copyTextarea = template.find(".iiexport");
-		copyTextarea && copyTextarea.select();
+		copyTextarea.select();
+		var msg;
 		try {
 			var successful = document.execCommand("copy");
-			var msg = successful ? "successful" : "unsuccessful";
-			console.log("Copying text command was " + msg);
+			var msg = successful ? "JSON copied to clipboard" : "Unable to copy JSON";
 		} catch (err) {
-			console.log("Oops, unable to copy");
+			msg = "Unable to copy JSON";
+		} finally {
+			clearSelection();
+			GlobalUI.toast(msg);
 		}
 	},
 	"click .doneButton": function(event, instance){
 		popDialogStack();
 	},
-})
+});
+
+var clearSelection = function(){
+	if (window.getSelection) {
+		if (window.getSelection().empty) {  // Chrome
+			window.getSelection().empty();
+		} else if (window.getSelection().removeAllRanges) {  // Firefox
+			window.getSelection().removeAllRanges();
+		}
+	} else if (document.selection) {  // IE?
+		document.selection.empty();
+	}
+};