Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BE1D3175F5 for ; Tue, 22 Sep 2015 08:50:23 +0000 (UTC) Received: (qmail 27217 invoked by uid 500); 22 Sep 2015 08:50:23 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 27182 invoked by uid 500); 22 Sep 2015 08:50:23 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 27173 invoked by uid 99); 22 Sep 2015 08:50:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Sep 2015 08:50:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6E634DFBAF; Tue, 22 Sep 2015 08:50:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Message-Id: <6f540aedae624c92b2387ae1bf56a86f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-843 Tweak diff selection. Date: Tue, 22 Sep 2015 08:50:23 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-843 fa130ca86 -> efa48db4f IGNITE-843 Tweak diff selection. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/efa48db4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/efa48db4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/efa48db4 Branch: refs/heads/ignite-843 Commit: efa48db4f54abb7a733085d9d5c100a368d312b4 Parents: fa130ca Author: Alexey Kuznetsov Authored: Tue Sep 22 15:50:09 2015 +0700 Committer: Alexey Kuznetsov Committed: Tue Sep 22 15:50:09 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/common-module.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/efa48db4/modules/control-center-web/src/main/js/controllers/common-module.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index 90b9d04..bb4d809 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -1342,16 +1342,25 @@ controlCenterModule.service('$preview', ['$timeout', '$interval', function ($tim var prevLen = prevContent.length - (prevContent[prevContent.length - 1] == '' ? 1 : 0); var newLen = newContent.length - (newContent[newContent.length - 1] == '' ? 1 : 0); + var skipEnd = 0; + var selected = false; var scrollTo = -1; + while (newContent[newLen - 1] == prevContent[prevLen - 1] && newLen > 0 && prevLen > 0) { + prevLen -= 1; + newLen -= 1; + + skipEnd += 1; + } + while (newIx < newLen || prevIx < prevLen) { var start = -1; var end = -1; // Find an index of a first line with different text. for (; (newIx < newLen || prevIx < prevLen) && start < 0; newIx++, prevIx++) { - if (newContent[newIx] != prevContent[prevIx]) { + if (newIx >= newLen || prevIx >= prevLen || newContent[newIx] != prevContent[prevIx]) { start = newIx; break; @@ -1382,7 +1391,7 @@ controlCenterModule.service('$preview', ['$timeout', '$interval', function ($tim if (start == end) { start = Math.max(0, start - 1); - end = Math.min(newLen, end + 1) + end = Math.min(newLen + skipEnd, end + 1) } if (start <= end) {