diff options
| author | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-08-01 00:10:38 +0300 |
|---|---|---|
| committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-08-01 00:12:00 +0300 |
| commit | 9485a0263985a5c2a41446e020e02c2accabc2bb (patch) | |
| tree | 01bf7a345b4cc80009586c8832ff2a5fdb905a8a /app/assets/javascripts/app | |
| parent | 02eba842aed40e6411fbed8db9e32fcd0e59c642 (diff) | |
| parent | eaedd3d26ca7e993e42fba02bc4e4fc5e72ae73e (diff) | |
Merge branch 'next-minor'v0.7.18.0
Diffstat (limited to 'app/assets/javascripts/app')
| -rw-r--r-- | app/assets/javascripts/app/helpers/text_formatter.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/app/views/tag_following_list_view.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/app/helpers/text_formatter.js b/app/assets/javascripts/app/helpers/text_formatter.js index c9a302fe9..814665959 100644 --- a/app/assets/javascripts/app/helpers/text_formatter.js +++ b/app/assets/javascripts/app/helpers/text_formatter.js @@ -43,7 +43,7 @@ var hashtagPlugin = window.markdownitHashtag; md.use(hashtagPlugin, { - // compare tag_text_regexp in app/models/acts_as_taggable_on-tag.rb + // compare tag_text_regexp in config/initializers/acts_as_taggable_on.rb hashtagRegExp: "[" + PosixBracketExpressions.word + "\\u055b" + // Armenian emphasis mark "\\u055c" + // Armenian exclamation mark diff --git a/app/assets/javascripts/app/views/tag_following_list_view.js b/app/assets/javascripts/app/views/tag_following_list_view.js index d284f137c..41af8e7e5 100644 --- a/app/assets/javascripts/app/views/tag_following_list_view.js +++ b/app/assets/javascripts/app/views/tag_following_list_view.js @@ -48,7 +48,7 @@ app.views.TagFollowingList = app.views.Base.extend({ if(evt){ evt.preventDefault(); } var name = this.$(".tag_input").val(); - // compare tag_text_regexp in app/models/acts_as_taggable_on-tag.rb + // compare tag_text_regexp in config/initializers/acts_as_taggable_on.rb var normalizedName = (name === "<3" ? name : name.replace( new RegExp("[^" + PosixBracketExpressions.alnum + "_\\-]+", "gi"), "").toLowerCase()); |