Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed JSON Library collision w/ rename

  • Loading branch information...
commit 83afb026ddbbdcbe933b7235a8ae36cc758f4c7f 1 parent 9eb6164
@swestfall authored
View
1  jqueryui-widget-testApp/.idea/modules.xml
@@ -3,7 +3,6 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/jqueryui-widget-testApp.iml" filepath="$PROJECT_DIR$/jqueryui-widget-testApp.iml" />
- <module fileurl="file://$PROJECT_DIR$/jqueryui-widget-testApp-grailsPlugins.iml" filepath="$PROJECT_DIR$/jqueryui-widget-testApp-grailsPlugins.iml" />
<module fileurl="file://$PROJECT_DIR$/jqueryuiWidget-inplacePlugin.iml" filepath="$PROJECT_DIR$/jqueryuiWidget-inplacePlugin.iml" />
</modules>
</component>
View
2  jqueryui-widget-testApp/application.properties
@@ -5,5 +5,5 @@ app.name=jqueryui-widget-testApp
app.servlet.version=2.4
app.version=0.1
plugins.hibernate=1.3.7
-plugins.jqueryui-widget=0.1.3
+plugins.jqueryui-widget=0.1.4.1
plugins.tomcat=1.3.7
View
11 jqueryui-widget-testApp/jqueryui-widget-testApp.iml
@@ -21,15 +21,15 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/grails-app/utils" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/groovy" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/grails-app/controllers" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/grails-app/domain" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/grails-app/services" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/grails-app/taglib" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/groovy" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test/unit" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/test/integration" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/grails-app/utils" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/grails-app/services" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/grails-app/taglib" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
<excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
<excludeFolder url="file://$MODULE_DIR$/web-app/plugins" />
@@ -48,7 +48,6 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="jqueryuiWidget-inplacePlugin" exported="" />
- <orderEntry type="module" module-name="jqueryui-widget-testApp-grailsPlugins" />
</component>
</module>
View
1  jqueryui-widget-testApp/jqueryuiWidget-inplacePlugin.iml
@@ -41,7 +41,6 @@
<jarDirectory url="file://$MODULE_DIR$/../jqueryui-widget/lib" recursive="false" />
</library>
</orderEntry>
- <orderEntry type="module" module-name="jqueryui-widget-testApp-grailsPlugins" />
</component>
</module>
View
2  jqueryui-widget/JqueryuiWidgetGrailsPlugin.groovy
@@ -3,7 +3,7 @@ import org.codehaus.groovy.grails.commons.GrailsApplication
class JqueryuiWidgetGrailsPlugin {
// the plugin version
- def version = "0.1.4"
+ def version = "0.1.4.1"
// the version or versions of Grails the plugin is designed for
def grailsVersion = "1.3.7 > *"
// the other plugins this plugin depends on
View
BIN  jqueryui-widget/lib/JSON_java_2.jar
Binary file not shown
View
4 jqueryui-widget/src/groovy/grails/jqueryui/widget/GrailsJQueryUIWidgetUtil.groovy
@@ -19,9 +19,9 @@ public class GrailsJQueryUIWidgetUtil {
public String toJSON(Object obj) {
if (obj instanceof Map) {
- return new org.json.JSONObject(((Map) obj)).toString();
+ return new org.json.JSONObject2(((Map) obj)).toString();
} else if (obj instanceof ArrayList) {
- return new org.json.JSONArray(((Collection) obj)).toString();
+ return new org.json.JSONArray2(((Collection) obj)).toString();
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.