Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 09:15:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1215455 - eslint react/jsx-curly-spacing [r=Standard8]

Browse Source
This commit is contained in:
Ed Lee 2015-10-17 00:10:34 -07:00
parent 4ca7c2f33f
commit 02291fbb9c
5 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/components/loop/.eslintrc
View File

@ -129,8 +129,7 @@
"react/prop-types": 2,
"react/self-closing-comp": 2,
"react/wrap-multilines": 2,
// We would probably want to go with a variant of never.
"react/jsx-curly-spacing": 0,
"react/jsx-curly-spacing": [2, "never"],
// Not worth it: React is defined globally
"react/jsx-uses-react": 0,
"react/react-in-jsx-scope": 0,

8
browser/components/loop/content/shared/js/views.js
View File

@ -1121,9 +1121,9 @@ loop.shared.views = (function(_, mozL10n) {
mediaType: "remote",
posterUrl: this.props.remotePosterUrl,
srcMediaElement: this.props.remoteSrcMediaElement}),
this.state.localMediaAboslutelyPositioned ?
this.state.localMediaAboslutelyPositioned ?
this.renderLocalVideo() : null,
this.props.displayScreenShare ? null : this.props.children
this.props.displayScreenShare ? null : this.props.children
),
React.createElement("div", {className: screenShareStreamClasses},
React.createElement(MediaView, {displayAvatar: false,
@ -1131,13 +1131,13 @@ loop.shared.views = (function(_, mozL10n) {
mediaType: "screen-share",
posterUrl: this.props.screenSharePosterUrl,
srcMediaElement: this.props.screenShareMediaElement}),
this.props.displayScreenShare ? this.props.children : null
this.props.displayScreenShare ? this.props.children : null
),
React.createElement(loop.shared.views.chat.TextChatView, {
dispatcher: this.props.dispatcher,
showRoomName: this.props.showContextRoomName,
useDesktopPaths: this.props.useDesktopPaths}),
this.state.localMediaAboslutelyPositioned ?
this.state.localMediaAboslutelyPositioned ?
null : this.renderLocalVideo()
)
)

12
browser/components/loop/content/shared/js/views.jsx
View File

@ -1121,9 +1121,9 @@ loop.shared.views = (function(_, mozL10n) {
mediaType="remote"
posterUrl={this.props.remotePosterUrl}
srcMediaElement={this.props.remoteSrcMediaElement} />
{ this.state.localMediaAboslutelyPositioned ?
this.renderLocalVideo() : null }
{ this.props.displayScreenShare ? null : this.props.children }
{this.state.localMediaAboslutelyPositioned ?
this.renderLocalVideo() : null}
{this.props.displayScreenShare ? null : this.props.children}
</div>
<div className={screenShareStreamClasses}>
<MediaView displayAvatar={false}
@ -1131,14 +1131,14 @@ loop.shared.views = (function(_, mozL10n) {
mediaType="screen-share"
posterUrl={this.props.screenSharePosterUrl}
srcMediaElement={this.props.screenShareMediaElement} />
{ this.props.displayScreenShare ? this.props.children : null }
{this.props.displayScreenShare ? this.props.children : null}
</div>
<loop.shared.views.chat.TextChatView
dispatcher={this.props.dispatcher}
showRoomName={this.props.showContextRoomName}
useDesktopPaths={this.props.useDesktopPaths} />
{ this.state.localMediaAboslutelyPositioned ?
null : this.renderLocalVideo() }
{this.state.localMediaAboslutelyPositioned ?
null : this.renderLocalVideo()}
</div>
</div>
);

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

@ -97,7 +97,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
_renderFailureText: function() {
return (
React.createElement("p", {className: "failure"}, mozL10n.get("rooms_already_joined") )
React.createElement("p", {className: "failure"}, mozL10n.get("rooms_already_joined"))
);
},
@ -109,8 +109,8 @@ loop.standaloneRoomViews = (function(mozL10n) {
React.createElement("div", {className: "handle-user-agent-view-scroller"},
React.createElement("div", {className: "handle-user-agent-view"},
React.createElement("div", {className: "info-panel"},
React.createElement("p", {className: "loop-logo-text", title: mozL10n.get("clientShortname2") }),
React.createElement("p", {className: "roomName"}, this.state.roomName),
React.createElement("p", {className: "loop-logo-text", title: mozL10n.get("clientShortname2")}),
React.createElement("p", {className: "roomName"}, this.state.roomName),
React.createElement("p", {className: "loop-logo"}),
this.state.failureReason ?

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

@ -97,7 +97,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
_renderFailureText: function() {
return (
<p className="failure">{ mozL10n.get("rooms_already_joined") }</p>
<p className="failure">{mozL10n.get("rooms_already_joined")}</p>
);
},
@ -109,8 +109,8 @@ loop.standaloneRoomViews = (function(mozL10n) {
<div className="handle-user-agent-view-scroller">
<div className="handle-user-agent-view">
<div className="info-panel">
<p className="loop-logo-text" title={ mozL10n.get("clientShortname2") }></p>
<p className="roomName">{ this.state.roomName }</p>
<p className="loop-logo-text" title={mozL10n.get("clientShortname2")}></p>
<p className="roomName">{this.state.roomName}</p>
<p className="loop-logo" />
{
this.state.failureReason ?