X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-ui-debug.js;h=67936282b1662c248c1add1d02515cbe6268593c;hb=51a4628361ca177ca768f406b4d2a1eda3a7cf8b;hp=377a5a6c1bc3b09253251a6058ca90f5cfcff7c0;hpb=b88377f1b1e5f27c74d029b648f8127b3d0e74d4;p=roojs1 diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index 377a5a6c1b..67936282b1 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -22413,6 +22413,7 @@ 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.. style: { @@ -22435,6 +22436,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, { img = { tag : 'a', href: this.href, + contenteditable : 'true', cn : [ img ] @@ -22499,7 +22501,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'); @@ -24276,7 +24278,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { dbody.bgProperties = 'fixed'; // ie //Roo.DomHelper.applyStyles(dbody, ss); Roo.EventManager.on(this.doc, { - //'mousedown': this.onEditorEvent, + 'mouseup': this.onEditorEvent, 'dblclick': this.onEditorEvent, 'click': this.onEditorEvent, @@ -24307,7 +24309,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.. @@ -24466,6 +24469,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..)