Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 01:05:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to mozilla-inbound

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-04-11 11:47:32 +02:00
commit f09dffab2b
6 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/components/syncedtabs/TabListView.js
View File

@ -242,8 +242,10 @@ TabListView.prototype = {
itemNode.querySelector(".item-title").textContent = item.title;
let icon = itemNode.querySelector(".item-icon-container");
icon.style.backgroundImage = "url(" + item.icon + ")";
if (item.icon) {
let icon = itemNode.querySelector(".item-icon-container");
icon.style.backgroundImage = "url(" + item.icon + ")";
}
},
onClick(event) {

11
browser/themes/shared/syncedtabs/sidebar.inc.css
View File

@ -84,10 +84,21 @@ body {
.client .item.tab > .item-title-container {
padding-inline-start: 35px;
}
.item.tab > .item-title-container {
padding-inline-start: 20px;
}
.item.tab > .item-title-container > .item-icon-container {
background-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
}
@media (min-resolution: 1.1dppx) {
.item.tab > .item-title-container > .item-icon-container {
background-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
}
}
.item-icon-container {
min-width: 16px;
max-width: 16px;

2
services/sync/modules/SyncedTabs.jsm
View File

@ -73,7 +73,7 @@ let SyncedTabsInternal = {
} catch (ex) { /* no favicon avaiable */ }
}
if (!icon) {
icon = PlacesUtils.favicons.defaultFavicon.spec;
icon = "";
}
return {
type: "tab",

4
services/sync/tests/unit/test_syncedtabs.js
View File

@ -157,8 +157,8 @@ add_task(function* test_clientWithTabsIconsDisabled() {
clients.sort((a, b) => { return a.name.localeCompare(b.name);});
equal(clients[0].tabs.length, 1);
equal(clients[0].tabs[0].url, "http://foo.com/");
// expect the default favicon due to the pref being false.
equal(clients[0].tabs[0].icon, faviconService.defaultFavicon.spec);
// expect the default favicon (empty string) due to the pref being false.
equal(clients[0].tabs[0].icon, "");
Services.prefs.clearUserPref("services.sync.syncedTabs.showRemoteIcons");
});

2
toolkit/mozapps/extensions/content/extensions.js
View File

@ -2255,7 +2255,7 @@ var gDiscoverView = {
Ci.nsIWebProgressListener.STATE_IS_REQUEST |
Ci.nsIWebProgressListener.STATE_TRANSFERRING;
// Once transferring begins show the content
if (aStateFlags & transferStart)
if ((aStateFlags & transferStart) === transferStart)
this.node.selectedPanel = this._browser;
// Only care about the network events

14
toolkit/mozapps/extensions/test/browser/browser_discovery.js
View File

@ -635,3 +635,17 @@ add_test(function() {
Services.prefs.clearUserPref(PREF_DISCOVER_ENABLED);
});
});
// Test for Bug 1219495 - should show placeholder content when offline
add_test(function() {
// set a URL to cause an error
Services.prefs.setCharPref(PREF_DISCOVERURL, "https://nocert.example.com/");
open_manager("addons://discover/", function(aWindow) {
gManagerWindow = aWindow;
ok(isError(), "Should have shown the placeholder content");
close_manager(gManagerWindow, run_next_test);
});
});