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

Protocol.HTTP.read should not write params into the protocol's options object, p=etdube,me r=me (closes #3237)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@11883 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Éric Lemoine
2011-04-07 06:49:38 +00:00
parent 4f3a0f1267
commit 64a611e861
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/OpenLayers/Protocol/HTTP.js
View File

@@ -175,9 +175,10 @@ OpenLayers.Protocol.HTTP = OpenLayers.Class(OpenLayers.Protocol, {
*/
read: function(options) {
OpenLayers.Protocol.prototype.read.apply(this, arguments);
options = OpenLayers.Util.applyDefaults(options, this.options);
options = options || {};
options.params = OpenLayers.Util.applyDefaults(
options.params, this.options.params);
options = OpenLayers.Util.applyDefaults(options, this.options);
if (options.filter && this.filterToParams) {
options.params = this.filterToParams(
options.filter, options.params

30
tests/Protocol/HTTP.html
View File

@@ -779,7 +779,7 @@
});
protocol.read();
t.delay_call(1, function() {
t.delay_call(2, function() {
t.eq(log1.callbackCalled, true, "[read] callback called");
t.eq(log1.callbackScope, scope, "[read] correct scope");
t.ok(log1.request instanceof OpenLayers.Request.XMLHttpRequest, "[read] correct priv type");
@@ -801,11 +801,37 @@
{state: OpenLayers.State.DELETE, url: "./3"},
{state: OpenLayers.State.DELETE, url: "./4"}
]);
t.delay_call(1, function() {
t.delay_call(2, function() {
t.eq(log2.called, 1, "[commit] Callback called once.");
t.eq(log2.scope, scope, "[commit] Correct scope.");
});
}
function test_read_global_options(t) {
// test that calling read doesn't write params into the protocol's
// options object, see ticket #3237
t.plan(2);
var protocol = new OpenLayers.Protocol.HTTP({
url: '.',
callback: function() {},
params: {'a': 'a'}
});
// check initial state first
t.eq(protocol.options.params, {'a': 'a'},
'protocol params are ok at initial state');
var filter = new OpenLayers.Filter.Comparison({
type: OpenLayers.Filter.Comparison.EQUAL_TO,
property: 'b',
value: 'b'
});
protocol.read({filter: filter});
t.eq(protocol.options.params, {'a': 'a'},
"protocol params are ok after read");
}