From bf75c36aef2458df5afc9f974e9073ee442c3922 2014-12-05 20:06:55
From: Min RK <benjaminrk@gmail.com>
Date: 2014-12-05 20:06:55
Subject: [PATCH] store current kernel selection in frontend config

instead of localStorage

---

diff --git a/IPython/html/static/tree/js/main.js b/IPython/html/static/tree/js/main.js
index 7eb99c9..6982b6f 100644
--- a/IPython/html/static/tree/js/main.js
+++ b/IPython/html/static/tree/js/main.js
@@ -8,6 +8,7 @@ require([
     'base/js/events',
     'base/js/page',
     'base/js/utils',
+    'services/config',
     'contents',
     'tree/js/notebooklist',
     'tree/js/clusterlist',
@@ -27,6 +28,7 @@ require([
     events,
     page,
     utils,
+    config,
     contents_service,
     notebooklist,
     clusterlist,
@@ -43,6 +45,10 @@ require([
         base_url: utils.get_body_data("baseUrl"),
         notebook_path: utils.get_body_data("notebookPath"),
     };
+    var cfg = new config.ConfigSection('tree', common_options);
+    cfg.load();
+    common_options.config = cfg;
+    
     var session_list = new sesssionlist.SesssionList($.extend({
         events: events}, 
         common_options));
diff --git a/IPython/html/static/tree/js/newnotebook.js b/IPython/html/static/tree/js/newnotebook.js
index 6a50391..a860712 100644
--- a/IPython/html/static/tree/js/newnotebook.js
+++ b/IPython/html/static/tree/js/newnotebook.js
@@ -15,6 +15,7 @@ define([
         this.notebook_path = options.notebook_path;
         this.contents = options.contents;
         this.current_selection = null;
+        this.config = options.config;
         this.kernelspecs = {};
         if (this.selector !== undefined) {
             this.element = $(selector);
@@ -38,6 +39,7 @@ define([
     
     NewNotebookWidget.prototype._load_kernelspecs = function (data) {
         /** load kernelspec list */
+        var that = this;
         this.kernelspecs = data.kernelspecs;
         var menu = this.element.find("#new-notebook-menu");
         var keys = Object.keys(data.kernelspecs).sort(function (a, b) {
@@ -69,17 +71,30 @@ define([
             );
             menu.append(li);
         }
-        this._load_default_kernelspec(data['default']);
+        this.config.loaded.then(function () {
+            that._load_default_kernelspec(data['default']);
+        });
     };
     
     NewNotebookWidget.prototype._load_default_kernelspec = function (default_name) {
         /** load default kernelspec name from localStorage, if defined */
-        this.select_kernel(localStorage.default_kernel_name || default_name);
+        if (this.config.data.NewNotebookWidget &&
+            this.config.data.NewNotebookWidget.current_selection &&
+            this.kernelspecs[this.config.data.NewNotebookWidget.current_selection] !== undefined
+        ) {
+            default_name = this.config.data.NewNotebookWidget.current_selection;
+        }
+        this.select_kernel(default_name);
     };
 
     NewNotebookWidget.prototype.select_kernel = function (kernel_name) {
         /** select the current default kernel */
         this.current_selection = kernel_name;
+        this.config.update({
+            NewNotebookWidget: {
+                current_selection: kernel_name
+            }
+        });
         var spec = this.kernelspecs[kernel_name];
         var display_name;
         if (spec) {