X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2FHtmlEditorCore.js;h=b997fb1b5fb5c3a72718dce48bb0f493320fe92a;hb=f88cf3bdd5f9e788a2c376c5102a2cae13683b12;hp=91b69ed5af372f960461c34c3c41f70cc1a2222d;hpb=4e6fc26f062b38496e5cdf3b6b270b0191647cf4;p=roojs1
diff --git a/Roo/HtmlEditorCore.js b/Roo/HtmlEditorCore.js
index 91b69ed5af..b997fb1b5f 100644
--- a/Roo/HtmlEditorCore.js
+++ b/Roo/HtmlEditorCore.js
@@ -71,7 +71,8 @@ Roo.HtmlEditorCore = function(config){
* Fires when on any editor (mouse up/down cursor movement etc.) - used for toolbar hooks.
* @param {Roo.HtmlEditorCore} this
*/
- editorevent: true
+ editorevent: true
+
});
@@ -122,6 +123,11 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
*
*/
stylesheets: false,
+ /**
+ * @cfg {String} language default en - language of text (usefull for rtl languages)
+ *
+ */
+ language: 'en',
/**
* @cfg {boolean} allowComments - default false - allow comments in HTML source
@@ -189,14 +195,16 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
st += '';
-
- var cls = 'roo-htmleditor-body';
+
+ st += '';
+
+ var cls = 'notranslate roo-htmleditor-body';
if(this.bodyCls.length){
cls += ' ' + this.bodyCls;
}
- return '' + st +
+ return '' + st +
//' +
@@ -323,7 +331,8 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
* @param {String} html The HTML to be cleaned
* return {String} The cleaned HTML
*/
- cleanHtml : function(html){
+ cleanHtml : function(html)
+ {
html = String(html);
if(html.length > 5){
if(Roo.isSafari){ // strip safari nonsense
@@ -352,18 +361,27 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
var bd = (this.doc.body || this.doc.documentElement);
+ var sel = this.win.getSelection();
var div = document.createElement('div');
div.innerHTML = bd.innerHTML;
-
+ var gtx = div.getElementsByClassName('gtx-trans-icon'); // google translate - really annoying and difficult to get rid of.
+ if (gtx.length > 0) {
+ var rm = gtx.item(0).parentNode;
+ rm.parentNode.removeChild(rm);
+ }
+
if (this.enableBlocks) {
new Roo.htmleditor.FilterBlock({ node : div });
}
//?? tidy?
+ var tidy = new Roo.htmleditor.TidySerializer({
+ inner: true
+ });
+ var html = tidy.serialize(div);
- var html = div.innerHTML;
if(Roo.isSafari){
var bs = bd.getAttribute('style'); // Safari puts text-align styles on the body element!
var m = bs ? bs.match(/text-align:(.*?);/i) : false;
@@ -432,6 +450,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
}
Roo.htmleditor.Block.initAll(this.doc.body);
+ this.updateLanguage();
var lc = this.doc.body.lastChild;
if (lc && lc.nodeType == 1 && lc.getAttribute("contenteditable") == "false") {
@@ -501,9 +520,11 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
//var ss = this.el.getStyles( 'background-image', 'background-repeat');
//ss['background-attachment'] = 'fixed'; // w3c
dbody.bgProperties = 'fixed'; // ie
+ dbody.setAttribute("translate", "no");
+
//Roo.DomHelper.applyStyles(dbody, ss);
Roo.EventManager.on(this.doc, {
- //'mousedown': this.onEditorEvent,
+
'mouseup': this.onEditorEvent,
'dblclick': this.onEditorEvent,
'click': this.onEditorEvent,
@@ -534,7 +555,8 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
this.owner.fireEvent('initialize', this);
this.pushValue();
},
-
+ // this is to prevent a href clicks resulting in a redirect?
+
onPasteEvent : function(e,v)
{
// I think we better assume paste is going to be a dirty load of rubish from word..
@@ -602,11 +624,11 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
}
if (this.enableBlocks) {
- Array.from(d.getElementByTagType('img')).forEach(function(img) {
+ Array.from(d.getElementsByTagName('img')).forEach(function(img) {
if (img.closest('figure')) { // assume!! that it's aready
return;
}
- var fig = Roo.htmleditor.BlockFigure({
+ var fig = new Roo.htmleditor.BlockFigure({
image_src : img.src
});
fig.updateElement(img); // replace it..
@@ -615,7 +637,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
}
- this.insertAtCursor(d.innerHTML);
+ this.insertAtCursor(d.innerHTML.replace(/ /g,' '));
if (this.enableBlocks) {
Roo.htmleditor.Block.initAll(this.doc.body);
}
@@ -693,6 +715,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
onEditorEvent : function(e)
{
+
if (e && (e.ctrlKey || e.metaKey) && e.keyCode === 90) {
return; // we do not handle this.. (undo manager does..)
@@ -1047,8 +1070,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
// should we cache this!!!!
-
-
+
var range = this.createRange(this.getSelection()).cloneRange();
@@ -1112,6 +1134,8 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
return nodes[0];
},
+
+
createRange: function(sel)
{
// this has strange effects when using with
@@ -1423,6 +1447,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;