+ {
+ 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; @@ -26053,6 +26065,8 @@ Roo.htmleditor.FilterAttributes = function(cfg) { Roo.apply(this, cfg); this.attrib_black = this.attrib_black || []; + this.attrib_white = this.attrib_white || []; + this.attrib_clean = this.attrib_clean || []; this.style_white = this.style_white || []; this.style_black = this.style_black || []; @@ -26065,6 +26079,8 @@ Roo.extend(Roo.htmleditor.FilterAttributes, Roo.htmleditor.Filter, attrib_black : false, // array attrib_clean : false, + attrib_white : false, + style_white : false, style_black : false, @@ -26078,6 +26094,12 @@ Roo.extend(Roo.htmleditor.FilterAttributes, Roo.htmleditor.Filter, for (var i = node.attributes.length-1; i > -1 ; i--) { var a = node.attributes[i]; //console.log(a); + if (this.attrib_white.length && this.attrib_white.indexOf(a.name.toLowerCase()) < 0) { + node.removeAttribute(a.name); + continue; + } + + if (a.name.toLowerCase().substr(0,2)=='on') { node.removeAttribute(a.name); @@ -26126,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(/^#/)) { @@ -26199,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); } @@ -26247,13 +26273,30 @@ Roo.extend(Roo.htmleditor.FilterKeepChildren, Roo.htmleditor.FilterBlack, replaceTag : function(node) { // walk children... + //Roo.log(node); var ar = Array.from(node.childNodes); + //remove first.. + for (var i = 0; i < ar.length; i++) { + if (ar[i].nodeType == 1) { + if ( + (typeof(this.tag) == 'object' && this.tag.indexOf(ar[i].tagName) > -1) + || // array and it matches + (typeof(this.tag) == 'string' && this.tag == ar[i].tagName) + ) { + this.replaceTag(ar[i]); // child is blacklisted as well... + continue; + } + } + } + ar = Array.from(node.childNodes); for (var i = 0; i < ar.length; i++) { + node.removeChild(ar[i]); // what if we need to walk these??? node.parentNode.insertBefore(ar[i], node); if (this.tag !== false) { this.walk(ar[i]); + } } node.parentNode.removeChild(node); @@ -26305,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; @@ -26517,6 +26561,185 @@ Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter, } +}); +/** + * @class Roo.htmleditor.FilterStyleToTag + * part of the word stuff... - certain 'styles' should be converted to tags. + * eg. + * font-weight: bold -> bold + * ?? super / subscrit etc.. + * + * @constructor +* Run a new style to tag filter. +* @param {Object} config Configuration options + */ +Roo.htmleditor.FilterStyleToTag = function(cfg) +{ + + this.tags = { + B : [ 'fontWeight' , 'bold'], + I : [ 'fontStyle' , 'italic'], + //pre : [ 'font-style' , 'italic'], + // h1.. h6 ?? font-size? + SUP : [ 'verticalAlign' , 'super' ], + SUB : [ 'verticalAlign' , 'sub' ] + + + }; + + Roo.apply(this, cfg); + + + this.walk(cfg.node); + + + +} + + +Roo.extend(Roo.htmleditor.FilterStyleToTag, Roo.htmleditor.Filter, +{ + tag: true, // all tags + + tags : false, + + + replaceTag : function(node) + { + + + if (node.getAttribute("style") === null) { + return true; + } + var inject = []; + for (var k in this.tags) { + if (node.style[this.tags[k][0]] == this.tags[k][1]) { + inject.push(k); + node.style.removeProperty(this.tags[k][0]); + } + } + if (!inject.length) { + return true; + } + var cn = Array.from(node.childNodes); + var nn = node; + Roo.each(inject, function(t) { + var nc = node.ownerDocument.createElement(t); + nn.appendChild(nc); + nn = nc; + }); + for(var i = 0;i < cn.length;cn++) { + node.removeChild(cn[i]); + nn.appendChild(cn[i]); + } + return true /// iterate thru + } + +})/** + * @class Roo.htmleditor.FilterLongBr + * BR/BR/BR - keep a maximum of 2... + * @constructor + * Run a new Long BR Filter + * @param {Object} config Configuration options + */ + +Roo.htmleditor.FilterLongBr = function(cfg) +{ + // no need to apply config. + this.walk(cfg.node); +} + +Roo.extend(Roo.htmleditor.FilterLongBr, Roo.htmleditor.Filter, +{ + + + tag : 'BR', + + + replaceTag : function(node) + { + + var ps = node.nextSibling; + while (ps && ps.nodeType == 3 && ps.nodeValue.trim().length < 1) { + ps = ps.nextSibling; + } + + if (!ps && [ 'TD', 'TH', 'LI', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6' ].indexOf(node.parentNode.tagName) > -1) { + node.parentNode.removeChild(node); // remove last BR inside one fo these tags + return false; + } + + if (!ps || ps.nodeType != 1) { + return false; + } + + if (!ps || ps.tagName != 'BR') { + + return false; + } + + + + + + if (!node.previousSibling) { + return false; + } + var ps = node.previousSibling; + + while (ps && ps.nodeType == 3 && ps.nodeValue.trim().length < 1) { + ps = ps.previousSibling; + } + if (!ps || ps.nodeType != 1) { + return false; + } + // if header or BR before.. then it's a candidate for removal.. - as we only want '2' of these.. + if (!ps || [ 'BR', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6' ].indexOf(ps.tagName) < 0) { + return false; + } + + node.parentNode.removeChild(node); // remove me... + + return false; // no need to do children + + } + +}); + +/** + * @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
- - usage: - -- add to document.. - new Roo.htmleditor.BlockFigure{ - image_src : 'http://www.google.com', - caption : 'test', - } - -- load document, and search for elements of this... - Roo.DomQuery.select('*[data-block]) - // loop each and call ctor ({node : xxx}) - -- html editor click - ** see if parent has Element.findParent(*[data-block]); - use ?? to + * Update a node with values from this object + * @param {DomElement} node + */ + updateElement : function(node) + { + Roo.DomHelper.update(node === undefined ? this.node : node, this.toObject()); + }, + /** + * convert to plain HTML for calling insertAtCursor.. + */ + toHTML : function() + { + return Roo.DomHelper.markup(this.toObject()); + }, + /** + * used by readEleemnt to extract data from a node + * may need improving as it's pretty basic + + * @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} style the style property - eg. text-align + */ + getVal : function(node, tag, attr, style) + { + var n = node; + if (tag !== true && n.tagName != tag.toUpperCase()) { + // in theory we could do figure[3] << 3rd figure? or some more complex search..? + // but kiss for now. + n = node.getElementsByTagName(tag).item(0); + } + if (!n) { + return ''; + } + if (attr == 'html') { + return n.innerHTML; + } + if (attr == 'style') { + return n.style[style]; + } + + return n.hasAttribute(attr) ? n.getAttribute(attr) : ''; + + }, + /** + * create a DomHelper friendly object - for use with + * Roo.DomHelper.markup / overwrite / etc.. + * (override this) + */ + toObject : function() + { + return {}; + }, + /** + * Read a node that has a 'data-block' property - and extract the values from it. + * @param {DomElement} node - the node + */ + readElement : function(node) + { + + } - */ + +}; + + /** * @class Roo.htmleditor.BlockFigure * Block that has an image and a figcaption * @cfg {String} image_src the url for the image * @cfg {String} align (left|right) alignment for the block default left - * @cfg {String} text_align (left|right) alignment for the text caption default left. * @cfg {String} caption the text to appear below (and in the alt tag) + * @cfg {String} caption_display (block|none) display or not the caption * @cfg {String|number} image_width the width of the image number or %? * @cfg {String|number} image_height the height of the image number or %? * @@ -26629,90 +26998,1600 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, { // setable values. image_src: '', - - align: 'left', + align: 'center', caption : '', - text_align: 'left', + caption_display : 'block', + width : '100%', + cls : '', + href: '', + video_url : '', - image_width : '', - image_height : '', + // margin: '2%', not used + + text_align: 'left', // (left|right) alignment for the text caption default left. - not used at present + // used by context menu friendly_name : 'Image with caption', + deleteTitle : "Delete Image and Caption", - context : { // ?? static really - image_width : { - title: "Width", - width: 40 - }, - image_height: { - title: "Height", - width: 40 - }, - align: { - title: "Align", - opts : [ [""],[ "left"],[ "right"],[ "center"],[ "top"]], - width : 80 - - }, - text_align: { - title: "Caption Align", - opts : [ [""],[ "left"],[ "right"],[ "center"],[ "top"]], - width : 80 - }, - - - image_src : { - title: "Src", - width: 220 - } - }, - /** - * create a DomHelper friendly object - for use with - * Roo.DomHelper.markup / overwrite / etc.. - */ - toObject : function() + contextMenu : function(toolbar) { - var img = { - tag : 'img', - src : this.image_src, - alt : this.caption + var block = function() { + return Roo.htmleditor.Block.factory(toolbar.tb.selectedNode); }; - if ((''+this.image_width).length) { - img.width = this.image_width; - } - if ((''+ this.height).length) { - img.height = this.image_height; - } - return { - tag: 'figure', - 'data-block' : 'Figure', - contenteditable : 'false', - style : 'text-align:' + this.align, - cn : [ - img, - { - tag: 'figcaption', - contenteditable : true, - style : 'text-align:left', - html : this.caption + + + var rooui = typeof(Roo.bootstrap) == 'undefined' ? Roo : Roo.bootstrap; + + var syncValue = toolbar.editorcore.syncValue; + + var fields = {}; + + return [ + { + xtype : 'TextItem', + text : "Source: ", + xns : rooui.Toolbar //Boostrap? + }, + { + xtype : 'Button', + text: 'Change Image URL', + + listeners : { + click: function (btn, state) + { + var b = block(); + + Roo.MessageBox.show({ + title : "Image Source URL", + msg : "Enter the url for the image", + buttons: Roo.MessageBox.OKCANCEL, + fn: function(btn, val){ + if (btn != 'ok') { + return; + } + b.image_src = val; + b.updateElement(); + syncValue(); + toolbar.editorcore.onEditorEvent(); + }, + minWidth:250, + prompt:true, + //multiline: multiline, + modal : true, + value : b.image_src + }); + } + }, + xns : rooui.Toolbar + }, + + { + xtype : 'Button', + text: 'Change Link URL', + + listeners : { + click: function (btn, state) + { + var b = block(); + + Roo.MessageBox.show({ + title : "Link URL", + msg : "Enter the url for the link - leave blank to have no link", + buttons: Roo.MessageBox.OKCANCEL, + fn: function(btn, val){ + if (btn != 'ok') { + return; + } + b.href = val; + b.updateElement(); + syncValue(); + toolbar.editorcore.onEditorEvent(); + }, + minWidth:250, + prompt:true, + //multiline: multiline, + modal : true, + value : b.href + }); + } + }, + xns : rooui.Toolbar + }, + { + xtype : 'Button', + text: 'Show Video URL', + + listeners : { + click: function (btn, state) + { + Roo.MessageBox.alert("Video URL", + block().video_url == '' ? 'This image is not linked ot a video' : + 'The image is linked to: ' + block().video_url + ''); + } + }, + xns : rooui.Toolbar + }, + + + { + xtype : 'TextItem', + text : "Width: ", + xns : rooui.Toolbar //Boostrap? + }, + { + xtype : 'ComboBox', + allowBlank : false, + displayField : 'val', + editable : true, + listWidth : 100, + triggerAction : 'all', + typeAhead : true, + valueField : 'val', + width : 70, + name : 'width', + listeners : { + select : function (combo, r, index) + { + toolbar.editorcore.selectNode(toolbar.tb.selectedNode); + var b = block(); + b.width = r.get('val'); + b.updateElement(); + syncValue(); + toolbar.editorcore.onEditorEvent(); + } + }, + xns : rooui.form, + store : { + xtype : 'SimpleStore', + data : [ + ['auto'], + ['50%'], + ['100%'] + ], + fields : [ 'val'], + xns : Roo.data + } + }, + { + xtype : 'TextItem', + text : "Align: ", + xns : rooui.Toolbar //Boostrap? + }, + { + xtype : 'ComboBox', + allowBlank : false, + displayField : 'val', + editable : true, + listWidth : 100, + triggerAction : 'all', + typeAhead : true, + valueField : 'val', + width : 70, + name : 'align', + listeners : { + select : function (combo, r, index) + { + toolbar.editorcore.selectNode(toolbar.tb.selectedNode); + var b = block(); + b.align = r.get('val'); + b.updateElement(); + syncValue(); + toolbar.editorcore.onEditorEvent(); + } + }, + xns : rooui.form, + store : { + xtype : 'SimpleStore', + data : [ + ['left'], + ['right'], + ['center'] + ], + fields : [ 'val'], + xns : Roo.data + } + }, + + + { + xtype : 'Button', + text: 'Hide Caption', + name : 'caption_display', + pressed : false, + enableToggle : true, + setValue : function(v) { + this.toggle(v == 'block' ? false : true); + }, + listeners : { + toggle: function (btn, state) + { + var b = block(); + b.caption_display = b.caption_display == 'block' ? 'none' : 'block'; + this.setText(b.caption_display == 'block' ? "Hide Caption" : "Show Caption"); + b.updateElement(); + syncValue(); + toolbar.editorcore.selectNode(toolbar.tb.selectedNode); + toolbar.editorcore.onEditorEvent(); + } + }, + xns : rooui.Toolbar + } + ]; + + }, + /** + * create a DomHelper friendly object - for use with + * Roo.DomHelper.markup / overwrite / etc.. + */ + toObject : function() + { + var d = document.createElement('div'); + d.innerHTML = this.caption; + + var m = this.width == '50%' && this.align == 'center' ? '0 auto' : 0; + + 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' + + + } + }; + /* + '
' +
+ '' +
+ '
' +
+ '' +
+ '
',
+ */
+
+ 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: 'block',
+ float : this.align ,
+ 'max-width': this.width,
+ width : 'auto',
+ margin: m,
+ padding: '10px'
+
+ },
+
+
+ align : this.align,
+ cn : [
+ img,
+
+ {
+ tag: 'figcaption',
+
+ style : {
+ 'text-align': 'left',
+ 'margin-top' : '16px',
+ 'font-size' : '16px',
+ 'line-height' : '24px',
+ display : this.caption_display
+ },
+ 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 : 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', 'align');
+ this.caption = this.getVal(node, 'figcaption', 'html');
+ // remove '
+ if (this.caption.trim().match(/^' +
+ '' +
+ '- then dont do anything. + + var ns = this.doc.createElement('br'); + this.doc.body.appendChild(ns); + range = this.doc.createRange(); + range.setStartAfter(ns); + range.collapse(true); + var sel = this.win.getSelection(); + sel.removeAllRanges(); + sel.addRange(range); + } + } + + + + this.fireEditorEvent(e); // this.updateToolbar(); this.syncValue(); //we can not sync so often.. sync cleans, so this breaks stuff }, + + fireEditorEvent: function(e) + { + this.owner.fireEvent('editorevent', this, e); + }, insertTag : function(tg) { @@ -27343,7 +29378,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { } this.execCmd("formatblock", tg); - + this.undoManager.addEvent(); }, insertText : function(txt) @@ -27355,6 +29390,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { //alert(Sender.getAttribute('label')); range.insertNode(this.doc.createTextNode(txt)); + this.undoManager.addEvent(); } , @@ -27365,7 +29401,37 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { * @param {String} cmd The Midas command * @param {String/Boolean} value (optional) The value to pass to the command (defaults to null) */ - relayCmd : function(cmd, value){ + relayCmd : function(cmd, value) + { + + switch (cmd) { + case 'justifyleft': + case 'justifyright': + case 'justifycenter': + // if we are in a cell, then we will adjust the + var n = this.getParentElement(); + var td = n.closest('td'); + if (td) { + var bl = Roo.htmleditor.Block.factory(td); + bl.textAlign = cmd.replace('justify',''); + bl.updateElement(); + this.owner.fireEvent('editorevent', this); + return; + } + this.execCmd('styleWithCSS', true); // + break; + case 'bold': + case 'italic': + // if there is no selection, then we insert, and set the curson inside it.. + this.execCmd('styleWithCSS', false); + break; + + + default: + break; + } + + this.win.focus(); this.execCmd(cmd, value); this.owner.fireEvent('editorevent', this); @@ -27398,20 +29464,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { if(!this.activated){ return; } - /* - if(Roo.isIE){ - this.win.focus(); - var r = this.doc.selection.createRange(); - if(r){ - r.collapse(true); - r.pasteHTML(text); - this.syncValue(); - this.deferFocus(); - - } - return; - } - */ + if(Roo.isGecko || Roo.isOpera || Roo.isSafari){ this.win.focus(); @@ -27421,19 +29474,31 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { var win = this.win; if (win.getSelection && win.getSelection().getRangeAt) { + + // delete the existing? + + this.createRange(this.getSelection()).deleteContents(); range = win.getSelection().getRangeAt(0); node = typeof(text) == 'string' ? range.createContextualFragment(text) : text; range.insertNode(node); + range = range.cloneRange(); + range.collapse(false); + + win.getSelection().removeAllRanges(); + win.getSelection().addRange(range); + + + } else if (win.document.selection && win.document.selection.createRange) { // no firefox support var txt = typeof(text) == 'string' ? text : text.outerHTML; win.document.selection.createRange().pasteHTML(txt); + } else { // no firefox support var txt = typeof(text) == 'string' ? text : text.outerHTML; this.execCmd('InsertHTML', txt); } - this.syncValue(); this.deferFocus(); @@ -27464,9 +29529,11 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { } if(cmd){ - this.win.focus(); - this.execCmd(cmd); - this.deferFocus(); + + this.relayCmd(cmd); + //this.win.focus(); + //this.execCmd(cmd); + //this.deferFocus(); e.preventDefault(); } @@ -27476,6 +29543,8 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { // private fixKeys : function(){ // load time branching for fastest keydown performance + + if(Roo.isIE){ return function(e){ var k = e.getKey(), r; @@ -27489,7 +29558,8 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { } return; } - + /// this is handled by Roo.htmleditor.KeyEnter + /* if(k == e.ENTER){ r = this.doc.selection.createRange(); if(r){ @@ -27502,6 +29572,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { } } } + */ //if (String.fromCharCode(k).toLowerCase() == 'v') { // paste // this.cleanUpPaste.defer(100, this); // return; @@ -27518,6 +29589,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { this.execCmd('InsertHTML',' '); this.deferFocus(); } + //if (String.fromCharCode(k).toLowerCase() == 'v') { // paste // this.cleanUpPaste.defer(100, this); // return; @@ -27534,6 +29606,8 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { this.deferFocus(); return; } + this.mozKeyPress(e); + //if (String.fromCharCode(k).toLowerCase() == 'v') { // paste // this.cleanUpPaste.defer(100, this); // return; @@ -27567,7 +29641,27 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { getSelection : function() { this.assignDocWin(); - return Roo.isIE ? this.doc.selection : this.win.getSelection(); + return Roo.lib.Selection.wrap(Roo.isIE ? this.doc.selection : this.win.getSelection(), this.doc); + }, + /** + * Select a dom node + * @param {DomElement} node the node to select + */ + selectNode : function(node, collapse) + { + var nodeRange = node.ownerDocument.createRange(); + try { + nodeRange.selectNode(node); + } catch (e) { + nodeRange.selectNodeContents(node); + } + if (collapse === true) { + nodeRange.collapse(true); + } + // + var s = this.win.getSelection(); + s.removeAllRanges(); + s.addRange(nodeRange); }, getSelectedNode: function() @@ -27576,8 +29670,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { // should we cache this!!!! - - + var range = this.createRange(this.getSelection()).cloneRange(); @@ -27641,6 +29734,8 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { return nodes[0]; }, + + createRange: function(sel) { // this has strange effects when using with @@ -27758,26 +29853,21 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { // fully contined. return 3; }, -/* - // private? - in a new class? - cleanUpPaste : function() - { - // cleans up the whole document.. - Roo.log('cleanuppaste'); - - this.cleanUpChild(this.doc.body); - var clean = this.cleanWordChars(this.doc.body.innerHTML); - if (clean != this.doc.body.innerHTML) { - this.doc.body.innerHTML = clean; - } - - }, - */ + cleanWordChars : function(input) {// change the chars to hex code - var he = Roo.HtmlEditorCore; + var swapCodes = [ + [ 8211, "–" ], + [ 8212, "—" ], + [ 8216, "'" ], + [ 8217, "'" ], + [ 8220, '"' ], + [ 8221, '"' ], + [ 8226, "*" ], + [ 8230, "..." ] + ]; var output = input; - Roo.each(he.swapCodes, function(sw) { + Roo.each(swapCodes, function(sw) { var swapper = new RegExp("\\u" + sw[0].toString(16), "g"); // hex codes output = output.replace(swapper, sw[1]); @@ -27957,6 +30047,16 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { }, + + updateLanguage : function() + { + if (!this.iframe || !this.iframe.contentDocument) { + return; + } + Roo.get(this.iframe.contentDocument.body).attr("lang", this.language); + }, + + removeStylesheets : function() { var _this = this; @@ -28021,36 +30121,40 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { }); Roo.HtmlEditorCore.white = [ - 'area', 'br', 'img', 'input', 'hr', 'wbr', + 'AREA', 'BR', 'IMG', 'INPUT', 'HR', 'WBR', - 'address', 'blockquote', 'center', 'dd', 'dir', 'div', - 'dl', 'dt', 'h1', 'h2', 'h3', 'h4', - 'h5', 'h6', 'hr', 'isindex', 'listing', 'marquee', - 'menu', 'multicol', 'ol', 'p', 'plaintext', 'pre', - 'table', 'ul', 'xmp', + 'ADDRESS', 'BLOCKQUOTE', 'CENTER', 'DD', 'DIR', 'DIV', + 'DL', 'DT', 'H1', 'H2', 'H3', 'H4', + 'H5', 'H6', 'HR', 'ISINDEX', 'LISTING', 'MARQUEE', + 'MENU', 'MULTICOL', 'OL', 'P', 'PLAINTEXT', 'PRE', + 'TABLE', 'UL', 'XMP', - 'caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th', - 'thead', 'tr', + 'CAPTION', 'COL', 'COLGROUP', 'TBODY', 'TD', 'TFOOT', 'TH', + 'THEAD', 'TR', - 'dir', 'menu', 'ol', 'ul', 'dl', + 'DIR', 'MENU', 'OL', 'UL', 'DL', - 'embed', 'object' + 'EMBED', 'OBJECT' ]; Roo.HtmlEditorCore.black = [ // 'embed', 'object', // enable - backend responsiblity to clean thiese - 'applet', // - 'base', 'basefont', 'bgsound', 'blink', 'body', - 'frame', 'frameset', 'head', 'html', 'ilayer', - 'iframe', 'layer', 'link', 'meta', 'object', - 'script', 'style' ,'title', 'xml' // clean later.. + 'APPLET', // + 'BASE', 'BASEFONT', 'BGSOUND', 'BLINK', 'BODY', + 'FRAME', 'FRAMESET', 'HEAD', 'HTML', 'ILAYER', + 'IFRAME', 'LAYER', 'LINK', 'META', 'OBJECT', + 'SCRIPT', 'STYLE' ,'TITLE', 'XML', + //'FONT' // CLEAN LATER.. + 'COLGROUP', 'COL' // messy tables. + + ]; -Roo.HtmlEditorCore.clean = [ - 'script', 'style', 'title', 'xml' +Roo.HtmlEditorCore.clean = [ // ?? needed??? + 'SCRIPT', 'STYLE', 'TITLE', 'XML' ]; Roo.HtmlEditorCore.tag_remove = [ - 'font' + 'FONT', 'TBODY' ]; // attributes.. @@ -28081,16 +30185,7 @@ Roo.HtmlEditorCore.cblack= [ ]; -Roo.HtmlEditorCore.swapCodes =[ - [ 8211, "–" ], - [ 8212, "—" ], - [ 8216, "'" ], - [ 8217, "'" ], - [ 8220, '"' ], - [ 8221, '"' ], - [ 8226, "*" ], - [ 8230, "..." ] -]; + /* * - LGPL @@ -29622,7 +31717,7 @@ Roo.extend(Roo.bootstrap.Graph, Roo.bootstrap.Component, { }); -/* +Roo.bootstrap.dash = {};/* * - LGPL * * numberBox