You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/05/05 18:50:55 UTC
svn commit: r771919 - in /labs/magma/trunk:
beans-richtext/src/main/java/org/apache/magma/beans/richtext/
beans-richtext/src/main/java/org/apache/magma/validation/validators/
website-dojo-textareas-youtubevideo/src/main/java/org/apache/magma/dojo/
webs...
Author: simoneg
Date: Tue May 5 16:50:50 2009
New Revision: 771919
URL: http://svn.apache.org/viewvc?rev=771919&view=rev
Log:
Rich text objects as separate parameter
Modified:
labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/beans/richtext/RichTextVisitor.java
labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/validation/validators/RichText.java
labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/validation/validators/RichTextValidator.java
labs/magma/trunk/website-dojo-textareas-youtubevideo/src/main/java/org/apache/magma/dojo/AddYoutubeVideoToPlugins.aj
labs/magma/trunk/website-dojo-textareas/src/main/java/org/apache/magma/dojo/RichEditorPlugins.java
Modified: labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/beans/richtext/RichTextVisitor.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/beans/richtext/RichTextVisitor.java?rev=771919&r1=771918&r2=771919&view=diff
==============================================================================
--- labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/beans/richtext/RichTextVisitor.java (original)
+++ labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/beans/richtext/RichTextVisitor.java Tue May 5 16:50:50 2009
@@ -270,6 +270,9 @@
if (!skiptag && !validator.isPermitTables()) {
skiptag = tagname.equals("TABLE") || tagname.equals("TH") || tagname.equals("TD") || tagname.equals("TR") || tagname.equals("TBODY") || tagname.equals("THEAD") || tagname.equals("TFOOT");
}
+ if (!skiptag && !validator.isPermitObjects()) {
+ skiptag = tagname.equals("OBJECT") || tagname.equals("EMBED");
+ }
String style = tag.getAttribute("style");
if (style != null && style.length() > 0) {
Modified: labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/validation/validators/RichText.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/validation/validators/RichText.java?rev=771919&r1=771918&r2=771919&view=diff
==============================================================================
--- labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/validation/validators/RichText.java (original)
+++ labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/validation/validators/RichText.java Tue May 5 16:50:50 2009
@@ -27,6 +27,7 @@
public boolean permitTables() default true;
public boolean permitIndents() default true;
public boolean permitJustify() default true;
+ public boolean permitObjects() default true;
public boolean purgeWordHtml() default true;
}
Modified: labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/validation/validators/RichTextValidator.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/validation/validators/RichTextValidator.java?rev=771919&r1=771918&r2=771919&view=diff
==============================================================================
--- labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/validation/validators/RichTextValidator.java (original)
+++ labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/validation/validators/RichTextValidator.java Tue May 5 16:50:50 2009
@@ -27,6 +27,7 @@
private boolean permitTables;
private boolean permitIndents;
private boolean permitJustify;
+ private boolean permitObjects;
private boolean purgeWord = true;
@@ -192,4 +193,14 @@
this.purgeWord = purgeWord;
}
+
+ public boolean isPermitObjects() {
+ return permitObjects;
+ }
+
+
+ public void setPermitObjects(boolean permitObjects) {
+ this.permitObjects = permitObjects;
+ }
+
}
Modified: labs/magma/trunk/website-dojo-textareas-youtubevideo/src/main/java/org/apache/magma/dojo/AddYoutubeVideoToPlugins.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-dojo-textareas-youtubevideo/src/main/java/org/apache/magma/dojo/AddYoutubeVideoToPlugins.aj?rev=771919&r1=771918&r2=771919&view=diff
==============================================================================
--- labs/magma/trunk/website-dojo-textareas-youtubevideo/src/main/java/org/apache/magma/dojo/AddYoutubeVideoToPlugins.aj (original)
+++ labs/magma/trunk/website-dojo-textareas-youtubevideo/src/main/java/org/apache/magma/dojo/AddYoutubeVideoToPlugins.aj Tue May 5 16:50:50 2009
@@ -9,7 +9,7 @@
public aspect AddYoutubeVideoToPlugins {
after(List<String> plugins) :
- execution(public static void RichEditorPlugins.addImagePlugins(List<String>)) &&
+ execution(public static void RichEditorPlugins.addObjectPlugins(List<String>)) &&
args(plugins) {
plugins.add("{name: 'dijit._editor.plugins.YoutubeVideoDialog', command: 'youtube'}");
@@ -17,7 +17,7 @@
after(BeanFormProducer producer, Head head) :
execution(void HtmlProducer+.head(..)) && this(producer) && args(head) {
- if (!producer.hasDojoRichText) return;
+ if (!producer.hasDojoRichText) return;
head.addRawScript("dojo.require.youtube", "dojo.require('dijit._editor.plugins.YoutubeVideoDialog');");
head.addCss("magma:/dojo/dijit/_editor/resources/YouTube.css");
}
Modified: labs/magma/trunk/website-dojo-textareas/src/main/java/org/apache/magma/dojo/RichEditorPlugins.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-dojo-textareas/src/main/java/org/apache/magma/dojo/RichEditorPlugins.java?rev=771919&r1=771918&r2=771919&view=diff
==============================================================================
--- labs/magma/trunk/website-dojo-textareas/src/main/java/org/apache/magma/dojo/RichEditorPlugins.java (original)
+++ labs/magma/trunk/website-dojo-textareas/src/main/java/org/apache/magma/dojo/RichEditorPlugins.java Tue May 5 16:50:50 2009
@@ -52,6 +52,9 @@
if (rcv.isPermitImages()) {
addImagePlugins(plugins);
}
+ if (rcv.isPermitObjects()) {
+ addObjectPlugins(plugins);
+ }
if (rcv.isPermitTables()) {
addTablePlugins(plugins);
}
@@ -114,6 +117,10 @@
public static void addBoldPlugin(List<String> plugins) {
plugins.add("bold");
}
+
+ public static void addObjectPlugins(List<String> plugins) {
+
+ }
public static void addDefaultPlugins(List<String> plugins) {
plugins.add("undo");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org