Merge pull request #4 in WS/webcomponents-myscript-text-web from wip_rab to master

Benoit Fonty · Benoit Fonty · commit 2a2bac73c5b3 · 2018-10-04T10:34:33.000+02:00
* commit '4ffc6ce7bc5a1081c0af0f041adfbb18c1c99649':
  recognition asset builder
diff --git a/myscript-text-web.js b/myscript-text-web.js
@@ -528,6 +528,14 @@ class MyScriptTextWeb extends PolymerElement {
         value: [],
         reflectToAttribute: true
       },
+        /**
+         * custom lexicon
+         */
+        customlexicon: {
+            type: Array,
+            value: [],
+            reflectToAttribute: true
+        },
       /**
            * If set to true, hide the export panel.
            */
@@ -759,7 +767,7 @@ class MyScriptTextWeb extends PolymerElement {
     return stylesheet;
   }
 
-  static _generateTextConfiguration(configuration, language, mimetypes, alwaysconnected, disableguides, disablesmartguide, enablesmartguidefadeout, smartguidefadeoutduration, nolktext, customresources, textinputmode, resultdetail, contenttypes, subsetknowledges, userlkwords, userresources, textcandidatelistsize, wordcandidatelistsize, wordpredictionlistsize, wordcompletionlistsize, charactercandidatelistsize, enableoutoflexicon, discardcasevariations, discardaccentuationvariations, glyphdistortion, enabletagger, spellingdistortion) {
+  static _generateTextConfiguration(configuration, language, mimetypes, alwaysconnected, disableguides, disablesmartguide, enablesmartguidefadeout, smartguidefadeoutduration, nolktext, customresources, customlexicon, textinputmode, resultdetail, contenttypes, subsetknowledges, userlkwords, userresources, textcandidatelistsize, wordcandidatelistsize, wordpredictionlistsize, wordcompletionlistsize, charactercandidatelistsize, enableoutoflexicon, discardcasevariations, discardaccentuationvariations, glyphdistortion, enabletagger, spellingdistortion) {
     // FIXME: find a way to do a proper deep merge
     const conf = Object.assign({}, configuration);
     if (!conf.recognitionParams) {
@@ -813,7 +821,12 @@ class MyScriptTextWeb extends PolymerElement {
     }
     if (customresources) {
       conf.recognitionParams.v4.text.configuration.customResources = customresources;
-      conf.recognitionParams.v4.text.configuration.addLKText = !nolktext;
+    }
+    if (customlexicon) {
+      conf.recognitionParams.v4.text.configuration.customLexicon = customlexicon;
+    }
+    if (customresources || customlexicon) {
+        conf.recognitionParams.v4.text.configuration.addLKText = !nolktext;
     }
     if (textinputmode) {
       conf.recognitionParams.v3.textParameter.textInputMode = textinputmode;
@@ -888,6 +901,7 @@ class MyScriptTextWeb extends PolymerElement {
       this.smartguidefadeoutduration,
       this.nolktext,
       this.customresources,
+      this.customlexicon,
       this.textinputmode,
       this.resultdetail,
       this.contenttypes,
diff --git a/src/demo-app/examples/v4/custom_lexicon.html b/src/demo-app/examples/v4/custom_lexicon.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="en">
+
+    <head>
+        <!-- Those meta make the capture of handwriting inputs easier on mobile devices -->
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="mobile-web-app-capable" content="yes">
+        <meta name="HandheldFriendly" content="true"/>
+
+        <title>Get started</title>
+
+        <link rel="stylesheet" href="../examples.css">
+
+        <script src="../../../../node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
+        <script type="module" src="../../../../myscript-text-web.js"></script>
+        <style>
+            .description {
+                margin: 12px;
+            }
+        </style>
+    </head>
+
+    <body>
+    <input type="text" class="input-field" id="lexicon" data-type="text/plain" placeholder="Add your own lexicon (space-separated)">
+    <button class="classic-btn" id="reinit">Reinit</button>
+    <myscript-text-web scheme="https"
+                           host="webdemoapi.myscript.com"
+                           applicationkey="515131ab-35fa-411c-bb4d-3917e00faf60"
+                           hmackey="54b2ca8a-6752-469d-87dd-553bb450e9ad"
+                           touch-action="none">
+        </myscript-text-web>
+    <script>
+        window.addEventListener('load', () => {
+
+            const textElement = document.querySelector('myscript-text-web');
+            const reinitButton = document.getElementById('reinit');
+            const lexicon = document.getElementById('lexicon');
+
+            reinitButton.addEventListener('click', function () {
+                const values = lexicon.value;
+                textElement.unloaded = true;
+                textElement.customlexicon = values.split(' ');
+                textElement.unloaded = false;
+            });
+        });
+    </script>
+    </body>
+</html>
diff --git a/src/demo-app/examples/v4/custom_resources.html b/src/demo-app/examples/v4/custom_resources.html
@@ -23,9 +23,9 @@
     </head>
 
     <body>
-    <p class="description">Custom resources: <b>Dinosaurs</b>. Try to write some dinosaurs name!</p>
-    <myscript-text-web scheme="https"
-                           host="webdemoapi.myscript.com"
+    <p class="description">Pre-loaded custom resources: <b>Dinosaurs</b>. Try to write some dinosaurs name!</p>
+    <myscript-text-web scheme="http"
+                           host="localhost:8897"
                            applicationkey="515131ab-35fa-411c-bb4d-3917e00faf60"
                            hmackey="54b2ca8a-6752-469d-87dd-553bb450e9ad"
                            touch-action="none"
