Bug 1142515: rename the pref contextInConverations to contextInConverSations, fixing a typo. r=Standard8
authorMike de Boer <mdeboer@mozilla.com>
Thu, 07 May 2015 11:38:49 +0200
changeset 272563 75784d87edf5a57bd5dc8ecb921b87d91055f6f0
parent 272562 93f39df2f4f3f45adcf6cf1ab09428768c695dd8
child 272564 8fe39788519c4aa9a9b93797a4b270001e48d333
push id4830
push userjlund@mozilla.com
push dateMon, 29 Jun 2015 20:18:48 +0000
treeherdermozilla-beta@4c2175bb0420 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs1142515
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1142515: rename the pref contextInConverations to contextInConverSations, fixing a typo. r=Standard8
browser/app/profile/firefox.js
browser/components/loop/content/js/panel.js
browser/components/loop/content/js/panel.jsx
browser/components/loop/content/js/roomViews.js
browser/components/loop/content/js/roomViews.jsx
browser/components/loop/ui/fake-mozLoop.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1714,17 +1714,17 @@ pref("loop.CSP", "default-src 'self' abo
 pref("loop.oauth.google.redirect_uri", "urn:ietf:wg:oauth:2.0:oob:auto");
 pref("loop.oauth.google.scope", "https://www.google.com/m8/feeds");
 pref("loop.fxa_oauth.tokendata", "");
 pref("loop.fxa_oauth.profile", "");
 pref("loop.support_url", "https://support.mozilla.org/kb/group-conversations-firefox-hello-webrtc");
 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);
 
 // activation from inside of share panel is possible if activationPanelEnabled
 // is true. Pref'd off for release while usage testing is done through beta.
 #ifdef EARLY_BETA_OR_EARLIER
 pref("social.share.activationPanelEnabled", true);
 #else
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -709,17 +709,17 @@ loop.panel = (function(_, mozL10n) {
         hostname = new URL(this.state.url).hostname;
       } catch (ex) {
         // Empty catch - if there's an error, then we won't show the context.
       }
 
       var contextClasses = React.addons.classSet({
         context: true,
         hide: !hostname ||
-          !this.props.mozLoop.getLoopPref("contextInConverations.enabled")
+          !this.props.mozLoop.getLoopPref("contextInConversations.enabled")
       });
 
       return (
         React.createElement("div", {className: "new-room-view"}, 
           React.createElement("div", {className: contextClasses}, 
             React.createElement("label", {className: "context-enabled"}, 
               React.createElement("input", {className: "context-checkbox", 
                      type: "checkbox", onChange: this.onCheckboxChange}), 
--- a/browser/components/loop/content/js/panel.jsx
+++ b/browser/components/loop/content/js/panel.jsx
@@ -709,17 +709,17 @@ loop.panel = (function(_, mozL10n) {
         hostname = new URL(this.state.url).hostname;
       } catch (ex) {
         // Empty catch - if there's an error, then we won't show the context.
       }
 
       var contextClasses = React.addons.classSet({
         context: true,
         hide: !hostname ||
-          !this.props.mozLoop.getLoopPref("contextInConverations.enabled")
+          !this.props.mozLoop.getLoopPref("contextInConversations.enabled")
       });
 
       return (
         <div className="new-room-view">
           <div className={contextClasses}>
             <label className="context-enabled">
               <input className="context-checkbox"
                      type="checkbox" onChange={this.onCheckboxChange}/>
--- a/browser/components/loop/content/js/roomViews.js
+++ b/browser/components/loop/content/js/roomViews.js
@@ -403,17 +403,17 @@ loop.roomViews = (function(mozL10n) {
     },
 
     _shouldRenderInvitationOverlay: function() {
       return (this.state.roomState !== ROOM_STATES.HAS_PARTICIPANTS);
     },
 
     _shouldRenderContextView: function() {
       return !!(
-        this.props.mozLoop.getLoopPref("contextInConverations.enabled") &&
+        this.props.mozLoop.getLoopPref("contextInConversations.enabled") &&
         (this.state.roomContextUrls || this.state.roomDescription)
       );
     },
 
     render: function() {
       if (this.state.roomName) {
         this.setTitle(this.state.roomName);
       }
--- a/browser/components/loop/content/js/roomViews.jsx
+++ b/browser/components/loop/content/js/roomViews.jsx
@@ -403,17 +403,17 @@ loop.roomViews = (function(mozL10n) {
     },
 
     _shouldRenderInvitationOverlay: function() {
       return (this.state.roomState !== ROOM_STATES.HAS_PARTICIPANTS);
     },
 
     _shouldRenderContextView: function() {
       return !!(
-        this.props.mozLoop.getLoopPref("contextInConverations.enabled") &&
+        this.props.mozLoop.getLoopPref("contextInConversations.enabled") &&
         (this.state.roomContextUrls || this.state.roomDescription)
       );
     },
 
     render: function() {
       if (this.state.roomName) {
         this.setTitle(this.state.roomName);
       }
--- a/browser/components/loop/ui/fake-mozLoop.js
+++ b/browser/components/loop/ui/fake-mozLoop.js
@@ -121,17 +121,17 @@ var fakeContacts = [{
 navigator.mozLoop = {
   ensureRegistered: function() {},
   getAudioBlob: function(){},
   getLoopPref: function(pref) {
     switch(pref) {
       // 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;
     }
   },
   setLoopPref: function(){},
   releaseCallData: function() {},
   copyString: function() {},