svn commit: r1772045 - in /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component: ScriptTagDeclaration.java StyleTagDeclaration.java

[lo...@apache.org]

Author: lofwyr
Date: Wed Nov 30 13:49:54 2016
New Revision: 1772045

URL: http://svn.apache.org/viewvc?rev=1772045&view=rev
Log:
* doc
* cleanup

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java?rev=1772045&r1=1772044&r2=1772045&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java Wed Nov 30 13:49:54 2016
@@ -42,56 +42,13 @@ import org.apache.myfaces.tobago.interna
 public interface ScriptTagDeclaration extends HasIdBindingAndRendered {
 
   /**
-   * File name to include into the rendered page.
+   * File name to include into the rendered page. The name must be full qualified, or relative.
+   * If using a complete path from root, you'll need to add the contextPath from the web application.
+   * This can be done with the EL #{request.contextPath}.
    * @param file A JavaScript file.
    */
   @TagAttribute()
   @UIComponentTagAttribute()
   void setFile(String file);
 
-  /**
-   * @deprecated Since 2.0.0. Please include a custom script file via the file attribute and use
-   * <code>Tobago.registerListener(myFunction, Tobago.Phase.DOCUMENT_READY);</code> or
-   * <code>Tobago.registerListener(myFunction, Tobago.Phase.WINDOW_LOAD);</code>
-   */
-  @Deprecated
-  @TagAttribute()
-  @UIComponentTagAttribute()
-  void setOnload(String onload);
-
-  /**
-   * @deprecated Since 2.0.0. Please include a custom script file via the file attribute and use
-   * <code>Tobago.registerListener(myFunction, Tobago.Phase.BEFORE_UNLOAD);</code>
-   */
-  @Deprecated
-  @TagAttribute()
-  @UIComponentTagAttribute()
-  void setOnunload(String onunload);
-
-  /**
-   * @deprecated Since 2.0.0. Please include a custom script file via the file attribute and use
-   * <code>Tobago.registerListener(myFunction, Tobago.Phase.BEFORE_EXIT);</code>
-   */
-  @Deprecated
-  @TagAttribute()
-  @UIComponentTagAttribute()
-  void setOnexit(String onexit);
-
-  /**
-   * @deprecated Since 2.0.0. Please include a custom script file via the file attribute and use
-   * <code>Tobago.registerListener(myFunction, Tobago.Phase.BEFORE_SUBMIT);</code>
-   */
-  @Deprecated
-  @TagAttribute()
-  @UIComponentTagAttribute()
-  void setOnsubmit(String onsubmit);
-
-  /**
-   * @deprecated Since 2.0.0. Please include a custom script file via the file attribute.
-   */
-  @Deprecated
-  @TagAttribute(bodyContent = true)
-  @UIComponentTagAttribute()
-  void setScript(String script);
-
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java?rev=1772045&r1=1772044&r2=1772045&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java Wed Nov 30 13:49:54 2016
@@ -33,10 +33,8 @@ import org.apache.myfaces.tobago.layout.
 
 /**
  * <p>
- * Add a style tag with the given file name.
- * </p>
- * <p>
- * Remark: Inline styles are deprecated because of CSP.
+ * Add a style tag with the given file name to the header (using file attribute) or add
+ * some CSS styles to the parent component.
  * </p>
  */
 @Tag(name = "style")
@@ -50,7 +48,9 @@ import org.apache.myfaces.tobago.layout.
 public interface StyleTagDeclaration extends HasIdBindingAndRendered {
 
   /**
-   * Name of the stylesheet file to add to page.
+   * Name of the stylesheet file to add to page. The name must be full qualified, or relative.
+   * If using a complete path from root, you'll need to add the contextPath from the web application.
+   * This can be done with the EL #{request.contextPath}.
    */
   @TagAttribute()
   @UIComponentTagAttribute()