Commit 46af9af5 authored by konovalovsergey's avatar konovalovsergey

add contentDisposition inline to print

parent 5875de8c
...@@ -856,7 +856,10 @@ var editor; ...@@ -856,7 +856,10 @@ var editor;
oAdditionalData["userid"] = this.documentUserId; oAdditionalData["userid"] = this.documentUserId;
oAdditionalData["vkey"] = this.documentVKey; oAdditionalData["vkey"] = this.documentVKey;
oAdditionalData["outputformat"] = sFormat; oAdditionalData["outputformat"] = sFormat;
oAdditionalData["title"] = changeFileExtention(this.documentTitle, getExtentionByFormat(sFormat)); oAdditionalData["title"] = changeFileExtention(this.documentTitle, getExtentionByFormat(sFormat));
if (DownloadType.Print === options.downloadType) {
oAdditionalData["inline"] = 1;
}
if (c_oAscFileType.PDF === sFormat) { if (c_oAscFileType.PDF === sFormat) {
var printPagesData = this.wb.calcPagesPrint(this.adjustPrint); var printPagesData = this.wb.calcPagesPrint(this.adjustPrint);
var pdf_writer = new CPdfPrinter(); var pdf_writer = new CPdfPrinter();
......
...@@ -4737,7 +4737,10 @@ function _downloadAs(editor, filetype, actionType, options) ...@@ -4737,7 +4737,10 @@ function _downloadAs(editor, filetype, actionType, options)
oAdditionalData["vkey"] = editor.documentVKey; oAdditionalData["vkey"] = editor.documentVKey;
oAdditionalData["outputformat"] = filetype; oAdditionalData["outputformat"] = filetype;
oAdditionalData["title"] = changeFileExtention(editor.documentTitle, getExtentionByFormat(filetype)); oAdditionalData["title"] = changeFileExtention(editor.documentTitle, getExtentionByFormat(filetype));
oAdditionalData["savetype"] = c_oAscSaveTypes.CompleteAll; oAdditionalData["savetype"] = c_oAscSaveTypes.CompleteAll;
if (DownloadType.Print === options.downloadType) {
oAdditionalData["inline"] = 1;
}
if(c_oAscFileType.PDF == filetype) if(c_oAscFileType.PDF == filetype)
{ {
var dd = editor.WordControl.m_oDrawingDocument; var dd = editor.WordControl.m_oDrawingDocument;
......
...@@ -6733,6 +6733,9 @@ function _downloadAs(editor, command, filetype, actionType, options, fCallbackRe ...@@ -6733,6 +6733,9 @@ function _downloadAs(editor, command, filetype, actionType, options, fCallbackRe
oAdditionalData["outputformat"] = filetype; oAdditionalData["outputformat"] = filetype;
oAdditionalData["title"] = changeFileExtention(editor.documentTitle, getExtentionByFormat(filetype)); oAdditionalData["title"] = changeFileExtention(editor.documentTitle, getExtentionByFormat(filetype));
oAdditionalData["savetype"] = c_oAscSaveTypes.CompleteAll; oAdditionalData["savetype"] = c_oAscSaveTypes.CompleteAll;
if (DownloadType.Print === options.downloadType) {
oAdditionalData["inline"] = 1;
}
if (options.isNoData) { if (options.isNoData) {
;//nothing ;//nothing
} else if (null == options.oDocumentMailMerge && c_oAscFileType.PDF === filetype) { } else if (null == options.oDocumentMailMerge && c_oAscFileType.PDF === filetype) {
......
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