Skip to content

S
sdkjs
Commit 8e1a1577 authored by Alexander.Trofimov's avatar Alexander.Trofimov
Browse files
Options

delete isComleteRenderer, isComleteRenderer2, async_SaveToPdf_Progress,... 

delete isComleteRenderer, isComleteRenderer2, async_SaveToPdf_Progress, async_SaveToPdf, async_SaveToPdf_PartCallback, async_SaveToPdf_Progress, function spellCheck

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64747 954022d7-b5bf-4e40-9824-e11837661b57
parent 099000cb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 288 deletions
Excel/model/DrawingObjects/DrawingDocument.js
View file @ 8e1a1577
......@@ -2159,30 +2159,6 @@ function CDrawingDocument(drawingObjects)
//console.log(ret);
return ret;
}
this.isComleteRenderer = function()
{
var pagescount = Math.min(this.m_lPagesCount, this.m_lCountCalculatePages);
if (this.m_lCurrentRendererPage >= pagescount)
{
this.m_lCurrentRendererPage = -1;
this.m_oDocRenderer = null;
this.m_oWordControl.m_oApi.ShowParaMarks = this.m_bOldShowMarks;
return true;
}
return false;
}
this.isComleteRenderer2 = function()
{
var pagescount = Math.min(this.m_lPagesCount, this.m_lCountCalculatePages);
var start = Math.max(this.m_lCurrentRendererPage, 0);
var end = Math.min(start + 50, pagescount - 1);
if ((end + 1) >= pagescount)
return true;
return false;
}
this.ToRendererPart = function()
{
var pagescount = Math.min(this.m_lPagesCount, this.m_lCountCalculatePages);
......@@ -2209,8 +2185,6 @@ function CDrawingDocument(drawingObjects)
renderer.BeginPage(page.width_mm, page.height_mm);
this.m_oLogicDocument.DrawPage(i, renderer);
renderer.EndPage();
editor.async_SaveToPdf_Progress(parseInt((i + 1) * 100 / pagescount));
}
this.m_lCurrentRendererPage = end + 1;
......
PowerPoint/Drawing/DrawingDocument.js
View file @ 8e1a1577
......@@ -1213,28 +1213,6 @@ function CDrawingDocument()
this.m_oWordControl.m_oApi.ShowParaMarks = old_marks;
return ret;
}
this.isComleteRenderer = function()
{
if (this.m_lCurrentRendererPage >= this.SlidesCount)
{
this.m_lCurrentRendererPage = -1;
this.m_oDocRenderer = null;
this.m_oWordControl.m_oApi.ShowParaMarks = this.m_bOldShowMarks;
return true;
}
return false;
}
this.isComleteRenderer2 = function()
{
var start = Math.max(this.m_lCurrentRendererPage, 0);
var end = this.SlidesCount - 1;
if ((end + 1) >= this.SlidesCount)
return true;
return false;
}
this.ToRendererPart = function()
{
var pagescount = this.SlidesCount;
......
PowerPoint/api.js
View file @ 8e1a1577
......@@ -804,11 +804,6 @@ asc_docs_api.prototype.LoadDocument = function() {
// Меняем тип состояния (на открытие)
this.advancedOptionsAction = c_oAscAdvancedOptionsAction.Open;
if (this.DocInfo.get_OfflineApp() === true) {
this.OfflineAppDocumentStartLoad();
return;
}
if (documentId) {
this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Open);
var rData = {
......@@ -832,7 +827,7 @@ asc_docs_api.prototype.LoadDocument = function() {
// For test create unique id
documentId = "test_presentation_id";
this.OfflineAppDocumentStartLoad();
this._OfflineAppDocumentStartLoad();
}
this.sync_zoomChangeCallback(this.WordControl.m_nZoomValue, this.WordControl.m_nZoomType);
};
......@@ -1023,35 +1018,24 @@ asc_docs_api.prototype.get_DocumentName = function()
return this.DocumentName;
};
asc_docs_api.prototype.OfflineAppDocumentStartLoad = function()
{
var scriptElem = document.createElement('script');
if (scriptElem.readyState)
{
scriptElem.onreadystatechange = function () {
if (this.readyState == 'complete' || this.readyState == 'loaded')
{
scriptElem.onreadystatechange = null;
setTimeout(editor.OfflineAppDocumentEndLoad, 0);
}
}
}
scriptElem.onload = scriptElem.onerror = this.OfflineAppDocumentEndLoad;
asc_docs_api.prototype._OfflineAppDocumentStartLoad = function() {
var t = this, scriptElem = document.createElement('script');
scriptElem.onload = scriptElem.onerror = function() {
t._OfflineAppDocumentEndLoad();
};
scriptElem.setAttribute('src',documentUrl + "editor.js");
scriptElem.setAttribute('type','text/javascript');
document.getElementsByTagName('head')[0].appendChild(scriptElem);
scriptElem.setAttribute('src', documentUrl + "editor.js");
scriptElem.setAttribute('type', 'text/javascript');
document.getElementsByTagName('head')[0].appendChild(scriptElem);
};
asc_docs_api.prototype.OfflineAppDocumentEndLoad = function()
{
if (undefined == window["editor_bin"])
return;
asc_docs_api.prototype._OfflineAppDocumentEndLoad = function() {
if (undefined == window["editor_bin"])
return;
editor.OpenDocument2(documentUrl, window["editor_bin"]);
//callback
editor.DocumentOrientation = (null == editor.WordControl.m_oLogicDocument) ? true : !editor.WordControl.m_oLogicDocument.Orientation;
this.OpenDocument2(documentUrl, window["editor_bin"]);
//callback
this.DocumentOrientation = (null == this.WordControl.m_oLogicDocument) ? true : !this.WordControl.m_oLogicDocument.Orientation;
};
// Callbacks
/* все имена callback'оф начинаются с On. Пока сделаны:
......@@ -1080,7 +1064,7 @@ var _callbacks = {};
asc_docs_api.prototype.asc_registerCallback = function(name, callback) {
if (!_callbacks.hasOwnProperty(name))
_callbacks[name] = []
_callbacks[name] = [];
_callbacks[name].push(callback);
};
......@@ -1091,7 +1075,7 @@ asc_docs_api.prototype.asc_unregisterCallback = function(name, callback) {
_callbacks[name].splice(i, 1);
}
}
_callbacks[name] = []
_callbacks[name] = [];
_callbacks[name].push(callback);
};
......
PowerPoint/apiExport.js
View file @ 8e1a1577
......@@ -44,8 +44,6 @@ asc_docs_api.prototype['SetInterfaceDrawImagePlaceTextArt'] = asc_docs_api.proto
asc_docs_api.prototype['SetInterfaceDrawImagePlace'] = asc_docs_api.prototype.SetInterfaceDrawImagePlace;
asc_docs_api.prototype['OpenDocument2'] = asc_docs_api.prototype.OpenDocument2;
asc_docs_api.prototype['get_DocumentName'] = asc_docs_api.prototype.get_DocumentName;
asc_docs_api.prototype['OfflineAppDocumentStartLoad'] = asc_docs_api.prototype.OfflineAppDocumentStartLoad;
asc_docs_api.prototype['OfflineAppDocumentEndLoad'] = asc_docs_api.prototype.OfflineAppDocumentEndLoad;
asc_docs_api.prototype['asc_registerCallback'] = asc_docs_api.prototype.asc_registerCallback;
asc_docs_api.prototype['asc_unregisterCallback'] = asc_docs_api.prototype.asc_unregisterCallback;
asc_docs_api.prototype['asc_fireCallback'] = asc_docs_api.prototype.asc_fireCallback;
......
Word/Drawing/DrawingDocument.js
View file @ 8e1a1577
......@@ -2134,30 +2134,6 @@ function CDrawingDocument()
//console.log(ret);
return ret;
}
this.isComleteRenderer = function()
{
var pagescount = Math.min(this.m_lPagesCount, this.m_lCountCalculatePages);
if (this.m_lCurrentRendererPage >= pagescount)
{
this.m_lCurrentRendererPage = -1;
this.m_oDocRenderer = null;
this.m_oWordControl.m_oApi.ShowParaMarks = this.m_bOldShowMarks;
return true;
}
return false;
}
this.isComleteRenderer2 = function()
{
var pagescount = Math.min(this.m_lPagesCount, this.m_lCountCalculatePages);
var start = Math.max(this.m_lCurrentRendererPage, 0);
var end = pagescount - 1;
if ((end + 1) >= pagescount)
return true;
return false;
}
this.ToRendererPart = function()
{
var pagescount = Math.min(this.m_lPagesCount, this.m_lCountCalculatePages);
......@@ -2184,8 +2160,6 @@ function CDrawingDocument()
renderer.BeginPage(page.width_mm, page.height_mm);
this.m_oLogicDocument.DrawPage(i, renderer);
renderer.EndPage();
editor.async_SaveToPdf_Progress(parseInt((i + 1) * 100 / pagescount));
}
this.m_lCurrentRendererPage = end + 1;
......
Word/api.js
View file @ 8e1a1577
This diff is collapsed.
Word/apiExport.js
View file @ 8e1a1577
......@@ -453,9 +453,6 @@ asc_docs_api.prototype['getCurrentPage'] = asc_docs_api.prototype.getCurrentPage
asc_docs_api.prototype['sync_zoomChangeCallback'] = asc_docs_api.prototype.sync_zoomChangeCallback;
asc_docs_api.prototype['sync_countPagesCallback'] = asc_docs_api.prototype.sync_countPagesCallback;
asc_docs_api.prototype['sync_currentPageCallback'] = asc_docs_api.prototype.sync_currentPageCallback;
asc_docs_api.prototype['async_SaveToPdf'] = asc_docs_api.prototype.async_SaveToPdf;
asc_docs_api.prototype['async_SaveToPdf_PartCallback'] = asc_docs_api.prototype.async_SaveToPdf_PartCallback;
asc_docs_api.prototype['async_SaveToPdf_Progress'] = asc_docs_api.prototype.async_SaveToPdf_Progress;
asc_docs_api.prototype['asc_enableKeyEvents'] = asc_docs_api.prototype.asc_enableKeyEvents;
asc_docs_api.prototype['asyncServerIdEndLoaded'] = asc_docs_api.prototype.asyncServerIdEndLoaded;
asc_docs_api.prototype['asyncFontsDocumentStartLoaded'] = asc_docs_api.prototype.asyncFontsDocumentStartLoaded;
......@@ -519,8 +516,6 @@ asc_docs_api.prototype['SetUseEmbeddedCutFonts'] = asc_docs_api.prototype.SetUse
asc_docs_api.prototype['IsNeedDefaultFonts'] = asc_docs_api.prototype.IsNeedDefaultFonts;
asc_docs_api.prototype['OnMouseUp'] = asc_docs_api.prototype.OnMouseUp;
asc_docs_api.prototype['asyncImageEndLoaded2'] = asc_docs_api.prototype.asyncImageEndLoaded2;
asc_docs_api.prototype['OfflineAppDocumentStartLoad'] = asc_docs_api.prototype.OfflineAppDocumentStartLoad;
asc_docs_api.prototype['OfflineAppDocumentEndLoad'] = asc_docs_api.prototype.OfflineAppDocumentEndLoad;
asc_docs_api.prototype['SetDrawImagePlaceParagraph'] = asc_docs_api.prototype.SetDrawImagePlaceParagraph;
asc_docs_api.prototype['asc_getMasterCommentId'] = asc_docs_api.prototype.asc_getMasterCommentId;
asc_docs_api.prototype['asc_getAnchorPosition'] = asc_docs_api.prototype.asc_getAnchorPosition;
......
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