Fix for missing $event causing the route planner return to fail on ev…

…ery browser that is not Chrome
iRail · Jun 2, 2014 · 699ba29 · 699ba29
1 parent cede54b
commit 699ba29
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/app/lang/nl/client.php b/app/lang/nl/client.php
@@ -4,8 +4,8 @@
     // New translation strings
     "planNewRoute" => "Plan nieuwe route",
     "searchStations" => "Zoek naar stations",
-    "typeToStation" => "Typ bestemming stationsnaam",
-    "typeFromStation" => "Typ vertrek stationsnaam",
+    "typeToStation" => "Typ bestemmingstation",
+    "typeFromStation" => "Typ vertrekstation",
     "chooseDate" => "Kies uw gewenste datum",
     "chooseTime" => "Kies uw gewenste tijdstip",
     "confirmSearch" => "Zoek naar treinen",

diff --git a/app/views/core/navigation.blade.php b/app/views/core/navigation.blade.php
@@ -11,7 +11,7 @@
         </div>
         <div class="navbar-collapse collapse navbar-right">
             <ul class="nav navbar-nav">
-                <li><a href="{{ URL::to('route') }}" ng-click="reset()"><i class="fa fa-road fa-12"></i> {{Lang::get('client.planNewRoute')}}</a></li>
+                <li><a href="{{ URL::to('route') }}" ng-click="resetplanner($event)"><i class="fa fa-road fa-12"></i> {{Lang::get('client.planNewRoute')}}</a></li>
                 <li><a href="{{ URL::to('stations') }}"><i class="fa fa-search fa-12"></i> {{Lang::get('client.searchStations')}}</a></li>
             </ul>
         </div><!--/.nav-collapse -->

diff --git a/app/views/route/planner.blade.php b/app/views/route/planner.blade.php
@@ -6,7 +6,7 @@
     <div id="main">
         @include('core.navigation')
         <div class="container">
-            <div class="row routeplanner view1 well" ng-show="planning">
+            <div class="row routeplanner view1" ng-show="planning">
                 <div class="col-sm-6">
                     <script type="text/ng-template" id="customTemplate.html">
                         <a>
@@ -67,7 +67,7 @@
                         <h3>{{Lang::get('client.error')}} <strong>{{Lang::get('client.errorNoRoutes')}}</strong></h3>
                         <p>{{Lang::get('client.errorExplanation')}} <a href="mailto:[email protected]">{{Lang::get('client.errorMail')}}</a>.</p>
                         <br/>
-                        <a href="#" ng-click="reset()" class="btn btn-danger btn-lg btn-wide"><i class="fa fa-chevron-left"></i> {{Lang::get('client.errorReturn')}}</a>
+                        <a href="#" ng-click="resetplanner($event)" class="btn btn-danger btn-lg btn-wide"><i class="fa fa-chevron-left"></i> {{Lang::get('client.errorReturn')}}</a>
                         <br/>
                     </div>
                 </div>
@@ -168,7 +168,7 @@
                         <a class="btn btn-default btn-50" ng-click="latest()">{{Lang::get('client.latestRide')}} &gt;&gt;</a>
                     </div>
                     <a class="btn btn-primary btn-wide btn-lg btn-botm" ng-click="reverse()"><i class="fa fa-exchange"></i> {{Lang::get('client.reverse')}}</a>
-                    <a class="btn btn-default btn-wide btn-lg btn-botm" ng-click="reset()"><i class="fa fa-undo"></i> {{Lang::get('client.planAnother')}}</a>
+                    <a class="btn btn-default btn-wide btn-lg btn-botm" ng-click="resetplanner($event)"><i class="fa fa-undo"></i> {{Lang::get('client.planAnother')}}</a>
                 </div>
             </div>
         </div>

diff --git a/public/css/main.css b/public/css/main.css
@@ -158,5 +158,5 @@ input.ng-invalid {
   animation: bounceIn 0.7s; }
 
 .row.routeplanner.ng-hide-remove {
-  -webkit-animation: bounceIn 0.7s;
-  animation: bounceIn 0.7s; }
+  -webkit-animation: fadeInDown 0.7s;
+  animation: fadeInDown 0.7s; }
diff --git a/public/css/main.scss b/public/css/main.scss
@@ -202,6 +202,6 @@ input.ng-invalid {
   }
 
 .row.routeplanner.ng-hide-remove {
-  -webkit-animation: bounceIn 0.7s;
-  animation: bounceIn 0.7s;
+  -webkit-animation: fadeInDown 0.7s;
+  animation: fadeInDown 0.7s;
   }
diff --git a/public/js/irailapp/app.js b/public/js/irailapp/app.js
@@ -86,7 +86,6 @@
          * @param string
          */
         $scope.findStationById = function(suppliedIdentifierString){
-            console.log($scope.stations);
             for (var i = 0, len = $scope.stations.stations.length; i < len; i++) {
                 if (($scope.stations.stations[i].id.toLowerCase()).indexOf(suppliedIdentifierString) != -1){
                     return $scope.stations.stations[i];
@@ -158,9 +157,9 @@
         /**
          * Resets the route planner to default values
          */
-        $scope.reset = function(){
-            event.stopPropagation();
-            event.preventDefault();
+        $scope.resetplanner = function(e){
+            e.stopPropagation();
+            e.preventDefault();
             $scope.error = false;
             $scope.loading = false;
             $scope.results = false;
@@ -251,7 +250,7 @@
             $scope.stations = data;
         });
 
-        $scope.reset = function(){
+        $scope.resetplanner = function(){
             // Should not do anything
         }
     });
@@ -292,7 +291,7 @@
             }
         };
 
-        $scope.reset = function(){
+        $scope.resetplanner = function(){
             // Should not do anything
         }