Merge and improve pull-request #704

2 files changed, 15 insertions, 22 deletions

diff --git a/assets/js/src/base.js b/assets/js/src/base.js
index 6e92eb31..05846ab8 100644
--- a/assets/js/src/base.js
+++ b/assets/js/src/base.js
@@ -242,6 +242,21 @@ var Kanboard = (function() {
             // Dropdown
             $(".dropit-submenu").hide();
             $('.dropdown').not(".dropit").dropit({ triggerParentEl : "span" });
+
+            if ($(".task-autocomplete").length) {
+            	$(".task-autocomplete").parent().find("input[type=submit]").attr('disabled','disabled');
+
+                $(".task-autocomplete").autocomplete({
+                    source: $(".task-autocomplete").data("search-url"),
+                    minLength: 2,
+                    select: function(event, ui) {
+                        var field = $(".task-autocomplete").data("dst-field");
+                        $("input[name=" + field + "]").val(ui.item.id);
+
+                        $(".task-autocomplete").parent().find("input[type=submit]").removeAttr('disabled');
+                    }
+                });
+            }
         }
     };
 
diff --git a/assets/js/src/task.js b/assets/js/src/task.js
deleted file mode 100644
index 2caf81cc..00000000
--- a/assets/js/src/task.js
+++ /dev/null
@@ -1,22 +0,0 @@
-Kanboard.Task = (function() {
-
-    jQuery(document).ready(function() {
-
-        if ($(".task-autocomplete").length) {
-
-            $("input[type=submit]").attr('disabled','disabled');
-
-            $(".task-autocomplete").autocomplete({
-                source: $(".task-autocomplete").data("search-url"),
-                minLength: 2,
-                select: function(event, ui) {
-                    var field = $(".task-autocomplete").data("dst-field");
-                    $("input[name=" + field + "]").val(ui.item.id);
-
-                    $("input[type=submit]").removeAttr('disabled');
-                }
-            });
-        }
-    });
-
-})();