1229328 - Remove preprocessing from toolbox-window.xul

Status: RESOLVED FIXED

(DevTools :: Framework, defect)

Description

[Alexandre Poirot [:ochameau]]

This prevent toolbox as window to work when using the live-reload addon from bug 1225108.

Comment 1

[Alexandre Poirot [:ochameau]]

Attachment: patch v1

Comment 2

[Alexandre Poirot [:ochameau]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=a9cf74fab46c

Comment 3

[Brian Grinstead [:bgrins]]

Comment on attachment 8694132 [details] [diff] [review]
patch v1

Review of attachment 8694132 [details] [diff] [review]:
-----------------------------------------------------------------

::: devtools/client/framework/toolbox-window.xul
@@ +27,5 @@
>           command="toolbox-cmd-close"
>           modifiers="accel"/>
>      <key id="toolbox-key-toggle"
>           key="&toggleToolbox.key;"
> +         command="toolbox-cmd-close"/>

I prefer the way we did it in Bug 1162848 if for nothing else but consistency, but also because you can see the modifiers here next to the key.

So we would have two disabled keys (toolbox-key-toggle and toolbox-key-toggle-osx) then in the js enable the correct one depending on platform, like https://hg.mozilla.org/mozilla-central/rev/2b9780ca7aa8#l2.55.

Comment 4

[Alexandre Poirot [:ochameau]]

Attachment: patch v2

Comment 5

[Brian Grinstead [:bgrins]]

Comment on attachment 8694224 [details] [diff] [review]
patch v2

Review of attachment 8694224 [details] [diff] [review]:
-----------------------------------------------------------------

Need to remove the * in jar.mn to get rid of preprocessing

Comment 6

[Alexandre Poirot [:ochameau]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=6b4f578518d3

Comment 7

[Alexandre Poirot [:ochameau]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=fb171dc42f30

Comment 8

[Alexandre Poirot [:ochameau]]

https://hg.mozilla.org/integration/fx-team/rev/91642bf07cd0aaba3a589d52c2c063c5c8919e97
Bug 1229328 - Remove preprocessing from toolbox-window.xul. r=bgrins

Comment 9

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/91642bf07cd0