Changeset 17970


Ignore:
Timestamp:
Jan 23, 2021, 9:15:01 PM (4 years ago)
Author:
lucid
Message:

TextareaKeyBindingsPlugin: Transform also InterWiki links with $-parameters. (fix #13831)

Location:
textareakeybindingsplugin/trunk/textareakeybindings
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • textareakeybindingsplugin/trunk/textareakeybindings/htdocs/js/textareakeybindings.js

    r17776 r17970  
    109109        });
    110110
    111         Object.keys(data.links).forEach(key => {
    112             const url_re = data.links[key];
     111        data.links.forEach(key_and_url_re => {
     112            const key = key_and_url_re[0];
     113            const url_re = key_and_url_re[1];
    113114            text_to_insert = text_to_insert.replaceAll(new RegExp(url_re, 'g'), key);
    114115        });

  • textareakeybindingsplugin/trunk/textareakeybindings/web_ui.py

    r17776 r17970  
    3939                url = re.sub(r'\\\$(\d)', repl, re.escape(url))
    4040                return outer[0], url
    41             links = {}
    42             links.update(url_pattern_to_re(name, url)
    43                         for name, url, title
    44                         in InterWikiMap(self.env).interwiki_map.values()
    45                         )
     41            def sortkey(tuple):
     42                name, url, title = tuple
     43                return len(url)
     44            tuples = InterWikiMap(self.env).interwiki_map.values()
     45            links = [url_pattern_to_re(name, url)
     46                     for name, url, title
     47                     in sorted(tuples, key=sortkey, reverse=True)]
    4648
    4749            baseurl_pattern = '%s/(\w+)/(\S+)' % (re.escape(req.base_url),)
Note: See TracChangeset for help on using the changeset viewer.