diff options
| author | Mark Holmquist <mtraceur@member.fsf.org> | 2013-07-31 17:25:29 -0700 |
|---|---|---|
| committer | Timo Tijhof <krinklemail@gmail.com> | 2013-08-02 01:31:53 +0200 |
| commit | 8d629551524d4bfaab633f309197361b9a793aee (patch) | |
| tree | 9ba6b0d0b94c96eb7f38b8a1e91b9a03cd741c17 /resources/mediawiki/mediawiki.util.js | |
| parent | c7f174bf6846df0bf9b758492d2ef13009417b72 (diff) | |
| download | mediawikicore-8d629551524d4bfaab633f309197361b9a793aee.tar.gz mediawikicore-8d629551524d4bfaab633f309197361b9a793aee.zip | |
mediawiki.util: Fix addPortletLink to allow jQuery objects
The docs already say jQuery is a supported type for nextnode, it just
wasn't yet checking for it in the function.
Change-Id: I0bdc7dacd24aac720b70c6fc0ca3154ceccd0ebb
Diffstat (limited to 'resources/mediawiki/mediawiki.util.js')
| -rw-r--r-- | resources/mediawiki/mediawiki.util.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/resources/mediawiki/mediawiki.util.js b/resources/mediawiki/mediawiki.util.js index b482823810ea..6f768392c77f 100644 --- a/resources/mediawiki/mediawiki.util.js +++ b/resources/mediawiki/mediawiki.util.js @@ -432,10 +432,16 @@ $link.attr( 'accesskey', accesskey ); } + // nextnode is a DOM element (was the only option before MW 1.17, in wikibits.js) + // so we make it a jQuery object! + if ( nextnode && nextnode.nodeType ) { + nextnode = $( nextnode ); + } + // Where to put our node ? - // - nextnode is a DOM element (was the only option before MW 1.17, in wikibits.js) - if ( nextnode && nextnode.parentNode === $ul[0] ) { - $( nextnode ).before( $item ); + // - nextnode is a jQuery object that represents exactly one element + if ( nextnode && nextnode.jquery && nextnode.length === 1 && nextnode[0].parentNode === $ul[0] ) { + nextnode.before( $item ); // - nextnode is a CSS selector for jQuery } else if ( typeof nextnode === 'string' && $ul.find( nextnode ).length !== 0 ) { |