Completed
Pull Request — master (#112)
by Nic
03:20
created
tests/LocationTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
     {
7 7
         $location = $this->objFromFixture('Location', 'dynamic');
8 8
 
9
-        $coords = ((int)$location->Lat != 0 && (int)$location->Lng != 0) ? 'true' : 'false';
9
+        $coords = ((int) $location->Lat != 0 && (int) $location->Lng != 0) ? 'true' : 'false';
10 10
 
11 11
         $this->assertEquals($coords, $location->getCoords());
12 12
     }
Please login to merge, or discard this patch.
code/extensions/DistanceDataExtension.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
     /**
6 6
      * @param SQLQuery $query
7 7
      */
8
-    public function augmentSQL(SQLQuery &$query)
8
+    public function augmentSQL(SQLQuery & $query)
9 9
     {
10 10
         if (Controller::curr()->getRequest()->getVar('Address')) { // on frontend
11 11
             $coords = GoogleGeocoding::address_to_point(Controller::curr()->getRequest()->getVar('Address'));
Please login to merge, or discard this patch.
code/pages/Locator.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 
215 215
             Requirements::css('locator/css/map.css');
216 216
             Requirements::javascript('framework/thirdparty/jquery/jquery.js');
217
-            Requirements::javascript('https://maps.google.com/maps/api/js?key=' . $key);
217
+            Requirements::javascript('https://maps.google.com/maps/api/js?key='.$key);
218 218
             Requirements::javascript('locator/thirdparty/handlebars/handlebars-v1.3.0.js');
219 219
             Requirements::javascript('locator/thirdparty/jquery-store-locator/js/jquery.storelocator.js');
220 220
 
@@ -250,27 +250,27 @@  discard block
 block discarded – undo
250 250
             unset($vars['action_doFilterLocations']);
251 251
             $url = '';
252 252
             if (count($vars)) {
253
-                $url .= '?' . http_build_query($vars);
253
+                $url .= '?'.http_build_query($vars);
254 254
             }
255
-            $link = $this->Link() . 'xml.xml' . $url;
255
+            $link = $this->Link().'xml.xml'.$url;
256 256
 
257 257
             // init map
258 258
             Requirements::customScript("
259 259
                 $(function(){
260 260
                     $('#map-container').storeLocator({
261
-                        " . $load . "
262
-                        dataLocation: '" . $link . "',
263
-                        listTemplatePath: '" . $listTemplatePath . "',
264
-                        infowindowTemplatePath: '" . $infowindowTemplatePath . "',
261
+                        " . $load."
262
+                        dataLocation: '" . $link."',
263
+                        listTemplatePath: '" . $listTemplatePath."',
264
+                        infowindowTemplatePath: '" . $infowindowTemplatePath."',
265 265
                         originMarker: true,
266
-                        " . $modal . ',
267
-                        ' . $featured . ",
266
+                        " . $modal.',
267
+                        ' . $featured.",
268 268
                         slideMap: false,
269 269
                         zoomLevel: 0,
270 270
                         noForm: true,
271 271
                         distanceAlert: -1,
272
-                        " . $kilometer . ',
273
-                        ' . $defaultCoords . '
272
+                        " . $kilometer.',
273
+                        ' . $defaultCoords.'
274 274
                     });
275 275
                 });
276 276
             ');
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
         $locations = Locator::get_locations($filter, $filterAny, $exclude, $callback);
359 359
         $locations = DataToArrayListHelper::to_array_list($locations);
360 360
 
361
-        $this->extend('alterListType', $locations);//allow for setting as grouped list
361
+        $this->extend('alterListType', $locations); //allow for setting as grouped list
362 362
 
363 363
         $this->locations = $locations;
364 364
         return $this;
Please login to merge, or discard this patch.