{listHeader}
{content}
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index a66cfb17b6..007ac88db2 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -21,6 +21,7 @@ import { KeyCode } from '../../Keyboard';
import dis from '../../dispatcher';
import { throttle } from 'lodash';
import AccessibleButton from '../../components/views/elements/AccessibleButton';
+import classNames from 'classnames';
module.exports = React.createClass({
displayName: 'SearchBox',
@@ -46,6 +47,7 @@ module.exports = React.createClass({
getInitialState: function() {
return {
searchTerm: "",
+ blurred: true,
};
},
@@ -93,7 +95,18 @@ module.exports = React.createClass({
},
_onFocus: function(ev) {
+ this.setState({blurred: false});
ev.target.select();
+ if (this.props.onFocus) {
+ this.props.onFocus(ev);
+ }
+ },
+
+ _onBlur: function(ev) {
+ this.setState({blurred: true});
+ if (this.props.onBlur) {
+ this.props.onBlur(ev);
+ }
},
_clearSearch: function(source) {
@@ -112,15 +125,21 @@ module.exports = React.createClass({
if (this.props.collapsed) {
return null;
}
- const clearButton = this.state.searchTerm.length > 0 ?
+ const clearButton = !this.state.blurred ?
(
) : undefined;
+ // show a shorter placeholder when blurred, if requested
+ // this is used for the room filter field that has
+ // the explore button next to it when blurred
+ const placeholder = this.state.blurred ?
+ (this.props.blurredPlaceholder || this.props.placeholder) :
+ this.props.placeholder;
const className = this.props.className || "";
return (
-
+
{ clearButton }
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 31cb92d982..3308daf366 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -94,7 +94,7 @@ module.exports = React.createClass({
// Phase of the overall login dialog.
phase: PHASE_LOGIN,
// The current login flow, such as password, SSO, etc.
- currentFlow: "m.login.password",
+ currentFlow: null, // we need to load the flows from the server
// We perform liveliness checks later, but for now suppress the errors.
// We also track the server dead errors independently of the regular errors so
@@ -373,6 +373,7 @@ module.exports = React.createClass({
this.setState({
busy: true,
+ currentFlow: null, // reset flow
loginIncorrect: false,
});
@@ -566,6 +567,13 @@ module.exports = React.createClass({
},
_renderSsoStep: function(url) {
+ const SignInToText = sdk.getComponent('views.auth.SignInToText');
+
+ let onEditServerDetailsClick = null;
+ // If custom URLs are allowed, wire up the server details edit link.
+ if (PHASES_ENABLED && !SdkConfig.get()['disable_custom_urls']) {
+ onEditServerDetailsClick = this.onEditServerDetailsClick;
+ }
// XXX: This link does *not* have a target="_blank" because single sign-on relies on
// redirecting the user back to a URI once they're logged in. On the web, this means
// we use the same window and redirect back to riot. On electron, this actually
@@ -575,7 +583,12 @@ module.exports = React.createClass({
// user's browser, let them log into their SSO provider, then redirect their browser
// to vector://vector which, of course, will not work.
return (
-
{ _t('Sign in with single sign-on') }
+
);
},
diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js
index 59acf0a034..63e77a938d 100644
--- a/src/components/views/auth/PasswordLogin.js
+++ b/src/components/views/auth/PasswordLogin.js
@@ -31,6 +31,7 @@ export default class PasswordLogin extends React.Component {
static propTypes = {
onSubmit: PropTypes.func.isRequired, // fn(username, password)
onError: PropTypes.func,
+ onEditServerDetailsClick: PropTypes.func,
onForgotPasswordClick: PropTypes.func, // fn()
initialUsername: PropTypes.string,
initialPhoneCountry: PropTypes.string,
@@ -257,6 +258,7 @@ export default class PasswordLogin extends React.Component {
render() {
const Field = sdk.getComponent('elements.Field');
+ const SignInToText = sdk.getComponent('views.auth.SignInToText');
let forgotPasswordJsx;
@@ -273,33 +275,6 @@ export default class PasswordLogin extends React.Component {
;
}
- let signInToText = _t('Sign in to your Matrix account on %(serverName)s', {
- serverName: this.props.serverConfig.hsName,
- });
- if (this.props.serverConfig.hsNameIsDifferent) {
- const TextWithTooltip = sdk.getComponent("elements.TextWithTooltip");
-
- signInToText = _t('Sign in to your Matrix account on
', {}, {
- 'underlinedServerName': () => {
- return
- {this.props.serverConfig.hsName}
- ;
- },
- });
- }
-
- let editLink = null;
- if (this.props.onEditServerDetailsClick) {
- editLink =
- {_t('Change')}
- ;
- }
-
const pwFieldClass = classNames({
error: this.props.loginIncorrect && !this.isLoginEmpty(), // only error password if error isn't top field
});
@@ -342,10 +317,8 @@ export default class PasswordLogin extends React.Component {
return (
-
- {signInToText}
- {editLink}
-
+
;
}
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index ef7d0ed5fb..c47eb54bca 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -758,7 +758,7 @@ module.exports = React.createClass({
headerItems: this._getHeaderItems('im.vector.fake.recent'),
order: "recent",
incomingCall: incomingCallIfTaggedAs('im.vector.fake.recent'),
- onAddRoom: () => {dis.dispatch({action: 'view_room_directory'})},
+ onAddRoom: () => {dis.dispatch({action: 'view_create_room'});},
},
];
const tagSubLists = Object.keys(this.state.lists)
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9ad20bf56c..90edd32660 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -724,11 +724,20 @@
"Unban this user?": "Unban this user?",
"Ban this user?": "Ban this user?",
"Failed to ban user": "Failed to ban user",
+ "No recent messages by %(user)s found": "No recent messages by %(user)s found",
+ "Try scrolling up in the timeline to see if there are any earlier ones.": "Try scrolling up in the timeline to see if there are any earlier ones.",
+ "Remove recent messages by %(user)s": "Remove recent messages by %(user)s",
+ "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?",
+ "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.",
+ "Remove %(count)s messages|other": "Remove %(count)s messages",
"Demote yourself?": "Demote yourself?",
"You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.",
"Demote": "Demote",
"Failed to mute user": "Failed to mute user",
"Failed to toggle moderator status": "Failed to toggle moderator status",
+ "Deactivate user?": "Deactivate user?",
+ "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?",
+ "Deactivate user": "Deactivate user",
"Failed to change power level": "Failed to change power level",
"You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.",
"No devices with registered encryption keys": "No devices with registered encryption keys",
@@ -739,6 +748,7 @@
"Share Link to User": "Share Link to User",
"User Options": "User Options",
"Direct chats": "Direct chats",
+ "Remove recent messages": "Remove recent messages",
"Unmute": "Unmute",
"Mute": "Mute",
"Revoke Moderator": "Revoke Moderator",
@@ -1383,9 +1393,6 @@
"Username": "Username",
"Phone": "Phone",
"Not sure of your password?
Set a new one": "Not sure of your password?
Set a new one",
- "Sign in to your Matrix account on %(serverName)s": "Sign in to your Matrix account on %(serverName)s",
- "Sign in to your Matrix account on
": "Sign in to your Matrix account on
",
- "Change": "Change",
"Sign in with": "Sign in with",
"If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Are you sure?",
"Use an email address to recover your account": "Use an email address to recover your account",
@@ -1407,6 +1414,7 @@
"Phone (optional)": "Phone (optional)",
"Create your Matrix account on %(serverName)s": "Create your Matrix account on %(serverName)s",
"Create your Matrix account on
": "Create your Matrix account on
",
+ "Change": "Change",
"Use an email address to recover your account.": "Use an email address to recover your account.",
"Other users can invite you to rooms using your contact details.": "Other users can invite you to rooms using your contact details.",
"Other servers": "Other servers",
@@ -1419,6 +1427,8 @@
"Premium hosting for organisations
Learn more": "Premium hosting for organisations
Learn more",
"Other": "Other",
"Find other public servers or use a custom server": "Find other public servers or use a custom server",
+ "Sign in to your Matrix account on %(serverName)s": "Sign in to your Matrix account on %(serverName)s",
+ "Sign in to your Matrix account on
": "Sign in to your Matrix account on
",
"Sorry, your browser is
not able to run Riot.": "Sorry, your browser is
not able to run Riot.",
"Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
"Please install
Chrome,
Firefox, or
Safari for the best experience.": "Please install
Chrome,
Firefox, or
Safari for the best experience.",
@@ -1470,7 +1480,9 @@
"Community %(groupId)s not found": "Community %(groupId)s not found",
"This homeserver does not support communities": "This homeserver does not support communities",
"Failed to load %(groupId)s": "Failed to load %(groupId)s",
- "Filter room names": "Filter room names",
+ "Explore": "Explore",
+ "Filter": "Filter",
+ "Filter rooms…": "Filter rooms…",
"Failed to reject invitation": "Failed to reject invitation",
"This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
"Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
@@ -1507,8 +1519,12 @@
"Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room",
"Fetching third party location failed": "Fetching third party location failed",
"Unable to look up room ID from server": "Unable to look up room ID from server",
- "Search for a room": "Search for a room",
- "Search for a room like #example": "Search for a room like #example",
+ "Preview": "Preview",
+ "View": "View",
+ "Find a room…": "Find a room…",
+ "Find a room… (e.g. %(exampleRoom)s)": "Find a room… (e.g. %(exampleRoom)s)",
+ "If you can't find the room you're looking for, ask for an invite or
Create a new room.": "If you can't find the room you're looking for, ask for an invite or
Create a new room.",
+ "Explore rooms": "Explore rooms",
"Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
"
Show devices,
send anyway or
cancel.": "
Show devices,
send anyway or
cancel.",
"You can't send any messages until you review and agree to
our terms and conditions.": "You can't send any messages until you review and agree to
our terms and conditions.",
diff --git a/test/components/structures/auth/Login-test.js b/test/components/structures/auth/Login-test.js
index 74451b922f..6a7982dd47 100644
--- a/test/components/structures/auth/Login-test.js
+++ b/test/components/structures/auth/Login-test.js
@@ -55,6 +55,11 @@ describe('Login', function() {
it('should show form with change server link', function() {
const root = render();
+ // Set non-empty flows & matrixClient to get past the loading spinner
+ root.setState({
+ currentFlow: "m.login.password",
+ });
+
const form = ReactTestUtils.findRenderedComponentWithType(
root,
sdk.getComponent('auth.PasswordLogin'),
@@ -75,6 +80,11 @@ describe('Login', function() {
const root = render();
+ // Set non-empty flows & matrixClient to get past the loading spinner
+ root.setState({
+ currentFlow: "m.login.password",
+ });
+
const form = ReactTestUtils.findRenderedComponentWithType(
root,
sdk.getComponent('auth.PasswordLogin'),
diff --git a/yarn.lock b/yarn.lock
index 5935a4342c..b8abf285f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4958,10 +4958,10 @@ mathml-tag-names@^2.0.1:
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
-matrix-js-sdk@2.3.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.3.0.tgz#ed04172add2e31c532dc87e2f38c26c2a63191c6"
- integrity sha512-jeswie7cWK7+XxcD+pQ7LplWnWkOQDa+x6y7FUUnxCdEvaj38cE5Obo9bPMjFgOln2hISlLdR8fzMNE9F4oUJA==
+matrix-js-sdk@2.3.1:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.3.1.tgz#c0ebe90d43611cf28422317ec0c04f5d41acb2ad"
+ integrity sha512-lf2pGHp0o4bDVrSZ5ReLAkMMiX9PngGMxNAtzztdDvQ20lfYZvhwif9PUbi3tt8kwXlfs7s34eWxz5Rg37mdGg==
dependencies:
another-json "^0.2.0"
babel-runtime "^6.26.0"