{
+ const addedLen = model.insert([userPillPart], position);
+ return model.positionForOffset(caret.offset + addedLen, true);
+ });
// refocus on composer, as we just clicked "Mention"
this._editorRef && this._editorRef.focus();
}
_insertQuotedMessage(event) {
- const {partCreator} = this.model;
+ const {model} = this;
+ const {partCreator} = model;
const quoteParts = parseEvent(event, partCreator, { isQuotedMessage: true });
// add two newlines
quoteParts.push(partCreator.newline());
quoteParts.push(partCreator.newline());
- this.model.insertPartsAt(quoteParts, {offset: 0});
+ model.transform(() => {
+ const addedLen = model.insert(quoteParts, model.positionForOffset(0));
+ return model.positionForOffset(addedLen, true);
+ });
// refocus on composer, as we just clicked "Quote"
this._editorRef && this._editorRef.focus();
}
+ _onPaste = (event) => {
+ const {clipboardData} = event;
+ if (clipboardData.files.length) {
+ // This actually not so much for 'files' as such (at time of writing
+ // neither chrome nor firefox let you paste a plain file copied
+ // from Finder) but more images copied from a different website
+ // / word processor etc.
+ ContentMessages.sharedInstance().sendContentListToRoom(
+ Array.from(clipboardData.files), this.props.room.roomId, this.context.matrixClient,
+ );
+ }
+ }
+
render() {
return (
diff --git a/src/components/views/settings/SetIdServer.js b/src/components/views/settings/SetIdServer.js
index 55dc3b6e94..a718d87fa6 100644
--- a/src/components/views/settings/SetIdServer.js
+++ b/src/components/views/settings/SetIdServer.js
@@ -20,13 +20,13 @@ import PropTypes from 'prop-types';
import {_t} from "../../../languageHandler";
import sdk from '../../../index';
import MatrixClientPeg from "../../../MatrixClientPeg";
-import SdkConfig from "../../../SdkConfig";
import Modal from '../../../Modal';
import dis from "../../../dispatcher";
import { getThreepidBindStatus } from '../../../boundThreepids';
import IdentityAuthClient from "../../../IdentityAuthClient";
import {SERVICE_TYPES} from "matrix-js-sdk";
import {abbreviateUrl, unabbreviateUrl} from "../../../utils/UrlUtils";
+import { getDefaultIdentityServerUrl } from '../../../utils/IdentityServerUtils';
/**
* Check an IS URL is valid, including liveness check
@@ -66,10 +66,10 @@ export default class SetIdServer extends React.Component {
super();
let defaultIdServer = '';
- if (!MatrixClientPeg.get().getIdentityServerUrl() && SdkConfig.get()['validated_server_config']['isUrl']) {
+ if (!MatrixClientPeg.get().getIdentityServerUrl() && getDefaultIdentityServerUrl()) {
// If no ID server is configured but there's one in the config, prepopulate
// the field to help the user.
- defaultIdServer = abbreviateUrl(SdkConfig.get()['validated_server_config']['isUrl']);
+ defaultIdServer = abbreviateUrl(getDefaultIdentityServerUrl());
}
this.state = {
@@ -253,10 +253,10 @@ export default class SetIdServer extends React.Component {
});
let newFieldVal = '';
- if (SdkConfig.get()['validated_server_config']['isUrl']) {
+ if (getDefaultIdentityServerUrl()) {
// Prepopulate the client's default so the user at least has some idea of
// a valid value they might enter
- newFieldVal = abbreviateUrl(SdkConfig.get()['validated_server_config']['isUrl']);
+ newFieldVal = abbreviateUrl(getDefaultIdentityServerUrl());
}
this.setState({
diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
index e269c6d2cd..8aabc8d340 100644
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
@@ -30,6 +30,7 @@ const plEventsToLabels = {
"m.room.history_visibility": _td("Change history visibility"),
"m.room.power_levels": _td("Change permissions"),
"m.room.topic": _td("Change topic"),
+ "m.room.tombstone": _td("Upgrade the room"),
"m.room.encryption": _td("Enable room encryption"),
"im.vector.modular.widgets": _td("Modify widgets"),
@@ -43,6 +44,7 @@ const plEventsToShow = {
"m.room.history_visibility": {isState: true},
"m.room.power_levels": {isState: true},
"m.room.topic": {isState: true},
+ "m.room.tombstone": {isState: true},
"m.room.encryption": {isState: true},
"im.vector.modular.widgets": {isState: true},
diff --git a/src/editor/autocomplete.js b/src/editor/autocomplete.js
index ac662c32d8..79a69c07a6 100644
--- a/src/editor/autocomplete.js
+++ b/src/editor/autocomplete.js
@@ -33,6 +33,10 @@ export default class AutocompleteWrapperModel {
});
}
+ close() {
+ this._updateCallback({close: true});
+ }
+
hasSelection() {
return this._getAutocompleterComponent().hasSelection();
}
@@ -52,9 +56,6 @@ export default class AutocompleteWrapperModel {
} else {
await acComponent.moveSelection(e.shiftKey ? -1 : +1);
}
- this._updateCallback({
- close: true,
- });
}
onUpArrow() {
@@ -70,7 +71,7 @@ export default class AutocompleteWrapperModel {
// so we can restore it in onComponentSelectionChange when the value is undefined (meaning it should be the typed text)
this._queryPart = part;
this._queryOffset = offset;
- this._updateQuery(part.text);
+ return this._updateQuery(part.text);
}
onComponentSelectionChange(completion) {
diff --git a/src/editor/dom.js b/src/editor/dom.js
index 1b683c2c5e..4f15a57303 100644
--- a/src/editor/dom.js
+++ b/src/editor/dom.js
@@ -84,6 +84,14 @@ function getTextAndFocusNodeOffset(editor, focusNode, focusOffset) {
foundCaret = true;
}
}
+ // usually newlines are entered as new DIV elements,
+ // but for example while pasting in some browsers, they are still
+ // converted to BRs, so also take these into account when they
+ // are not the last element in the DIV.
+ if (node.tagName === "BR" && node.nextSibling) {
+ text += "\n";
+ focusNodeOffset += 1;
+ }
const nodeText = node.nodeType === Node.TEXT_NODE && getTextNodeValue(node);
if (nodeText) {
if (!foundCaret) {
diff --git a/src/editor/model.js b/src/editor/model.js
index 9d129afa69..0fbaa4bb3c 100644
--- a/src/editor/model.js
+++ b/src/editor/model.js
@@ -35,6 +35,11 @@ import Range from "./range";
* This is used to adjust the caret position.
*/
+/**
+ * @callback ManualTransformCallback
+ * @return the caret position
+ */
+
export default class EditorModel {
constructor(parts, partCreator, updateCallback = null) {
this._parts = parts;
@@ -44,7 +49,6 @@ export default class EditorModel {
this._autoCompletePartIdx = null;
this._transformCallback = null;
this.setUpdateCallback(updateCallback);
- this._updateInProgress = false;
}
/**
@@ -90,10 +94,14 @@ export default class EditorModel {
_removePart(index) {
this._parts.splice(index, 1);
- if (this._activePartIdx >= index) {
+ if (index === this._activePartIdx) {
+ this._activePartIdx = null;
+ } else if (this._activePartIdx > index) {
--this._activePartIdx;
}
- if (this._autoCompletePartIdx >= index) {
+ if (index === this._autoCompletePartIdx) {
+ this._autoCompletePartIdx = null;
+ } else if (this._autoCompletePartIdx > index) {
--this._autoCompletePartIdx;
}
}
@@ -150,8 +158,14 @@ export default class EditorModel {
this._updateCallback(caret, inputType);
}
- insertPartsAt(parts, caret) {
- const position = this.positionForOffset(caret.offset, caret.atNodeEnd);
+ /**
+ * Inserts the given parts at the given position.
+ * Should be run inside a `model.transform()` callback.
+ * @param {Part[]} parts the parts to replace the range with
+ * @param {DocumentPosition} position the position to start inserting at
+ * @return {Number} the amount of characters added
+ */
+ insert(parts, position) {
const insertIndex = this._splitAt(position);
let newTextLength = 0;
for (let i = 0; i < parts.length; ++i) {
@@ -159,36 +173,31 @@ export default class EditorModel {
newTextLength += part.text.length;
this._insertPart(insertIndex + i, part);
}
- // put caret after new part
- const lastPartIndex = insertIndex + parts.length - 1;
- const newPosition = new DocumentPosition(lastPartIndex, newTextLength);
- this._updateCallback(newPosition);
+ return newTextLength;
}
update(newValue, inputType, caret) {
- this._updateInProgress = true;
const diff = this._diff(newValue, inputType, caret);
const position = this.positionForOffset(diff.at, caret.atNodeEnd);
let removedOffsetDecrease = 0;
if (diff.removed) {
removedOffsetDecrease = this.removeText(position, diff.removed.length);
}
- const canOpenAutoComplete = inputType !== "insertFromPaste" && inputType !== "insertFromDrop";
let addedLen = 0;
if (diff.added) {
- // these shouldn't trigger auto-complete, you just want to append a piece of text
- addedLen = this._addText(position, diff.added, {validate: canOpenAutoComplete});
+ addedLen = this._addText(position, diff.added, inputType);
}
this._mergeAdjacentParts();
const caretOffset = diff.at - removedOffsetDecrease + addedLen;
let newPosition = this.positionForOffset(caretOffset, true);
- this._setActivePart(newPosition, canOpenAutoComplete);
+ const canOpenAutoComplete = inputType !== "insertFromPaste" && inputType !== "insertFromDrop";
+ const acPromise = this._setActivePart(newPosition, canOpenAutoComplete);
if (this._transformCallback) {
const transformAddedLen = this._transform(newPosition, inputType, diff);
newPosition = this.positionForOffset(caretOffset + transformAddedLen, true);
}
- this._updateInProgress = false;
this._updateCallback(newPosition, inputType, diff);
+ return acPromise;
}
_transform(newPosition, inputType, diff) {
@@ -214,13 +223,14 @@ export default class EditorModel {
}
// not _autoComplete, only there if active part is autocomplete part
if (this.autoComplete) {
- this.autoComplete.onPartUpdate(part, pos.offset);
+ return this.autoComplete.onPartUpdate(part, pos.offset);
}
} else {
this._activePartIdx = null;
this._autoComplete = null;
this._autoCompletePartIdx = null;
}
+ return Promise.resolve();
}
_onAutoComplete = ({replacePart, caretOffset, close}) => {
@@ -322,22 +332,20 @@ export default class EditorModel {
* inserts `str` into the model at `pos`.
* @param {Object} pos
* @param {string} str
- * @param {Object} options
+ * @param {string} inputType the source of the input, see html InputEvent.inputType
* @param {bool} options.validate Whether characters will be validated by the part.
* Validating allows the inserted text to be parsed according to the part rules.
* @return {Number} how far from position (in characters) the insertion ended.
* This can be more than the length of `str` when crossing non-editable parts, which are skipped.
*/
- _addText(pos, str, {validate=true}) {
+ _addText(pos, str, inputType) {
let {index} = pos;
const {offset} = pos;
let addLen = str.length;
const part = this._parts[index];
if (part) {
if (part.canEdit) {
- if (validate && part.validateAndInsert(offset, str)) {
- str = null;
- } else if (!validate && part.insert(offset, str)) {
+ if (part.validateAndInsert(offset, str, inputType)) {
str = null;
} else {
const splitPart = part.split(offset);
@@ -356,13 +364,8 @@ export default class EditorModel {
index = 0;
}
while (str) {
- const newPart = this._partCreator.createPartForInput(str, index);
- if (validate) {
- str = newPart.appendUntilRejected(str);
- } else {
- newPart.insert(0, str);
- str = null;
- }
+ const newPart = this._partCreator.createPartForInput(str, index, inputType);
+ str = newPart.appendUntilRejected(str, inputType);
this._insertPart(index, newPart);
index += 1;
}
@@ -395,18 +398,15 @@ export default class EditorModel {
return new Range(this, position);
}
- // called from Range.replace
+ //mostly internal, called from Range.replace
replaceRange(startPosition, endPosition, parts) {
+ // convert end position to offset, so it is independent of how the document is split into parts
+ // which we'll change when splitting up at the start position
+ const endOffset = endPosition.asOffset(this);
const newStartPartIndex = this._splitAt(startPosition);
- const idxDiff = newStartPartIndex - startPosition.index;
- // if both position are in the same part, and we split it at start position,
- // the offset of the end position needs to be decreased by the offset of the start position
- const removedOffset = startPosition.index === endPosition.index ? startPosition.offset : 0;
- const adjustedEndPosition = new DocumentPosition(
- endPosition.index + idxDiff,
- endPosition.offset - removedOffset,
- );
- const newEndPartIndex = this._splitAt(adjustedEndPosition);
+ // convert it back to position once split at start
+ endPosition = endOffset.asPosition(this);
+ const newEndPartIndex = this._splitAt(endPosition);
for (let i = newEndPartIndex - 1; i >= newStartPartIndex; --i) {
this._removePart(i);
}
@@ -416,8 +416,18 @@ export default class EditorModel {
insertIdx += 1;
}
this._mergeAdjacentParts();
- if (!this._updateInProgress) {
- this._updateCallback();
- }
+ }
+
+ /**
+ * Performs a transformation not part of an update cycle.
+ * Modifying the model should only happen inside a transform call if not part of an update call.
+ * @param {ManualTransformCallback} callback to run the transformations in
+ * @return {Promise} a promise when auto-complete (if applicable) is done updating
+ */
+ transform(callback) {
+ const pos = callback();
+ const acPromise = this._setActivePart(pos, true);
+ this._updateCallback(pos);
+ return acPromise;
}
}
diff --git a/src/editor/offset.js b/src/editor/offset.js
new file mode 100644
index 0000000000..7054836bdc
--- /dev/null
+++ b/src/editor/offset.js
@@ -0,0 +1,26 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+export default class DocumentOffset {
+ constructor(offset, atEnd) {
+ this.offset = offset;
+ this.atEnd = atEnd;
+ }
+
+ asPosition(model) {
+ return model.positionForOffset(this.offset, this.atEnd);
+ }
+}
diff --git a/src/editor/parts.js b/src/editor/parts.js
index f9b4243de4..d14fcf98a2 100644
--- a/src/editor/parts.js
+++ b/src/editor/parts.js
@@ -23,7 +23,7 @@ class BasePart {
this._text = text;
}
- acceptsInsertion(chr) {
+ acceptsInsertion(chr, offset, inputType) {
return true;
}
@@ -56,10 +56,11 @@ class BasePart {
}
// append str, returns the remaining string if a character was rejected.
- appendUntilRejected(str) {
+ appendUntilRejected(str, inputType) {
+ const offset = this.text.length;
for (let i = 0; i < str.length; ++i) {
const chr = str.charAt(i);
- if (!this.acceptsInsertion(chr, i)) {
+ if (!this.acceptsInsertion(chr, offset + i, inputType)) {
this._text = this._text + str.substr(0, i);
return str.substr(i);
}
@@ -69,10 +70,10 @@ class BasePart {
// inserts str at offset if all the characters in str were accepted, otherwise don't do anything
// return whether the str was accepted or not.
- validateAndInsert(offset, str) {
+ validateAndInsert(offset, str, inputType) {
for (let i = 0; i < str.length; ++i) {
const chr = str.charAt(i);
- if (!this.acceptsInsertion(chr)) {
+ if (!this.acceptsInsertion(chr, offset + i, inputType)) {
return false;
}
}
@@ -82,16 +83,6 @@ class BasePart {
return true;
}
- insert(offset, str) {
- if (this.canEdit) {
- const beforeInsert = this._text.substr(0, offset);
- const afterInsert = this._text.substr(offset);
- this._text = beforeInsert + str + afterInsert;
- return true;
- }
- return false;
- }
-
createAutoComplete() {}
trim(len) {
@@ -119,8 +110,15 @@ class BasePart {
// exported for unit tests, should otherwise only be used through PartCreator
export class PlainPart extends BasePart {
- acceptsInsertion(chr) {
- return chr !== "@" && chr !== "#" && chr !== ":" && chr !== "\n";
+ acceptsInsertion(chr, offset, inputType) {
+ if (chr === "\n") {
+ return false;
+ }
+ // when not pasting or dropping text, reject characters that should start a pill candidate
+ if (inputType !== "insertFromPaste" && inputType !== "insertFromDrop") {
+ return chr !== "@" && chr !== "#" && chr !== ":";
+ }
+ return true;
}
toDOMNode() {
@@ -141,7 +139,6 @@ export class PlainPart extends BasePart {
updateDOMNode(node) {
if (node.textContent !== this.text) {
- // console.log("changing plain text from", node.textContent, "to", this.text);
node.textContent = this.text;
}
}
@@ -211,8 +208,8 @@ class PillPart extends BasePart {
}
class NewlinePart extends BasePart {
- acceptsInsertion(chr, i) {
- return (this.text.length + i) === 0 && chr === "\n";
+ acceptsInsertion(chr, offset) {
+ return offset === 0 && chr === "\n";
}
acceptsRemoval(position, chr) {
@@ -284,6 +281,9 @@ class UserPillPart extends PillPart {
}
setAvatar(node) {
+ if (!this._member) {
+ return;
+ }
const name = this._member.name || this._member.userId;
const defaultAvatarUrl = Avatar.defaultAvatarUrlForString(this._member.userId);
let avatarUrl = Avatar.avatarUrlForMember(
@@ -328,11 +328,11 @@ class PillCandidatePart extends PlainPart {
return this._autoCompleteCreator.create(updateCallback);
}
- acceptsInsertion(chr, i) {
- if ((this.text.length + i) === 0) {
+ acceptsInsertion(chr, offset, inputType) {
+ if (offset === 0) {
return true;
} else {
- return super.acceptsInsertion(chr, i);
+ return super.acceptsInsertion(chr, offset, inputType);
}
}
@@ -366,6 +366,8 @@ export class PartCreator {
constructor(room, client, autoCompleteCreator = null) {
this._room = room;
this._client = client;
+ // pre-create the creator as an object even without callback so it can already be passed
+ // to PillCandidatePart (e.g. while deserializing) and set later on
this._autoCompleteCreator = {create: autoCompleteCreator && autoCompleteCreator(this)};
}
diff --git a/src/editor/position.js b/src/editor/position.js
index 5dcb31fe65..98b158e547 100644
--- a/src/editor/position.js
+++ b/src/editor/position.js
@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+import DocumentOffset from "./offset";
+
export default class DocumentPosition {
constructor(index, offset) {
this._index = index;
@@ -104,4 +106,18 @@ export default class DocumentPosition {
}
}
}
+
+ asOffset(model) {
+ if (this.index === -1) {
+ return new DocumentOffset(0, true);
+ }
+ let offset = 0;
+ for (let i = 0; i < this.index; ++i) {
+ offset += model.parts[i].text.length;
+ }
+ offset += this.offset;
+ const lastPart = model.parts[this.index];
+ const atEnd = offset >= lastPart.text.length;
+ return new DocumentOffset(offset, atEnd);
+ }
}
diff --git a/src/editor/range.js b/src/editor/range.js
index e2ecc5d12b..1aaf480733 100644
--- a/src/editor/range.js
+++ b/src/editor/range.js
@@ -41,6 +41,12 @@ export default class Range {
return text;
}
+ /**
+ * Splits the model at the range boundaries and replaces with the given parts.
+ * Should be run inside a `model.transform()` callback.
+ * @param {Part[]} parts the parts to replace the range with
+ * @return {Number} the net amount of characters added, can be negative.
+ */
replace(parts) {
const newLength = parts.reduce((sum, part) => sum + part.text.length, 0);
let oldLength = 0;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9ed4d4c4d9..ce4598ed5f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -117,7 +117,6 @@
"Email, name or Matrix ID": "Email, name or Matrix ID",
"Start Chat": "Start Chat",
"Invite new room members": "Invite new room members",
- "Who would you like to add to this room?": "Who would you like to add to this room?",
"Send Invites": "Send Invites",
"Failed to start chat": "Failed to start chat",
"Operation failed": "Operation failed",
@@ -146,6 +145,7 @@
"/ddg is not a command": "/ddg is not a command",
"To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
"Upgrades a room to a new version": "Upgrades a room to a new version",
+ "You do not have the required permissions to use this command.": "You do not have the required permissions to use this command.",
"Room upgrade confirmation": "Room upgrade confirmation",
"Upgrading a room can be destructive and isn't always necessary.": "Upgrading a room can be destructive and isn't always necessary.",
"Room upgrades are usually recommended when a room version is considered
unstable. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Room upgrades are usually recommended when a room version is considered
unstable. Unstable room versions might have bugs, missing features, or security vulnerabilities.",
@@ -680,7 +680,7 @@
"Change history visibility": "Change history visibility",
"Change permissions": "Change permissions",
"Change topic": "Change topic",
- "Enable room encryption": "Enable room encryption",
+ "Upgrade the room": "Upgrade the room",
"Modify widgets": "Modify widgets",
"Failed to unban": "Failed to unban",
"Unban": "Unban",
@@ -1161,6 +1161,8 @@
"That doesn't look like a valid email address": "That doesn't look like a valid email address",
"You have entered an invalid address.": "You have entered an invalid address.",
"Try using one of the following valid address types: %(validTypesList)s.": "Try using one of the following valid address types: %(validTypesList)s.",
+ "Use an identity server to invite by email.
Use the default (%(defaultIdentityServerName)s) or manage in
Settings.": "Use an identity server to invite by email.
Use the default (%(defaultIdentityServerName)s) or manage in
Settings.",
+ "Use an identity server to invite by email. Manage in
Settings.": "Use an identity server to invite by email. Manage in
Settings.",
"The following users may not exist": "The following users may not exist",
"Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?",
"Invite anyway and never warn me again": "Invite anyway and never warn me again",
@@ -1462,13 +1464,14 @@
"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
",
- "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.",
+ "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.",
+ "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.",
"No Identity Server is configured: no email addreses can be added. You will be unable to reset your password.": "No Identity Server is configured: no email addreses can be added. You will be unable to reset your password.",
- "Other servers": "Other servers",
- "Enter custom server URLs
What does this mean?": "Enter custom server URLs
What does this mean?",
+ "Enter your custom homeserver URL
What does this mean?": "Enter your custom homeserver URL
What does this mean?",
"Homeserver URL": "Homeserver URL",
+ "Enter your custom identity server URL
What does this mean?": "Enter your custom identity server URL
What does this mean?",
"Identity Server URL": "Identity Server URL",
+ "Other servers": "Other servers",
"Free": "Free",
"Join millions for free on the largest public server": "Join millions for free on the largest public server",
"Premium": "Premium",
diff --git a/src/stores/ActiveWidgetStore.js b/src/stores/ActiveWidgetStore.js
index f0a9f718a2..82a7f7932c 100644
--- a/src/stores/ActiveWidgetStore.js
+++ b/src/stores/ActiveWidgetStore.js
@@ -67,11 +67,12 @@ class ActiveWidgetStore extends EventEmitter {
if (ev.getType() !== 'im.vector.modular.widgets') return;
if (ev.getStateKey() === this._persistentWidgetId) {
- this.destroyPersistentWidget();
+ this.destroyPersistentWidget(this._persistentWidgetId);
}
}
- destroyPersistentWidget() {
+ destroyPersistentWidget(id) {
+ if (id !== this._persistentWidgetId) return;
const toDeleteId = this._persistentWidgetId;
this.setWidgetPersistence(toDeleteId, false);
diff --git a/src/utils/IdentityServerUtils.js b/src/utils/IdentityServerUtils.js
new file mode 100644
index 0000000000..883bd52149
--- /dev/null
+++ b/src/utils/IdentityServerUtils.js
@@ -0,0 +1,30 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import SdkConfig from '../SdkConfig';
+import MatrixClientPeg from '../MatrixClientPeg';
+
+export function getDefaultIdentityServerUrl() {
+ return SdkConfig.get()['validated_server_config']['isUrl'];
+}
+
+export function useDefaultIdentityServer() {
+ const url = getDefaultIdentityServerUrl();
+ // Account data change will update localstorage, client, etc through dispatcher
+ MatrixClientPeg.get().setAccountData("m.identity_server", {
+ base_url: url,
+ });
+}
diff --git a/test/editor/range-test.js b/test/editor/range-test.js
index 5a95da952d..468cb60c76 100644
--- a/test/editor/range-test.js
+++ b/test/editor/range-test.js
@@ -52,7 +52,6 @@ describe('editor/range', function() {
range.expandBackwardsWhile((index, offset) => model.parts[index].text[offset] !== " ");
expect(range.text).toBe("world");
range.replace([pc.roomPill(pillChannel)]);
- console.log({parts: JSON.stringify(model.serializeParts())});
expect(model.parts[0].type).toBe("plain");
expect(model.parts[0].text).toBe("hello ");
expect(model.parts[1].type).toBe("room-pill");
@@ -60,7 +59,6 @@ describe('editor/range', function() {
expect(model.parts[2].type).toBe("plain");
expect(model.parts[2].text).toBe("!!!!");
expect(model.parts.length).toBe(3);
- expect(renderer.count).toBe(1);
});
it('range replace across parts', function() {
const renderer = createRenderer();
@@ -74,7 +72,6 @@ describe('editor/range', function() {
const range = model.startRange(model.positionForOffset(14)); // after "replace"
range.expandBackwardsWhile((index, offset) => model.parts[index].text[offset] !== " ");
expect(range.text).toBe("replace");
- console.log("range.text", {text: range.text});
range.replace([pc.roomPill(pillChannel)]);
expect(model.parts[0].type).toBe("plain");
expect(model.parts[0].text).toBe("try to ");
@@ -83,6 +80,23 @@ describe('editor/range', function() {
expect(model.parts[2].type).toBe("plain");
expect(model.parts[2].text).toBe(" me");
expect(model.parts.length).toBe(3);
- expect(renderer.count).toBe(1);
+ });
+ // bug found while implementing tab completion
+ it('replace a part with an identical part with start position at end of previous part', function() {
+ const renderer = createRenderer();
+ const pc = createPartCreator();
+ const model = new EditorModel([
+ pc.plain("hello "),
+ pc.pillCandidate("man"),
+ ], pc, renderer);
+ const range = model.startRange(model.positionForOffset(9, true)); // before "man"
+ range.expandBackwardsWhile((index, offset) => model.parts[index].text[offset] !== " ");
+ expect(range.text).toBe("man");
+ range.replace([pc.pillCandidate(range.text)]);
+ expect(model.parts[0].type).toBe("plain");
+ expect(model.parts[0].text).toBe("hello ");
+ expect(model.parts[1].type).toBe("pill-candidate");
+ expect(model.parts[1].text).toBe("man");
+ expect(model.parts.length).toBe(2);
});
});
diff --git a/yarn.lock b/yarn.lock
index c664d0b7dc..1989f4339a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2852,16 +2852,16 @@ eslint-scope@^4.0.0, eslint-scope@^4.0.3:
estraverse "^4.1.1"
eslint-utils@^1.3.1:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.0.tgz#e2c3c8dba768425f897cf0f9e51fe2e241485d4c"
- integrity sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==
+ version "1.4.2"
+ resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab"
+ integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==
dependencies:
eslint-visitor-keys "^1.0.0"
eslint-visitor-keys@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
- integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
+ integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
eslint@^5.12.0:
version "5.16.0"