Skip to content

Commit

Permalink
Merge pull request #506 from maurerit/hotfix/dragging-systems-causes-…
Browse files Browse the repository at this point in the history
…typeerror

Fixed an issue where moving systems caused a typeerror
  • Loading branch information
exodus4d authored Jul 22, 2017
2 parents 5d55c3a + 257f4c8 commit 7c9068b
Show file tree
Hide file tree
Showing 14 changed files with 158 additions and 154 deletions.
4 changes: 3 additions & 1 deletion js/app/map/map.js
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand Down
2 changes: 1 addition & 1 deletion public/js/v1.2.3/app.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 22 additions & 22 deletions public/js/v1.2.3/app/admin.js.map

Large diffs are not rendered by default.

66 changes: 33 additions & 33 deletions public/js/v1.2.3/app/login.js.map

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion public/js/v1.2.3/app/mappage.js
Original file line number Diff line number Diff line change
Expand Up @@ -25747,7 +25747,9 @@ define('app/map/map',[
}

// 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){
Expand Down
132 changes: 66 additions & 66 deletions public/js/v1.2.3/app/mappage.js.map

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions public/js/v1.2.3/app/notification.js.map

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions public/js/v1.2.3/app/setup.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/v1.2.3/lib/bootstrap-image-gallery.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7c9068b

Please sign in to comment.