Commit fa6c3144 authored by Igor.Zotov's avatar Igor.Zotov

добавил условие для MAC

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57013 954022d7-b5bf-4e40-9824-e11837661b57
parent 9b61ce1d
...@@ -331,7 +331,7 @@ ...@@ -331,7 +331,7 @@
var oBinaryFileWriter = new Asc.BinaryFileWriter(worksheet.model.workbook, cloneActiveRange); var oBinaryFileWriter = new Asc.BinaryFileWriter(worksheet.model.workbook, cloneActiveRange);
var sBase64 = oBinaryFileWriter.Write(); var sBase64 = oBinaryFileWriter.Write();
if(this.element.children && this.element.children.length == 1 && window.USER_AGENT_WEBKIT && (true !== window.USER_AGENT_SAFARI_MACOS)) if(this.element.children && this.element.children.length == 1 && (window.USER_AGENT_WEBKIT || window.USER_AGENT_SAFARI_MACOS))
{ {
$(this.element.children[0]).css("font-weight", "normal"); $(this.element.children[0]).css("font-weight", "normal");
$(this.element.children[0]).wrap(document.createElement("b")); $(this.element.children[0]).wrap(document.createElement("b"));
...@@ -1806,6 +1806,7 @@ ...@@ -1806,6 +1806,7 @@
//parse HTML //parse HTML
aResult = this._parseHtml(pasteFragment, node, worksheet, isText); aResult = this._parseHtml(pasteFragment, node, worksheet, isText);
if(aResult)
this._correctImageUrl(aResult, worksheet); this._correctImageUrl(aResult, worksheet);
}, },
......
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