https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113250
Revision: 113250
Author: foxtrott
Date: 2012-03-07 17:29:38 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
bugfix ('and' filter)
Modified Paths:
--------------
trunk/extensions/SemanticResultFormats/Filtered/libs/ext.srf.filtered.value-filter.js
Modified:
trunk/extensions/SemanticResultFormats/Filtered/libs/ext.srf.filtered.value-filter.js
===================================================================
---
trunk/extensions/SemanticResultFormats/Filtered/libs/ext.srf.filtered.value-filter.js
2012-03-07 17:20:11 UTC (rev 113249)
+++
trunk/extensions/SemanticResultFormats/Filtered/libs/ext.srf.filtered.value-filter.js
2012-03-07 17:29:38 UTC (rev 113250)
@@ -49,10 +49,19 @@
} else {
var selected =
( printoutValues.length > 0 );
- for ( var j in
printoutValues ) {
+ if ( selected )
{
+ // try
to find each required value
+
selectedInputs.each(function(){
-
selectedInputs.each(function(){
-
selected = selected && ( printoutValues[j] == $(this).attr('value') );
+
var selectedFoundInPrintout = false;
+
for ( var j in printoutValues ) {
+
selectedFoundInPrintout = selectedFoundInPrintout || (
printoutValues[j] == $(this).attr('value') );
+
+
if ( selectedFoundInPrintout ) {
+
break;
+
}
+
}
+
selected = selected && selectedFoundInPrintout;
});
}
}
@@ -101,7 +110,7 @@
filtercontrols.append('<div
class="filtered-value-label"><span>' + values[i]['printouts'][target]['label']
+ '</span></div>');
// set default config values
- filtered.filtered( 'setFilterData', {filter: 'value',
printout: target, configvar: 'use or', configvalue: true } );
+ filtered.filtered( 'setFilterData', {filter: 'value',
printout: target, configvar: 'use or', configvalue: true} );
// insert switches
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
