X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-bootstrap-debug.js;h=f8ab6a0624d0068f5c899c9faef5a4d27fb3518f;hb=f2689269a2a28287e338dbca978ed7bbeaf2c060;hp=5b262be36ec758f3283fd6f2582e1bf1fdfcaa07;hpb=ead8a9a89064304bfe56d9f1571ea4e257120c61;p=roojs1 diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 5b262be36e..f8ab6a0624 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -1,4 +1,4 @@ -/** +Roo.bootstrap = {};/** * set the version of bootstrap based on the stylesheet... * */ @@ -15358,6 +15358,16 @@ Roo.extend(Roo.data.Store, Roo.util.Observable, { *
* @param {Object} options An object containing properties which control loading options:
+ { + data : data, // array of key=>value data like JsonReader + total : data.length, + success : true + + } ++ }.
// double BR. - node.insertBefore(node.documentOwner.createElement('BR'), node); + node.parentNode.insertBefore(node.ownerDocument.createElement('BR'), node); + node.parentNode.insertBefore(node.ownerDocument.createElement('BR'), node); node.parentNode.removeChild(node); return false; @@ -26330,7 +26369,7 @@ Roo.htmleditor.FilterSpan = function(cfg) this.walk(cfg.node); } -Roo.extend(Roo.htmleditor.FilterSpan, Roo.htmleditor.Filter, +Roo.extend(Roo.htmleditor.FilterSpan, Roo.htmleditor.FilterKeepChildren, { tag : 'SPAN', @@ -26339,17 +26378,10 @@ Roo.extend(Roo.htmleditor.FilterSpan, Roo.htmleditor.Filter, replaceTag : function(node) { if (node.attributes && node.attributes.length > 0) { - this.walk(node); - return true; - } - for (var i = 0; i < node.childNodes.length; i++) { - node.removeChild(node.childNodes[i]); - // what if we need to walk these??? - node.insertBefore(node.childNodes[i], node); - this.walk(node.childNodes[i]); + return true; // walk if there are any. } - n.parentNode.removeChild(n); - return false; // don't walk children + Roo.htmleditor.FilterKeepChildren.prototype.replaceTag.call(this, node); + return false; } @@ -26410,7 +26442,7 @@ Roo.extend(Roo.htmleditor.FilterTableWidth, Roo.htmleditor.Filter, } } - this.walk(node); + return true; // continue doing children.. } });/** * @class Roo.htmleditor.FilterWord @@ -26529,208 +26561,2265 @@ Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter, } -});//