From 2dbeca3462c6052cdf254eff97c86bd9e1936568 Mon Sep 17 00:00:00 2001
From: Matias De lellis <mati86dl@gmail.com>
Date: Thu, 26 May 2016 20:09:37 -0300
Subject: [PATCH] Add checkmarks to color filter on navigation

---
 js/script.js                  | 20 +++++++++++++++-----
 templates/part.navigation.php |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/js/script.js b/js/script.js
index 0ce1c3b..8e1a3b3 100644
--- a/js/script.js
+++ b/js/script.js
@@ -315,9 +315,9 @@ View.prototype = {
         $('#modal-note-div .circle-toolbar').click(function (event) {
             event.stopPropagation();
 
-            var oldColorTool = $('.circle-toolbar.icon-checkmark');
+            var oldColorTool = $('#modal-note-div .circle-toolbar.icon-checkmark');
             $.each(oldColorTool, function(i, oct) {
-               $(oct).removeClass('icon-checkmark'); 
+               $(oct).removeClass('icon-checkmark');
             });
             $(this).addClass('icon-checkmark');
             var color = $(this).css("background-color");
@@ -365,6 +365,12 @@ View.prototype = {
         $('#all-notes').click(function () {
             self._notes.unsetActive();
             $('.notes-grid').isotope({ filter: '*'});
+
+            var oldColorTool = $('#app-navigation .circle-toolbar.icon-checkmark');
+            $.each(oldColorTool, function(i, oct) {
+               $(oct).removeClass('icon-checkmark');
+            });
+            $('#app-navigation .any-color').addClass('icon-checkmark');
         });
 
         // create a new note
@@ -423,10 +429,14 @@ View.prototype = {
 
         // Handle colors.
         $('#app-navigation .circle-toolbar').click(function (event) {
-            event.stopPropagation();
+            var oldColorTool = $('#app-navigation .circle-toolbar.icon-checkmark');
+            $.each(oldColorTool, function(i, oct) {
+                 $(oct).removeClass('icon-checkmark');
+            });
+            $(this).addClass('icon-checkmark');
 
-            var color = $(this).css("background-color");
-            if (color != 'transparent') {
+            if (!$(this).hasClass("any-color")) {
+                var color = $(this).css("background-color");
                 $('.notes-grid').isotope({ filter: function() {
                     var itemColor = $(this).children().css("background-color");
                     return color == itemColor;
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
index b6bab6f..90ac483 100644
--- a/templates/part.navigation.php
+++ b/templates/part.navigation.php
@@ -10,7 +10,7 @@
 		<a href="#" class="icon-search svg">Colors</a>
 		<ul>
 			<li style="display: flex; justify-content: center;">
-				<button class="circle-toolbar" style="background: transparent none; border: 1px solid;"></button>
+				<button class="circle-toolbar icon-checkmark any-color"></button>
 				{{#each colors}}
 					<button class="circle-toolbar" style="background-color: {{color}} "></button>
 				{{/each}}