Changeset 6688

Timestamp:

10/20/15 12:28:17 (9 years ago)

Author:

Twan Goosen

Message:

Update highlighting in search results after collapse/expand

File:

• vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemPanel.java (modified) (5 diffs)

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

@@ -21 +21 @@
 import eu.clarin.cmdi.vlo.pojo.ExpansionState;
 import eu.clarin.cmdi.vlo.pojo.SearchContext;
+import eu.clarin.cmdi.vlo.wicket.HighlightSearchTermScriptFactory;
 import eu.clarin.cmdi.vlo.wicket.components.RecordPageLink;
 import eu.clarin.cmdi.vlo.wicket.components.SolrFieldLabel;
@@ -35 +36 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
+import org.apache.wicket.util.string.Strings;
 
 /**
@@ -44 +46 @@
     @SpringBean
     private VloConfig config;
-    
+
     private final Panel collapsedDetails;
     private final Panel expandedDetails;
     private final IModel<ExpansionState> expansionStateModel;
+    private final IModel<SearchContext> selectionModel;
 
     /**
@@ -61 +64 @@
         super(id, documentModel);
         this.expansionStateModel = expansionStateModel;
+        this.selectionModel = selectionModel;
 
         final Link recordLink = new RecordPageLink("recordLink", documentModel, selectionModel);
@@ -100 +104 @@
                     // parial update (just this search result item)
                     target.add(SearchResultItemPanel.this);
+
+                    // in case of a query, update highlight matching search terms after collapse/expand
+                    final String query = selectionModel.getObject().getSelection().getQuery();
+                    if (!Strings.isEmpty(query)) {
+                        final HighlightSearchTermScriptFactory scriptFactory = new HighlightSearchTermScriptFactory();
+                        final String selector = "#" + SearchResultItemPanel.this.getMarkupId();
+                        target.appendJavaScript(scriptFactory.createScript(selector, query));
+                    }
                 }
             }