+ {
+ data : data, // array of key=>value data like JsonReader
+ total : data.length,
+ success : true
+
+ }
+
+ }.-
*
- r : Roo.data.Record[] @@ -25977,7 +25987,9 @@ Roo.extend(Roo.bootstrap.form.SecurePass, Roo.bootstrap.form.Input, { return this.IsLongEnough(pwd, 6) || !this.IsLongEnough(pwd, 0); } -})Roo.htmleditor = {}; +}); +Roo.htmleditor = {}; + /** * @class Roo.htmleditor.Filter * Base Class for filtering htmleditor stuff. - do not use this directly - extend it. @@ -26013,7 +26025,7 @@ Roo.htmleditor.Filter.prototype = { Roo.each( Array.from(dom.childNodes), function( e ) { switch(true) { - case e.nodeType == 8 && typeof(this.replaceComment) != 'undefined': // comment + case e.nodeType == 8 && this.replaceComment !== false: // comment this.replaceComment(e); return; @@ -26136,7 +26148,11 @@ Roo.extend(Roo.htmleditor.FilterAttributes, Roo.htmleditor.Filter, if (v.match(/^\./) || v.match(/^\//)) { return; } - if (v.match(/^(http|https):\/\//) || v.match(/^mailto:/) || v.match(/^ftp:/)) { + if (v.match(/^(http|https):\/\//) + || v.match(/^mailto:/) + || v.match(/^ftp:/) + || v.match(/^data:/) + ) { return; } if (v.match(/^#/)) { @@ -26209,7 +26225,7 @@ Roo.extend(Roo.htmleditor.FilterBlack, Roo.htmleditor.Filter, { tag : true, // all elements. - replace : function(n) + replaceTag : function(n) { n.parentNode.removeChild(n); } @@ -26257,7 +26273,7 @@ Roo.extend(Roo.htmleditor.FilterKeepChildren, Roo.htmleditor.FilterBlack, replaceTag : function(node) { // walk children... - Roo.log(node); + //Roo.log(node); var ar = Array.from(node.childNodes); //remove first.. for (var i = 0; i < ar.length; i++) { @@ -26332,6 +26348,7 @@ Roo.extend(Roo.htmleditor.FilterParagraph, Roo.htmleditor.Filter, // double BR. node.parentNode.insertBefore(node.ownerDocument.createElement('BR'), node); + node.parentNode.insertBefore(node.ownerDocument.createElement('BR'), node); node.parentNode.removeChild(node); return false; @@ -26607,7 +26624,7 @@ Roo.extend(Roo.htmleditor.FilterStyleToTag, Roo.htmleditor.Filter, var cn = Array.from(node.childNodes); var nn = node; Roo.each(inject, function(t) { - var nc = node.ownerDocument.createelement(t); + var nc = node.ownerDocument.createElement(t); nn.appendChild(nc); nn = nc; }); @@ -26687,6 +26704,42 @@ Roo.extend(Roo.htmleditor.FilterLongBr, Roo.htmleditor.Filter, } +}); + +/** + * @class Roo.htmleditor.FilterBlock + * removes id / data-block and contenteditable that are associated with blocks + * usage should be done on a cloned copy of the dom + * @constructor +* Run a new Attribute Filter { node : xxxx }} +* @param {Object} config Configuration options + */ +Roo.htmleditor.FilterBlock = function(cfg) +{ + Roo.apply(this, cfg); + var qa = cfg.node.querySelectorAll; + this.removeAttributes('data-block'); + this.removeAttributes('contenteditable'); + this.removeAttributes('id'); + +} + +Roo.apply(Roo.htmleditor.FilterBlock.prototype, +{ + node: true, // all tags + + + removeAttributes : function(attr) + { + var ar = this.node.querySelectorAll('*[' + attr + ']'); + for (var i =0;i
' +
+ '' +
+ '
' +
+ '' +
+ '
',
+ */
+
+ if (this.href.length > 0) {
+ img = {
+ tag : 'a',
+ href: this.href,
+ contenteditable : 'true',
+ cn : [
+ img
+ ]
+ };
+ }
+
+
+ if (this.video_url.length > 0) {
+ img = {
+ tag : 'div',
+ cls : this.cls,
+ frameborder : 0,
+ allowfullscreen : true,
+ width : 420, // these are for video tricks - that we replace the outer
+ height : 315,
+ src : this.video_url,
+ cn : [
+ img
+ ]
+ };
+ }
+
+ return {
tag: 'figure',
'data-block' : 'Figure',
contenteditable : 'false',
style : {
- display: 'table',
+ display: 'block',
float : this.align ,
- width : this.width,
- margin: this.margin
+ 'max-width': this.width,
+ width : 'auto',
+ margin: m,
+ padding: '10px'
+
},
+
+
+ align : this.align,
cn : [
- {
- tag : 'img',
- src : this.image_src,
- alt : d.innerText.replace(/\n/g, " "), // removeHTML..
- style: {
- width: '100%'
- }
- },
+ img,
+
{
tag: 'figcaption',
contenteditable : true,
style : {
- 'text-align': this.text_align
+ 'text-align': 'left',
+ 'margin-top' : '16px',
+ 'font-size' : '16px',
+ 'line-height' : '24px',
+ 'font-style': 'italic',
+ display : this.caption_display
},
+ cls : this.cls.length > 0 ? (this.cls + '-thumbnail' ) : '',
html : this.caption
}
]
};
+
},
readElement : function(node)
{
+ // this should not really come from the link...
+ this.video_url = this.getVal(node, 'div', 'src');
+ this.cls = this.getVal(node, 'div', 'class');
+ this.href = this.getVal(node, 'a', 'href');
+
this.image_src = this.getVal(node, 'img', 'src');
- this.align = this.getVal(node, 'figure', 'style', 'float');
+
+ this.align = this.getVal(node, 'figure', 'align');
this.caption = this.getVal(node, 'figcaption', 'html');
- this.text_align = this.getVal(node, 'figcaption', 'style','text-align');
- this.width = this.getVal(node, 'figure', 'style', 'width');
- this.margin = this.getVal(node, 'figure', 'style', 'margin');
+ //this.text_align = this.getVal(node, 'figcaption', 'style','text-align');
+ this.width = this.getVal(node, 'figure', 'style', 'max-width');
+ //this.margin = this.getVal(node, 'figure', 'style', 'margin');
- }
+ },
+ removeNode : function()
+ {
+ return this.node;
+ }
@@ -27012,53 +27350,1291 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
})
-//' +
+ '' +
+ '