Tiny MCE--> Relative Absolute URL for Images IE and Firefox different

This commit is contained in:
JT Smith 2007-02-27 18:41:01 +00:00
parent 1b1804fc16
commit ff03aebfd3
4 changed files with 5 additions and 35 deletions

View file

@ -1,5 +1,6 @@
7.3.11
- Added an option for enabling coverage tests to testCodebase.pl.
- fix: Tiny MCE--> Relative Absolute URL for Images IE and Firefox different
- fix: WeatherData asset not displaying properly
- rfe: Weather-Data not only for US-Cities
- rfe: WeatherData Asset - Convert to International format

View file

@ -45,32 +45,6 @@ These methods are available from this class:
#-------------------------------------------------------------------
=head2 _fetch_button_rows ( @toolbarRows )
Return the definitions for toolbar rows.
=head3 definition
A hash reference passed in from a subclass definition.
=cut
sub _fetch_button_rows {
my $self = shift;
my @toolbarRows = @_;
my %toolbarRow = ();
foreach my $rowIndex (0..$#toolbarRows) {
$toolbarRow{'theme_advanced_buttons'.$rowIndex} =
join(',', @{$toolbarRows[$_]});
}
#(map { "theme_advanced_buttons".($_+1) => }
#(0..$#toolbarRows)),
}
#-------------------------------------------------------------------
=head2 definition ( definition )
@ -471,13 +445,11 @@ sub getRichEditor {
elements => $nameId,
theme => "advanced",
relative_urls => "false",
# remove_script_host => "false",
# document_base_url => "/",
remove_script_host => "true",
auto_reset_designmode => "true",
cleanup_callback => "tinyMCE_WebGUI_Cleanup",
urlconvertor_callback => "tinyMCE_WebGUI_URLConvertor",
theme_advanced_resizing => "true",
#$self->_fetch_button_rows(@toolbarRows),
(map { "theme_advanced_buttons".($_+1) => (join ',', @{$toolbarRows[$_]}) }
(0..$#toolbarRows)),
ask => $self->getValue("askAboutRichEdit") ? "true" : "false",

View file

@ -176,7 +176,7 @@ function createLink() {
alert("@{[$i18n->get("link enter alert")]}");
document.getElementById("url_formId").focus();
}
var link = '<a href="'+"^" + "/" + ";" + document.getElementById("url_formId").value+'"';
var link = '<a href="'+"^" + "/(" + document.getElementById("url_formId").value+');"';
var target = document.getElementById('target_formId').value;
if (target != '_self') link += ' target="' + target + '"';
link += '>' + window.opener.tinyMCE.selectedInstance.selection.getSelectedHTML() + '</a>';

View file

@ -1,9 +1,8 @@
// WebGUI Specific javascript functions for TinyMCE
function tinyMCE_WebGUI_URLConvertor(url, node, on_save) {
// The next line would have tried formatting the URL, but we don't want it to
//url = tinyMCE.convertURL(url, node, on_save);
// Do custom WebUI convertion, replace back ^();
url = tinyMCE.convertURL(url, node, on_save);
// Do custom WebGUI convertion, replace back ^();
url = url.replace(new RegExp("%5E", "g"), "^");
url = url.replace(new RegExp("%3B", "g"), ";");
url = url.replace(new RegExp("%28", "g"), "(");
@ -16,8 +15,6 @@ function tinyMCE_WebGUI_URLConvertor(url, node, on_save) {
}
function tinyMCE_WebGUI_Cleanup(type,value) {
// alert(value);
// return value;
if (value != "[object HTMLBodyElement]" && value != "[object]") {
value = value.replace(new RegExp("&quot;", "g"),"\"");
}