Moving caret back to selected node when documentCanvas is shown again

[fnpeditor.git] / modules / documentHistory / documentHistory.js

diff --git a/modules/documentHistory/documentHistory.js b/modules/documentHistory/documentHistory.js
index 0693469..d435617 100644 (file)
--- a/modules/documentHistory/documentHistory.js
+++ b/modules/documentHistory/documentHistory.js
@@ -1,9 +1,10 @@
 define([\r
 'libs/jquery-1.9.1.min',\r
 'libs/underscore-min',\r
 define([\r
 'libs/jquery-1.9.1.min',\r
 'libs/underscore-min',\r

+'./restoreDialog',\r

 'libs/text!./templates/main.html',\r
 'libs/text!./templates/item.html'\r
 'libs/text!./templates/main.html',\r
 'libs/text!./templates/item.html'\r

-], function($, _, mainTemplateSrc, itemTemplateSrc) {\r
+], function($, _, restoreDialog, mainTemplateSrc, itemTemplateSrc) {\r

 \r
 'use strict';\r
     \r
 \r
 'use strict';\r
     \r


@@ -20,6 +21,19 @@ return function(sandbox) {
         var selected = historyItems.getSelected();\r
         sandbox.publish('compare', selected[0], selected[1]);\r
     });\r
         var selected = historyItems.getSelected();\r
         sandbox.publish('compare', selected[0], selected[1]);\r
     });\r

+    \r
+    dom.find('.btn.restore').click(function(e) {\r
+        var dialog = restoreDialog.create();\r
+        dialog.on('restore', function(event) {\r
+            sandbox.publish('restoreVersion', {version: historyItems.getSelected()[0], description: event.data.description});\r
+            event.success();\r
+        });\r
+        dialog.show();\r
+    });\r
+    \r
+    dom.find('.btn.display').click(function(e) {\r
+        sandbox.publish('displayVersion', {version: historyItems.getSelected()[0]});\r
+    });\r

         \r
     var addHistoryItem = function(item, options) {\r
         historyItems.add(item);\r
         \r
     var addHistoryItem = function(item, options) {\r
         historyItems.add(item);\r


@@ -70,18 +84,18 @@ return function(sandbox) {
             var len = this._selected.length;\r
             if(len === 0) {\r
                 toggleButton('compare', false);\r
             var len = this._selected.length;\r
             if(len === 0) {\r
                 toggleButton('compare', false);\r

-                toggleButton('show2', false);\r
+                toggleButton('display', false);\r

                 toggleButton('restore', false);\r
             }\r
             if(len === 1) {\r
                 toggleButton('compare', false);\r
                 toggleButton('restore', false);\r
             }\r
             if(len === 1) {\r
                 toggleButton('compare', false);\r

-                toggleButton('show2', true);\r
+                toggleButton('display', true);\r

                 toggleButton('restore', true);\r
             }\r
             if(len === 2) {\r
                 toggleItemViews(false);\r
                 toggleButton('compare', true);\r
                 toggleButton('restore', true);\r
             }\r
             if(len === 2) {\r
                 toggleItemViews(false);\r
                 toggleButton('compare', true);\r

-                toggleButton('show2', false);\r
+                toggleButton('display', false);\r

                 toggleButton('restore', false);\r
             } else {\r
                 toggleItemViews(true);\r
                 toggleButton('restore', false);\r
             } else {\r
                 toggleItemViews(true);\r