поправил в тестовом меню кнопки для freezePane

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

Excel/SpreadsheetTestMenu.html

@@ -22,7 +22,7 @@
 <script type="text/javascript" src="../Common/3rdparty/XRegExp/xregexp-all.js"></script>
 
 <!-- scroll -->
-<script type="text/css" src="menu/perfect-scrollbar/perfect-scrollbar.css"></script>
+<link rel="stylesheet" type="text/css" href="menu/perfect-scrollbar/perfect-scrollbar.css" />
 <script type="text/javascript" src="menu/perfect-scrollbar/jquery.mousewheel.js"></script>
 <script type="text/javascript" src="menu/perfect-scrollbar/perfect-scrollbar.js"></script>
 
@@ -1749,35 +1749,6 @@ Format
 <td class="cp toolbarSep" style="vertical-align: top; width: 15px;min-width:15px;">
     <div class="sepMenu ToolbarIconOut" style="position: absolute; background: url('menu/img/sep.png') repeat-y scroll 0pt 0pt transparent; margin-top: -7px; height: 65px; margin-left: 6px;"></div>
 </td>
-<td>
-    <ul class="noListStyle">
-        <li class="ToolbarIconOut selectableIcon" title="Set fixed area">
-            <div id="td_set_fixed_area" class="iconToolbar">
-                <img class="ToolbarIcon FixedArea" src="menu/img/spacer.gif"/>
-            </div>
-        </li>
-        <li class="ToolbarIconOut selectableIcon" title="Set fixed first col">
-            <div id="td_set_fixed_col" class="iconToolbar">
-                <img class="ToolbarIcon FixedArea" src="menu/img/spacer.gif"/>
-            </div>
-        </li>
-    </ul>
-    <ul class="noListStyle">
-        <li class="ToolbarIconOut selectableIcon" title="Clean fixed area">
-            <div id="td_clean_fixed_area" class="iconToolbar">
-                <img class="ToolbarIcon FixedAreaClean" src="menu/img/spacer.gif"/>
-            </div>
-        </li>
-        <li class="ToolbarIconOut selectableIcon" title="Set fixed first row">
-            <div id="td_set_fixed_row" class="iconToolbar">
-                <img class="ToolbarIcon FixedArea" src="menu/img/spacer.gif"/>
-            </div>
-        </li>
-    </ul>
-</td>
-<td class="cp toolbarSep" style="vertical-align: top; width: 15px;min-width:15px;">
-    <div class="sepMenu ToolbarIconOut" style="position: absolute; background: url('menu/img/sep.png') repeat-y scroll 0pt 0pt transparent; margin-top: -7px; height: 65px; margin-left: 6px;"></div>
-</td>
 <td>
     <ul class="noListStyle">
         <li class="ToolbarIconOut selectableIcon" title="Show Grid Liines">
@@ -1789,6 +1760,11 @@ Format
             <input id="showHeaders" type="checkbox" name="showHeaders" checked>Show headers
         </li>
     </ul>
+    <ul class="noListStyle">
+        <li class="ToolbarIconOut selectableIcon" title="Freeze Pane">
+            <input id="freezePane" type="checkbox" name="freezePane">Freeze Pane
+        </li>
+    </ul>
 </td>
 <td class="cp toolbarSep" style="vertical-align: top; width: 15px;min-width:15px;">
     <div class="sepMenu ToolbarIconOut" style="position: absolute; background: url('menu/img/sep.png') repeat-y scroll 0pt 0pt transparent; margin-top: -7px; height: 65px; margin-left: 6px;"></div>

Excel/index.html

@@ -73,7 +73,7 @@
     <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
     <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
     <script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
-	<script type="text/css" src="../../../vendor/perfect-scrollbar/src/perfect-scrollbar.css"></script>
+    <link rel="stylesheet" type="text/css" href="../../../vendor/perfect-scrollbar/src/perfect-scrollbar.css" />
 	<script type="text/javascript" src="../../../vendor/perfect-scrollbar/src/jquery.mousewheel.js"></script>
 	<script type="text/javascript" src="../../../vendor/perfect-scrollbar/src/perfect-scrollbar.js"></script>
 

Excel/menu/menu.js

@@ -210,6 +210,7 @@
 		g_sheetViewSettings = api.asc_getSheetViewSettings();
 		$("#showGridLines").attr("checked", g_sheetViewSettings.asc_getShowGridLines());
 		$("#showHeaders").attr("checked", g_sheetViewSettings.asc_getShowRowColHeaders());
+		$("#freezePane").attr("checked", api.asc_isFreezePane());
 	}
 
 	function onTabNavigationBtnClicked(event) {
@@ -917,22 +918,6 @@
 				showAddFilterDialog();
 				break;
 			}
-			case "td_set_fixed_area":{
-				api.asc_freezePane();
-				break;
-			}
-			case "td_clean_fixed_area":{
-				api.asc_freezePane();
-				break;
-			}
-			case "td_set_fixed_col":{
-				api.asc_freezePane();
-				break;
-			}
-			case "td_set_fixed_row":{
-				api.asc_freezePane();
-				break;
-			}
 		}
 	});
 	$("#tdIncreaseFontSize").click(function () {
@@ -2627,6 +2612,9 @@
 	$("#showHeaders").change(function () {
 		onChangeView();
 	});
+	$("#freezePane").change(function () {
+		api.asc_freezePane();
+	});
 
     var chart_subtype_image_map = {};
     chart_subtype_image_map["gist"] =

Excel/menu/styles/MenuStyle.css

@@ -907,10 +907,6 @@ input, textarea {outline:none;}
 	display: none; 
 }
 
-.FixedArea { background: url(../img/Table_Merge.png) no-repeat scroll 0 0 transparent; }
-
-.FixedAreaClean { background: url(../img/Table_MergeDisable.png) no-repeat scroll 0 0 transparent; }
-
 .menuChartFont { cursor: pointer; }
 
 .ToolbarAddShape { background: url("../img/drawing-16.png") no-repeat scroll 0 0 transparent; }