mw.htmlform: Don't refer to OO.ui if it might not be loaded

[lhc/web/wiklou.git] / resources / src / mediawiki / htmlform / hide-if.js

diff --git a/resources/src/mediawiki/htmlform/hide-if.js b/resources/src/mediawiki/htmlform/hide-if.js
index 6460ed1..0fbbcbe 100644 (file)
--- a/resources/src/mediawiki/htmlform/hide-if.js
+++ b/resources/src/mediawiki/htmlform/hide-if.js
@@ -156,7 +156,8 @@
                                }
                                v = spec[ 2 ];
 
-                               if ( field instanceof OO.ui.Widget ) {
+                               if ( !( field instanceof jQuery ) ) {
+                                       // field is a OO.ui.Widget
                                        if ( field.supports( 'isSelected' ) ) {
                                                getVal = function () {
                                                        var selected = field.isSelected();
@@ -203,25 +204,17 @@
 
        mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
                $root.find( '.mw-htmlform-hide-if' ).each( function () {
-                       var v, i, fields, test, func, spec, self, modules,
+                       var v, i, fields, test, func, spec, self, modules, data,extraModules,
                                $el = $( this );
 
                        modules = [];
                        if ( $el.is( '[data-ooui]' ) ) {
                                modules.push( 'mediawiki.htmlform.ooui' );
-                               if ( $el.filter( '.mw-htmlform-field-HTMLTitleTextField' ).length ) {
-                                       // FIXME: TitleInputWidget should be in its own module
-                                       modules.push( 'mediawiki.widgets' );
-                               }
-                               if ( $el.filter( '.mw-htmlform-field-HTMLUserTextField' ).length ) {
-                                       modules.push( 'mediawiki.widgets.UserInputWidget' );
-                               }
-                               if (
-                                       $el.filter( '.mw-htmlform-field-HTMLSelectNamespace' ).length ||
-                                       $el.filter( '.mw-htmlform-field-HTMLSelectNamespaceWithButton' ).length
-                               ) {
-                                       // FIXME: NamespaceInputWidget should be in its own module (probably?)
-                                       modules.push( 'mediawiki.widgets' );
+                               data = $el.data( 'mw-modules' );
+                               if ( data ) {
+                                       // We can trust this value, 'data-mw-*' attributes are banned from user content in Sanitizer
+                                       extraModules = data.split( ',' );
+                                       modules.push.apply( modules, extraModules );
                                }
                        }