рефакторинг

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

Common/Charts/libraries/OfficeExcel.bar.js

@@ -225,15 +225,7 @@
         if (this._otherProps._annotatable) {
             OfficeExcel.Annotate(this);
         }
-        
-        /**
-        * This bit shows the mini zoom window if requested
-        */
-        if (this._zoom._mode == 'thumbnail' || this._zoom._mode == 'area') {
-            OfficeExcel.ShowZoomWindow(this);
-        }
 
-        
         /**
         * This function enables resizing
         */

Common/Charts/libraries/OfficeExcel.hbar.js

@@ -110,7 +110,7 @@
 
         this.scale = OfficeExcel.getScale(this.max, this);
          
-        //   
+        //определяем куда ставить ось
         var numNull = this._otherProps._background_grid_autofit_numhlines;
         var arrTemp = []
         if(typeof(this.data[0]) == 'object')
@@ -375,14 +375,6 @@
             OfficeExcel.Annotate(this);
         }
         
-        /**
-        * This bit shows the mini zoom window if requested
-        */
-        if (this._zoom._mode == 'thumbnail' || this._zoom._mode == 'area') {
-            OfficeExcel.ShowZoomWindow(this);
-        }
-
-        
         /**
         * This function enables resizing
         */

Common/Charts/libraries/OfficeExcel.line.js

@@ -432,14 +432,6 @@
         } else if (this._otherProps._filled && this._otherProps._filled_range)
             alert('[LINE] You must have only two sets of data for a filled range chart');
 
-        // Zoom
-        if (this._zoom._mode == 'thumbnail')
-            OfficeExcel.ShowZoomWindow(this);
-
-        // Zoom mode
-        if (this._zoom._mode == 'area')
-            OfficeExcel.ZoomArea(this);
-
         // Resizing
         if (this._otherProps._resizable)
             OfficeExcel.AllowResizing(this);
@@ -473,7 +465,7 @@
         
 		if('auto' == this._otherProps._ylabels_count && this._otherProps._xaxispos)
 		{
-			//îïðåäåëÿåì êóäà ñòàâèòü îñü
+			//определяем куда ставить ось
 			var numNull = this._otherProps._background_grid_autofit_numhlines;
 			var arrTemp = []
 			var k = 0;

Common/Charts/libraries/OfficeExcel.pie.js

@@ -497,13 +497,6 @@
         if (this._otherProps._annotatable) {
             OfficeExcel.Annotate(this);
         }
-        
-        /**
-        * This bit shows the mini zoom window if requested
-        */
-        if (this._zoom._mode == 'thumbnail' || this._zoom._mode == 'area') {
-            OfficeExcel.ShowZoomWindow(this);
-        }
 
         
         /**

Common/Charts/libraries/OfficeExcel.scatter.js

@@ -414,14 +414,6 @@
             OfficeExcel.Annotate(this);
         }
         
-        /**
-        * This bit shows the mini zoom window if requested
-        */
-        if (this._zoom._mode == 'thumbnail' || this._zoom._mode == 'area') {
-            OfficeExcel.ShowZoomWindow(this);
-        }
-
-        
         /**
         * This function enables resizing
         */
@@ -453,7 +445,7 @@
 		{
 			if('auto' == this._otherProps._ylabels_count)
 			{
-				//îïðåäåëÿåì êóäà ñòàâèòü îñü
+				//определяем куда ставить ось
 				var numNull = this._otherProps._background_grid_autofit_numvlines;
 				/*var arrTemp = [];
 				var k = 0;
@@ -522,7 +514,7 @@
 				} 
 				else if('auto' == this._otherProps._ylabels_count)
 				{
-					//îïðåäåëÿåì êóäà ñòàâèòü îñü
+					//определяем куда ставить ось
 					var numNull = this._otherProps._background_grid_autofit_numhlines;
 					/*var arrTemp = []
 					var k = 0;
@@ -1534,7 +1526,7 @@
 
 					var xPos = this.coords[i][j][0];
 					var yPos = this.coords[i][j][1];
-					//äëÿ âû÷èñëåíèÿ ñðåäíåãî
+					//для вычисления среднего
 					/*var summ = 0;
 					if(typeof this.coords[i][j][0] == "object")
 					{
@@ -1842,7 +1834,7 @@
 							OfficeExcel.numToFormatText(OfficeExcel.num_round(y_val),formatTrue),
                             'center',
                             'center',
-                            false,//ðàìêà
+                            false,//рамка
                             null,
                             'rgba(255, 255, 255, 0.7)', bold, null, textOptions);
             }

Excel/SpreadsheetTestMenu.html

@@ -131,7 +131,6 @@
 		<script src="../Common/Charts/libraries/OfficeExcel.common.key.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.common.resizing.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.common.tooltips.js"></script>
-		<script src="../Common/Charts/libraries/OfficeExcel.common.zoom.js"></script>
 
 		<script src="../Common/Charts/libraries/OfficeExcel.bar.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.hbar.js"></script>

Excel/index.html

@@ -200,7 +200,6 @@
 	<script src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.key.js"></script>
 	<script src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.resizing.js"></script>
 	<script src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.tooltips.js"></script>
-	<script src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.zoom.js"></script>
 
 	<script src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.bar.js"></script>
 	<script src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.hbar.js"></script>

Word/TextEditor.html

@@ -52,7 +52,6 @@
 		<script src="../Common/Charts/libraries/OfficeExcel.common.key.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.common.resizing.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.common.tooltips.js"></script>
-		<script src="../Common/Charts/libraries/OfficeExcel.common.zoom.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.bar.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.hbar.js"></script>
 		<script src="../Common/Charts/libraries/OfficeExcel.line.js"></script>

Word/index.html

@@ -117,7 +117,6 @@
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.key.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.resizing.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.tooltips.js"></script>
-	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.zoom.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.bar.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.hbar.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.line.js"></script>