Some code improvements suggested by linter

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

diff --git a/modules/documentHistory/documentHistory.js b/modules/documentHistory/documentHistory.js
index c90c879..2647ee3 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


@@ -12,84 +13,134 @@ return function(sandbox) {
     var dom = $(_.template(mainTemplateSrc)());\r
     var domNodes = {\r
         itemList: dom.find('.rng-module-documentHistory-itemsList'),\r
     var dom = $(_.template(mainTemplateSrc)());\r
     var domNodes = {\r
         itemList: dom.find('.rng-module-documentHistory-itemsList'),\r

-    }\r
+    };\r

     var itemViews = [];\r
     var itemViews = [];\r

+    \r
+    \r
+    dom.find('.btn.compare').click(function(e) {\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
         \r

-    var addHistoryItem = function(item) {\r
+    var addHistoryItem = function(item, options) {\r

         historyItems.add(item);\r
         var view = new itemView(item);\r
         itemViews.push(view);\r
         domNodes.itemList.prepend(view.dom);\r
         historyItems.add(item);\r
         var view = new itemView(item);\r
         itemViews.push(view);\r
         domNodes.itemList.prepend(view.dom);\r

-    }\r
+        if(options.animate) {\r
+            view.dom.hide().slideDown();\r
+        }\r
+    };\r

     \r
     var toggleItemViews = function(toggle) {\r
         itemViews.forEach(function(view) {\r
     \r
     var toggleItemViews = function(toggle) {\r
         itemViews.forEach(function(view) {\r

-            view.toggle(toggle);\r
+            if(!historyItems.isSelected(view.item))\r
+                view.toggle(toggle);\r

         });\r
         });\r

-    }\r
+    };\r
+    \r
+    var toggleButton = function(btn, toggle) {\r
+        dom.find('button.'+btn).toggleClass('disabled', !toggle);\r
+    };\r

     \r
     var historyItems = {\r
         _itemsById: {},\r
         _selected: [],\r
     \r
     var historyItems = {\r
         _itemsById: {},\r
         _selected: [],\r

-        select: function(id) {\r
+        select: function(item) {\r

             if(this._selected.length < 2) {\r
             if(this._selected.length < 2) {\r

-                this._selected.push(id);\r
-                if(this._selected.length === 2)\r
-                    toggleItemViews(false);\r
+                this._selected.push(item.version);\r
+                this._updateUI();\r

                 return true;\r
             }\r
             return false;\r
         },\r
         unselect: function(item) {\r
                 return true;\r
             }\r
             return false;\r
         },\r
         unselect: function(item) {\r

-            this._selected = _.without(this._selected, id);\r
-            if(this._selected.length < 2)\r
-                toggleItemViews(true);\r
+            this._selected = _.without(this._selected, item.version);\r
+            this._updateUI();\r

         },\r
         add: function(item) {\r
         },\r
         add: function(item) {\r

-            this._itemsById[item.id] = item;\r
+            this._itemsById[item.version] = item;\r
+        },\r
+        isSelected: function(item) {\r
+            return _.contains(this._selected, item.version);\r
+        },\r
+        getSelected: function() {\r
+            return this._selected;\r

         },\r
         },\r

-        selected: function(item) {\r
-            return _.contains(_selected, item.id);\r
+        _updateUI: function() {\r
+            var len = this._selected.length;\r
+            if(len === 0) {\r
+                toggleButton('compare', false);\r
+                toggleButton('display', false);\r
+                toggleButton('restore', false);\r
+            }\r
+            if(len === 1) {\r
+                toggleButton('compare', false);\r
+                toggleButton('display', true);\r
+                toggleButton('restore', true);\r
+            }\r
+            if(len === 2) {\r
+                toggleItemViews(false);\r
+                toggleButton('compare', true);\r
+                toggleButton('display', false);\r
+                toggleButton('restore', false);\r
+            } else {\r
+                toggleItemViews(true);\r
+            }\r

         }\r
     };\r
         }\r
     };\r

+    historyItems._updateUI();\r

     \r
     var itemView = function(item) {\r
         this.item = item;\r
         this.dom = $(this.template(item));\r
     \r
     var itemView = function(item) {\r
         this.item = item;\r
         this.dom = $(this.template(item));\r

-        this.dom.on('click', this.onItemClicked);\r
+        this.dom.on('click', _.bind(this.onItemClicked, this));\r

     };\r
     itemView.prototype.template = _.template(itemTemplateSrc);\r
     itemView.prototype.onItemClicked = function() {\r
     };\r
     itemView.prototype.template = _.template(itemTemplateSrc);\r
     itemView.prototype.onItemClicked = function() {\r

-        if(historyItems.selected(item)) {\r
-            historyItems.unselect(item);\r
+        if(historyItems.isSelected(this.item)) {\r
+            historyItems.unselect(this.item);\r

             this.dimItem();\r
             this.dimItem();\r

-        } else if(historyItems.select(item)) {\r
+        } else if(historyItems.select(this.item)) {\r

             this.highlightItem();\r
         }            \r
     };\r
     itemView.prototype.highlightItem = function() {\r
             this.highlightItem();\r
         }            \r
     };\r
     itemView.prototype.highlightItem = function() {\r

-        \r
+        this.dom.addClass('highlighted');\r

     };\r
     itemView.prototype.dimItem = function() {\r
     };\r
     itemView.prototype.dimItem = function() {\r

-    \r
+        this.dom.removeClass('highlighted');\r

     };\r
     itemView.prototype.toggle = function(toggle) {\r
     };\r
     itemView.prototype.toggle = function(toggle) {\r

-    \r
+        this.dom.toggleClass('disabled', !toggle);\r

     };\r
 \r
     \r
     \r
     return {\r
     };\r
 \r
     \r
     \r
     return {\r

-        start: function() { sandbox.publish('ready'); },\r
-        addHistory: function(history) {\r
+        start: function() { sandbox.publish('ready'); },
+        addHistory: function(history, options) {\r

             history.forEach(function(historyItem) {\r
             history.forEach(function(historyItem) {\r

-                addHistoryItem(historyItem);\r
+                addHistoryItem(historyItem, options || {});\r

             });\r
         },\r
         getView: function() {\r
             return dom;\r
         }\r
             });\r
         },\r
         getView: function() {\r
             return dom;\r
         }\r

-    }\r
-}\r
+    };\r
+};\r

 \r
 });
\ No newline at end of file
 \r
 });
\ No newline at end of file