X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=roojs-debug.js;h=7935bec0143bd5a097b46dbeab3200145d2e6ceb;hp=84c422e373361d53eec6eb17da25fe55d1c5beae;hb=fca4852c957f6aebf0af1675fd518713f4739fe5;hpb=cb9a8f5f7f553a7dfef00613388f37102123ccf6 diff --git a/roojs-debug.js b/roojs-debug.js index 84c422e373..7935bec014 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -25890,10 +25890,10 @@ Roo.extend(Roo.data.DataProxy, Roo.util.Observable); * An implementation of Roo.data.DataProxy that simply passes the data specified in its constructor * to the Reader when its load method is called. * @constructor - * @cfg {Object} data The data object which the Reader uses to construct a block of Roo.data.Records. + * @param {Object} config A config object containing the objects needed for the Store to access data, */ Roo.data.MemoryProxy = function(data){ - if (data.data) { + if (typeof(data) != 'undefined' && typeof(data.data) != 'undefined') { data = data.data; } Roo.data.MemoryProxy.superclass.constructor.call(this); @@ -25902,6 +25902,9 @@ Roo.data.MemoryProxy = function(data){ Roo.extend(Roo.data.MemoryProxy, Roo.data.DataProxy, { + /** + * @cfg {Object} data The data object which the Reader uses to construct a block of Roo.data.Records. + */ /** * Load data from the requested source (in this case an in-memory * data object passed to the constructor), read the data object into