Fix/pre7.2.2 (#3057)

* [se] Fix bug 59417 (#3051) * [se] Fix bug 59417 * Fix bug 59414 (#3053) (cherry picked from commit ef6e3a8) * added description for the InpurHelper class (#3054) * Fix bug 57481 Co-authored-by: Igor Zotov <[email protected]> Co-authored-by: Natalia Ovchinnikova <[email protected]>
ONLYOFFICE · Oct 21, 2022 · 42f8237 · 42f8237
1 parent a2f2ab4
commit 42f8237
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/cell/view/WorkbookView.js b/cell/view/WorkbookView.js
@@ -2732,7 +2732,7 @@
 				}
 
 				if (name) {
-					res = new AscCommonExcel.CFunctionInfo(name)
+					res = new AscCommonExcel.CFunctionInfo(AscCommonExcel.cFormulaFunctionToLocale ? AscCommonExcel.cFormulaFunctionToLocale[name] : name)
 
 					//получаем массив аргументов
 					res.argumentsValue = parseResult.getArgumentsValue(t.cellEditor._formula.Formula);

diff --git a/common/Local/common.js b/common/Local/common.js
@@ -441,7 +441,25 @@ AscCommon.InitDragAndDrop = function(oHtmlElement, callback) {
             editor.endInlineDropTarget(e);
 
 			var _files = window["AscDesktopEditor"]["GetDropFiles"]();
-			if (0 == _files.length)
+			let countInserted = 0;
+			if (0 !== _files.length)
+			{
+				let countInserted = 0;
+				for (var i = 0; i < _files.length; i++)
+				{
+					if (window["AscDesktopEditor"]["IsImageFile"](_files[i]))
+					{
+						if (_files[i] === "")
+							continue;
+						var _url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](_files[i]);
+						editor.AddImageUrlAction(AscCommon.g_oDocumentUrls.getImageUrl(_url));
+						++countInserted;
+						break;
+					}
+				}
+			}
+
+			if (0 === countInserted)
 			{
                 // test html
                 var htmlValue = e.dataTransfer.getData("text/html");
@@ -458,20 +476,6 @@ AscCommon.InitDragAndDrop = function(oHtmlElement, callback) {
                     return;
                 }
 			}
-			else
-			{
-                for (var i = 0; i < _files.length; i++)
-                {
-                    if (window["AscDesktopEditor"]["IsImageFile"](_files[i]))
-                    {
-						if (_files[i] == "")
-							continue;
-						var _url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](_files[i]);
-						editor.AddImageUrlAction(AscCommon.g_oDocumentUrls.getImageUrl(_url));
-                        break;
-                    }
-                }
-            }
 		};
 	}
 };

diff --git a/common/plugins/plugin_base_api.js b/common/plugins/plugin_base_api.js
@@ -502,6 +502,7 @@ window.startPluginApi = function() {
 	 */
 
 	/**
+	 * Class representing an input helper - a window that appears and disappears when you type text. Its location is tied to the cursor.
 	 * @global
 	 * @class
 	 * @name InputHelper