X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=roojs-debug.js;h=e4c6e1a7fba077aa3a8d6d501e4e74ad61d050cb;hp=d2b15ccb1ab0888b3f4c086b3e19e2dcdcb63aa6;hb=3cc0f894f4950c221efdc268aed5afa04b6971b2;hpb=cdb8f6b38af2e35f4cea899bcbc70a26cb03b878 diff --git a/roojs-debug.js b/roojs-debug.js index d2b15ccb1a..e4c6e1a7fb 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -45324,6 +45324,7 @@ Roo.rtf.Parser.prototype = { this.flushHexStore(); if (!this.group) { // an RTF fragment, missing the {\rtf1 header //this.group = this.doc + return; // we really don't care about stray text... } this.group.addContent(new Roo.rtf.Span(cmd)); }, @@ -47759,7 +47760,7 @@ Roo.htmleditor.Block.prototype = { * @param {DomElement} node * @param {String} tag - tag to find, eg. IMG ?? might be better to use DomQuery ? - * @param {String} attribute (use html - for contents, or style for using next param as style) + * @param {String} attribute (use html - for contents, style for using next param as style, or false to return the node) * @param {String} style the style property - eg. text-align */ getVal : function(node, tag, attr, style) @@ -47773,6 +47774,9 @@ Roo.htmleditor.Block.prototype = { if (!n) { return ''; } + if (attr === false) { + return n; + } if (attr == 'html') { return n.innerHTML; } @@ -48069,15 +48073,16 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, { var m = this.width == '50%' && this.align == 'center' ? '0 auto' : 0; + var iw = this.align == 'center' ? this.width : '100%'; var img = { tag : 'img', contenteditable : 'false', src : this.image_src, alt : d.innerText.replace(/\n/g, " ").replace(/\s+/g, ' ').trim(), // removeHTML and reduce spaces.. style: { - width : 'auto', - 'max-width': '100%', - margin : '0px' + width : iw, + maxWidth : iw + ' !important', // this is not getting rendered? + margin : m } @@ -48116,20 +48121,23 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, { ] }; } - - var captionhtml = this.caption_display == 'hidden' ? this.caption : (this.caption.length ? this.caption : "Caption"); + // we remove caption totally if its hidden... - will delete data.. but otherwise we end up with fake caption + var captionhtml = this.caption_display == 'none' ? '' : (this.caption.length ? this.caption : "Caption"); return { tag: 'figure', 'data-block' : 'Figure', + contenteditable : 'false', + style : { display: 'block', float : this.align , - 'max-width': this.width, - width : 'auto', - margin: m, - padding: '10px' + maxWidth : this.align == 'center' ? '100% !important' : (this.width + ' !important'), + width : this.align == 'center' ? '100%' : this.width, + margin: '0px', + padding: '10px', + textAlign : this.align // seems to work for email.. }, @@ -48140,22 +48148,38 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, { { tag: 'figcaption', - + 'data-display' : this.caption_display, style : { - 'text-align': 'left', - 'margin-top' : '16px', - 'font-size' : '16px', - 'line-height' : '24px', - display : this.caption_display + textAlign : 'left', + fontSize : '16px', + lineHeight : '24px', + display : this.caption_display, + maxWidth : this.width + ' !important', + margin: m, + width: this.width + + }, cls : this.cls.length > 0 ? (this.cls + '-thumbnail' ) : '', cn : [ { - // we can not rely on yahoo syndication to use CSS elements - so have to use '' to encase stuff. - tag : 'i', - contenteditable : true, - html : captionhtml + tag: 'div', + style : { + marginTop : '16px', + textAlign : 'left' + }, + align: 'left', + cn : [ + { + // we can not rely on yahoo syndication to use CSS elements - so have to use '' to encase stuff. + tag : 'i', + contenteditable : true, + html : captionhtml + } + + ] } + ] } @@ -48171,16 +48195,16 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, { 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', 'align'); - this.caption = this.getVal(node, 'figcaption', 'html'); - // remove ' - if (this.caption.trim().match(/^]*>/i)) { - this.caption = this.caption.trim().replace(/^]*>/i, '').replace(/^<\/i>$/i, ''); - } + var figcaption = this.getVal(node, 'figcaption', false); + this.caption = this.getVal(figcaption, 'i', 'html'); + + this.caption_display = this.getVal(node, 'figcaption', 'data-display'); //this.text_align = this.getVal(node, 'figcaption', 'style','text-align'); - this.width = this.getVal(node, 'figure', 'style', 'max-width'); + this.width = this.getVal(node, 'figcaption', 'style', 'width'); //this.margin = this.getVal(node, 'figure', 'style', 'margin'); }, @@ -50005,7 +50029,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { var cd = (e.browserEvent.clipboardData || window.clipboardData); // check what type of paste - if it's an image, then handle it differently. - if (cd.files.length > 0) { + if (cd.files && cd.files.length > 0) { // pasting images? var urlAPI = (window.createObjectURL && window) || (window.URL && URL.revokeObjectURL && URL) || @@ -50015,14 +50039,19 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { this.insertAtCursor(''); return false; } - + if (cd.types.indexOf('text/html') < 0 ) { + return false; + } + var images = []; var html = cd.getData('text/html'); // clipboard event - var parser = new Roo.rtf.Parser(cd.getData('text/rtf')); - var images = parser.doc ? parser.doc.getElementsByType('pict') : []; + if (cd.types.indexOf('text/rtf') > -1) { + var parser = new Roo.rtf.Parser(cd.getData('text/rtf')); + images = parser.doc ? parser.doc.getElementsByType('pict') : []; + } Roo.log(images); //Roo.log(imgs); // fixme.. - images = images.filter(function(g) { return !g.path.match(/^rtf\/(head|pgdsctbl|listtable)/); }) // ignore headers + images = images.filter(function(g) { return !g.path.match(/^rtf\/(head|pgdsctbl|listtable|footerf)/); }) // ignore headers/footers etc. .map(function(g) { return g.toDataURL(); }) .filter(function(g) { return g != 'about:blank'; });