Skip to content

S
sdkjs
Commit 8ca9361f authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov
Browse files
Options

git-svn-id:... 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48843 954022d7-b5bf-4e40-9824-e11837661b57
parent 381cdf3d
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 100 deletions
PowerPoint/api.js
View file @ 8ca9361f
......@@ -145,17 +145,97 @@ asc_docs_api.prototype._coAuthoringInit = function (docId, user) {
this.CoAuthoringApi.onUserStateChanged = function (e) { oThis.asc_fireCallback( "asc_onUserStateChanged", e ); };
this.CoAuthoringApi.onLocksAcquired = function (e) {
if (2 != e["state"]) {
var Id = e["block"];
var Class = g_oTableId.Get_ById( Id );
if ( null != Class )
{
var Lock = Class.Lock;
var OldType = Class.Lock.Get_Type();
if ( locktype_Other2 === OldType || locktype_Other3 === OldType )
Lock.Set_Type( locktype_Other3, true );
else
Lock.Set_Type( locktype_Other, true );
// Выставляем ID пользователя, залочившего данный элемент
Lock.Set_UserId( e["user"] );
/* if ( Class instanceof CHeaderFooterController )
editor.sync_LockHeaderFooters();
else if ( Class instanceof CDocument )
editor.sync_LockDocumentProps();
else if ( Class instanceof CComment )
editor.sync_LockComment(Class.Get_Id(), e["user"]);
else if ( Class instanceof CGraphicObjects )
editor.sync_LockDocumentSchema(); */
// TODO: Здесь для ускорения надо сделать проверку, является ли текущим элемент с
// заданным Id. Если нет, тогда и не надо обновлять состояние.
editor.WordControl.m_oLogicDocument.Document_UpdateInterfaceState();
}
else
{
CollaborativeEditing.Add_NeedLock(Id, e["user"]);
}
// TODO: эвент о пришедших lock-ах
}
};
this.CoAuthoringApi.onLocksReleased = function (e, bChanges) {
var element = e["block"];
var Id = e["block"];
var Class = g_oTableId.Get_ById( Id );
if ( null != Class )
{
var Lock = Class.Lock;
if ( "undefined" != typeof(Lock) )
{
var CurType = Lock.Get_Type();
var NewType = locktype_None;
if ( CurType === locktype_Other )
{
if ( true != bChanges )
NewType = locktype_None;
else
{
NewType = locktype_Other2;
CollaborativeEditing.Add_Unlock(Class);
}
}
else if ( CurType === locktype_Mine )
{
// Такого быть не должно
NewType = locktype_Mine;
}
else if ( CurType === locktype_Other2 || CurType === locktype_Other3 )
NewType = locktype_Other2;
Lock.Set_Type( NewType, true );
}
}
else
{
CollaborativeEditing.Remove_NeedLock(Id);
}
// TODO: эвент о снятии lock-ов другими пользователями
};
this.CoAuthoringApi.onSaveChanges = function (e, bSendEvent) {
// bSendEvent = false - это означает, что мы загружаем имеющиеся изменения при открытии
var bAddChanges = false;
var Count = e.length;
for ( var Index = 0; Index < Count; Index++ )
{
var Changes = new CCollaborativeChanges();
Changes.Set_Id( e[Index].m_sId );
Changes.Set_Data( e[Index].m_pData );
CollaborativeEditing.Add_Changes( Changes );
}
// т.е. если bSendEvent не задан, то посылаем сообщение
if ( Count > 0 && false != bSendEvent )
editor.sync_CollaborativeChanges();
// TODO: эвент о пришедших изменениях с сервера (но еще не сохраненных)
// т.е. если bSendEvent не задан, то посылаем сообщение
......@@ -163,6 +243,8 @@ asc_docs_api.prototype._coAuthoringInit = function (docId, user) {
oThis.syncCollaborativeChanges();
};
this.CoAuthoringApi.onFirstLoadChanges = function (e) {
this.CoAuthoringApi.onSaveChanges(e,false);
CollaborativeEditing.Apply_Changes();
// TODO: Загружаем изменения от других пользователей при открытии
};
this.CoAuthoringApi.onSetIndexUser = function (e) {
......@@ -170,12 +252,16 @@ asc_docs_api.prototype._coAuthoringInit = function (docId, user) {
oThis.asyncServerIdEndLoaded ();
};
this.CoAuthoringApi.onStartCoAuthoring = function (isStartEvent) {
// На старте не нужно ничего делать
if (!isStartEvent) {
// TODO:
// Принимаем чужие изменения
// Пересылаем свои изменения
}
CollaborativeEditing.Start_CollaborationEditing();
editor.WordControl.m_oLogicDocument.DrawingDocument.Start_CollaborationEditing();
if ( true != History.Is_Clear() )
{
CollaborativeEditing.Apply_Changes();
CollaborativeEditing.Send_Changes();
}
};
/**
* Event об отсоединении от сервера
......@@ -184,27 +270,42 @@ asc_docs_api.prototype._coAuthoringInit = function (docId, user) {
* @param {Bool} isCloseCoAuthoring
*/
this.CoAuthoringApi.onDisconnect = function (e, isDisconnectAtAll, isCloseCoAuthoring) {
if (0 === oThis.CoAuthoringApi.get_state())
oThis.asyncServerIdEndLoaded();
// TODO: Uncomment when CoAuthoring will be done
//if (isDisconnectAtAll) {
// Посылаем наверх эвент об отключении от сервера
// oThis.asc_fireCallback("asc_onСoAuthoringDisconnect");
// oThis.SetViewMode(true);
// if (!isCloseCoAuthoring){
// oThis.sync_ErrorCallback(c_oAscError.ID.CoAuthoringDisconnect, c_oAscError.Level.NoCritical);
// }
//}
var t = this;
if (0 === t.CoAuthoringApi.get_state())
t.asyncServerIdEndLoaded();
if (isDisconnectAtAll) {
// Посылаем наверх эвент об отключении от сервера
t.asc_fireCallback("asc_onСoAuthoringDisconnect");
t.SetViewMode(true, true);
if (!isCloseCoAuthoring){
t.sync_ErrorCallback(c_oAscError.ID.CoAuthoringDisconnect, c_oAscError.Level.NoCritical);
}
}
};
this.CoAuthoringApi.init (user, docId, this.isViewMode, 'fghhfgsjdgfjs', window.location.host, g_sMainServiceLocalUrl, function(){
});
// ToDo init other callbacks
};
asc_docs_api.prototype._coAuthoringInitCallBack = function (_this) {
if (undefined !== window['g_cAscCoAuthoringUrl'])
}
asc_docs_api.prototype.pre_Save = function(_images)
{
this.isSaveFonts_Images = true;
this.saveImageMap = _images;
this.WordControl.m_oDrawingDocument.CheckFontNeeds();
this.FontLoader.LoadDocumentFonts2(this.WordControl.m_oLogicDocument.Fonts);
}
asc_docs_api.prototype.sync_CollaborativeChanges = function()
{
this.asc_fireCallback("asc_onCollaborativeChanges");
}
asc_docs_api.prototype._coAuthoringInitCallBack = function(_this)
{
if(undefined !== window['g_cAscCoAuthoringUrl'])
window.g_cAscCoAuthoringUrl = window['g_cAscCoAuthoringUrl'];
if (undefined !== window.g_cAscCoAuthoringUrl) {
......@@ -473,7 +574,7 @@ asc_docs_api.prototype.LoadDocument = function(c_DocInfo)
this.DocInfo.put_OfflineApp(true);
// For test create unique id
documentId = "0123456789";
documentId = "qwerty123";
this.OfflineAppDocumentStartLoad();
this.sync_zoomChangeCallback(this.WordControl.m_nZoomValue, this.WordControl.m_nZoomType);
......@@ -2917,86 +3018,10 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function()
{
if(this.LoadedObject)
{
this.WordControl.m_oLogicDocument.Recalculate();
var presentation = this.WordControl.m_oLogicDocument;
/* for(var i = 0; i <presentation.slideLayouts.length; ++i)
{
presentation.slideLayouts[i].elementsManipulator = new AutoShapesContainer(presentation, 0);
for(var j = 0; j < presentation.slideLayouts[i].cSld.spTree.length; ++j)
{
presentation.slideLayouts[i].cSld.spTree[j].setParent(presentation.slideLayouts[i]);
presentation.slideLayouts[i].cSld.spTree[j].setContainer(presentation.slideLayouts[i].elementsManipulator);
presentation.slideLayouts[i].cSld.spTree[j].calculate();
}
}
for(i = 0; i <presentation.slideMasters.length; ++i)
{
presentation.slideMasters[i].elementsManipulator = new AutoShapesContainer(presentation, 0);
for(j = 0; j < presentation.slideMasters[i].cSld.spTree.length; ++j)
{
presentation.slideMasters[i].cSld.spTree[j].setParent(presentation.slideMasters[i]);
presentation.slideMasters[i].cSld.spTree[j].setContainer(presentation.slideMasters[i].elementsManipulator);
presentation.slideMasters[i].cSld.spTree[j].calculate();
}
} */
var _slides = presentation.Slides;
var _slide_index;
var _slide_count = _slides.length;
var _cur_slide;
for(_slide_index = 0; _slide_index < _slide_count; ++_slide_index)
{
_cur_slide = _slides[_slide_index];
if(!_cur_slide.Layout.calculated)
{
var _cur_layout = _cur_slide.Layout;
_cur_layout.elementsManipulator = new AutoShapesContainer(presentation, 0);
var _layout_shape_index;
var _layout_shapes = _cur_layout.cSld.spTree;
var _layout_shape_count = _layout_shapes.length;
var _layout_shape;
for(_layout_shape_index = 0; _layout_shape_index < _layout_shape_count; ++_layout_shape_index)
{
_layout_shape = _layout_shapes[_layout_shape_index];
if(!_layout_shape.isPlaceholder())
{
_layout_shape.setParent(_cur_layout);
_layout_shape.setContainer(_cur_layout.elementsManipulator);
_layout_shape.calculate();
}
}
_cur_layout.calculated = true;
}
if(!_cur_slide.Layout.Master.calculated)
{
var _cur_master = _cur_slide.Layout.Master;
_cur_master.elementsManipulator = new AutoShapesContainer(presentation, 0);
var _master_shape_index;
var _master_shapes = _cur_master.cSld.spTree;
var _master_shape_count = _master_shapes.length;
var _master_shape;
for(_master_shape_index = 0; _master_shape_index < _master_shape_count; ++_master_shape_index)
{
_master_shape = _master_shapes[_master_shape_index];
if(!_master_shape.isPlaceholder())
{
_master_shape.setParent(_cur_master);
_master_shape.setContainer(_cur_master.elementsManipulator);
_master_shape.calculate();
}
}
_cur_master.calculated = true;
}
_cur_slide.calculate();
presentation.DrawingDocument.OnRecalculatePage( _slide_index, _cur_slide );
}
presentation.DrawingDocument.OnEndRecalculate();
this.asc_fireCallback("asc_onPresentationSize", presentation.Width, presentation.Height);
this.WordControl.GoToPage(0);
bIsScroll = true;
}
......
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