From 27a669a195ff5cc99851e20f4d34e40af36e296d Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Mon, 31 Mar 2014 13:50:41 +0200
Subject: [PATCH] Allow adding tags from autocomplete; use class selector for
 tagcloud styles

---
 plugins/tasklist/jquery.tagedit.js                 |  2 +-
 plugins/tasklist/skins/larry/iehacks.css           |  2 +-
 plugins/tasklist/skins/larry/tasklist.css          | 14 +++++++-------
 .../tasklist/skins/larry/templates/mainview.html   |  2 +-
 plugins/tasklist/tasklist.js                       | 12 ++----------
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/plugins/tasklist/jquery.tagedit.js b/plugins/tasklist/jquery.tagedit.js
index 7d7bf0a3..639edb83 100644
--- a/plugins/tasklist/jquery.tagedit.js
+++ b/plugins/tasklist/jquery.tagedit.js
@@ -176,7 +176,7 @@
 						$(this).bind('transformToTag', function(event, id) {
 							var oldValue = (typeof id != 'undefined' && (id.length > 0 || id > 0));
 
-							var checkAutocomplete = oldValue == true? false : true;
+							var checkAutocomplete = oldValue == true || options.autocompleteOptions.noCheck ? false : true;
 							// check if the Value ist new
 							var isNewResult = isNew($(this).val(), checkAutocomplete);
 							if(isNewResult[0] === true || (isNewResult[0] === false && typeof isNewResult[1] == 'string')) {
diff --git a/plugins/tasklist/skins/larry/iehacks.css b/plugins/tasklist/skins/larry/iehacks.css
index 9b51999f..24ebaadd 100644
--- a/plugins/tasklist/skins/larry/iehacks.css
+++ b/plugins/tasklist/skins/larry/iehacks.css
@@ -55,7 +55,7 @@ html.ie7 #taskselector li.selected.overdue .count {
 	color: #fff;
 }
 
-html.ie7 #tagslist li,
+html.ie7 .tagcloud li,
 html.ie7 #taskselector li {
 	float: left;
 }
diff --git a/plugins/tasklist/skins/larry/tasklist.css b/plugins/tasklist/skins/larry/tasklist.css
index 14776e15..1ace07db 100644
--- a/plugins/tasklist/skins/larry/tasklist.css
+++ b/plugins/tasklist/skins/larry/tasklist.css
@@ -77,7 +77,7 @@ body.attachmentwin #topnav .topright {
 	padding-right: 0.3em;
 }
 
-#tagslist li,
+.tagcloud li,
 #taskselector li a {
 	display: inline-block;
 	color: #004458;
@@ -108,7 +108,7 @@ body.attachmentwin #topnav .topright {
 	color: #97b3bf;
 }
 
-#tagslist li.selected,
+.tagcloud li.selected,
 #taskselector li.selected a {
 	color: #fff;
 	background: #005d76;
@@ -171,13 +171,13 @@ body.attachmentwin #topnav .topright {
 	border-color: #ff3800 transparent;
 }
 
-#tagslist {
+.tagcloud {
 	padding: 0;
 	margin: 6px;
 	list-style: none;
 }
 
-#tagslist li {
+.tagcloud li {
 	display: inline-block;
 	color: #004458;
 	padding-right: 0.2em;
@@ -187,14 +187,14 @@ body.attachmentwin #topnav .topright {
 	cursor: pointer;
 }
 
-#tagslist li.inactive {
+.tagcloud li.inactive {
 	color: #89b3be;
 	padding-right: 0.6em;
 	font-size: 80%;
 /*	display: none; */
 }
 
-#tagslist li .count {
+.tagcloud li .count {
 	position: relative;
 	top: -1px;
 	margin-left: 5px;
@@ -212,7 +212,7 @@ body.attachmentwin #topnav .topright {
 }
 
 .tag-draghelper .tag .count,
-#tagslist li.inactive .count {
+.tagcloud li.inactive .count {
 	display: none;
 }
 
diff --git a/plugins/tasklist/skins/larry/templates/mainview.html b/plugins/tasklist/skins/larry/templates/mainview.html
index 03557bbe..3905072a 100644
--- a/plugins/tasklist/skins/larry/templates/mainview.html
+++ b/plugins/tasklist/skins/larry/templates/mainview.html
@@ -19,7 +19,7 @@
 		<div id="tagsbox" class="uibox listbox">
 			<h2 class="boxtitle"><roundcube:label name="tasklist.tags" id="taglist" /></h2>
 			<div class="scroller">
-				<roundcube:object name="plugin.tagslist" id="tagslist" />
+				<roundcube:object name="plugin.tagslist" id="tagslist" class="tagcloud" />
 			</div>
 		</div>
 
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 745d6763..62a7a76c 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -1205,7 +1205,7 @@ function rcube_tasklist_ui(settings)
             animSpeed: 100,
             allowEdit: false,
             checkNewEntriesCaseSensitive: false,
-            autocompleteOptions: { source: tags, minLength: 0 },
+            autocompleteOptions: { source: tags, minLength: 0, noCheck: true },
             texts: { removeLinkTitle: rcmail.gettext('removetag', 'tasklist') }
         });
 
@@ -1341,9 +1341,6 @@ function rcube_tasklist_ui(settings)
           resizable: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
           closeOnEscape: false,
           title: rcmail.gettext((action == 'edit' ? 'edittask' : 'newtask'), 'tasklist'),
-          open: function() {
-            $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
-          },
           close: function() {
               editform.hide().appendTo(document.body);
               $dialog.dialog('destroy').remove();
@@ -1667,12 +1664,7 @@ function rcube_tasklist_ui(settings)
           resizable: true,
           closeOnEscape: false,
           title: rcmail.gettext((list.id ? 'editlist' : 'createlist'), 'tasklist'),
-          open: function() {
-            $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
-          },
-          close: function() {
-            $dialog.dialog('destroy').hide();
-          },
+          close: function() { $dialog.dialog('destroy').hide(); },
           buttons: buttons,
           minWidth: 400,
           width: 420