зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1142515: rename the pref contextInConverations to contextInConverSations, fixing a typo. r=Standard8
This commit is contained in:
Родитель
46a3f493b3
Коммит
7fb5d31c3d
|
@ -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.show", false);
|
||||||
pref("loop.contacts.gravatars.promo", true);
|
pref("loop.contacts.gravatars.promo", true);
|
||||||
pref("loop.browserSharing.showInfoBar", true);
|
pref("loop.browserSharing.showInfoBar", true);
|
||||||
pref("loop.contextInConverations.enabled", false);
|
pref("loop.contextInConversations.enabled", false);
|
||||||
|
|
||||||
pref("social.sidebar.unload_timeout_ms", 10000);
|
pref("social.sidebar.unload_timeout_ms", 10000);
|
||||||
|
|
||||||
|
|
|
@ -714,7 +714,7 @@ loop.panel = (function(_, mozL10n) {
|
||||||
var contextClasses = React.addons.classSet({
|
var contextClasses = React.addons.classSet({
|
||||||
context: true,
|
context: true,
|
||||||
hide: !hostname ||
|
hide: !hostname ||
|
||||||
!this.props.mozLoop.getLoopPref("contextInConverations.enabled")
|
!this.props.mozLoop.getLoopPref("contextInConversations.enabled")
|
||||||
});
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|
|
@ -714,7 +714,7 @@ loop.panel = (function(_, mozL10n) {
|
||||||
var contextClasses = React.addons.classSet({
|
var contextClasses = React.addons.classSet({
|
||||||
context: true,
|
context: true,
|
||||||
hide: !hostname ||
|
hide: !hostname ||
|
||||||
!this.props.mozLoop.getLoopPref("contextInConverations.enabled")
|
!this.props.mozLoop.getLoopPref("contextInConversations.enabled")
|
||||||
});
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|
|
@ -408,7 +408,7 @@ loop.roomViews = (function(mozL10n) {
|
||||||
|
|
||||||
_shouldRenderContextView: function() {
|
_shouldRenderContextView: function() {
|
||||||
return !!(
|
return !!(
|
||||||
this.props.mozLoop.getLoopPref("contextInConverations.enabled") &&
|
this.props.mozLoop.getLoopPref("contextInConversations.enabled") &&
|
||||||
(this.state.roomContextUrls || this.state.roomDescription)
|
(this.state.roomContextUrls || this.state.roomDescription)
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|
|
@ -408,7 +408,7 @@ loop.roomViews = (function(mozL10n) {
|
||||||
|
|
||||||
_shouldRenderContextView: function() {
|
_shouldRenderContextView: function() {
|
||||||
return !!(
|
return !!(
|
||||||
this.props.mozLoop.getLoopPref("contextInConverations.enabled") &&
|
this.props.mozLoop.getLoopPref("contextInConversations.enabled") &&
|
||||||
(this.state.roomContextUrls || this.state.roomDescription)
|
(this.state.roomContextUrls || this.state.roomDescription)
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|
|
@ -126,7 +126,7 @@ navigator.mozLoop = {
|
||||||
// Ensure we skip FTE completely.
|
// Ensure we skip FTE completely.
|
||||||
case "gettingStarted.seen":
|
case "gettingStarted.seen":
|
||||||
case "contacts.gravatars.promo":
|
case "contacts.gravatars.promo":
|
||||||
case "contextInConverations.enabled":
|
case "contextInConversations.enabled":
|
||||||
return true;
|
return true;
|
||||||
case "contacts.gravatars.show":
|
case "contacts.gravatars.show":
|
||||||
return false;
|
return false;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче