Skip to content

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

viewer cut

parent 5e81db5c
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 10 deletions
common/scroll.js
View file @ d9d752cc
...@@ -1710,6 +1710,7 @@ ScrollObject.prototype = { ...@@ -1710,6 +1710,7 @@ ScrollObject.prototype = {
this.canvas.style.zIndex = 100; this.canvas.style.zIndex = 100;
this.canvas.style.position = "absolute"; this.canvas.style.position = "absolute";
this.canvas.style.top = "0px"; this.canvas.style.top = "0px";
this.canvas.style["msTouchAction"] = "none";
if ( navigator.userAgent.toLowerCase().indexOf( "webkit" ) != -1 ){ if ( navigator.userAgent.toLowerCase().indexOf( "webkit" ) != -1 ){
this.canvas.style.webkitUserSelect = "none"; this.canvas.style.webkitUserSelect = "none";
} }
......
slide/api.js
View file @ d9d752cc
...@@ -1367,13 +1367,13 @@ background-repeat: no-repeat;\ ...@@ -1367,13 +1367,13 @@ background-repeat: no-repeat;\
} }
var _innerHTML = "<div id=\"id_panel_thumbnails\" class=\"block_elem\" style=\"background-color:" + AscCommonSlide.GlobalSkin.BackgroundColorThumbnails + ";" + _thumbnail_style_right + "\">\ var _innerHTML = "<div id=\"id_panel_thumbnails\" class=\"block_elem\" style=\"background-color:" + AscCommonSlide.GlobalSkin.BackgroundColorThumbnails + ";" + _thumbnail_style_right + "\">\
<canvas id=\"id_thumbnails_background\" class=\"block_elem\" style=\"-webkit-user-select: none;background-color:#EBEBEB;z-index:1\"></canvas>\ <canvas id=\"id_thumbnails_background\" class=\"block_elem\" style=\"-ms-touch-action: none;-webkit-user-select: none;background-color:#EBEBEB;z-index:1\"></canvas>\
<canvas id=\"id_thumbnails\" class=\"block_elem\" style=\"-webkit-user-select: none;z-index:2\"></canvas>\ <canvas id=\"id_thumbnails\" class=\"block_elem\" style=\"-ms-touch-action: none;-webkit-user-select: none;z-index:2\"></canvas>\
<div id=\"id_vertical_scroll_thmbnl\" style=\"left:0;top:0;width:1px;overflow:hidden;position:absolute;\">\ <div id=\"id_vertical_scroll_thmbnl\" style=\"left:0;top:0;width:1px;overflow:hidden;position:absolute;\">\
<div id=\"panel_right_scroll_thmbnl\" class=\"block_elem\" style=\"left:0;top:0;width:1px;height:6000px;\"></div>\ <div id=\"panel_right_scroll_thmbnl\" class=\"block_elem\" style=\"left:0;top:0;width:1px;height:6000px;\"></div>\
</div>\ </div>\
</div>\ </div>\
<div id=\"id_main\" class=\"block_elem\" style=\"-moz-user-select:none;-khtml-user-select:none;user-select:none;background-color:" + AscCommonSlide.GlobalSkin.BackgroundColor + ";overflow:hidden;border-left-width: 1px;border-left-color:" + AscCommonSlide.GlobalSkin.BorderSplitterColor + "; border-left-style: solid;" + _main_border_style + "\" 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;border-left-width: 1px;border-left-color:" + AscCommonSlide.GlobalSkin.BorderSplitterColor + "; border-left-style: solid;" + _main_border_style + "\" UNSELECTABLE=\"on\">\
<div id=\"id_panel_left\" class=\"block_elem\">\ <div id=\"id_panel_left\" class=\"block_elem\">\
<canvas id=\"id_buttonTabs\" class=\"block_elem\"></canvas>\ <canvas id=\"id_buttonTabs\" class=\"block_elem\"></canvas>\
<canvas id=\"id_vert_ruler\" class=\"block_elem\"></canvas>\ <canvas id=\"id_vert_ruler\" class=\"block_elem\"></canvas>\
...@@ -1382,9 +1382,9 @@ background-repeat: no-repeat;\ ...@@ -1382,9 +1382,9 @@ background-repeat: no-repeat;\
<canvas id=\"id_hor_ruler\" class=\"block_elem\"></canvas>\ <canvas id=\"id_hor_ruler\" class=\"block_elem\"></canvas>\
</div>\ </div>\
<div id=\"id_main_view\" class=\"block_elem\" style=\"overflow:hidden\">\ <div id=\"id_main_view\" class=\"block_elem\" style=\"overflow:hidden\">\
<canvas id=\"id_viewer\" class=\"block_elem\" style=\"-webkit-user-select: none;background-color:#B0B0B0;z-index:1\"></canvas>\ <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=\"-webkit-user-select: none;z-index:2\"></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=\"-webkit-user-select: none;width:2px;height:13px;display:none;z-index:4;\"></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>\
</div>\ </div>\
<div id=\"id_panel_right\" class=\"block_elem\" style=\"margin-right:1px;background-color:#F1F1F1;\">\ <div id=\"id_panel_right\" class=\"block_elem\" style=\"margin-right:1px;background-color:#F1F1F1;\">\
<div id=\"id_buttonRulers\" class=\"block_elem buttonRuler\"></div>\ <div id=\"id_buttonRulers\" class=\"block_elem buttonRuler\"></div>\
...@@ -1948,6 +1948,8 @@ background-repeat: no-repeat;\ ...@@ -1948,6 +1948,8 @@ background-repeat: no-repeat;\
asc_docs_api.prototype.asc_SelectionCut = function() asc_docs_api.prototype.asc_SelectionCut = function()
{ {
if (this.getViewMode())
return;
var _logicDoc = this.WordControl.m_oLogicDocument; var _logicDoc = this.WordControl.m_oLogicDocument;
if (!_logicDoc) if (!_logicDoc)
return; return;
......
word/api.js
View file @ d9d752cc
...@@ -714,7 +714,7 @@ background-repeat: no-repeat;\ ...@@ -714,7 +714,7 @@ background-repeat: no-repeat;\
this.CreateCSS(); this.CreateCSS();
if (this.HtmlElement != null) if (this.HtmlElement != null)
this.HtmlElement.innerHTML = "<div id=\"id_main\" class=\"block_elem\" style=\"-moz-user-select:none;-khtml-user-select:none;user-select:none;background-color:" + AscCommonWord.GlobalSkin.BackgroundColor + ";overflow:hidden;\" UNSELECTABLE=\"on\">\ this.HtmlElement.innerHTML = "<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:" + AscCommonWord.GlobalSkin.BackgroundColor + ";overflow:hidden;\" UNSELECTABLE=\"on\">\
<div id=\"id_panel_left\" class=\"block_elem\">\ <div id=\"id_panel_left\" class=\"block_elem\">\
<canvas id=\"id_buttonTabs\" class=\"block_elem\"></canvas>\ <canvas id=\"id_buttonTabs\" class=\"block_elem\"></canvas>\
<canvas id=\"id_vert_ruler\" class=\"block_elem\"></canvas>\ <canvas id=\"id_vert_ruler\" class=\"block_elem\"></canvas>\
...@@ -723,9 +723,9 @@ background-repeat: no-repeat;\ ...@@ -723,9 +723,9 @@ background-repeat: no-repeat;\
<canvas id=\"id_hor_ruler\" class=\"block_elem\"></canvas>\ <canvas id=\"id_hor_ruler\" class=\"block_elem\"></canvas>\
</div>\ </div>\
<div id=\"id_main_view\" class=\"block_elem\" style=\"overflow:hidden\">\ <div id=\"id_main_view\" class=\"block_elem\" style=\"overflow:hidden\">\
<canvas id=\"id_viewer\" class=\"block_elem\" style=\"-webkit-user-select: none; background-color:" + AscCommonWord.GlobalSkin.BackgroundColor + ";z-index:1\"></canvas>\ <canvas id=\"id_viewer\" class=\"block_elem\" style=\"-ms-touch-action: none;-webkit-user-select: none; background-color:" + AscCommonWord.GlobalSkin.BackgroundColor + ";z-index:1\"></canvas>\
<canvas id=\"id_viewer_overlay\" class=\"block_elem\" style=\"-webkit-user-select: none; z-index:2\"></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=\"-webkit-user-select: none;width:2px;height:13px;z-index:4;\"></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;z-index:4;\"></canvas>\
</div>\ </div>\
</div>\ </div>\
<div id=\"id_panel_right\" class=\"block_elem\" style=\"margin-right:1px;background-color:" + AscCommonWord.GlobalSkin.BackgroundScroll + ";\">\ <div id=\"id_panel_right\" class=\"block_elem\" style=\"margin-right:1px;background-color:" + AscCommonWord.GlobalSkin.BackgroundScroll + ";\">\
...@@ -1956,6 +1956,9 @@ background-repeat: no-repeat;\ ...@@ -1956,6 +1956,9 @@ background-repeat: no-repeat;\
asc_docs_api.prototype.asc_SelectionCut = function() asc_docs_api.prototype.asc_SelectionCut = function()
{ {
if (AscCommon.CollaborativeEditing.m_bGlobalLock)
return;
var _logicDoc = this.WordControl.m_oLogicDocument; var _logicDoc = this.WordControl.m_oLogicDocument;
if (!_logicDoc) if (!_logicDoc)
return; return;
......
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