Merge branch '1.17.3-rc'

Author: TheNewCoke

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wolfnet-idx-for-wordpress",
-  "version": "1.17.2",
+  "version": "1.17.3",
   "description": "WolfNet IDX for WordPress",
   "homepage": "https://github.com/wolfnet/wordpressplugin",
   "bugs": "https://github.com/wolfnet/wordpressplugin/issues",

public/css/wolfnet.less

@@ -370,40 +370,56 @@
 
     }
 
-	&.wolfnet_smartSearch
-	{
+	&.wolfnet_smartSearch {
+
 		&.wnt-smartsearch {
 			.wnt-smartsearch-input-container {
 				width: 100%;
 			}
 		}
 
-        .wolfnet-suggestion-label
-        {
-            font-weight: bold;
-            font-size: 1.1em;
-            padding-left: 10px;
-            display: inline-block;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
+		.wolfnet_smartSearch_form.wnt-smartsearch-narrow {
 
-        .wolfnet-suggestion-field
-        {
-            float: right;
-            padding-right: 10px;
-            font-size: 0.9em;
-        }
+			// Put min/max price, bed/bath, and submit button on own lines
+			.wolfnet_smartPriceFields,
+			.wolfnet_smartBedBathFields,
+			.wolfnet_smartSubmit {
+				width: 100%;
+				clear: both;
+			}
+
+			// Adjust widths of formfield pairs
+			.wolfnet_smartMinPrice,
+			.wolfnet_smartMaxPrice,
+			.wolfnet_smartBeds,
+			.wolfnet_smartBaths {
+				width: 50%;
+			}
+
+		}
+
+		.wolfnet-suggestion-label {
+			font-weight: bold;
+			font-size: 1.1em;
+			padding-left: 10px;
+			display: inline-block;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+		}
+
+		.wolfnet-suggestion-field {
+			float: right;
+			padding-right: 10px;
+			font-size: 0.9em;
+		}
 
-		.wnt-smart-menu
-		{
+		.wnt-smart-menu {
 			display: inline-block;
 			position:absolute;
 		}
 
-		span.wnt-smart-search
-		{
+		span.wnt-smart-search {
 			padding: 1em 1em 1em 1em;
 			cursor: text;
 			overflow: hidden;
@@ -414,28 +430,25 @@
 			display: inline-block;
 			text-align: left;
 
-			.wnt-ss-value
-			{
+			.wnt-ss-value {
 				background-color: @quickSearchGrad2;
 				border: 1px solid black;
 				font-size: 1.1em;
 				margin-right:.5em;
 				padding: 0 5px 0 5px;
 
-				.wnt-close-btn
-				{
+				.wnt-close-btn {
 					padding-left: 5px;
 					cursor: pointer;
 					font-weight: bold;
 				}
 			}
 
-			> span
-			{
+			> span {
 				vertical-align: top;
 
 				input {
-                    background-color: white;
+					background-color: white;
 					height: 100%;
 					border: 0 !important;
 					padding: 0 !important;
@@ -447,25 +460,21 @@
 
 		}
 
-		.wnt-suggestions
-		{
+		.wnt-suggestions {
 			border-top: 1px solid @quickSearchGrad2;
 			border-bottom: 1px solid @quickSearchGrad2;
 			border-left: 1px solid @quickSearchGrad2;
 			border-right: 1px solid @quickSearchGrad2;
 
-			> div
-			{
+			> div {
 				clear: both;
 
-				&.wnt-hover
-				{
+				&.wnt-hover {
 					color: @quickSearchGrad2;
 					background-color: gray;
 				}
 
-				&.wnt-suggestion
-				{
+				&.wnt-suggestion {
 					cursor: pointer;
 				}
 

public/js/jquery.wolfnetScrollingItems.src.js

@@ -178,24 +178,17 @@ if (typeof jQuery != 'undefined') {
          *
          * @return null
          */
-        var cloneItems = function(target)
-        {
-            var $target = $(target);
-            var data = getData(target);
-            var containerWidth = data.$itemContainer.innerWidth();
-            var $items = getItems(target);
+		var cloneItems = function (target) {
+			var $target  = $(target);
+			var data     = getData(target);
+			var $items   = getItems(target);
 
-            if (
-				(containerWidth) &&
-				($items.length) &&
-				(data.itemWidth) &&
-				containerWidth >= (($items.length * data.itemWidth) / 2)
-			) {
-               	$items.clone().appendTo(data.$itemContainer);
-               	cloneItems(target, containerWidth);
-            }
+			if (!hasEnoughItems(target)) {
+				var $newItems = $items.clone().appendTo(data.$itemContainer);
+				cloneItems(target);
+			}
 
-        };
+		};
 
 
         /**
@@ -206,29 +199,24 @@ if (typeof jQuery != 'undefined') {
          *
          * @return null
          */
-        var hasEnoughItems = function(target)
-        {
-            var $target = $(target);
-            var data = getData(target);
-
-            var numberOfItems = getItems(target).length;
-            var itemWidth = data.itemWidth;
-            var containerWidth = data.$itemContainer.innerWidth();
-
-            // Do not scroll if width of all items in scroller is less than container
-            if ((numberOfItems) && (itemWidth) && (containerWidth) &&
-				(numberOfItems * itemWidth) < containerWidth) {
-				return false;
-            }
+		var hasEnoughItems = function (target) {
+			var $target  = $(target);
+			var data     = getData(target);
 
-            // Do not scroll a single item
-            if ((numberOfItems) && numberOfItems == 1) {
-				return false;
-            }
+			var numberOfItems   = getItems(target).length;
+			var itemWidth       = data.itemWidth;
 
-            return true;
+			// Do not scroll if width of all items in scroller is less than container
+			// Do not scroll a single item
+			return (
+				(
+					(itemWidth <= 0) ||
+					(numberOfItems === 0) || (numberOfItems > 50) ||
+					(data.containerWidth < ((numberOfItems * itemWidth) / 2))
+				) && (numberOfItems !== 1)
+			);
 
-        };
+		};
 
 
         /**
@@ -389,6 +377,24 @@ if (typeof jQuery != 'undefined') {
         };
 
 
+		var resizeTimeout = 0;
+
+		var onResize = function (target) {
+			if (resizeTimeout) clearTimeout(resizeTimeout);
+			resizeTimeout = setTimeout(function () { measureContainer(target); }, 50);
+		};
+
+
+		var measureContainer = function (target) {
+			var data = getData(target);
+			var $items = getItems(target);
+			$items.hide();
+			data.containerWidth = Math.max(data.$itemContainer.innerWidth(), data.itemWidth);
+			$items.show();
+			data.$itemContainer.css('max-width', data.containerWidth + 'px');
+		};
+
+
         var methods = {
 
             /**
@@ -419,6 +425,8 @@ if (typeof jQuery != 'undefined') {
                     removeWhitespaceBetweenTags(target);
                     data.itemWidth = getItems(target).first().outerWidth(true);
 
+					measureContainer(target);
+
                     if (data.option.showControls) {
                         buildControls(target);
                     }
@@ -445,11 +453,8 @@ if (typeof jQuery != 'undefined') {
 
 					var enoughItems = hasEnoughItems(target);
 
-					$(window).resize(function(){
-						if ((data.resizing || false) === false) {
-							data.resizing = true;
-							data.resizing = false;
-						}
+					$(window).resize(function () {
+						onResize(target);
 					});
 
                 });

public/js/jquery.wolfnetSmartsearch.src.js

@@ -21,6 +21,19 @@
 		submitted: false
 	};
 
+
+	var onResizeForm = function () {
+		var $form = this.closest('form');
+
+		if (!isNaN($form.width()) && ($form.width() > 0) && ($form.width() <= 500)) {
+			$form.addClass('wnt-smartsearch-narrow');
+		} else {
+			$form.removeClass('wnt-smartsearch-narrow');
+		}
+
+	};
+
+
 	var methods =
 	{
 
@@ -370,10 +383,8 @@
 			var $suggestions = pluginData.suggestionContainer;
 			var $form = $($smartSearch[0].form);
 
-			if ($form.width() <= 500) {
-				// Apply narrow CSS based on container size
-				methods.applyNarrowCSS($form);
-			}
+			$(window).on('resize', function () { onResizeForm.call($smartSearch); });
+			onResizeForm.call($smartSearch);
 
 			$smartSearch.on('wntFocus', function(event){
 				$searchInput.focus();
@@ -1142,30 +1153,6 @@
 				methods.refreshExistingValues($smartSearch, event);
 			}
 
-		},
-
-		applyNarrowCSS: function($form) {
-
-			// Put min/max price, bed/bath, and submit button on own lines
-			$form.find('.wolfnet_smartPriceFields').css({
-				width: "100%",
-				clear: "both"
-			});
-			$form.find('.wolfnet_smartBedBathFields').css({
-				width: "100%",
-				clear: "both"
-			});
-			$form.find('.wolfnet_smartSubmit').css({
-				width: "100%",
-				clear: "both"
-			});
-
-			// Adjust widths of formfield pairs
-			$form.find('.wolfnet_smartMinPrice').css({'width':'50%'});
-			$form.find('.wolfnet_smartMaxPrice').css({'width':'50%'});
-			$form.find('.wolfnet_smartBeds').css({'width':'50%'});
-			$form.find('.wolfnet_smartBaths').css({'width':'50%'});
-
 		}
 
 	};

readme.md

@@ -93,6 +93,11 @@ Please upgrade to the latest version of the plugin as we will be disabling our o
 
 ## Changelog
 
+### 1.17.3
+
+* Fix to prevent the featured listings scroller from crashing when used in a floating element
+* SmartSearch layout fix for use in sliders
+
 ### 1.17.2
 
 * Fix to prevent zip codes from losing their leading zero(s) when applicable
@@ -101,7 +106,7 @@ Please upgrade to the latest version of the plugin as we will be disabling our o
 ### 1.17.1
 
 * Fix for sites that use Google Maps outside of this plugin
-* Fix for Javascript error in new Smart Search functionality
+* Fix for JavaScript error in new Smart Search functionality
 
 ### 1.17.0