Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-02 07:05:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1212348 - Loop's RoomList view requires user profile data passed in when it doesn't need to. r=mikedeboer

Browse Source
This commit is contained in:
Mark Banner 2015-10-08 11:30:06 +01:00
parent bc83c52931
commit 93963ee2bc
2 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
browser/components/loop/content/js/panel.js
View File

@ -668,9 +668,7 @@ loop.panel = (function(_, mozL10n) {
propTypes: {
dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
mozLoop: React.PropTypes.object.isRequired,
store: React.PropTypes.instanceOf(loop.store.RoomStore).isRequired,
// Used for room creation, associated with room owner.
userProfile: userProfileValidator
store: React.PropTypes.instanceOf(loop.store.RoomStore).isRequired
},
getInitialState: function() {
@ -703,11 +701,6 @@ loop.panel = (function(_, mozL10n) {
this.setState(this.props.store.getStoreState());
},
_getUserDisplayName: function() {
return this.props.userProfile && this.props.userProfile.email ||
mozL10n.get("display_name_guest");
},
/**
* Let the user know we're loading rooms
* @returns {Object} React render
@ -746,8 +739,7 @@ loop.panel = (function(_, mozL10n) {
React.createElement(NewRoomView, {dispatcher: this.props.dispatcher,
mozLoop: this.props.mozLoop,
pendingOperation: this.state.pendingCreation ||
this.state.pendingInitialRetrieval,
userDisplayName: this._getUserDisplayName()})
this.state.pendingInitialRetrieval})
);
},
@ -792,8 +784,7 @@ loop.panel = (function(_, mozL10n) {
propTypes: {
dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
mozLoop: React.PropTypes.object.isRequired,
pendingOperation: React.PropTypes.bool.isRequired,
userDisplayName: React.PropTypes.string.isRequired
pendingOperation: React.PropTypes.bool.isRequired
},
mixins: [
@ -1002,8 +993,7 @@ loop.panel = (function(_, mozL10n) {
notifications: this.props.notifications}),
React.createElement(RoomList, {dispatcher: this.props.dispatcher,
mozLoop: this.props.mozLoop,
store: this.props.roomStore,
userProfile: this.state.userProfile}),
store: this.props.roomStore}),
React.createElement("div", {className: "footer"},
React.createElement("div", {className: "user-details"},
React.createElement(AvailabilityDropdown, null)

18
browser/components/loop/content/js/panel.jsx
View File

@ -668,9 +668,7 @@ loop.panel = (function(_, mozL10n) {
propTypes: {
dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
mozLoop: React.PropTypes.object.isRequired,
store: React.PropTypes.instanceOf(loop.store.RoomStore).isRequired,
// Used for room creation, associated with room owner.
userProfile: userProfileValidator
store: React.PropTypes.instanceOf(loop.store.RoomStore).isRequired
},
getInitialState: function() {
@ -703,11 +701,6 @@ loop.panel = (function(_, mozL10n) {
this.setState(this.props.store.getStoreState());
},
_getUserDisplayName: function() {
return this.props.userProfile && this.props.userProfile.email ||
mozL10n.get("display_name_guest");
},
/**
* Let the user know we're loading rooms
* @returns {Object} React render
@ -746,8 +739,7 @@ loop.panel = (function(_, mozL10n) {
<NewRoomView dispatcher={this.props.dispatcher}
mozLoop={this.props.mozLoop}
pendingOperation={this.state.pendingCreation ||
this.state.pendingInitialRetrieval}
userDisplayName={this._getUserDisplayName()} />
this.state.pendingInitialRetrieval} />
);
},
@ -792,8 +784,7 @@ loop.panel = (function(_, mozL10n) {
propTypes: {
dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
mozLoop: React.PropTypes.object.isRequired,
pendingOperation: React.PropTypes.bool.isRequired,
userDisplayName: React.PropTypes.string.isRequired
pendingOperation: React.PropTypes.bool.isRequired
},
mixins: [
@ -1002,8 +993,7 @@ loop.panel = (function(_, mozL10n) {
notifications={this.props.notifications} />
<RoomList dispatcher={this.props.dispatcher}
mozLoop={this.props.mozLoop}
store={this.props.roomStore}
userProfile={this.state.userProfile} />
store={this.props.roomStore} />
<div className="footer">
<div className="user-details">
<AvailabilityDropdown />