Removed some spaces that that don't match the rest of the file, updated Handlebars templates with additional conditionals

Author: bjorn2404

dist/assets/js/plugins/storeLocator/jquery.storelocator.js

@@ -546,14 +546,14 @@
 			}
 
 			// Raw data
-			if( _this.settings.dataRaw !== null ) {
+			if(_this.settings.dataRaw !== null) {
 				// XML
 				if( dataTypeRead === 'xml' ) {
 					return $.parseXML(_this.settings.dataRaw);
 				}
 
 				// JSON
-				else if( dataTypeRead === 'json' ) {
+				else if(dataTypeRead === 'json') {
 					if (Array.isArray && Array.isArray(_this.settings.dataRaw)) {
 						return _this.settings.dataRaw;
 					}

dist/assets/js/plugins/storeLocator/templates/infowindow-description.html

@@ -1,11 +1,21 @@
 {{#location}}
 <div class="loc-name">{{name}}</div>
 <div>{{address}}</div>
-<div>{{address2}}</div>
+{{#if address2}}
+    <div>{{address2}}</div>
+{{/if}}
 <div>{{city}}{{#if city}},{{/if}} {{state}} {{postal}}</div>
-<div>{{hours1}}</div>
-<div>{{hours2}}</div>
-<div>{{hours3}}</div>
-<div>{{phone}}</div>
+{{#if hours1}}
+    <div>{{hours1}}</div>
+{{/if}}
+{{#if hours2}}
+    <div>{{hours2}}</div>
+{{/if}}
+{{#if hours3}}
+    <div>{{hours3}}</div>
+{{/if}}
+{{#if phone}}
+    <div>{{phone}}</div>
+{{/if}}
 <div><a href="{{web}}" target="_blank">{{niceURL web}}</a></div>
-{{/location}}
+{{/location}}

dist/assets/js/plugins/storeLocator/templates/kml-infowindow-description.html

@@ -1,4 +1,6 @@
 {{#location}}
 <div class="loc-name">{{name}}</div>
-<div>{{{description}}}</div>
-{{/location}}
+{{#if description}}
+    <div>{{{description}}}</div>
+{{/if}}
+{{/location}}

dist/assets/js/plugins/storeLocator/templates/kml-location-list-description.html

@@ -4,8 +4,10 @@
 	<div class="list-details">
 		<div class="list-content">
 			<div class="loc-name">{{name}}</div>
-			<div>{{{description}}}</div>
+			{{#if description}}
+				<div>{{{description}}}</div>
+			{{/if}}
 		</div>
 	</div>
 </li>
-{{/location}}
+{{/location}}

dist/assets/js/plugins/storeLocator/templates/location-list-description.html

@@ -5,10 +5,16 @@
 		<div class="list-content">
 			<div class="loc-name">{{name}}</div>
 			<div class="loc-addr">{{address}}</div>
-			<div class="loc-addr2">{{address2}}</div>
+			{{#if address2}}
+				<div class="loc-addr2">{{address2}}</div>
+			{{/if}}
 			<div class="loc-addr3">{{city}}{{#if city}},{{/if}} {{state}} {{postal}}</div>
-			<div class="loc-phone">{{phone}}</div>
-			<div class="loc-web"><a href="{{web}}" target="_blank">{{niceURL web}}</a></div>
+			{{#if phone}}
+				<div class="loc-phone">{{phone}}</div>
+			{{/if}}
+			{{#if web}}
+				<div class="loc-web"><a href="{{web}}" target="_blank">{{niceURL web}}</a></div>
+			{{/if}}
 			{{#if distance}}
 				<div class="loc-dist loc-default-dist">{{distance}} {{length}}</div>
 				{{#if altdistance}}<div class="loc-dist loc-alt-dist">{{altdistance}} {{altlength}}</div>{{/if}}

src/js/jquery.storelocator.js

@@ -530,7 +530,7 @@
 				formattedAddress = '';
 
 			// Define extra geocode result info
-			if ( typeof geocodeData !== 'undefined' && typeof geocodeData.geometry.bounds !== 'undefined') {
+			if (typeof geocodeData !== 'undefined' && typeof geocodeData.geometry.bounds !== 'undefined') {
 				formattedAddress = geocodeData.formatted_address;
 				northEast = JSON.stringify( geocodeData.geometry.bounds.getNorthEast() );
 				southWest = JSON.stringify( geocodeData.geometry.bounds.getSouthWest() );
@@ -542,14 +542,14 @@
 			}
 
 			// Raw data
-			if( _this.settings.dataRaw !== null ) {
+			if(_this.settings.dataRaw !== null) {
 				// XML
 				if( dataTypeRead === 'xml' ) {
 					return $.parseXML(_this.settings.dataRaw);
 				}
 
 				// JSON
-				else if( dataTypeRead === 'json' ) {
+				else if(dataTypeRead === 'json') {
 					if (Array.isArray && Array.isArray(_this.settings.dataRaw)) {
 						return _this.settings.dataRaw;
 					}