From 8e44bc941b85f3a2e453c7434434e40755931a1b Mon Sep 17 00:00:00 2001
From: Jon Kristensen <info@jonkri.se>
Date: Wed, 28 Jun 2017 23:48:42 +0200
Subject: [FixaMinGata] Consolidate with upstream.

Add hook for post-title field content in report form.
Update translations.
---
 web/js/map-google.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'web/js/map-google.js')

diff --git a/web/js/map-google.js b/web/js/map-google.js
index be2df8502..7155a372e 100644
--- a/web/js/map-google.js
+++ b/web/js/map-google.js
@@ -218,7 +218,8 @@ fixmystreet.maps = {};
                 'Show pins', 'Hide pins',
                 'Dangos pinnau', 'Cuddio pinnau',
                 "Vis nåler", "Gjem nåler",
-                "Zeige Stecknadeln", "Stecknadeln ausblenden"
+                "Zeige Stecknadeln", "Stecknadeln ausblenden",
+                'Visa kartnålar', 'Göm kartnålar'
             ];
             for (i=0; i<showhide.length; i+=2) {
                 if (this.innerHTML == showhide[i]) {
-- 
cgit v1.2.3


From 82350c8df0cb088e5d1eaf26833f9880700b496d Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Mon, 17 Jul 2017 13:30:07 +0100
Subject: Use standard JS translation for show/hide pins.

---
 web/js/map-google.js | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

(limited to 'web/js/map-google.js')

diff --git a/web/js/map-google.js b/web/js/map-google.js
index 7155a372e..8819697eb 100644
--- a/web/js/map-google.js
+++ b/web/js/map-google.js
@@ -214,25 +214,16 @@ fixmystreet.maps = {};
         $('#hide_pins_link').click(function(e) {
             var i, m;
             e.preventDefault();
-            var showhide = [
-                'Show pins', 'Hide pins',
-                'Dangos pinnau', 'Cuddio pinnau',
-                "Vis nåler", "Gjem nåler",
-                "Zeige Stecknadeln", "Stecknadeln ausblenden",
-                'Visa kartnålar', 'Göm kartnålar'
-            ];
-            for (i=0; i<showhide.length; i+=2) {
-                if (this.innerHTML == showhide[i]) {
-                    for (m=0; m<fixmystreet.markers.length; m++) {
-                        fixmystreet.markers[m].setMap(fixmystreet.map);
-                    }
-                    this.innerHTML = showhide[i+1];
-                } else if (this.innerHTML == showhide[i+1]) {
-                    for (m=0; m<fixmystreet.markers.length; m++) {
-                        fixmystreet.markers[m].setMap(null);
-                    }
-                    this.innerHTML = showhide[i];
+            if (this.innerHTML == translation_strings.show_pins) {
+                for (m=0; m<fixmystreet.markers.length; m++) {
+                    fixmystreet.markers[m].setMap(fixmystreet.map);
+                }
+                this.innerHTML = translation_strings.hide_pins;
+            } else if (this.innerHTML == translation_strings.hide_pins) {
+                for (m=0; m<fixmystreet.markers.length; m++) {
+                    fixmystreet.markers[m].setMap(null);
                 }
+                this.innerHTML = translation_strings.show_pins;
             }
         });
 
-- 
cgit v1.2.3


From d034f3c1447ea91cb4333365ce123d58deb2de0d Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 17 Aug 2017 15:50:07 +0100
Subject: Refactor /around list code to share with others.

Both /reports and /my share an ID and a /reports/ajax function, use
these also on /around (and share ajax/non-ajax code).
---
 web/js/map-google.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'web/js/map-google.js')

diff --git a/web/js/map-google.js b/web/js/map-google.js
index 8819697eb..596e4f8ee 100644
--- a/web/js/map-google.js
+++ b/web/js/map-google.js
@@ -114,12 +114,9 @@ fixmystreet.maps = {};
 
     /* Pan data handler */
     function read_pin_json(obj) {
-        var current, current_near;
-        if (typeof(obj.current) != 'undefined' && (current = document.getElementById('current'))) {
-            current.innerHTML = obj.current;
-        }
-        if (typeof(obj.current_near) != 'undefined' && (current_near = document.getElementById('current_near'))) {
-            current_near.innerHTML = obj.current_near;
+        var reports_list;
+        if (typeof(obj.reports_list) != 'undefined' && (reports_list = document.getElementById('js-reports-list'))) {
+            reports_list.innerHTML = obj.reports_list;
         }
         fixmystreet.markers = markers_list( obj.pins, false );
     }
-- 
cgit v1.2.3