Commit dd8922ea authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=27125 - [Copy&Paste] JS ошибка после...

http://bugzserver/show_bug.cgi?id=27125 - [Copy&Paste] JS ошибка после copy&paste текста с подгруженным шрифтом

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59152 954022d7-b5bf-4e40-9824-e11837661b57
parent 53e9d8c1
...@@ -2899,6 +2899,8 @@ PasteProcessor.prototype = ...@@ -2899,6 +2899,8 @@ PasteProcessor.prototype =
} }
} }
//проверяем список фонтов
aContent.fonts = oThis._checkFontsOnLoad(aContent.fonts);
var aImagesToDownload = []; var aImagesToDownload = [];
for(var i in oImagesToDownload) for(var i in oImagesToDownload)
...@@ -3998,6 +4000,18 @@ PasteProcessor.prototype = ...@@ -3998,6 +4000,18 @@ PasteProcessor.prototype =
return aPrepeareFonts; return aPrepeareFonts;
}; };
}, },
_checkFontsOnLoad: function(fonts)
{
for(var i = 0; i < fonts.length; i++)
{
var index = this.map_font_index[fonts[i].name];
if(null == index || undefined == index)
{
fonts[i] = new CFont("Arial", 0, "", 0);
}
}
return fonts;
},
_IsBlockElem : function(name) _IsBlockElem : function(name)
{ {
if( "p" == name || "div" == name || "ul" == name || "ol" == name || "li" == name || "table" == name || "tbody" == name || "tr" == name || "td" == name || "th" == name || if( "p" == name || "div" == name || "ul" == name || "ol" == name || "li" == name || "table" == name || "tbody" == name || "tr" == name || "td" == name || "th" == name ||
......
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