Skip to content

GRAILS-8330: changed JSON encoding of params attribute to respect List t... #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

GRAILS-8330: changed JSON encoding of params attribute to respect List t... #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions src/groovy/org/codehaus/groovy/grails/plugins/jquery/JQueryProvider.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,22 @@ import org.codehaus.groovy.grails.plugins.web.taglib.JavascriptProvider
* @author Finn Herpich (finn.herpich <at> marfinn-software <dot> de)
*/
class JQueryProvider implements JavascriptProvider {

/**
* encodeParamValue creates a JSON encoded param
*
* @param value
*
* @return the JSON representation of the value
*/
def encodeParamValue(value) {
if (value instanceof List) {
"[ " + value.collect { encodeParamValue(it) }.join(',') + " ]"
} else {
"'" + "$value".encodeAsJavaScript() + "'"
}
}

/**
* doRemoteFunction creates a jQuery-AJAX-Call
*
Expand Down Expand Up @@ -67,11 +83,7 @@ class JQueryProvider implements JavascriptProvider {
if(attrs?.params instanceof Map) {
hasParams = true
out << attrs.remove('params').collect { k, v ->
"\'" +
"${k}".encodeAsJavaScript() +
"\': \'" +
"${v}".encodeAsJavaScript() +
"\'"
"'" + "${k}".encodeAsJavaScript() + "': " + encodeParamValue(v)
}.join(",")
}

Expand All @@ -80,11 +92,7 @@ class JQueryProvider implements JavascriptProvider {
out << ","

out << attrs.remove('jsParams').collect { k, v ->
"\'" +
"${k}".encodeAsJavaScript() +
"\': \'" +
"${v}".encodeAsJavaScript() +
"\'"
"'" + "${k}".encodeAsJavaScript() + "': " + encodeParamValue(v)
}.join(",")
}

Expand Down