Move loading cookie to browser level

GMOD · Nov 28, 2018 · 9ae29b4 · 9ae29b4
1 parent f0d2c96
commit 9ae29b4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/JBrowse/Browser.js b/src/JBrowse/Browser.js
@@ -2174,6 +2174,7 @@ _addTrackConfigs: function( /**Array*/ configs ) {
         //     console.warn("track with label "+conf.label+" already exists, skipping");
         //     return;
         // }
+        this.loadTrackConfigFromCookie(conf);
 
         this.trackConfigsByName[conf.label] = conf;
         this.config.tracks.push( conf );
@@ -2197,7 +2198,7 @@ _replaceTrackConfigs: function( /**Array*/ newConfigs ) {
 
         this.trackConfigsByName[conf.label] =
                            dojo.mixin( this.trackConfigsByName[ conf.label ] || {}, conf );
-        this.saveConfig(conf);
+        this.saveTrackConfigToCookie(conf);
    },this);
 },
 /**
@@ -3427,12 +3428,20 @@ teardown: function() {
     }
 },
 
-saveConfig(config) {
+saveTrackConfigToCookie(config) {
     const c = Object.assign({}, config)
     delete c.store
     delete c.menuTemplate
     delete c.events
     this.cookie('track-' + config.label + '-config', JSON.stringify(c));
+},
+
+loadTrackConfigFromCookie(config) {
+    var cookie = this.cookie("track-" + config.label + '-config');
+    if (cookie) {
+        cookie = JSON.parse(cookie)
+        Object.assign(config, cookie)
+    }
 }
 
 });

diff --git a/src/JBrowse/View/Track/BlockBased.js b/src/JBrowse/View/Track/BlockBased.js
@@ -81,11 +81,6 @@ return declare( [Component,DetailsMixin,FeatureFiltererMixin,Destroyable],
 
         this.refSeq = args.refSeq;
         this.name = args.label || this.config.label;
-        var cookie = this.browser.cookie("track-" + this.name + '-config');
-        if (cookie) {
-            cookie = JSON.parse(cookie)
-            Object.assign(this.config, cookie)
-        }
         this.key = args.key || this.config.key || this.name;
 
         this._changedCallback = args.changeCallback || function(){};