Changeset 6665

Timestamp:

10/12/15 15:41:30 (9 years ago)

Author:

Twan Goosen

Message:

Search button disabled and animated until search result returned. Fixes #800

Location:

vlo/branches/vlo-3.3/vlo-web-app/src/main

Files:

• java/eu/clarin/cmdi/vlo/JavaScriptResources.java (modified) (2 diffs)
• java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchFormPanel.java (modified) (5 diffs)
• js/eu/clarin/cmdi/vlo/wicket/pages/vlo-searchform.js (added)
• less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-search.less (modified) (1 diff)

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

@@ -32 +32 @@
     private final static JavaScriptResourceReference VLO_SYNTAX_HELP = new JavaScriptResourceReference(VloBasePage.class, "vlo-syntax-help.js");
     private final static JavaScriptResourceReference VLO_FACETS = new JavaScriptResourceReference(VloBasePage.class, "vlo-facets.js");
+    private final static JavaScriptResourceReference SEARCH_FORM = new JavaScriptResourceReference(VloBasePage.class, "vlo-searchform.js");
     private final static JavaScriptResourceReference JQUERY_UI = new JavaScriptResourceReference(VloBasePage.class, "jquery-ui-1.11.4.custom/jquery-ui.min.js");
     private final static CssResourceReference JQUERY_UI_CSS = new CssResourceReference(VloBasePage.class, "jquery-ui-1.11.4.custom/jquery-ui.min.css");
@@ -66 +67 @@
         return VLO_SYNTAX_HELP;
     }
+    
+    public static JavaScriptResourceReference getSearchFormJS() {
+        return SEARCH_FORM;
+    }
+    
+    
 
 }

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

@@ -20 +20 @@
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.solr.AutoCompleteService;
-import eu.clarin.cmdi.vlo.wicket.components.IndicatingAjaxFallbackButton;
 import java.util.Iterator;
+import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.IAjaxIndicatorAware;
+import org.apache.wicket.ajax.attributes.AjaxCallListener;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.apache.wicket.ajax.markup.html.form.AjaxFallbackButton;
-import org.apache.wicket.extensions.ajax.markup.html.AjaxIndicatorAppender;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
 import org.apache.wicket.extensions.ajax.markup.html.autocomplete.AutoCompleteTextField;
 import org.apache.wicket.markup.head.CssHeaderItem;
@@ -63 +62 @@
 
         // Button allows partial updates but can fall back to a full (non-JS) refresh
-        form.add(new IndicatingAjaxFallbackButton("searchSubmit", form) {
+        form.add(new AjaxFallbackButton("searchSubmit", form) {
 
             @Override
@@ -69 +68 @@
                 SearchFormPanel.this.onSubmit(target);
             }
+
+            @Override
+            protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+                super.updateAjaxAttributes(attributes);
+
+                // listener to start/stop indicating progress
+                AjaxCallListener listener = new AjaxCallListener() {
+
+                    @Override
+                    public CharSequence getBeforeHandler(Component component) {
+                        return ("startSearch();");
+                    }
+
+                    @Override
+                    public CharSequence getCompleteHandler(Component component) {
+                        return ("endSearch();");
+                    }
+
+                };
+                attributes.getAjaxCallListeners().add(listener);
+            }
+
         }
         );
@@ -74 +95 @@
         add(form);
     }
-//
-//    /**
-//     * @see
-//     * org.apache.wicket.ajax.IAjaxIndicatorAware#getAjaxIndicatorMarkupId()
-//     */
-//    @Override
-//    public String getAjaxIndicatorMarkupId() {
-//        return indicatorAppender.getMarkupId();
-//    }
-
+   
     protected abstract void onSubmit(AjaxRequestTarget target);
 
@@ -92 +104 @@
         response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getJQueryUIJS()));
         response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getSyntaxHelpJS()));
+        response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getSearchFormJS()));
     }
 }

vlo/branches/vlo-3.3/vlo-web-app/src/main/less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-search.less

@@ -68 +68 @@
     text-align: center;
 }
-
-/*#searchcontrols .wicket-ajax-indicator {
-    float: right;
-}*/
 
 .resultpagination {