fix for GRAILS-2512

git-svn-id: https://svn.codehaus.org/grails/trunk@6802 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

src/groovy/org/codehaus/groovy/grails/plugins/web/taglib/JavascriptTagLib.groovy

@@ -192,9 +192,10 @@ class JavascriptTagLib  {
 		if(!value) value = ''
 
 		out << "<input type=\"text\" name=\"${attrs.remove('name')}\" value=\"${value}\" onkeyup=\""
-		if(attrs.params) {
+        
+        if(attrs.params) {
 			if(attrs.params instanceof Map) {
-				attrs.params.put(paramName, 'this.value')
+				attrs.params.put(paramName, new JavascriptValue('this.value'))
 			}
 			else {
 				attrs.params += "+'${paramName}='+this.value"	
@@ -332,6 +333,19 @@ interface JavascriptProvider {
 	def prepareAjaxForm(attrs)
 }
 
+class JavascriptValue {
+    def value
+
+    public JavascriptValue(value) {
+        this.value = value
+    }
+
+    public String toString() {
+        return "'+$value+'"
+    }
+
+
+}
 /**
  * Prototype implementation of JavaScript provider
  *
@@ -366,21 +380,32 @@ class PrototypeProvider implements JavascriptProvider {
 
 		//def pms = attrs.remove('params')
         def url
+        def jsParams = attrs.params?.findAll { it.value instanceof JavascriptValue }
+
+        jsParams?.each { attrs.params?.remove(it.key) }
+
+
+
         if(attrs.url) {
 			url = taglib.createLink(attrs.url)
 		}
 		else {
 			url = taglib.createLink(attrs)
 		}
+
+        if(!attrs.params) attrs.params = [:]
+        jsParams?.each { attrs.params[it.key] = it.value }
+
+        
         def i = url?.indexOf('?')
 
         if(i >-1) {
             if(attrs.params instanceof String) {
                 attrs.params += "+'&${url[i+1..-1].encodeAsJavaScript()}'"                
             }
             else if(attrs.params instanceof Map) {
-                def params = attrs.params.collect { k, v -> "${k.encodeAsURL()}=${v.encodeAsURL()}" }.join('&').encodeAsJavaScript()
-                attrs.params = "'$params&${url[i+1..-1].encodeAsJavaScript()}'"
+                def params = createQueryString(attrs.params)
+                attrs.params = "'${params}${params ? '&' : ''}${url[i+1..-1].encodeAsJavaScript()}'"
             }
             else {
                 attrs.params = "'${url[i+1..-1].encodeAsJavaScript()}'"
@@ -399,9 +424,30 @@ class PrototypeProvider implements JavascriptProvider {
 		// process options
 		out << getAjaxOptions(attrs)
 		// close
-		out << ');'		
-	}
-	
+		out << ');'
+        attrs.remove('params')
+    }
+
+    private String createQueryString(params) {
+        def allParams = []
+        for (entry in params) {
+            def value = entry.value
+            def key = entry.key
+            if (value instanceof JavascriptValue) {
+                allParams << "${key.encodeAsURL()}='+${value.value}+'"
+            }
+            else {
+                allParams << "${key.encodeAsURL()}=${value.encodeAsURL()}".encodeAsJavascript()
+            }
+        }
+        if(allParams.size() == 1) {
+            return allParams[0]
+        }
+        else {
+            return allParams.join('&')
+        }
+    }
+
     // helper function to build ajax options
     def getAjaxOptions(options) {
         def ajaxOptions = []
@@ -432,13 +478,9 @@ class PrototypeProvider implements JavascriptProvider {
             if(options.params) {
 				def params = options.remove('params')
 				if (params instanceof Map) {
-					ajaxOptions << "parameters:'" +
-										params.collect { k, v -> "${k.encodeAsURL()}=${v.encodeAsURL()}" }.join('&').encodeAsJavaScript() +
-									"'"				
-				} 
-				else {
-					ajaxOptions << "parameters:${params}"
+                    params = createQueryString(params)
 				}
+                ajaxOptions << "parameters:${params}"
             }
         }
         // remaining options

test/groovy/org/codehaus/groovy/grails/web/taglib/JavaScriptTagLibTests.groovy

@@ -19,6 +19,15 @@ class TestUrlMappings {
         grailsApplication.addArtefact(UrlMappingsArtefactHandler.TYPE, urlMappingsClass)
     }
 
+    void testRemoteFieldWithExtraParams() {
+        def template = '<g:remoteField controller="test" action="hello" id="1" params="[var1: \'one\', var2: \'two\']" update="success" name="myname" value="myvalue"/>'
+
+         request.setAttribute("org.codehaus.grails.INCLUDED_JS_LIBRARIES", ['prototype'])
+
+        assertOutputEquals '<input type="text" name="myname" value="myvalue" onkeyup="new Ajax.Updater(\'success\',\'/test/hello/1\',{asynchronous:true,evalScripts:true,parameters:\'value=\'+this.value+\'&var1=one&var2=two\'});" />', template
+
+    }
+
     void testPrototypeSubmitToRemoteWithExtraParams() {
         def template = '<g:submitToRemote name="myButton" url="[controller:\'person\', action:\'show\', params:[var1:\'one\', var2:\'two\']]" ></g:submitToRemote>'
         request.setAttribute("org.codehaus.grails.INCLUDED_JS_LIBRARIES", ['prototype'])