wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 868523 - snapped synced tabs entry doesnt hide if sync is not enabled.r=jimm

Browse Source
This commit is contained in:
Allison Naaktgeboren 2013-05-07 19:29:41 -07:00
parent 1890f56fff
commit 5f00501947
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
browser/metro/base/content/RemoteTabs.js
View File

@ -19,10 +19,10 @@ Components.utils.import("resource://services-sync/main.js");
* disabled. Must sanely support 'hidden' attribute.
* You may only have one UI access point at this time.
*/
function RemoteTabsView(aSet, aSetUIAccess) {
function RemoteTabsView(aSet, aSetUIAccessList) {
this._set = aSet;
this._set.controller = this;
this._uiAccessElement = aSetUIAccess;
this._uiAccessElements = aSetUIAccessList;
// Sync uses special voodoo observers.
// If you want to change this code, talk to the fx-si team
@ -38,7 +38,7 @@ function RemoteTabsView(aSet, aSetUIAccess) {
RemoteTabsView.prototype = {
_set: null,
_uiAccessElement: null,
_uiAccessElements: [],
handleItemClick: function tabview_handleItemClick(aItem) {
let url = aItem.getAttribute("value");
@ -57,7 +57,9 @@ RemoteTabsView.prototype = {
},
setUIAccessVisible: function setUIAccessVisible(aVisible) {
this._uiAccessElement.hidden = !aVisible;
for (let elem of this._uiAccessElements) {
elem.hidden = !aVisible;
}
},
populateGrid: function populateGrid() {
@ -108,7 +110,8 @@ let RemoteTabsStartView = {
init: function init() {
let vbox = document.getElementById("start-remotetabs");
this._view = new RemoteTabsView(this._grid, vbox);
let uiList = [vbox];
this._view = new RemoteTabsView(this._grid, uiList);
},
uninit: function uninit() {
@ -127,9 +130,11 @@ let RemoteTabsPanelView = {
get visible() { return PanelUI.isPaneVisible("remotetabs-container"); },
init: function init() {
//decks are fragile, don't hide the tab panel(bad things happen), hide link.
//decks are fragile, don't hide the tab panel(bad things happen), hide link in menu.
let menuEntry = document.getElementById("menuitem-remotetabs");
this._view = new RemoteTabsView(this._grid, menuEntry);
let snappedEntry = document.getElementById("snappedRemoteTabsLabel");
let uiList = [menuEntry, snappedEntry];
this._view = new RemoteTabsView(this._grid, uiList);
},
show: function show() {

2
browser/metro/base/content/browser.xul
View File

@ -291,7 +291,7 @@
onclick="PanelUI.show('bookmarks-container');"/>
<label class="meta-section-title" value="&startHistoryHeader.label;"
onclick="PanelUI.show('history-container');" inputProcessing="true"/>
<label class="meta-section-title" value="&startRemoteTabsHeader.label;"
<label id="snappedRemoteTabsLabel" class="meta-section-title" value="&snappedRemoteTabsHeader.label;"
onclick="PanelUI.show('remotetabs-container');" inputProcessing="true"/>
</scrollbox>
</vbox>

3
browser/metro/locales/en-US/chrome/browser.dtd
View File

@ -17,6 +17,9 @@
<!ENTITY startBookmarksHeader.label "Bookmarks">
<!ENTITY startHistoryHeader.label "Recent History">
<!ENTITY startRemoteTabsHeader.label "Tabs from Other Devices">
<!-- LOCALIZATION NOTE (snappedRemoteTabsHeader.label): shortened version of startRemoteTabsHeader.label.
Needs to be two words or shorter to fit in narrow vertical space.-->
<!ENTITY snappedRemoteTabsHeader.label "Remote Tabs">
<!ENTITY autocompleteResultsHeader.label "Your Results">
<!ENTITY autocompleteSearchesHeader.label "Internet Searches">