Skip to content

S
sdkjs
Commit a234f5fa authored by Oleg Korshul's avatar Oleg Korshul
Browse files
Options

.

parent 16ce9dfa
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 11 deletions
slide/Drawing/DrawingDocument.js
View file @ a234f5fa
......@@ -1775,11 +1775,13 @@ function CDrawingDocument()
{
this.m_oWordControl.m_oMainView.HtmlElement.removeChild(this.TargetHtmlElement);
this.m_oWordControl.m_oNotesContainer.HtmlElement.appendChild(this.TargetHtmlElement);
this.TargetHtmlElement.style.zIndex = 4;
}
else
{
this.m_oWordControl.m_oNotesContainer.HtmlElement.removeChild(this.TargetHtmlElement);
this.m_oWordControl.m_oMainView.HtmlElement.appendChild(this.TargetHtmlElement);
this.TargetHtmlElement.style.zIndex = 9;
}
this.TargetHtmlElementOnSlide = isFocusOnSlide;
......@@ -5635,8 +5637,9 @@ function CNotesDrawer(page)
settings.screenAddH = AscCommon.AscBrowser.convertToRetinaValue(settings.screenAddH);
}
this.Scroll = 0;
this.ScrollMax = Math.max(0, settings.contentH - settings.screenH);
if (this.Scroll > this.ScrollMax)
this.Scroll = this.ScrollMax;
document.getElementById('panel_right_scroll_notes').style.height = settings.contentH + "px";
......@@ -5661,6 +5664,7 @@ function CNotesDrawer(page)
this.HtmlPage.m_oScrollNotes_.bind("scrollvertical", function (evt)
{
oThis.Scroll = (oThis.ScrollMax * evt.scrollD / Math.max(evt.maxScrollY, 1)) >> 0;
oThis.HtmlPage.m_bIsUpdateTargetNoAttack = true;
oThis.IsRepaint = true;
});
}
......
slide/Drawing/HtmlPage.js
View file @ a234f5fa
......@@ -670,9 +670,9 @@ function CEditorPage(api)
this.m_oOverlay.HtmlElement.onmouseup = this.onMouseUp;
var _cur = document.getElementById('id_target_cursor');
_cur.onmousedown = this.onMouseDown;
_cur.onmousemove = this.onMouseMove;
_cur.onmouseup = this.onMouseUp;
_cur.onmousedown = this.onMouseDownTarget;
_cur.onmousemove = this.onMouseMoveTarget;
_cur.onmouseup = this.onMouseUpTarget;
this.m_oMainContent.HtmlElement.onmousewheel = this.onMouseWhell;
if (this.m_oMainContent.HtmlElement.addEventListener)
......@@ -1679,6 +1679,28 @@ function CEditorPage(api)
AscCommon.stopEvent(e);
};
this.onMouseDownTarget = function(e)
{
if (oThis.m_oDrawingDocument.TargetHtmlElementOnSlide)
return oThis.onMouseDown(e);
else
return oThis.m_oNotesApi.onMouseDown(e);
};
this.onMouseMoveTarget = function(e)
{
if (oThis.m_oDrawingDocument.TargetHtmlElementOnSlide)
return oThis.onMouseMove(e);
else
return oThis.m_oNotesApi.onMouseMove(e);
};
this.onMouseUpTarget = function(e)
{
if (oThis.m_oDrawingDocument.TargetHtmlElementOnSlide)
return oThis.onMouseUp(e);
else
return oThis.m_oNotesApi.onMouseUp(e);
};
this.onMouseDown = function(e)
{
oThis.m_oApi.checkLastWork();
......@@ -1768,6 +1790,9 @@ function CEditorPage(api)
if (false === oThis.m_oApi.bInit_word_control)
return;
if (!oThis.m_oDrawingDocument.TargetHtmlElementOnSlide)
return oThis.m_oNotesApi.onMouseMove(e);
var oWordControl = oThis;
if (e.preventDefault)
......@@ -1816,8 +1841,9 @@ function CEditorPage(api)
if (false === oThis.m_oApi.bInit_word_control)
return;
//if (true == global_mouseEvent.IsLocked)
// return;
if (!oThis.m_oDrawingDocument.TargetHtmlElementOnSlide)
return oThis.m_oNotesApi.onMouseUp(e);
var oWordControl = oThis;
if (!global_mouseEvent.IsLocked)
......@@ -3248,6 +3274,12 @@ function CEditorPage(api)
oWordControl.m_oDrawingDocument.UpdateTargetFromPaint = false;
oWordControl.CheckFontCache();
if (oWordControl.m_bIsUpdateTargetNoAttack)
{
oWordControl.m_oDrawingDocument.UpdateTargetNoAttack();
oWordControl.m_bIsUpdateTargetNoAttack = false;
}
}
oWordControl.m_oDrawingDocument.Collaborative_TargetsUpdate(isRepaint);
......
slide/api.js
View file @ a234f5fa
......@@ -1330,7 +1330,7 @@ background-repeat: no-repeat;\
</div>\
</div>\
<div id=\"id_main_parent\" class=\"block_elem\" style=\"-ms-touch-action: none;-moz-user-select:none;-khtml-user-select:none;user-select:none;overflow:hidden;border-left-width: 1px;border-left-color:" + AscCommonSlide.GlobalSkin.BorderSplitterColor + "; border-left-style: solid;\" UNSELECTABLE=\"on\">\
<div id=\"id_main\" class=\"block_elem\" style=\"-ms-touch-action: none;-moz-user-select:none;-khtml-user-select:none;user-select:none;background-color:" + AscCommonSlide.GlobalSkin.BackgroundColor + ";overflow:hidden;\" UNSELECTABLE=\"on\">\
<div id=\"id_main\" class=\"block_elem\" style=\"z-index:5;-ms-touch-action: none;-moz-user-select:none;-khtml-user-select:none;user-select:none;background-color:" + AscCommonSlide.GlobalSkin.BackgroundColor + ";overflow:hidden;\" UNSELECTABLE=\"on\">\
<div id=\"id_panel_left\" class=\"block_elem\">\
<canvas id=\"id_buttonTabs\" class=\"block_elem\"></canvas>\
<canvas id=\"id_vert_ruler\" class=\"block_elem\"></canvas>\
......@@ -1339,9 +1339,9 @@ background-repeat: no-repeat;\
<canvas id=\"id_hor_ruler\" class=\"block_elem\"></canvas>\
</div>\
<div id=\"id_main_view\" class=\"block_elem\" style=\"overflow:hidden\">\
<canvas id=\"id_viewer\" class=\"block_elem\" style=\"-ms-touch-action: none;-webkit-user-select: none;background-color:#B0B0B0;z-index:1\"></canvas>\
<canvas id=\"id_viewer_overlay\" class=\"block_elem\" style=\"-ms-touch-action: none;-webkit-user-select: none;z-index:2\"></canvas>\
<canvas id=\"id_target_cursor\" class=\"block_elem\" width=\"1\" height=\"1\" style=\"-ms-touch-action: none;-webkit-user-select: none;width:2px;height:13px;display:none;z-index:4;\"></canvas>\
<canvas id=\"id_viewer\" class=\"block_elem\" style=\"-ms-touch-action: none;-webkit-user-select: none;background-color:#B0B0B0;z-index:6\"></canvas>\
<canvas id=\"id_viewer_overlay\" class=\"block_elem\" style=\"-ms-touch-action: none;-webkit-user-select: none;z-index:7\"></canvas>\
<canvas id=\"id_target_cursor\" class=\"block_elem\" width=\"1\" height=\"1\" style=\"-ms-touch-action: none;-webkit-user-select: none;width:2px;height:13px;display:none;z-index:9;\"></canvas>\
</div>\
<div id=\"id_panel_right\" class=\"block_elem\" style=\"margin-right:1px;background-color:#F1F1F1;z-index:0;\">\
<div id=\"id_buttonRulers\" class=\"block_elem buttonRuler\"></div>\
......@@ -1363,7 +1363,6 @@ background-repeat: no-repeat;\
_innerHTML += "<div id=\"id_panel_notes\" class=\"block_elem\" style=\"background-color:#FFFFFF;\">\
<canvas id=\"id_notes\" class=\"block_elem\" style=\"-ms-touch-action: none;-webkit-user-select: none;background-color:#FFFFFF;z-index:1\"></canvas>\
<canvas id=\"id_notes_overlay\" class=\"block_elem\" style=\"-ms-touch-action: none;-webkit-user-select: none;z-index:2\"></canvas>\
<canvas id=\"id_notes_target_cursor\" class=\"block_elem\" width=\"1\" height=\"1\" style=\"-ms-touch-action: none;-webkit-user-select: none;width:2px;height:13px;display:none;z-index:4;\"></canvas>\
<div id=\"id_vertical_scroll_notes\" style=\"left:0;top:0;width:16px;overflow:hidden;position:absolute;\">\
<div id=\"panel_right_scroll_notes\" class=\"block_elem\" style=\"left:0;top:0;width:1px;height:1px;\"></div>\
</div>\
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7