]> source.dussan.org Git - vaadin-framework.git/commit
Support using multiple @JavaScript and @StyleSheet annotations on a class (#8293)
authorArtur <artur@vaadin.com>
Tue, 24 Jan 2017 13:41:15 +0000 (15:41 +0200)
committerAleksi Hietanen <aleksi@vaadin.com>
Tue, 24 Jan 2017 13:41:15 +0000 (15:41 +0200)
commitc916782da19362dc210402bbe922873d6386b05d
tree5e184d80e68f5b65e13d51c5ccf36e84d2b3125a
parenta0b80c1d9b22aed986e885d8a32cf1446533d6da
Support using multiple @JavaScript and @StyleSheet annotations on a class (#8293)
14 files changed:
server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForJS.java [new file with mode: 0644]
server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForSS.java [new file with mode: 0644]
server/src/main/java/com/vaadin/annotations/JavaScript.java
server/src/main/java/com/vaadin/annotations/StyleSheet.java
server/src/main/java/com/vaadin/server/BootstrapHandler.java
server/src/main/java/com/vaadin/server/communication/UidlWriter.java
uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java
uitest/src/main/java/com/vaadin/tests/components/ui/UiDependenciesInHtml.java
uitest/src/main/resources/com/vaadin/tests/components/ui/uiDependency.js
uitest/src/main/themes/VAADIN/themes/tests-valo/uiDependency.css [deleted file]
uitest/src/main/themes/VAADIN/themes/tests-valo/uiDependency1.css [new file with mode: 0644]
uitest/src/main/themes/VAADIN/themes/tests-valo/uiDependency2.css [new file with mode: 0644]
uitest/src/main/themes/VAADIN/themes/tests-valo/uiDependency3.css [new file with mode: 0644]
uitest/src/test/java/com/vaadin/tests/components/ui/UiDependenciesInHtmlTest.java