Build 1.9.0

MeadCo · Oct 16, 2020 · 5596525 · 5596525
1 parent ff94f91
commit 5596525
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ npm install meadco-scriptxjs --save
 
 ## Quick start for working with ScriptX Add-on only
 
-1. Link to meadco-scriptx.js `<script src="meadco-scriptx.js"></script>`
+1. Link to meadco-scriptx.js `<script src="https://cdn.jsdelivr.net/npm/meadco-scriptxjs@1/dist/meadco-scriptx.min.js"></script>`
 2. Initialise the library in the document ready/window loaded event handler, and initialise printing parameters. For example, when using jQuery:
 
 ```javascript
@@ -86,19 +86,18 @@ A promise polyfill is required if the browser does not support promises (for exa
 We recommend (and test with) [Promise Polyfill](https://github.com/taylorhakes/promise-polyfill)
 
 ```javascript
-<script src="/scripts/meadco-scriptx.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/meadco-scriptxjs@1/dist/meadco-scriptx.min.js"></script>
 
 <!-- ScriptX Services client emulation libraries - depend on jQuery -->
 <script src="/scripts/jquery-3.1.1.js"></script>
 
-<script src="/scripts/MeadCo.ScriptX/core.js"></script>
-<script src="/scripts/MeadCo.ScriptX/scriptxprint.js"></script>
-<script src="/scripts/MeadCo.ScriptX/scriptxprinthtml.js"></script>
-<script src="/scripts/MeadCo.ScriptX/scriptxfactory.js" 
+<!-- A promise library will be required if also targetting IE 11. -->
+<script src="https://cdn.jsdelivr.net/npm/promise-polyfill@8/dist/polyfill.min.js"></script>
+
+<script src="https://cdn.jsdelivr.net/npm/scriptxprint-html@1.7/dist/meadco-scriptxservices.min.js"
         data-meadco-server="https://scriptxservices.meadroid.com" 
         data-meadco-license="xxx-xxx-xxxxxxx-xxx"></script>
 
-<!-- A promise library will be required if targetting IE. -->
 <script type="text/javascript">
    $(window).on('load', function () {
      MeadCo.ScriptX.InitAsync().then(function {

diff --git a/ScriptXJSTest/Views/Home/AsyncService.cshtml b/ScriptXJSTest/Views/Home/AsyncService.cshtml
@@ -38,7 +38,7 @@
     <script src="~/Scripts/MeadCo.ScriptX/meadco-secmgr-1.7.0.js"></script>
     <script src="~/Scripts/MeadCo.ScriptX/meadco-scriptxfactory-1.7.0.js" data-meadco-server="@serviceUrl" data-meadco-subscription="{13598d2f-8724-467b-ae64-6e53e9e9f642}" data-meadco-syncinit="false"></script>
 
-    <script src="~/Scripts/promise.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/promise-polyfill@8/dist/polyfill.min.js"></script>
 
     <script src="@Url.Action("Script", new {filename = "meadco-scriptx.js"})"></script>
 
@@ -53,10 +53,10 @@
 
         // do not use $(function() {}) as the license may still be loading / scripts for the service  still loading
         $(window).on("load",
-            function() {
+            function () {
                 console.log("starting window.onload");
                 $("#libVersion").text(MeadCo.ScriptX.LibVersion);
-                MeadCo.ScriptX.InitAsync().then(function() {
+                MeadCo.ScriptX.InitAsync().then(function () {
                     console.log("Init succeeded to: " + MeadCo.ScriptX.Connector);
                     $("span[data-purpose='sxversion']").text(MeadCo.ScriptX.Version()).addClass("text-success")
                         .removeClass("text-danger");
@@ -77,24 +77,24 @@
 
                         $("#btn-test4").click(function () {
                             setSimpleFormatting();
-                            MeadCo.ScriptX.PrintPage2(true).then(function(bStarted) {
+                            MeadCo.ScriptX.PrintPage2(true).then(function (bStarted) {
                                 console.log("Print started: " + bStarted);
-                                MeadCo.ScriptX.WaitForSpoolingComplete().then(function() {
+                                MeadCo.ScriptX.WaitForSpoolingComplete().then(function () {
                                     console.log("printing completed.");
                                 });
                             });
                         });
 
-                    }).catch(function() {
+                    }).catch(function () {
                         $("#licCheck").text("** UNKNOWN **");
                         $("#errMsg").text(MeadCo.Licensing.ErrorMessage());
                     });
-            }).catch(function(e) {
-                $("span[data-purpose='sxversion']").text("** UNKNOWN (Failed to init) **");
-                $("#licCheck").text("** UNKNOWN **");
-                console.log("Warning :: Failed to initialise scriptx, is it installed? : " + e + " (" + MeadCo.Licensing.ErrorMessage() + ")");
+                }).catch(function (e) {
+                    $("span[data-purpose='sxversion']").text("** UNKNOWN (Failed to init) **");
+                    $("#licCheck").text("** UNKNOWN **");
+                    console.log("Warning :: Failed to initialise scriptx, is it installed? : " + e + " (" + MeadCo.Licensing.ErrorMessage() + ")");
+                });
             });
-        });
     </script>
 
 }
diff --git a/dist/meadco-scriptx.min.js b/dist/meadco-scriptx.min.js
diff --git a/docs/MeadCoLicensing.html b/docs/MeadCoLicensing.html
@@ -269,7 +269,7 @@ <h4 class="name" id=".ErrorMessage">
         <p class="tag-source">
             <a href="meadco-scriptx.js.html" class="button">View Source</a>
             <span>
-                <a href="meadco-scriptx.js.html">meadco-scriptx.js</a>, <a href="meadco-scriptx.js.html#line1383">line 1383</a>
+                <a href="meadco-scriptx.js.html">meadco-scriptx.js</a>, <a href="meadco-scriptx.js.html#line1387">line 1387</a>
             </span>
         </p>
 
@@ -793,7 +793,7 @@ <h4 class="name" id=".IsLicensedAsync">
         <p class="tag-source">
             <a href="meadco-scriptx.js.html" class="button">View Source</a>
             <span>
-                <a href="meadco-scriptx.js.html">meadco-scriptx.js</a>, <a href="meadco-scriptx.js.html#line1356">line 1356</a>
+                <a href="meadco-scriptx.js.html">meadco-scriptx.js</a>, <a href="meadco-scriptx.js.html#line1360">line 1360</a>
             </span>
         </p>
 
@@ -972,7 +972,7 @@ <h5>Parameters:</h5>
         <p class="tag-source">
             <a href="meadco-scriptx.js.html" class="button">View Source</a>
             <span>
-                <a href="meadco-scriptx.js.html">meadco-scriptx.js</a>, <a href="meadco-scriptx.js.html#line1398">line 1398</a>
+                <a href="meadco-scriptx.js.html">meadco-scriptx.js</a>, <a href="meadco-scriptx.js.html#line1402">line 1402</a>
             </span>
         </p>
 

diff --git a/docs/meadco-scriptx.js.html b/docs/meadco-scriptx.js.html
@@ -1464,6 +1464,10 @@ <h1>meadco-scriptx.js</h1>
     licensing.IsLicensed = function () {
 
         if (licensing.Init()) {
+            if (licensing.Connector === licensing.Connection.SERVICE) {
+                var l = licensing.LicMgr.License;
+            }
+
             return licensing.LicMgr.result === 0 &amp;&amp; licensing.LicMgr.validLicense;
         }