From 2d0b015521fc3a9b3a84a97a6871685bdd155b9f Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 20 Sep 2016 16:59:08 +0200
Subject: [PATCH] Improved editor autosave controls

---
 com.woltlab.wcf/templates/wysiwyg.tpl               |  2 ++
 wcfsetup/install/files/acp/templates/wysiwyg.tpl    |  2 ++
 .../js/WoltLabSuite/Core/Ui/Redactor/Autosave.js    | 13 +++++++++++--
 wcfsetup/install/lang/de.xml                        |  2 ++
 wcfsetup/install/lang/en.xml                        |  2 ++
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index 8d0a61da3e..2afb6a18e0 100644
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -54,6 +54,8 @@
 				'wcf.attachment.dragAndDrop.dropHere': '{lang}wcf.attachment.dragAndDrop.dropHere{/lang}',
 				'wcf.attachment.dragAndDrop.dropNow': '{lang}wcf.attachment.dragAndDrop.dropNow{/lang}',
 				
+				'wcf.editor.autosave.discard': '{lang}wcf.editor.autosave.discard{/lang}',
+				'wcf.editor.autosave.keep': '{lang}wcf.editor.autosave.keep{/lang}',
 				'wcf.editor.autosave.restored': '{lang}wcf.editor.autosave.restored{/lang}',
 				
 				'wcf.editor.code.edit': '{lang}wcf.editor.code.edit{/lang}',
diff --git a/wcfsetup/install/files/acp/templates/wysiwyg.tpl b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
index 8d0a61da3e..2afb6a18e0 100644
--- a/wcfsetup/install/files/acp/templates/wysiwyg.tpl
+++ b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
@@ -54,6 +54,8 @@
 				'wcf.attachment.dragAndDrop.dropHere': '{lang}wcf.attachment.dragAndDrop.dropHere{/lang}',
 				'wcf.attachment.dragAndDrop.dropNow': '{lang}wcf.attachment.dragAndDrop.dropNow{/lang}',
 				
+				'wcf.editor.autosave.discard': '{lang}wcf.editor.autosave.discard{/lang}',
+				'wcf.editor.autosave.keep': '{lang}wcf.editor.autosave.keep{/lang}',
 				'wcf.editor.autosave.restored': '{lang}wcf.editor.autosave.restored{/lang}',
 				
 				'wcf.editor.code.edit': '{lang}wcf.editor.code.edit{/lang}',
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Autosave.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Autosave.js
index fd51448f62..92194d42a5 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Autosave.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Autosave.js
@@ -149,7 +149,9 @@ define(['Language', 'Dom/Traverse'], function(Language, DomTraverse) {
 			container.appendChild(title);
 			
 			var button = elCreate('a');
+			button.className = 'jsTooltip';
 			button.href = '#';
+			button.title = Language.get('wcf.editor.autosave.keep');
 			button.innerHTML = '<span class="icon icon16 fa-check green"></span>';
 			button.addEventListener(WCF_CLICK_EVENT, (function (event) {
 				event.preventDefault();
@@ -159,7 +161,9 @@ define(['Language', 'Dom/Traverse'], function(Language, DomTraverse) {
 			container.appendChild(button);
 			
 			button = elCreate('a');
+			button.className = 'jsTooltip';
 			button.href = '#';
+			button.title = Language.get('wcf.editor.autosave.discard');
 			button.innerHTML = '<span class="icon icon16 fa-times red"></span>';
 			button.addEventListener(WCF_CLICK_EVENT, (function (event) {
 				event.preventDefault();
@@ -179,6 +183,13 @@ define(['Language', 'Dom/Traverse'], function(Language, DomTraverse) {
 			
 			this._editor.core.box()[0].appendChild(container);
 			
+			var callback = (function () {
+				this._editor.core.editor()[0].removeEventListener(WCF_CLICK_EVENT, callback);
+				
+				this.hideOverlay();
+			}).bind(this);
+			this._editor.core.editor()[0].addEventListener(WCF_CLICK_EVENT, callback);
+			
 			this._container = container;
 		},
 		
@@ -221,8 +232,6 @@ define(['Language', 'Dom/Traverse'], function(Language, DomTraverse) {
 				}));
 				
 				this._lastMessage = content;
-				
-				this.hideOverlay();
 			}
 			catch (e) {
 				window.console.warn("Unable to write to local storage: " + e.message);
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index ebf10f99de..05cb04f64b 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2350,6 +2350,8 @@ Fehler sind beispielsweise:
 		<item name="wcf.editor.alignment.left"><![CDATA[Linksbündig ausrichten]]></item>
 		<item name="wcf.editor.alignment.right"><![CDATA[Rechtsbündig ausrichten]]></item>
 		
+		<item name="wcf.editor.autosave.discard"><![CDATA[Verwerfen und Editor zurücksetzen]]></item>
+		<item name="wcf.editor.autosave.keep"><![CDATA[Hinweis ausblenden]]></item>
 		<item name="wcf.editor.autosave.restored"><![CDATA[Entwurf wiederhergestellt]]></item>
 		
 		<item name="wcf.editor.button.alignment"><![CDATA[Ausrichtung]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 6630e0800a..f17d37dddb 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2312,6 +2312,8 @@ Errors are:
 		<item name="wcf.editor.alignment.left"><![CDATA[Align left]]></item>
 		<item name="wcf.editor.alignment.right"><![CDATA[Align right]]></item>
 		
+		<item name="wcf.editor.autosave.discard"><![CDATA[Discard and revert editor]]></item>
+		<item name="wcf.editor.autosave.keep"><![CDATA[Hide notice]]></item>
 		<item name="wcf.editor.autosave.restored"><![CDATA[Draft restored]]></item>
 		
 		<item name="wcf.editor.button.alignment"><![CDATA[Alignment]]></item>
-- 
2.20.1