wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1208466 - Part 3. Fix display when opening room, and make the opened room text non-bold. r=mikedeboer

Browse Source
This commit is contained in:
Mark Banner 2015-09-28 16:08:27 +01:00
parent 5da7557499
commit c33c3d4761
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/components/loop/standalone/content/css/webapp.css
View File

@ -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 */

4
browser/components/loop/standalone/content/js/standaloneRoomViews.js
View File

@ -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})

4
browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
View File

@ -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} />

6
browser/components/loop/test/standalone/standaloneRoomViews_test.js
View File

@ -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();