Merge "Allow specifying targets for ResourceLoaderWikiModule"

[lhc/web/wiklou.git] / resources / src / jquery / jquery.makeCollapsible.js

diff --git a/resources/src/jquery/jquery.makeCollapsible.js b/resources/src/jquery/jquery.makeCollapsible.js
index ddc57ec..bdb5ce8 100644 (file)
--- a/resources/src/jquery/jquery.makeCollapsible.js
+++ b/resources/src/jquery/jquery.makeCollapsible.js
@@ -153,16 +153,14 @@
         */
        function togglingHandler( $toggle, $collapsible, e, options ) {
                var wasCollapsed, $textContainer, collapseText, expandText;
-
-               if ( options === undefined ) {
-                       options = {};
-               }
+               options = options || {};
 
                if ( e ) {
                        if (
                                e.type === 'click' &&
                                options.linksPassthru &&
                                $.nodeName( e.target, 'a' ) &&
+                               $( e.target ).attr( 'href' ) &&
                                $( e.target ).attr( 'href' ) !== '#'
                        ) {
                                // Don't fire if a link with href !== '#' was clicked, if requested  (for premade togglers by default)
@@ -240,9 +238,7 @@
         * @chainable
         */
        $.fn.makeCollapsible = function ( options ) {
-               if ( options === undefined ) {
-                       options = {};
-               }
+               options = options || {};
 
                this.each( function () {
                        var $collapsible, collapseText, expandText, $caption, $toggle, actionHandler, buildDefaultToggleLink,