Top search properly implemented - can search text

The topbar search button was never correctly implemented. The
button would send the user to the glm list page (as is the default
behaviour when a category is selected) instead of the search result
page.

diff --git a/footer.php b/footer.php
index 860152f..465bba9 100644 (file)
--- a/footer.php
+++ b/footer.php
@@ -118,17 +118,5 @@
 !function(){function t(){var t=r("utm_content");if(t){var e=new Date;e.setDate(e.getDate()+30),document.cookie=t+";expires="+e.toGMTString()+";path=/"}else if(document.cookie)for(var o=document.cookie.split(/;*/),n=0;n<o.length;n++)if(0===o[n].toLowerCase().trim().indexOf("utm_content=")){t=o[n];break}return t}function e(t){try{console.log(t)}catch(e){alert(t)}}function r(t){var e=top.location.search?top.location.search.substring(1):null;if(e)for(var r=e.split("&"),o=0;o<r.length;o++)if(0===r[o].toLowerCase().trim().indexOf(t+"="))return r[o];return null}var o="",n=r("mctest");if(n)e("dnr tag version: 20160125"),o="http://localhost:8080/rip/library/dnr/mcDnrTag.debug.js";else{var a=t(),c="";a&&(c=top.location.search?0<=top.location.search.indexOf("utm_content")?top.location.search:top.location.search+"&"+a:"?"+a,o=" https://script.advertiserreports.com/redirector/dnr"+c)}if(o){var i=document.createElement("script");i.src=o,i.type="text/javascript",scriptTag=document.getElementsByTagName("script")[0],scriptTag.parentNode.appendChild(i)}}();
 </script>
 <!-- /End Call Tracking Code -->
-<script>
-    $(document).ready(function () {
-        categorySelect = $("#glm-member-list-filters-wrapper #categorySelect");
-        textSearch = $('#glm-member-list-filters-wrapper input[name="textSearch"]');
-        categorySelect.on('change', function() {
-            textSearch.val("");
-        });
-        textSearch.on('keydown', function() {
-            categorySelect.val($("#categorySelect option:first").val());
-        });
-    });
-</script>
   </body>
 </html>

diff --git a/js/app.js b/js/app.js
index bed4f1f..f5a9004 100644 (file)
--- a/js/app.js
+++ b/js/app.js
@@ -206,6 +206,18 @@ var g=a(f(this.selector(c),a("<div></div>").html(c.attr("title")).html())),h=thi
 $(document).foundation();
 $(document).ready(function () {
     'use strict';
+    
+    var page            = $("body");
+    var search_member   = page.find('#member-categories');
+    var search_input    = page.find(".site-search");
+    var main_search_btn = page.find('.topbar-search-button');
+    var dropdown_search = page.find('.dropdown-search');
+    var search_close    = page.find(".topbar-search-close");
+    var dropdown_button = page.find('.dropdown-search-button');
+
+    console.log(search_member);
+    console.log($(search_member));
+
     $('ul.children').each(function () {
         $(this).before('<a class="toggle" href="#"></a>');
     });
@@ -227,6 +239,42 @@ $(document).ready(function () {
         //console.log('menu-id = ' + menuNum);
     });
 
+    // search dropdown animations
+    $(main_search_btn).on("click", function (){
+        $(dropdown_search).slideDown();
+        $(search_close).animate({
+            opacity: 1
+        }, 500);
+    });
+    $(search_close).on("click", function (){
+        $(dropdown_search).slideUp();
+        $(this).animate({
+            opacity: 0
+        }, 500);
+    });
+
+    // Change search behaviour for member list
+    var categorySelect = page.find("#glm-member-list-filters-wrapper #categorySelect");
+    var textSearch = page.find('#glm-member-list-filters-wrapper input[name="textSearch"]');
+    categorySelect.on('change', function() {
+        textSearch.val("");
+    });
+    textSearch.on('keydown', function() {
+        categorySelect.val($("#categorySelect option:first").val());
+    });
+    
+    // disable member dropdown if text is in the search box
+     $(search_input).on("keyup change", function() {
+        var checker = $.trim($(this).val()).length === 0;
+        $(search_member).attr('disabled', !checker);
+         
+        if( $(search_member ).attr('disabled')){
+            dropdown_button.css("display", "none");
+        } else {
+            dropdown_button.css("display", "block");
+        }
+    });
+
     var bookNowButton = $(document).find(".book-now-button a");
     var bookNowDropdown = $(document).find(".book-now-dropdown");
 

diff --git a/js/custom/pageSetup.js b/js/custom/pageSetup.js
index d2cd8cc..ebe5da4 100644 (file)
--- a/js/custom/pageSetup.js
+++ b/js/custom/pageSetup.js
@@ -3,6 +3,18 @@
 $(document).foundation();
 $(document).ready(function () {
     'use strict';
+    
+    var page            = $("body");
+    var search_member   = page.find('#member-categories');
+    var search_input    = page.find(".site-search");
+    var main_search_btn = page.find('.topbar-search-button');
+    var dropdown_search = page.find('.dropdown-search');
+    var search_close    = page.find(".topbar-search-close");
+    var dropdown_button = page.find('.dropdown-search-button');
+
+    console.log(search_member);
+    console.log($(search_member));
+
     $('ul.children').each(function () {
         $(this).before('<a class="toggle" href="#"></a>');
     });
@@ -24,6 +36,42 @@ $(document).ready(function () {
         //console.log('menu-id = ' + menuNum);
     });
 
+    // search dropdown animations
+    $(main_search_btn).on("click", function (){
+        $(dropdown_search).slideDown();
+        $(search_close).animate({
+            opacity: 1
+        }, 500);
+    });
+    $(search_close).on("click", function (){
+        $(dropdown_search).slideUp();
+        $(this).animate({
+            opacity: 0
+        }, 500);
+    });
+
+    // Change search behaviour for member list
+    var categorySelect = page.find("#glm-member-list-filters-wrapper #categorySelect");
+    var textSearch = page.find('#glm-member-list-filters-wrapper input[name="textSearch"]');
+    categorySelect.on('change', function() {
+        textSearch.val("");
+    });
+    textSearch.on('keydown', function() {
+        categorySelect.val($("#categorySelect option:first").val());
+    });
+    
+    // disable member dropdown if text is in the search box
+     $(search_input).on("keyup change", function() {
+        var checker = $.trim($(this).val()).length === 0;
+        $(search_member).attr('disabled', !checker);
+         
+        if( $(search_member ).attr('disabled')){
+            dropdown_button.css("display", "none");
+        } else {
+            dropdown_button.css("display", "block");
+        }
+    });
+
     var bookNowButton = $(document).find(".book-now-button a");
     var bookNowDropdown = $(document).find(".book-now-dropdown");
 

diff --git a/parts/search-dropdown.php b/parts/search-dropdown.php
index 811c7ba..074b72a 100644 (file)
--- a/parts/search-dropdown.php
+++ b/parts/search-dropdown.php
@@ -28,34 +28,34 @@
 
 <script>
     // search dropdown animations
-    var page            = jQuery("body");
-    var search_input    = page.find(".site-search");
-    var main_search_btn = page.find('.topbar-search-button');
-    var dropdown_search = page.find('.dropdown-search');
-    var search_close    = page.find(".topbar-search-close");
-    var dropdown_button = page.find('.dropdown-search-button');
-    jQuery(main_search_btn).on("click", function (){
-        jQuery(dropdown_search).slideDown();
-        jQuery(search_close).animate({
-            opacity: 1
-        }, 500);
-    });
-    jQuery(search_close).on("click", function (){
-        jQuery(dropdown_search).slideUp();
-        jQuery(this).animate({
-            opacity: 0
-        }, 500);
-    });
+    // var page            = jQuery("body");
+    // var search_input    = page.find(".site-search");
+    // var main_search_btn = page.find('.topbar-search-button');
+    // var dropdown_search = page.find('.dropdown-search');
+    // var search_close    = page.find(".topbar-search-close");
+    // var dropdown_button = page.find('.dropdown-search-button');
+    // jQuery(main_search_btn).on("click", function (){
+    //     jQuery(dropdown_search).slideDown();
+    //     jQuery(search_close).animate({
+    //         opacity: 1
+    //     }, 500);
+    // });
+    // jQuery(search_close).on("click", function (){
+    //     jQuery(dropdown_search).slideUp();
+    //     jQuery(this).animate({
+    //         opacity: 0
+    //     }, 500);
+    // });
 
-    // disable member dropdown if text is in the search box
-    jQuery(search_input).on("keyup change", function() {
-        var checker = jQuery.trim(jQuery(this).val()).length === 0;
-        jQuery(search_member).attr('disabled', !checker);
+    // // disable member dropdown if text is in the search box
+    // jQuery(search_input).on("keyup change", function() {
+    //     var checker = jQuery.trim(jQuery(this).val()).length === 0;
+    //     jQuery(search_member).attr('disabled', !checker);
 
-        if( jQuery(search_member ).attr('disabled')){
-            dropdown_button.css("display", "none");
-        } else {
-            dropdown_button.css("display", "block");
-        }
-    });
+    //     if( jQuery(search_member ).attr('disabled')){
+    //         dropdown_button.css("display", "none");
+    //     } else {
+    //         dropdown_button.css("display", "block");
+    //     }
+    // });
 </script>