X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-debug.js;h=27f607683cfc9137cb51c7d1ab1977af84eeedc3;hb=b999dac6d220ed742af894af4750d19d0e6dc586;hp=a0bb05ee810ee7cf740f78581295802f333c54ef;hpb=379a6b501c18d6c1657516ff1da835d18cc474e2;p=roojs1 diff --git a/roojs-debug.js b/roojs-debug.js index a0bb05ee81..27f607683c 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -46882,6 +46882,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: { @@ -46904,6 +46905,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, { img = { tag : 'a', href: this.href, + contenteditable : 'true', cn : [ img ] @@ -46919,7 +46921,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, { allowfullscreen : true, width : 420, // these are for video tricks - that we replace the outer height : 315, - src : this.video_src, + src : this.video_url, cn : [ img ] @@ -46968,7 +46970,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'); @@ -48745,7 +48747,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, @@ -48776,7 +48778,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.. @@ -48935,6 +48938,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..)