Commit 1109884b authored by Oleg Korshul's avatar Oleg Korshul

1) mobile version -> change table murkup: create history point

2) plugin start -> clear scroll interval (word/slide)
parent 2db58068
...@@ -1731,7 +1731,13 @@ ...@@ -1731,7 +1731,13 @@
var _markup = this.HtmlPage.m_oHorRuler.m_oTableMarkup; var _markup = this.HtmlPage.m_oHorRuler.m_oTableMarkup;
_markup.Cols[this.TableCurrentMovePos] += (this.TableCurrentMoveValue - this.TableCurrentMoveValueOld); _markup.Cols[this.TableCurrentMovePos] += (this.TableCurrentMoveValue - this.TableCurrentMoveValueOld);
_markup.Cols[this.TableCurrentMovePos] = Math.max(_markup.Cols[this.TableCurrentMovePos], 1); _markup.Cols[this.TableCurrentMovePos] = Math.max(_markup.Cols[this.TableCurrentMovePos], 1);
_markup.Table.Update_TableMarkupFromRuler(_markup, true, this.TableCurrentMovePos + 1);
if ( false === this.HtmlPage.m_oLogicDocument.Document_Is_SelectionLocked(AscCommon.changestype_Table_Properties) )
{
this.HtmlPage.m_oLogicDocument.Create_NewHistoryPoint(AscDFH.historydescription_Document_SetTableMarkup_Hor);
_markup.Table.Update_TableMarkupFromRuler(_markup, true, this.TableCurrentMovePos + 1);
this.HtmlPage.m_oLogicDocument.Document_UpdateInterfaceState();
}
} }
else else
{ {
...@@ -1750,7 +1756,13 @@ ...@@ -1750,7 +1756,13 @@
var _markup = this.HtmlPage.m_oHorRuler.m_oTableMarkup; var _markup = this.HtmlPage.m_oHorRuler.m_oTableMarkup;
_markup.Rows[this.TableCurrentMovePos].H += (this.TableCurrentMoveValue - this.TableCurrentMoveValueOld); _markup.Rows[this.TableCurrentMovePos].H += (this.TableCurrentMoveValue - this.TableCurrentMoveValueOld);
_markup.Table.Update_TableMarkupFromRuler(_markup, false, this.TableCurrentMovePos + 1);
if ( false === this.HtmlPage.m_oLogicDocument.Document_Is_SelectionLocked(AscCommon.changestype_Table_Properties) )
{
this.HtmlPage.m_oLogicDocument.Create_NewHistoryPoint(AscDFH.historydescription_Document_SetTableMarkup_Hor);
_markup.Table.Update_TableMarkupFromRuler(_markup, false, this.TableCurrentMovePos + 1);
this.HtmlPage.m_oLogicDocument.Document_UpdateInterfaceState();
}
} }
this.HtmlPage.OnUpdateOverlay(); this.HtmlPage.OnUpdateOverlay();
......
...@@ -176,6 +176,12 @@ ...@@ -176,6 +176,12 @@
if (this.startData.getAttribute("resize") === true) if (this.startData.getAttribute("resize") === true)
this.startLongAction(); this.startLongAction();
if (this.api.WordControl && this.api.WordControl.m_oTimerScrollSelect != -1)
{
clearInterval(this.api.WordControl.m_oTimerScrollSelect);
this.api.WordControl.m_oTimerScrollSelect = -1;
}
if (this.current.variations[this.currentVariation].isVisual && this.startData.getAttribute("resize") !== true) if (this.current.variations[this.currentVariation].isVisual && this.startData.getAttribute("resize") !== true)
{ {
this.api.sendEvent("asc_onPluginShow", this.current, this.currentVariation); this.api.sendEvent("asc_onPluginShow", this.current, this.currentVariation);
......
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