A more or less big rewrite... Cleaner and more animations...

This commit is contained in:
Matias De lellis
2020-06-07 22:41:46 -03:00
parent 8aa4b74323
commit 3d5c74c1e0
5 changed files with 384 additions and 511 deletions

View File

@@ -1,5 +1,5 @@
/*
* @copyright 2019 Matias De lellis <mati86dl@gmail.com>
* @copyright 2019-2020 Matias De lellis <mati86dl@gmail.com>
*
* @author 2019 Matias De lellis <mati86dl@gmail.com>
*
@@ -49,9 +49,10 @@ const QnDialogs = {
multiple: false,
allowClear: true,
toggleSelect: true,
tags : function () {
tags: function () {
var data = [];
currentTags.forEach(function (item, index) {
// Select2 expect text instead of name
data.push({id: item.id, text: item.name});
});
return data;
@@ -94,7 +95,13 @@ const QnDialogs = {
click: function () {
input.select2('close');
if (callback !== undefined) {
callback(true, input.select2("data"));
// Quicknotes use name instead text of selecd
newTags = input.select2("data");
newTags.forEach(function (item, index, tArray) {
item['name'] = item.text;
tArray[index] = item;
});
callback(true, newTags);
}
$(dialogId).ocdialog('close');
},

File diff suppressed because it is too large Load Diff

View File

@@ -12,7 +12,11 @@
</div>
{{else}}
<div>
{{#if ispinned}}
<div class="icon-header-note icon-pinned fixed-header-icon" title="{{t "quicknotes" "Unpin note"}}"></div>
{{else}}
<div class="icon-header-note icon-pin hide-header-icon" title="{{t "quicknotes" "Pin note"}}"></div>
{{/if}}
<div class="icon-header-note icon-delete hide-header-icon icon-delete-note" title="{{t "quicknotes" "Delete note"}}"></div>
<!--
{{#if sharedwith}}

View File

@@ -0,0 +1,5 @@
<div class='note-tags'>
{{#each tags}}
<div class="icon-tag slim-tag" tag-id="{{ id }}">{{{ name }}}</div>
{{/each}}
</div>

View File

@@ -1,12 +1,23 @@
<?php
/**
* ownCloud - quicknotes
/*
* @copyright 2016-2020 Matias De lellis <mati86dl@gmail.com>
*
* This file is licensed under the Affero General Public License version 3 or
* later. See the COPYING file.
* @author 2016 Matias De lellis <mati86dl@gmail.com>
*
* @author Matias De lellis <mati86dl@gmail.com>
* @copyright Matias De lellis 2016
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace OCA\QuickNotes\Controller;
@@ -134,16 +145,21 @@ class NoteController extends Controller {
// Create note and insert it
$note = new Note();
$note->setTitle($title);
$note->setContent($content);
$note->setTimestamp(time());
$note->setColorId($hcolor->id);
$note->setUserId($this->userId);
// Insert true color to response
$note->setColor($hcolor->getColor());
$newNote = $this->notemapper->insert($note);
return new DataResponse($this->notemapper->insert($note));
// Insert true color pin and tags to response
$newNote->setColor($hcolor->getColor());
$newNote->setIsPinned(false);
$newNote->setTags([]);
return new DataResponse($newNote);
}
/**
@@ -218,13 +234,13 @@ class NoteController extends Controller {
$note->setTimestamp(time());
$note->setColorId($hcolor->id);
// Insert true color to response
$note->setColor($hcolor->getColor());
$note->setIsPinned($note->getPinned() ? true : false);
// Update note.
$newnote = $this->notemapper->update($note);
// Insert true color and pin to response
$newnote->setColor($hcolor->getColor());
$newnote->setIsPinned($note->getPinned() ? true : false);
// Fill new tags
$newnote->setTags($this->tagmapper->getTagsForNote($this->userId, $newnote->getId()));