Commit de1847a2 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Поправил открытие файла с набором изменений

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64449 954022d7-b5bf-4e40-9824-e11837661b57
parent f5de7567
...@@ -125,7 +125,7 @@ function g_fSaveWithParts(fSendCommand, fCallback, fCallbackRequest, oAdditional ...@@ -125,7 +125,7 @@ function g_fSaveWithParts(fSendCommand, fCallback, fCallbackRequest, oAdditional
function g_fGetImageFromChanges (name) { function g_fGetImageFromChanges (name) {
var file; var file;
var ext = GetFileExtension(sName); var ext = GetFileExtension(name);
if (null !== ext && g_oZipChanges && (file = g_oZipChanges.files[name])) { if (null !== ext && g_oZipChanges && (file = g_oZipChanges.files[name])) {
var oFileArray = file.asUint8Array(); var oFileArray = file.asUint8Array();
return 'data:image/' + ext + ';base64,' + Base64Encode(oFileArray, oFileArray.length, 0); return 'data:image/' + ext + ';base64,' + Base64Encode(oFileArray, oFileArray.length, 0);
...@@ -174,8 +174,10 @@ function g_fOpenFileCommand (binUrl, changesUrl, Signature, callback) { ...@@ -174,8 +174,10 @@ function g_fOpenFileCommand (binUrl, changesUrl, Signature, callback) {
g_oZipChanges = new (require('jszip'))(data); g_oZipChanges = new (require('jszip'))(data);
oResult.changes = []; oResult.changes = [];
for(var i in g_oZipChanges.files) for(var i in g_oZipChanges.files) {
oResult.changes.push(JSON.parse(g_oZipChanges.files[i].asText())); if (i.endsWith('.json'))
oResult.changes.push(JSON.parse(g_oZipChanges.files[i].asText()));
}
onEndOpen(); onEndOpen();
}); });
} else } else
...@@ -544,6 +546,12 @@ var c_oAscImageUploadProp = {//Не все браузеры позволяют ...@@ -544,6 +546,12 @@ var c_oAscImageUploadProp = {//Не все браузеры позволяют
SupportedFormats:[ "jpg", "jpeg", "jpe", "png", "gif", "bmp", "ico"] SupportedFormats:[ "jpg", "jpeg", "jpe", "png", "gif", "bmp", "ico"]
}; };
/**
*
* @param sName
* @returns {*}
* @constructor
*/
function GetFileExtension (sName) { function GetFileExtension (sName) {
var nIndex = sName.lastIndexOf("."); var nIndex = sName.lastIndexOf(".");
if (-1 != nIndex) if (-1 != nIndex)
......
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