From b248f68fadec6b47294a3c28c7f96c977169ed9f Mon Sep 17 00:00:00 2001
From: YUKI Hiroshi <shimoda@clear-code.com>
Date: Mon, 5 Oct 2015 19:57:17 +0900
Subject: [PATCH] Update insertion position info of old previous/next tabs
 after rearrangement

---
 modules/browser.js | 44 ++++++++++++++++++--------------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/modules/browser.js b/modules/browser.js
index b9f269a4..9f3b434b 100644
--- a/modules/browser.js
+++ b/modules/browser.js
@@ -3482,37 +3482,29 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
 			this.moveTabSubtreeTo(tab, tab._tPos);
 		}
 
-		var parentTab = this.getParentTab(tab);
-		if (parentTab && !this.subTreeChildrenMovingCount) {
-			this.updateChildrenArray(parentTab);
-		}
-
 		this.updateTabsCount(tab, true);
 
-		this.updateInsertionPositionInfo(tab);
+		var tabsToBeUpdated = [tab];
 
-		var old = aEvent.detail;
-		if (old > tab._tPos)
-			old--;
-		var tabs = this.getAllTabs(b);
-		old = tabs[old];
-
-		var prev = this.getPreviousSiblingTab(old);
-		var next = this.getNextSiblingTab(old);
-
-		if (prev) {
-			this.setTabValue(prev, this.kINSERT_BEFORE, old.getAttribute(this.kID));
-			this.setTabValue(old, this.kINSERT_AFTER, prev.getAttribute(this.kID));
+		var parentTab = this.getParentTab(tab);
+		if (parentTab) {
+			let children = this.getChildTabs(parentTab);
+			let oldChildIndex = children.indexOf(tab);
+			if (oldChildIndex > -1) {
+				if (oldChildIndex > 0) {
+					let oldPrevTab = children[oldChildIndex - 1];
+					tabsToBeUpdated.push(oldPrevTab);
+				}
+				if (oldChildIndex < children.lenght - 1) {
+					let oldNextTab = children[oldChildIndex + 1];
+					tabsToBeUpdated.push(oldNextTab);
+				}
+			}
+			if (!this.subTreeChildrenMovingCount)
+				this.updateChildrenArray(parentTab);
 		}
-		else
-			this.deleteTabValue(old, this.kINSERT_AFTER);
 
-		if (next) {
-			this.setTabValue(next, this.kINSERT_AFTER, old.getAttribute(this.kID));
-			this.setTabValue(old, this.kINSERT_BEFORE, next.getAttribute(this.kID));
-		}
-		else
-			this.deleteTabValue(old, this.kINSERT_BEFORE);
+		tabsToBeUpdated.forEach(this.updateInsertionPositionInfo, this);
 
 		this.positionPinnedTabsWithDelay();