Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #22637 from lightsofapollo/reland-webcomp-off
Browse files Browse the repository at this point in the history
Bug 1038439 - Remove web components preference from Gaia. r=vingtetun
  • Loading branch information
lightsofapollo authored and rvandermeulen committed Aug 12, 2014
1 parent 88e774c commit 6155d46
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 4 deletions.
4 changes: 4 additions & 0 deletions Makefile
Expand Up @@ -700,6 +700,10 @@ ifeq ($(DOGFOOD),1)
EXTENDED_PREF_FILES += dogfood-prefs.js
endif

ifeq ($(DEBUG),1)
EXTENDED_PREF_FILES += debug-prefs.js
endif

# Optional partner provided preference files. They will be added
# after the ones on the EXTENDED_PREF_FILES and they will be read
# from the GAIA_DISTRIBUTION_DIR directory
Expand Down
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -224,3 +224,4 @@ You could generate single app doc with this:
```sh
$ grunt jsdoc:system
```

7 changes: 7 additions & 0 deletions build/config/debug-prefs.js
@@ -0,0 +1,7 @@
/* global pref */

// This pref is only for firefox tests which contain web components and
// debugging/testing portions of gaia in firefox nightly. We can remove this
// pref once webcomponents are ready for the entire web (and not just certified
// apps seee bug 1000199)
pref('dom.webcomponents.enabled', true);
3 changes: 0 additions & 3 deletions build/preferences.js
Expand Up @@ -56,9 +56,6 @@ PreferencesBuilder.prototype.preparePref = function() {
this.prefs['layout.css.sticky.enabled'] = true;
this.prefs['intl.uidirection.qps-plocm'] = 'rtl';

// This pref can be removed once bug 1000199 has landed
this.prefs['dom.webcomponents.enabled'] = true;

// for https://bugzilla.mozilla.org/show_bug.cgi?id=811605 to let user know
//what prefs is for ril debugging
this.prefs['ril.debugging.enabled'] = false;
Expand Down
1 change: 0 additions & 1 deletion build/test/unit/preference.test.js
Expand Up @@ -317,7 +317,6 @@ suite('preferences.js', function() {
'b2g.system_startup_url': 'app://system8000/index.html',
'network.http.max-connections-per-server': 15,
'dom.mozInputMethod.enabled': true,
'dom.webcomponents.enabled': true,
'intl.uidirection.qps-plocm': 'rtl',
'layout.css.sticky.enabled': true,
'ril.debugging.enabled': false,
Expand Down

0 comments on commit 6155d46

Please sign in to comment.