From 837f838059e2ade6af7e84bc980cfb6c54bccf31 Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Wed, 15 Dec 2010 16:44:55 +0300
Subject: [PATCH] + show current task priority in task menu

---
 src/mytinytodo.js            | 29 +++++++++++++++++------------
 src/themes/default/index.php | 16 ++++++++--------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/mytinytodo.js b/src/mytinytodo.js
index c6af88e..5f973e3 100644
--- a/src/mytinytodo.js
+++ b/src/mytinytodo.js
@@ -14,7 +14,6 @@ var objPrio = {};
 var selTask = 0;
 var flag = { needAuth:false, isLogged:false, tagsChanged:true, readOnly:false };
 var taskCnt = { total:0, past: 0, today:0, soon:0 };
-var cmenu;
 var tabLists = {
 	_lists: {},
 	_length: 0,
@@ -1653,15 +1652,21 @@ function mttMenu(container, options)
 
 function taskContextMenu(el, id)
 {
-	if(!cmenu) cmenu = new mttMenu('taskcontextcontainer', {onclick:taskContextClick});
-	cmenu.tag = id;
-	cmenu.show(el);
+	if(!_mtt.menus.cmenu) _mtt.menus.cmenu = new mttMenu('taskcontextcontainer', {
+		onclick: taskContextClick,
+		beforeShow: function() {
+			$('#cmenupriocontainer li').removeClass('mtt-item-checked');
+			$('#cmenu_prio\\:'+ taskList[_mtt.menus.cmenu.tag].prio).addClass('mtt-item-checked');
+		} 
+	});
+	_mtt.menus.cmenu.tag = id;
+	_mtt.menus.cmenu.show(el);
 };
 
 function taskContextClick(el, menu)
 {
 	if(!el.id) return;
-	var taskId = parseInt(cmenu.tag);
+	var taskId = parseInt(_mtt.menus.cmenu.tag);
 	var id = el.id, value;
 	var a = id.split(':');
 	if(a.length == 2) {
@@ -1699,21 +1704,21 @@ function moveTaskToList(taskId, listId)
 
 function cmenuOnListsLoaded()
 {
-	if(cmenu) cmenu.destroy();
-	cmenu = null;
+	if(_mtt.menus.cmenu) _mtt.menus.cmenu.destroy();
+	_mtt.menus.cmenu = null;
 	var s = '';
 	var all = tabLists.getAll();
 	for(var i in all) {
 		s += '<li id="cmenu_list:'+all[i].id+'">'+all[i].name+'</li>';
 	}
-	$('#listsmenucontainer ul').html(s);
+	$('#cmenulistscontainer ul').html(s);
 };
 
 function cmenuOnListAdded(list)
 {
-	if(cmenu) cmenu.destroy();
-	cmenu = null;
-	$('#listsmenucontainer ul').append('<li id="cmenu_list:'+list.id+'">'+list.name+'</li>');
+	if(_mtt.menus.cmenu) _mtt.menus.cmenu.destroy();
+	_mtt.menus.cmenu = null;
+	$('#cmenulistscontainer ul').append('<li id="cmenu_list:'+list.id+'">'+list.name+'</li>');
 };
 
 function cmenuOnListRenamed(list)
@@ -1723,7 +1728,7 @@ function cmenuOnListRenamed(list)
 
 function cmenuOnListSelected(list)
 {
-	$('#listsmenucontainer li').removeClass('mtt-disabled');
+	$('#cmenulistscontainer li').removeClass('mtt-disabled');
 	$('#cmenu_list\\:'+list.id).addClass('mtt-disabled');
 };
 
diff --git a/src/themes/default/index.php b/src/themes/default/index.php
index f28d455..6cc9416 100644
--- a/src/themes/default/index.php
+++ b/src/themes/default/index.php
@@ -239,22 +239,22 @@ $().ready(function(){
 <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-indicator" submenu="priocontainer"><div class="submenu-icon"></div><?php _e('action_priority');?></li>
- <li id="cmenu_move" class="mtt-menu-indicator" submenu="listsmenucontainer"><div class="submenu-icon"></div><?php _e('action_move');?></li>
+ <li id="cmenu_prio" class="mtt-menu-indicator" submenu="cmenupriocontainer"><div class="submenu-icon"></div><?php _e('action_priority');?></li>
+ <li id="cmenu_move" class="mtt-menu-indicator" submenu="cmenulistscontainer"><div class="submenu-icon"></div><?php _e('action_move');?></li>
  <li id="cmenu_delete"><?php _e('action_delete');?></li>
 </ul>
 </div>
 
-<div id="priocontainer" class="mtt-menu-container" style="display:none">
+<div id="cmenupriocontainer" class="mtt-menu-container" style="display:none">
 <ul>
- <li id="cmenu_prio:2">+2</li>
- <li id="cmenu_prio:1">+1</li>
- <li id="cmenu_prio:0">&plusmn;0</li>
- <li id="cmenu_prio:-1">&minus;1</li>
+ <li id="cmenu_prio:2"><div class="menu-icon"></div>+2</li>
+ <li id="cmenu_prio:1"><div class="menu-icon"></div>+1</li>
+ <li id="cmenu_prio:0"><div class="menu-icon"></div>&plusmn;0</li>
+ <li id="cmenu_prio:-1"><div class="menu-icon"></div>&minus;1</li>
 </ul>
 </div>
 
-<div id="listsmenucontainer" class="mtt-menu-container" style="display:none">
+<div id="cmenulistscontainer" class="mtt-menu-container" style="display:none">
 <ul>
 </ul>
 </div>