Commit de63be910d1117446b8bee53a5c8d68739278e1a
1 parent
3ef35c23
Exists in
master
and in
1 other branch
No settings
Showing
2 changed files
with
17 additions
and
18 deletions
Show diff stats
index.html
@@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
37 | <img src="./includes/images/checked.png" ng-show='setting.enabled == false' ng-click="changeSetting('enable', $index)"> | 37 | <img src="./includes/images/checked.png" ng-show='setting.enabled == false' ng-click="changeSetting('enable', $index)"> |
38 | <img src="./includes/images/unchecked.png" ng-show='setting.enabled == true' ng-click="changeSetting('disable', $index)"> | 38 | <img src="./includes/images/unchecked.png" ng-show='setting.enabled == true' ng-click="changeSetting('disable', $index)"> |
39 | <span>{{setting.description}}</span> | 39 | <span>{{setting.description}}</span> |
40 | - </div> | 40 | + </div> |
41 | </div> --> | 41 | </div> --> |
42 | </div> | 42 | </div> |
43 | <div class="map"> | 43 | <div class="map"> |
src/js/app.js
@@ -61,7 +61,7 @@ app.controller('myCtrl', function($scope, $http, $rootScope, $sce) { | @@ -61,7 +61,7 @@ app.controller('myCtrl', function($scope, $http, $rootScope, $sce) { | ||
61 | valid: false, | 61 | valid: false, |
62 | id: 1 | 62 | id: 1 |
63 | 63 | ||
64 | - }, | 64 | + }, |
65 | { | 65 | { |
66 | Description: "Start typing to search...", | 66 | Description: "Start typing to search...", |
67 | lbl: "Drop", | 67 | lbl: "Drop", |
@@ -104,20 +104,20 @@ app.controller('myCtrl', function($scope, $http, $rootScope, $sce) { | @@ -104,20 +104,20 @@ app.controller('myCtrl', function($scope, $http, $rootScope, $sce) { | ||
104 | calcRoute($scope.stops[0], $scope.stops[$scope.stops.length - 1], waypoints); | 104 | calcRoute($scope.stops[0], $scope.stops[$scope.stops.length - 1], waypoints); |
105 | } | 105 | } |
106 | }); | 106 | }); |
107 | - function refreshSettings(completed){ | ||
108 | - newSettings = []; | ||
109 | - $scope.settings.forEach(function(s, i){ | ||
110 | - if(completed && !s.showOnPageLoad){ | ||
111 | - s.showOnRouteLoad = true; | ||
112 | - } else { | ||
113 | - s.showOnRouteLoad = false; | ||
114 | - } | ||
115 | - newSettings.push(s); | ||
116 | - if (i == $scope.settings.length - 1){ | ||
117 | - $scope.settings = newSettings; | ||
118 | - } | ||
119 | - }) | ||
120 | - } | 107 | + // function refreshSettings(completed){ |
108 | + // newSettings = []; | ||
109 | + // $scope.settings.forEach(function(s, i){ | ||
110 | + // if(completed && !s.showOnPageLoad){ | ||
111 | + // s.showOnRouteLoad = true; | ||
112 | + // } else { | ||
113 | + // s.showOnRouteLoad = false; | ||
114 | + // } | ||
115 | + // newSettings.push(s); | ||
116 | + // if (i == $scope.settings.length - 1){ | ||
117 | + // $scope.settings = newSettings; | ||
118 | + // } | ||
119 | + // }) | ||
120 | + // } | ||
121 | function slider() { | 121 | function slider() { |
122 | $("#slider").slider({ | 122 | $("#slider").slider({ |
123 | animate: "fast", | 123 | animate: "fast", |
@@ -328,7 +328,7 @@ app.controller('myCtrl', function($scope, $http, $rootScope, $sce) { | @@ -328,7 +328,7 @@ app.controller('myCtrl', function($scope, $http, $rootScope, $sce) { | ||
328 | }); | 328 | }); |
329 | slider(); | 329 | slider(); |
330 | getTime(); | 330 | getTime(); |
331 | - refreshSettings(); | 331 | + // refreshSettings(); |
332 | follow(response.routes[0].overview_path); | 332 | follow(response.routes[0].overview_path); |
333 | } else { | 333 | } else { |
334 | $scope.warning = 'Destination Too Far Away!'; | 334 | $scope.warning = 'Destination Too Far Away!'; |
@@ -527,4 +527,3 @@ app.controller('myCtrl', function($scope, $http, $rootScope, $sce) { | @@ -527,4 +527,3 @@ app.controller('myCtrl', function($scope, $http, $rootScope, $sce) { | ||
527 | 527 | ||
528 | 528 | ||
529 | }); | 529 | }); |
530 | - |