Changeset 920 for branches/features/purchaseOrders/grails-app/taglib

Timestamp:

May 7, 2011, 12:42:44 PM (14 years ago)

Author:

gav

Message:

Svn merge -r874:r919 trunk/ into branches/features/purchaseOrders.
This brings the purchaseOrder branch fully up to date.

Location:

branches/features/purchaseOrders

Files:

• . (modified) (1 prop)
• grails-app/taglib/CustomTagLib.groovy (modified) (3 diffs)
• grails-app/taglib/JsUtilTagLib.groovy (modified) (2 diffs)

branches/features/purchaseOrders/grails-app/taglib/CustomTagLib.groovy

@@ -314 +314 @@
     */
     def helpBalloon = {attrs, body ->
-        def mkp = new groovy.xml.MarkupBuilder(out) //this line will be unnecessary in versions of Grails after version 1.2
+        def mb = new groovy.xml.MarkupBuilder(out)
 
         def title = attrs["title"]
@@ -352 +352 @@
         if(iconSrc) {
             iconId = iconId ?: "customHb$num"
-            mkp.img( id: iconId, src: iconSrc)
+            mb.img(id: iconId, src: iconSrc)
         }
 
@@ -367 +367 @@
 });"""
 
-        mkp.script(type: "text/javascript") {
-            yieldUnescaped(javascript)
+        mb.script(type: "text/javascript") {
+            mkp.yieldUnescaped(javascript)
         }
 

branches/features/purchaseOrders/grails-app/taglib/JsUtilTagLib.groovy

@@ -28 +28 @@
     */
     def toggleControl = { attrs ->
-        def mkp = new groovy.xml.MarkupBuilder(out) //this line will be unnecessary in versions of Grails after version 1.2
+        def mb = new groovy.xml.MarkupBuilder(out)
 
         def toggleJs
@@ -39 +39 @@
 
         if(attrs.useDiv == 'false') {
-            mkp.a( href: toggleJs ) {
-                    yieldUnescaped(attrs.text)
+            mb.a( href: toggleJs ) {
+                    mkp.yieldUnescaped(attrs.text)
                     img(id: attrs.imageId, src: attrs.closedImgUrl, alt: "Show")
-            } // mkp
+            }
 
         }
         else {
-            mkp.div() {
+            mb.div() {
                 a( href: toggleJs ) {
-                    yieldUnescaped(attrs.text)
+                    mkp.yieldUnescaped(attrs.text)
                     img(id: attrs.imageId, src: attrs.closedImgUrl, alt: "Show")
                 }
-            } // mkp
+            }
         }