-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #248 from ONLYOFFICE/develop
Release/2.6.0
- Loading branch information
Showing
43 changed files
with
179 additions
and
228 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,86 +44,84 @@ AscDesktopEditor.execCommand (command, parameters) | |
| </table> | ||
| <div class="mobile-content"></div> | ||
|
|
||
| <ol> | ||
| <li id="login" class="copy-link"> | ||
| <p><b>portal:login</b></p> | ||
| <p>When the <em>portal:login</em> command is sent, the cloud is registered and listed on the <b>Connected clouds</b> page. | ||
| Call the command on all the pages you can access after logging in to your cloud. | ||
| Parameters are specified in the format of a string with the serialized <em>json</em> as follows:</p> | ||
| <pre> | ||
| <h2 id="login" class="copy-link">portal:login</h2> | ||
| <p>When the <em>portal:login</em> command is sent, the cloud is registered and listed on the <b>Connected clouds</b> page. | ||
| Call the command on all the pages you can access after logging in to your cloud. | ||
| Parameters are specified in the format of a string with the serialized <em>json</em> as follows:</p> | ||
| <pre> | ||
| { | ||
| "displayName": "user name", | ||
| "email": "[email protected]", | ||
| "domain": "domain name", | ||
| "provider": "provider", | ||
| "userId": "user id" | ||
| "displayName": "user name", | ||
| "email": "[email protected]", | ||
| "domain": "domain name", | ||
| "provider": "provider", | ||
| "userId": "user id" | ||
| } | ||
| </pre> | ||
|
|
||
| <div class="header-gray">Parameters</div> | ||
| <table class="table"> | ||
| <colgroup> | ||
| <col class="table-name" /> | ||
| <col /> | ||
| <col class="table-type" /> | ||
| <col class="table-example" /> | ||
| </colgroup> | ||
| <thead> | ||
| <tr class="tablerow"> | ||
| <td>Name</td> | ||
| <td>Description</td> | ||
| <td>Type</td> | ||
| <td>Example</td> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr class="tablerow"> | ||
| <td id="displayName" class="copy-link">displayName<span class="required">*</span></td> | ||
| <td> | ||
| Defines the user name displayed on the <b>Connected clouds</b> page. | ||
| </td> | ||
| <td>string</td> | ||
| <td>"John Smith"</td> | ||
| </tr> | ||
| <tr class="tablerow"> | ||
| <td id="email" class="copy-link">email</td> | ||
| <td> | ||
| Defines the user email displayed on the <b>Connected clouds</b> page. | ||
| </td> | ||
| <td>string</td> | ||
| <td>"[email protected]"</td> | ||
| </tr> | ||
| <tr class="tablerow"> | ||
| <td id="domain" class="copy-link">domain<span class="required">*</span></td> | ||
| <td> | ||
| Defines the cloud name and the cloud entry point. | ||
| </td> | ||
| <td>string</td> | ||
| <td>"https://exampledomain.com"</td> | ||
| </tr> | ||
| <tr class="tablerow"> | ||
| <td id="provider" class="copy-link">provider<span class="required">*</span></td> | ||
| <td> | ||
| Defines the provider id used to refer to the desktop app in the JavaScript commands (the same as in the <a href="<%= Url.Action("addingdms/") %>">config</a>). | ||
| </td> | ||
| <td>string</td> | ||
| <td>"onlyoffice"</td> | ||
| </tr> | ||
| <tr class="tablerow"> | ||
| <td id="userId" class="copy-link">userId<span class="required">*</span></td> | ||
| <td> | ||
| Defines the user id. | ||
| </td> | ||
| <td>string</td> | ||
| <td>"78e1e841"</td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| <div class="mobile-content"></div> | ||
| <span class="required-descr"><span class="required">*</span><em> - required field</em></span> | ||
| <div class="header-gray">Parameters</div> | ||
| <table class="table"> | ||
| <colgroup> | ||
| <col class="table-name" /> | ||
| <col /> | ||
| <col class="table-type" /> | ||
| <col class="table-example" /> | ||
| </colgroup> | ||
| <thead> | ||
| <tr class="tablerow"> | ||
| <td>Name</td> | ||
| <td>Description</td> | ||
| <td>Type</td> | ||
| <td>Example</td> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr class="tablerow"> | ||
| <td id="displayName" class="copy-link">displayName<span class="required">*</span></td> | ||
| <td> | ||
| Defines the user name displayed on the <b>Connected clouds</b> page. | ||
| </td> | ||
| <td>string</td> | ||
| <td>"John Smith"</td> | ||
| </tr> | ||
| <tr class="tablerow"> | ||
| <td id="email" class="copy-link">email</td> | ||
| <td> | ||
| Defines the user email displayed on the <b>Connected clouds</b> page. | ||
| </td> | ||
| <td>string</td> | ||
| <td>"[email protected]"</td> | ||
| </tr> | ||
| <tr class="tablerow"> | ||
| <td id="domain" class="copy-link">domain<span class="required">*</span></td> | ||
| <td> | ||
| Defines the cloud name and the cloud entry point. | ||
| </td> | ||
| <td>string</td> | ||
| <td>"https://exampledomain.com"</td> | ||
| </tr> | ||
| <tr class="tablerow"> | ||
| <td id="provider" class="copy-link">provider<span class="required">*</span></td> | ||
| <td> | ||
| Defines the provider id used to refer to the desktop app in the JavaScript commands (the same as in the <a href="<%= Url.Action("addingdms/") %>">config</a>). | ||
| </td> | ||
| <td>string</td> | ||
| <td>"onlyoffice"</td> | ||
| </tr> | ||
| <tr class="tablerow"> | ||
| <td id="userId" class="copy-link">userId<span class="required">*</span></td> | ||
| <td> | ||
| Defines the user id. | ||
| </td> | ||
| <td>string</td> | ||
| <td>"78e1e841"</td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| <div class="mobile-content"></div> | ||
|
|
||
| <span class="required-descr"><span class="required">*</span><em> - required field</em></span> | ||
|
|
||
| <div class="header-gray">Example</div> | ||
| <div class="header-gray">Example</div> | ||
| <pre> | ||
| const params = { | ||
| "displayName": "John Smith", | ||
|
|
@@ -132,51 +130,50 @@ const params = { | |
| "provider": "onlyoffice", | ||
| "userId": "78e1e841" | ||
| } | ||
| AscDesktopEditor.execCommand ("portal:login", JSON.stringify(params)) | ||
| AscDesktopEditor.execCommand ("portal:login", JSON.stringify(params)) | ||
| </pre> | ||
| </li> | ||
| <li id="logout" class="copy-link"> | ||
| <p><b>portal:logout</b></p> | ||
| <p>When the <em>portal:logout</em> command is sent, the cloud will be removed from the list on the <b>Connected clouds</b> page. | ||
| Cookies for this domain will be cleared. Parameters are specified in the format of a string with the serialized <em>json</em> as follows:</p> | ||
| <pre> | ||
|
|
||
| <h2 id="logout" class="copy-link">portal:logout</b></h2> | ||
| <p>When the <em>portal:logout</em> command is sent, the cloud will be removed from the list on the <b>Connected clouds</b> page. | ||
| Cookies for this domain will be cleared. Parameters are specified in the format of a string with the serialized <em>json</em> as follows:</p> | ||
| <pre> | ||
| { | ||
| "domain": "domain name" | ||
| } | ||
| } | ||
| </pre> | ||
|
|
||
| <div class="header-gray">Parameters</div> | ||
| <table class="table"> | ||
| <colgroup> | ||
| <col class="table-name" /> | ||
| <col /> | ||
| <col class="table-type" /> | ||
| <col class="table-example" /> | ||
| </colgroup> | ||
| <thead> | ||
| <tr class="tablerow"> | ||
| <td>Name</td> | ||
| <td>Description</td> | ||
| <td>Type</td> | ||
| <td>Example</td> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr class="tablerow"> | ||
| <td id="domain" class="copy-link">domain</td> | ||
| <td> | ||
| Defines the cloud name and the cloud entry point. | ||
| </td> | ||
| <td>string</td> | ||
| <td>"https://exampledomain.com"</td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| <div class="mobile-content"></div> | ||
| <div class="header-gray">Parameters</div> | ||
| <table class="table"> | ||
| <colgroup> | ||
| <col class="table-name" /> | ||
| <col /> | ||
| <col class="table-type" /> | ||
| <col class="table-example" /> | ||
| </colgroup> | ||
| <thead> | ||
| <tr class="tablerow"> | ||
| <td>Name</td> | ||
| <td>Description</td> | ||
| <td>Type</td> | ||
| <td>Example</td> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr class="tablerow"> | ||
| <td id="domain" class="copy-link">domain</td> | ||
| <td> | ||
| Defines the cloud name and the cloud entry point. | ||
| </td> | ||
| <td>string</td> | ||
| <td>"https://exampledomain.com"</td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| <div class="mobile-content"></div> | ||
|
|
||
| <div class="header-gray">Example</div> | ||
| <pre> | ||
| <div class="header-gray">Example</div> | ||
| <pre> | ||
| window.AscDesktopEditor.execCommand ("portal:logout", JSON.stringify (({ | ||
| "domain": "https://exampledomain.com" | ||
| })); | ||
| })); | ||
| </pre> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.