jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix regexp in reltag toggle

Browse Source 
should account for all special characters while preserving newlines
This commit is contained in:
Toks
2013-04-12 18:00:57 -04:00
parent 3ccad2cc18
commit 5843b3037f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/related_tag.js
View File

@@ -194,7 +194,8 @@
var tag = $(e.target).html().replace(/ /g, "_").replace(/&gt;/g, ">").replace(/&lt;/g, "<").replace(/&amp;/g, "&"); var tag = $(e.target).html().replace(/ /g, "_").replace(/&gt;/g, ">").replace(/&lt;/g, "<").replace(/&amp;/g, "&");
if ($.inArray(tag, tags) > -1) { if ($.inArray(tag, tags) > -1) {
$field.val($field.val().replace(new RegExp("\\b" + tag + "\\b", "gi"), " ")); var escaped_tag = Danbooru.regexp_escape(tag);
$field.val($field.val().replace(new RegExp("(^|\\s)" + escaped_tag + "($|\\s)", "gi"), "$1$2"));
} else { } else {
$field.val($field.val() + " " + tag); $field.val($field.val() + " " + tag);
} }

4
app/assets/javascripts/utility.js
View File

@@ -74,6 +74,10 @@
return filtered; return filtered;
} }
Danbooru.regexp_escape = function(string) {
return string.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
}
$.fn.selectRange = function(start, end) { $.fn.selectRange = function(start, end) {
return this.each(function() { return this.each(function() {
if (this.setSelectionRange) { if (this.setSelectionRange) {