Allow users to enter in mixed text and macros in URLs inside TinyMCE. Fixes bug #12094.

This commit is contained in:
Colin Kuskie 2011-04-05 13:14:18 -07:00
parent 85f52c2499
commit e3ec56c3c1
2 changed files with 2 additions and 3 deletions

View file

@ -1,4 +1,5 @@
7.10.14 7.10.14
- fixed #12094: Cannot enter in Macros in URLs inside TinyMCE.
7.10.13 7.10.13
- added #12079: Carousel Auto Play - added #12079: Carousel Auto Play

View file

@ -5,15 +5,13 @@
colon = /%3B/g, colon = /%3B/g,
leftParen = /%28/g, leftParen = /%28/g,
rightParen = /%29/g, rightParen = /%29/g,
front = /^.*(\^.*)$/,
quot = /"/g; quot = /"/g;
function convert(url) { function convert(url) {
return url.replace(carat, '^') return url.replace(carat, '^')
.replace(colon, ':') .replace(colon, ':')
.replace(leftParen, '(') .replace(leftParen, '(')
.replace(rightParen, ')') .replace(rightParen, ')');
.replace(front, '$1');
} }
function recurse(el) { function recurse(el) {