From f5d59ca004bd458b0018830f1081e71da952a697 Mon Sep 17 00:00:00 2001
From: Mac Knight <mknight1996@gmail.com>
Date: Wed, 7 Feb 2018 11:56:40 -0500
Subject: [PATCH] connect close_and_halt via id_actions_dict

---
 notebook/static/notebook/js/menubar.js | 5 +----
 notebook/templates/notebook.html       | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/notebook/static/notebook/js/menubar.js b/notebook/static/notebook/js/menubar.js
index 12538e98f..17a6945a2 100644
--- a/notebook/static/notebook/js/menubar.js
+++ b/notebook/static/notebook/js/menubar.js
@@ -231,10 +231,6 @@ define([
             }
         });
 
-        this.element.find('#kill_and_exit').click(function () {
-            that.notebook.close_and_halt();
-        });
-
         // View
         this._add_celltoolbar_list();
 
@@ -254,6 +250,7 @@ define([
             '#restart_kernel': 'confirm-restart-kernel',
             '#restart_clear_output': 'confirm-restart-kernel-and-clear-output',
             '#restart_run_all': 'confirm-restart-kernel-and-run-all-cells',
+            '#close_and_halt': 'close-and-halt',
             '#int_kernel': 'interrupt-kernel',
             '#cut_cell': 'cut-cell',
             '#copy_cell': 'copy-cell',
diff --git a/notebook/templates/notebook.html b/notebook/templates/notebook.html
index 19603642c..589efdd47 100644
--- a/notebook/templates/notebook.html
+++ b/notebook/templates/notebook.html
@@ -124,7 +124,7 @@ data-notebook-path="{{notebook_path | urlencode}}"
                             title="{% trans %}Trust the output of this notebook{% endtrans %}">
                             <a href="#" >{% trans %}Trust Notebook{% endtrans %}</a></li>
                         <li class="divider"></li>
-                        <li id="kill_and_exit"
+                        <li id="close_and_halt"
                             title="{% trans %}Shutdown this notebook's kernel, and close this window{% endtrans %}">
                             <a href="#" >{% trans %}Close and Halt{% endtrans %}</a></li>
                     </ul>