diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index f40071a8d8e0..ce0ac1985e77 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -1719,7 +1719,7 @@ pref("loop.support_url", "https://support.mozilla.org/kb/group-conversations-fir pref("loop.contacts.gravatars.show", false); pref("loop.contacts.gravatars.promo", true); pref("loop.browserSharing.showInfoBar", true); -pref("loop.contextInConverations.enabled", false); +pref("loop.contextInConversations.enabled", false); pref("social.sidebar.unload_timeout_ms", 10000); diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js index 10563052f1f0..afc0ee6a19dc 100644 --- a/browser/components/loop/content/js/panel.js +++ b/browser/components/loop/content/js/panel.js @@ -714,7 +714,7 @@ loop.panel = (function(_, mozL10n) { var contextClasses = React.addons.classSet({ context: true, hide: !hostname || - !this.props.mozLoop.getLoopPref("contextInConverations.enabled") + !this.props.mozLoop.getLoopPref("contextInConversations.enabled") }); return ( diff --git a/browser/components/loop/content/js/panel.jsx b/browser/components/loop/content/js/panel.jsx index 4e7d134c8ec9..bd7112280163 100644 --- a/browser/components/loop/content/js/panel.jsx +++ b/browser/components/loop/content/js/panel.jsx @@ -714,7 +714,7 @@ loop.panel = (function(_, mozL10n) { var contextClasses = React.addons.classSet({ context: true, hide: !hostname || - !this.props.mozLoop.getLoopPref("contextInConverations.enabled") + !this.props.mozLoop.getLoopPref("contextInConversations.enabled") }); return ( diff --git a/browser/components/loop/content/js/roomViews.js b/browser/components/loop/content/js/roomViews.js index 97164f1360de..faa326dd55eb 100644 --- a/browser/components/loop/content/js/roomViews.js +++ b/browser/components/loop/content/js/roomViews.js @@ -408,7 +408,7 @@ loop.roomViews = (function(mozL10n) { _shouldRenderContextView: function() { return !!( - this.props.mozLoop.getLoopPref("contextInConverations.enabled") && + this.props.mozLoop.getLoopPref("contextInConversations.enabled") && (this.state.roomContextUrls || this.state.roomDescription) ); }, diff --git a/browser/components/loop/content/js/roomViews.jsx b/browser/components/loop/content/js/roomViews.jsx index 6d734cc9a365..d96a27f05bc4 100644 --- a/browser/components/loop/content/js/roomViews.jsx +++ b/browser/components/loop/content/js/roomViews.jsx @@ -408,7 +408,7 @@ loop.roomViews = (function(mozL10n) { _shouldRenderContextView: function() { return !!( - this.props.mozLoop.getLoopPref("contextInConverations.enabled") && + this.props.mozLoop.getLoopPref("contextInConversations.enabled") && (this.state.roomContextUrls || this.state.roomDescription) ); }, diff --git a/browser/components/loop/ui/fake-mozLoop.js b/browser/components/loop/ui/fake-mozLoop.js index 0037ea7acb16..7d2205f47553 100644 --- a/browser/components/loop/ui/fake-mozLoop.js +++ b/browser/components/loop/ui/fake-mozLoop.js @@ -126,7 +126,7 @@ navigator.mozLoop = { // Ensure we skip FTE completely. case "gettingStarted.seen": case "contacts.gravatars.promo": - case "contextInConverations.enabled": + case "contextInConversations.enabled": return true; case "contacts.gravatars.show": return false;