Linked filters fix

licoffe · Jun 22, 2017 · a8e2dfb · a8e2dfb
1 parent 8edeee0
commit a8e2dfb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/renderer.js b/renderer.js
@@ -160,7 +160,7 @@ $( document).ready( function() {
         $( "#filters-amount" ).text( $( "#filters .collection-item:visible" ).length );
     };
 
-    // When clicking on 'Cancel editing'
+    // When clicking on 'Clear Filter'
     var cancelEditAction = function() {
         $( "#league" ).val( config.leagues[config.defaultLeagueIndex]);
         $( "#league").material_select();
@@ -200,10 +200,12 @@ $( document).ready( function() {
         $( "#item-type" ).val( "any" );
         $( "#item-type").material_select();
 
+        // If we are editing and the button is 'Clear Filter'
         if ( $( this ).text() !== "Clear filter" ) {
             $( "#add-filter" ).text( "Add filter" );
             $( "#cancel-filter" ).text( "Clear filter" );
             $( "#cancel-filter" ).removeClass( "red" ).addClass( "blue-grey" );
+            editingFilter = "";
         }
     };
 
@@ -1140,4 +1142,8 @@ $( document).ready( function() {
         }
     }, config.NOTIFICATION_QUEUE_INTERVAL );
 
+    // setInterval( function() {
+    //     console.log( "editingFilter: " + editingFilter );
+    // }, 1000 );
+
 });
diff --git a/templates/entry.html b/templates/entry.html
@@ -1,7 +1,7 @@
 <li class="collection-item entry" id="{{id}}" style="display: none">
     <div class="title row" style="">
         <span class="timestamp col s1">{{time}}</span>
-        <span class="item col s4">{{item}} <span class="typeLine">{{typeLine}}</span></span>
+        <span class="item col s4">{{item}} <span class="typeLine">{{type}}</span></span>
         <span class="account col s3">{{account}}</span>
         <span class="currency col s1">{{originalPrice}}</span>
         <span class="col s2"></span>