Changeset 19852

Timestamp:

12/03/15 10:35:20 (9 years ago)

Author:

dlcheng

Message:

CHG: Fixing javascript colorbar behavior for predefined colorbars.

File:

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

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

@@ -144 +144 @@
                         var cheightoffset = options.getfieldvalue('colorbarfontsize',16);
                         var ccontext,ccanvas,ccanvasid;
-                        ccanvasid=options.getfieldvalue('colorbarcanvasid',options.getfieldvalue('canvasid')+'_colorbar');
-                        ccanvas=document.getElementById(ccanvasid);
-                        if(ccanvas==null){
+                        ccanvasid = options.getfieldvalue('colorbarcanvasid',options.getfieldvalue('canvasid')+'_colorbar');
+                        ccanvashtml = document.getElementById(ccanvasid);
+                        if(ccanvashtml==null){
                                 ccanvas = $('<canvas id="'+ccanvasid+'" width="'+String(cwidth+cheightoffset*4)+'" height="'+String(cheight+cheightoffset)+'"></canvas>').insertAfter('#'+options.getfieldvalue('canvasid'));
                                 ccanvas.css({'position':'relative','top':((canvassize-cheight-cheightoffset)/-2).toFixed(2)+'px'});
@@ -153 +153 @@
                         else{
                                 ccanvas = $('#'+ccanvasid);
-                                if (options.exist('colorbarcanvasid')){
+                                if (options.exist('colorbarcanvasid')&&!ccanvashtml.hasOwnProperty('init')){
                                         //store actual colobar size
-                                        cheight=ccanvas.height();
-                                        cwidth=ccanvas.width();
+                                        cwidth = ccanvas.width();
+                                        cheight = ccanvas.height();
                                         //get html object instead of jqurey object to modify height/width to accomodate labels
-                                        document.getElementById(ccanvasid).width=ccanvas.width()+cheightoffset*6;
-                                        document.getElementById(ccanvasid).width=ccanvas.height()+cheightoffset;
+                                        ccanvashtml.width = ccanvas.width()+cheightoffset*6;
+                                        ccanvas.css({'display':'inline-block'});
+                                        ccanvashtml.height = canvassize;
+                                        ccanvashtml.cwidth = cwidth;
+                                        ccanvashtml.cheight = cheight;
+                                        ccanvashtml.init = true;
+                                }
+                                else {
+                                        cwidth = ccanvashtml.cwidth;
+                                        cheight = ccanvashtml.cheight;
                                 }
                                 ccontext = ccanvas[0].getContext('2d');