diff --git a/ResourcesGrailsPlugin.groovy b/ResourcesGrailsPlugin.groovy index c7e7d6a..c18d36e 100644 --- a/ResourcesGrailsPlugin.groovy +++ b/ResourcesGrailsPlugin.groovy @@ -22,7 +22,7 @@ class ResourcesGrailsPlugin { static DEFAULT_URI_PREFIX = 'static' static DEFAULT_ADHOC_PATTERNS = ["/images/*", "*.css", "*.js"].asImmutable() - def version = "1.2" + def version = "1.2-FAST" def grailsVersion = "1.3 > *" def loadAfter = ['logging'] // retained to ensure correct loading under Grails < 2.0 diff --git a/src/groovy/org/grails/plugin/resource/DevModeSanityFilter.groovy b/src/groovy/org/grails/plugin/resource/DevModeSanityFilter.groovy index 933be85..23f1f07 100644 --- a/src/groovy/org/grails/plugin/resource/DevModeSanityFilter.groovy +++ b/src/groovy/org/grails/plugin/resource/DevModeSanityFilter.groovy @@ -1,9 +1,7 @@ package org.grails.plugin.resource - -import javax.servlet.* import org.springframework.web.context.support.WebApplicationContextUtils -import grails.util.Environment +import javax.servlet.* /** * This just traps any obvious mistakes the user has made and warns them in dev mode * @@ -37,7 +35,17 @@ class DevModeSanityFilter implements Filter { void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + boolean processReloading = false + if (grailsResourceProcessor.reloading) { + if (grailsResourceProcessor.isDebugMode(request) && request.getAttribute('resources.adhoc')) { + processReloading = false //don't add reloading stub for adhoc resources in dev mode + } else { + processReloading = true + } + } + + if (processReloading) { response.contentType = "text/html" response.writer << RELOADING_DOC } else { diff --git a/src/groovy/org/grails/plugin/resource/ProcessingFilter.groovy b/src/groovy/org/grails/plugin/resource/ProcessingFilter.groovy index 4f81e30..879ca70 100644 --- a/src/groovy/org/grails/plugin/resource/ProcessingFilter.groovy +++ b/src/groovy/org/grails/plugin/resource/ProcessingFilter.groovy @@ -1,9 +1,7 @@ package org.grails.plugin.resource - -import javax.servlet.* import org.springframework.web.context.support.WebApplicationContextUtils -import grails.util.Environment +import javax.servlet.* /** * This is the servlet filter that handles all static resource requests and delegates to the service * to return them. @@ -31,6 +29,7 @@ class ProcessingFilter implements Filter { def debugging = grailsResourceProcessor.isDebugMode(request) if (debugging) { request.setAttribute('resources.debug', debugging) + if (adhoc) request.setAttribute('resources.adhoc', true) } if (!debugging) { if (adhoc) {