diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-12-28 11:44:34 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-02 17:07:18 -0600 |
| commit | f331a83bcadab99750eb9b751d6610aada85ccf7 (patch) | |
| tree | 71538ef0f3cc28b85504bb7fcc3a4109199ebea6 | |
| parent | 1ccad17c33e8cdf8a03c428922582ae0e3e8bb79 (diff) | |
| download | gitlab-ce-25188-polyfill-es6-symbol.tar.gz | |
update array destructuring now that Symbol.iterator is available25188-polyfill-es6-symbol
| -rw-r--r-- | app/assets/javascripts/diff.js.es6 | 13 |
1 files 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() { |