projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of http://git.roojs.com/roojs1
[roojs1]
/
Roo
/
data
/
MemoryProxy.js
diff --git
a/Roo/data/MemoryProxy.js
b/Roo/data/MemoryProxy.js
index
241c570
..
ac626fb
100644
(file)
--- a/
Roo/data/MemoryProxy.js
+++ b/
Roo/data/MemoryProxy.js
@@
-46,7
+46,7
@@
Roo.extend(Roo.data.MemoryProxy, Roo.data.DataProxy, {
params = params || {};
var result;
try {
params = params || {};
var result;
try {
- result = reader.readRecords(this.data);
+ result = reader.readRecords(
params.data ? params.data :
this.data);
}catch(e){
this.fireEvent("loadexception", this, arg, null, e);
callback.call(scope, null, arg, false);
}catch(e){
this.fireEvent("loadexception", this, arg, null, e);
callback.call(scope, null, arg, false);