mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-02 07:05:24 +00:00
Bug 1208466 - Part 3. Fix display when opening room, and make the opened room text non-bold. r=mikedeboer
This commit is contained in:
parent
427e64138f
commit
81cf28c78e
@ -195,6 +195,7 @@ html[dir="rtl"] .rooms-footer .footer-logo {
|
||||
background-color: #EBEBEB;
|
||||
border-color: #EBEBEB;
|
||||
color: #B2B0B3;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
/* Room wrapper layout */
|
||||
|
@ -680,11 +680,11 @@ loop.standaloneRoomViews = (function(mozL10n) {
|
||||
|
||||
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})
|
||||
|
@ -680,11 +680,11 @@ loop.standaloneRoomViews = (function(mozL10n) {
|
||||
|
||||
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} />
|
||||
|
@ -936,7 +936,7 @@ describe("loop.standaloneRoomViews", function() {
|
||||
|
||||
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();
|
||||
@ -946,7 +946,7 @@ describe("loop.standaloneRoomViews", function() {
|
||||
|
||||
it("should render StandaloneHandleUserAgentView if Firefox can handle the room", function() {
|
||||
activeRoomStore.setStoreState({
|
||||
firefoxHandlesRoom: true
|
||||
userAgentHandlesRoom: true
|
||||
});
|
||||
|
||||
view = mountTestComponent();
|
||||
@ -957,7 +957,7 @@ describe("loop.standaloneRoomViews", function() {
|
||||
|
||||
it("should render StandaloneRoomView if Firefox cannot handle the room", function() {
|
||||
activeRoomStore.setStoreState({
|
||||
firefoxHandlesRoom: false
|
||||
userAgentHandlesRoom: false
|
||||
});
|
||||
|
||||
view = mountTestComponent();
|
||||
|
Loading…
Reference in New Issue
Block a user