mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Remove trailing whitespace

Browse source
This commit is contained in:
Mark Haines 2016-03-15 18:38:24 +00:00
parent eb01cb9cba
commit 31915db6f6
31 changed files with 103 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/structures/LeftPanel.js
View file

@ -40,7 +40,7 @@ var LeftPanel = React.createClass({
componentWillReceiveProps: function(newProps) {
this._recheckCallElement(newProps.selectedRoom);
},
},
componentWillUnmount: function() {
dis.unregister(this.dispatcherRef);
@ -95,7 +95,7 @@ var LeftPanel = React.createClass({
}
else {
// Hide the collapse button until we work out how to display it in the new skin
// collapseButton = <img className="mx_LeftPanel_hideButton" onClick={ this.onHideClick } src="img/hide.png" width="12" height="20" alt="<"/>
// collapseButton = <img className="mx_LeftPanel_hideButton" onClick={ this.onHideClick } src="img/hide.png" width="12" height="20" alt="<"/>
}
var callPreview;

2
src/components/structures/RightPanel.js
View file

@ -38,7 +38,7 @@ module.exports = React.createClass({
},
componentWillUnmount: function() {
dis.unregister(this.dispatcherRef);
dis.unregister(this.dispatcherRef);
if (MatrixClientPeg.get()) {
MatrixClientPeg.get().removeListener("RoomState.members", this.onRoomStateMember);
}

6
src/components/structures/RoomDirectory.js
View file

@ -47,7 +47,7 @@ module.exports = React.createClass({
var self = this;
MatrixClientPeg.get().publicRooms(function (err, data) {
if (err) {
self.setState({ loading: false });
self.setState({ loading: false });
console.error("Failed to get publicRooms: %s", JSON.stringify(err));
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, {
@ -124,7 +124,7 @@ module.exports = React.createClass({
<div className="mx_RoomDirectory_perm">Guests can join</div>
);
}
perms = null;
if (guestRead || guestJoin) {
perms = <div className="mx_RoomDirectory_perms">{guestRead} {guestJoin}</div>;
@ -169,7 +169,7 @@ module.exports = React.createClass({
render: function() {
if (this.state.loading) {
var Loader = sdk.getComponent("elements.Spinner");
var Loader = sdk.getComponent("elements.Spinner");
return (
<div className="mx_RoomDirectory">
<Loader />

14
src/components/structures/RoomSubList.js
View file

@ -187,15 +187,15 @@ var RoomSubList = React.createClass({
var rooms = this.state.sortedList;
if (found.room) {
rooms.splice(found.index, 1);
}
}
else {
console.warn("Can't remove room " + room.roomId + " - can't find it");
}
this.setState({ sortedList: rooms });
},
findRoomTile: function(room) {
var index = this.state.sortedList.indexOf(room);
findRoomTile: function(room) {
var index = this.state.sortedList.indexOf(room);
if (index >= 0) {
// console.log("found: room: " + room.roomId + " with index " + index);
}
@ -210,7 +210,7 @@ var RoomSubList = React.createClass({
},
calcManualOrderTagData: function(room) {
var index = this.state.sortedList.indexOf(room);
var index = this.state.sortedList.indexOf(room);
// we sort rooms by the lexicographic ordering of the 'order' metadata on their tags.
// for convenience, we calculate this for now a floating point number between 0.0 and 1.0.
@ -274,7 +274,7 @@ var RoomSubList = React.createClass({
},
_getHeaderJsx: function() {
var TintableSvg = sdk.getComponent("elements.TintableSvg");
var TintableSvg = sdk.getComponent("elements.TintableSvg");
return (
<h2 onClick={ this.onClick } className="mx_RoomSubList_label">
{ this.props.collapsed ? '' : this.props.label }
@ -332,7 +332,7 @@ var RoomSubList = React.createClass({
}
else {
subList = <TruncatedList className={ classes }>
</TruncatedList>;
</TruncatedList>;
}
return connectDropTarget(
@ -356,7 +356,7 @@ var RoomSubList = React.createClass({
// Export the wrapped version, inlining the 'collect' functions
// to more closely resemble the ES7
module.exports =
module.exports =
DropTarget('RoomTile', roomListTarget, function(connect) {
return {
connectDropTarget: connect.dropTarget(),

2
src/components/structures/ViewSource.js
View file

@ -40,7 +40,7 @@ module.exports = React.createClass({
this.props.onFinished();
}
},
render: function() {
return (
<div className="mx_ViewSource">

2
src/components/views/globals/GuestWarningBar.js
View file

@ -23,7 +23,7 @@ module.exports = React.createClass({
onRegisterClicked: function() {
dis.dispatch({'action': 'start_upgrade_registration'});
},
onLoginClicked: function() {
dis.dispatch({'action': 'logout'});
dis.dispatch({'action': 'start_login'});

10
src/components/views/rooms/RoomDNDView.js
View file

@ -38,7 +38,7 @@ var roomTileSource = {
// Return the data describing the dragged item
var item = {
room: props.room,
originalList: props.roomSubList,
originalList: props.roomSubList,
originalIndex: props.roomSubList.findRoomTile(props.room).index,
targetList: props.roomSubList, // at first target is same as original
// lastTargetRoom: null,
@ -145,10 +145,10 @@ var roomTileTarget = {
// shuffle the list to add our tile to that position.
props.roomSubList.moveRoomTile(item.room, roomTile.index);
}
// stop us from flickering between our droptarget and the previous room.
// whenever the cursor changes direction we have to reset the flicker-damping.
/*
/*
var yDelta = off.y - item.lastYOffset;
if ((yDelta > 0 && item.lastYDelta < 0) ||
@ -168,7 +168,7 @@ var roomTileTarget = {
if (yDelta) item.lastYDelta = yDelta;
item.lastYOffset = off.y;
*/
*/
}
else if (switchedTarget) {
if (!props.roomSubList.findRoomTile(item.room).room) {
@ -183,7 +183,7 @@ var roomTileTarget = {
// Export the wrapped version, inlining the 'collect' functions
// to more closely resemble the ES7
module.exports =
module.exports =
DropTarget('RoomTile', roomTileTarget, function(connect, monitor) {
return {
// Call this function inside render()

2
src/components/views/rooms/RoomTooltip.js
View file

@ -34,7 +34,7 @@ module.exports = React.createClass({
});
}
else {
tooltip.style.top = tooltip.parentElement.getBoundingClientRect().top + "px";
tooltip.style.top = tooltip.parentElement.getBoundingClientRect().top + "px";
tooltip.style.display = "block";
}
},

2
src/components/views/rooms/SearchBar.js
View file

@ -50,7 +50,7 @@ module.exports = React.createClass({
onSearch: function() {
this.props.onSearch(this.refs.search_term.value, this.state.scope);
},
render: function() {
var searchButtonClasses = classNames({ mx_SearchBar_searchButton : true, mx_SearchBar_searching: this.props.searchInProgress });
var thisRoomClasses = classNames({ mx_SearchBar_button : true, mx_SearchBar_unselected : this.state.scope !== 'Room' });

70
src/components/views/settings/Notifications.js
View file

@ -120,7 +120,7 @@ var ACTION_DISABLED = null;
*/
var VectorPushRulesDefinitions = {
// Messages containing user's display name
// Messages containing user's display name
// (skip contains_user_name which is too geeky)
".m.rule.contains_display_name": {
kind: "underride",
@ -225,7 +225,7 @@ module.exports = React.createClass({
DISPLAY: "DISPLAY", // The component is ready and display data
ERROR: "ERROR" // There was an error
},
getInitialState: function() {
return {
phase: this.phases.LOADING,
@ -239,11 +239,11 @@ module.exports = React.createClass({
externalContentRules: [] // Keyword push rules that have been defined outside Vector UI
};
},
componentWillMount: function() {
this._refreshFromServer();
},
onEnableNotificationsChange: function(event) {
var self = this;
this.setState({
@ -254,15 +254,15 @@ module.exports = React.createClass({
self._refreshFromServer();
});
},
onEnableDesktopNotificationsChange: function(event) {
UserSettingsStore.setEnableNotifications(event.target.checked);
},
onNotifStateButtonClicked: function(event) {
var vectorRuleId = event.target.className.split("-")[0];
var newPushRuleVectorState = event.target.className.split("-")[1];
if ("_keywords" === vectorRuleId) {
this._setKeywordsPushRuleVectorState(newPushRuleVectorState)
}
@ -273,7 +273,7 @@ module.exports = React.createClass({
}
}
},
onKeywordsClicked: function(event) {
var self = this;
@ -314,13 +314,13 @@ module.exports = React.createClass({
}
return array;
},[]);
self._setKeywords(newKeywords);
}
}
});
},
getRule: function(vectorRuleId) {
for (var i in this.state.vectorPushRules) {
var rule = this.state.vectorPushRules[i];
@ -329,7 +329,7 @@ module.exports = React.createClass({
}
}
},
_actionsFor: function(pushRuleVectorState) {
if (pushRuleVectorState === PushRuleVectorState.ON) {
return ACTION_NOTIFY;
@ -338,12 +338,12 @@ module.exports = React.createClass({
return ACTION_HIGHLIGHT_DEFAULT_SOUND;
}
},
// Determine whether a content rule is in the PushRuleVectorState.ON category or in PushRuleVectorState.LOUD
// regardless of its enabled state. Returns undefined if it does not match these categories.
_contentRuleVectorStateKind: function(rule) {
var stateKind;
// Count tweaks to determine if it is a ON or LOUD rule
var tweaks = 0;
for (var j in rule.actions) {
@ -363,9 +363,9 @@ module.exports = React.createClass({
}
return stateKind;
},
_setPushRuleVectorState: function(rule, newPushRuleVectorState) {
if (rule && rule.vectorState !== newPushRuleVectorState) {
_setPushRuleVectorState: function(rule, newPushRuleVectorState) {
if (rule && rule.vectorState !== newPushRuleVectorState) {
this.setState({
phase: this.phases.LOADING
@ -401,14 +401,14 @@ module.exports = React.createClass({
});
}
},
_setKeywordsPushRuleVectorState: function(newPushRuleVectorState) {
// Is there really a change?
if (this.state.vectorContentRules.vectorState === newPushRuleVectorState
if (this.state.vectorContentRules.vectorState === newPushRuleVectorState
|| this.state.vectorContentRules.rules.length === 0) {
return;
}
var self = this;
var cli = MatrixClientPeg.get();
@ -469,7 +469,7 @@ module.exports = React.createClass({
});
});
},
_setKeywords: function(newKeywords) {
this.setState({
phase: this.phases.LOADING
@ -517,9 +517,9 @@ module.exports = React.createClass({
var pushRuleVectorStateKind = self.state.vectorContentRules.vectorState;
if (pushRuleVectorStateKind === PushRuleVectorState.OFF) {
// When the current global keywords rule is OFF, we need to look at
// the flavor of rules in 'vectorContentRules' to apply the same actions
// the flavor of rules in 'vectorContentRules' to apply the same actions
// when creating the new rule.
// Thus, this new rule will join the 'vectorContentRules' set.
// Thus, this new rule will join the 'vectorContentRules' set.
if (self.state.vectorContentRules.rules.length) {
pushRuleVectorStateKind = self._contentRuleVectorStateKind(self.state.vectorContentRules.rules[0]);
}
@ -610,7 +610,7 @@ module.exports = React.createClass({
},
_refreshFromServer: function() {
var self = this;
var self = this;
MatrixClientPeg.get().getPushRules().then(self._portRulesToNewAPI).done(function(rulesets) {
MatrixClientPeg.get().pushRules = rulesets;
@ -685,8 +685,8 @@ module.exports = React.createClass({
// whereas Matrix has a push rule per keyword.
// Vector can set the unique rule in ON, LOUD or OFF state.
// Matrix has enabled/disabled plus a combination of (highlight, sound) tweaks.
// The code below determines which set of user's content push rules can be
// The code below determines which set of user's content push rules can be
// displayed by the vector UI.
// Push rules that does not fit, ie defined by another Matrix client, ends
// in self.state.externalContentRules.
@ -697,14 +697,14 @@ module.exports = React.createClass({
self.state.vectorContentRules = {
vectorState: PushRuleVectorState.LOUD,
rules: contentRules.loud
}
}
self.state.externalContentRules = [].concat(contentRules.loud_but_disabled, contentRules.on, contentRules.on_but_disabled, contentRules.other);
}
else if (contentRules.loud_but_disabled.length) {
self.state.vectorContentRules = {
vectorState: PushRuleVectorState.OFF,
rules: contentRules.loud_but_disabled
}
}
self.state.externalContentRules = [].concat(contentRules.on, contentRules.on_but_disabled, contentRules.other);
}
else if (contentRules.on.length) {
@ -787,7 +787,7 @@ module.exports = React.createClass({
}
if (!vectorState) {
console.error("Cannot translate rule actions into Vector rule state. Rule: " + rule);
console.error("Cannot translate rule actions into Vector rule state. Rule: " + rule);
vectorState = PushRuleVectorState.OFF;
}
}
@ -803,7 +803,7 @@ module.exports = React.createClass({
});
}
}
// Build the rules not managed by Vector UI
var otherRulesDescriptions = {
'.m.rule.message': "Notify for all other messages/rooms",
@ -814,7 +814,7 @@ module.exports = React.createClass({
for (var i in defaultRules.others) {
var rule = defaultRules.others[i];
var ruleDescription = otherRulesDescriptions[rule.rule_id];
// Show enabled default rules that was modified by the user
if (ruleDescription && rule.enabled && !rule.default) {
rule.description = ruleDescription;
@ -827,7 +827,7 @@ module.exports = React.createClass({
});
});
},
_updatePushRuleActions: function(rule, actions, enabled) {
var cli = MatrixClientPeg.get();
var deferred = q.defer();
@ -874,7 +874,7 @@ module.exports = React.createClass({
</tr>
);
},
renderNotifRulesTableRows: function() {
var rows = [];
for (var i in this.state.vectorPushRules) {
@ -884,7 +884,7 @@ module.exports = React.createClass({
return rows;
},
render: function() {
render: function() {
var self = this;
if (this.state.phase === this.phases.LOADING) {
@ -958,7 +958,7 @@ module.exports = React.createClass({
{ externalRules }
</ul>
</div>
);
);
}
return (
@ -1022,7 +1022,7 @@ module.exports = React.createClass({
</div>
{ advancedSettings }
</div>
</div>