From 0869b11f53e1ba691e76253532d9d4884a1922d9 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Mon, 26 Oct 2015 17:00:52 -0700 Subject: [PATCH] Refactor DeltaView to use view in template --- app/templates/editor/delta.jade | 5 +++-- app/views/editor/DeltaView.coffee | 8 +------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/templates/editor/delta.jade b/app/templates/editor/delta.jade index 8f31176aa..32715df3b 100644 --- a/app/templates/editor/delta.jade +++ b/app/templates/editor/delta.jade @@ -1,4 +1,5 @@ - var i = 0 +- var counter = view.constructor.deltaCounter; mixin deltaPanel(delta, conflict) - delta.index = i++ @@ -41,8 +42,8 @@ mixin deltaPanel(delta, conflict) +deltaPanel(delta.conflict, true) .panel-group(id='delta-accordion-'+(counter)) - for delta in deltas + for delta in view.expandedDeltas +deltaPanel(delta) - if !deltas.length + if !view.expandedDeltas.length alert.alert-warning(data-i18n="delta.no_changes") No changes diff --git a/app/views/editor/DeltaView.coffee b/app/views/editor/DeltaView.coffee index a01cc9378..be545cb42 100644 --- a/app/views/editor/DeltaView.coffee +++ b/app/views/editor/DeltaView.coffee @@ -71,14 +71,8 @@ module.exports = class DeltaView extends CocoView if skip then skippedDeltas.push delta else newDeltas.push delta [newDeltas, skippedDeltas] - getRenderData: -> - c = super() - c.deltas = @expandedDeltas - c.counter = DeltaView.deltaCounter - DeltaView.deltaCounter += @expandedDeltas.length - c - afterRender: -> + DeltaView.deltaCounter += @expandedDeltas.length deltas = @$el.find('.details') for delta, i in deltas deltaEl = $(delta)