This is an automated email from the ASF dual-hosted git repository.

jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-html4j.git

commit 25fa0fadae1e186c669fdb4a9aa0220bb3e2bdf3
Merge: d8833aa beda7c5
Author: Jaroslav Tulach <[email protected]>
AuthorDate: Thu Jan 4 12:04:22 2018 +0100

    Merge pull request #4 from JaroslavTulach/jtulach/MultiJavaScriptResource
    
    Make @JavaScriptResource repeatable

 .../java/net/java/html/js/JavaScriptResource.java  | 20 +++++
 .../java/org/netbeans/html/boot/impl/FnUtils.java  | 27 ++++++-
 .../html/boot/impl/JavaScriptProcesor.java         | 87 +++++++++++++---------
 json-tck/pom.xml                                   |  9 +++
 .../net/java/html/js/tests/JavaScriptBodyTest.java |  5 ++
 .../java/net/java/html/js/tests/ResourceOrder.java | 30 ++++++++
 .../resources/net/java/html/js/tests/addHello.js   | 20 +++++
 .../resources/net/java/html/js/tests/addWorld.js   | 20 +++++
 .../resources/net/java/html/js/tests/initArray.js  | 20 +++++
 pom.xml                                            |  2 +-
 src/main/javadoc/overview.html                     |  3 +
 11 files changed, 202 insertions(+), 41 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

Reply via email to