character markers are visible & react to slider (but not switches)

This commit is contained in:
Ryan Carpenter
2016-07-30 18:14:26 +08:00
parent d6cfadb37a
commit 578668c10b
8 changed files with 213 additions and 83 deletions
+18 -3
View File
@@ -42,7 +42,6 @@
models='mapModels.heraldry'
coords="'coords'"
options="'options'"
visible="options.houseHeraldry"
click="map.heraldryClick"
idkey="'key'">
</ui-gmap-markers>
@@ -57,6 +56,22 @@
idKey="'key'">
</ui-gmap-polygons>
<!-- Character Markers -->
<ui-gmap-markers
models='mapModels.characters'
coords="'coords'"
options="'options'"
click="map.characterClick"
type="'spider'"
idkey="'key'">
</ui-gmap-markers>
<!-- Character Paths -->
<!-- <ui-gmap-polylines
models='mapModels.paths'
idkey="'key'">
</ui-gmap-polylines> -->
</ui-gmap-google-map>
<div id="side" class=".col-xs-12 .col-md-3">
@@ -64,8 +79,8 @@
<div id="slider" ng-show="state.substring(0,6)=='slider'">
<h1>
<span class="glyphicon glyphicon-menu-hamburger" ng-click="toState('menu')"></span>
<span ng-show="slider.show=='episodes'" ng-bind="episodes[slider.currentEpisode].name" ng-click="toState('slider-full')"></span>
<span ng-show="slider.show=='chapters'" ng-bind="chapters[slider.currentChapter].name" ng-click="toState('slider-full')"></span>
<span ng-show="slider.show=='episodes'" ng-bind="episodes[slider.currentEpisode].name" title="{{episodes[slider.currentEpisode].name}}" ng-click="toState('slider-full')"></span>
<span ng-show="slider.show=='chapters'" ng-bind="chapters[slider.currentChapter].name" title="{{chapters[slider.currentChapter].name}}" ng-click="toState('slider-full')"></span>
</h1>
<div id="slider-control" ng-show="state=='slider-full'">
<div class="btn-group btn-group-2" role="group">