Merge branch 'master' into develop

2017-07-22 10:14:55 +02:00
parent eebae77482
commit c877d9c7f8
1 changed files with 3 additions and 1 deletions
--- a/public/js/v1.2.4/app/map/map.js
+++ b/public/js/v1.2.4/app/map/map.js
@@ -408,7 +408,9 @@ define([
                    }

                    // update tooltip placement based on system position
-                    system.data('bs.tooltip').options.placement = getSystemTooltipPlacement(system);
+                    if (system.data('bs.tooltip')) {
+                        system.data('bs.tooltip').options.placement = getSystemTooltipPlacement(system);
+                    }

                    // show() can be forced
                    if(options.show === true){