Changeset 5163

Timestamp:

05/08/14 13:06:32 (10 years ago)

Author:

Twan Goosen

Message:

merged some updates with respect to javascript bundling from trunk to 3.0

Location:

vlo/branches/vlo-3.0

Files:

• . (modified) (1 prop)
• vlo-web-app (modified) (1 prop)
• vlo-web-app/pom.xml (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/JavaScriptResources.java (copied) (copied from vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/JavaScriptResources.java) (3 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java (modified) (2 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermBehavior.java (modified) (4 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/SimpleSearchPage.java (modified) (3 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/VloBasePage.html (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/VloBasePage.java (modified) (4 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetValuesPanel.java (modified) (3 diffs)
• vlo-web-app/src/main/js (copied) (copied from vlo/trunk/vlo-web-app/src/main/js)
• vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/searchhi.js (copied) (copied from vlo/trunk/vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/searchhi.js)
• vlo-web-app/src/main/resources/eu/clarin/cmdi/vlo/wicket/pages/searchhi.js (deleted)
• vlo-web-app/src/main/webapp/js (deleted)

vlo/branches/vlo-3.0/vlo-web-app/pom.xml

@@ -182 +182 @@
                 <filtering>true</filtering>
                 <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <filtering>false</filtering>
+                <directory>src/main/js</directory>
             </resource>
             <resource>

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/JavaScriptResources.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo;
 
+import eu.clarin.cmdi.vlo.wicket.pages.RecordPage;
 import eu.clarin.cmdi.vlo.wicket.pages.VloBasePage;
 import org.apache.wicket.request.resource.JavaScriptResourceReference;
@@ -29 +30 @@
     private final static JavaScriptResourceReference VLO_HEADER = new JavaScriptResourceReference(VloBasePage.class, "vlo-header.js");
     private final static JavaScriptResourceReference JQUERY_WATERMARK = new JavaScriptResourceReference(VloBasePage.class, "jquery.watermark-3.1.4/jquery.watermark.min.js");
+    private final static JavaScriptResourceReference HIGHLIGHT = new JavaScriptResourceReference(RecordPage.class, "searchhi.js");
 
     public static JavaScriptResourceReference getVloFrontJS() {
@@ -41 +43 @@
         return JQUERY_WATERMARK;
     }
+    
+    public static JavaScriptResourceReference getHighlightJS() {
+        return HIGHLIGHT;
+    }
 
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java

@@ -9 +9 @@
 import eu.clarin.cmdi.vlo.wicket.pages.RecordPage;
 import eu.clarin.cmdi.vlo.wicket.pages.SimpleSearchPage;
+import eu.clarin.cmdi.vlo.wicket.pages.VloBasePage;
 import org.apache.wicket.Application;
 import org.apache.wicket.markup.html.WebPage;
@@ -76 +77 @@
         // register the resource of application properties (version information filtered at build time)
         getResourceSettings().getStringResourceLoaders().add(new BundleStringResourceLoader("application"));
+        // register JavaScript bundle (combines  JavaScript source in a single resource to decrease number of client requests)
+        getResourceBundles().addJavaScriptBundle(VloBasePage.class, "vlo-js",
+                JavaScriptResources.getVloFrontJS(),
+                JavaScriptResources.getVloHeaderJS(),
+                JavaScriptResources.getJQueryWatermarkJS()
+        );
     }
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermBehavior.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket;
 
-import eu.clarin.cmdi.vlo.wicket.pages.RecordPage;
+import eu.clarin.cmdi.vlo.JavaScriptResources;
 import org.apache.wicket.Component;
 import org.apache.wicket.behavior.Behavior;
@@ -23 +23 @@
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.request.resource.PackageResourceReference;
 
 /**
@@ -34 +33 @@
 public class HighlightSearchTermBehavior extends Behavior {
 
-    private static final PackageResourceReference HIGHLIGHT_SCRIPT_REFERENCE = new PackageResourceReference(RecordPage.class, "searchhi.js");
     private static final String HIGHLIGHT_FUNCTION = "searchhi.init()";
 
@@ -40 +38 @@
     public void renderHead(Component component, IHeaderResponse response) {
         // include highlight script
-        response.render(JavaScriptHeaderItem.forReference(HIGHLIGHT_SCRIPT_REFERENCE));
+        response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getHighlightJS()));
         // after load, highlight 
         response.render(OnDomReadyHeaderItem.forScript(HIGHLIGHT_FUNCTION));

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/SimpleSearchPage.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.pages;
 
+import eu.clarin.cmdi.vlo.JavaScriptResources;
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
@@ -26 +27 @@
 import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -94 +97 @@
         add(browse);
     }
+
+    @Override
+    public void renderHead(IHeaderResponse response) {
+        super.renderHead(response);
+        response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getVloFrontJS()));
+    }
 }

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

@@ -33 +33 @@
 
     <body>
-        <!-- TODO: Include in header per page? -->
-        <script src="js/jquery.watermark-3.1.4/jquery.watermark.min.js" type="text/javascript"></script>
-        <script src="js/vlo-header.js" type="text/javascript"></script>
-        <script src="js/vlo-front.js" type="text/javascript"></script>
-        <script src="js/vlo-facets.js" type="text/javascript"></script>
-        <script src="js/vlo-record.js" type="text/javascript"></script>
-        <script src="js/vlo-search.js" type="text/javascript"></script>
-
         <div id="main">
             <div id="header">

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/VloBasePage.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.pages;
 
+import eu.clarin.cmdi.vlo.JavaScriptResources;
 import eu.clarin.cmdi.vlo.VloWebAppParameters;
 import eu.clarin.cmdi.vlo.config.VloConfig;
@@ -23 +24 @@
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.html.GenericWebPage;
 import org.apache.wicket.markup.html.basic.Label;
@@ -31 +33 @@
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.wicket.util.string.StringValue;
@@ -123 +126 @@
     @Override
     public void renderHead(IHeaderResponse response) {
-        // Include CSS. Exact file will be chosen on basis of current locale and
-        // style (theme).
+        // Include CSS. Exact file will be chosen on basis of current locale and style (theme)
         response.render(CssHeaderItem.forReference(new CssResourceReference(VloBasePage.class, "vlo.css", getLocale(), getStyle(), getVariation())));
+        // Include JavaScript for header (e.g. permalink animation)
+        response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getVloHeaderJS()));
     }
 

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

@@ -18 +18 @@
 
 import com.google.common.collect.ImmutableSet;
+import eu.clarin.cmdi.vlo.JavaScriptResources;
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import eu.clarin.cmdi.vlo.pojo.FieldValuesFilter;
@@ -35 +36 @@
 import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxFallbackLink;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -295 +298 @@
         }
     }
+
+    @Override
+    public void renderHead(IHeaderResponse response) {
+        // include watermark JQuery extension sources
+        response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getJQueryWatermarkJS()));
+    }
+
 }