From 5b77fc986ab341898fc9fc4f3944ffb88c7ca803 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 09:05:15 -0800 Subject: [PATCH 01/35] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1119b2f8a72c Author: Chris Lord Desc: Merge pull request #28267 from Cwiiis/bug1131344-followup Bug 1131344 - Follow-up, fix dragging group to top of homescreen. r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/4c9f2f7728c9 Author: Chris Lord Desc: Bug 1131344 - Follow-up, fix dragging group to top of homescreen. r=kgrandon --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 500c3994ff33..2a4f2608921e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "4f39e48b95fa00c8669b8707447542024bb55432", + "git_revision": "b6ab33b486e28f5ca94ec593ae64b61c6d7a1f68", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "e0816d2581cdc2d0581f625c06811128c87c0c48", + "revision": "1119b2f8a72c1c6244a398059d622811bb59548c", "repo_path": "integration/gaia-central" } From dd3a256dc2a826a8f9ac6775d0d3e32d1bfac444 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 09:07:41 -0800 Subject: [PATCH 02/35] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index fdca5910c933..9404c662f543 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index f122ff4326e4..f3fd40852178 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 0b1cad71e7a5..68abaedc5ea0 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 5f102cd302bf..a8f7f94b47da 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index f122ff4326e4..f3fd40852178 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index c2224832098f..82cacf022c58 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index bbe7bc53e572..93394832d06c 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 659b969db14f..d680d9399d62 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 228b7dade4d0..9f9fa634f4fb 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From b4223fb6c58865eb173025dd12adbded9a9563c8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 09:24:49 -0800 Subject: [PATCH 03/35] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4f4cb495fc07 Author: autolander Desc: Bug 1124146 - merge pull request #28218 from sfoster:task-manager-short-name-bug-1124146 to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/f57b6de2ab7d Author: Sam Foster Desc: Bug 1124146 - Use manifest short_name in task manager. r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/478d7b4cd0f0 Author: autolander Desc: Bug 1131486 - merge pull request #28225 from mikehenrty:bug-1131486-rtl-download-checkboxes to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/350e76762408 Author: Michael Henretty Desc: Bug 1131486 - Use RTL compatible styles for the download list --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 2a4f2608921e..93db1bc86568 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "b6ab33b486e28f5ca94ec593ae64b61c6d7a1f68", + "git_revision": "6943356112f7103602f578e8436dbc7b7a60de67", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "1119b2f8a72c1c6244a398059d622811bb59548c", + "revision": "4f4cb495fc0704c622b6cd27188a8356b6e42869", "repo_path": "integration/gaia-central" } From 4b5a276099900378c95b84d18b8452724c434957 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 09:27:16 -0800 Subject: [PATCH 04/35] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 9404c662f543..f4517700fc68 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index f3fd40852178..0830909c91db 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 68abaedc5ea0..26064ff771a5 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index a8f7f94b47da..2dae4ef777d3 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index f3fd40852178..0830909c91db 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 82cacf022c58..2368caefb556 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 93394832d06c..1b1e6cd441e6 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index d680d9399d62..9f0432bd3e41 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 9f9fa634f4fb..aa4efff4db9c 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 59e51eb36e5c640ae616731690bf26a1569f4715 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 09:44:24 -0800 Subject: [PATCH 05/35] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f76a3056d8f5 Author: autolander Desc: Bug 1131214 - merge pull request #28180 from punamdahiya:Bug1131214 to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/29b56a44b679 Author: Punam Dahiya Desc: Bug 1131214 - [Gallery][RTL] File name in info view should not be mirrored r=wilsonpage --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 93db1bc86568..4ed6cc896003 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "6943356112f7103602f578e8436dbc7b7a60de67", + "git_revision": "d6a13f8ddb8949e263d6a103897d5975c2035e18", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "4f4cb495fc0704c622b6cd27188a8356b6e42869", + "revision": "f76a3056d8f5bbfae823d053b2adf28b31af99c9", "repo_path": "integration/gaia-central" } From be6cb734fa4c44c8605b850143f8cfd77ecda128 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 09:47:09 -0800 Subject: [PATCH 06/35] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index f4517700fc68..77b92d325d48 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 0830909c91db..883428d3d06d 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 26064ff771a5..ba1e98742c47 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 2dae4ef777d3..4fc7a24cc899 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 0830909c91db..883428d3d06d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 2368caefb556..1c0632a756d4 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 1b1e6cd441e6..41462621611f 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 9f0432bd3e41..23090df46b10 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index aa4efff4db9c..5f6ed8b5e26c 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 2df5f8e068ff468c101682ac8890f26a0a7d486b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 10:10:12 -0800 Subject: [PATCH 07/35] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/165120218393 Author: Eitan Isaacson Desc: Merge pull request #28125 from eeejay/bug-1069631 Bug 1069631 - Label go to player view button. r=dkuo ======== https://hg.mozilla.org/integration/gaia-central/rev/25cc3cedc3f0 Author: Eitan Isaacson Desc: Bug 1069631 - Label go to player view button. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 4ed6cc896003..ad1b26b40fe9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "d6a13f8ddb8949e263d6a103897d5975c2035e18", + "git_revision": "66835a37c067028b6fc0463d10a329d3a9d16804", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "f76a3056d8f5bbfae823d053b2adf28b31af99c9", + "revision": "1651202183934c79f2dfa22690b15c222dd2a118", "repo_path": "integration/gaia-central" } From 26c5de4af5709d4f591645c15187e8dc45e91686 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 10:13:19 -0800 Subject: [PATCH 08/35] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 77b92d325d48..ce97aa9fb723 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 883428d3d06d..97d183040a82 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index ba1e98742c47..e0211fd2401e 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 4fc7a24cc899..ba8cb511b999 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 883428d3d06d..97d183040a82 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 1c0632a756d4..a394310cc598 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 41462621611f..d41cea056d03 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 23090df46b10..ed65df19f34d 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 5f6ed8b5e26c..7728dd044be3 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 62183e4458def646e10c1f615ffdfa119898d943 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 10:34:23 -0800 Subject: [PATCH 09/35] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9835fe348b00 Author: autolander Desc: Bug 1132672 - merge pull request #28222 from jfkthame:ftu-import-rtl to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/09576eb29423 Author: Jonathan Kew Desc: Bug 1132672 - [RTL][FTE] Fix padding on Import buttons. It looks like this was added specifically to compensate for the broken platform behavior (bug 1130231), so we can remove it now. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index ad1b26b40fe9..af985f685be3 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "66835a37c067028b6fc0463d10a329d3a9d16804", + "git_revision": "115334fcbd3f65c9da8f12fce815a6309cea911d", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "1651202183934c79f2dfa22690b15c222dd2a118", + "revision": "9835fe348b00f939c80b2a6df5e364382ecd848c", "repo_path": "integration/gaia-central" } From 242d719bbb7803218cf7a3689eb0660b8fbc5df9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 10:36:53 -0800 Subject: [PATCH 10/35] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index ce97aa9fb723..5f8584194b87 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 97d183040a82..cb648d5fd58d 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index e0211fd2401e..f938bc6922e9 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index ba8cb511b999..7ec9082cf513 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 97d183040a82..cb648d5fd58d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index a394310cc598..8610f693a688 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index d41cea056d03..93b0909d45cc 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index ed65df19f34d..90a2c72ebcca 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 7728dd044be3..aef2915ed0b8 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 1d8cc26d983e5bb45a19587187bd091ee943f242 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 10:55:00 -0800 Subject: [PATCH 11/35] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/32e1a251fe42 Author: autolander Desc: Bug 1003876 - merge pull request #27933 from benfrancis:1003876-4 to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/751042208bdc Author: Ben Francis Desc: Bug 1003876 - Install an app from a web page --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index af985f685be3..65238f0710dc 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "115334fcbd3f65c9da8f12fce815a6309cea911d", + "git_revision": "189d6b3c4e44cfd28a92ce7dee4e06739f479feb", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "9835fe348b00f939c80b2a6df5e364382ecd848c", + "revision": "32e1a251fe4293ac46545d111bd88868be1595ee", "repo_path": "integration/gaia-central" } From ef837d12bb96c8890015a8c37941f7f7ddaf552a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 10:57:40 -0800 Subject: [PATCH 12/35] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 5f8584194b87..14ab6b2c8176 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index cb648d5fd58d..8c024618a36c 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index f938bc6922e9..c56fbb6f0db5 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 7ec9082cf513..2544bd624cfb 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index cb648d5fd58d..8c024618a36c 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 8610f693a688..50e6ebde3bf9 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 93b0909d45cc..9cb00a09725d 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 90a2c72ebcca..d0d07cdd9fa5 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index aef2915ed0b8..b8ebeae7ba1e 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From d7b8a470aae532feecc277aed2442b49a7ad55ee Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 11:55:05 -0800 Subject: [PATCH 13/35] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ba61658dd6f2 Author: Marshall Culpepper Desc: Merge pull request #27286 from marshall/bug1109422_mauChanges Bug 1109422 - [AUM] Updates to support monthly active users ======== https://hg.mozilla.org/integration/gaia-central/rev/600e432b10d2 Author: Marshall Culpepper Desc: Bug 1109422 - [AUM] Part 2: Make data sharing opt-out by default in FTU. r=fcampo ======== https://hg.mozilla.org/integration/gaia-central/rev/88036910edfb Author: Marshall Culpepper Desc: Bug 1109422 - [AUM] Part 1: Updates to support monthly active users. r=djf --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 65238f0710dc..c52184938f24 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "189d6b3c4e44cfd28a92ce7dee4e06739f479feb", + "git_revision": "a8ab4a083908ed02950c76eea3c2ccb855b3a7d9", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "32e1a251fe4293ac46545d111bd88868be1595ee", + "revision": "ba61658dd6f245dff2c8944570e7bddff6eefb5d", "repo_path": "integration/gaia-central" } From 3a5d6358f3ae29387eeb2e031afc0739294a6aca Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 11:57:32 -0800 Subject: [PATCH 14/35] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 14ab6b2c8176..f347b37217b6 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 8c024618a36c..c15a5bd669fb 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index c56fbb6f0db5..381f7f6b9ef9 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 2544bd624cfb..a246a3686655 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 8c024618a36c..c15a5bd669fb 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 50e6ebde3bf9..f9ab406abc27 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 9cb00a09725d..4e475b18c845 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index d0d07cdd9fa5..d8560f72c6f2 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index b8ebeae7ba1e..8a1e3d61a602 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 37954760bc11421173e6aaa3db6079b91aa17408 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 12:34:08 -0800 Subject: [PATCH 15/35] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8c74e8d99ee4 Author: autolander Desc: Bug 1132551 - merge pull request #28259 from anefzaoui:bug-1132551 to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/9a75153d2573 Author: Ahmed Nefzaoui Desc: Bug 1132551 - [RTL][Contacts] Icons are Left Aligned in Import/Export Contacts menus. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index c52184938f24..e71b887f6f86 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "a8ab4a083908ed02950c76eea3c2ccb855b3a7d9", + "git_revision": "dc92f3fc3465bbbd3596790bc2afa4e120f4cfbd", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "ba61658dd6f245dff2c8944570e7bddff6eefb5d", + "revision": "8c74e8d99ee464adeadccf6822cae93a93451e4b", "repo_path": "integration/gaia-central" } From 6992d0a1c3e6ffb14296b4e98cfb313e5fa2a563 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 12:36:34 -0800 Subject: [PATCH 16/35] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index f347b37217b6..5424b3320530 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c15a5bd669fb..ae263473a394 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 381f7f6b9ef9..20b40a0b138d 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index a246a3686655..ad28a99f30d1 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index c15a5bd669fb..ae263473a394 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index f9ab406abc27..2714a89b1f05 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 4e475b18c845..480d78679120 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index d8560f72c6f2..b129d5989c9c 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 8a1e3d61a602..747c22e97413 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From deb54e8e7c801c3dd4cf36bd890d7837c67dc770 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 13:00:23 -0800 Subject: [PATCH 17/35] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9a72bfab6b39 Author: autolander Desc: Bug 1115213 - merge pull request #28226 from mikehenrty:bug-1115213-rtl-stop-resume-dl to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/b4b5320b3af2 Author: Michael Henretty Desc: Bug 1115213 - Fix download pause/resume icons in RTL --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e71b887f6f86..0916fa71b426 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "dc92f3fc3465bbbd3596790bc2afa4e120f4cfbd", + "git_revision": "404bbb2cefb34241e0e4aa1b1fea2ddd51c0d7bc", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "8c74e8d99ee464adeadccf6822cae93a93451e4b", + "revision": "9a72bfab6b3929ffd49802eadeeb0009eabdecbb", "repo_path": "integration/gaia-central" } From b61b38ff2826f54bd946a88d1bb74e7400b3fce6 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 17 Feb 2015 13:02:48 -0800 Subject: [PATCH 18/35] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 5424b3320530..a22d14257eb1 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index ae263473a394..59bd017a92a9 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 20b40a0b138d..f4a1f1376537 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index ad28a99f30d1..d46fbfcad040 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index ae263473a394..59bd017a92a9 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 2714a89b1f05..4f02164e710a 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 480d78679120..c2b15cec5c04 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index b129d5989c9c..d096d20b1b5f 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 747c22e97413..e71eec5abbde 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From c5e5513ce6662f624267f92e2e58d4d832d90962 Mon Sep 17 00:00:00 2001 From: Fabien Cazenave Date: Mon, 2 Feb 2015 15:01:32 +0100 Subject: [PATCH 19/35] Bug 1119057 - Scrollbar position should follow the document 'dir'. r=timdream --- b2g/app/b2g.js | 3 +++ b2g/chrome/content/content.css | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js index 2c3b697d037e..d5a959b04f53 100644 --- a/b2g/app/b2g.js +++ b/b2g/app/b2g.js @@ -688,6 +688,9 @@ pref("ui.useOverlayScrollbars", 1); pref("ui.scrollbarFadeBeginDelay", 450); pref("ui.scrollbarFadeDuration", 200); +// Scrollbar position follows the document `dir` attribute +pref("layout.scrollbar.side", 1); + // Enable the ProcessPriorityManager, and give processes with no visible // documents a 1s grace period before they're eligible to be marked as // background. Background processes that are perceivable due to playing diff --git a/b2g/chrome/content/content.css b/b2g/chrome/content/content.css index bbab3aeba6f7..64777cff7ef9 100644 --- a/b2g/chrome/content/content.css +++ b/b2g/chrome/content/content.css @@ -36,6 +36,13 @@ xul|scrollbar[orient="vertical"] { max-width: 8px; } +/* workaround for bug 1119057: as -moz-margin-start may not work as expected, + * force a right margin value in RTL mode. */ +[dir="rtl"] xul|scrollbar[root="true"][orient="vertical"] { + -moz-margin-start: unset; + margin-right: -8px; +} + xul|scrollbar[orient="vertical"] xul|thumb { max-width: 6px !important; min-width: 6px !important; From 19d3403bbae3a6faa60eb0d8ba95a6a6085b98ba Mon Sep 17 00:00:00 2001 From: Dave Townsend Date: Sat, 14 Feb 2015 00:14:25 -0800 Subject: [PATCH 20/35] Bug 1133141: Reduce the amount of CPOW traffic caused by shimmed events. r=billm --HG-- extra : rebase_source : d9e85e2373efff7252070ed528bb535b78260eb3 --- .../addoncompat/RemoteAddonsParent.jsm | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/toolkit/components/addoncompat/RemoteAddonsParent.jsm b/toolkit/components/addoncompat/RemoteAddonsParent.jsm index 3e699efba974..95f9f729d774 100644 --- a/toolkit/components/addoncompat/RemoteAddonsParent.jsm +++ b/toolkit/components/addoncompat/RemoteAddonsParent.jsm @@ -7,6 +7,7 @@ this.EXPORTED_SYMBOLS = ["RemoteAddonsParent"]; const Ci = Components.interfaces; const Cc = Components.classes; const Cu = Components.utils; +const Cr = Components.results; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import('resource://gre/modules/Services.jsm'); @@ -512,22 +513,33 @@ let EventTargetParent = { for (let [handler, target] of handlers) { let EventProxy = { - get: function(actualEvent, name) { - if (name == "currentTarget") { - return target; - } else { - return actualEvent[name]; - } + get: function(knownProps, name) { + if (knownProps.hasOwnProperty(name)) + return knownProps[name]; + return event[name]; } - }; - let proxyEvent = new Proxy(event, EventProxy); + } + let proxyEvent = new Proxy({ + currentTarget: target, + target: eventTarget, + type: type, + QueryInterface: function(iid) { + if (iid.equals(Ci.nsISupports) || + iid.equals(Ci.nsIDOMEventTarget)) + return proxyEvent; + // If event deson't support the interface this will throw. If it + // does we want to return the proxy + event.QueryInterface(iid); + return proxyEvent; + } + }, EventProxy); try { Prefetcher.withPrefetching(prefetched, cpows, () => { if ("handleEvent" in handler) { handler.handleEvent(proxyEvent); } else { - handler.call(event.target, proxyEvent); + handler.call(eventTarget, proxyEvent); } }); } catch (e) { From 4558c81b2caf3e61db65692a01b543fe5b1abe2a Mon Sep 17 00:00:00 2001 From: Alexandre Poirot Date: Mon, 16 Feb 2015 13:10:00 -0500 Subject: [PATCH 21/35] Bug 1124501 - Add a "logs" panel to WebIDE showing pre-package command output. r=jryans --- browser/devtools/webide/content/details.js | 13 ++++ browser/devtools/webide/content/details.xhtml | 2 + browser/devtools/webide/content/jar.mn | 2 + browser/devtools/webide/content/logs.js | 71 +++++++++++++++++++ browser/devtools/webide/content/logs.xhtml | 33 +++++++++ browser/devtools/webide/content/webide.js | 15 +++- browser/devtools/webide/content/webide.xul | 1 + .../devtools/webide/modules/app-manager.js | 5 +- browser/devtools/webide/modules/build.js | 39 +++++++--- browser/devtools/webide/test/test_build.html | 24 ++++++- browser/devtools/webide/themes/jar.mn | 1 + browser/devtools/webide/themes/logs.css | 18 +++++ .../en-US/chrome/browser/devtools/webide.dtd | 4 ++ 13 files changed, 214 insertions(+), 14 deletions(-) create mode 100644 browser/devtools/webide/content/logs.js create mode 100644 browser/devtools/webide/content/logs.xhtml create mode 100644 browser/devtools/webide/themes/logs.css diff --git a/browser/devtools/webide/content/details.js b/browser/devtools/webide/content/details.js index dabb191cefc5..79739b677246 100644 --- a/browser/devtools/webide/content/details.js +++ b/browser/devtools/webide/content/details.js @@ -9,6 +9,7 @@ const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).de const {AppProjects} = require("devtools/app-manager/app-projects"); const {AppValidator} = require("devtools/app-manager/app-validator"); const {AppManager} = require("devtools/webide/app-manager"); +const {ProjectBuilding} = require("devtools/webide/build"); window.addEventListener("load", function onLoad() { window.removeEventListener("load", onLoad); @@ -44,6 +45,8 @@ function resetUI() { document.querySelector("#manifestURL").textContent = ""; document.querySelector("#location").textContent = ""; + document.querySelector("#prePackageLog").hidden = true; + document.querySelector("#errorslist").innerHTML = ""; document.querySelector("#warningslist").innerHTML = ""; @@ -102,6 +105,12 @@ function updateUI() { } } + if (project.type != "runtimeApp" && project.type != "mainProcess") { + ProjectBuilding.hasPrepackage(project).then(hasPrepackage => { + document.querySelector("#prePackageLog").hidden = !hasPrepackage; + }); + } + let errorsNode = document.querySelector("#errorslist"); let warningsNode = document.querySelector("#warningslist"); @@ -122,6 +131,10 @@ function updateUI() { } } +function showPrepackageLog() { + window.top.UI.selectDeckPanel("logs"); +} + function removeProject() { AppManager.removeSelectedProject(); } diff --git a/browser/devtools/webide/content/details.xhtml b/browser/devtools/webide/content/details.xhtml index 8c8017edc78b..139601318562 100644 --- a/browser/devtools/webide/content/details.xhtml +++ b/browser/devtools/webide/content/details.xhtml @@ -43,6 +43,8 @@

&details_manifestURL;

+ +
    diff --git a/browser/devtools/webide/content/jar.mn b/browser/devtools/webide/content/jar.mn index e72e69069cc6..2f7c45eeb35f 100644 --- a/browser/devtools/webide/content/jar.mn +++ b/browser/devtools/webide/content/jar.mn @@ -26,3 +26,5 @@ webide.jar: content/devicesettings.xhtml (devicesettings.xhtml) content/wifi-auth.js (wifi-auth.js) content/wifi-auth.xhtml (wifi-auth.xhtml) + content/logs.xhtml (logs.xhtml) + content/logs.js (logs.js) diff --git a/browser/devtools/webide/content/logs.js b/browser/devtools/webide/content/logs.js new file mode 100644 index 000000000000..76b403b177e9 --- /dev/null +++ b/browser/devtools/webide/content/logs.js @@ -0,0 +1,71 @@ +/* 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/. */ + +const Cu = Components.utils; +Cu.import("resource:///modules/devtools/gDevTools.jsm"); +const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools; +const {AppManager} = require("devtools/webide/app-manager"); + +window.addEventListener("load", function onLoad() { + window.removeEventListener("load", onLoad); + + Logs.init(); +}); + +window.addEventListener("unload", function onUnload() { + window.removeEventListener("unload", onUnload); + + Logs.uninit(); +}); + +const Logs = { + init: function () { + this.list = document.getElementById("logs"); + + Logs.onAppManagerUpdate = Logs.onAppManagerUpdate.bind(this); + AppManager.on("app-manager-update", Logs.onAppManagerUpdate); + + document.getElementById("close").onclick = Logs.close.bind(this); + }, + + uninit: function () { + AppManager.off("app-manager-update", Logs.onAppManagerUpdate); + }, + + onAppManagerUpdate: function(event, what, details) { + switch (what) { + case "pre-package": + this.prePackageLog(details); + break; + }; + }, + + close: function () { + window.parent.UI.openProject(); + }, + + prePackageLog: function (msg, details) { + if (msg == "start") { + this.clear(); + } else if (msg == "succeed") { + setTimeout(function () { + Logs.close(); + }, 1000); + } else if (msg == "failed") { + this.log(details); + } else { + this.log(msg); + } + }, + + clear: function () { + this.list.innerHTML = ""; + }, + + log: function (msg) { + let line = document.createElement("li"); + line.textContent = msg; + this.list.appendChild(line); + } +}; diff --git a/browser/devtools/webide/content/logs.xhtml b/browser/devtools/webide/content/logs.xhtml new file mode 100644 index 000000000000..ead712ada677 --- /dev/null +++ b/browser/devtools/webide/content/logs.xhtml @@ -0,0 +1,33 @@ + + + + + + %webideDTD; +]> + + + + + + + + + + + + + + +

    &logs_title;

    + +
      +
    + + + diff --git a/browser/devtools/webide/content/webide.js b/browser/devtools/webide/content/webide.js index f129c7b1fa64..2d4660e7c3cb 100644 --- a/browser/devtools/webide/content/webide.js +++ b/browser/devtools/webide/content/webide.js @@ -195,6 +195,9 @@ let UI = { case "runtime-apps-found": this.autoSelectProject(); break; + case "pre-package": + this.prePackageLog(details); + break; }; this._updatePromise = promise.resolve(); }, @@ -768,9 +771,13 @@ let UI = { }, selectDeckPanel: function(id) { + let deck = document.querySelector("#deck"); + if (deck.selectedPanel && deck.selectedPanel.id === "deck-panel-" + id) { + // This panel is already displayed. + return; + } this.hidePanels(); this.resetFocus(); - let deck = document.querySelector("#deck"); let panel = deck.querySelector("#deck-panel-" + id); let lazysrc = panel.getAttribute("lazysrc"); if (lazysrc) { @@ -1004,6 +1011,12 @@ let UI = { document.querySelector("#action-button-debug").removeAttribute("active"); this.updateToolboxFullscreenState(); }, + + prePackageLog: function (msg) { + if (msg == "start") { + UI.selectDeckPanel("logs"); + } + } }; let Cmds = { diff --git a/browser/devtools/webide/content/webide.xul b/browser/devtools/webide/content/webide.xul index 3a9617050f09..b31821b53c7c 100644 --- a/browser/devtools/webide/content/webide.xul +++ b/browser/devtools/webide/content/webide.xul @@ -201,6 +201,7 @@