corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 2ba82990c44b (bug 1170627) for bc1/bc3 test failures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2015-06-10 15:55:15 +02:00
parent beaa69522b
commit 58f5df0708
6 changed files with 11 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
browser/components/loop/content/js/roomViews.js
View File

@@ -338,13 +338,6 @@ loop.roomViews = (function(mozL10n) {
}
}
// Make sure we do not show the edit-mode when we just successfully saved
// context.
if (this.props.savingContext && nextProps.savingContext !== this.props.savingContext &&
!nextProps.error && this.state.editMode) {
newState.editMode = false;
}
if (Object.getOwnPropertyNames(newState).length) {
this.setState(newState);
}
@@ -352,7 +345,7 @@ loop.roomViews = (function(mozL10n) {
getDefaultProps: function() {
return { editMode: false };
},
},
getInitialState: function() {
var url = this._getURL();
@@ -535,7 +528,7 @@ loop.roomViews = (function(mozL10n) {
React.createElement("button", {className: "btn btn-info",
disabled: this.props.savingContext,
onClick: this.handleFormSubmit},
mozL10n.get("context_save_label2")
mozL10n.get("context_save_label")
),
React.createElement("button", {className: "room-context-btn-close",
onClick: this.handleCloseClick,