From 8a2989c03e7e37a5fa175ab9e939f632980448d4 Mon Sep 17 00:00:00 2001
From: Piro / YUKI Hiroshi <piro.outsider.reflex@gmail.com>
Date: Sun, 9 Feb 2014 01:06:35 +0900
Subject: [PATCH] Don't start dragging operation of the tab bar itself from a
 button which have its own popup menu (#656)

---
 history.en.md                | 1 +
 history.ja.md                | 1 +
 modules/tabbarDNDObserver.js | 5 ++++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/history.en.md b/history.en.md
index 3f5ece25..077fe46f 100644
--- a/history.en.md
+++ b/history.en.md
@@ -8,6 +8,7 @@
    * Fixed: In the fullscreen mode, don't hide the navigation toolbar on OS X Lion.
    * Fixed: Collapse the tab bar automatically, if it is expanded by long-press of the Ctrl key and a new window is opened while the key is pressed.
    * Fixed: Open tabs as children, from the "search by" in the context menu.
+   * Fixed: Don't start dragging operation of the tab bar itself from a button which have its own popup menu.
  - 0.14.2014013001
    * Improved: Better compatibility with [Nav Bar on Title Bar](https://addons.mozilla.org/firefox/addon/nav-bar-on-title-bar/).
    * Improved: Better compatibility with [Tab Control](https://addons.mozilla.org/firefox/addon/tab-control/).
diff --git a/history.ja.md b/history.ja.md
index 8f863873..bc16d35b 100644
--- a/history.ja.md
+++ b/history.ja.md
@@ -8,6 +8,7 @@
    * OS X Lionでのフルスクリーン表示において、ナビゲーションツールバーを隠さないようにした
    * タブバーがCtrlキーの長押しで自動的に表示されている間に新しいウィンドウが開かれた場合に、タブバーが自動的に隠れないでそのままになってしまっていたのを修正
    * コンテキストメニューの「～検索」機能から開いたタブが現在のタブの子にならなくなっていたのを修正
+   * メニューを持つツールバーボタン上ではタブバー自体のドラッグ操作を開始しないようにした
  - 0.14.2014013001
    * [Nav Bar on Title Bar](https://addons.mozilla.org/firefox/addon/nav-bar-on-title-bar/)との互換性を改善
    * [Tab Control](https://addons.mozilla.org/firefox/addon/tab-control/)との互換性を改善
diff --git a/modules/tabbarDNDObserver.js b/modules/tabbarDNDObserver.js
index a91f2a23..4f68b841 100644
--- a/modules/tabbarDNDObserver.js
+++ b/modules/tabbarDNDObserver.js
@@ -91,7 +91,10 @@ TabbarDNDObserver.prototype = {
 
 		if (
 			sv.evaluateXPath(
-				'ancestor-or-self::*[contains(" scrollbar popup menupopup panel tooltip ", concat(" ", local-name(), " "))]',
+				'ancestor-or-self::*[' +
+					'contains(" scrollbar popup menupopup panel tooltip ", concat(" ", local-name(), " ")) or' +
+					'(local-name()="toolbarbutton" and @type="menu")' +
+				']',
 				aEvent.originalTarget,
 				Ci.nsIDOMXPathResult.BOOLEAN_TYPE
 			).booleanValue ||