statusbar: improve how colorbar size is calculated and add defensive …

…checks
freethoughtdesign · Oct 9, 2020 · b2028f2 · b2028f2
1 parent 40b9374
commit b2028f2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/js9-allinone.js b/js9-allinone.js
diff --git a/js9.js b/js9.js
@@ -10634,7 +10634,8 @@ JS9.Display.prototype.resize = function(width, height, opts){
 	if( pinst ){
 	    $(`#${this.id}Statusbar`).css("width", nwidth);
 	    // resize colorbar, if necessary
-	    if( pinst.statusBar.match(/\$colorbar/) &&
+	    if( pinst.statusBar &&
+		pinst.statusBar.match(/\$colorbar/) &&
 		opts.resizeStatusbarColorbar !== false ){
 		pinst.colorwidth = Math.max(pinst.colorwidth + width - owidth,
 					    JS9.Statusbar.COLORWIDTH);

diff --git a/js9.min.js b/js9.min.js
diff --git a/js9plugins.js b/js9plugins.js
@@ -13169,8 +13169,7 @@ JS9.Statusbar.init = function(width, height){
     this.height = parseInt(this.divjq.css("height"), 10);
     // colorbar width stretches with statusbar
     this.colorwidth = parseInt(this.divjq.attr("data-colorbarWidth"), 10) ||
-	Math.max(this.width - 512 + JS9.Statusbar.COLORWIDTH,
-		 JS9.Statusbar.COLORWIDTH);
+	JS9.Statusbar.COLORWIDTH + Math.max(this.display.width - 512, 0);
     this.colorheight = parseInt(this.divjq.attr("data-colorbarHeight"), 10) ||
 	JS9.Statusbar.COLORHEIGHT;
     // clean plugin container

diff --git a/plugins/core/statusbar.js b/plugins/core/statusbar.js
@@ -195,8 +195,7 @@ JS9.Statusbar.init = function(width, height){
     this.height = parseInt(this.divjq.css("height"), 10);
     // colorbar width stretches with statusbar
     this.colorwidth = parseInt(this.divjq.attr("data-colorbarWidth"), 10) ||
-	Math.max(this.width - 512 + JS9.Statusbar.COLORWIDTH,
-		 JS9.Statusbar.COLORWIDTH);
+	JS9.Statusbar.COLORWIDTH + Math.max(this.display.width - 512, 0);
     this.colorheight = parseInt(this.divjq.attr("data-colorbarHeight"), 10) ||
 	JS9.Statusbar.COLORHEIGHT;
     // clean plugin container