Bug 930277 - Toggle dom.forms.color on everywhere but on B2G, Android and Metro as these platforms don't have a color picker ready yet. r=dholbert

This commit is contained in:
Arnaud Bienner 2013-10-28 19:56:59 +01:00
parent 722d4bbb4f
commit b7d6e57361
6 changed files with 42 additions and 6 deletions

View File

@ -568,6 +568,10 @@ pref("dom.disable_window_showModalDialog", true);
pref("dom.experimental_forms", true); pref("dom.experimental_forms", true);
pref("dom.forms.number", true); pref("dom.forms.number", true);
// Don't enable <input type=color> yet as we don't have a color picker
// implemented for b2g (bug 875751)
pref("dom.forms.color", false);
// Turns on gralloc-based direct texturing for Gonk // Turns on gralloc-based direct texturing for Gonk
pref("gfx.gralloc.enabled", false); pref("gfx.gralloc.enabled", false);

View File

@ -648,3 +648,7 @@ pref("full-screen-api.ignore-widgets", true);
pref("layout.imagevisibility.enabled", true); pref("layout.imagevisibility.enabled", true);
pref("layout.imagevisibility.numscrollportwidths", 1); pref("layout.imagevisibility.numscrollportwidths", 1);
pref("layout.imagevisibility.numscrollportheights", 1); pref("layout.imagevisibility.numscrollportheights", 1);
// Don't enable <input type=color> yet as we don't have a color picker
// implemented for Windows Metro (bug 895464)
pref("dom.forms.color", false);

View File

@ -1,7 +1,13 @@
# Simple test. Should fail on platforms where input type color isn't activated
# yet. Missing platforms are B2G (bug 875751), Android (bug 875750) and Metro
# (bug 895464).
fails-if(B2G||Android) == input-color-1.html input-color-1-ref.html
default-preferences pref(dom.forms.color,true) default-preferences pref(dom.forms.color,true)
fails-if(B2G) == input-color-1.html input-color-1-ref.html # bug 928877 # Despite the "default-preferences" line above, B2G and Android are still
fails-if(B2G) == margin-padding-1.html margin-padding-1-ref.html # bug 928877 # excluded from some style in forms.css, which makes the following tests fail.
fails-if(B2G||Android) == margin-padding-1.html margin-padding-1-ref.html
== block-invalidate-1.html block-invalidate-1-ref.html == block-invalidate-1.html block-invalidate-1-ref.html
fails-if(B2G) == transformations-1.html transformations-1-ref.html # bug 928877 fails-if(B2G||Android) == transformations-1.html transformations-1-ref.html
fails-if(B2G) == custom-style-1.html custom-style-1-ref.html # bug 928877 fails-if(B2G||Android) == custom-style-1.html custom-style-1-ref.html

View File

@ -10,6 +10,12 @@
@namespace url(http://www.w3.org/1999/xhtml); /* set default namespace to HTML */ @namespace url(http://www.w3.org/1999/xhtml); /* set default namespace to HTML */
@namespace xul url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul); @namespace xul url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
%ifdef ANDROID
%define INPUT_TYPE_COLOR_UNSUPPORTED
%elifdef MOZ_WIDGET_GONK
%define INPUT_TYPE_COLOR_UNSUPPORTED
%endif
*|*::-moz-fieldset-content { *|*::-moz-fieldset-content {
display: block; display: block;
unicode-bidi: inherit; unicode-bidi: inherit;
@ -541,7 +547,9 @@ input[type="radio"]:hover:active {
/* Non text-related properties for buttons: these ones are shared with /* Non text-related properties for buttons: these ones are shared with
input[type="color"] */ input[type="color"] */
button, button,
%ifndef INPUT_TYPE_COLOR_UNSUPPORTED
input[type="color"], input[type="color"],
%endif
input[type="reset"], input[type="reset"],
input[type="button"], input[type="button"],
input[type="submit"] { input[type="submit"] {
@ -585,7 +593,9 @@ button {
} }
button:hover, button:hover,
%ifndef INPUT_TYPE_COLOR_UNSUPPORTED
input[type="color"]:hover, input[type="color"]:hover,
%endif
input[type="reset"]:hover, input[type="reset"]:hover,
input[type="button"]:hover, input[type="button"]:hover,
input[type="submit"]:hover { input[type="submit"]:hover {
@ -600,7 +610,9 @@ input[type="submit"]:hover {
} }
button:active:hover, button:active:hover,
%ifndef INPUT_TYPE_COLOR_UNSUPPORTED
input[type="color"]:active:hover, input[type="color"]:active:hover,
%endif
input[type="reset"]:active:hover, input[type="reset"]:active:hover,
input[type="button"]:active:hover, input[type="button"]:active:hover,
input[type="submit"]:active:hover { input[type="submit"]:active:hover {
@ -617,7 +629,9 @@ input[type="submit"]:active:hover {
} }
button::-moz-focus-inner, button::-moz-focus-inner,
%ifndef INPUT_TYPE_COLOR_UNSUPPORTED
input[type="color"]::-moz-focus-inner, input[type="color"]::-moz-focus-inner,
%endif
input[type="reset"]::-moz-focus-inner, input[type="reset"]::-moz-focus-inner,
input[type="button"]::-moz-focus-inner, input[type="button"]::-moz-focus-inner,
input[type="submit"]::-moz-focus-inner, input[type="submit"]::-moz-focus-inner,
@ -627,7 +641,9 @@ input[type="file"] > button[type="button"]::-moz-focus-inner {
} }
button:-moz-focusring::-moz-focus-inner, button:-moz-focusring::-moz-focus-inner,
%ifndef INPUT_TYPE_COLOR_UNSUPPORTED
input[type="color"]:-moz-focusring::-moz-focus-inner, input[type="color"]:-moz-focusring::-moz-focus-inner,
%endif
input[type="reset"]:-moz-focusring::-moz-focus-inner, input[type="reset"]:-moz-focusring::-moz-focus-inner,
input[type="button"]:-moz-focusring::-moz-focus-inner, input[type="button"]:-moz-focusring::-moz-focus-inner,
input[type="submit"]:-moz-focusring::-moz-focus-inner, input[type="submit"]:-moz-focusring::-moz-focus-inner,
@ -636,8 +652,10 @@ input[type="file"] > button[type="button"]:-moz-focusring::-moz-focus-inner {
} }
button:disabled:active, button:disabled, button:disabled:active, button:disabled,
%ifndef INPUT_TYPE_COLOR_UNSUPPORTED
input[type="color"]:disabled:active, input[type="color"]:disabled:active,
input[type="color"]:disabled, input[type="color"]:disabled,
%endif
input[type="reset"]:disabled:active, input[type="reset"]:disabled:active,
input[type="reset"]:disabled, input[type="reset"]:disabled,
input[type="button"]:disabled:active, input[type="button"]:disabled:active,

View File

@ -164,6 +164,9 @@ pref("layout.spellcheckDefault", 0);
/* new html5 forms */ /* new html5 forms */
pref("dom.experimental_forms", true); pref("dom.experimental_forms", true);
pref("dom.forms.number", true); pref("dom.forms.number", true);
// Don't enable <input type=color> yet as we don't have a color picker
// implemented for Android (bug 875750)
pref("dom.forms.color", false);
/* extension manager and xpinstall */ /* extension manager and xpinstall */
pref("xpinstall.whitelist.add", "addons.mozilla.org"); pref("xpinstall.whitelist.add", "addons.mozilla.org");

View File

@ -853,8 +853,9 @@ pref("dom.min_background_timeout_value", 1000);
pref("dom.experimental_forms", false); pref("dom.experimental_forms", false);
pref("dom.forms.number", false); pref("dom.forms.number", false);
// Don't enable <input type=color> yet: // Enable <input type=color> by default. It will be turned off for remaining
pref("dom.forms.color", false); // platforms which don't have a color picker implemented yet.
pref("dom.forms.color", true);
// Enables system messages and activities // Enables system messages and activities
pref("dom.sysmsg.enabled", false); pref("dom.sysmsg.enabled", false);