Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
0e51621e
Commit
0e51621e
authored
Jun 16, 2016
by
konovalovsergey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
в логах ошибки на auth
parent
a2c2cfa8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
3 deletions
+21
-3
common/apiBase.js
common/apiBase.js
+10
-3
common/docscoapi.js
common/docscoapi.js
+11
-0
No files found.
common/apiBase.js
View file @
0e51621e
...
@@ -347,7 +347,7 @@
...
@@ -347,7 +347,7 @@
this
.
sendEvent
(
"
asc_onPrint
"
);
this
.
sendEvent
(
"
asc_onPrint
"
);
};
};
// Open
// Open
baseEditorsApi
.
prototype
.
asc_LoadDocument
=
function
(
isVersionHistory
)
baseEditorsApi
.
prototype
.
asc_LoadDocument
=
function
(
isVersionHistory
,
isRepeat
)
{
{
// Меняем тип состояния (на открытие)
// Меняем тип состояния (на открытие)
this
.
advancedOptionsAction
=
AscCommon
.
c_oAscAdvancedOptionsAction
.
Open
;
this
.
advancedOptionsAction
=
AscCommon
.
c_oAscAdvancedOptionsAction
.
Open
;
...
@@ -373,7 +373,9 @@
...
@@ -373,7 +373,9 @@
}
}
this
.
CoAuthoringApi
.
auth
(
this
.
getViewMode
(),
rData
);
this
.
CoAuthoringApi
.
auth
(
this
.
getViewMode
(),
rData
);
this
.
sync_StartAction
(
c_oAscAsyncActionType
.
BlockInteraction
,
c_oAscAsyncAction
.
Open
);
if
(
!
isRepeat
)
{
this
.
sync_StartAction
(
c_oAscAsyncActionType
.
BlockInteraction
,
c_oAscAsyncAction
.
Open
);
}
if
(
offlineMode
===
this
.
documentUrl
)
if
(
offlineMode
===
this
.
documentUrl
)
{
{
...
@@ -513,7 +515,12 @@
...
@@ -513,7 +515,12 @@
{
{
if
(
t
.
isOnFirstConnectEnd
)
if
(
t
.
isOnFirstConnectEnd
)
{
{
t
.
CoAuthoringApi
.
auth
(
t
.
getViewMode
());
if
(
t
.
CoAuthoringApi
.
get_isAuth
())
{
t
.
CoAuthoringApi
.
auth
(
t
.
getViewMode
());
}
else
{
//первый запрос или ответ не дошел надо повторить открытие
t
.
asc_LoadDocument
(
false
,
true
);
}
}
}
else
else
{
{
...
...
common/docscoapi.js
View file @
0e51621e
...
@@ -268,6 +268,13 @@
...
@@ -268,6 +268,13 @@
return
null
;
return
null
;
};
};
CDocsCoApi
.
prototype
.
get_isAuth
=
function
()
{
if
(
this
.
_CoAuthoringApi
&&
this
.
_onlineWork
)
{
return
this
.
_CoAuthoringApi
.
get_isAuth
();
}
return
null
;
};
CDocsCoApi
.
prototype
.
releaseLocks
=
function
(
blockId
)
{
CDocsCoApi
.
prototype
.
releaseLocks
=
function
(
blockId
)
{
if
(
this
.
_CoAuthoringApi
&&
this
.
_onlineWork
)
{
if
(
this
.
_CoAuthoringApi
&&
this
.
_onlineWork
)
{
this
.
_CoAuthoringApi
.
releaseLocks
(
blockId
);
this
.
_CoAuthoringApi
.
releaseLocks
(
blockId
);
...
@@ -514,6 +521,10 @@
...
@@ -514,6 +521,10 @@
return
this
.
_indexUser
;
return
this
.
_indexUser
;
};
};
DocsCoApi
.
prototype
.
get_isAuth
=
function
()
{
return
this
.
_isAuth
};
DocsCoApi
.
prototype
.
getSessionId
=
function
()
{
DocsCoApi
.
prototype
.
getSessionId
=
function
()
{
return
this
.
_id
;
return
this
.
_id
;
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment