зеркало из https://github.com/mozilla/pjs.git
Bug 588999 - Add Tab Candy escape button to Tab Candy view [r+a=dietrich]
--HG-- extra : rebase_source : 4bf904071d0ba0a115e982ba200a3a4a0e96ecc3
This commit is contained in:
Raymond Lee
Родитель
04bf56d9ad
Коммит
75ae675774
|
|
@ -186,6 +186,12 @@ body {
|
|||
display: none;
|
||||
}
|
||||
|
||||
/* Exit button
|
||||
----------------------------------*/
|
||||
#exit-button {
|
||||
position: absolute;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
/* Search
|
||||
----------------------------------*/
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@
|
|||
|
||||
<body transparent="true">
|
||||
<div id="content">
|
||||
<input id="exit-button" type="image" onclick="UI.onExitButtonPressed();"
|
||||
alt="" />
|
||||
<div id="actions">
|
||||
<input type="button" id="searchbutton"/>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -884,6 +884,17 @@ let UI = {
|
|||
this._save();
|
||||
},
|
||||
|
||||
// ----------
|
||||
// Function: onExitButtonPressed
|
||||
// Exits TabView UI.
|
||||
onExitButtonPressed: function() {
|
||||
let activeTab = this.getActiveTab();
|
||||
if (!activeTab)
|
||||
activeTab = gBrowser.selectedTab.tabItem;
|
||||
if (activeTab)
|
||||
activeTab.zoomIn();
|
||||
},
|
||||
|
||||
// ----------
|
||||
// Function: _addDevMenu
|
||||
// Fills out the "dev menu" in the TabView UI.
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ _BROWSER_FILES = \
|
|||
browser_tabview_bug591706.js \
|
||||
browser_tabview_apptabs.js \
|
||||
browser_tabview_undo_group.js \
|
||||
browser_tabview_exit_button.js \
|
||||
$(NULL)
|
||||
|
||||
libs:: $(_BROWSER_FILES)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,62 @@
|
|||
/* ***** 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 tabview exit button test.
|
||||
*
|
||||
* 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 ***** */
|
||||
|
||||
function test() {
|
||||
waitForExplicitFinish();
|
||||
|
||||
let onTabViewShown = function() {
|
||||
window.removeEventListener("tabviewshown", onTabViewShown, false);
|
||||
ok(TabView.isVisible(), "Tab View is visible");
|
||||
|
||||
let contentWindow = document.getElementById("tab-view").contentWindow;
|
||||
let button = contentWindow.document.getElementById("exit-button");
|
||||
|
||||
ok(button, "Exit button exists");
|
||||
EventUtils.sendMouseEvent({ type: "click" }, button, contentWindow);
|
||||
}
|
||||
|
||||
let onTabViewHidden = function() {
|
||||
window.removeEventListener("tabviewhidden", onTabViewHidden, false);
|
||||
|
||||
ok(!TabView.isVisible(), "Tab View is hidden");
|
||||
finish();
|
||||
}
|
||||
|
||||
window.addEventListener("tabviewshown", onTabViewShown, false);
|
||||
window.addEventListener("tabviewhidden", onTabViewHidden, false);
|
||||
TabView.toggle();
|
||||
}
|
||||
|
|
@ -389,6 +389,21 @@ input.defaultName {
|
|||
bottom: 1px;
|
||||
}
|
||||
|
||||
/* Exit button
|
||||
+----------------------------------*/
|
||||
#exit-button {
|
||||
cursor: default;
|
||||
top: 0;
|
||||
right: 0;
|
||||
width: 28px;
|
||||
height: 27px;
|
||||
background: url(chrome://browser/skin/tabview/tabview.png) no-repeat scroll 7px 7px #b7b7b7;
|
||||
border-bottom: 1px solid #909090;
|
||||
border-left: 1px solid #B7B7B7;
|
||||
border-top: 1px solid #CFCFCF;
|
||||
border-radius: 3px 0 0 3px;
|
||||
}
|
||||
|
||||
/* Search
|
||||
----------------------------------*/
|
||||
|
||||
|
|
|
|||
|
|
@ -395,6 +395,21 @@ input.defaultName {
|
|||
bottom: 1px;
|
||||
}
|
||||
|
||||
/* Exit button
|
||||
+----------------------------------*/
|
||||
#exit-button {
|
||||
cursor: default;
|
||||
top: 0;
|
||||
right: 0;
|
||||
width: 28px;
|
||||
height: 27px;
|
||||
background: url(chrome://browser/skin/tabview/tabview.png) no-repeat scroll 4px 4px #b7b7b7;
|
||||
border-bottom: 1px solid #909090;
|
||||
border-left: 1px solid #B7B7B7;
|
||||
border-top: 1px solid #CFCFCF;
|
||||
border-radius: 3px 0 0 3px;
|
||||
}
|
||||
|
||||
/* Search
|
||||
----------------------------------*/
|
||||
|
||||
|
|
|
|||
|
|
@ -400,6 +400,21 @@ input.defaultName {
|
|||
bottom: 1px;
|
||||
}
|
||||
|
||||
/* Exit button
|
||||
+----------------------------------*/
|
||||
#exit-button {
|
||||
cursor: default;
|
||||
top: 0;
|
||||
right: 0;
|
||||
width: 28px;
|
||||
height: 27px;
|
||||
background: url(chrome://browser/skin/tabview/tabview.png) no-repeat scroll 4px 4px #b7b7b7;
|
||||
border-bottom: 1px solid #909090;
|
||||
border-left: 1px solid #B7B7B7;
|
||||
border-top: 1px solid #CFCFCF;
|
||||
border-radius: 3px 0 0 3px;
|
||||
}
|
||||
|
||||
/* Search
|
||||
----------------------------------*/
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче