fix jszip load history

common/editorscommon.js

@@ -254,10 +254,11 @@ function loadFileContent(url, callback) {
   });
 }
 
-function getJSZipUtils() {
+	function getJSZipUtils() {
 		return window['JSZipUtils'] ? window['JSZipUtils'] : require('jsziputils');
-}
-function getImageFromChanges (name) {
+	}
+
+	function getImageFromChanges(name) {
 		var file;
 		var ext = GetFileExtension(name);
 		if (null !== ext && oZipChanges && (file = oZipChanges.files[name])) {
@@ -265,10 +266,11 @@ function getImageFromChanges (name) {
 			return 'data:image/' + ext + ';base64,' + AscCommon.Base64Encode(oFileArray, oFileArray.length, 0);
 		}
 		return null;
-}
-function openFileCommand(binUrl, changesUrl, Signature, callback) {
+	}
+
+	function openFileCommand(binUrl, changesUrl, Signature, callback) {
 		var bError = false, oResult = new OpenFileResult(), bEndLoadFile = false, bEndLoadChanges = false;
-  var onEndOpen = function() {
+		var onEndOpen = function () {
 			if (bEndLoadFile && bEndLoadChanges) {
 				if (callback) {
 					callback(bError, oResult);
@@ -280,9 +282,7 @@ function openFileCommand(binUrl, changesUrl, Signature, callback) {
 
 		if (!window['IS_NATIVE_EDITOR']) {
 			asc_ajax({
-    url: sFileUrl,
-    dataType: "text",
-    success: function(result) {
+				url: sFileUrl, dataType: "text", success: function (result) {
 					//получаем url к папке с файлом
 					var url;
 					var nIndex = sFileUrl.lastIndexOf("/");
@@ -296,8 +296,7 @@ function openFileCommand(binUrl, changesUrl, Signature, callback) {
 					}
 					bEndLoadFile = true;
 					onEndOpen();
-    },
-    error: function() {
+				}, error: function () {
 					bEndLoadFile = true;
 					bError = true;
 					onEndOpen();
@@ -305,25 +304,32 @@ function openFileCommand(binUrl, changesUrl, Signature, callback) {
 			});
 		}
 
-  if (null != changesUrl) {
-    getJSZipUtils().getBinaryContent(changesUrl, function(err, data) {
-      bEndLoadChanges = true;
+		if (changesUrl) {
+			getJSZipUtils().getBinaryContent(changesUrl, function (err, data) {
 				if (err) {
+					bEndLoadChanges = true;
 					bError = true;
 					onEndOpen();
 					return;
 				}
 
-      oZipChanges = new (require('jszip'))(data);
 				oResult.changes = [];
-      for (var i in oZipChanges.files) {
-        if (i.endsWith('.json')) {
-          // Заглушка на имя файла (стоило его начинать с цифры)
-          oResult.changes[parseInt(i.slice('changes'.length))] = JSON.parse(oZipChanges.files[i].asText());
+				require('jszip').loadAsync(data).then(function (zipChanges) {
+					var promises = [];
+					zipChanges.forEach(function (relativePath, file) {
+						if (relativePath.endsWith('.json')) {
+							promises[parseInt(relativePath.slice('changes'.length))] = file.async('string');
 						}
+					});
+					Promise.all(promises).then(function (values) {
+						for (var i = 0; i < values.length; ++i) {
+							oResult.changes[i] = JSON.parse(values[i]);
 						}
+						bEndLoadChanges = true;
 						onEndOpen();
 					});
+				});
+			});
 		} else {
 			bEndLoadChanges = true;
 		}