Add loading and clearing list when filtering list

zanata · Mar 26, 2014 · 2f76e6e · 2f76e6e
1 parent 1e2973e
commit 2f76e6e
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 10 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
@@ -347,11 +347,10 @@ public List<HLocale> suggest() {
                         public boolean apply(@Nullable HLocale input) {
                             return !getInstance().getActiveLocales().contains(
                                     input)
-                                    && (input.getLocaleId().getId()
-                                            .startsWith(getQuery()) || input
-                                            .retrieveDisplayName()
-                                            .toLowerCase()
-                                            .contains(getQuery().toLowerCase()));
+                                    && (StringUtils.startsWithIgnoreCase(input
+                                            .getLocaleId().getId(), getQuery()) || StringUtils.containsIgnoreCase(
+                                            input.retrieveDisplayName(),
+                                            getQuery()));
                         }
                     });
 

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
@@ -86,8 +86,9 @@
           <li
             class="progress-bar__expander">
             <a4j:commandLink
-              action="#{versionGroupHomeAction.setSelectedLocale(hLocale)}"
-              render="languages-project_list, language-label, #{rich:clientId('projectFilter-size')}"
+              action="#{versionGroupHomeAction.setSelectedLocale(hLocale)}" onbegin="clearList('#{rich:clientId('languages-project_list')}')"
+              status="languageTab-projectsLoader"
+              render="languages-project_list, language-label, languageTabVersionFilter-pager, languageTabVersionFilter-page-info, languageTabVersionFilterBottom-pager, languageTabVersionFilterBottom-page-info"
               onclick="updateUrl('/version-group/view/#{versionGroupHomeAction.slug}', '/languages/#{hLocale.localeId}')"
               styleClass="bx--block #{hLocale.localeId}">
               <div class="list__item">

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
@@ -89,6 +89,7 @@
             <a4j:commandLink limitRender="true"
               action="#{versionGroupHomeAction.setSelectedVersion(version)}"
               status="projectsTab-languagesLoader"
+              onbegin="clearList('#{rich:clientId('projects-language_list')}')"
               render="projects-language_list, project-label, projectTabLanguageFilter-pager, projectTabLanguageFilter-page-info, projectTabLanguageFilterBottom-pager, projectTabLanguageFilterBottom-page-info"
               onclick="updateUrl('/version-group/view/#{versionGroupHomeAction.slug}', '/projects/#{version.project.slug}/#{version.slug}')"
               styleClass="bx--block">

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
@@ -187,7 +187,7 @@
           </div>
           <a4j:commandLink limitRender="true"
             action="#{versionHomeAction.setSelectedDocument(document)}"
-            status="documentsTab-languagesLoader"
+            status="documentsTab-languagesLoader" onbegin="clearList('#{rich:clientId('documents-language_list')}')"
             render="documents-language_list, document-label, documents-language-size, documentsTabLanguageSearch-pager, documentsTabLanguageSearch-page-info, documentsTabLanguageSearchBottom-pager, documentsTabLanguageSearchBottom-page-info"
             onclick="updateActiveRow(this);toggleColumn('documents_content')">
             <div class="list__item__content">

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
@@ -117,7 +117,7 @@
           <li class="progress-bar__expander panels__panel__item">
             <a4j:commandLink limitRender="true"
               action="#{versionHomeAction.setSelectedLocale(hLocale)}"
-              status="languageTab-documentsLoader"
+              status="languageTab-documentsLoader" onbegin="clearList('#{rich:clientId('languages-document_list')}')"
               render="languages-document_list, language-label, languages-export_options, languageTabDocumentSearch-pager, languageTabDocumentSearch-page-info, languageTabDocumentSearchBottom-pager, languageTabDocumentSearchBottom-page-info"
               onclick="updateActiveRow(this);toggleColumn('languages_content')">
               <div class="list__item">

diff --git a/zanata-war/src/main/webapp/resources/script/components-script.js b/zanata-war/src/main/webapp/resources/script/components-script.js
@@ -125,6 +125,10 @@ function focusCurrentActiveInput() {
   });
 }
 
+function clearList(listId) {
+  jQuery('#' + listId).empty();
+}
+
 /* ----------------------------------------------------------- */
 /*----------------zanata-autocomplete component----------------*/
 /* ----------------------------------------------------------- */

diff --git a/zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml b/zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
@@ -3,6 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
   xmlns:composite="http://java.sun.com/jsf/composite"
   xmlns:s="http://jboss.org/schema/seam/taglib"
+  xmlns:rich="http://richfaces.org/rich"
   xmlns:a4j="http://richfaces.org/a4j">
 
 <composite:interface>
@@ -38,7 +39,8 @@
   <a4j:jsFunction name="#{cc.attrs.id}FilterList"
     action="#{cc.attrs.actionBean.resetPage}" status="#{cc.attrs.status}"
     render="#{cc.attrs.id}-pager, #{cc.attrs.id}-page-info, #{cc.attrs.render}"
-    limitRender="true" onbegin="">
+    limitRender="true"
+    onbegin="clearList('#{rich:clientId(cc.attrs.listId)}')">
     <a4j:param name="val" assignTo="#{cc.attrs.actionBean.query}"/>
   </a4j:jsFunction>