Commit e32f38fd authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50062 954022d7-b5bf-4e40-9824-e11837661b57
parent 95987089
...@@ -3530,6 +3530,7 @@ asc_docs_api.prototype.asyncImagesDocumentEndLoaded = function() ...@@ -3530,6 +3530,7 @@ asc_docs_api.prototype.asyncImagesDocumentEndLoaded = function()
this.isPasteFonts_Images = false; this.isPasteFonts_Images = false;
this.pasteImageMap = null; this.pasteImageMap = null;
this.pasteCallback(); this.pasteCallback();
window.GlobalPasteFlag = false;
this.pasteCallback = null; this.pasteCallback = null;
} }
else if (this.isSaveFonts_Images) else if (this.isSaveFonts_Images)
...@@ -3677,9 +3678,23 @@ asc_docs_api.prototype.sync_SendProgress = function(Percents) ...@@ -3677,9 +3678,23 @@ asc_docs_api.prototype.sync_SendProgress = function(Percents)
asc_docs_api.prototype.pre_Paste = function(_fonts, _images, callback) asc_docs_api.prototype.pre_Paste = function(_fonts, _images, callback)
{ {
this.isPasteFonts_Images = true;
this.pasteCallback = callback; this.pasteCallback = callback;
this.pasteImageMap = _images; this.pasteImageMap = _images;
var _count = 0;
for (var i in this.pasteImageMap)
++_count;
if (0 == _count && false === this.FontLoader.CheckFontsNeedLoading(_fonts))
{
// никаких евентов. ничего грузить не нужно. сделано для сафари под макОс.
// там при LongActions теряется фокус и вставляются пробелы
this.pasteCallback();
window.GlobalPasteFlag = false;
this.pasteCallback = null;
return;
}
this.isPasteFonts_Images = true;
this.FontLoader.LoadDocumentFonts2(_fonts); this.FontLoader.LoadDocumentFonts2(_fonts);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment