http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97606
Revision: 97606
Author: junaidpv
Date: 2011-09-20 08:56:33 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Narayam: Blank keybuffer was matching against rules that require keybuffer
match. Fixed now.
Modified Paths:
--------------
trunk/extensions/Narayam/js/ext.narayam.core.js
Modified: trunk/extensions/Narayam/js/ext.narayam.core.js
===================================================================
--- trunk/extensions/Narayam/js/ext.narayam.core.js 2011-09-20 08:56:30 UTC
(rev 97605)
+++ trunk/extensions/Narayam/js/ext.narayam.core.js 2011-09-20 08:56:33 UTC
(rev 97606)
@@ -53,13 +53,19 @@
var rules = currentScheme.extended_keyboard && useExtended ?
currentScheme.rules_x : currentScheme.rules;
for ( var i = 0; i < rules.length; i++ ) {
- var keyBufferMatch = true;
- if ( rules[i][1].length > 0 && rules[i][1].length <=
keyBuffer.length ) {
- // Try to match rules[i][1] at the end of the
key buffer
- keyBufferMatch = new RegExp( rules[i][1] + '$'
).test( keyBuffer );
- }
var regex = new RegExp( rules[i][0] + '$' );
- if ( keyBufferMatch && regex.test( str ) ) {
+ if ( regex.test( str ) // Input string match
+ &&
+ (
+ rules[i][1].length == 0 // Keybuffer
match not required
+ ||
+ ( // Keybuffer match specified,
so it should be met
+ rules[i][1].length > 0
+ && rules[i][1].length <=
keyBuffer.length
+ && new RegExp( rules[i][1] +
'$' ).test( keyBuffer )
+ )
+ )
+ ) {
return str.replace( regex, rules[i][2] );
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
