Commit 1d659240 authored by GoshaZotov's avatar GoshaZotov

Merge branch 'release/v4.1.0' into develop

parents a5a8125e 64ead82d
...@@ -144,8 +144,11 @@ ...@@ -144,8 +144,11 @@
if(ws.getCellEditMode() === true) if(ws.getCellEditMode() === true)
{ {
var text = data1.innerText; var text = data1.innerText;
if(text)
{
window["Asc"]["editor"].wb.cellEditor.pasteText(text); window["Asc"]["editor"].wb.cellEditor.pasteText(text);
} }
}
else else
{ {
t.pasteProcessor.editorPasteExec(ws, data1); t.pasteProcessor.editorPasteExec(ws, data1);
...@@ -158,8 +161,11 @@ ...@@ -158,8 +161,11 @@
if(ws.getCellEditMode() === true) if(ws.getCellEditMode() === true)
{ {
var text = t.pasteProcessor.pasteFromBinary(ws, data1, true); var text = t.pasteProcessor.pasteFromBinary(ws, data1, true);
if(text)
{
window["Asc"]["editor"].wb.cellEditor.pasteText(text); window["Asc"]["editor"].wb.cellEditor.pasteText(text);
} }
}
else else
{ {
t.pasteProcessor.pasteFromBinary(ws, data1); t.pasteProcessor.pasteFromBinary(ws, data1);
...@@ -170,9 +176,12 @@ ...@@ -170,9 +176,12 @@
case AscCommon.c_oAscClipboardDataFormat.Text: case AscCommon.c_oAscClipboardDataFormat.Text:
{ {
if(ws.getCellEditMode() === true) if(ws.getCellEditMode() === true)
{
if(text)
{ {
window["Asc"]["editor"].wb.cellEditor.pasteText(data1); window["Asc"]["editor"].wb.cellEditor.pasteText(data1);
} }
}
else else
{ {
t.pasteProcessor.pasteTextOnSheet(ws, data1); t.pasteProcessor.pasteTextOnSheet(ws, data1);
......
...@@ -491,6 +491,9 @@ ...@@ -491,6 +491,9 @@
} }
} }
} }
if (window.g_asc_plugins)
window.g_asc_plugins.onExternalMouseUp();
} }
InitCaptureEvents(); InitCaptureEvents();
......
...@@ -351,6 +351,16 @@ ...@@ -351,6 +351,16 @@
// re-init // re-init
this.init(); this.init();
} }
},
onExternalMouseUp : function()
{
if (!this.current)
return;
this.startData.setAttribute("type", "onExternalMouseUp");
this.correctData(this.startData);
this.sendMessage(this.startData);
} }
}; };
......
...@@ -3993,6 +3993,8 @@ function CThumbnailsManager() ...@@ -3993,6 +3993,8 @@ function CThumbnailsManager()
if (i >= this.m_arrPages.length) if (i >= this.m_arrPages.length)
{ {
this.m_arrPages[i] = new CThPage(); this.m_arrPages[i] = new CThPage();
if (0 == i)
this.m_arrPages[0].IsSelected = true;
} }
if (false === bIsFoundFirst) if (false === bIsFoundFirst)
......
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