@seafile/sdoc-editor 2.0.187 → 2.0.189
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.
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
border-bottom: 1px solid #e9ecef;
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
.modal-title-container {
|
|
33
|
+
.sdoc-file-select-dialog .modal-title-container {
|
|
34
34
|
flex: 0 1 auto;
|
|
35
35
|
white-space: nowrap;
|
|
36
36
|
position: relative;
|
|
@@ -40,14 +40,6 @@
|
|
|
40
40
|
margin: auto 0;
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
-
.search-container {
|
|
44
|
-
display: flex;
|
|
45
|
-
flex: 1;
|
|
46
|
-
align-items: center;
|
|
47
|
-
justify-content: flex-end;
|
|
48
|
-
margin-right: 8px;
|
|
49
|
-
}
|
|
50
|
-
|
|
51
43
|
.sdoc-close-dialog {
|
|
52
44
|
display: flex;
|
|
53
45
|
align-items: center;
|
|
@@ -56,14 +48,12 @@
|
|
|
56
48
|
cursor: pointer;
|
|
57
49
|
}
|
|
58
50
|
|
|
59
|
-
.
|
|
60
|
-
.modal-header-container .sdoc-close1 {
|
|
51
|
+
.sdoc-file-select-dialog .modal-header-container .sdoc-close1 {
|
|
61
52
|
font-size: 16px;
|
|
62
53
|
color: #666666;
|
|
63
54
|
}
|
|
64
55
|
|
|
65
|
-
.
|
|
66
|
-
.modal-header-container .sdoc-close1:hover {
|
|
56
|
+
.sdoc-file-select-dialog .modal-header-container .sdoc-close1:hover {
|
|
67
57
|
background-color: #EFEFEF;
|
|
68
58
|
border-radius: 3px;
|
|
69
59
|
height: 28px;
|
|
@@ -153,12 +143,12 @@
|
|
|
153
143
|
width: 100%;
|
|
154
144
|
}
|
|
155
145
|
|
|
156
|
-
.modal-header-container .modal-operation-container {
|
|
146
|
+
.sdoc-file-select-dialog .modal-header-container .modal-operation-container {
|
|
157
147
|
display: flex;
|
|
158
148
|
align-items: center;
|
|
159
149
|
}
|
|
160
150
|
|
|
161
|
-
.toggle-view {
|
|
151
|
+
.sdoc-toggle-view {
|
|
162
152
|
display: flex;
|
|
163
153
|
margin-right: 0.5rem;
|
|
164
154
|
border: 1px solid #eee;
|
|
@@ -167,12 +157,8 @@
|
|
|
167
157
|
padding: 3px;
|
|
168
158
|
}
|
|
169
159
|
|
|
170
|
-
.toggle-view-
|
|
171
|
-
|
|
172
|
-
}
|
|
173
|
-
|
|
174
|
-
.toggle-view .sdoc-tree-view,
|
|
175
|
-
.toggle-view .sdoc-list-view {
|
|
160
|
+
.sdoc-toggle-view .sdoc-tree-view,
|
|
161
|
+
.sdoc-toggle-view .sdoc-list-view {
|
|
176
162
|
min-width: 66px;
|
|
177
163
|
width: fit-content;
|
|
178
164
|
border-radius: 2px;
|
|
@@ -182,12 +168,12 @@
|
|
|
182
168
|
cursor: pointer;
|
|
183
169
|
}
|
|
184
170
|
|
|
185
|
-
.toggle-view .sdoc-tree-view.active,
|
|
186
|
-
.toggle-view .sdoc-list-view.active {
|
|
171
|
+
.sdoc-toggle-view .sdoc-tree-view.active,
|
|
172
|
+
.sdoc-toggle-view .sdoc-list-view.active {
|
|
187
173
|
background-color: #f5f5f5;
|
|
188
174
|
}
|
|
189
175
|
|
|
190
|
-
.toggle-view .sdoc-tree-view:hover,
|
|
191
|
-
.toggle-view .sdoc-list-view:hover {
|
|
176
|
+
.sdoc-toggle-view .sdoc-tree-view:hover,
|
|
177
|
+
.sdoc-toggle-view .sdoc-list-view:hover {
|
|
192
178
|
background-color: #f0f0f0;
|
|
193
179
|
}
|
|
@@ -233,7 +233,7 @@ var SelectSdocFileDialog = function SelectSdocFileDialog(_ref) {
|
|
|
233
233
|
}, t(modalTitle)), /*#__PURE__*/_react["default"].createElement("div", {
|
|
234
234
|
className: "modal-operation-container"
|
|
235
235
|
}, enableMetadata && /*#__PURE__*/_react["default"].createElement("div", {
|
|
236
|
-
className: "toggle-view"
|
|
236
|
+
className: "sdoc-toggle-view"
|
|
237
237
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
238
238
|
className: (0, _classnames["default"])('sdocfont sdoc-tree-view', {
|
|
239
239
|
'active': isTreeView
|
|
@@ -13,7 +13,7 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/es
|
|
|
13
13
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
|
|
14
14
|
var _socket = _interopRequireDefault(require("socket.io-client"));
|
|
15
15
|
var _debug = require("../utils/debug");
|
|
16
|
-
var
|
|
16
|
+
var _socketManager3 = _interopRequireDefault(require("./socket-manager"));
|
|
17
17
|
var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketClient(_config) {
|
|
18
18
|
var _this = this;
|
|
19
19
|
(0, _classCallCheck2["default"])(this, SocketClient);
|
|
@@ -64,7 +64,7 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
64
64
|
(0, _debug.clientDebug)('socket is connected: %s', _this.socket.connected);
|
|
65
65
|
// join room
|
|
66
66
|
_this.socket.emit('join-room', function (result) {
|
|
67
|
-
var socketManager =
|
|
67
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
68
68
|
if (result.success) {
|
|
69
69
|
// sync operations or document
|
|
70
70
|
if (_this.isReconnect) {
|
|
@@ -84,17 +84,17 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
84
84
|
(0, _defineProperty2["default"])(this, "onReconnect", function (data) {
|
|
85
85
|
(0, _debug.clientDebug)('reconnect.');
|
|
86
86
|
_this.isReconnect = true;
|
|
87
|
-
var socketManager =
|
|
87
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
88
88
|
socketManager.dispatchConnectState('reconnect');
|
|
89
89
|
});
|
|
90
90
|
(0, _defineProperty2["default"])(this, "onReconnectAttempt", function (attemptNumber) {
|
|
91
91
|
(0, _debug.clientDebug)('reconnect_attempt. %s', attemptNumber);
|
|
92
|
-
var socketManager =
|
|
92
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
93
93
|
socketManager.dispatchConnectState('reconnect_attempt', attemptNumber);
|
|
94
94
|
});
|
|
95
95
|
(0, _defineProperty2["default"])(this, "onReconnectError", function () {
|
|
96
96
|
(0, _debug.clientDebug)('reconnect_error.');
|
|
97
|
-
var socketManager =
|
|
97
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
98
98
|
socketManager.dispatchConnectState('reconnect_error');
|
|
99
99
|
});
|
|
100
100
|
(0, _defineProperty2["default"])(this, "onDisconnected", function (data) {
|
|
@@ -102,7 +102,7 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
102
102
|
var time = new Date().toLocaleString();
|
|
103
103
|
(0, _debug.clientDebug)('Current time is: %s', time);
|
|
104
104
|
(0, _debug.clientDebug)('Disconnected due to ping timeout, trying to reconnect...');
|
|
105
|
-
var _socketManager =
|
|
105
|
+
var _socketManager = _socketManager3["default"].getInstance();
|
|
106
106
|
_socketManager.dispatchConnectState('disconnect');
|
|
107
107
|
setTimeout(function () {
|
|
108
108
|
_this.safeReconnect();
|
|
@@ -110,19 +110,24 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
110
110
|
return;
|
|
111
111
|
}
|
|
112
112
|
(0, _debug.clientDebug)('disconnect message: %s', data);
|
|
113
|
-
var socketManager =
|
|
113
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
114
114
|
socketManager.dispatchConnectState('disconnect');
|
|
115
115
|
});
|
|
116
116
|
(0, _defineProperty2["default"])(this, "onConnectError", function (error) {
|
|
117
117
|
(0, _debug.clientDebug)('connect_error. %s', error.message);
|
|
118
118
|
(0, _debug.clientDebug)('connect_error. %s', error.type);
|
|
119
119
|
(0, _debug.clientDebug)('connect_error. %O', error.context);
|
|
120
|
+
if (error.message === 'jwt expired') {
|
|
121
|
+
var _socketManager2 = _socketManager3["default"].getInstance();
|
|
122
|
+
_socketManager2.dispatchConnectState('token_expired');
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
120
125
|
if (error.message.includes('timeout')) {
|
|
121
126
|
setTimeout(function () {
|
|
122
127
|
_this.safeReconnect();
|
|
123
128
|
}, 1000);
|
|
124
129
|
}
|
|
125
|
-
var socketManager =
|
|
130
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
126
131
|
socketManager.dispatchConnectState('connect_error');
|
|
127
132
|
});
|
|
128
133
|
(0, _defineProperty2["default"])(this, "safeReconnect", /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee() {
|
|
@@ -191,22 +196,22 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
191
196
|
});
|
|
192
197
|
(0, _defineProperty2["default"])(this, "onJoinRoom", function (userInfo) {
|
|
193
198
|
(0, _debug.serverDebug)('%s joined room success.', userInfo.username);
|
|
194
|
-
var socketManager =
|
|
199
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
195
200
|
socketManager.dispatchConnectState('join-room', userInfo);
|
|
196
201
|
});
|
|
197
202
|
(0, _defineProperty2["default"])(this, "onLeaveRoom", function (username) {
|
|
198
203
|
(0, _debug.serverDebug)('%s leaved room success.', username);
|
|
199
|
-
var socketManager =
|
|
204
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
200
205
|
socketManager.dispatchConnectState('leave-room', username);
|
|
201
206
|
});
|
|
202
207
|
(0, _defineProperty2["default"])(this, "onUserUpdated", function (userInfo) {
|
|
203
208
|
(0, _debug.serverDebug)('%s name updated: %s', userInfo.username, userInfo.name);
|
|
204
|
-
var socketManager =
|
|
209
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
205
210
|
socketManager.dispatchConnectState('user-updated', userInfo);
|
|
206
211
|
});
|
|
207
212
|
(0, _defineProperty2["default"])(this, "onReloadImage", function () {
|
|
208
213
|
(0, _debug.serverDebug)('Reload image by other people copy images from different repos');
|
|
209
|
-
var socketManager =
|
|
214
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
210
215
|
socketManager.dispatchConnectState('reload_image');
|
|
211
216
|
});
|
|
212
217
|
/**
|
|
@@ -215,12 +220,12 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
215
220
|
*/
|
|
216
221
|
(0, _defineProperty2["default"])(this, "onReceiveRemoteOperations", function (params) {
|
|
217
222
|
(0, _debug.serverDebug)('receive operations: %O', params);
|
|
218
|
-
var socketManager =
|
|
223
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
219
224
|
socketManager.onReceiveRemoteOperations(params);
|
|
220
225
|
});
|
|
221
226
|
(0, _defineProperty2["default"])(this, "getRecentOperations", function () {
|
|
222
227
|
var docUuid = _this.config.docUuid;
|
|
223
|
-
var socketManager =
|
|
228
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
224
229
|
var clientVersion = socketManager.getDocumentVersion();
|
|
225
230
|
_this.socket.emit('sync-document', {
|
|
226
231
|
doc_uuid: docUuid,
|
|
@@ -239,46 +244,46 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
239
244
|
}));
|
|
240
245
|
});
|
|
241
246
|
(0, _defineProperty2["default"])(this, "receiveCursorLocation", function (params) {
|
|
242
|
-
var socketManager =
|
|
247
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
243
248
|
socketManager.receiveCursorLocation(params);
|
|
244
249
|
});
|
|
245
250
|
(0, _defineProperty2["default"])(this, "disconnectWithServer", function () {
|
|
246
251
|
_this.socket.disconnect();
|
|
247
252
|
});
|
|
248
253
|
(0, _defineProperty2["default"])(this, "receivePublishDocument", function () {
|
|
249
|
-
var socketManager =
|
|
254
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
250
255
|
socketManager.receivePublishDocument();
|
|
251
256
|
});
|
|
252
257
|
(0, _defineProperty2["default"])(this, "receivePublishDocumentError", function () {
|
|
253
|
-
var socketManager =
|
|
258
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
254
259
|
socketManager.receivePublishDocumentError();
|
|
255
260
|
});
|
|
256
261
|
(0, _defineProperty2["default"])(this, "receiveDocumentReplaced", function () {
|
|
257
|
-
var socketManager =
|
|
262
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
258
263
|
socketManager.receiveDocumentReplaced();
|
|
259
264
|
});
|
|
260
265
|
(0, _defineProperty2["default"])(this, "receiveDocumentReplacedError", function () {
|
|
261
|
-
var socketManager =
|
|
266
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
262
267
|
socketManager.receiveDocumentReplacedError();
|
|
263
268
|
});
|
|
264
269
|
(0, _defineProperty2["default"])(this, "receiveRemoveDocument", function () {
|
|
265
|
-
var socketManager =
|
|
270
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
266
271
|
socketManager.receiveRemoveDocument();
|
|
267
272
|
});
|
|
268
273
|
(0, _defineProperty2["default"])(this, "receiveRemoveDocumentError", function () {
|
|
269
|
-
var socketManager =
|
|
274
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
270
275
|
socketManager.receiveRemoveDocumentError();
|
|
271
276
|
});
|
|
272
277
|
(0, _defineProperty2["default"])(this, "receiveNewNotification", function (notification) {
|
|
273
|
-
var socketManager =
|
|
278
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
274
279
|
socketManager.receiveNewNotification(notification);
|
|
275
280
|
});
|
|
276
281
|
(0, _defineProperty2["default"])(this, "receiveParticipantAdded", function (uses) {
|
|
277
|
-
var socketManager =
|
|
282
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
278
283
|
socketManager.receiveParticipantAdded(uses);
|
|
279
284
|
});
|
|
280
285
|
(0, _defineProperty2["default"])(this, "receiveParticipantRemoved", function (email) {
|
|
281
|
-
var socketManager =
|
|
286
|
+
var socketManager = _socketManager3["default"].getInstance();
|
|
282
287
|
socketManager.receiveParticipantRemoved(email);
|
|
283
288
|
});
|
|
284
289
|
this.config = _config;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@seafile/sdoc-editor",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.189",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"test": "jest",
|
|
@@ -71,5 +71,5 @@
|
|
|
71
71
|
"publishConfig": {
|
|
72
72
|
"access": "public"
|
|
73
73
|
},
|
|
74
|
-
"gitHead": "
|
|
74
|
+
"gitHead": "59450c9add50eee2fd988db15cc9b11091a09034"
|
|
75
75
|
}
|