Browse Source

Merge pull request #1634 from MrKartoshka/trip_animation_improvement

Trip animation widget improvement:
pull/1646/head
Igor Kulikov 8 years ago
committed by GitHub
parent
commit
a9a5b344ff
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      application/src/main/data/json/system/widget_bundles/maps.json
  2. 1403
      ui/src/app/widget/lib/tripAnimation/trip-animation-widget.js
  3. 1
      ui/src/app/widget/lib/tripAnimation/trip-animation-widget.scss
  4. 2
      ui/src/app/widget/lib/tripAnimation/trip-animation-widget.tpl.html
  5. 2
      ui/src/app/widget/lib/widget-utils.js

6
application/src/main/data/json/system/widget_bundles/maps.json

File diff suppressed because one or more lines are too long

1403
ui/src/app/widget/lib/tripAnimation/trip-animation-widget.js

File diff suppressed because one or more lines are too long

1
ui/src/app/widget/lib/tripAnimation/trip-animation-widget.scss

@ -91,6 +91,7 @@
position: relative;
box-sizing: border-box;
width: 100%;
padding-bottom: 16px;
padding-left: 10px;
md-slider-container {

2
ui/src/app/widget/lib/tripAnimation/trip-animation-widget.tpl.html

@ -27,7 +27,7 @@
<ng-md-icon icon="info_outline"></ng-md-icon>
</md-button>
</div>
<div class="trip-animation-tooltip md-whiteframe-z4" layout="column" ng-class="!vm.staticSettings.showTooltip ? 'trip-animation-tooltip-hidden':''" ng-bind-html="vm.trips[vm.activeTripIndex].settings.tooltipText"
<div class="trip-animation-tooltip md-whiteframe-z4" layout="column" ng-class="!vm.staticSettings.showTooltip ? 'trip-animation-tooltip-hidden':''" ng-bind-html="vm.staticSettings.tooltipMarker === 'polygon' ? vm.trips[vm.activeTripIndex].settings.polygonTooltipText : vm.trips[vm.activeTripIndex].settings.tooltipText"
ng-style="{'background-color': vm.staticSettings.tooltipColor, 'opacity': vm.staticSettings.tooltipOpacity, 'color': vm.staticSettings.tooltipFontColor}">
</div>
</div>

2
ui/src/app/widget/lib/widget-utils.js

@ -210,7 +210,7 @@ export function arraysEqual(a, b) {
if (a.length != b.length) return false;
for (var i = 0; i < a.length; ++i) {
if (!a[i].equals(b[i])) return false;
if (!arraysEqual(a[i],b[i])) return false;
}
return true;
}

Loading…
Cancel
Save