From 4c4b5da0fdbe3250c1af6c01ed0bbf38f4fb3a2d Mon Sep 17 00:00:00 2001
From: YUKI Hiroshi <shimoda@clear-code.com>
Date: Wed, 7 Sep 2016 14:39:07 +0900
Subject: [PATCH] Update library

---
 chrome.manifest                               |   6 +-
 .../bookmarkPropertiesOverlay.xul             |   4 +
 .../treestyletab/res/bookmarkMultipleTabs.js  | 173 ++++++++++++++++++
 .../treestyletab/res/bookmarkMultipleTabs.xul | 146 ---------------
 ...MultipleTabs_bookmarkPropertiesOverlay.xul |  59 ------
 content/treestyletab/treestyletab.xul         |   1 +
 6 files changed, 180 insertions(+), 209 deletions(-)
 create mode 100644 content/treestyletab/bookmarkPropertiesOverlay.xul
 create mode 100644 content/treestyletab/res/bookmarkMultipleTabs.js
 delete mode 100644 content/treestyletab/res/bookmarkMultipleTabs.xul
 delete mode 100644 content/treestyletab/res/bookmarkMultipleTabs_bookmarkPropertiesOverlay.xul

diff --git a/chrome.manifest b/chrome.manifest
index 3d763b1e..0aa0f6c5 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -8,13 +8,11 @@ overlay	chrome://browser/content/places/places.xul	chrome://treestyletab/content
 overlay	chrome://browser/content/places/places.xul	chrome://treestyletab/content/bookmarksOverlayEditable.xul
 overlay	chrome://browser/content/places/bookmarkProperties.xul	chrome://treestyletab/content/bookmarksOverlay.xul
 overlay	chrome://browser/content/places/bookmarkProperties.xul	chrome://treestyletab/content/bookmarksOverlayEditable.xul
+overlay	chrome://browser/content/places/bookmarkProperties.xul	chrome://treestyletab/content/bookmarkPropertiesOverlay.xul
+overlay	chrome://browser/content/places/bookmarkProperties2.xul	chrome://treestyletab/content/bookmarkPropertiesOverlay.xul
 
 overlay	chrome://multipletab/content/config.xul	chrome://treestyletab/content/multipletabConfigOverlay.xul
 
-overlay	chrome://browser/content/browser.xul	chrome://treestyletab/content/res/bookmarkMultipleTabs.xul
-overlay	chrome://browser/content/places/bookmarkProperties.xul	chrome://treestyletab/content/res/bookmarkMultipleTabs_bookmarkPropertiesOverlay.xul
-overlay	chrome://browser/content/places/bookmarkProperties2.xul	chrome://treestyletab/content/res/bookmarkMultipleTabs_bookmarkPropertiesOverlay.xul
-
 locale	treestyletab	en-US	locale/en-US/treestyletab/
 locale	treestyletab	ja	locale/ja/treestyletab/
 locale	treestyletab	it-IT	locale/it-IT/treestyletab/
diff --git a/content/treestyletab/bookmarkPropertiesOverlay.xul b/content/treestyletab/bookmarkPropertiesOverlay.xul
new file mode 100644
index 00000000..2d21b0b2
--- /dev/null
+++ b/content/treestyletab/bookmarkPropertiesOverlay.xul
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<script src="res/bookmarkMultipleTabs.js" type="application/javascript"/>
+</overlay>
diff --git a/content/treestyletab/res/bookmarkMultipleTabs.js b/content/treestyletab/res/bookmarkMultipleTabs.js
new file mode 100644
index 00000000..b9cd2888
--- /dev/null
+++ b/content/treestyletab/res/bookmarkMultipleTabs.js
@@ -0,0 +1,173 @@
+/**
+ * Bookmark Multiple Tabs library for Firefox 2 or later
+ *
+ * Usage:
+ *   First, load this file into three Chrome documents:
+ *     * chrome://browser/content/browser.xul
+ *     * chrome://browser/content/places/bookmarkProperties.xul
+ *     * chrome://browser/content/places/bookmarkProperties2.xul
+ *
+ *   Then, run this line in your JS files:
+ *     window['piro.sakura.ne.jp'].bookmarkMultipleTabs.addBookmarkFor(tabsArray, folderName);
+ *
+ * license: The MIT License, Copyright (c) 2009-2016 YUKI "Piro" Hiroshi
+ *   http://github.com/piroor/fxaddonlib-bookmark-multiple-tabs/blob/master/license.txt
+ * original:
+ *   http://github.com/piroor/fxaddonlib-bookmark-multiple-tabs
+ */
+(function() {
+	const currentRevision = 8;
+
+	if (!('BookmarkPropertiesPanel' in window)) {
+		window.addEventListener('DOMContentLoaded', function() {
+			window.removeEventListener('DOMContentLoaded', arguments.callee, true);
+
+			if (!('piro.sakura.ne.jp' in window)) window['piro.sakura.ne.jp'] = {};
+
+			var loadedRevision = 'bookmarkMultipleTabs' in window['piro.sakura.ne.jp'] ?
+					window['piro.sakura.ne.jp'].bookmarkMultipleTabs.revision :
+					0 ;
+			if (loadedRevision && loadedRevision > currentRevision) {
+				return;
+			}
+
+			var addBookmarkTabsFilter = function(aTab) { return aTab.linkedBrowser.currentURI; };
+			// Tab Mix Plus modifies the API.
+			if ('TMP_Places' in window && 'getTabFixedTitle' in TMP_Places) {
+				addBookmarkTabsFilter = function(aTab) {
+					var b = aTab.linkedBrowser;
+					var uri = b.currentURI;
+					return {
+						uri   : uri,
+						title : TMP_Places.getTabFixedTitle(b, uri)
+					};
+				};
+			}
+
+			window['piro.sakura.ne.jp'].bookmarkMultipleTabs = {
+				revision : currentRevision,
+
+				addBookmarkFor : function(aTabs, aFolderName) 
+				{
+					if (!aTabs) return;
+
+					var b = this.getTabBrowserFromChild(aTabs[0]);
+
+					if ('PlacesUIUtils' in window || 'PlacesUtils' in window) { // Firefox 3 or later
+						try {
+							var utils = 'PlacesUIUtils' in window ? PlacesUIUtils : PlacesUtils ;
+							var tabs = Array.slice(aTabs).map(this.addBookmarkTabsFilter);
+							if (aFolderName)
+								this.Prefs.setCharPref('temp.showMinimalAddMultiBookmarkUI.folderName', unescape(encodeURIComponent(aFolderName)));
+							if ('showBookmarkDialog' in utils) { // Firefox 9 or later
+								utils.showBookmarkDialog({
+									action  : 'add',
+									type    : 'folder',
+									// title   : aFolderName, // don't specify it, because Firefox doesn't create bookmarks if the title is given!
+									URIList : tabs,
+									hiddenRows : ['description', 'location', 'loadInSidebar', 'keyword']
+								}, window);
+							}
+							else {
+								throw new Error('there is no method to create bookmarks from tabs!');
+							}
+						}
+						catch(e) {
+							alert(e.message+'\n'+e.stack);
+						}
+						finally {
+							this.Prefs.clearUserPref('temp.showMinimalAddMultiBookmarkUI.folderName');
+						}
+						return;
+					}
+
+					var currentTabInfo;
+					var tabsInfo = Array.slice(aTabs).map(function(aTab) {
+							var webNav = aTab.linkedBrowser.webNavigation;
+							var url    = webNav.currentURI.spec;
+							var name   = '';
+							var charSet, description;
+							try {
+								var doc = webNav.document;
+								name = doc.title || url;
+								charSet = doc.characterSet;
+								description = BookmarksUtils.getDescriptionFromDocument(doc);
+							}
+							catch (e) {
+								name = url;
+							}
+							return {
+								name        : name,
+								url         : url,
+								charset     : charSet,
+								description : description
+							};
+						});
+
+					window.openDialog(
+						'chrome://browser/content/bookmarks/addBookmark2.xul',
+						'',
+						BROWSER_ADD_BM_FEATURES,
+						(aTabs.length == 1 ?
+							tabsInfo[0] :
+							{
+								name             : (aFolderName || gNavigatorBundle.getString('bookmarkAllTabsDefault')),
+								bBookmarkAllTabs : true,
+								objGroup         : tabsInfo
+							}
+						)
+					);
+				},
+				addBookmarkTabsFilter : addBookmarkTabsFilter,
+
+				Prefs : Components.classes['@mozilla.org/preferences-service;1']
+							.getService(Components.interfaces.nsIPrefBranch),
+
+				getTabBrowserFromChild : function(aTab) 
+				{
+					var b = aTab.ownerDocument.evaluate(
+							'ancestor-or-self::*[local-name()="tabbrowser"] | '+
+							'ancestor-or-self::*[local-name()="tabs" and @tabbrowser]',
+							aTab,
+							null,
+							XPathResult.FIRST_ORDERED_NODE_TYPE,
+							null
+						).singleNodeValue;
+					return (b && b.tabbrowser) || b;
+				}
+			};
+		}, true);
+	}
+	else {
+		if (!BookmarkPropertiesPanel._determineItemInfo ||
+			BookmarkPropertiesPanel.__bookmarkMultipleTabs__determineItemInfo)
+			return;
+
+		// Defined at http://mxr.mozilla.org/mozilla-central/source/browser/components/places/content/bookmarkProperties.js#73
+		const ACTION_ADD = 1;
+
+		BookmarkPropertiesPanel.__bookmarkMultipleTabs__determineItemInfo = BookmarkPropertiesPanel._determineItemInfo;
+		BookmarkPropertiesPanel._determineItemInfo = function(...aArgs) {
+			var folderNameOverride = null;
+			try {
+				folderNameOverride = Components.classes['@mozilla.org/preferences;1']
+					.getService(Components.interfaces.nsIPrefBranch)
+					.getCharPref('temp.showMinimalAddMultiBookmarkUI.folderName');
+				folderNameOverride = decodeURIComponent(escape(folderNameOverride));
+			}
+			catch(e) {
+			}
+			var retVal = this.__bookmarkMultipleTabs__determineItemInfo.apply(this, aArgs);
+			if (folderNameOverride &&
+				this._action == ACTION_ADD) {
+				let dialogInfo = window.arguments[0];
+				if (dialogInfo.type === 'folder' &&
+					!('title' in dialogInfo) &&
+					'URIList' in dialogInfo) {
+					this._title = folderNameOverride;
+				}
+			}
+			return retVal;
+		};
+	}
+})();
diff --git a/content/treestyletab/res/bookmarkMultipleTabs.xul b/content/treestyletab/res/bookmarkMultipleTabs.xul
deleted file mode 100644
index 775791a7..00000000
--- a/content/treestyletab/res/bookmarkMultipleTabs.xul
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Bookmark Multiple Tabs library for Firefox 2 or later
-
- Usage:
-   in chrome.manifest:
-     overlay  chrome://browser/content/browser.xul
-              chrome://***/content/bookmarkMultipleTabs.xul
-     overlay  chrome://browser/content/places/bookmarkProperties.xul
-              chrome://***/content/bookmarkMultipleTabs_bookmarkPropertiesOverlay.xul
-     overlay  chrome://browser/content/places/bookmarkProperties2.xul
-              chrome://***/content/bookmarkMultipleTabs_bookmarkPropertiesOverlay.xul
-
-   in JS files:
-     window['piro.sakura.ne.jp'].bookmarkMultipleTabs.addBookmarkFor(tabsArray, folderName);
-
- license: The MIT License, Copyright (c) 2009-2015 YUKI "Piro" Hiroshi
- original:
-   http://github.com/piroor/fxaddonlib-bookmark-multiple-tabs
--->
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<script type="application/javascript"><![CDATA[
-
-window.addEventListener('DOMContentLoaded', function() {
-	window.removeEventListener('DOMContentLoaded', arguments.callee, true);
-
-	const currentRevision = 8;
-
-	if (!('piro.sakura.ne.jp' in window)) window['piro.sakura.ne.jp'] = {};
-
-	var loadedRevision = 'bookmarkMultipleTabs' in window['piro.sakura.ne.jp'] ?
-			window['piro.sakura.ne.jp'].bookmarkMultipleTabs.revision :
-			0 ;
-	if (loadedRevision && loadedRevision > currentRevision) {
-		return;
-	}
-
-	var addBookmarkTabsFilter = function(aTab) { return aTab.linkedBrowser.currentURI; };
-	// Tab Mix Plus modifies the API.
-	if ('TMP_Places' in window && 'getTabFixedTitle' in TMP_Places) {
-		addBookmarkTabsFilter = function(aTab) {
-			var b = aTab.linkedBrowser;
-			var uri = b.currentURI;
-			return {
-				uri   : uri,
-				title : TMP_Places.getTabFixedTitle(b, uri)
-			};
-		};
-	}
-
-	window['piro.sakura.ne.jp'].bookmarkMultipleTabs = {
-		revision : currentRevision,
-
-		addBookmarkFor : function(aTabs, aFolderName) 
-		{
-			if (!aTabs) return;
-
-			var b = this.getTabBrowserFromChild(aTabs[0]);
-
-			if ('PlacesUIUtils' in window || 'PlacesUtils' in window) { // Firefox 3 or later
-				try {
-					var utils = 'PlacesUIUtils' in window ? PlacesUIUtils : PlacesUtils ;
-					var tabs = Array.slice(aTabs).map(this.addBookmarkTabsFilter);
-					if (aFolderName)
-						this.Prefs.setCharPref('temp.showMinimalAddMultiBookmarkUI.folderName', unescape(encodeURIComponent(aFolderName)));
-					if ('showBookmarkDialog' in utils) { // Firefox 9 or later
-						utils.showBookmarkDialog({
-							action  : 'add',
-							type    : 'folder',
-							// title   : aFolderName, // don't specify it, because Firefox doesn't create bookmarks if the title is given!
-							URIList : tabs,
-							hiddenRows : ['description', 'location', 'loadInSidebar', 'keyword']
-						}, window);
-					}
-					else {
-						throw new Error('there is no method to create bookmarks from tabs!');
-					}
-				}
-				catch(e) {
-					alert(e.message+'\n'+e.stack);
-				}
-				finally {
-					this.Prefs.clearUserPref('temp.showMinimalAddMultiBookmarkUI.folderName');
-				}
-				return;
-			}
-
-			var currentTabInfo;
-			var tabsInfo = Array.slice(aTabs).map(function(aTab) {
-					var webNav = aTab.linkedBrowser.webNavigation;
-					var url    = webNav.currentURI.spec;
-					var name   = '';
-					var charSet, description;
-					try {
-						var doc = webNav.document;
-						name = doc.title || url;
-						charSet = doc.characterSet;
-						description = BookmarksUtils.getDescriptionFromDocument(doc);
-					}
-					catch (e) {
-						name = url;
-					}
-					return {
-						name        : name,
-						url         : url,
-						charset     : charSet,
-						description : description
-					};
-				});
-
-			window.openDialog(
-				'chrome://browser/content/bookmarks/addBookmark2.xul',
-				'',
-				BROWSER_ADD_BM_FEATURES,
-				(aTabs.length == 1 ?
-					tabsInfo[0] :
-					{
-						name             : (aFolderName || gNavigatorBundle.getString('bookmarkAllTabsDefault')),
-						bBookmarkAllTabs : true,
-						objGroup         : tabsInfo
-					}
-				)
-			);
-		},
-		addBookmarkTabsFilter : addBookmarkTabsFilter,
-
-		Prefs : Components.classes['@mozilla.org/preferences-service;1']
-					.getService(Components.interfaces.nsIPrefBranch),
-
-		getTabBrowserFromChild : function(aTab) 
-		{
-			var b = aTab.ownerDocument.evaluate(
-					'ancestor-or-self::*[local-name()="tabbrowser"] | '+
-					'ancestor-or-self::*[local-name()="tabs" and @tabbrowser]',
-					aTab,
-					null,
-					XPathResult.FIRST_ORDERED_NODE_TYPE,
-					null
-				).singleNodeValue;
-			return (b && b.tabbrowser) || b;
-		}
-	};
-}, true);
-
-]]></script>
-</overlay>
diff --git a/content/treestyletab/res/bookmarkMultipleTabs_bookmarkPropertiesOverlay.xul b/content/treestyletab/res/bookmarkMultipleTabs_bookmarkPropertiesOverlay.xul
deleted file mode 100644
index 2ecb846c..00000000
--- a/content/treestyletab/res/bookmarkMultipleTabs_bookmarkPropertiesOverlay.xul
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Bookmark Multiple Tabs library for Firefox 2 or later
-
- Usage:
-   in chrome.manifest:
-     overlay  chrome://browser/content/browser.xul
-              chrome://***/content/bookmarkMultipleTabs.xul
-     overlay  chrome://browser/content/places/bookmarkProperties.xul
-              chrome://***/content/bookmarkMultipleTabs_bookmarkPropertiesOverlay.xul
-     overlay  chrome://browser/content/places/bookmarkProperties2.xul
-              chrome://***/content/bookmarkMultipleTabs_bookmarkPropertiesOverlay.xul
-
-   in JS files:
-     window['piro.sakura.ne.jp'].bookmarkMultipleTabs.addBookmarkFor(tabsArray, folderName);
-
- license: The MIT License, Copyright (c) 2009-2015 YUKI "Piro" Hiroshi
-   http://github.com/piroor/fxaddonlibs/blob/master/license.txt
- original:
-   http://github.com/piroor/fxaddonlibs/blob/master/bookmarkMultipleTabs.xul
-   http://github.com/piroor/fxaddonlibs/blob/master/bookmarkMultipleTabs_bookmarkPropertiesOverlay.xul
--->
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<script type="application/javascript"><![CDATA[
-(function() {
-	if (!('BookmarkPropertiesPanel' in window) ||
-		!BookmarkPropertiesPanel._determineItemInfo ||
-		BookmarkPropertiesPanel.__bookmarkMultipleTabs__determineItemInfo)
-		return;
-
-	// Defined at http://mxr.mozilla.org/mozilla-central/source/browser/components/places/content/bookmarkProperties.js#73
-	const ACTION_ADD = 1;
-
-	BookmarkPropertiesPanel.__bookmarkMultipleTabs__determineItemInfo = BookmarkPropertiesPanel._determineItemInfo;
-	BookmarkPropertiesPanel._determineItemInfo = function(...aArgs) {
-		var folderNameOverride = null;
-		try {
-			folderNameOverride = Components.classes['@mozilla.org/preferences;1']
-				.getService(Components.interfaces.nsIPrefBranch)
-				.getCharPref('temp.showMinimalAddMultiBookmarkUI.folderName');
-			folderNameOverride = decodeURIComponent(escape(folderNameOverride));
-		}
-		catch(e) {
-		}
-		var retVal = this.__bookmarkMultipleTabs__determineItemInfo.apply(this, aArgs);
-		if (folderNameOverride &&
-			this._action == ACTION_ADD) {
-			let dialogInfo = window.arguments[0];
-			if (dialogInfo.type === 'folder' &&
-				!('title' in dialogInfo) &&
-				'URIList' in dialogInfo) {
-				this._title = folderNameOverride;
-			}
-		}
-		return retVal;
-	};
-})();
-]]></script>
-</overlay>
diff --git a/content/treestyletab/treestyletab.xul b/content/treestyletab/treestyletab.xul
index 26be71ad..ff228602 100644
--- a/content/treestyletab/treestyletab.xul
+++ b/content/treestyletab/treestyletab.xul
@@ -40,6 +40,7 @@
          xmlns:svg="http://www.w3.org/2000/svg">
 
 <script src="res/tabsDragUtils.js" type="application/javascript"/>
+<script src="res/bookmarkMultipleTabs.js" type="application/javascript"/>
 <script src="treestyletab.js" type="application/javascript"/>
 <script src="windowHelper.js" type="application/javascript"/>
 <script src="windowHelperHacks.js" type="application/javascript"/>