Changeset 5160


Ignore:
Timestamp:
05/08/14 12:34:43 (10 years ago)
Author:
Twan Goosen
Message:

cleanup and proper bundling of JavaScript? sources

Location:
vlo/trunk/vlo-web-app
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • vlo/trunk/vlo-web-app/pom.xml

    r5148 r5160  
    182182                <filtering>true</filtering>
    183183                <directory>src/main/resources</directory>
     184            </resource>
     185            <resource>
     186                <filtering>false</filtering>
     187                <directory>src/main/js</directory>
    184188            </resource>
    185189            <resource>

  • vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java

    r4988 r5160  
    99import eu.clarin.cmdi.vlo.wicket.pages.RecordPage;
    1010import eu.clarin.cmdi.vlo.wicket.pages.SimpleSearchPage;
     11import eu.clarin.cmdi.vlo.wicket.pages.VloBasePage;
    1112import org.apache.wicket.Application;
    1213import org.apache.wicket.markup.html.WebPage;
    … …  
    7677        // register the resource of application properties (version information filtered at build time)
    7778        getResourceSettings().getStringResourceLoaders().add(new BundleStringResourceLoader("application"));
     79        // register JavaScript bundle (combines  JavaScript source in a single resource to decrease number of client requests)
     80        getResourceBundles().addJavaScriptBundle(VloBasePage.class, "vlo-js",
     81                JavaScriptResources.getVloFrontJS(),
     82                JavaScriptResources.getVloHeaderJS(),
     83                JavaScriptResources.getJQueryWatermarkJS()
     84        );
    7885    }
    7986

  • vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/SimpleSearchPage.java

    r5140 r5160  
    1717package eu.clarin.cmdi.vlo.wicket.pages;
    1818
     19import eu.clarin.cmdi.vlo.JavaScriptResources;
    1920import eu.clarin.cmdi.vlo.config.VloConfig;
    2021import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
    … …  
    2627import org.apache.wicket.RestartResponseException;
    2728import org.apache.wicket.ajax.AjaxRequestTarget;
     29import org.apache.wicket.markup.head.IHeaderResponse;
     30import org.apache.wicket.markup.head.JavaScriptHeaderItem;
    2831import org.apache.wicket.markup.html.WebMarkupContainer;
    2932import org.apache.wicket.markup.html.link.BookmarkablePageLink;
    … …  
    9497        add(browse);
    9598    }
     99
     100    @Override
     101    public void renderHead(IHeaderResponse response) {
     102        super.renderHead(response);
     103        response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getVloFrontJS()));
     104    }
    96105}

  • vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/VloBasePage.html

    r5127 r5160  
    3333
    3434    <body>
    35         <!-- TODO: Include in header per page? -->
    36         <script src="js/jquery.watermark-3.1.4/jquery.watermark.min.js" type="text/javascript"></script>
    37         <script src="js/vlo-header.js" type="text/javascript"></script>
    38         <script src="js/vlo-front.js" type="text/javascript"></script>
    39         <script src="js/vlo-facets.js" type="text/javascript"></script>
    40         <script src="js/vlo-record.js" type="text/javascript"></script>
    41         <script src="js/vlo-search.js" type="text/javascript"></script>
    42 
    4335        <div id="main">
    4436            <div id="header">

  • vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/VloBasePage.java

    r5082 r5160  
    1717package eu.clarin.cmdi.vlo.wicket.pages;
    1818
     19import eu.clarin.cmdi.vlo.JavaScriptResources;
    1920import eu.clarin.cmdi.vlo.VloWebAppParameters;
    2021import eu.clarin.cmdi.vlo.config.VloConfig;
    … …  
    2324import org.apache.wicket.markup.head.CssHeaderItem;
    2425import org.apache.wicket.markup.head.IHeaderResponse;
     26import org.apache.wicket.markup.head.JavaScriptHeaderItem;
    2527import org.apache.wicket.markup.html.GenericWebPage;
    2628import org.apache.wicket.markup.html.basic.Label;
    … …  
    3133import org.apache.wicket.request.mapper.parameter.PageParameters;
    3234import org.apache.wicket.request.resource.CssResourceReference;
     35import org.apache.wicket.request.resource.JavaScriptResourceReference;
    3336import org.apache.wicket.spring.injection.annot.SpringBean;
    3437import org.apache.wicket.util.string.StringValue;
    … …  
    123126    @Override
    124127    public void renderHead(IHeaderResponse response) {
    125         // Include CSS. Exact file will be chosen on basis of current locale and
    126         // style (theme).
     128        // Include CSS. Exact file will be chosen on basis of current locale and style (theme)
    127129        response.render(CssHeaderItem.forReference(new CssResourceReference(VloBasePage.class, "vlo.css", getLocale(), getStyle(), getVariation())));
     130        // Include JavaScript for header (e.g. permalink animation)
     131        response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getVloHeaderJS()));
    128132    }
    129133

  • vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetValuesPanel.java

    r5140 r5160  
    1818
    1919import com.google.common.collect.ImmutableSet;
     20import eu.clarin.cmdi.vlo.JavaScriptResources;
    2021import eu.clarin.cmdi.vlo.pojo.FacetSelection;
    2122import eu.clarin.cmdi.vlo.pojo.FieldValuesFilter;
    … …  
    3536import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxFallbackLink;
    3637import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
     38import org.apache.wicket.markup.head.IHeaderResponse;
     39import org.apache.wicket.markup.head.JavaScriptHeaderItem;
    3740import org.apache.wicket.markup.html.WebMarkupContainer;
    3841import org.apache.wicket.markup.html.basic.Label;
    … …  
    295298        }
    296299    }
     300
     301    @Override
     302    public void renderHead(IHeaderResponse response) {
     303        // include watermark JQuery extension sources
     304        response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getJQueryWatermarkJS()));
     305    }
     306
    297307}
Note: See TracChangeset for help on using the changeset viewer.