Bug 595395 - Add pin events to AllTabs.jsm [r=dolske, a=dolske]

--HG--
extra : rebase_source : 591d2031a32ad7a034cd0681da49bc07f7c79097
This commit is contained in:
Raymond Lee 2010-11-10 11:39:31 +08:00
parent 5012624462
commit 6d61a10531
4 changed files with 94 additions and 25 deletions

View File

@ -59,7 +59,7 @@ let AllTabs = {
* *
* @param eventName * @param eventName
* Name of the corresponding Tab* Event; one of "attrModified", * Name of the corresponding Tab* Event; one of "attrModified",
* "close", "move", "open", "select". * "close", "move", "open", "select", "pinned", "unpinned".
* @param callback * @param callback
* Callback that gets called with the tab as the first argument and * Callback that gets called with the tab as the first argument and
* the event as the second argument. * the event as the second argument.
@ -79,7 +79,7 @@ let AllTabs = {
* *
* @param eventName * @param eventName
* Name of the corresponding Tab* Event; one of "attrModified", * Name of the corresponding Tab* Event; one of "attrModified",
* "close", "move", "open", "select". * "close", "move", "open", "select", "pinned", "unpinned".
* @param callback * @param callback
* The callback given for the original AllTabs.register call. * The callback given for the original AllTabs.register call.
* @usage AllTabs.unregister("close", handleClose); * @usage AllTabs.unregister("close", handleClose);
@ -107,7 +107,7 @@ __defineGetter__("browserWindows", function browserWindows() {
return browserWindows; return browserWindows;
}); });
let events = ["attrModified", "close", "move", "open", "select"]; let events = ["attrModified", "close", "move", "open", "select", "pinned", "unpinned"];
let eventListeners = {}; let eventListeners = {};
function registerBrowserWindow(browserWindow) { function registerBrowserWindow(browserWindow) {

View File

@ -646,31 +646,27 @@ let UI = {
self.onTabSelect(tab); self.onTabSelect(tab);
}; };
// TabPinned
this._eventListeners.pinned = function(tab) {
if (tab.ownerDocument.defaultView != gWindow)
return;
TabItems.handleTabPin(tab);
GroupItems.addAppTab(tab);
};
// TabUnpinned
this._eventListeners.unpinned = function(tab) {
if (tab.ownerDocument.defaultView != gWindow)
return;
TabItems.handleTabUnpin(tab);
GroupItems.removeAppTab(tab);
};
// Actually register the above handlers // Actually register the above handlers
for (let name in this._eventListeners) for (let name in this._eventListeners)
AllTabs.register(name, this._eventListeners[name]); AllTabs.register(name, this._eventListeners[name]);
// Start watching for tab pin events, and set up our uninit for same.
function handleTabPin(event) {
TabItems.handleTabPin(event.originalTarget);
GroupItems.addAppTab(event.originalTarget);
}
gBrowser.tabContainer.addEventListener("TabPinned", handleTabPin, false);
this._cleanupFunctions.push(function() {
gBrowser.tabContainer.removeEventListener("TabPinned", handleTabPin, false);
});
// Start watching for tab unpin events, and set up our uninit for same.
function handleTabUnpin(event) {
TabItems.handleTabUnpin(event.originalTarget);
GroupItems.removeAppTab(event.originalTarget);
}
gBrowser.tabContainer.addEventListener("TabUnpinned", handleTabUnpin, false);
this._cleanupFunctions.push(function() {
gBrowser.tabContainer.removeEventListener("TabUnpinned", handleTabUnpin, false);
});
}, },
// ---------- // ----------

View File

@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
_BROWSER_FILES = \ _BROWSER_FILES = \
browser_tabview_alltabs.js \
browser_tabview_apptabs.js \ browser_tabview_apptabs.js \
browser_tabview_bug580412.js \ browser_tabview_bug580412.js \
browser_tabview_bug587043.js \ browser_tabview_bug587043.js \

View File

@ -0,0 +1,72 @@
/* ***** 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 a test for bug 595395.
*
* The Initial Developer of the Original Code is
* Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Raymond Lee <raymond@appcoast.com>
*
* 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 ***** */
Cu.import("resource:///modules/tabview/AllTabs.jsm");
function test() {
waitForExplicitFinish();
let newTab = gBrowser.addTab();
// TabPinned
let pinned = function(tab) {
is(tab, newTab, "The tabs are the same after the tab is pinned");
ok(tab.pinned, "The tab gets pinned");
gBrowser.unpinTab(tab);
};
// TabUnpinned
let unpinned = function(tab) {
AllTabs.unregister("pinned", pinned);
AllTabs.unregister("unpinned", unpinned);
is(tab, newTab, "The tabs are the same after the tab is unpinned");
ok(!tab.pinned, "The tab gets unpinned");
// clean up and finish
gBrowser.removeTab(tab);
finish();
};
AllTabs.register("pinned", pinned);
AllTabs.register("unpinned", unpinned);
ok(!newTab.pinned, "The tab is not pinned");
gBrowser.pinTab(newTab);
}