Skip to content
This repository was archived by the owner on Jan 4, 2021. It is now read-only.

Commit 1d12c5b

Browse files
RomainCscnRomainCscn
committed
[DEV] Error management
1 parent 6c17a31 commit 1d12c5b

File tree

71 files changed

+48767
-54413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+48767
-54413
lines changed

‎dist/myscript.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/myscript.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/ast/source/Editor.js.json

+24,639-26,795
Large diffs are not rendered by default.

‎docs/ast/source/configuration/Constants.js.json

+363-148
Large diffs are not rendered by default.

‎docs/ast/source/recognizer/websocket/v4/Cdkv4WSIInkRecognizer.js.json

+22,810-26,065
Large diffs are not rendered by default.

‎docs/badge.svg

+2-2
Loading

‎docs/class/src/Editor.js~Editor.html

+60-131
Large diffs are not rendered by default.

‎docs/coverage.json

+18-20
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"coverage": "90.8%",
3-
"expectCount": 250,
2+
"coverage": "91.53%",
3+
"expectCount": 248,
44
"actualCount": 227,
55
"files": {
66
"src/model/RecognizerContext.js": {
@@ -9,20 +9,19 @@
99
"undocumentLines": []
1010
},
1111
"src/Editor.js": {
12-
"expectCount": 60,
12+
"expectCount": 59,
1313
"actualCount": 53,
1414
"undocumentLines": [
15-
425,
16-
420,
17-
504,
18-
931,
19-
454,
20-
605,
21-
606
15+
416,
16+
411,
17+
495,
18+
445,
19+
596,
20+
597
2221
]
2322
},
2423
"src/recognizer/websocket/v4/Cdkv4WSIInkRecognizer.js": {
25-
"expectCount": 28,
24+
"expectCount": 27,
2625
"actualCount": 19,
2726
"undocumentLines": [
2827
98,
@@ -32,8 +31,7 @@
3231
68,
3332
204,
3433
211,
35-
218,
36-
459
34+
218
3735
]
3836
},
3937
"src/renderer/canvas/symbols/MathSymbolCanvasRenderer.js": {
@@ -198,6 +196,11 @@
198196
"actualCount": 1,
199197
"undocumentLines": []
200198
},
199+
"src/renderer/canvas/symbols/StrokeSymbolCanvasRenderer.js": {
200+
"expectCount": 1,
201+
"actualCount": 1,
202+
"undocumentLines": []
203+
},
201204
"src/renderer/svg/symbols/StrokeSymbolSVGRenderer.js": {
202205
"expectCount": 1,
203206
"actualCount": 1,
@@ -213,11 +216,6 @@
213216
"actualCount": 2,
214217
"undocumentLines": []
215218
},
216-
"src/renderer/canvas/symbols/StrokeSymbolCanvasRenderer.js": {
217-
"expectCount": 1,
218-
"actualCount": 1,
219-
"undocumentLines": []
220-
},
221219
"src/callback/EventCallback.js": {
222220
"expectCount": 1,
223221
"actualCount": 1,
@@ -233,7 +231,7 @@
233231
"actualCount": 3,
234232
"undocumentLines": []
235233
},
236-
"src/recognizer/common/CdkCommonUtil.js": {
234+
"src/recognizer/common/v3/Cdkv3CommonTextRecognizer.js": {
237235
"expectCount": 1,
238236
"actualCount": 1,
239237
"undocumentLines": []
@@ -243,7 +241,7 @@
243241
"actualCount": 4,
244242
"undocumentLines": []
245243
},
246-
"src/recognizer/common/v3/Cdkv3CommonTextRecognizer.js": {
244+
"src/recognizer/common/CdkCommonUtil.js": {
247245
"expectCount": 1,
248246
"actualCount": 1,
249247
"undocumentLines": []

‎docs/dump.json

+624-731
Large diffs are not rendered by default.

‎docs/file/src/Editor.js.html

+4-18
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207-
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
208207
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
209208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
210209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>
@@ -436,10 +435,12 @@
436435
(err.error.result.error === &apos;InvalidApplicationKeyException&apos; || err.error.result.error === &apos;InvalidHMACSignatureException&apos;)
437436
)) {
438437
editorRef.error.innerText = Constants.Error.WRONG_CREDENTIALS;
439-
} else if (editorRef.error.style.display === &apos;none&apos;) {
438+
} else if (err.message === &apos;Session is too old. Max Session Duration Reached&apos;) {
439+
editorRef.error.innerText = Constants.Error.TOO_OLD;
440+
} else if (err.message &amp;&amp; editorRef.error.style.display === &apos;none&apos;) {
440441
editorRef.error.innerText = Constants.Error.NOT_REACHABLE;
441442
}
442-
if ((err.message === &apos;Session is too old. Max Session Duration Reached&apos; || err.code === 1006) &amp;&amp; RecognizerContext.canReconnect(editor.recognizerContext)) {
443+
if ((editorRef.error.innerText === Constants.Error.TOO_OLD || err.code === 1006) &amp;&amp; RecognizerContext.canReconnect(editor.recognizerContext)) {
443444
logger.info(&apos;Reconnection is available&apos;, err.stack || err);
444445
editorRef.error.style.display = &apos;none&apos;;
445446
} else {
@@ -489,17 +490,6 @@
489490
editorRef.smartGuide = SmartGuide.launchSmartGuide(editor.smartGuide, exports);
490491
}
491492

492-
function launchRestoreSession(editor, model) {
493-
if (editor.recognizer &amp;&amp; editor.recognizer.restoreSession) {
494-
editor.recognizerContext.initPromise
495-
.then(() =&gt; {
496-
editor.recognizer.restoreSession(editor.recognizerContext, model, editor.domElement, (err, res, ...types) =&gt; {
497-
recognizerCallback(editor, err, res, ...types);
498-
});
499-
});
500-
}
501-
}
502-
503493
/**
504494
* Launch ink import.
505495
* @param {Editor} editor
@@ -1193,10 +1183,6 @@
11931183
launchImport(this, this.model, !(data instanceof Blob) ? new Blob([data], { type: mimetype }) : data);
11941184
}
11951185

1196-
restoreSession() {
1197-
launchRestoreSession(this, this.model);
1198-
}
1199-
12001186
/**
12011187
* pointer events
12021188
* @param {PointerEvents} events

‎docs/file/src/EditorFacade.js.html

-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207-
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
208207
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
209208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
210209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/callback/EventCallback.js.html

-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207-
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
208207
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
209208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
210209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/configuration/Constants.js.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207-
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
208207
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
209208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
210209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>
@@ -339,7 +338,8 @@
339338
},
340339
Error: {
341340
NOT_REACHABLE: &apos;MyScript recognition server is not reachable. Please reload once you are connected.&apos;,
342-
WRONG_CREDENTIALS: &apos;Application credentials are invalid. Please check or regenerate your application key and hmackey.&apos;
341+
WRONG_CREDENTIALS: &apos;Application credentials are invalid. Please check or regenerate your application key and hmackey.&apos;,
342+
TOO_OLD: &apos;Session is too old. Max Session Duration Reached.&apos;
343343
},
344344
Exports: {
345345
JIIX: &apos;application/vnd.myscript.jiix&apos;

‎docs/file/src/configuration/DefaultBehaviors.js.html

-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207-
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
208207
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
209208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
210209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/configuration/DefaultConfiguration.js.html

-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207-
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
208207
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
209208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
210209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/configuration/DefaultPenStyle.js.html

-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207-
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
208207
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
209208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
210209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/configuration/DefaultTheme.js.html

-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207-
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
208207
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
209208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
210209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/configuration/LoggerConfig.js.html

-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207-
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
208207
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
209208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
210209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/grabber/PointerEventGrabber.js.html

-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207-
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
208207
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
209208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
210209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/model/InkModel.js.html

-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207-
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
208207
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
209208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
210209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

0 commit comments

Comments
 (0)