Changeset 568

Timestamp:

Jun 4, 2010, 11:45:14 PM (15 years ago)

Author:

gav

Message:

JavaScript? util improvements, added toggleWithEffectUtil() and useDiv option to toggleControl taglib.

Location:

trunk

Files:

• grails-app/taglib/JsUtilTagLib.groovy (modified) (2 diffs)
• web-app/js/jsUtil.js (modified) (1 diff)

trunk/grails-app/taglib/JsUtilTagLib.groovy

@@ -25 +25 @@
     * @param effect The effect to apply, 'fade' uses the fade/appear effect while the default is to just toggle.
     * @param text The text, if any, to display.
+    * @param useDiv Whether or not to use a wrapping div, default is 'true'.
     */
     def toggleControl = { attrs ->
@@ -37 +38 @@
             toggleJs = js.toggleWithImg(attrs.toggleId, attrs.imageId, attrs.openImgUrl, attrs.closedImgUrl)
 
-        mkp.div() {
-            a( href: toggleJs ) {
-                yieldUnescaped(attrs.text)
-                img(id: attrs.imageId, src: attrs.closedImgUrl, alt: "Show")
-            }
-        } // mkp
+        if(attrs.useDiv == 'false') {
+            mkp.a( href: toggleJs ) {
+                    yieldUnescaped(attrs.text)
+                    img(id: attrs.imageId, src: attrs.closedImgUrl, alt: "Show")
+            } // mkp
+
+        }
+        else {
+            mkp.div() {
+                a( href: toggleJs ) {
+                    yieldUnescaped(attrs.text)
+                    img(id: attrs.imageId, src: attrs.closedImgUrl, alt: "Show")
+                }
+            } // mkp
+        }
 
     } // hideShowControl

trunk/web-app/js/jsUtil.js

@@ -24 +24 @@
 }
 
+function toggleWithEffectUtil(id) {
+    if( $(id).visible() ) {
+        Effect.Fade(id,{duration:0.4,queue:'end'});
+    }
+    else {
+        Effect.Appear(id,{duration:0.4,queue:'end'});
+    }
+}
+
 function toggleWithImgAndEffectUtil(id, imageId, openImgUrl, closedImgUrl) {