Merge branch 'develop'

bradcornford · Sep 12, 2016 · f143cd2 · f143cd2
2 parents eb8b0f0 + 62edaae
commit f143cd2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -207,7 +207,7 @@ This event is fired when the user stops dragging the marker.
 The `informationWindow` method allows an information window to be added to to a map, with latitude, longitude, content, and optional parameters for options.
 
 	Mapper::informationWindow(53.381128999999990000, -1.470085000000040000, 'Content');
-	Mapper::informationWindow(53.381128999999990000, -1.470085000000040000, 'Content', ['open' => true, 'markers' => ['title' => 'Title']]);
+	Mapper::informationWindow(53.381128999999990000, -1.470085000000040000, 'Content', ['open' => true, 'maxWidth'=> 300, markers' => ['title' => 'Title']]);
 	Mapper::map(52.381128999999990000, 0.470085000000040000)->informationWindow(53.381128999999990000, -1.470085000000040000, 'Content', ['markers' => ['animation' => 'DROP']]);
 
 ### Polyline

diff --git a/src/views/marker.blade.php b/src/views/marker.blade.php
@@ -65,6 +65,12 @@
 			content: {!! json_encode($options['content']) !!}
 		});
 
+		@if (isset($options['maxWidth']))
+
+			infowindow_{!! $id !!}.setOptions({ maxWidth: {!! $options['maxWidth'] !!} });
+
+		@endif
+
 		@if (isset($options['open']) && $options['open'])
 
 			infowindow_{!! $id !!}.open({!! $options['map'] !!}, marker_{!! $id !!});