Remove some redundant character escapes from regexes
authorSam Reed <reedy@users.mediawiki.org>
Tue, 30 Nov 2010 19:38:04 +0000 (19:38 +0000)
committerSam Reed <reedy@users.mediawiki.org>
Tue, 30 Nov 2010 19:38:04 +0000 (19:38 +0000)
resources/jquery.effects/jquery.effects.core.js
resources/jquery/jquery.color.js
skins/common/ajaxwatch.js

index f3041f5..4589fe2 100644 (file)
@@ -52,7 +52,7 @@ function getRGB(color) {
                                return [parseInt(result[1],10), parseInt(result[2],10), parseInt(result[3],10)];
 
                // Look for rgb(num%,num%,num%)
-               if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color))
+               if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)%\s*,\s*([0-9]+(?:\.[0-9]+)?)%\s*\)/.exec(color))
                                return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
 
                // Look for #a0b1c2
index 634719d..e1b0d0d 100644 (file)
@@ -39,7 +39,7 @@
                        return [parseInt(result[1]), parseInt(result[2]), parseInt(result[3])];
 
                // Look for rgb(num%,num%,num%)
-               if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color))
+               if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)%\s*,\s*([0-9]+(?:\.[0-9]+)?)%\s*,\s*([0-9]+(?:\.[0-9]+)?)%\s*\)/.exec(color))
                        return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
 
                // Look for #a0b1c2
index a1682f0..aaf6360 100644 (file)
@@ -65,8 +65,8 @@ $( document ).ready( function() {
                var $link = $( this );
                $link
                        .data( 'icon', $link.parents( 'li' ).hasClass( 'icon' ) )
-                       .data( 'action', $link.attr( 'href' ).match( /[\?\&]action=unwatch/i ) ? 'unwatch' : 'watch' );
-               var title = $link.attr( 'href' ).match( /[\?\&]title=(.*?)&/i )[1];
+                       .data( 'action', $link.attr( 'href' ).match( /[\?&]action=unwatch/i ) ? 'unwatch' : 'watch' );
+               var title = $link.attr( 'href' ).match( /[\?&]title=(.*?)&/i )[1];
                $link.data( 'target', decodeURIComponent( title ).replace( /_/g, ' ' ) );
        });