X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=roojs-bootstrap-debug.js;h=e66fdc2593e3c19aa8535beeb601d8b90a61236b;hp=dfc980e8bee0bebb4e3f7e2446236d0b8c7fec88;hb=2dd06c4c3e0f351d16332bd7a5fba608af1219ca;hpb=2bafb06934870804a034f101e1e4623d8c8a6792
diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index dfc980e8be..e66fdc2593 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -27173,8 +27173,9 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
var img = {
tag : 'img',
+ contenteditable : 'false',
src : this.image_src,
- alt : d.innerText.replace(/\n/g, " "), // removeHTML..
+ alt : d.innerText.replace(/\n/g, " ").replace(/\s+/g, ' ').trim(), // removeHTML and reduce spaces..
style: {
width : 'auto',
'max-width': '100%',
@@ -27195,6 +27196,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
img = {
tag : 'a',
href: this.href,
+ contenteditable : 'true',
cn : [
img
]
@@ -27259,7 +27261,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
readElement : function(node)
{
// this should not really come from the link...
- this.video_src = this.getVal(node, 'div', 'src');
+ this.video_url = this.getVal(node, 'div', 'src');
this.cls = this.getVal(node, 'div', 'class');
this.href = this.getVal(node, 'a', 'href');
@@ -28721,14 +28723,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 +
//' +
@@ -28855,7 +28859,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
@@ -28884,18 +28889,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;
@@ -29034,9 +29048,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.onMouseDown,
+
'mouseup': this.onEditorEvent,
'dblclick': this.onEditorEvent,
'click': this.onEditorEvent,
@@ -29068,12 +29084,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
this.pushValue();
},
// this is to prevent a href clicks resulting in a redirect?
- onMouseDown : function(e)
- {
-
-
-
- }
+
onPasteEvent : function(e,v)
{
// I think we better assume paste is going to be a dirty load of rubish from word..
@@ -29232,6 +29243,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..)