Merge pull request #29 in WS/myscriptjs from fix-math to 1.3

Steven Roulleau · Steven Roulleau · commit 85cad9dcc555 · 2018-11-30T11:18:44.000+01:00
* commit '950bfd0b320692a212918f74802ef02b7ed2b6a2':
  fix(examples): math import with strokes
diff --git a/examples/index.html b/examples/index.html
@@ -141,19 +141,6 @@ <h2><a class="title" name="v4-ws">iink SDK web with WebSockets</a></h2>
             </svg>
             Get source code</a>
         </div>
-        <p><strong>Import content math</strong></p>
-        <div class="center">
-          <a href="v4/import_content_math.html" class="btn">
-            <svg class="icn">
-              <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-play"></use>
-            </svg>
-            View example</a>
-          <a href="https://github.com/MyScript/MyScriptJS/blob/master/examples/v4/import_content_math.html" class="btn">
-            <svg class="icn">
-              <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icn-github"></use>
-            </svg>
-            Get source code</a>
-        </div>
         <p><strong>Import content math with JIIX</strong></p>
         <div class="center">
           <a href="v4/import_math_jiix.html" class="btn">
diff --git a/examples/v4/file_export.html b/examples/v4/file_export.html
@@ -21,8 +21,6 @@
       }
     </style>
 
-    <!-- Live reload with webpack -->
-    <script type="text/javascript" src="http://localhost:8080/webpack-dev-server.js"></script>
     <script src="https://code.jquery.com/pep/0.4.3/pep.js"></script>
     <script type="text/javascript" src="../../dist/myscript.min.js"></script>
   </head>
diff --git a/examples/v4/import_content_math.html b/examples/v4/import_content_math.html
diff --git a/examples/v4/import_math_jiix.html b/examples/v4/import_math_jiix.html
@@ -91,8 +91,8 @@
 
   importElement.addEventListener('click', () => {
     if(toImport !== null) {
+      editorELement2.editor.clear();
       if(editorELement1.editor.isEmpty) {
-        editorELement2.editor.clear();
         toImport = null;
       } else {
         infosElement.style.visibility = 'hidden';
@@ -134,6 +134,11 @@
           alwaysConnected: true,
           math: {
             mimeTypes: ['application/vnd.myscript.jiix', 'application/x-latex']
+          },
+          export: {
+            jiix: {
+              strokes: true,
+            }
           }
         }
       }
diff --git a/test/lib/configuration.js b/test/lib/configuration.js
@@ -249,12 +249,6 @@ const configurations = [{
   apiVersion: 'V4',
   alternate: 'RAB',
   examples: ['/examples/v4/custom_resources_content_math.html'],
-},{
-  type: 'MATH',
-  protocol: 'WEBSOCKET',
-  apiVersion: 'V4',
-  alternate: 'import',
-  examples: ['/examples/v4/import_content_math.html'],
 }, {
   type: 'TEXT',
   protocol: 'WEBSOCKET',
diff --git a/test/nightwatch/partial/03-iink/01-math-iink-ws-cdkv4.js b/test/nightwatch/partial/03-iink/01-math-iink-ws-cdkv4.js
@@ -1,6 +1,6 @@
 const inkPlayer = require('../../lib/inkPlayer');
 const config = require('../../../lib/configuration').getConfiguration('MATH', 'WEBSOCKET', 'V4');
-const configImport = require('../../../lib/configuration').getConfiguration('MATH', 'WEBSOCKET', 'V4', '', 'import');
+// const configImport = require('../../../lib/configuration').getConfiguration('MATH', 'WEBSOCKET', 'V4', '', 'import');
 
 function runLabelTests(ink) {
   module.exports[config.header + ' checkConvert ' + ink.name] = function checkConvert(browser) {
@@ -36,6 +36,6 @@ config.inks
   .forEach(ink => runUndoTests(ink));
 
 
-configImport.inks
-  .filter(ink => ['equation2', 'equation3'].includes(ink.name))
-  .forEach(ink => runImportTests(ink));
+// configImport.inks
+//  .filter(ink => ['equation2', 'equation3'].includes(ink.name))
+//  .forEach(ink => runImportTests(ink));

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,6 @@`
`21`	`21`	`}`
`22`	`22`	`</style>`
`23`	`23`
`24`		`- <!-- Live reload with webpack -->`
`25`		`- <script type="text/javascript" src="http://localhost:8080/webpack-dev-server.js"></script>`
`26`	`24`	`<script src="https://code.jquery.com/pep/0.4.3/pep.js"></script>`
`27`	`25`	`<script type="text/javascript" src="../../dist/myscript.min.js"></script>`
`28`	`26`	`</head>`