Yajbir-Malik/DocumentServer-v-9.2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
Alexander Trofimov
2015-06-25 11:27:08 +03:00
parent dbf21ee32f
commit a10605c91f
174 changed files with 24121 additions and 8908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OfficeWeb/sdk/PowerPoint/Drawing/DrawingDocument.js
View File

@@ -845,9 +845,8 @@ function CDrawingDocument() {
this.SendChangeDocumentToApi = function (bIsAttack) {
if (bIsAttack || !this.m_bIsSendApiDocChanged) {
this.m_bIsSendApiDocChanged = true;
this.m_oWordControl.m_oApi.isDocumentModify = true;
this.m_oWordControl.m_oApi.SetDocumentModified(true);
this.m_oWordControl.m_oApi.asc_fireCallback("asc_onDocumentChanged");
this.m_oWordControl.m_oApi.asc_fireCallback("asc_onDocumentModifiedChanged");
}
};
this.InitGuiCanvasTextProps = function (div_id) {
@@ -2743,6 +2742,11 @@ function CThumbnailsManager() {
if (false === this.m_bIsScrollVisible || !oThis.m_oWordControl.m_oScrollThumbApi) {
return;
}
if (undefined !== window["AscDesktopEditor"]) {
if (false === window["AscDesktopEditor"]["CheckNeedWheel"]()) {
return;
}
}
var delta = 0;
if (undefined != e.wheelDelta && e.wheelDelta != 0) {
delta = -45 * e.wheelDelta / 120;

5
OfficeWeb/sdk/PowerPoint/Drawing/HtmlPage.js
View File

@@ -1348,6 +1348,11 @@ function CEditorPage(api) {
if (false === oThis.m_oApi.bInit_word_control) {
return;
}
if (undefined !== window["AscDesktopEditor"]) {
if (false === window["AscDesktopEditor"]["CheckNeedWheel"]()) {
return;
}
}
if (oThis.DemonstrationManager.Mode) {
if (e.preventDefault) {
e.preventDefault();

11
OfficeWeb/sdk/PowerPoint/Drawing/Transitions.js
View File

@@ -2026,6 +2026,9 @@ function CDemonstrationManager(htmlpage) {
if (this.DemonstrationDiv == null || start_slide_num < 0 || start_slide_num >= this.SlidesCount) {
return;
}
if (undefined !== window["AscDesktopEditor"]) {
window["AscDesktopEditor"]["SetFullscreen"](true);
}
this.MainDivId = main_div_id;
var _width = this.DemonstrationDiv.clientWidth;
var _height = this.DemonstrationDiv.clientHeight;
@@ -2179,6 +2182,9 @@ function CDemonstrationManager(htmlpage) {
}
};
this.End = function () {
if (undefined !== window["AscDesktopEditor"]) {
window["AscDesktopEditor"]["SetFullscreen"](false);
}
if (!this.Mode) {
return;
}
@@ -2298,6 +2304,11 @@ function CDemonstrationManager(htmlpage) {
return false;
};
this.onMouseWhell = function (e) {
if (undefined !== window["AscDesktopEditor"]) {
if (false === window["AscDesktopEditor"]["CheckNeedWheel"]()) {
return;
}
}
var delta = 0;
if (undefined != e.wheelDelta) {
delta = (e.wheelDelta > 0) ? -1 : 1;