pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-04-07 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #534 from ONLYOFFICE/feature/nodejs-forced-conversion

Browse Source 
Feature/nodejs forced conversion
This commit is contained in:
Sergey Linnik
2024-04-03 14:05:24 +03:00
committed by GitHub
parent 14bb9fc8a4 53c3e97b5c
commit 43d260cd7a
5 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
web/documentserver-example/nodejs/public/javascripts/jscript.js
View File

@ -121,7 +121,7 @@ if (typeof jQuery != "undefined") {
});
var timer = null;
var checkConvert = function (filePass, forceConvert) {
var checkConvert = function (filePass, fileType) {
filePass = filePass ? filePass : null;
if (timer != null) {
clearTimeout(timer);
@ -143,16 +143,13 @@ if (typeof jQuery != "undefined") {
return;
}
var convData = {filename: fileName, filePass: filePass, lang: language};
if (forceConvert) convData.forceConv = forceConvert;
timer = setTimeout(function () {
jq.ajaxSetup({ cache: false });
jq.ajax({
async: true,
type: "post",
dataType: "json",
data: convData,
data: {filename: fileName, filePass: filePass, lang: language, fileExt: fileType},
url: UrlConverter,
complete: function (data) {
var responseText = data.responseText;
@ -173,7 +170,7 @@ if (typeof jQuery != "undefined") {
return;
} else {
if (response.error.includes("-9")){
jq("#xmlError").removeClass("invisible");
jq("#select-file-type").removeClass("invisible");
jq("#step2").removeClass("current");
jq("#hiddenFileName").attr("placeholder",filePass);
return;
@ -189,7 +186,7 @@ if (typeof jQuery != "undefined") {
jq("#hiddenFileName").val(response.filename);
if (typeof response.step != "undefined" && response.step < 100) {
checkConvert(filePass, forceConvert);
checkConvert(filePass, fileType);
} else {
jq("#step2").addClass("done").removeClass("current");
loadScripts();
@ -232,11 +229,11 @@ if (typeof jQuery != "undefined") {
}
};
jq(document).on("click", "#forceConvert:not(.disable)", function () {
jq(document).on("click", ".file-type:not(.disable)", function () {
const currentElement = jq(this);
var fileType = currentElement.attr("data");
var filePass = jq("#hiddenFileName").attr("placeholder");
jq("div[id='forceConvert']").addClass("disable, pale");
jq(".file-type").addClass(["disable", "pale"]);
currentElement.removeClass("pale");
checkConvert(filePass, fileType);
});
@ -423,7 +420,7 @@ if (typeof jQuery != "undefined") {
async: true,
type: "post",
dataType: "json",
data: {filename: fileName, filePass: filePass, lang: language, fileExt: fileExt},
data: {filename: fileName, filePass: filePass, lang: language, fileExt: fileExt, keepOriginal: true},
url: UrlConverter,
complete: function (data) {
try {