Добавил метод asc_SetFontsPath (в базовом классе)

asc_Init -> asc_SetFontsPath
SetFontsPath -> asc_SetFontsPath

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

Common/apiBase.js

@@ -142,6 +142,9 @@ baseEditorsApi.prototype.asc_setDocInfo = function(oDocInfo) {
     window["AscDesktopEditor"]["SetDocumentName"](this.documentTitle);
   }
 };
+baseEditorsApi.asc_SetFontsPath = function(path) {
+  this.FontLoader.fontFilesPath = path;
+};
 // Events
 baseEditorsApi.prototype.sendEvent = function() {
 };

Excel/SpreadsheetTestMobile.html

@@ -418,7 +418,7 @@
 						console.log(arguments[0]);
 				});
 
-				api.asc_Init("../Fonts/");
+				api.asc_SetFontsPath("../Fonts/");
 
 				function getURLParameter(name) {
 					return (RegExp(name + '=' + '(.+?)(&|$)').exec(location.search) || [, null])[1];

Excel/api.js

@@ -98,6 +98,8 @@ var editor;
   spreadsheet_api.prototype._init = function() {
     this.topLineEditorElement = document.getElementById(this.topLineEditorName);
     this.formulasList = getFormulasInfo();
+    // ToDo нужно ли это
+    asc['editor'] = ( asc['editor'] || this );
   };
 
   spreadsheet_api.prototype.asc_CheckGuiControlColors = function() {
@@ -286,12 +288,7 @@ var editor;
   };
 
   spreadsheet_api.prototype.asc_Init = function(fontsPath) {
-    var t = this;
-    asc["editor"] = ( asc["editor"] || t );
-    t.FontLoader.fontFilesPath = fontsPath;
-    t.asc_registerCallback("loadFonts", function(fonts, callback) {
-      t._loadFonts(fonts, callback);
-    });
+    this.asc_SetFontsPath(fontsPath);
   };
   spreadsheet_api.prototype.asc_getLocaleExample = function(val, number, date) {
     var res = '';
@@ -3321,6 +3318,7 @@ var editor;
   prot = spreadsheet_api.prototype;
 
   prot["asc_GetFontThumbnailsPath"] = prot.asc_GetFontThumbnailsPath;
+  prot["asc_SetFontsPath"] = prot.asc_SetFontsPath;
   prot["asc_Init"] = prot.asc_Init;
   prot["asc_setDocInfo"] = prot.asc_setDocInfo;
   prot["asc_getLocaleExample"] = prot.asc_getLocaleExample;

Excel/menu/menu.js

@@ -532,7 +532,7 @@
 		$("#themeSelect ul").empty().append(cellThemeContent);
 	});
 	
-	api.asc_Init("../Fonts/");
+	api.asc_SetFontsPath("../Fonts/");
 	//api.asc_setViewerMode(true);
 
 	function getURLParameter(name) {

Excel/view/WorkbookView.js

@@ -1684,13 +1684,6 @@
 				var ws = t.getWorksheet();
 				t.clipboard.pasteRange(ws);
 			} else {
-				// t.clipboard.pasteCellValue(function (text, fonts) {
-					// if (fonts.length > 0) {
-						// t.handlers.trigger("loadFonts", fonts, function(){t.cellEditor.paste(fragments)});
-					// } else {
-						// t.cellEditor.pasteText(text);
-					// }
-				// });
 				t.clipboard.pasteAsText(function (text) {
 					t.cellEditor.pasteText(text);
 				});

PowerPoint/PowerPoint.html

@@ -1300,7 +1300,7 @@
 
                 var editor = new asc_docs_api("editor_sdk");
                 editor.CreateComponents();
-                editor.SetFontsPath("../Fonts/");
+                editor.asc_SetFontsPath("../Fonts/");
                 editor.SetThemesPath("themes/");
                 editor.Init();
                 //editor.LoadDocument();

PowerPoint/api.js

@@ -666,7 +666,7 @@ asc_docs_api.prototype.LoadDocument = function() {
 
 asc_docs_api.prototype.SetFontsPath = function(path)
 {
-	this.FontLoader.fontFilesPath = path;
+  this.asc_SetFontsPath(path);
 };
 asc_docs_api.prototype.SetThemesPath = function(path)
 {

PowerPoint/apiExport.js

@@ -27,6 +27,7 @@ asc_docs_api.prototype['asc_getEditorPermissions'] = asc_docs_api.prototype.asc_
 asc_docs_api.prototype['asc_setDocInfo'] = asc_docs_api.prototype.asc_setDocInfo;
 asc_docs_api.prototype['asc_setLocale'] = asc_docs_api.prototype.asc_setLocale;
 asc_docs_api.prototype['LoadDocument'] = asc_docs_api.prototype.LoadDocument;
+asc_docs_api.prototype['asc_SetFontsPath'] = asc_docs_api.prototype.asc_SetFontsPath;
 asc_docs_api.prototype['SetFontsPath'] = asc_docs_api.prototype.SetFontsPath;
 asc_docs_api.prototype['SetThemesPath'] = asc_docs_api.prototype.SetThemesPath;
 asc_docs_api.prototype['CreateCSS'] = asc_docs_api.prototype.CreateCSS;

Word/api.js

@@ -590,7 +590,7 @@ asc_docs_api.prototype.LoadDocument = function(isVersionHistory) {
 
 asc_docs_api.prototype.SetFontsPath = function(path)
 {
-	this.FontLoader.fontFilesPath = path;
+  this.asc_SetFontsPath(path);
 };
 
 asc_docs_api.prototype.SetTextBoxInputMode = function(bIsEA)

Word/apiExport.js

@@ -98,6 +98,7 @@ asc_docs_api.prototype['asc_getEditorPermissions'] = asc_docs_api.prototype.asc_
 asc_docs_api.prototype['asc_setDocInfo'] = asc_docs_api.prototype.asc_setDocInfo;
 asc_docs_api.prototype['asc_setLocale'] = asc_docs_api.prototype.asc_setLocale;
 asc_docs_api.prototype['LoadDocument'] = asc_docs_api.prototype.LoadDocument;
+asc_docs_api.prototype['asc_SetFontsPath'] = asc_docs_api.prototype.asc_SetFontsPath;
 asc_docs_api.prototype['SetFontsPath'] = asc_docs_api.prototype.SetFontsPath;
 asc_docs_api.prototype['SetTextBoxInputMode'] = asc_docs_api.prototype.SetTextBoxInputMode;
 asc_docs_api.prototype['GetTextBoxInputMode'] = asc_docs_api.prototype.GetTextBoxInputMode;