X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=roojs-debug.js;h=b72198f2df467e4717aa0c3d0c4cdfafb19331d2;hp=7935bec0143bd5a097b46dbeab3200145d2e6ceb;hb=bb4f20285cb0ce281099e1db5cb76e60175de50f;hpb=73f7b5a9f21e91afcf1a6ce56a0a5140310de826 diff --git a/roojs-debug.js b/roojs-debug.js index 7935bec014..b72198f2df 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -25892,9 +25892,10 @@ Roo.extend(Roo.data.DataProxy, Roo.util.Observable); * @constructor * @param {Object} config A config object containing the objects needed for the Store to access data, */ -Roo.data.MemoryProxy = function(data){ - if (typeof(data) != 'undefined' && typeof(data.data) != 'undefined') { - data = data.data; +Roo.data.MemoryProxy = function(config){ + var data = config; + if (typeof(config) != 'undefined' && typeof(config.data) != 'undefined') { + data = config.data; } Roo.data.MemoryProxy.superclass.constructor.call(this); this.data = data; @@ -46276,7 +46277,7 @@ Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter, } var nlvl = (style['mso-list'].split(' ')[1].replace(/level/,'') *1) - 1; - if (nlvl > lvl) { + if (nlvl > lvl && last_li) { //new indent var nul = doc.createElement('ul'); // what about number lists... last_li.appendChild(nul);