From e910d9337a35fad663c978ff9121ed64ca28af91 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 14 Jul 2016 15:21:43 +0500 Subject: - Fixed saving parent group when creating new group. - Fixed storing device and group if parent group is not defined. - Fixed Warning in browser console about missed requirements. --- web/app/view/GroupsController.js | 1 + 1 file changed, 1 insertion(+) (limited to 'web/app') diff --git a/web/app/view/GroupsController.js b/web/app/view/GroupsController.js index 1764423d7..4cf1459a6 100644 --- a/web/app/view/GroupsController.js +++ b/web/app/view/GroupsController.js @@ -19,6 +19,7 @@ Ext.define('Traccar.view.GroupsController', { alias: 'controller.groups', requires: [ + 'Traccar.view.GroupDialog', 'Traccar.view.GroupGeofences' ], -- cgit v1.2.3 From 1f411961db56f7024d3e88cfaef89f1ab26fc9f1 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Fri, 15 Jul 2016 15:04:25 +0500 Subject: Fix geofences not showed in old browsers and IE --- web/app/GeofenceConverter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web/app') diff --git a/web/app/GeofenceConverter.js b/web/app/GeofenceConverter.js index ebe121385..339f09615 100644 --- a/web/app/GeofenceConverter.js +++ b/web/app/GeofenceConverter.js @@ -20,7 +20,7 @@ Ext.define('Traccar.GeofenceConverter', { wktToGeometry: function (mapView, wkt) { var geometry, projection, resolutionAtEquator, pointResolution, resolutionFactor, points = [], center, radius, content, i, lat, lon, coordinates; - if (wkt.startsWith('POLYGON')) { + if (wkt.lastIndexOf('POLYGON', 0) === 0) { content = wkt.match(/\([^\(\)]+\)/); if (content !== null) { coordinates = content[0].match(/-?\d+\.?\d*/g); @@ -34,7 +34,7 @@ Ext.define('Traccar.GeofenceConverter', { geometry = new ol.geom.Polygon([points]); } } - } else if (wkt.startsWith('CIRCLE')) { + } else if (wkt.lastIndexOf('CIRCLE', 0) === 0) { content = wkt.match(/\([^\(\)]+\)/); if (content !== null) { coordinates = content[0].match(/-?\d+\.?\d*/g); -- cgit v1.2.3