@jupyter/docprovider-extension 4.4.0 → 4.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/yprovider.js +10 -4
- package/package.json +3 -3
package/lib/yprovider.js
CHANGED
|
@@ -13,8 +13,9 @@ const PLUGIN_ID = '@jupyter/docprovider-extension:websocket-provider';
|
|
|
13
13
|
* Document provider factory that creates WebSocket providers.
|
|
14
14
|
*/
|
|
15
15
|
class WebSocketDocumentProviderFactory {
|
|
16
|
-
constructor(
|
|
17
|
-
this._trans =
|
|
16
|
+
constructor(options) {
|
|
17
|
+
this._trans = options.translator;
|
|
18
|
+
this._commands = options.commands;
|
|
18
19
|
}
|
|
19
20
|
create(options) {
|
|
20
21
|
return new WebSocketProvider({
|
|
@@ -24,7 +25,9 @@ class WebSocketDocumentProviderFactory {
|
|
|
24
25
|
model: options.model,
|
|
25
26
|
user: options.user,
|
|
26
27
|
translator: this._trans,
|
|
27
|
-
serverSettings: options.serverSettings
|
|
28
|
+
serverSettings: options.serverSettings,
|
|
29
|
+
onConflictSaveAs: () => this._commands.execute('docmanager:save-as'),
|
|
30
|
+
onConflictRevert: () => this._commands.execute('docmanager:reload')
|
|
28
31
|
});
|
|
29
32
|
}
|
|
30
33
|
}
|
|
@@ -53,7 +56,10 @@ export const documentProviderFactoryPlugin = {
|
|
|
53
56
|
provides: IDocumentProviderFactory,
|
|
54
57
|
activate: async (app, translator) => {
|
|
55
58
|
const trans = translator.load('jupyter_collaboration');
|
|
56
|
-
return new WebSocketDocumentProviderFactory(
|
|
59
|
+
return new WebSocketDocumentProviderFactory({
|
|
60
|
+
translator: trans,
|
|
61
|
+
commands: app.commands
|
|
62
|
+
});
|
|
57
63
|
}
|
|
58
64
|
};
|
|
59
65
|
/**
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyter/docprovider-extension",
|
|
3
|
-
"version": "4.4.
|
|
3
|
+
"version": "4.4.1",
|
|
4
4
|
"description": "JupyterLab - Collaborative Shared Models",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"jupyter",
|
|
@@ -53,8 +53,8 @@
|
|
|
53
53
|
"watch:labextension": "jupyter labextension watch ."
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@jupyter/collaborative-drive": "^4.4.
|
|
57
|
-
"@jupyter/docprovider": "^4.4.
|
|
56
|
+
"@jupyter/collaborative-drive": "^4.4.1",
|
|
57
|
+
"@jupyter/docprovider": "^4.4.1",
|
|
58
58
|
"@jupyter/ydoc": "^2.1.3 || ^3.0.0",
|
|
59
59
|
"@jupyterlab/application": "^4.5.0",
|
|
60
60
|
"@jupyterlab/apputils": "^4.5.0",
|