Changeset 5161

Timestamp:

05/08/14 13:01:53 (10 years ago)

Author:

Twan Goosen

Message:

Bundling of highlight javascript

Location:

vlo/trunk/vlo-web-app/src/main

Files:

• java/eu/clarin/cmdi/vlo/JavaScriptResources.java (modified) (3 diffs)
• java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermBehavior.java (modified) (4 diffs)
• js/eu/clarin/cmdi/vlo/wicket/pages/searchhi.js (moved) (moved from vlo/trunk/vlo-web-app/src/main/resources/eu/clarin/cmdi/vlo/wicket/pages/searchhi.js)

vlo/trunk/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/trunk/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));