Author: billyxie
Date: 2009-09-29 08:29:08 +0200 (Tue, 29 Sep 2009)
New Revision: 38904
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/CreateLink/insertinline_link.html
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
Log:
CMSC-892 - Rich-text editor: add button and functionality for Anchor links
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
2009-09-28 21:16:51 UTC (rev 38903)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
2009-09-29 06:29:08 UTC (rev 38904)
@@ -392,7 +392,7 @@
idsList.add(id);
}
else {
- if (link.hasAttribute(RichText.HREF_ATTR)) {
+ if (link.hasAttribute(RichText.HREF_ATTR) &&
!(link.getAttribute(RichText.HREF_ATTR).startsWith("#")) ) {
String href = link.getAttribute(RichText.HREF_ATTR);
String name = link.getAttribute("name");
String owner = mmObj.getStringValue("owner");
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/CreateLink/insertinline_link.html
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/CreateLink/insertinline_link.html
2009-09-28 21:16:51 UTC (rev 38903)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/CreateLink/insertinline_link.html
2009-09-29 06:29:08 UTC (rev 38904)
@@ -70,7 +70,7 @@
function onOK() {
var elhref = document.getElementById("f_href");
- var re = new RegExp("\://|javascript\:|mailto\:");
+ var re = new RegExp("\://|javascript\:|mailto\:|#");
var destination = document.getElementById("f_destination");
if(!elhref.value.match(re) && !destination.value ){
if (!elhref.value.match(re)) {
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
2009-09-28 21:16:51 UTC (rev 38903)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
2009-09-29 06:29:08 UTC (rev 38904)
@@ -6,6 +6,7 @@
var xinha_plugins = [
'CharacterMap',
'ContextMenu',
+ 'InsertAnchor',
// 'ListType',
// 'FullScreen',
// 'SpellChecker',
@@ -333,7 +334,7 @@
}
}
} catch(ex) {}
-x }
+ }
else
{
var href = param.f_href.trim();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
