Update of
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/popups
In directory
james.mmbase.org:/tmp/cvs-serv24458/richtext/src/webapp/mmbase/edit/wizard/xinha/popups
Modified Files:
insertinline_link.html
Log Message:
CMSC-681 Asset Maintenance New dialog (Adding images): uploading .zip files
refuses clicking image directly closes pop-up
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/popups
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: insertinline_link.html
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/popups/insertinline_link.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- insertinline_link.html 9 Jan 2009 10:28:09 -0000 1.7
+++ insertinline_link.html 12 Jan 2009 10:46:06 -0000 1.8
@@ -33,13 +33,13 @@
document.getElementById("f_target").selectedIndex = 0;
var param = window.dialogArguments;
-
var target_select = document.getElementById("f_target");
var use_target = true;
if (param) {
if ( typeof param["f_usetarget"] != "undefined" ) {
use_target = param["f_usetarget"];
}
+ if ( typeof param["f_href"] != "undefined" ) {
document.getElementById("f_href").value = param["f_href"];
document.getElementById("f_linkName").value = param["f_linkName"];
document.getElementById("f_title").value = param["f_title"];
@@ -53,6 +53,7 @@
opt.selected = true;
}
}
+ }
if (! use_target) {
document.getElementById("f_target_label").style.visibility = "hidden";
document.getElementById("f_target").style.visibility = "hidden";
@@ -63,50 +64,40 @@
opt.innerHTML = i18n("Other");
target_select.appendChild(opt);
target_select.onchange = onTargetChanged;
- document.getElementById("f_linkName").value = param["f_linkName"];
document.getElementById("f_href").focus();
document.getElementById("f_href").select();
}
function onOK() {
var elhref = document.getElementById("f_href");
- if (HTMLArea.is_ie ? elhref.readOnly : elhref.hasAttribute("readonly"))
{
- var el = document.getElementById("f_destination");
- if(!el.value) {
- var message = i18n("You must select an item");
- return false;
- }
- else {
- var el = document.getElementById("f_linkName");
- if(!el.value){
- var message = i18n("You must enter the name of
the link");
- el.focus();
- return false;
- }
- else{
+ var re = new RegExp("\://|javascript\:|mailto\:");
+ var destination = document.getElementById("f_destination");
+ if(elhref.value.match(re)||destination.value){
var el = document.getElementById("f_title");
- if (!el.value) {
+ if (el.value == "") {
var message = i18n("You must enter a
title");
+ alert(message);
el.focus();
return false;
}
}
- }
- }
- else {
- if (!elhref.value) {
- var message = i18n("You must enter the URL where this
link points to");
- elhref.focus();
- return false;
- }
- else {
- var re = new RegExp("\://|javascript\:|mailto\:");
+ else{
if (!elhref.value.match(re)) {
var message = i18n("Url is missing protocol (eg
http://)");
+ alert(message);
elhref.focus();
return false;
}
+ if(!destination.value) {
+ var message = i18n("You must select an item");
+ alert(message);
+ return false;
+ }
}
+ var tmpLinkName = document.getElementById("f_linkName");
+ if(!tmpLinkName.value){
+ // set the defult linkname the same as href's value
+ tmpLinkName.value = elhref.value;
}
// pass data back to the calling window
var fields = ["f_href", "f_linkName","f_title", "f_target",
"f_destination" ];//f_linkName is added by Rain.Tang
@@ -116,8 +107,9 @@
var el = document.getElementById(id);
param[id] = el.value;
}
- if (param.f_target == "_other")
+ if (param.f_target == "_other"){
param.f_target = document.getElementById("f_other_target").value;
+ }
__dlg_close(param);
return false;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
