mirror of
https://github.com/maxpozdeev/mytinytodo.git
synced 2026-03-11 08:55:27 +00:00
+ task priority added to context menu
This commit is contained in:
parent
5d1e607db6
commit
731be8e876
7 changed files with 35 additions and 14 deletions
|
|
@ -74,6 +74,7 @@ class Lang extends DefaultLang
|
|||
'action_edit' => "Редактировать",
|
||||
'action_note' => "Заметка",
|
||||
'action_delete' => "Удалить",
|
||||
'action_priority' => "Приоритет",
|
||||
'notes' => "Заметки:",
|
||||
'notes_show' => "Показать",
|
||||
'notes_hide' => "Скрыть",
|
||||
|
|
|
|||
38
src/ajax.js
38
src/ajax.js
|
|
@ -579,16 +579,21 @@ function prioClick(prio, el)
|
|||
{
|
||||
el.blur();
|
||||
prio = parseInt(prio);
|
||||
$('#priopopup').fadeOut('fast'); //.hide();
|
||||
setTaskPrio(objPrio.taskId, prio);
|
||||
}
|
||||
|
||||
function setTaskPrio(id, prio)
|
||||
{
|
||||
setAjaxErrorTrigger();
|
||||
var nocache = '&rnd='+Math.random();
|
||||
$.getJSON('ajax.php?setPrio='+objPrio.taskId+'&prio='+prio+nocache, function(json){
|
||||
$.getJSON('ajax.php?setPrio='+id+'&prio='+prio+'&rnd='+Math.random(), function(json){
|
||||
resetAjaxErrorTrigger();
|
||||
});
|
||||
taskList[objPrio.taskId].prio = prio;
|
||||
$(objPrio.el).replaceWith(preparePrio(prio, objPrio.taskId));
|
||||
$('#priopopup').fadeOut('fast'); //.hide();
|
||||
if(sortBy != 0) changeTaskOrder(objPrio.taskId);
|
||||
$('#taskrow_'+objPrio.taskId).effect("highlight", {color:theme.editTaskFlashColor}, 'normal');
|
||||
taskList[id].prio = prio;
|
||||
var $t = $('#taskrow_'+id);
|
||||
$t.find('.task-prio').replaceWith(preparePrio(prio, id));
|
||||
if(sortBy != 0) changeTaskOrder(id);
|
||||
$t.effect("highlight", {color:theme.editTaskFlashColor}, 'normal');
|
||||
}
|
||||
|
||||
function setSort(v, init)
|
||||
|
|
@ -1130,6 +1135,10 @@ function taskContextClick(el)
|
|||
case 'cmenu_edit': editTask(taskId); break;
|
||||
case 'cmenu_note': toggleTaskNote(taskId); break;
|
||||
case 'cmenu_delete': deleteTask(taskId); break;
|
||||
case 'cmenu_prio_-1': setTaskPrio(taskId, -1); break;
|
||||
case 'cmenu_prio_0': setTaskPrio(taskId, 0); break;
|
||||
case 'cmenu_prio_1': setTaskPrio(taskId, 1); break;
|
||||
case 'cmenu_prio_2': setTaskPrio(taskId, 2); break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1146,6 +1155,8 @@ function mttMenu(container, options)
|
|||
var submenu = new mttMenu($(this).attr('submenu'));
|
||||
submenu.$caller = $(this);
|
||||
submenu.parent = menu;
|
||||
if(menu.root) submenu.root = menu.root; //!! be careful with circular references
|
||||
else submenu.root = menu;
|
||||
menu.submenu = submenu;
|
||||
|
||||
var showTimer, hideTimer;
|
||||
|
|
@ -1160,11 +1171,16 @@ function mttMenu(container, options)
|
|||
clearTimeout(showTimer);
|
||||
hideTimer = setTimeout(function(){
|
||||
submenu.hide();
|
||||
}, 300);
|
||||
}, 400);
|
||||
}
|
||||
);
|
||||
|
||||
submenu.container.find('li').each(function()
|
||||
submenu.container.find('li').click(function()
|
||||
{
|
||||
submenu.root.onclick(this);
|
||||
return false;
|
||||
})
|
||||
.each(function()
|
||||
{
|
||||
$(this).hover(
|
||||
function(){
|
||||
|
|
@ -1173,7 +1189,7 @@ function mttMenu(container, options)
|
|||
function(){
|
||||
hideTimer = setTimeout(function(){
|
||||
submenu.hide();
|
||||
}, 300);
|
||||
}, 400);
|
||||
}
|
||||
);
|
||||
});
|
||||
|
|
@ -1186,7 +1202,7 @@ function mttMenu(container, options)
|
|||
|
||||
this.onclick = function(item)
|
||||
{
|
||||
if($(item).is('.mtt-disabled')) return;
|
||||
if($(item).is('.mtt-disabled,.mtt-menu-has-submenu')) return;
|
||||
menu.close();
|
||||
if(this.options.onclick) this.options.onclick(item);
|
||||
}
|
||||
|
|
|
|||
BIN
src/images/arrright.gif
Normal file
BIN
src/images/arrright.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 55 B |
|
|
@ -217,8 +217,8 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
|
|||
<ul>
|
||||
<li id="cmenu_edit"><b><?php _e('action_edit');?></b></li>
|
||||
<li id="cmenu_note"><?php _e('action_note');?></li>
|
||||
<li id="cmenu_prio" class="mtt-menu-has-submenu" submenu="priocontainer"><?php _e('action_priority');?></li>
|
||||
<!--
|
||||
<li id="cmenu_prio" class="mtt-menu-has-submenu" submenu="priocontainer">Set Priority...</li>
|
||||
<li id="cmenu_moveto" class="mtt-menu-has-submenu" submenu="priocontainer">Move to...</li>
|
||||
-->
|
||||
<li id="cmenu_delete"><?php _e('action_delete');?></li>
|
||||
|
|
@ -227,8 +227,8 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
|
|||
|
||||
<div id="priocontainer" class="mtt-btnmenu-container mtt-btnmenu-hasimages" style="display:none">
|
||||
<ul>
|
||||
<li id="cmenu_prio_-1">-1</li>
|
||||
<li id="cmenu_prio_0">0</li>
|
||||
<li id="cmenu_prio_-1">−1</li>
|
||||
<li id="cmenu_prio_0">±0</li>
|
||||
<li id="cmenu_prio_1">+1</li>
|
||||
<li id="cmenu_prio_2">+2</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ class DefaultLang
|
|||
'action_edit' => "Edit",
|
||||
'action_note' => "Edit Note",
|
||||
'action_delete' => "Delete",
|
||||
'action_priority' => "Priority",
|
||||
'notes' => "Notes:",
|
||||
'notes_show' => "Show",
|
||||
'notes_hide' => "Hide",
|
||||
|
|
|
|||
|
|
@ -74,6 +74,7 @@ class Lang extends DefaultLang
|
|||
'action_edit' => "Edit",
|
||||
'action_note' => "Edit Note",
|
||||
'action_delete' => "Delete",
|
||||
'action_priority' => "Priority",
|
||||
'notes' => "Notes:",
|
||||
'notes_show' => "Show",
|
||||
'notes_hide' => "Hide",
|
||||
|
|
|
|||
|
|
@ -194,6 +194,8 @@ div.task-note-area textarea { color:#999999; width:100%; display:block; height:6
|
|||
.mtt-btnmenu-container.mtt-btnmenu-hasimages li { padding-left:18px; }
|
||||
.mtt-btnmenu-container li.mtt-item-checked { background-image:url(images/checkmark.gif); background-position:left center; background-repeat:no-repeat; }
|
||||
|
||||
.mtt-menu-has-submenu { margin-right:15px; background:url(images/arrright.gif) no-repeat center right; }
|
||||
|
||||
.mtt-settings-table { width:100%; border-collapse:collapse; }
|
||||
.mtt-settings-table th, .mtt-settings-table td { border-bottom:1px solid #dedede; padding:8px; vertical-align:top; }
|
||||
.mtt-settings-table .form-buttons { border-bottom:none; text-align:center; }
|
||||
|
|
|
|||
Loading…
Reference in a new issue