Changeset 918 for trunk

Timestamp:

May 2, 2011, 3:51:27 PM (14 years ago)

Author:

gav

Message:

Small taglib fix, mkp is now a special namespace in groovy.xml.MarkupBuilder? so using 'mb'.

Location:

trunk/grails-app

Files:

• services/AssetTreeService.groovy (modified) (7 diffs)
• taglib/CustomTagLib.groovy (modified) (3 diffs)
• taglib/JsUtilTagLib.groovy (modified) (2 diffs)

trunk/grails-app/services/AssetTreeService.groovy

@@ -111 +111 @@
 
         def sw = new StringWriter()
-        def mkp = new groovy.xml.MarkupBuilder(sw)
-
-        mkp.div(class: buttonHtmlClass) {
+        def mb = new groovy.xml.MarkupBuilder(sw)
+
+        mb.div(class: buttonHtmlClass) {
             a( href: hrefShowPane() ) {
                 img(src: treeRootImg, alt: 'Asset Tree', title: 'Asset Tree')
             }
-        } // mkp
+        }
 
         return sw.toString()
@@ -133 +133 @@
 
         def sw = new StringWriter()
-        def mkp = new groovy.xml.MarkupBuilder(sw)
-
-        mkp.div(class: paneHtmlClass, id: paneHtmlId, style: 'display:none;') {
+        def mb = new groovy.xml.MarkupBuilder(sw)
+
+        mb.div(class: paneHtmlClass, id: paneHtmlId, style: 'display:none;') {
             div(class: paneCloseHtmlClass) {
                 a( href: js.toggle(paneHtmlId) ) {
@@ -155 +155 @@
                 } // table
             } // div
-        } // mkp
+        }
 
         return sw.toString()
@@ -203 +203 @@
 
         def sw = new StringWriter()
-        def mkp = new groovy.xml.MarkupBuilder(sw)
+        def mb = new groovy.xml.MarkupBuilder(sw)
 
         // Offer a site create link if no sites are found.
         if(!sites) {
-            mkp.div(class: tableDivHtmlClass) {
+            mb.div(class: tableDivHtmlClass) {
 
                 div(class: paneCloseHtmlClass) {
@@ -235 +235 @@
                     }
                 } // button div
-            } // mkp
+            } // mb
             return sw.toString()
         } // if(!sites)
@@ -242 +242 @@
         // The main populated table.
         /// @todo: use a loop for the subItem levels.
-        mkp.div(class: tableDivHtmlClass) {
+        mb.div(class: tableDivHtmlClass) {
 
             div(class: paneCloseHtmlClass) {
@@ -443 +443 @@
             }
 
-        } // mkp
+        } // mb
 
         def totalTime = (System.currentTimeMillis() - startedAt)/1000

trunk/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)
         }
 

trunk/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
+            }
         }