Minz/quicknotes
1
0
Fork 0
mirror of https://github.com/JanGross/quicknotes.git synced 2025-11-30 23:37:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix double use of data-id on tags

Browse Source
This commit is contained in:
Matias De lellis
2019-11-12 11:58:41 -03:00
parent fa5c9d8239
commit 14dcc9a8b3
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/script.js
View File

@@ -314,7 +314,7 @@ View.prototype = {
var color = this.colorToHex($("#modal-note-div .quicknote").css("background-color")); var color = this.colorToHex($("#modal-note-div .quicknote").css("background-color"));
var tags = $("#modal-note-div .slim-tag").toArray().map(function (value) { var tags = $("#modal-note-div .slim-tag").toArray().map(function (value) {
return { return {
id: value.getAttribute('data-id'), id: value.getAttribute('tag-id'),
name: value.textContent.trim() name: value.textContent.trim()
}; };
}); });
@@ -468,11 +468,11 @@ View.prototype = {
$('#app-content').on('click', '.slim-tag', function (event) { $('#app-content').on('click', '.slim-tag', function (event) {
event.stopPropagation(); event.stopPropagation();
var tagId = parseInt($(this).data('id'), 10); var tagId = parseInt($(this).attr('tag-id'), 10);
$('.notes-grid').isotope({ filter: function() { $('.notes-grid').isotope({ filter: function() {
var match = false; var match = false;
$(this).find(".slim-tag").siblings().addBack().each(function() { $(this).find(".slim-tag").siblings().addBack().each(function() {
var id = parseInt($(this).data('id'), 10); var id = parseInt($(this).attr('tag-id'), 10);
if (tagId === id) if (tagId === id)
match = true; match = true;
}); });
@@ -621,7 +621,7 @@ View.prototype = {
modalTags.html(''); modalTags.html('');
newTags.forEach(function (item, index) { newTags.forEach(function (item, index) {
var noteId = parseInt(item.id) || -1; var noteId = parseInt(item.id) || -1;
var tag = $('<div class="slim-tag" data-id="' + noteId + '">' + item.text + '</div>'); var tag = $('<div class="slim-tag" tag-id="' + noteId + '">' + item.text + '</div>');
modalTags.append(tag); modalTags.append(tag);
}); });
} }
@@ -773,11 +773,11 @@ View.prototype = {
$('#app-navigation .nav-tag > a').click(function (event) { $('#app-navigation .nav-tag > a').click(function (event) {
event.stopPropagation(); event.stopPropagation();
var tagId = parseInt($(this).parent().data('id'), 10); var tagId = parseInt($(this).parent().attr('tag-id'), 10);
$('.notes-grid').isotope({ filter: function() { $('.notes-grid').isotope({ filter: function() {
var match = false; var match = false;
$(this).find(".slim-tag").siblings().addBack().each(function() { $(this).find(".slim-tag").siblings().addBack().each(function() {
var id = parseInt($(this).data('id'), 10); var id = parseInt($(this).attr('tag-id'), 10);
if (tagId === id) if (tagId === id)
match = true; match = true;
}); });

4
js/templates/navigation.handlebars
View File

@@ -33,10 +33,10 @@
</li> </li>
<li id="tags-folder" class="collapsible open"> <li id="tags-folder" class="collapsible open">
<button class="collapse"></button> <button class="collapse"></button>
<a href="#" class="icon-folder svg">{{tagsTxt}}</a> <a href="#" class="icon-tag svg">{{tagsTxt}}</a>
<ul> <ul>
{{#each tags}} {{#each tags}}
<li class="nav-tag with-menu {{#if active}}active{{/if}}" data-id="{{ id }}"> <li class="nav-tag with-menu {{#if active}}active{{/if}}" tag-id="{{ id }}">
<a href="#">{{{ name }}}</a> <a href="#">{{{ name }}}</a>
</li> </li>
{{/each}} {{/each}}

2
js/templates/note-item.handlebars
View File

@@ -27,7 +27,7 @@
</div> </div>
<div class='note-tags'> <div class='note-tags'>
{{#each tags}} {{#each tags}}
<div class="slim-tag" data-id="{{ id }}">{{{ name }}}</div> <div class="slim-tag" tag-id="{{ id }}">{{{ name }}}</div>
{{/each}} {{/each}}
</div> </div>
{{/if}} {{/if}}

2
js/templates/notes.handlebars
View File

@@ -30,7 +30,7 @@
</div> </div>
<div class='note-tags'> <div class='note-tags'>
{{#each tags}} {{#each tags}}
<div class='slim-tag' data-id="{{ id }}"> <div class='slim-tag' tag-id="{{ id }}">
{{{ name }}} {{{ name }}}
</div> </div>
{{/each}} {{/each}}