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

Commit e8e9fed

Browse files
committed
[FIX] Customize style penStyleClasses firefox edge
1 parent 64f8fc5 commit e8e9fed

File tree

9 files changed

+7247
-6881
lines changed

9 files changed

+7247
-6881
lines changed

dist/myscript.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/myscript.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/ast/source/Editor.js.json

Lines changed: 7179 additions & 6815 deletions
Large diffs are not rendered by default.

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2163,7 +2163,7 @@ <h3 data-ice="anchor" id="instance-get-canClear">
21632163
<span class="right-info">
21642164

21652165

2166-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber831">source</a></span></span>
2166+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber832">source</a></span></span>
21672167
</span>
21682168
</h3>
21692169

@@ -2219,7 +2219,7 @@ <h3 data-ice="anchor" id="instance-get-canConvert">
22192219
<span class="right-info">
22202220

22212221

2222-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber850">source</a></span></span>
2222+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber851">source</a></span></span>
22232223
</span>
22242224
</h3>
22252225

@@ -2275,7 +2275,7 @@ <h3 data-ice="anchor" id="instance-get-canExport">
22752275
<span class="right-info">
22762276

22772277

2278-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber868">source</a></span></span>
2278+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber869">source</a></span></span>
22792279
</span>
22802280
</h3>
22812281

@@ -2331,7 +2331,7 @@ <h3 data-ice="anchor" id="instance-get-canRedo">
23312331
<span class="right-info">
23322332

23332333

2334-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber812">source</a></span></span>
2334+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber813">source</a></span></span>
23352335
</span>
23362336
</h3>
23372337

@@ -2387,7 +2387,7 @@ <h3 data-ice="anchor" id="instance-get-canUndo">
23872387
<span class="right-info">
23882388

23892389

2390-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber793">source</a></span></span>
2390+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber794">source</a></span></span>
23912391
</span>
23922392
</h3>
23932393

@@ -2588,7 +2588,7 @@ <h3 data-ice="anchor" id="instance-get-eastereggs">
25882588
<span class="right-info">
25892589

25902590

2591-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber941">source</a></span></span>
2591+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber942">source</a></span></span>
25922592
</span>
25932593
</h3>
25942594

@@ -2731,7 +2731,7 @@ <h3 data-ice="anchor" id="instance-get-exports">
27312731
<span class="right-info">
27322732

27332733

2734-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber906">source</a></span></span>
2734+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber907">source</a></span></span>
27352735
</span>
27362736
</h3>
27372737

@@ -2887,7 +2887,7 @@ <h3 data-ice="anchor" id="instance-get-idle">
28872887
<span class="right-info">
28882888

28892889

2890-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber777">source</a></span></span>
2890+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber778">source</a></span></span>
28912891
</span>
28922892
</h3>
28932893

@@ -4005,7 +4005,7 @@ <h3 data-ice="anchor" id="instance-method-clear">
40054005
<span class="right-info">
40064006

40074007

4008-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber838">source</a></span></span>
4008+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber839">source</a></span></span>
40094009
</span>
40104010
</h3>
40114011

@@ -4049,7 +4049,7 @@ <h3 data-ice="anchor" id="instance-method-convert">
40494049
<span class="right-info">
40504050

40514051

4052-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber857">source</a></span></span>
4052+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber858">source</a></span></span>
40534053
</span>
40544054
</h3>
40554055

@@ -4093,7 +4093,7 @@ <h3 data-ice="anchor" id="instance-method-exportContent">
40934093
<span class="right-info">
40944094

40954095

4096-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber876">source</a></span></span>
4096+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber877">source</a></span></span>
40974097
</span>
40984098
</h3>
40994099

@@ -4210,7 +4210,7 @@ <h3 data-ice="anchor" id="instance-method-importContent">
42104210
<span class="right-info">
42114211

42124212

4213-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber889">source</a></span></span>
4213+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber890">source</a></span></span>
42144214
</span>
42154215
</h3>
42164216

@@ -4361,7 +4361,7 @@ <h3 data-ice="anchor" id="instance-method-pointerEvents">
43614361
<span class="right-info">
43624362

43634363

4364-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber898">source</a></span></span>
4364+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber899">source</a></span></span>
43654365
</span>
43664366
</h3>
43674367

@@ -4421,7 +4421,7 @@ <h3 data-ice="anchor" id="instance-method-pointerMove">
44214421
<span class="right-info">
44224422

44234423

4424-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber749">source</a></span></span>
4424+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber750">source</a></span></span>
44254425
</span>
44264426
</h3>
44274427

@@ -4482,7 +4482,7 @@ <h3 data-ice="anchor" id="instance-method-pointerUp">
44824482
<span class="right-info">
44834483

44844484

4485-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber760">source</a></span></span>
4485+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber761">source</a></span></span>
44864486
</span>
44874487
</h3>
44884488

@@ -4543,7 +4543,7 @@ <h3 data-ice="anchor" id="instance-method-redo">
45434543
<span class="right-info">
45444544

45454545

4546-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber819">source</a></span></span>
4546+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber820">source</a></span></span>
45474547
</span>
45484548
</h3>
45494549

@@ -4587,7 +4587,7 @@ <h3 data-ice="anchor" id="instance-method-resize">
45874587
<span class="right-info">
45884588

45894589

4590-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber913">source</a></span></span>
4590+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber914">source</a></span></span>
45914591
</span>
45924592
</h3>
45934593

@@ -4631,7 +4631,7 @@ <h3 data-ice="anchor" id="instance-method-setThemeForFont">
46314631
<span class="right-info">
46324632

46334633

4634-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber923">source</a></span></span>
4634+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber924">source</a></span></span>
46354635
</span>
46364636
</h3>
46374637

@@ -4691,7 +4691,7 @@ <h3 data-ice="anchor" id="instance-method-undo">
46914691
<span class="right-info">
46924692

46934693

4694-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber800">source</a></span></span>
4694+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber801">source</a></span></span>
46954695
</span>
46964696
</h3>
46974697

@@ -4735,7 +4735,7 @@ <h3 data-ice="anchor" id="instance-method-waitForIdle">
47354735
<span class="right-info">
47364736

47374737

4738-
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber784">source</a></span></span>
4738+
<span data-ice="source"><span><a href="file/src/Editor.js.html#lineNumber785">source</a></span></span>
47394739
</span>
47404740
</h3>
47414741

docs/dump.json

Lines changed: 25 additions & 25 deletions
Large diffs are not rendered by default.

docs/file/src/Editor.js.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,6 +1028,7 @@
10281028
logger.trace(&apos;Pointer down&apos;, point);
10291029
window.clearTimeout(this.notifyTimer);
10301030
window.clearTimeout(this.exportTimer);
1031+
console.log(this.localPenStyle);
10311032
this.model = InkModel.initPendingStroke(this.model, point, Object.assign({ pointerType, pointerId }, this.theme.ink, this.localPenStyle));
10321033
this.renderer.drawCurrentStroke(this.rendererContext, this.model, this.stroker);
10331034
// Currently no recognition on pointer down

docs/source.html

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,9 @@
307307
<td data-ice="filePath"><span><a href="file/src/Editor.js.html#errorLines=405,410,439,490,591,592">src/Editor.js</a></span></td>
308308
<td data-ice="identifier" class="identifiers"><span><a href="class/src/Editor.js~Editor.html">Editor</a></span></td>
309309
<td class="coverage"><span data-ice="coverage">89 %</span><span data-ice="coverageCount" class="coverage-count">50/56</span></td>
310-
<td style="display: none;" data-ice="size">28516 byte</td>
311-
<td style="display: none;" data-ice="lines">945</td>
312-
<td style="display: none;" data-ice="updated">2018-01-03 08:26:52 (UTC)</td>
310+
<td style="display: none;" data-ice="size">28553 byte</td>
311+
<td style="display: none;" data-ice="lines">946</td>
312+
<td style="display: none;" data-ice="updated">2018-01-03 15:17:21 (UTC)</td>
313313
</tr>
314314
<tr data-ice="file">
315315
<td data-ice="filePath"><span><a href="file/src/EditorFacade.js.html">src/EditorFacade.js</a></span></td>
@@ -334,7 +334,7 @@
334334
<td class="coverage"><span data-ice="coverage">-</span></td>
335335
<td style="display: none;" data-ice="size">1852 byte</td>
336336
<td style="display: none;" data-ice="lines">83</td>
337-
<td style="display: none;" data-ice="updated">2018-01-04 09:46:00 (UTC)</td>
337+
<td style="display: none;" data-ice="updated">2018-01-03 14:51:01 (UTC)</td>
338338
</tr>
339339
<tr data-ice="file">
340340
<td data-ice="filePath"><span><a href="file/src/configuration/DefaultBehaviors.js.html">src/configuration/DefaultBehaviors.js</a></span></td>
@@ -352,7 +352,7 @@
352352
<td class="coverage"><span data-ice="coverage">100 %</span><span data-ice="coverageCount" class="coverage-count">2/2</span></td>
353353
<td style="display: none;" data-ice="size">15344 byte</td>
354354
<td style="display: none;" data-ice="lines">419</td>
355-
<td style="display: none;" data-ice="updated">2018-01-04 15:44:29 (UTC)</td>
355+
<td style="display: none;" data-ice="updated">2018-01-03 14:51:01 (UTC)</td>
356356
</tr>
357357
<tr data-ice="file">
358358
<td data-ice="filePath"><span><a href="file/src/configuration/DefaultPenStyle.js.html#errorLines=31,36">src/configuration/DefaultPenStyle.js</a></span></td>
@@ -391,15 +391,15 @@
391391
<td class="coverage"><span data-ice="coverage">100 %</span><span data-ice="coverageCount" class="coverage-count">10/10</span></td>
392392
<td style="display: none;" data-ice="size">1735 byte</td>
393393
<td style="display: none;" data-ice="lines">72</td>
394-
<td style="display: none;" data-ice="updated">2017-12-05 15:54:20 (UTC)</td>
394+
<td style="display: none;" data-ice="updated">2018-01-03 14:51:01 (UTC)</td>
395395
</tr>
396396
<tr data-ice="file">
397397
<td data-ice="filePath"><span><a href="file/src/eastereggs/InkImporter.js.html">src/eastereggs/InkImporter.js</a></span></td>
398398
<td data-ice="identifier" class="identifiers"><span><a href="function/index.html#static-function-inkImporter">inkImporter</a></span></td>
399399
<td class="coverage"><span data-ice="coverage">100 %</span><span data-ice="coverageCount" class="coverage-count">1/1</span></td>
400400
<td style="display: none;" data-ice="size">2738 byte</td>
401401
<td style="display: none;" data-ice="lines">76</td>
402-
<td style="display: none;" data-ice="updated">2018-01-05 11:09:46 (UTC)</td>
402+
<td style="display: none;" data-ice="updated">2018-01-03 14:51:01 (UTC)</td>
403403
</tr>
404404
<tr data-ice="file">
405405
<td data-ice="filePath"><span><a href="file/src/grabber/PointerEventGrabber.js.html#errorLines=186">src/grabber/PointerEventGrabber.js</a></span></td>
@@ -408,7 +408,7 @@
408408
<td class="coverage"><span data-ice="coverage">50 %</span><span data-ice="coverageCount" class="coverage-count">1/2</span></td>
409409
<td style="display: none;" data-ice="size">8665 byte</td>
410410
<td style="display: none;" data-ice="lines">191</td>
411-
<td style="display: none;" data-ice="updated">2018-01-02 16:38:30 (UTC)</td>
411+
<td style="display: none;" data-ice="updated">2018-01-03 14:51:01 (UTC)</td>
412412
</tr>
413413
<tr data-ice="file">
414414
<td data-ice="filePath"><span><a href="file/src/model/InkModel.js.html">src/model/InkModel.js</a></span></td>
@@ -460,7 +460,7 @@
460460
<td class="coverage"><span data-ice="coverage">100 %</span><span data-ice="coverageCount" class="coverage-count">5/5</span></td>
461461
<td style="display: none;" data-ice="size">5177 byte</td>
462462
<td style="display: none;" data-ice="lines">147</td>
463-
<td style="display: none;" data-ice="updated">2018-01-03 08:26:52 (UTC)</td>
463+
<td style="display: none;" data-ice="updated">2018-01-03 14:51:01 (UTC)</td>
464464
</tr>
465465
<tr data-ice="file">
466466
<td data-ice="filePath"><span><a href="file/src/model/Symbol.js.html">src/model/Symbol.js</a></span></td>
@@ -516,7 +516,7 @@
516516
<td class="coverage"><span data-ice="coverage">100 %</span><span data-ice="coverageCount" class="coverage-count">4/4</span></td>
517517
<td style="display: none;" data-ice="size">6227 byte</td>
518518
<td style="display: none;" data-ice="lines">119</td>
519-
<td style="display: none;" data-ice="updated">2018-01-03 08:26:52 (UTC)</td>
519+
<td style="display: none;" data-ice="updated">2018-01-03 14:51:01 (UTC)</td>
520520
</tr>
521521
<tr data-ice="file">
522522
<td data-ice="filePath"><span><a href="file/src/recognizer/common/CdkCommonUtil.js.html">src/recognizer/common/CdkCommonUtil.js</a></span></td>
@@ -634,7 +634,7 @@
634634
<td class="coverage"><span data-ice="coverage">80 %</span><span data-ice="coverageCount" class="coverage-count">4/5</span></td>
635635
<td style="display: none;" data-ice="size">5569 byte</td>
636636
<td style="display: none;" data-ice="lines">137</td>
637-
<td style="display: none;" data-ice="updated">2018-01-02 08:21:01 (UTC)</td>
637+
<td style="display: none;" data-ice="updated">2018-01-03 14:51:01 (UTC)</td>
638638
</tr>
639639
<tr data-ice="file">
640640
<td data-ice="filePath"><span><a href="file/src/recognizer/websocket/networkWSInterface.js.html">src/recognizer/websocket/networkWSInterface.js</a></span></td>
@@ -644,7 +644,7 @@
644644
<td class="coverage"><span data-ice="coverage">100 %</span><span data-ice="coverageCount" class="coverage-count">3/3</span></td>
645645
<td style="display: none;" data-ice="size">3514 byte</td>
646646
<td style="display: none;" data-ice="lines">114</td>
647-
<td style="display: none;" data-ice="updated">2018-01-05 11:09:46 (UTC)</td>
647+
<td style="display: none;" data-ice="updated">2018-01-03 14:51:01 (UTC)</td>
648648
</tr>
649649
<tr data-ice="file">
650650
<td data-ice="filePath"><span><a href="file/src/recognizer/websocket/v3/Cdkv3WSBuilder.js.html">src/recognizer/websocket/v3/Cdkv3WSBuilder.js</a></span></td>
@@ -686,7 +686,7 @@
686686
<td class="coverage"><span data-ice="coverage">100 %</span><span data-ice="coverageCount" class="coverage-count">1/1</span></td>
687687
<td style="display: none;" data-ice="size">6903 byte</td>
688688
<td style="display: none;" data-ice="lines">150</td>
689-
<td style="display: none;" data-ice="updated">2018-01-02 08:28:31 (UTC)</td>
689+
<td style="display: none;" data-ice="updated">2018-01-03 14:51:01 (UTC)</td>
690690
</tr>
691691
<tr data-ice="file">
692692
<td data-ice="filePath"><span><a href="file/src/recognizer/websocket/v4/Cdkv4WSIInkRecognizer.js.html#errorLines=209,216,223,57,68,80,89,98">src/recognizer/websocket/v4/Cdkv4WSIInkRecognizer.js</a></span></td>
@@ -720,7 +720,7 @@
720720
<td class="coverage"><span data-ice="coverage">70 %</span><span data-ice="coverageCount" class="coverage-count">19/27</span></td>
721721
<td style="display: none;" data-ice="size">20015 byte</td>
722722
<td style="display: none;" data-ice="lines">555</td>
723-
<td style="display: none;" data-ice="updated">2018-01-03 08:26:52 (UTC)</td>
723+
<td style="display: none;" data-ice="updated">2018-01-03 14:51:01 (UTC)</td>
724724
</tr>
725725
<tr data-ice="file">
726726
<td data-ice="filePath"><span><a href="file/src/renderer/QuadraticUtils.js.html">src/renderer/QuadraticUtils.js</a></span></td>
@@ -820,7 +820,7 @@
820820
<td class="coverage"><span data-ice="coverage">100 %</span><span data-ice="coverageCount" class="coverage-count">6/6</span></td>
821821
<td style="display: none;" data-ice="size">7746 byte</td>
822822
<td style="display: none;" data-ice="lines">211</td>
823-
<td style="display: none;" data-ice="updated">2018-01-02 16:21:00 (UTC)</td>
823+
<td style="display: none;" data-ice="updated">2018-01-03 14:51:01 (UTC)</td>
824824
</tr>
825825
<tr data-ice="file">
826826
<td data-ice="filePath"><span><a href="file/src/renderer/svg/stroker/QuadraticSVGStroker.js.html">src/renderer/svg/stroker/QuadraticSVGStroker.js</a></span></td>
@@ -847,7 +847,7 @@
847847
<td class="coverage"><span data-ice="coverage">100 %</span><span data-ice="coverageCount" class="coverage-count">3/3</span></td>
848848
<td style="display: none;" data-ice="size">18192 byte</td>
849849
<td style="display: none;" data-ice="lines">472</td>
850-
<td style="display: none;" data-ice="updated">2018-01-03 09:29:17 (UTC)</td>
850+
<td style="display: none;" data-ice="updated">2018-01-03 14:51:01 (UTC)</td>
851851
</tr>
852852
<tr data-ice="file">
853853
<td data-ice="filePath"><span><a href="file/src/util/FontLoader.js.html#errorLines=25">src/util/FontLoader.js</a></span></td>

examples/v4/customize_style.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,11 +287,11 @@
287287
};
288288
}
289289

290-
penStyleClasses.addEventListener('change', () => {
290+
penStyleClasses.addEventListener('change', (event) => {
291291
if (event.target.checked) {
292292
const classesTheme = Object.assign({}, getTheme(themes, themeSelector.value));
293293
classesTheme['.greenThickPen'] = {
294-
color: '#00FF00FF',
294+
color: '#00FF00',
295295
'-myscript-pen-width': 3
296296
};
297297

src/Editor.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,7 @@ export class Editor {
737737
logger.trace('Pointer down', point);
738738
window.clearTimeout(this.notifyTimer);
739739
window.clearTimeout(this.exportTimer);
740+
console.log(this.localPenStyle);
740741
this.model = InkModel.initPendingStroke(this.model, point, Object.assign({ pointerType, pointerId }, this.theme.ink, this.localPenStyle));
741742
this.renderer.drawCurrentStroke(this.rendererContext, this.model, this.stroker);
742743
// Currently no recognition on pointer down

0 commit comments

Comments
 (0)