Clean up JS

app/assets/javascripts/discourse/components/debounce.js

@@ -6,26 +6,22 @@
   @module Discourse
   @param {function} func The function to debounce
   @param {Numbers} wait how long to wait
-  @param {Boolean} trickle 
 **/
-Discourse.debounce = function(func, wait, trickle) {
+Discourse.debounce = function(func, wait) {
-  var timeout;
+  var timeout = null;
 
-  timeout = null;
   return function() {
-    var args, context, currentWait, later;
+    var context = this;
-    context = this;
+    var args = arguments;
-    args = arguments;
+
-    later = function() {
+    var later = function() {
       timeout = null;
       return func.apply(context, args);
     };
 
-    if (timeout && trickle) {
+    if (timeout) return;
-      // already queued, let it through
-      return;
-    }
 
+    var currentWait;
     if (typeof wait === "function") {
       currentWait = wait();
     } else {

app/assets/javascripts/discourse/components/user_search.js

@@ -5,15 +5,11 @@
   @namespace Discourse
   @module Discourse
 **/
-var cache, cacheTime, cacheTopicId, debouncedSearch, doSearch;
+var cache = {};
+var cacheTopicId = null;
+var cacheTime = null;
 
-cache = {};
+var doSearch = function(term, topicId, success) {
-
-cacheTopicId = null;
-
-cacheTime = null;
-
-doSearch = function(term, topicId, success) {
   return Discourse.ajax({
     url: Discourse.getURL('/users/search/users'),
     dataType: 'JSON',
@@ -29,16 +25,16 @@ doSearch = function(term, topicId, success) {
   });
 };
 
-debouncedSearch = Discourse.debounce(doSearch, 200);
+var debouncedSearch = Discourse.debounce(doSearch, 200);
 
 Discourse.UserSearch = {
+
   search: function(options) {
-    var callback, exclude, limit, success, term, topicId;
+    var term = options.term || "";
-    term = options.term || "";
+    var callback = options.callback;
-    callback = options.callback;
+    var exclude = options.exclude || [];
-    exclude = options.exclude || [];
+    var topicId = options.topicId;
-    topicId = options.topicId;
+    var limit = options.limit || 5;
-    limit = options.limit || 5;
     if (!callback) {
       throw "missing callback";
     }
@@ -55,20 +51,18 @@ Discourse.UserSearch = {
       cache = {};
     }
     cacheTopicId = topicId;
-    success = function(r) {
+    var success = function(r) {
-      var result;
+      var result = [];
-      result = [];
       r.users.each(function(u) {
         if (exclude.indexOf(u.username) === -1) {
           result.push(u);
         }
-        if (result.length > limit) {
+        if (result.length > limit) return false;
-          return false;
-        }
         return true;
       });
       return callback(result);
     };
+
     if (cache[term]) {
       success(cache[term]);
     } else {
@@ -76,6 +70,7 @@ Discourse.UserSearch = {
     }
     return true;
   }
+
 };