Clean up FuzzyBookmarkCompletionSource class definition

2 files changed, 24 insertions, 27 deletions

diff --git a/lib/completion.js b/lib/completion.js
index 14c2dbe4..bb869206 100644
--- a/lib/completion.js
+++ b/lib/completion.js
@@ -116,33 +116,31 @@ var completion = (function() {
   });
 
   /** A fuzzy bookmark completer */
-  var FuzzyBookmarkCompletionSource = function() {
-    AsyncCompletionSource.call(this);
-  }
-  utils.extend(AsyncCompletionSource, FuzzyBookmarkCompletionSource);
-
-  FuzzyBookmarkCompletionSource.prototype.traverseTree = function(bookmarks, results) {
-    var self = this;
-    bookmarks.forEach(function(bookmark) {
-      results.push(bookmark);
-      if (bookmark.children === undefined)
-        return;
-      self.traverseTree(bookmark.children, results);
-    });
-  }
-
-  FuzzyBookmarkCompletionSource.prototype.refresh = function() {
-    var self = this; self.reset();
-    chrome.bookmarks.getTree(function(bookmarks) {
-      var results = [];
-      self.traverseTree(bookmarks, results);
+  var FuzzyBookmarkCompletionSource = AsyncCompletionSource.extend({
+    traverseTree: function(bookmarks, results) {
+      var self = this;
+      bookmarks.forEach(function(bookmark) {
+        results.push(bookmark);
+        if (bookmark.children === undefined)
+          return;
+        self.traverseTree(bookmark.children, results);
+      });
+    },
 
-      self.resultsReady(results.filter(function(b) { return b.url !== undefined; })
-                              .map(function(bookmark) {
-        return self.createInternalMatch('bookmark', bookmark);
-      }));
-    });
-  }
+    refresh: function() {
+      var self = this;
+      self.reset();
+      chrome.bookmarks.getTree(function(bookmarks) {
+        var results = [];
+        self.traverseTree(bookmarks, results);
+
+        self.resultsReady(results.filter(function(b) { return b.url !== undefined; })
+                                .map(function(bookmark) {
+          return self.createInternalMatch('bookmark', bookmark);
+        }));
+      });
+    }
+  });
 
   /** A fuzzy history completer */
   var FuzzyHistoryCompletionSource = function(maxResults) {
diff --git a/lib/utils.js b/lib/utils.js
index d6b7bb93..a5887e89 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -165,7 +165,6 @@ Function.prototype.proxy = function(self) {
   return function() { return fn.apply(self, arguments); };
 };
 
-
 /*
  * Simple JavaScript Inheritance, by John Resig.
  * This provides a short syntax for organizing code into classes.