Changeset 6690 for vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermBehavior.java

Timestamp:

10/20/15 13:18:13 (9 years ago)

Author:

Twan Goosen

Message:

merged updates from 3.3 branch to trunk

Location:

vlo/trunk

Files:

• . (modified) (1 prop)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermBehavior.java (modified) (3 diffs)

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

@@ -23 +23 @@
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.request.Request;
+import org.apache.wicket.util.string.StringValue;
+import org.apache.wicket.util.string.Strings;
 
 /**
@@ -33 +36 @@
 public class HighlightSearchTermBehavior extends Behavior {
 
-    private static final String HIGHLIGHT_FUNCTION = "searchhi.init()";
+    private final HighlightSearchTermScriptFactory scriptFactory = new HighlightSearchTermScriptFactory();
 
     @Override
@@ -39 +42 @@
         // include highlight script
         response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getHighlightJS()));
-        // after load, highlight 
-        response.render(OnDomReadyHeaderItem.forScript(HIGHLIGHT_FUNCTION));
+
+        final String words = getWordList(component);
+        if (!Strings.isEmpty(words)) {
+            String selector = getComponentSelector(component.getMarkupId());
+            // after load, highlight 
+            response.render(OnDomReadyHeaderItem.forScript(scriptFactory.createScript(selector, words)));
+        }
+    }
+
+    protected String getComponentSelector(String componentId) {
+        return "#" + componentId;
+    }
+
+    protected String getWordList(Component component) {
+        Request request = component.getPage().getRequestCycle().getRequest();
+        return request.getQueryParameters().getParameterValue(getQueryParam()).toString();
+    }
+
+    protected String getQueryParam() {
+        return "q";
     }