Add Click

ReFlar · Sep 25, 2018 · 147b091 · 147b091
1 parent 092bd43
commit 147b091
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^0.1.0-beta.7"
+        "flarum/core": "0.1.0-beta.7"
     },
     "autoload": {
         "psr-4": {

diff --git a/js/forum/dist/extension.js b/js/forum/dist/extension.js
@@ -398,7 +398,7 @@ System.register('reflar/geotags/components/GeotagModal', ['flarum/components/Mod
                     value: function onready() {
                         var _this2 = this;
 
-                        if (this.geotags.length > 1) {
+                        if (m.route().includes('/t/') || this.geotags.length > 1) {
                             $('#modal').on('shown.bs.modal', function () {
                                 _this2.loadMap();
                             });
@@ -448,7 +448,13 @@ System.register('reflar/geotags/components/GeotagModal', ['flarum/components/Mod
                             var latLong = new OpenLayers.LonLat(geotag.lng(), geotag.lat()).transform(new OpenLayers.Projection("EPSG:4326"), // transform from WGS 1984
                             map.getProjectionObject() // to Spherical Mercator Projection
                             );
-                            markers.addMarker(new OpenLayers.Marker(latLong, new OpenLayers.Icon(markerUrl, iconSize, new OpenLayers.Pixel(-(iconSize.w / 2), -iconSize.h))));
+                            var marker = new OpenLayers.Marker(latLong, new OpenLayers.Icon(markerUrl, iconSize, new OpenLayers.Pixel(-(iconSize.w / 2), -iconSize.h)));
+
+                            marker.events.register('click', marker, function () {
+                                m.route(app.route.discussion(app.store.getById('discussions', geotag.discussionId())));
+                            });
+
+                            markers.addMarker(marker);
                         });
                         map.zoomToExtent(markers.getDataExtent());
                         this.geotags = null;
@@ -678,6 +684,7 @@ System.register('reflar/geotags/models/Geotag', ['flarum/Model', 'flarum/utils/m
                 lat: Model.attribute('lat'),
                 lng: Model.attribute('lng'),
                 tagSlug: Model.attribute('tag_slug'),
+                discussionId: Model.attribute('discussion_id'),
                 markerColor: Model.attribute('marker_color')
             }));
 

diff --git a/js/forum/src/components/GeotagModal.js b/js/forum/src/components/GeotagModal.js
@@ -14,7 +14,7 @@ export default class GeotagModal extends Modal {
     }
 
     onready() {
-        if (this.geotags.length > 1) {
+        if (m.route().includes('/t/') || this.geotags.length > 1) {
             $('#modal').on('shown.bs.modal', () => {
                 this.loadMap()
             })
@@ -66,7 +66,13 @@ export default class GeotagModal extends Modal {
                 new OpenLayers.Projection("EPSG:4326"), // transform from WGS 1984
                 map.getProjectionObject() // to Spherical Mercator Projection
             );
-            markers.addMarker(new OpenLayers.Marker(latLong, new OpenLayers.Icon(markerUrl, iconSize, new OpenLayers.Pixel(-(iconSize.w / 2), -iconSize.h))));
+            var marker = new OpenLayers.Marker(latLong, new OpenLayers.Icon(markerUrl, iconSize, new OpenLayers.Pixel(-(iconSize.w / 2), -iconSize.h)));
+
+            marker.events.register('click', marker, () => {
+                    m.route(app.route.discussion(app.store.getById('discussions', geotag.discussionId())));
+                });
+
+            markers.addMarker(marker);
         });
         map.zoomToExtent(markers.getDataExtent());
         this.geotags = null;

diff --git a/js/lib/models/Geotag.js b/js/lib/models/Geotag.js
@@ -7,5 +7,6 @@ export default class Geotag extends mixin(Model, {
     lat: Model.attribute('lat'),
     lng: Model.attribute('lng'),
     tagSlug: Model.attribute('tag_slug'),
+    discussionId: Model.attribute('discussion_id'),
     markerColor: Model.attribute('marker_color')
 }) {}
diff --git a/src/Api/Serializer/GeotagBasicSerializer.php b/src/Api/Serializer/GeotagBasicSerializer.php
@@ -52,6 +52,7 @@ protected function getDefaultAttributes($geotag)
 
         if ($post) {
             $attributes['post_id'] = $post->id;
+            $attributes['discussion_id'] = $post->discussion->id;
             $tag = $post->discussion->tags[0];
             if ($tag) {
                 $attributes['marker_color'] = $tag->color;