Merge "Allow maxlength attribute on HTMLSelectAndOtherField"

diff --combined resources/Resources.php
index e53ed54,dc7b6f4..6a7b35a
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -779,10 -779,6 +779,10 @@@ return array
                        'mediawiki.hlist',
                ),
        ),
 +      'mediawiki.template' => array(
 +              'scripts' => 'resources/src/mediawiki/mediawiki.template.js',
 +              'targets' => array( 'desktop', 'mobile' ),
 +      ),
        'mediawiki.apipretty' => array(
                'styles' => 'resources/src/mediawiki/mediawiki.apipretty.css',
                'targets' => array( 'desktop', 'mobile' ),
@@@ -855,9 -851,6 +855,9 @@@
                'position' => 'bottom',
        ),
        'mediawiki.feedback' => array(
 +              'templates' => array(
 +                      'dialog.html' => 'resources/src/mediawiki/templates/dialog.html',
 +              ),
                'scripts' => 'resources/src/mediawiki/mediawiki.feedback.js',
                'styles' => 'resources/src/mediawiki/mediawiki.feedback.css',
                'dependencies' => array(
@@@ -901,8 -894,13 +901,13 @@@
                'scripts' => 'resources/src/mediawiki/mediawiki.htmlform.js',
                'dependencies' => array(
                        'jquery.mwExtension',
+                       'jquery.byteLimit',
+               ),
+               'messages' => array(
+                       'htmlform-chosen-placeholder',
+                       // @todo Load this message in content language
+                       'colon-separator',
                ),
-               'messages' => array( 'htmlform-chosen-placeholder' ),
        ),
        'mediawiki.icon' => array(
                'styles' => 'resources/src/mediawiki/mediawiki.icon.less',
@@@ -1002,7 -1000,6 +1007,7 @@@
                'dependencies' => array(
                        'jquery.cookie',
                ),
 +              'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.toolbar' => array(
                'class' => 'ResourceLoaderEditToolbarModule',
@@@ -1071,9 -1068,6 +1076,9 @@@
                ),
        ),
        'mediawiki.action.view.postEdit' => array(
 +              'templates' => array(
 +                      'postEdit.html' => 'resources/src/mediawiki.action/templates/postEdit.html',
 +              ),
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.postEdit.js',
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.view.postEdit.css',
                'dependencies' => array(
@@@ -1348,9 -1342,6 +1353,9 @@@
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.undelete.js',
        ),
        'mediawiki.special.upload' => array(
 +              'templates' => array(
 +                      'thumbnail.html' => 'resources/src/mediawiki.special/templates/thumbnail.html',
 +              ),
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.upload.js',
                'messages' => array(
                        'widthheight',
@@@ -1605,18 -1596,17 +1610,18 @@@
                        'minerva' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css',
                ),
                'messages' => array(
 +                      'ooui-dialog-message-accept',
 +                      'ooui-dialog-message-reject',
 +                      'ooui-dialog-process-continue',
 +                      'ooui-dialog-process-dismiss',
 +                      'ooui-dialog-process-error',
 +                      'ooui-dialog-process-retry',
                        'ooui-outline-control-move-down',
                        'ooui-outline-control-move-up',
                        'ooui-outline-control-remove',
                        'ooui-toolbar-more',
                        'ooui-toolgroup-collapse',
                        'ooui-toolgroup-expand',
 -                      'ooui-dialog-message-accept',
 -                      'ooui-dialog-message-reject',
 -                      'ooui-dialog-process-dismiss',
 -                      'ooui-dialog-process-error',
 -                      'ooui-dialog-process-retry',
                ),
                'dependencies' => array(
                        'es5-shim',

diff --combined resources/src/mediawiki/mediawiki.htmlform.js
index fd76c80,db8d8b1..4a4a97e
--- 1/resources/src/mediawiki/mediawiki.htmlform.js
--- 2/resources/src/mediawiki/mediawiki.htmlform.js
+++ b/resources/src/mediawiki/mediawiki.htmlform.js
@@@ -237,7 -237,9 +237,9 @@@
        } );
  
        function enhance( $root ) {
-               var $matrixTooltips, $autocomplete;
+               var $matrixTooltips, $autocomplete,
+                       // cache the separator to avoid object creation on each keypress
+                       colonSeparator = mw.message( 'colon-separator' ).text();
  
                /**
                 * @ignore
@@@ -261,6 -263,36 +263,36 @@@
                                handleSelectOrOther.call( this, true );
                        } );
  
+               // Add a dynamic max length to the reason field of SelectAndOther
+               // This checks the length together with the value from the select field
+               // When the reason list is changed and the bytelimit is longer than the allowed,
+               // nothing is done
+               $root
+                       .find( '.mw-htmlform-select-and-other-field' )
+                       .each( function () {
+                               var $this = $( this ),
+                                       // find the reason list
+                                       $reasonList = $root.find( '#' + $this.data( 'id-select' ) ),
+                                       // cache the current selection to avoid expensive lookup
+                                       currentValReasonList = $reasonList.val();
+ 
+                               $reasonList.change( function () {
+                                       currentValReasonList = $reasonList.val();
+                               } );
+ 
+                               $this.byteLimit( function ( input ) {
+                                       // Should be built the same as in HTMLSelectAndOtherField::loadDataFromRequest
+                                       var comment = currentValReasonList;
+                                       if ( comment === 'other' ) {
+                                               comment = input;
+                                       } else if ( input !== '' ) {
+                                               // Entry from drop down menu + additional comment
+                                               comment += colonSeparator + input;
+                                       }
+                                       return comment;
+                               } );
+                       } );
+ 
                // Set up hide-if elements
                $root.find( '.mw-htmlform-hide-if' ).each( function () {
                        var v, $fields, test, func,
@@@ -368,12 -400,12 +400,12 @@@
                }
  
                // Add/remove cloner clones without having to resubmit the form
 -              $root.find( '.mw-htmlform-cloner-delete-button' ).click( function ( ev ) {
 +              $root.find( '.mw-htmlform-cloner-delete-button' ).filter( ':input' ).click( function ( ev ) {
                        ev.preventDefault();
                        $( this ).closest( 'li.mw-htmlform-cloner-li' ).remove();
                } );
  
 -              $root.find( '.mw-htmlform-cloner-create-button' ).click( function ( ev ) {
 +              $root.find( '.mw-htmlform-cloner-create-button' ).filter( ':input' ).click( function ( ev ) {
                        var $ul, $li, html;
  
                        ev.preventDefault();