Added withActiveTab function

Author: gsingh93

src/ContentScript.ts

@@ -0,0 +1,28 @@
+/// <reference path="d.ts/DefinitelyTyped/chrome/chrome.d.ts"/>
+
+module Utils {
+    export interface ActiveTabCallback {
+        (tab: chrome.tabs.Tab) : void;
+    }
+
+    export function withActiveTab(callback: ActiveTabCallback) {
+        chrome.tabs.query({ active: true, lastFocusedWindow: true },
+            function (tabs: chrome.tabs.Tab[]) {
+
+            console.assert(tabs.length == 1);
+            callback(tabs[0]);
+        });
+    }
+
+    export function sendCommand(commandName: string, responseHandler?: any): void {
+        (function (commandName, responseHandler) {
+            withActiveTab(function (tab: chrome.tabs.Tab) {
+                if (typeof responseHandler === "undefined") {
+                    responseHandler = null;
+                }
+                chrome.tabs.sendMessage(tab.id, { command: commandName },
+                    responseHandler);
+            });
+        })(commandName, responseHandler);
+    }
+}

src/Utils.ts

@@ -1,27 +1,26 @@
 /// <reference path="../d.ts/DefinitelyTyped/chrome/chrome.d.ts"/>
-/// <reference path="../ContentScript.ts"/>
+/// <reference path="../Utils.ts"/>
 /// <reference path="TabStateManager.ts"/>
 
 module KeyboardHandler {
     var lastCalled: number;
 
     export function init(tabStates: TabStateManager) {
         chrome.commands.onCommand.addListener(function (command: string) {
-            chrome.tabs.query({ active: true, lastFocusedWindow: true }, function (tabs) {
-                console.assert(tabs.length == 1);
-                var id = tabs[0].id;
+            Utils.withActiveTab(function (tab: chrome.tabs.Tab) {
+                var id = tab.id;
 
                 // The time hack is to get around this function being called twice when
                 // the popup is open
                 var d = new Date();
                 if (tabStates.exists(id) && tabStates.get(id, "searching")
                     && d.getTime() - lastCalled > 50) {
                     if (command == "next" || command == "prev") {
-                        ContentScript.sendCommand(command);
+                        Utils.sendCommand(command);
                     }
                     lastCalled = d.getTime();
                 }
             });
         });
     }
-}
+}

src/background/KeyboardHandler.ts

@@ -1,6 +1,6 @@
 /// <reference path="../d.ts/DefinitelyTyped/chrome/chrome.d.ts"/>
 /// <reference path="../bg-interface.ts"/>
-/// <reference path="../ContentScript.ts"/>
+/// <reference path="../Utils.ts"/>
 var logging = false;
 
 function log(message: string) {
@@ -9,10 +9,8 @@ function log(message: string) {
     }
 }
 
-chrome.tabs.query({active: true, lastFocusedWindow: true}, function (tabs) {
-    console.assert(tabs.length == 1);
-
-    var id = tabs[0].id;
+Utils.withActiveTab(function (tab: chrome.tabs.Tab) {
+    var id = tab.id;
     var tabStates = BackgroundInterface.getTabStateManager();
 
     // In most cases the map entry will already be initialized. However, there
@@ -33,11 +31,11 @@ chrome.tabs.query({active: true, lastFocusedWindow: true}, function (tabs) {
     }
 
     prevButton.addEventListener("click", function(event) {
-        ContentScript.sendCommand("prev");
+        Utils.sendCommand("prev");
     });
     nextButton.addEventListener("click", function(event) {
         if (tabState.searching) {
-            ContentScript.sendCommand("next");
+            Utils.sendCommand("next");
         } else {
             search();
         }
@@ -54,7 +52,7 @@ chrome.tabs.query({active: true, lastFocusedWindow: true}, function (tabs) {
 
         if (tabState.searching) {
             tabState.searching = false;
-            ContentScript.sendCommand("clear");
+            Utils.sendCommand("clear");
         }
 
         // Remove the invalid class if it's there