tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX #4471: Fixed link insertion in Safari. (from r97581)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102507 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-04-12 21:57:57 +00:00
parent a97c252b0d
commit 37cbb9a92a
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
javascript/tiny_mce_improvements.js vendored
View File

@ -187,22 +187,10 @@ LinkForm.prototype = {
}
break;
}
if(this.originalSelection) {
tinyMCE.activeEditor.selection.setRng(this.originalSelection);
}
/*
else {
var mceInst = tinyMCE.activeEditor;
var sel = mceInst.getSel();
if(sel.addRange && sel.removeAllRanges) {
sel.removeAllRanges();
sel.addRange(this.originalSelection);
}
mceInst.selectedElement = mceInst.getFocusElement();
}
}
*/
var attributes = {
href : href,
@ -211,23 +199,15 @@ LinkForm.prototype = {
innerHTML : this.elements.LinkText.value ? this.elements.LinkText.value : "Your Link"
};
// Remove the old link while preserving the selection
if(tinyMCE.activeEditor.selection.getContent() != "") {
var rng = tinyMCE.activeEditor.selection.getRng();
tinyMCE.activeEditor.selection.setRng(rng);
tinyMCE.activeEditor.execCommand('unlink');
tinyMCE.activeEditor.selection.setRng(rng);
}
// Add the new link
this.ssInsertLink(tinyMCE.activeEditor, attributes);
this.ssInsertLink(tinyMCE.activeEditor, attributes, this);
},
/**
* Insert a link into the given editor.
* Replaces mceInsertLink in that innerHTML can also be set
*/
ssInsertLink: function(ed, attributes) {
ssInsertLink: function(ed, attributes, linkFormObj) {
var v = attributes;
var s = ed.selection, e = ed.dom.getParent(s.getNode(), 'A');
@ -239,12 +219,16 @@ LinkForm.prototype = {
if(k == 'innerHTML') e.innerHTML = v;
else ed.dom.setAttrib(e, k, v);
});
try {
s.select(e);
if(linkFormObj) linkFormObj.updateSelection(ed);
} catch(er) {}
};
function replace() {
tinymce.each(ed.dom.select('a'), function(e) {
if (e.href == 'javascript:mctmp(0);') set(e);
});
});
}
if(attributes.innerHTML && !ed.selection.getContent()) {