Helder.wiki has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/74152


Change subject: Load filter conditions when the user press ENTER
......................................................................

Load filter conditions when the user press ENTER

Cleanup:
- Trim the field value before trying to load the filter
- Add the pattern to the box using .val() instead of .text(), to
  update the content even if the user has made changes to it

Bug: 51402
Change-Id: I4ae671941571dce206448424f8e996cb99ac8d41
---
M modules/ext.abuseFilter.edit.js
1 file changed, 10 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/52/74152/1

diff --git a/modules/ext.abuseFilter.edit.js b/modules/ext.abuseFilter.edit.js
index f55cfbd..9081524 100644
--- a/modules/ext.abuseFilter.edit.js
+++ b/modules/ext.abuseFilter.edit.js
@@ -134,7 +134,7 @@
         */
        function fetchFilter() {
                /*jshint validthis:true */
-               var filterId = $( '#mw-abusefilter-load-filter' ).val(),
+               var filterId = $.trim( $( '#mw-abusefilter-load-filter' ).val() 
),
                        api;
 
                if ( filterId === '' ) {
@@ -158,7 +158,7 @@
                } )
                .done( function( data ) {
                        if ( data.query.abusefilters[0] !== undefined ) {
-                               $filterBox.text( 
data.query.abusefilters[0].pattern );
+                               $filterBox.val( 
data.query.abusefilters[0].pattern );
                        }
                } );
        }
@@ -258,6 +258,7 @@
 
        // On ready initialization
        $( document ).ready( function() {
+               var $loadButton = $( '#mw-abusefilter-load' );
                $filterBox = $( '#' + mw.config.get( 'abuseFilterBoxName' ) );
                // Hide the syntax ok message when the text changes
                $filterBox.keyup( function() {
@@ -268,7 +269,13 @@
                        }
                } );
 
-               $( '#mw-abusefilter-load' ).click( fetchFilter );
+               $loadButton.click( fetchFilter );
+               $( '#mw-abusefilter-load-filter' ).keypress( function( e ) {
+                       if ( e.type === 'keypress' && e.which === 13 ) {
+                               e.preventDefault();
+                               $loadButton.click();
+                       }
+               } );
                $( '#mw-abusefilter-warn-preview-button' ).click( 
previewWarnMessage );
                $( '#mw-abusefilter-warn-edit-button' ).click( editWarnMessage 
);
                $( 'input.mw-abusefilter-action-checkbox' ).click( 
hideDeselectedActions );

-- 
To view, visit https://gerrit.wikimedia.org/r/74152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ae671941571dce206448424f8e996cb99ac8d41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Helder.wiki <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to