From b7184ad02b8314f64825fb12aadf3b9c374c4cb5 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Mon, 30 May 2016 00:17:06 +0300 Subject: [PATCH] =?UTF-8?q?ADD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=BE?= =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=84=D1=80=D0=B0?= =?UTF-8?q?=D0=B3=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=20=D1=82=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20=D0=BA=D0=B0=D1=80=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/JsonController.php | 1 + public/js/tracks.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/controllers/JsonController.php b/controllers/JsonController.php index 4519f28..62edebf 100644 --- a/controllers/JsonController.php +++ b/controllers/JsonController.php @@ -637,6 +637,7 @@ class JsonController extends Controller $resTracks[] = array( 'name' => (string) $track->name, + 'description' => $track->description, 'length' => 0, 'latlngs' => $resLatlngs, ); diff --git a/public/js/tracks.js b/public/js/tracks.js index 0dac8e7..07214b1 100644 --- a/public/js/tracks.js +++ b/public/js/tracks.js @@ -55,7 +55,7 @@ function loadTrack(id) colorIndex = (colorIndex == colors.length-1) ? 0 : colorIndex+1; tracks[i] = L.polyline(data.tracks[i].latlngs, {color: color, width: 4, opacity: 0.8}); - tracks[i].bindPopup(data.tracks[i].name); + tracks[i].bindPopup('' + data.tracks[i].name + '
' + data.tracks[i].description); trips[id].addLayer(tracks[i]) } }