From 97568ec82b2135d6edb9112b35c6217f14f20996 Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Tue, 24 May 2016 01:18:52 +0200 Subject: [PATCH 1/2] highlight current color, only on entering edit mode --- js/script.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/script.js b/js/script.js index 8a10fd4..f347217 100644 --- a/js/script.js +++ b/js/script.js @@ -163,6 +163,12 @@ View.prototype = { var title = note.find("#title-editable").html(); var content = note.find("#content-editable").html(); var color = note.children().css("background-color"); + var colors = modal[0].getElementsByClassName("circle-toolbar"); + $.each(colors, function(i, c) { + if(color == c.style.backgroundColor) { + c.className += " icon-checkmark"; + } + }); var modalid = modalnote.data('id'); From f1936aa5ce82ab8f0bb96cd9005dc9bb4b9255b9 Mon Sep 17 00:00:00 2001 From: v1r0x Date: Tue, 24 May 2016 14:46:14 +0200 Subject: [PATCH 2/2] update checkmark to match current selected color --- js/script.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/js/script.js b/js/script.js index f347217..8ca5c51 100644 --- a/js/script.js +++ b/js/script.js @@ -198,6 +198,11 @@ View.prototype = { var modaltitle = $('#modal-note-div #title-editable'); var modalcontent = $('#modal-note-dive #content-editable'); var modalnote = $("#modal-note-div .quicknote"); + //remove checkmark icons from temp selected color + var modalcolortools = $("#modal-note-div .circle-toolbar"); + $.each(modalcolortools, function(i, colortool) { + $(colortool).removeClass('icon-checkmark'); + }); this._notes.unsetActive(); @@ -306,6 +311,11 @@ View.prototype = { $('#app-content .circle-toolbar').click(function (event) { event.stopPropagation(); + var oldColorTool = $('.circle-toolbar.icon-checkmark'); + $.each(oldColorTool, function(i, oct) { + $(oct).removeClass('icon-checkmark'); + }); + $(this).addClass('icon-checkmark'); var color = $(this).css("background-color"); modalnote.css("background-color", color); });