Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Correctly choose z-axis vs no z-axis label for Axes.

Global variable andes.drawing.zAxisEnabled just sets
default value in dojox/drawing.  Generally, the help server
sets the value when starting a problem.
  • Loading branch information...
commit 4c79c3c607983bf66fe5e17fdcce4c4114214d36 1 parent 65b3c71
@bvds authored
Showing with 3 additions and 2 deletions.
  1. +1 −1  web-UI/andes/convert.js
  2. +2 −1  web-UI/andes/drawing.js
View
2  web-UI/andes/convert.js
@@ -192,7 +192,7 @@ define([
obj.data.text = o.text;
}else if(o.type=="axes"){
obj.label = o['x-label']+" and "+o['y-label'];
- if(window.andes.defaults.zAxisEnabled){
+ if(o['z-label']){
obj.label += " and "+o['z-label'];
}
}
View
3  web-UI/andes/drawing.js
@@ -154,7 +154,8 @@ define([
if(hasLabel[item.type]){
// axes
// default labels for an axes
- props.data.text = window.andes.defaults.zAxisEnabled?
+ // This is the switch used in dojox/drawing/tools/custom/Axes.js:
+ props.data.text = item.style.zAxisEnabled?
"x and y and z":"x and y";
}
// create statement for vector, rect, ellipse, or axes
Please sign in to comment.
Something went wrong with that request. Please try again.