Bug 932305 - The Cmd-D shortcut no longer works, r=past, a=bajaj

browser/devtools/debugger/debugger-view.js

@@ -190,16 +190,20 @@ let DebuggerView = {
 
     // This needs to be more localizable: see bug 929234.
     let extraKeys = {};
-    let tokenSearch = document.getElementById("tokenSearchKey").getAttribute("key");
-    let globalSearch = document.getElementById("globalSearchKey").getAttribute("key");
-    let tokenSearchShortcut = Editor.accel(tokenSearch);
-    let globalSearchShortcut = Editor.accel(globalSearch, { alt: true });
-    extraKeys[tokenSearchShortcut] = () => this.Filtering._doTokenSearch();
-    extraKeys[globalSearchShortcut] = () => this.Filtering._doGlobalSearch();
+    bindKey("_doTokenSearch", "tokenSearchKey");
+    bindKey("_doGlobalSearch", "globalSearchKey", { alt: true });
+    bindKey("_doFunctionSearch", "functionSearchKey");
+
     extraKeys[(Services.appinfo.OS == "Darwin" ? "Cmd-" : "Ctrl-") + "F"] = (cm) => {
       DebuggerView.Filtering._doTokenSearch();
     };
 
+    function bindKey(func, key, modifiers = {}) {
+      let key = document.getElementById(key).getAttribute("key");
+      let shortcut = Editor.accel(key, modifiers);
+      extraKeys[shortcut] = () => DebuggerView.Filtering[func]();
+    }
+
     this.editor = new Editor({
       mode: Editor.modes.text,
       readOnly: true,