Commit 1d659240 authored by GoshaZotov's avatar GoshaZotov

Merge branch 'release/v4.1.0' into develop

parents a5a8125e 64ead82d
......@@ -144,7 +144,10 @@
if(ws.getCellEditMode() === true)
{
var text = data1.innerText;
window["Asc"]["editor"].wb.cellEditor.pasteText(text);
if(text)
{
window["Asc"]["editor"].wb.cellEditor.pasteText(text);
}
}
else
{
......@@ -158,7 +161,10 @@
if(ws.getCellEditMode() === true)
{
var text = t.pasteProcessor.pasteFromBinary(ws, data1, true);
window["Asc"]["editor"].wb.cellEditor.pasteText(text);
if(text)
{
window["Asc"]["editor"].wb.cellEditor.pasteText(text);
}
}
else
{
......@@ -171,7 +177,10 @@
{
if(ws.getCellEditMode() === true)
{
window["Asc"]["editor"].wb.cellEditor.pasteText(data1);
if(text)
{
window["Asc"]["editor"].wb.cellEditor.pasteText(data1);
}
}
else
{
......
......@@ -491,6 +491,9 @@
}
}
}
if (window.g_asc_plugins)
window.g_asc_plugins.onExternalMouseUp();
}
InitCaptureEvents();
......
......@@ -351,6 +351,16 @@
// re-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()
if (i >= this.m_arrPages.length)
{
this.m_arrPages[i] = new CThPage();
if (0 == i)
this.m_arrPages[0].IsSelected = true;
}
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