wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 02:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some more switch fixes

Browse source 
Change-Id: If1a6086348c45a73a941bc8e6728ef75d002be50
This commit is contained in:
Gabriel Wicke 2012-06-02 15:04:20 +02:00
parent 8f216af2f5
commit 74135b295f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/parser/ext.core.ParserFunctions.js
View file

@ -80,6 +80,7 @@ ParserFunctions.prototype._switchLookupFallback = function ( frame, kvs, key, di
this.manager.env.tp('swl');
//console.trace();
this.manager.env.dp('_switchLookupFallback', kvs.length, key, v );
var _cb = function( res ) { cb ( { tokens: res } ); };
if ( v && v.constructor !== String ) {
v = '';
console.warn(JSON.stringify(v));
@ -87,7 +88,6 @@ ParserFunctions.prototype._switchLookupFallback = function ( frame, kvs, key, di
if ( v && key === v.trim() ) {
// found. now look for the next entry with a non-empty key.
this.manager.env.dp( 'switch found' );
var _cb = function( res ) { cb ( { tokens: res } ); };
for ( var j = 0; j < l; j++) {
kv = kvs[j];
// XXX: make sure the key is always one of these!
@ -100,7 +100,7 @@ ParserFunctions.prototype._switchLookupFallback = function ( frame, kvs, key, di
}
}
// No value found, return empty string? XXX: check this
return cb( [] );
return cb( {} );
} else if ( kvs.length ) {
// search for value-only entry which matches
var i = 0;
@ -135,18 +135,18 @@ ParserFunctions.prototype._switchLookupFallback = function ( frame, kvs, key, di
if ( '#default' in dict ) {
return dict['#default'].get({
type: 'tokens/x-mediawiki/expanded',
cb: function( res ) { cb ( { tokens: res } ); },
cb: _cb,
asyncCB: cb
});
} else if ( kvs.length ) {
var lastKV = kvs[kvs.length - 1];
if ( lastKV && ! lastKV.k.length ) {
return lastKV.v.get( {
cb: cb,
cb: _cb,
asyncCB: cb } );
//cb ( { tokens: lastKV.v } );
} else {
cb ( {tokens:[]} );
cb ( {} );
}
} else {
// nothing found at all.