[jspwiki] branch master updated: 2.10.5-git-07 : fix to plain haddock editor related to the new functionality to recover unsaved page edits

[br...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

brushed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


The following commit(s) were added to refs/heads/master by this push:
     new d2d57d6  2.10.5-git-07 : fix to plain haddock editor related to the new functionality to recover unsaved page edits
d2d57d6 is described below

commit d2d57d661b34af91325437291ad45812cf89b7a3
Author: brushed <di...@gmail.com>
AuthorDate: Mon Jul 9 21:19:17 2018 +0200

    2.10.5-git-07 : fix to plain haddock editor related to the new functionality to recover unsaved page edits
---
 ChangeLog                                                 | 15 +++++++++++++++
 jspwiki-war/src/main/java/org/apache/wiki/Release.java    |  2 +-
 .../src/main/webapp/templates/haddock/editors/plain.jsp   |  7 +++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9e4c6e8..af415e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2018-07-09  Dirk Frederickx (brushed AT apache DOT org)
+
+       * 2.10.5-git-07 : fix to plain haddock editor related to the new
+         functionality to recover unsaved page edits.
+
+         You can test this like so:
+         - open a page for edit in the haddock template
+         - make some changes to the page
+         - move to another page without saving (or close the browser tab)
+         - click LEAVE when the popup 'changes you made may not be saved' appears.
+         - reopen the page for edit
+         - you should now receive a new popup which allows you to restore or abandon
+           the unsaved changes
+
+
 2018-07-08  Juan Pablo Santos (juanpablo AT apache DOT org)
 
        * 2.10.5-git-06 : update bundled Apache Tomcat on portable JSPWiki to 7.0.90
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index 3cbc50a..f60386e 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "6";
+    public static final String     BUILD         = "7";
 
     /**
      *  This is the generic version string you should use when printing out the version.  It is of
diff --git a/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp b/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp
index fd9cce4..c1a6abc 100644
--- a/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp
+++ b/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp
@@ -92,6 +92,13 @@
 
   <div class="snipe">
 
+    <div class="localstorage modal">
+      <div class="modal-footer">
+        <button class="btn btn-success"><fmt:message key="editor.plain.localstorage.restore"/></button>
+        <button class="btn btn-danger"><fmt:message key="editor.plain.localstorage.delete"/></button>
+      </div>
+    </div>
+
     <div class="form-inline form-group sticky">
 
     <div class="form-inline form-group dropdown">