refactoring code

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

refactoring code
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48655 954022d7-b5bf-4e40-9824-e11837661b57
1f58464b · Alexander.Trofimov · Alexander.Trofimov · 8e7c1761 · 1f58464b
Commit 1f58464b authored Aug 09, 2013 by Alexander.Trofimov Committed by Alexander.Trofimov May 18, 2016
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 8 deletions

Excel/api.js Excel/api.js +6 -8

No files found.
--- a/Excel/api.js
+++ b/Excel/api.js
@@ -518,8 +518,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 			asc_addAutoFilter: function(lTable, addFormatTableOptionsObj){
 				var ws = this.wb.getWorksheet();
-				var result = ws.addAutoFilter(lTable, addFormatTableOptionsObj);
+				return ws.addAutoFilter(lTable, addFormatTableOptionsObj);
-				return result;
 			},
 			asc_applyAutoFilter: function(type,autoFilterObject){
@@ -535,8 +534,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 			asc_getAddFormatTableOptions: function()
 			{
 				var ws = this.wb.getWorksheet();
-				var result = ws.getAddFormatTableOptions();
+				return ws.getAddFormatTableOptions();
-				return result;
 			},
 			asc_setMobileVersion: function (isMobile){
@@ -1285,6 +1283,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 				 * Event об отсоединении от сервера
 				 * @param {jQuery} e  event об отсоединении с причиной
 				 * @param {Bool} isDisconnectAtAll  окончательно ли отсоединяемся(true) или будем пробовать сделать reconnect(false) + сами отключились
+				 * @param {Bool} isCloseCoAuthoring
 				 */
 				this.CoAuthoringApi.onDisconnect				= function (e, isDisconnectAtAll, isCloseCoAuthoring) {
 					if (0 === t.CoAuthoringApi.get_state())
@@ -1468,10 +1467,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 				//this.asc_Resize(); // Убрал, т.к. сверху приходит resize (http://bugzserver/show_bug.cgi?id=14680)
 				if( this.wbModel.startActionOn == false ){
 					this.wbModel.startActionOn = true;
-				}
+				} else {
-				else{
+					var t = this;
-					var thas = this;
+					setTimeout(function(){t.asc_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Recalc)},500);
-					setTimeout(function(){thas.asc_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Recalc)},500);
 				}
                if (undefined != window['appBridge']) {