From f331a83bcadab99750eb9b751d6610aada85ccf7 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Wed, 28 Dec 2016 11:44:34 -0600
Subject: update array destructuring now that Symbol.iterator is available

---
 app/assets/javascripts/diff.js.es6 | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/diff.js.es6 b/app/assets/javascripts/diff.js.es6
index 9cf33e62958..9e9f11ecf6d 100644
--- a/app/assets/javascripts/diff.js.es6
+++ b/app/assets/javascripts/diff.js.es6
@@ -25,11 +25,7 @@
 
     handleClickUnfold(e) {
       const $target = $(e.target);
-      // current babel config relies on iterators implementation, so we cannot simply do:
-      // const [oldLineNumber, newLineNumber] = this.lineNumbers($target.parent());
-      const ref = this.lineNumbers($target.parent());
-      const oldLineNumber = ref[0];
-      const newLineNumber = ref[1];
+      const [oldLineNumber, newLineNumber] = this.lineNumbers($target.parent());
       const offset = newLineNumber - oldLineNumber;
       const bottom = $target.hasClass('js-unfold-bottom');
       let since;
@@ -46,7 +42,7 @@
         to = lineNumber;
 
         // make sure we aren't loading more than we need
-        const prevNewLine = this.lineNumbers($target.parent().prev())[1];
+        const [, prevNewLine] = this.lineNumbers($target.parent().prev());
         if (since <= prevNewLine + 1) {
           since = prevNewLine + 1;
           unfold = false;
@@ -88,10 +84,11 @@
     }
 
     lineNumbers(line) {
-      if (!line.children().length) {
+      const children = line.find('.diff-line-num').toArray();
+      if (children.length !== 2) {
         return [0, 0];
       }
-      return line.find('.diff-line-num').map((i, elm) => parseInt($(elm).data('linenumber'), 10));
+      return children.map((i, elm) => parseInt($(elm).data('linenumber'), 10) || 0);
     }
 
     highlighSelectedLine() {
-- 
cgit v1.2.1