Repository: tapestry-5 Updated Branches: refs/heads/master e71688962 -> ffeaabc04
Remove "t-" prefix from CSS style "t-ajax-insertion-point" Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/9769b0db Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/9769b0db Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/9769b0db Branch: refs/heads/master Commit: 9769b0db2f44afc41923f67f087dc50383743504 Parents: e716889 Author: Howard M. Lewis Ship <hls...@apache.org> Authored: Mon Dec 29 14:06:41 2014 -0800 Committer: Howard M. Lewis Ship <hls...@apache.org> Committed: Mon Dec 29 14:06:41 2014 -0800 ---------------------------------------------------------------------- .../src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee | 2 +- .../org/apache/tapestry5/services/javascript/StylesheetLink.java | 2 +- .../apache/tapestry5/services/javascript/StylesheetOptions.java | 2 +- .../tapestry5/internal/services/DocumentLinkerImplTest.groovy | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9769b0db/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee index 18e95ff..149d9ea 100644 --- a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee +++ b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee @@ -54,7 +54,7 @@ define ["underscore", "./console", "./dom", "./events"], insertionPoint = _.find(document.styleSheets, (ss) -> parent = ss.ownerNode || ss.owningElement - parent.rel is "stylesheet t-ajax-insertion-point") + parent.rel is "stylesheet ajax-insertion-point") # Most browsers support document.head, but older IE doesn't: head = document.head or document.getElementsByTagName("head")[0] http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9769b0db/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java index d45ba1f..ae98fbb 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java @@ -100,7 +100,7 @@ public final class StylesheetLink container.raw(String.format("\n<!--[if %s]>\n", options.condition)); } - String rel = options.ajaxInsertionPoint ? "stylesheet t-ajax-insertion-point" : "stylesheet"; + String rel = options.ajaxInsertionPoint ? "stylesheet ajax-insertion-point" : "stylesheet"; container.element("link", "href", getURL(), http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9769b0db/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetOptions.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetOptions.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetOptions.java index f03140f..ae1edd0 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetOptions.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetOptions.java @@ -42,7 +42,7 @@ public final class StylesheetOptions /** * If true, then this stylesheet is the insertion point for Ajax operations; any added CSS links will be inserted before this link. Only at most * one CSS link should be the insertion point. Only used for full page renders (not partial page renders). When this is true, the {@code <link>} element's - * ref attribute is wrtten out as "stylesheet t-ajax-insertion-point". + * ref attribute is wrtten out as "stylesheet ajax-insertion-point". */ public boolean ajaxInsertionPoint; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9769b0db/tapestry-core/src/test/groovy/org/apache/tapestry5/internal/services/DocumentLinkerImplTest.groovy ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/internal/services/DocumentLinkerImplTest.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/internal/services/DocumentLinkerImplTest.groovy index b1a335f..11c1b4e 100644 --- a/tapestry-core/src/test/groovy/org/apache/tapestry5/internal/services/DocumentLinkerImplTest.groovy +++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/internal/services/DocumentLinkerImplTest.groovy @@ -303,7 +303,7 @@ class DocumentLinkerImplTest extends InternalBaseTestCase { linker.updateDocument(document) check document, ''' -<html><head><link type="text/css" rel="stylesheet" href="whatever.css"/><link type="text/css" rel="stylesheet t-ajax-insertion-point" href="insertion-point.css"/></head><body data-page-initialized="true"></body></html> +<html><head><link type="text/css" rel="stylesheet" href="whatever.css"/><link type="text/css" rel="stylesheet ajax-insertion-point" href="insertion-point.css"/></head><body data-page-initialized="true"></body></html> ''' }
