diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/options.xul | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-2018.07.18.tar UXP-2018.07.18.tar.gz UXP-2018.07.18.tar.lz UXP-2018.07.18.tar.xz UXP-2018.07.18.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/options.xul')
| -rw-r--r-- | toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/options.xul | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/options.xul b/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/options.xul deleted file mode 100644 index c271c35da..000000000 --- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/options.xul +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" ?> -<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - <setting pref="extensions.inlinesettings1.bool" type="bool" title="Bool" checkboxlabel="Check box label"/> - <setting pref="extensions.inlinesettings1.boolint" type="boolint" on="1" off="2" title="BoolInt"/> - <setting pref="extensions.inlinesettings1.integer" type="integer" title="Integer"/> - <setting pref="extensions.inlinesettings1.string" type="string" title="String"/> - <setting type="control" title="Menulist"> - <menulist sizetopopup="always" oncommand="window._testValue = this.value;"> - <menupopup> - <menuitem label="Alpha" value="1" /> - <menuitem label="Bravo" value="2" /> - <menuitem label="Charlie" value="3" /> - </menupopup> - </menulist> - </setting> - <setting pref="extensions.inlinesettings1.color" type="color" title="Color"/> - <setting pref="extensions.inlinesettings1.file" type="file" title="File"/> - <setting pref="extensions.inlinesettings1.directory" type="directory" title="Directory"/> - <setting pref="extensions.inlinesettings1.integer-size" type="integer" title="Integer with size" size="1" /> -</vbox> |