projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Roo/htmleditor/TidySerializer.js
[roojs1]
/
roojs-debug.js
diff --git
a/roojs-debug.js
b/roojs-debug.js
index
ba017f1
..
27f6076
100644
(file)
--- a/
roojs-debug.js
+++ b/
roojs-debug.js
@@
-46711,6
+46711,9
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
caption : '',
caption_display : 'block',
width : '100%',
caption : '',
caption_display : 'block',
width : '100%',
+ cls : '',
+ href: '',
+ video_url : '',
// margin: '2%', not used
// margin: '2%', not used
@@
-46879,6
+46882,7
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
var img = {
tag : 'img',
var img = {
tag : 'img',
+ contenteditable : 'false',
src : this.image_src,
alt : d.innerText.replace(/\n/g, " "), // removeHTML..
style: {
src : this.image_src,
alt : d.innerText.replace(/\n/g, " "), // removeHTML..
style: {
@@
-46897,10
+46901,11
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
'</div>',
*/
'</div>',
*/
- if (this.href) {
+ if (this.href
.length > 0
) {
img = {
tag : 'a',
href: this.href,
img = {
tag : 'a',
href: this.href,
+ contenteditable : 'true',
cn : [
img
]
cn : [
img
]
@@
-46908,7
+46913,7
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
}
}
- if (this.video_url) {
+ if (this.video_url
.length > 0
) {
img = {
tag : 'div',
cls : this.cls,
img = {
tag : 'div',
cls : this.cls,
@@
-46916,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,
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
]
cn : [
img
]
@@
-46953,7
+46958,7
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
'font-style': 'italic',
display : this.caption_display
},
'font-style': 'italic',
display : this.caption_display
},
- cls : this.cls
+ '-thumbnail
',
+ cls : this.cls
.length > 0 ? (this.cls + '-thumbnail' ) : '
',
html : this.caption
}
html : this.caption
}
@@
-46965,7
+46970,7
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
readElement : function(node)
{
// this should not really come from the link...
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');
this.cls = this.getVal(node, 'div', 'class');
this.href = this.getVal(node, 'a', 'href');
@@
-48742,7
+48747,7
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
dbody.bgProperties = 'fixed'; // ie
//Roo.DomHelper.applyStyles(dbody, ss);
Roo.EventManager.on(this.doc, {
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,
'mouseup': this.onEditorEvent,
'dblclick': this.onEditorEvent,
'click': this.onEditorEvent,
@@
-48773,7
+48778,8
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
this.owner.fireEvent('initialize', this);
this.pushValue();
},
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..
onPasteEvent : function(e,v)
{
// I think we better assume paste is going to be a dirty load of rubish from word..
@@
-48932,6
+48938,7
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
onEditorEvent : function(e)
{
onEditorEvent : function(e)
{
+
if (e && (e.ctrlKey || e.metaKey) && e.keyCode === 90) {
return; // we do not handle this.. (undo manager does..)
if (e && (e.ctrlKey || e.metaKey) && e.keyCode === 90) {
return; // we do not handle this.. (undo manager does..)