Changeset 19849

Timestamp:

11/30/15 23:40:05 (9 years ago)

Author:

dlcheng

Message:

CHG: Tentative fix for javascript display colorbar sizing

File:

• issm/trunk-jpl/src/m/plot/applyoptions.js (modified) (2 diffs)

issm/trunk-jpl/src/m/plot/applyoptions.js

@@ -143 +143 @@
                         var color;
                         var cheightoffset = options.getfieldvalue('colorbarfontsize',16);
-
                         var ccontext,ccanvas,ccanvasid;
                         ccanvasid=options.getfieldvalue('colorbarcanvasid',options.getfieldvalue('canvasid')+'_colorbar');
@@ -149 +148 @@
                         if(ccanvas==null){
                                 ccanvas = $('<canvas id="'+ccanvasid+' width="'+String(cwidth*4)+'" height="'+String(cheight+cheightoffset)+'"></canvas>').insertAfter('#'+options.getfieldvalue('canvasid'));
-                                ccanvas.css({'position':'relative','top':((canvassize-cheight-cheightoffset)/-2).toFixed(2)+'px'});
+                                ccanvas.css({'display':'inline-block','position':'relative','top':((canvassize-cheight-cheightoffset)/-2).toFixed(2)+'px'});
                                 ccontext = ccanvas[0].getContext('2d');
                         }
                         else{
                                 ccanvas = $('#'+ccanvasid);
-                                ccanvas.height(cwidth*4);
-                                ccanvas.width(cheight+cheightoffset);   
-                                ccanvas.css({'position':'relative','top':((canvassize-cheight-cheightoffset)/-2).toFixed(2)+'px'});
+                                if (options.exist('colorbarcanvasid')){
+                                        cheight=ccanvas.height();
+                                        cwidth=ccanvas.width(); 
+                                }
+                                ccanvas.css({'display':'inline-block','position':'relative','top':((canvassize-cheight-cheightoffset)/-2).toFixed(2)+'px'});
                                 ccontext = ccanvas[0].getContext('2d');
                                 /*erase existing colorbar:*/