From d8a9883c9acc8e45ed1bfafbfec28979ea47088b Mon Sep 17 00:00:00 2001 From: greenlaw110 Date: Sat, 11 Feb 2012 09:45:47 +1100 Subject: [PATCH] fix bug: #30; add tag for play-rythm template engine --- java/core/lib/play-greenscript.jar | Bin 17254 -> 17254 bytes .../tags/rythm/greenscript/closeTag_.html | 6 +- .../app/views/tags/rythm/greenscript/css.html | 12 +-- .../app/views/tags/rythm/greenscript/gs_.html | 82 +++++++++--------- .../tags/rythm/greenscript/importCss.html | 7 +- .../app/views/tags/rythm/greenscript/js.html | 14 +-- .../tags/rythm/greenscript/openTag_.html | 9 +- .../views/tags/rythm/greenscript/output_.html | 2 +- 8 files changed, 60 insertions(+), 72 deletions(-) diff --git a/java/core/lib/play-greenscript.jar b/java/core/lib/play-greenscript.jar index 4ee90065a97e82c51a56be65f15e042ad75348f0..c8a645a4f4c24f1104661fb558e80f8a1144f8e7 100755 GIT binary patch delta 11397 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 F{{b{6KobA} diff --git a/java/play/app/views/tags/rythm/greenscript/closeTag_.html b/java/play/app/views/tags/rythm/greenscript/closeTag_.html index 48cf154..1c9dd78 100755 --- a/java/play/app/views/tags/rythm/greenscript/closeTag_.html +++ b/java/play/app/views/tags/rythm/greenscript/closeTag_.html @@ -1,2 +1,4 @@ -@args String type; -@if ("js".equalsIgnoreCase(type)) @ else if ("css".equalsIgnoreCase(type)) @ +#{verbatim} +@args String type +@("js".equalsIgnoreCase(type) ? "" : ("css".equalsIgnoreCase(type) ? "" : "" )) +#{/verbatim} diff --git a/java/play/app/views/tags/rythm/greenscript/css.html b/java/play/app/views/tags/rythm/greenscript/css.html index 275b37e..825c36a 100755 --- a/java/play/app/views/tags/rythm/greenscript/css.html +++ b/java/play/app/views/tags/rythm/greenscript/css.html @@ -1,10 +1,4 @@ +#{verbatim} @args String nameList, Object output, boolean all, boolean deps, String media, String browser, String id, String charset, int priority; - -@{ -if (null == nameList) nameList = _getAs("arg", String.class); -String cacheKey = nameList + output + all + deps + media + browser + id + charset + priority; -}@ - -@cacheOnProd(cacheKey, "1h") << -@greenscript.gs_(nameList = nameList, output = output, all = all, deps = deps, media = media, browser = browser, id = id, charset = charset, priority = priority, type = "css") -@ \ No newline at end of file +@greenscript.gs_(nameList = nameList, output = output, all = all, deps = deps, media = media, browser = browser, id = id, charset = charset, priority = priority, type = "css", _body = _body) +#{/verbatim} \ No newline at end of file diff --git a/java/play/app/views/tags/rythm/greenscript/gs_.html b/java/play/app/views/tags/rythm/greenscript/gs_.html index f5bbefa..0485bfa 100755 --- a/java/play/app/views/tags/rythm/greenscript/gs_.html +++ b/java/play/app/views/tags/rythm/greenscript/gs_.html @@ -1,47 +1,47 @@ -@import play.modules.greenscript.GreenScriptPlugin; -@args String nameList, Object output, boolean all, boolean deps, String media, String browser, String id, String charset, int priority = 0, String type; - @{ - final com.greenscriptool.RenderSession sm = (com.greenscriptool.RenderSession)GreenScriptPlugin.session(type); - if (null != nameList) { - sm.declare(nameList, media, browser); - } - _logger.info("aaa"); - - all = all || "all".equals(output); - deps = deps || "deps".equals(output); +#{verbatim} +@import play.modules.greenscript.GreenScriptPlugin +@args String nameList, Object output, boolean all, boolean deps, String media, String browser, String id, String charset, int priority = 0, String type +@{ + final com.greenscriptool.RenderSession sm = (com.greenscriptool.RenderSession)GreenScriptPlugin.session(type); + if (null != nameList) { + sm.declare(nameList, media, browser); + } - boolean _output = all || deps || ((null != output) && ((output instanceof Boolean) ? (Boolean)output : !"false".equals(output.toString()))); - }@ + all = all || "all".equals(output); + deps = deps || "deps".equals(output); - @if (_output) - @if (all) - @// default browser with default media - @greenscript.output_(nameList, deps = deps, all = all, media = null, browser = null, id = id, charset = charset, type = type, sm = sm) + boolean _output = all || deps || ((null != output) && ((output instanceof Boolean) ? (Boolean)output : !"false".equals(output.toString()))); +}@ - @// default browser with non-default media - @each String med: sm.getMedias(null) - @greenscript.output_(nameList, deps = deps, all = all, media = med, browser = null, id = id, charset = charset, type = type, sm = sm) - @ +@if (_output) { + @if (all) { + @// default browser with default media + @greenscript.output_(nameList, deps = deps, all = all, media = null, browser = null, id = id, charset = charset, type = type, sm = sm) - @// non-default browsers - @each String bro: sm.getBrowsers() - @each String med: sm.getMedias(bro) - @greenscript.output_(nameList, deps = deps, all = all, media = med, browser = bro, id = id, charset = charset, type = type, sm = sm) - @ - @ - @ else - @greenscript.output_(nameList, deps = deps, all = all, media = media, browser = browser, id = id, charset = charset, type = type, sm = sm) - @ - @ + @// default browser with non-default media + @each String med: sm.getMedias(null) { + @greenscript.output_(nameList, deps = deps, all = all, media = med, browser = null, id = id, charset = charset, type = type, sm = sm) + } - @// handle inline code + @// non-default browsers + @each String bro: sm.getBrowsers() { + @each String med: sm.getMedias(bro) { + @greenscript.output_(nameList, deps = deps, all = all, media = med, browser = bro, id = id, charset = charset, type = type, sm = sm) + } + } + } else { + @greenscript.output_(nameList, deps = deps, all = all, media = media, browser = browser, id = id, charset = charset, type = type, sm = sm) + } +} - @if (null != _body) - @if (_output) - @greenscript.openTag_(type) - @_body - @greenscript.closeTag_(type) - @ else - @{ sm.declareInline(_body.toString(), priority); }@ - @ - @ +@// handle inline code +@if (null != _body) { + @if (_output) { + @greenscript.openTag_(type) + @_body + @greenscript.closeTag_(type) + } else { + @{ sm.declareInline(_body.toString(), priority) }@ + } +} +#{/verbatim} \ No newline at end of file diff --git a/java/play/app/views/tags/rythm/greenscript/importCss.html b/java/play/app/views/tags/rythm/greenscript/importCss.html index 3175a7d..8735f3e 100755 --- a/java/play/app/views/tags/rythm/greenscript/importCss.html +++ b/java/play/app/views/tags/rythm/greenscript/importCss.html @@ -1,4 +1,5 @@ -@import play.modules.greenscript.GreenScriptPlugin; +#{verbatim} +@import play.modules.greenscript.GreenScriptPlugin @args String nameList; - -@GreenScriptPlugin.lessImport(nameList) \ No newline at end of file +@GreenScriptPlugin.lessImport(nameList) +#{/verbatim} \ No newline at end of file diff --git a/java/play/app/views/tags/rythm/greenscript/js.html b/java/play/app/views/tags/rythm/greenscript/js.html index ea0a238..3812ef3 100755 --- a/java/play/app/views/tags/rythm/greenscript/js.html +++ b/java/play/app/views/tags/rythm/greenscript/js.html @@ -1,10 +1,4 @@ -@args String nameList, Object output, boolean all, boolean deps, String media, String browser, String id, String charset, int priority; - -@{ -if (null == nameList) nameList = _getAs("arg", String.class); -String cacheKey = nameList + output + all + deps + media + browser + id + charset + priority; -}@ - -@cacheOnProd(cacheKey, "1h") << -@greenscript.gs_(nameList = nameList, output = output, all = all, deps = deps, media = media, browser = browser, id = id, charset = charset, priority = priority, type = "js") -@ \ No newline at end of file +#{verbatim} +@args String nameList, Object output, boolean all, boolean deps, String media, String browser, String id, String charset, int priority +@greenscript.gs_(nameList = nameList, output = output, all = all, deps = deps, media = media, browser = browser, id = id, charset = charset, priority = priority, type = "js", _body = _body) +#{/verbatim} diff --git a/java/play/app/views/tags/rythm/greenscript/openTag_.html b/java/play/app/views/tags/rythm/greenscript/openTag_.html index b65d68d..6d83927 100755 --- a/java/play/app/views/tags/rythm/greenscript/openTag_.html +++ b/java/play/app/views/tags/rythm/greenscript/openTag_.html @@ -1,7 +1,4 @@ +#{verbatim} @args String type - - @if ("js".equalsIgnoreCase(type)) -