upstream/ipython Commit - r19271:bc6ccc9f

14

this.base_url = options.base_url;

14

this.base_url = options.base_url;

15

this.notebook_path = options.notebook_path;

15

this.notebook_path = options.notebook_path;

16

this.contents = options.contents;

16

this.contents = options.contents;

17

this.~~current_selection~~ = null;

17

this.default_kernel = null;

18

this.config = options.config;

18

this.config = options.config;

19

this.kernelspecs = {};

19

this.kernelspecs = {};

20

if (this.selector !== undefined) {

20

if (this.selector !== undefined) {

74

NewNotebookWidget.prototype._load_default_kernelspec = function (default_name) {

74

NewNotebookWidget.prototype._load_default_kernelspec = function (default_name) {

75

/** load default kernelspec name from config, if defined */

75

/** load default kernelspec name from config, if defined */

76

if (this.config.data.NewNotebookWidget &&

76

if (this.config.data.NewNotebookWidget &&

77

this.config.data.NewNotebookWidget.~~current_selection~~ &&

77

this.config.data.NewNotebookWidget.default_kernel &&

78

this.kernelspecs[this.config.data.NewNotebookWidget.~~current_selection~~] !== undefined

78

this.kernelspecs[this.config.data.NewNotebookWidget.default_kernel] !== undefined

79

) {

79

) {

80

default_name = this.config.data.NewNotebookWidget.~~current_selection~~;

80

default_name = this.config.data.NewNotebookWidget.default_kernel;

81

}

81

}

82

this.set_default_kernel(default_name);

82

this.set_default_kernel(default_name);

83

};

83

};

84

85

NewNotebookWidget.prototype.set_default_kernel = function (kernel_name) {

85

NewNotebookWidget.prototype.set_default_kernel = function (kernel_name) {

86

/** select the current default kernel */

86

/** select the current default kernel */

87

this.~~current_selection~~ = kernel_name;

87

this.default_kernel = kernel_name;

88

this.config.update({

88

this.config.update({

89

NewNotebookWidget: {

89

NewNotebookWidget: {

90

~~current_selection~~: kernel_name

90

default_kernel: kernel_name

91

}

91

}

92

});

92

});

93

var spec = this.kernelspecs[kernel_name];

93

var spec = this.kernelspecs[kernel_name];

108

NewNotebookWidget.prototype.new_notebook = function (kernel_name) {

108

NewNotebookWidget.prototype.new_notebook = function (kernel_name) {

109

/** create and open a new notebook */

109

/** create and open a new notebook */

110

var that = this;

110

var that = this;

111

kernel_name = kernel_name || this.~~current_selection~~;

111

kernel_name = kernel_name || this.default_kernel;

112

var w = window.open();

112

var w = window.open();

113

this.contents.new_untitled(that.notebook_path, {type: "notebook"}).then(

113

this.contents.new_untitled(that.notebook_path, {type: "notebook"}).then(

114

function (data) {

114

function (data) {

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

                     this.base_url = options.base_url;
                     this.notebook_path = options.notebook_path;
                     this.contents = options.contents;
-                    this.current_selection = null;
+                    this.default_kernel = null;
                     this.config = options.config;
                     this.kernelspecs = {};
                     if (this.selector !== undefined) {
                 NewNotebookWidget.prototype._load_default_kernelspec = function (default_name) {
                     /** load default kernelspec name from config, if defined */
                     if (this.config.data.NewNotebookWidget &&
-                        this.config.data.NewNotebookWidget.current_selection &&
+                        this.config.data.NewNotebookWidget.default_kernel &&
-                        this.kernelspecs[this.config.data.NewNotebookWidget.current_selection] !== undefined
+                        this.kernelspecs[this.config.data.NewNotebookWidget.default_kernel] !== undefined
                     ) {
-                        default_name = this.config.data.NewNotebookWidget.current_selection;
+                        default_name = this.config.data.NewNotebookWidget.default_kernel;
                     }
                     this.set_default_kernel(default_name);
                 };
                 NewNotebookWidget.prototype.set_default_kernel = function (kernel_name) {
                     /** select the current default kernel */
-                    this.current_selection = kernel_name;
+                    this.default_kernel = kernel_name;
                     this.config.update({
                         NewNotebookWidget: {
-                            current_selection: kernel_name
+                            default_kernel: kernel_name
                         }
                     });
                     var spec = this.kernelspecs[kernel_name];
                 NewNotebookWidget.prototype.new_notebook = function (kernel_name) {
                     /** create and open a new notebook */
                     var that = this;
-                    kernel_name = kernel_name || this.current_selection;
+                    kernel_name = kernel_name || this.default_kernel;
                     var w = window.open();
                     this.contents.new_untitled(that.notebook_path, {type: "notebook"}).then(
                         function (data) {