delete _ylabels_inside, _ylabels_inside_color

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51879 954022d7-b5bf-4e40-9824-e11837661b57

Common/Charts/libraries/OfficeExcel.bar.js

@@ -854,14 +854,8 @@
 				underline: this._otherProps._ylabels_underline
 			}
 
-            if (this._otherProps._ylabels_inside == true) {
-                var xpos  = this._otherProps._yaxispos == 'left' ? this._chartGutter._left + 5 : OfficeExcel.GetWidth(this) - this._chartGutter._right - 5;
-                var align = this._otherProps._yaxispos == 'left' ? 'left' : 'right';
-                var boxed = true;
-            } else {
-                var xpos  = this._otherProps._yaxispos == 'left' ? this._chartGutter._left - 5 : this.canvas.width - this._chartGutter._right + 5;
-                var boxed = false;
-            }
+            var xpos  = this._otherProps._yaxispos == 'left' ? this._chartGutter._left - 5 : this.canvas.width - this._chartGutter._right + 5;
+            var boxed = false;
             
              if('auto' == numYLabels)
             {
@@ -987,23 +981,13 @@
             var units_pre  = this._otherProps._units_pre;
             var units_post = this._otherProps._units_post;
             var context = this.context;
-            var align   = '';
-            var xpos    = 0;
-            var boxed   = false;
 
             this.context.fillStyle = this._otherProps._text_color;
             this.context.strokeStyle = 'black';
 
-            if (this._otherProps._ylabels_inside == true) {
-                var xpos  = this._otherProps._yaxispos == 'left' ? this._chartGutter._left + 5 : OfficeExcel.GetWidth(this) - this._chartGutter._right - 5;
-                var align = this._otherProps._yaxispos == 'left' ? 'left' : 'right';
-                var boxed = true;
-            } else {
-                var xpos  = this._otherProps._yaxispos == 'left' ? this._chartGutter._left - 5 : OfficeExcel.GetWidth(this) - this._chartGutter._right + 5;
-                var align = this._otherProps._yaxispos == 'left' ? 'right' : 'left';
-                var boxed = false;
-            }
-
+            var xpos  = this._otherProps._yaxispos == 'left' ? this._chartGutter._left - 5 : OfficeExcel.GetWidth(this) - this._chartGutter._right + 5;
+            var align = this._otherProps._yaxispos == 'left' ? 'right' : 'left';
+            var boxed = false;
 
             /**
             * Draw specific Y labels here so that the local variables can be reused
@@ -1139,14 +1123,8 @@
 				underline: this._otherProps._xlabels_underline
 			}
 
-            if (this._otherProps._ylabels_inside == true) {
-                var xpos  = this._otherProps._yaxispos == 'left' ? this._chartGutter._left + 5 : OfficeExcel.GetWidth(this) - this._chartGutter._right - 5;
-                var align = this._otherProps._yaxispos == 'left' ? 'left' : 'right';
-                var boxed = true;
-            } else {
-                var xpos  = this._otherProps._yaxispos == 'left' ? this._chartGutter._left - 5 : OfficeExcel.GetWidth(this) - this._chartGutter._right + 5;
-                var boxed = false;
-            }
+            var xpos  = this._otherProps._yaxispos == 'left' ? this._chartGutter._left - 5 : OfficeExcel.GetWidth(this) - this._chartGutter._right + 5;
+            var boxed = false;
             
             /**
             * Draw specific Y labels here so that the local variables can be reused

Common/Charts/libraries/OfficeExcel.chartProperties.js

@@ -56,8 +56,6 @@ OfficeExcel.OtherProps = function()
 
     this._ylabels = true;
     this._ylabels_count = 5;
-    this._ylabels_inside = false;
-    this._ylabels_inside_color = null;
     this._ylabels_specific = null;
 
     this._labels = [];

Common/Charts/libraries/OfficeExcel.line.js

@@ -473,25 +473,7 @@
 
             var numYLabels = this._otherProps._ylabels_count;
             var bounding   = false;
-            var bgcolor    = this._otherProps._ylabels_inside ? this._otherProps._ylabels_inside_color : null;	
-
-
-            /**
-            * If the Y labels are inside the Y axis, invert the alignment
-            */
-            if (this._otherProps._ylabels_inside == true && align == 'left') {
-                xpos -= 10;
-                align = 'right';
-                bounding = true;
-
-
-            } else if (this._otherProps._ylabels_inside == true && align == 'right') {
-                xpos += 10;
-                align = 'left';
-                bounding = true;
-            }
-
-
+            var bgcolor    = null;
 
             if (this._otherProps._xaxispos == 'center') {
                 var half = this.grapharea / 2;
@@ -689,22 +671,8 @@
             if (this._otherProps._yaxispos == 'left') {
                 var x = this._chartGutter._left - 5;
 
-                if (this._otherProps._ylabels_inside) {
-                    x += 10;
-                    halign   = 'left';
-                    bounding = true;
-                    bgcolor  = 'rgba(255,255,255,0.5)';
-                }
-
             } else if (this._otherProps._yaxispos == 'right') {
                 var x = this.canvas.width - this._chartGutter._right + 5;
-
-                if (this._otherProps._ylabels_inside) {
-                    x -= 10;
-                    halign = 'right';
-                    bounding = true;
-                    bgcolor  = 'rgba(255,255,255,0.5)';
-                }
             }
 
 

Common/Charts/libraries/OfficeExcel.scatter.js

@@ -399,16 +399,11 @@
         this.context.fillStyle = this._otherProps._text_color;
         var font       = this._otherProps._ylabels_font;
         var xMin       = this._otherProps._xmin;
-        var xMax       = this._otherProps._xmax;
-        var yMax       = this.scale[this.scale.length - 1];
-        var yMin       = this._otherProps._ymin;
         var text_size  = this._otherProps._ylabels_size;
         var units_pre  = this._otherProps._units_pre;
         var units_post = this._otherProps._units_post;
         var numYLabels = this._otherProps._ylabels_count;
-        var inside     = this._otherProps._ylabels_inside;
         var context    = this.context;
-        var canvas     = this.canvas;
         var boxed      = false;
 
         this.halfTextHeight = text_size / 2;
@@ -429,19 +424,7 @@
 				color: this._otherProps._ylabels_color,
 				underline: this._otherProps._ylabels_underline,
 				italic: this._otherProps._ylabels_italic
-			}	
-			
-            if (inside) {
-                if (this._otherProps._yaxispos == 'left') {
-                    xPos  = this._chartGutter._left + 5;
-                    align = 'left';
-                    boxed = true;
-                } else {
-                    xPos  = this.canvas.width - this._chartGutter._right - 5;
-                    align = 'right';
-                    boxed = true;
-                }
-            }
+			}
 
             if (this._otherProps._xaxispos == 'center') {
 
@@ -560,23 +543,6 @@
                 var xPos  = this._otherProps._yaxispos == 'left' ? this._chartGutter._left - 5 : this.canvas.width - this._chartGutter._right + 5;
                 var align = this._otherProps._yaxispos == 'right' ? 'left' : 'right';
 
-                if (inside) {
-                    if (this._otherProps._yaxispos == 'left') {
-                        xPos  = this._chartGutter._left + 5;
-                        align = 'left';
-                        boxed = true;
-                    } else {
-                        xPos  = this.canvas.width - this._chartGutter._right - 5;
-                        align = 'right';
-                        boxed = true;
-                    }
-                }
-                /**
-                * Specific Y labels
-                */
-                
-                
-                
                 if('auto' == numYLabels)
                 {
                      align = 'right';