Bug 1208466 - Part 3. Fix display when opening room, and make the opened room text non-bold. r=mikedeboer
authorMark Banner <standard8@mozilla.com>
Mon, 28 Sep 2015 16:08:27 +0100
changeset 296843 642b7adaf3da296a76beb8920ef0f0487cbe53e3
parent 296842 396173a9720e87cf94ae8b23b075619a0440f1ed
child 296844 161d0b4fcccd21481a3a76eb01943bae5208c90a
push id5885
push usermleibovic@mozilla.com
push dateMon, 28 Sep 2015 18:19:32 +0000
reviewersmikedeboer
bugs1208466
milestone44.0a1
Bug 1208466 - Part 3. Fix display when opening room, and make the opened room text non-bold. r=mikedeboer
browser/components/loop/standalone/content/css/webapp.css
browser/components/loop/standalone/content/js/standaloneRoomViews.js
browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
browser/components/loop/test/standalone/standaloneRoomViews_test.js
--- a/browser/components/loop/standalone/content/css/webapp.css
+++ b/browser/components/loop/standalone/content/css/webapp.css
@@ -190,16 +190,17 @@ html[dir="rtl"] .rooms-footer .footer-lo
   font-size: 1.6rem;
   font-weight: bold;
 }
 
 .handle-user-agent-view > .info-panel > button.disabled {
   background-color: #EBEBEB;
   border-color: #EBEBEB;
   color: #B2B0B3;
+  font-weight: normal;
 }
 
 /* Room wrapper layout */
 
 .room-conversation-wrapper {
   position: relative;
   height: 100%;
   background: #000;
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.js
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
@@ -675,21 +675,21 @@ loop.standaloneRoomViews = (function(moz
     },
 
     getInitialState: function() {
       return this.getStoreState();
     },
 
     render: function() {
       // If we don't know yet, don't display anything.
-      if (this.state.firefoxHandlesRoom === undefined) {
+      if (this.state.userAgentHandlesRoom === undefined) {
         return null;
       }
 
-      if (this.state.firefoxHandlesRoom) {
+      if (this.state.userAgentHandlesRoom) {
         return (
           React.createElement(StandaloneHandleUserAgentView, {
             dispatcher: this.props.dispatcher})
         );
       }
 
       return (
         React.createElement(StandaloneRoomView, {
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
@@ -675,21 +675,21 @@ loop.standaloneRoomViews = (function(moz
     },
 
     getInitialState: function() {
       return this.getStoreState();
     },
 
     render: function() {
       // If we don't know yet, don't display anything.
-      if (this.state.firefoxHandlesRoom === undefined) {
+      if (this.state.userAgentHandlesRoom === undefined) {
         return null;
       }
 
-      if (this.state.firefoxHandlesRoom) {
+      if (this.state.userAgentHandlesRoom) {
         return (
           <StandaloneHandleUserAgentView
             dispatcher={this.props.dispatcher} />
         );
       }
 
       return (
         <StandaloneRoomView
--- a/browser/components/loop/test/standalone/standaloneRoomViews_test.js
+++ b/browser/components/loop/test/standalone/standaloneRoomViews_test.js
@@ -931,38 +931,38 @@ describe("loop.standaloneRoomViews", fun
           loop.standaloneRoomViews.StandaloneRoomControllerView, {
         dispatcher: dispatcher,
         isFirefox: true
       }));
     }
 
     it("should not display anything if it is not known if Firefox can handle the room", function() {
       activeRoomStore.setStoreState({
-        firefoxHandlesRoom: undefined
+        userAgentHandlesRoom: undefined
       });
 
       view = mountTestComponent();
 
       expect(view.getDOMNode()).eql(null);
     });
 
     it("should render StandaloneHandleUserAgentView if Firefox can handle the room", function() {
       activeRoomStore.setStoreState({
-        firefoxHandlesRoom: true
+        userAgentHandlesRoom: true
       });
 
       view = mountTestComponent();
 
       TestUtils.findRenderedComponentWithType(view,
         loop.standaloneRoomViews.StandaloneHandleUserAgentView);
     });
 
     it("should render StandaloneRoomView if Firefox cannot handle the room", function() {
       activeRoomStore.setStoreState({
-        firefoxHandlesRoom: false
+        userAgentHandlesRoom: false
       });
 
       view = mountTestComponent();
 
       TestUtils.findRenderedComponentWithType(view,
         loop.standaloneRoomViews.StandaloneRoomView);
     });
   });