ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Making it so mergeWithDefaultFilter returns undefined if the protocol defaultFilter is falsey. r=ahocevar,me (closes #2796)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@10658 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Tim Schaub
2010-08-20 23:48:45 +00:00
parent ee7065c9fa
commit f37c9f8aef
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/OpenLayers/Protocol.js
View File

@@ -57,20 +57,18 @@ OpenLayers.Protocol = OpenLayers.Class({
* filter - {OpenLayers.Filter}
*/
mergeWithDefaultFilter: function(filter) {
if(filter) {
if(this.defaultFilter) {
filter = new OpenLayers.Filter.Logical({
type: OpenLayers.Filter.Logical.AND,
filters: [this.defaultFilter, filter]
});
}
var merged;
if (filter && this.defaultFilter) {
merged = new OpenLayers.Filter.Logical({
type: OpenLayers.Filter.Logical.AND,
filters: [this.defaultFilter, filter]
});
} else {
filter = this.defaultFilter;
merged = filter || this.defaultFilter || undefined;
}
return filter;
return merged;
},
/**
* APIMethod: destroy
* Clean up the protocol.