Various improvements to watched words (PR #12020)

nbianca · February 9, 2021, 2:14pm

ZogStriP · February 16, 2021, 4:24pm

app/assets/javascripts/admin/addon/components/watched-word-form.js

@@ -56,6 +61,7 @@ export default Component.extend({
 
         const watchedWord = WatchedWord.create({
           word: this.word,
+          replacement: this.canReplace ? this.replacement : undefined,

Why use undefined instead of null?

ZogStriP · February 16, 2021, 4:42pm

app/assets/javascripts/pretty-text/engines/discourse-markdown/watched-words-links.js
@@ -0,0 +1,122 @@
+function isLinkOpen(str) {
+  return /^<a[>\s]/i.test(str);
+}
+
+function isLinkClose(str) {

function isLinkClosed(str) {

nbianca · February 16, 2021, 6:37pm

I kept the original name from linkify:

github.com

markdown-it/markdown-it/blob/master/lib/rules_core/linkify.js#L14


//
'use strict';
var arrayReplaceAt = require('../common/utils').arrayReplaceAt;
function isLinkOpen(str) {
  return /^<a[>\s]/i.test(str);
}
function isLinkClose(str) {
  return /^<\/a\s*>/i.test(str);
}
module.exports = function linkify(state) {
  var i, j, l, tokens, token, currentToken, nodes, ln, text, pos, lastPos,
      level, htmlLinkLevel, url, fullUrl, urlText,
      blockTokens = state.tokens,
      links;

eviltrout · February 23, 2021, 4:56pm

This looks quite nice. I don’t have any feedback, I think @ZogStriP likely found all the good stuff

nbianca · February 25, 2021, 12:01pm

nbianca · February 25, 2021, 12:01pm