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

Backed out 2 changesets (bug 1446975) for failing xpcshell on sync/tests/unit/test_syncedtabs.js and browser-chrome failures e.g. test/urlbar/browser_page_action_menu.js on a CLOSED TREE

Browse Source 
Backed out changeset 69653800c483 (bug 1446975)
Backed out changeset 44e3e7446b02 (bug 1446975)

--HG--
rename : browser/themes/shared/icons/device-phone.svg => browser/themes/shared/icons/device-mobile.svg
This commit is contained in:
Gurzau Raul 2018-04-13 01:28:22 +03:00
parent 62d2749834
commit 50d002961a
16 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/base/content/browser-sync.js
View File

@ -384,7 +384,8 @@ var gSync = {
const clients = this.remoteClients;
for (let client of clients) {
const type = Weave.Service.clientsEngine.getClientType(client.id);
const type = client.formfactor && client.formfactor.includes("tablet") ?
"tablet" : client.type;
addTargetDevice(client.id, client.name, type, new Date(client.serverLastModified * 1000));
}

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

@ -231,10 +231,14 @@ TabListView.prototype = {
} else {
itemNode.classList.remove("selected");
}
if (item.isMobile) {
itemNode.classList.add("device-image-mobile");
} else {
itemNode.classList.add("device-image-desktop");
}
if (item.focused) {
itemNode.focus();
}
itemNode.setAttribute("clientType", item.clientType);
itemNode.dataset.id = item.id;
itemNode.querySelector(".item-title").textContent = item.name;
},

6
browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js
View File

@ -6,7 +6,7 @@ const FIXTURE = [
"type": "client",
"lastModified": 1492201200,
"name": "zcarter's Nightly on MacBook-Pro-25",
"clientType": "desktop",
"isMobile": false,
"tabs": [
{
"type": "tab",
@ -23,7 +23,7 @@ const FIXTURE = [
"type": "client",
"lastModified": 1492201200,
"name": "laptop",
"clientType": "desktop",
"isMobile": false,
"tabs": [
{
"type": "tab",
@ -57,7 +57,7 @@ const FIXTURE = [
"type": "client",
"lastModified": 1492201200,
"name": "desktop",
"clientType": "desktop",
"isMobile": false,
"tabs": []
}
];

2
browser/themes/linux/jar.mn
View File

@ -49,6 +49,8 @@ browser.jar:
skin/classic/browser/preferences/applications.css (preferences/applications.css)
skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
skin/classic/browser/sync-desktopIcon.svg (../shared/sync-desktopIcon.svg)
skin/classic/browser/sync-mobileIcon.svg (../shared/sync-mobileIcon.svg)
skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:

2
browser/themes/osx/jar.mn
View File

@ -58,6 +58,8 @@ browser.jar:
skin/classic/browser/preferences/applications.css (preferences/applications.css)
skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
skin/classic/browser/tabbrowser/tabDragIndicator@2x.png (tabbrowser/tabDragIndicator@2x.png)
skin/classic/browser/sync-desktopIcon.svg (../shared/sync-desktopIcon.svg)
skin/classic/browser/sync-mobileIcon.svg (../shared/sync-mobileIcon.svg)
skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:

0
browser/themes/shared/icons/device-phone.svg → browser/themes/shared/icons/device-mobile.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 540 B

After

Width:  |  Height:  |  Size: 540 B

2
browser/themes/shared/jar.inc.mn
View File

@ -128,7 +128,7 @@
skin/classic/browser/check-animation.svg (../shared/icons/check-animation.svg)
skin/classic/browser/customize.svg (../shared/icons/customize.svg)
skin/classic/browser/developer.svg (../shared/icons/developer.svg)
skin/classic/browser/device-phone.svg (../shared/icons/device-phone.svg)
skin/classic/browser/device-mobile.svg (../shared/icons/device-mobile.svg)
skin/classic/browser/device-tablet.svg (../shared/icons/device-tablet.svg)
skin/classic/browser/device-desktop.svg (../shared/icons/device-desktop.svg)
skin/classic/browser/edit-copy.svg (../shared/icons/edit-copy.svg)

2
browser/themes/shared/menupanel.inc.css
View File

@ -83,7 +83,7 @@
}
#PanelUI-remotetabs-view-managedevices {
list-style-image: url("chrome://browser/skin/device-phone.svg");
list-style-image: url("chrome://browser/skin/device-mobile.svg");
}
#appMenuViewHistorySidebar,

8
browser/themes/shared/sync-desktopIcon.svg Normal file
View File

@ -0,0 +1,8 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<svg xmlns="http://www.w3.org/2000/svg"
width="16" height="16" viewBox="0 0 16 16">
<path fill="context-fill" d="M15,14H1a1,1,0,0,1-1-1V12.526H16V13A1,1,0,0,1,15,14ZM1,4A1,1,0,0,1,2,3H14a1,1,0,0,1,1,1v8H1V4Zm1,7H14V4H2v7Z"/>
<rect fill="context-fill" fill-opacity="0.15" x="2" y="4" width="12" height="7"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 535 B

8
browser/themes/shared/sync-mobileIcon.svg Normal file
View File

@ -0,0 +1,8 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<svg xmlns="http://www.w3.org/2000/svg"
width="16" height="16" viewBox="0 0 16 16">
<path fill="context-fill" d="M12,16H4a1,1,0,0,1-1-1V1A1,1,0,0,1,4,0h8a1,1,0,0,1,1,1V15A1,1,0,0,1,12,16Zm-4-.684a0.785,0.785,0,1,0-.785-0.785A0.785,0.785,0,0,0,8,15.316ZM12,2H4V13h8V2Z"/>
<rect fill="context-fill" fill-opacity="0.15" x="4" y="2" width="8" height="11"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 581 B

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

@ -88,25 +88,24 @@ body {
padding-inline-start: 20px;
}
.item.client[clientType] > .item-title-container > .item-icon-container {
.item.client.device-image-desktop > .item-title-container > .item-icon-container {
background-image: url("chrome://browser/skin/sync-desktopIcon.svg");
-moz-context-properties: fill;
fill: #4d4d4d;
}
.item.client[clientType].selected:focus > .item-title-container > .item-icon-container {
.item.client.device-image-desktop.selected:focus > .item-title-container > .item-icon-container {
fill: white;
}
.item.client[clientType=phone] > .item-title-container > .item-icon-container {
background-image: url("chrome://browser/skin/device-phone.svg");
.item.client.device-image-mobile > .item-title-container > .item-icon-container {
background-image: url("chrome://browser/skin/sync-mobileIcon.svg");
-moz-context-properties: fill;
fill: #4d4d4d;
}
.item.client[clientType=tablet] > .item-title-container > .item-icon-container {
background-image: url("chrome://browser/skin/device-tablet.svg");
}
.item.client[clientType=desktop] > .item-title-container > .item-icon-container {
background-image: url("chrome://browser/skin/device-desktop.svg");
.item.client.device-image-mobile.selected:focus > .item-title-container > .item-icon-container {
fill: white;
}
.item.tab > .item-title-container > .item-icon-container {

4
browser/themes/shared/urlbar-searchbar.inc.css
View File

@ -151,8 +151,8 @@
transform: scaleX(-1);
}
.pageAction-sendToDevice-device[clientType=phone] {
list-style-image: url("chrome://browser/skin/device-phone.svg");
.pageAction-sendToDevice-device[clientType=mobile] {
list-style-image: url("chrome://browser/skin/device-mobile.svg");
}
.pageAction-sendToDevice-device[clientType=tablet] {

2
browser/themes/windows/jar.mn
View File

@ -16,6 +16,8 @@ browser.jar:
* skin/classic/browser/searchbar.css
skin/classic/browser/setDesktopBackground.css
skin/classic/browser/slowStartup-16.png
skin/classic/browser/sync-desktopIcon.svg (../shared/sync-desktopIcon.svg)
skin/classic/browser/sync-mobileIcon.svg (../shared/sync-mobileIcon.svg)
skin/classic/browser/webRTC-indicator.css (../shared/webRTC-indicator.css)
* skin/classic/browser/controlcenter/panel.css (controlcenter/panel.css)
skin/classic/browser/customizableui/menu-arrow.svg (customizableui/menu-arrow.svg)

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

@ -76,7 +76,7 @@ let SyncedTabsInternal = {
id: client.id,
type: "client",
name: Weave.Service.clientsEngine.getClientName(client.id),
clientType: Weave.Service.clientsEngine.getClientType(client.id),
isMobile: Weave.Service.clientsEngine.isMobile(client.id),
lastModified: client.lastModified * 1000, // sec to ms
tabs: []
};

13
services/sync/modules/engines/clients.js
View File

@ -232,15 +232,10 @@ ClientEngine.prototype = {
return null;
},
getClientType(id) {
const client = this._store._remoteClients[id];
if (client.type == DEVICE_TYPE_DESKTOP) {
return "desktop";
}
if (client.formfactor && client.formfactor.includes("tablet")) {
return "tablet";
}
return "phone";
isMobile: function isMobile(id) {
if (this._store._remoteClients[id])
return this._store._remoteClients[id].type == DEVICE_TYPE_MOBILE;
return false;
},
async _readCommands() {

2
toolkit/components/places/PlacesRemoteTabsAutocompleteProvider.jsm
View File

@ -135,7 +135,7 @@ var PlacesRemoteTabsAutocompleteProvider = {
// create the record we return for auto-complete.
let record = {
url, title, icon,
deviceClass: Weave.Service.clientsEngine.getClientType(clientId),
deviceClass: Weave.Service.clientsEngine.isMobile(clientId) ? "mobile" : "desktop",
deviceName: client.clientName,
};
matches.push(record);