IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: attempts to make d-editor tests more resilient (#7556)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2019-05-16 14:42:01 +02:00
committed by GitHub
parent 244c03573a
commit ad4d01233b
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/components/d-editor.js.es6
View File

@@ -675,7 +675,7 @@ export default Ember.Component.extend({
}
},
_replaceText(oldVal, newVal, opts) {
_replaceText(oldVal, newVal, opts = {}) {
const val = this.get("value");
const needleStart = val.indexOf(oldVal);
@@ -693,7 +693,7 @@ export default Ember.Component.extend({
replacement: { start: needleStart, end: needleStart + newVal.length }
});
if (opts && opts.index && opts.regex) {
if (opts.index && opts.regex) {
let i = -1;
const newValue = val.replace(opts.regex, match => {
i++;
@@ -705,7 +705,7 @@ export default Ember.Component.extend({
this.set("value", val.replace(oldVal, newVal));
}
if ($("textarea.d-editor-input").is(":focus")) {
if (opts.forceFocus || $("textarea.d-editor-input").is(":focus")) {
// Restore cursor.
this._selectText(
newSelection.start,