@ucd-lib/theme-elements 1.2.0 → 1.2.2

package/brand/ucd-theme-pagination/ucd-theme-pagination.js

@@ -115,26 +115,26 @@ export default class UcdThemePagination extends LitElement {
   }
 
   /**
-   * @method updated()
-   * @description Changes occur on update
+   * @method willUpdate()
+   * @description Changes before updated
    */
-  updated(props3) {
-    if( props3.has('currentPage') ) {
+  willUpdate(props) {
+    if( props.has('currentPage') || props.has('maxPages') ) {
       
-      if(this.xs_screen && this.screen_check) {
+      if( this.xs_screen && this.screen_check ) {
         let pages = [this.currentPage];
         this._pages = pages;  // Mobile Pagination
-      }else{
-        if(this.ellipses && this.maxPages >= 8){
+      } else {
+        if( this.ellipses && this.maxPages >= 8 ) {
           this._pages = this._renderEllipse();
-        }else if(this.ellipses && this.maxPages < 8){
+        } else if ( this.ellipses && this.maxPages < 8 ) {
           this._pages = this._renderOriginal();
-        }else {
+        } else {
           let startIndex = Math.floor(this.currentPage - (this.visibleLinkCount/2));
           
           if( startIndex < 0 ) {
             startIndex = 0;
-          } else if( (this.currentPage + (this.visibleLinkCount/2)) > this.maxPages ) {
+          } else if ( (this.currentPage + (this.visibleLinkCount/2)) > this.maxPages ) {
             startIndex -= Math.ceil(this.currentPage + (this.visibleLinkCount/2)) - this.maxPages - 1;
           }
           if( startIndex < 0 ) {
@@ -150,9 +150,7 @@ export default class UcdThemePagination extends LitElement {
           }
           this._pages = pages;
         } 
-
       } // Desktop Pagination
-
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucd-lib/theme-elements",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Custom elements for the UCD brand theme",
   "main": "index.js",
   "scripts": {

package/ucdlib/ucdlib-sils-search-redirect/ucdlib-sils-search-redirect.js

@@ -87,8 +87,27 @@ export default class UcdlibSilsSearchRedirect extends LitElement {
    */
   _onSubmit(e){
     e.preventDefault();
+    this.doSearch('simple-search');
+
+  }
+
+  /**
+   * @method _onAdvancedSearch
+   * @description Called when advanced search button is clicked
+   * @private
+   */
+  _onAdvancedSearch(){
+    this.doSearch('advanced-search');
+  }
+
+  /**
+   * @method doSearch
+   * @description Either redirects to Primo or fires event listener
+   * @param {*} searchType - advanced or basic
+   */
+  doSearch(searchType){
+    let advanced = searchType == "advanced-search";
     let corpus = this.ucdOnly ? "ucd" : "everything";
-    let advanced = e.submitter.id == "advanced-search";
 
     let url = this.primo.makeSearchUrl(this.query, corpus, advanced);
     if ( this.preventRedirect ) {

package/ucdlib/ucdlib-sils-search-redirect/ucdlib-sils-search-redirect.tpl.js

@@ -107,7 +107,7 @@ return html`
       <div class="checkbox u-space-mr--small u-space-mt--small">
         <input id="corpus" type="checkbox" ?checked=${this.ucdOnly} @input=${this._onCorpusChange}><label for="corpus">UC Davis libraries only</label>
       </div>
-      <button id="advanced-search" class="u-space-mt--small" type="submit">Advanced Search</button>
+      <button id="advanced-search" class="u-space-mt--small" type="button" @click=${this._onAdvancedSearch}>Advanced Search</button>
     </div>
 </form>