タブバーの位置の変更を巻き戻すAPI TreeStyleTabBrowser.rollbackTabbarPosition()

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@5622 599a83e7-65a4-db11-8015-0010dcdd6dc2

chrome.manifest

@@ -34,3 +34,5 @@ override chrome://treestyletab/skin/square/compat.css	chrome://treestyletab/skin
 override chrome://treestyletab/skin/metal/tab.css	chrome://treestyletab/skin/metal/tab-3.5.css	appversion>=3.5
 
 override chrome://treestyletab/skin/config.css	chrome://treestyletab/skin/config-3.7.png	appversion>=3.7a1pre
+
+resource treestyletab-modules modules/

components/AboutGroup.js

@@ -1,39 +1,37 @@
-/*
+/* ***** BEGIN LICENSE BLOCK *****
-***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
-
+ * The contents of this file are subject to the Mozilla Public License Version
-The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
-1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
-the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
-http://www.mozilla.org/MPL/
+ *
-
+ * Software distributed under the License is distributed on an "AS IS" basis,
-Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
-for the specific language governing rights and limitations under the
+ * License.
-License.
+ *
-
+ * The Original Code is the Tree Style Tab.
-The Original Code is the Tree Style Tab.
+ *
-
+ * The Initial Developer of the Original Code is SHIMODA Hiroshi.
-The Initial Developer of the Original Code is SHIMODA Hiroshi.
+ * Portions created by the Initial Developer are Copyright (C) 2009
-Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
-the Initial Developer. All Rights Reserved.
+ *
-
+ * Contributor(s): SHIMODA Hiroshi <piro@p.club.ne.jp>
-Contributor(s): SHIMODA Hiroshi <piro@p.club.ne.jp>
+ *
-
+ * Alternatively, the contents of this file may be used under the terms of
-Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
-in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
-of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
-under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
-use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
-decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
-and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
-the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
-the terms of any one of the MPL, the GPL or the LGPL.
+ *
-
+ * ***** END LICENSE BLOCK ******/
-***** END LICENSE BLOCK *****
-*/
 
 const IOService = Components.classes['@mozilla.org/network/io-service;1']
 					.getService(Components.interfaces.nsIIOService);

content/treestyletab/bookmarksOverlay.xul

@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<script src="res/prefs.js" type="application/x-javascript; version=1.7"/>
 <script src="res/boxObject.js" type="application/x-javascript; version=1.7"/>
 <script src="res/stringBundle.js" type="application/x-javascript; version=1.7"/>
 <script src="res/animationManager.js" type="application/x-javascript; version=1.7"/>

content/treestyletab/treestyletab.js

@@ -455,18 +455,16 @@ var TreeStyleTabService = {
  
 	get currentTabbarPosition() /* PUBLIC API */ 
 	{
-		return this.getTreePref('tabbar.position') || 'top';
+		return this.common.currentTabbarPosition;
 	},
 	set currentTabbarPosition(aValue)
 	{
-		var position = String(aValue);
+		return this.common.currentTabbarPosition = aValue;
-		if (!position || !/^(top|bottom|left|right)$/i.test(position))
+	},
-			position = 'top';
+ 
-
+	rollbackTabbarPosition : function TSTService_rollbackTabbarPosition() /* PUBLIC API */ 
-		position = position.toLowerCase();
+	{
-		this.setTreePref('tabbar.position', position);
+		return this.common.rollbackTabbarPosition();
-
-		return aValue;
 	},
   
 /* backward compatibility */ 
@@ -1320,6 +1318,14 @@ var TreeStyleTabService = {
 		window.removeEventListener('DOMContentLoaded', this, true);
 		if (!document.getElementById('content')) return;
 
+		var namespace = {};
+		Components.utils.import(
+			'resource://treestyletab-modules/common.jsm',
+			namespace
+		);
+		this.common = namespace.TreeStyleTabCommon;
+		this.common.init();
+
 		window.addEventListener('SSTabRestoring', this, true);
 
 		if ('swapBrowsersAndCloseOther' in document.getElementById('content')) {
@@ -2935,7 +2941,14 @@ catch(e) {
    
 }; 
 
-TreeStyleTabService.__proto__ = window['piro.sakura.ne.jp'].prefs;
+(function() {
+	var namespace = {};
+	Components.utils.import(
+		'resource://treestyletab-modules/prefs.js',
+		namespace
+	);
+	TreeStyleTabService.__proto__ = namespace.window['piro.sakura.ne.jp'].prefs;
+})();
 window.addEventListener('DOMContentLoaded', TreeStyleTabService, true);
 window.addEventListener('load', TreeStyleTabService, false);
 TreeStyleTabService.ObserverService.addObserver(TreeStyleTabService, 'sessionstore-windows-restored', false);

content/treestyletab/treestyletab.xul

@@ -7,7 +7,6 @@
 <overlay id="treestyletab-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script src="res/prefs.js" type="application/x-javascript; version=1.7"/>
 <script src="res/boxObject.js" type="application/x-javascript; version=1.7"/>
 <script src="res/stringBundle.js" type="application/x-javascript; version=1.7"/>
 <script src="res/autoScroll.js" type="application/x-javascript; version=1.7"/>

modules/common.jsm

@@ -0,0 +1,121 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Tree Style Tab.
+ *
+ * The Initial Developer of the Original Code is SHIMODA Hiroshi.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): SHIMODA Hiroshi <piro@p.club.ne.jp>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ******/
+
+var EXPORTED_SYMBOLS = ['TreeStyleTabCommon'];
+
+var TreeStyleTabCommon = {
+
+	init : function TSTCommon_init()
+	{
+		if (this._initialized) return;
+
+		this.addPrefListener(this);
+	},
+	_initialized : false,
+
+
+	observe : function TSTCommon_observe(aSubject, aTopic, aData) 
+	{
+		switch (aTopic)
+		{
+			case 'nsPref:changed':
+				this.onPrefChange(aData);
+				return;
+		}
+	},
+
+	domains : [ 
+		'extensions.treestyletab.tabbar.position'
+	],
+
+	onPrefChange : function TSTCommon_onPrefChange(aPrefName) 
+	{
+		var value = this.getPref(aPrefName);
+		switch (aPrefName)
+		{
+			case 'extensions.treestyletab.tabbar.position':
+				this.onChangeTabbarPosition(value);
+				break;
+
+			default:
+				break;
+		}
+	},
+
+
+	// tabbar position API
+
+	/* PUBLIC API */
+	get currentTabbarPosition()
+	{
+		return this.getPref('extensions.treestyletab.tabbar.position') || 'top';
+	},
+	set currentTabbarPosition(aValue)
+	{
+		var position = String(aValue);
+		if (!position || !/^(top|bottom|left|right)$/i.test(position))
+			position = 'top';
+
+		position = position.toLowerCase();
+		this.setPref('extensions.treestyletab.tabbar.position', position);
+
+		return aValue;
+	},
+
+	/* PUBLIC API */
+	rollbackTabbarPosition : function TSTCommon_rollbackTabbarPosition()
+	{
+		if (!this._tabbarPositionHistory.length)
+			return false;
+
+		this._inRollbackTabbarPosition = true;
+		this.currentTabbarPosition = this._tabbarPositionHistory.pop();
+		this._inRollbackTabbarPosition = false;
+
+		return true;
+	},
+
+	onChangeTabbarPosition : function TSTCommon_onChangeTabbarPosition(aPosition)
+	{
+		if (this._inRollbackTabbarPosition) return;
+		this._tabbarPositionHistory.push(aPosition);
+	},
+
+	_tabbarPositionHistory : []
+
+};
+
+Components.utils.import('resource://treestyletab-modules/prefs.js');
+TreeStyleTabCommon.__proto__ = window['piro.sakura.ne.jp'].prefs;

modules/prefs.js

@@ -1,3 +1,6 @@
+var EXPORTED_SYMBOLS = ['window'];
+var window = {};
+
 /*
  Preferences Library