Feb 8, 2018 · Feb 7, 2018 · Feb 7, 2018 · Feb 7, 2018 · Feb 7, 2018
diff --git a/notebook/static/notebook/js/actions.js b/notebook/static/notebook/js/actions.js
              // Execute a CM command
              selected_cell.code_mirror.execCommand('indentAuto');
            }
        },
        'close-and-halt': {
            cmd: i18n.msg._('shutdown kernel and close window'),
            help : i18n.msg._('shutdown kernel and close window'),
            handler : function(env) {
                env.notebook.close_and_halt();
            }
        }
    };

diff --git a/notebook/static/notebook/js/menubar.js b/notebook/static/notebook/js/menubar.js
            }
        });

        this.element.find('#kill_and_exit').click(function () {
            var close_window = function () {
                /**
                 * allow closing of new tabs in Chromium, impossible in FF
                 */
                window.open('', '_self', '');
                window.close();
            };
            // finish with close on success or failure
            that.notebook.session.delete(close_window, close_window);
        });

        // View
        this._add_celltoolbar_list();

                notebook: that.notebook,
                keyboard_manager: that.notebook.keyboard_manager});
        });


        var id_actions_dict = {
            '#trust_notebook' : 'trust-notebook',
            '#rename_notebook' : 'rename-notebook',
            '#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/static/notebook/js/notebook.js b/notebook/static/notebook/js/notebook.js
        return promise;
    };

    /**
     *
     * Halt the kernel and close the notebook window
     */
    Notebook.prototype.close_and_halt = function () {
        var close_window = function () {
            /**
             * allow closing of new tabs in Chromium, impossible in FF
             */
                window.open('', '_self', '');
                window.close();
        };
            // finish with close on success or failure
            this.session.delete(close_window, close_window);
    };

    /**
     * Execute cells corresponding to the given indices.
     *
diff --git a/notebook/templates/notebook.html b/notebook/templates/notebook.html
                            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>
diff --git a/notebook/tests/notebook/shutdown.js b/notebook/tests/notebook/shutdown.js
    this.waitForPopup('');
    this.withPopup('', function () {
        this.thenEvaluate(function () {
            $('#kill_and_exit').click();
            $('#close_and_halt').click();
        });

        this.thenEvaluate(function () {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -694,6 +694,13 @@ define([
		// Execute a CM command
		selected_cell.code_mirror.execCommand('indentAuto');
		}
		},
		'close-and-halt': {
		cmd: i18n.msg._('shutdown kernel and close window'),
		help : i18n.msg._('shutdown kernel and close window'),
		handler : function(env) {
		env.notebook.close_and_halt();
		}
		}
		};

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -231,18 +231,6 @@ define([
		}
		});

		this.element.find('#kill_and_exit').click(function () {
		var close_window = function () {
		/**
		* allow closing of new tabs in Chromium, impossible in FF
		*/
		window.open('', '_self', '');
		window.close();
		};
		// finish with close on success or failure
		that.notebook.session.delete(close_window, close_window);
		});

		// View
		this._add_celltoolbar_list();

Expand All		@@ -252,7 +240,7 @@ define([
		notebook: that.notebook,
		keyboard_manager: that.notebook.keyboard_manager});
		});


		var id_actions_dict = {
		'#trust_notebook' : 'trust-notebook',
		'#rename_notebook' : 'rename-notebook',
Expand All		@@ -262,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',
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2399,6 +2399,22 @@ define([
		return promise;
		};

		/**
		*
		* Halt the kernel and close the notebook window
		*/
		Notebook.prototype.close_and_halt = function () {
		var close_window = function () {
		/**
		* allow closing of new tabs in Chromium, impossible in FF
		*/
		window.open('', '_self', '');
		window.close();
		};
		// finish with close on success or failure
		this.session.delete(close_window, close_window);
		};

		/**
		* Execute cells corresponding to the given indices.
		*
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -124,7 +124,7 @@
		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>
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,7 +25,7 @@ casper.notebook_test(function () {
		this.waitForPopup('');
		this.withPopup('', function () {
		this.thenEvaluate(function () {
		$('#kill_and_exit').click();
		$('#close_and_halt').click();
		});

		this.thenEvaluate(function () {
Expand Down