scichart 2.0.2144 → 2.0.2186

package/Charting/Visuals/TextureManager/DpiHelper.js

@@ -40,7 +40,7 @@ var DpiHelper = /** @class */ (function () {
                     var lastDpiScaling = DpiHelper.PIXEL_RATIO;
                     if (lastDpiScaling !== newDpiScale) {
                         if (SciChartSurfaceBase_1.DebugForDpi) {
-                            console.log("Dpi Changing, was " + lastDpiScaling + ", now " + newDpiScale);
+                            console.log("Dpi Changing, was ".concat(lastDpiScaling, ", now ").concat(newDpiScale));
                         }
                         DpiHelper.PIXEL_RATIO = newDpiScale;
                         DpiHelper.dpiChanged.raiseEvent({ newValue: newDpiScale, oldValue: lastDpiScaling });
@@ -81,7 +81,7 @@ var DpiHelper = /** @class */ (function () {
      */
     DpiHelper.setWidth = function (canvas, desiredWidth) {
         if (SciChartSurfaceBase_1.DebugForDpi) {
-            console.log("setWidth " + canvas.id + " backBuffer=" + desiredWidth * DpiHelper.PIXEL_RATIO + " display=" + desiredWidth);
+            console.log("setWidth ".concat(canvas.id, " backBuffer=").concat(desiredWidth * DpiHelper.PIXEL_RATIO, " display=").concat(desiredWidth));
         }
         // https://www.khronos.org/webgl/wiki/HandlingHighDPI
         //
@@ -97,7 +97,7 @@ var DpiHelper = /** @class */ (function () {
      */
     DpiHelper.setHeight = function (canvas, desiredHeight) {
         if (SciChartSurfaceBase_1.DebugForDpi) {
-            console.log("setHeight " + canvas.id + " backBuffer=" + desiredHeight * DpiHelper.PIXEL_RATIO + " display=" + desiredHeight);
+            console.log("setHeight ".concat(canvas.id, " backBuffer=").concat(desiredHeight * DpiHelper.PIXEL_RATIO, " display=").concat(desiredHeight));
         }
         // https://www.khronos.org/webgl/wiki/HandlingHighDPI
         //

package/Charting/Visuals/TextureManager/TextureManager.d.ts

@@ -35,6 +35,7 @@ export declare class TextureManager implements IDeletable {
     createTextureFromImage(image: HTMLImageElement, imageWidth: number, imageHeight: number): TTextureObject;
     getTextureContext(width: number, height: number): CanvasRenderingContext2D;
     createTextureFromCtxBuffer(textureWidth: number, textureHeight: number): TTextureObject;
+    createTextureFromImageData(imageData: ImageData, textureWidth: number, textureHeight: number): TTextureObject;
     delete(): void;
     private createTextureFromCtx;
 }

package/Charting/Visuals/TextureManager/TextureManager.js

@@ -56,15 +56,15 @@ var TextureManager = /** @class */ (function () {
             this.ctx.fillRect(0, 0, this.canvas.width, this.canvas.height);
         }
         this.ctx.fillStyle = color;
-        this.ctx.font = font_1.getFontString(fontStyle, fontWeight, fontSizePx, fontFamily);
+        this.ctx.font = (0, font_1.getFontString)(fontStyle, fontWeight, fontSizePx, fontFamily);
         var textureWidth = 0;
         // const fontSizePt = Math.ceil(fontSizePx * PX_TO_PT);
-        var lineHeight = exports.measureTextHeight(fontSizePx);
+        var lineHeight = (0, exports.measureTextHeight)(fontSizePx);
         var extraLineHeight = lineHeight * (lineSpacing !== null && lineSpacing !== void 0 ? lineSpacing : 1.1);
         var textureHeight = lineHeight + padding.top + padding.bottom;
         for (var index = 0; index < text.length; index++) {
             var line = text[index];
-            var lineWidth = exports.measureTextWidth(this.ctx, line) + padding.left + padding.right;
+            var lineWidth = (0, exports.measureTextWidth)(this.ctx, line) + padding.left + padding.right;
             if (lineWidth > textureWidth) {
                 textureWidth = lineWidth;
             }
@@ -96,7 +96,7 @@ var TextureManager = /** @class */ (function () {
         for (var _i = 0, text_1 = text; _i < text_1.length; _i++) {
             var line = text_1[_i];
             if (alignment === LabelAlignment_1.ELabelAlignment.Center || alignment === LabelAlignment_1.ELabelAlignment.Right) {
-                var lineWidth = exports.measureTextWidth(this.ctx, line);
+                var lineWidth = (0, exports.measureTextWidth)(this.ctx, line);
                 x =
                     alignment === LabelAlignment_1.ELabelAlignment.Right
                         ? textureWidth - lineWidth - padding.right
@@ -118,9 +118,9 @@ var TextureManager = /** @class */ (function () {
         this.ctx.globalAlpha = opacity !== null && opacity !== void 0 ? opacity : 1;
         this.ctx.textBaseline = "top";
         this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
-        this.ctx.font = font_1.getFontString(fontStyle, fontWeight, fontSizePx, fontFamily);
-        var textureWidth = exports.measureTextWidth(this.ctx, text) + 4 * padding;
-        var textureHeight = exports.measureTextHeight(fontSizePx) + 2 * padding;
+        this.ctx.font = (0, font_1.getFontString)(fontStyle, fontWeight, fontSizePx, fontFamily);
+        var textureWidth = (0, exports.measureTextWidth)(this.ctx, text) + 4 * padding;
+        var textureHeight = (0, exports.measureTextHeight)(fontSizePx) + 2 * padding;
         var _a = calcAxisMarkerTextureParams(textureHeight, textureWidth, text, axisAlignment), angle = _a.angle, alignmentLeft = _a.alignmentLeft, alignmentTop = _a.alignmentTop, finalTextureWidth = _a.finalTextureWidth, finalTextureHeight = _a.finalTextureHeight, halfHeight = _a.halfHeight;
         this.ctx.save();
         this.ctx.translate((textureWidth + halfHeight) / 2, textureHeight / 2);
@@ -178,13 +178,15 @@ var TextureManager = /** @class */ (function () {
         return this.ctx;
     };
     TextureManager.prototype.createTextureFromCtxBuffer = function (textureWidth, textureHeight) {
-        // TODO: Michael cache the canvas, UIntVector, bitmapTexture unless size changed
-        // Logger.log(`New Texture: Size is ${textureWidth}, ${textureHeight}`);
+        var imageData = this.ctx.getImageData(0, 0, textureWidth, textureHeight);
+        return this.createTextureFromImageData(imageData, textureWidth, textureHeight);
+    };
+    TextureManager.prototype.createTextureFromImageData = function (imageData, textureWidth, textureHeight) {
         var textureFormat = this.webAssemblyContext.eTSRTextureFormat.TSR_TEXTUREFORMAT_A8B8G8R8;
         var bitmapTexture = this.webAssemblyContext.SCRTCreateBitmapTexture(textureWidth, textureHeight, textureFormat);
         var buffer;
         try {
-            var imageData = this.ctx.getImageData(0, 0, textureWidth, textureHeight);
+            // const imageData = this.ctx.getImageData(0, 0, textureWidth, textureHeight);
             var clampedCharArray = imageData.data;
             /// because plain c functions were receiving the object pointer as null, this is the way around that...
             this.webAssemblyContext.SCRTSetActiveTexture(bitmapTexture);
@@ -258,11 +260,13 @@ var TextureManager = /** @class */ (function () {
     return TextureManager;
 }());
 exports.TextureManager = TextureManager;
-exports.measureTextHeight = function (fontSizePx) { return fontSizePx; };
-exports.measureTextWidth = function (ctx, text) {
+var measureTextHeight = function (fontSizePx) { return fontSizePx; };
+exports.measureTextHeight = measureTextHeight;
+var measureTextWidth = function (ctx, text) {
     var textMeasure = ctx.measureText(text);
     return Math.ceil(textMeasure.width);
 };
+exports.measureTextWidth = measureTextWidth;
 /** @ignore */
 var calcAxisMarkerTextureParams = function (textureHeight, textureWidth, text, axisAlignment) {
     var halfHeight = Math.ceil(textureHeight / 2);

package/Charting/Visuals/createMaster.js

@@ -56,7 +56,7 @@ var sciChartMaster = {
 /** @ignore */
 var sciChartMasterPromise;
 /** @ignore */
-exports.createMultichart = function (divElementId, options) { return __awaiter(void 0, void 0, void 0, function () {
+var createMultichart = function (divElementId, options) { return __awaiter(void 0, void 0, void 0, function () {
     var canvases, loader, loaderDiv, master, createChildSurface, wasmContext, sciChartSurface;
     var _a, _b, _c;
     return __generator(this, function (_d) {
@@ -90,6 +90,7 @@ exports.createMultichart = function (divElementId, options) { return __awaiter(v
         }
     });
 }); };
+exports.createMultichart = createMultichart;
 /** @ignore */
 var monitorWebGL = function (master) {
     var wasmContext = sciChartMaster.wasmContext, getChildSurfaces = sciChartMaster.getChildSurfaces;
@@ -134,7 +135,7 @@ var createMaster = function () {
         return sciChartSurface;
     };
     var addDestination = function (wasmContext, canvasElementId, sciChartSurface, width, height, chartInitObj) {
-        var newDestination = SciChartSurfaceBase_1.createChartDestination(canvasElementId);
+        var newDestination = (0, SciChartSurfaceBase_1.createChartDestination)(canvasElementId);
         if (!newDestination) {
             sciChartSurface.delete();
             return;
@@ -146,8 +147,8 @@ var createMaster = function () {
     };
     return new Promise(function (resolve) {
         // make sure canvas has event listener for context creation error
-        var canvas = SciChartSurfaceBase_1.getMasterCanvas();
-        var locateFile = SciChartSurfaceBase_1.getLocateFile(SciChartSurface_1.sciChartConfig);
+        var canvas = (0, SciChartSurfaceBase_1.getMasterCanvas)();
+        var locateFile = (0, SciChartSurfaceBase_1.getLocateFile)(SciChartSurface_1.sciChartConfig);
         // @ts-ignore
         new WasmModule2D({ locateFile: locateFile, noInitialRun: true }).then(function (wasmContext) {
             var getChildSurfaces = function () { return exports.sciChartDestinations.map(function (el) { return el.sciChartSurface; }); };
@@ -198,7 +199,7 @@ var createMaster = function () {
             wasmContext.SCRTSetGlobalSampleChartInterface(chartInitObj);
             /// create an object that native side can trigger the copy to from...
             var canvasCopyObj = wasmContext.SCRTCopyToDestinationInterface.implement({
-                CopyToDestination: SciChartSurfaceBase_1.copyToCanvas(SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas)
+                CopyToDestination: (0, SciChartSurfaceBase_1.copyToCanvas)(SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas)
             });
             wasmContext.SCRTSetGlobalCopyToDestinationInterface(canvasCopyObj);
             wasmContext.TSRSetDrawRequestsEnabled(true);

package/Charting/Visuals/createSingle.js

@@ -14,7 +14,7 @@ var SciChartSurfaceBase_1 = require("./SciChartSurfaceBase");
 // Global variables
 exports.sciChartSingleDestinations = [];
 /** @ignore */
-exports.createSingleInternal = function (divElementId, options) {
+var createSingleInternal = function (divElementId, options) {
     return new Promise(function (resolve) {
         var _a;
         var canvases = sciChartInitCommon_1.default.initCanvas(divElementId, options === null || options === void 0 ? void 0 : options.widthAspect, options === null || options === void 0 ? void 0 : options.heightAspect);
@@ -23,13 +23,13 @@ exports.createSingleInternal = function (divElementId, options) {
         var webGLSupport = WebGlHelper_1.WebGlHelper.getWebGlSupport();
         // console.log("webGLSupport", webGLSupport);
         if (webGLSupport === WebGlHelper_1.EWebGLSupport.WebGL2 || webGLSupport === WebGlHelper_1.EWebGLSupport.WebGL1) {
-            var locateFile = SciChartSurfaceBase_1.getLocateFile(SciChartSurface_1.sciChartConfig);
+            var locateFile = (0, SciChartSurfaceBase_1.getLocateFile)(SciChartSurface_1.sciChartConfig);
             // @ts-ignore
             new WasmModule2D({ locateFile: locateFile, noInitialRun: true }).then(function (wasmContext) {
                 loader.removeChartLoader(canvases.domDivContainer, loaderDiv);
                 // @ts-ignore
                 wasmContext.doNotCaptureKeyboard = true;
-                exports.initDrawEngineSingleChart(wasmContext, canvases, resolve, options === null || options === void 0 ? void 0 : options.theme);
+                (0, exports.initDrawEngineSingleChart)(wasmContext, canvases, resolve, options === null || options === void 0 ? void 0 : options.theme);
             });
         }
         else {
@@ -37,8 +37,9 @@ exports.createSingleInternal = function (divElementId, options) {
         }
     });
 };
+exports.createSingleInternal = createSingleInternal;
 /** @ignore */
-exports.initDrawEngineSingleChart = function (wasmContext, canvases, resolve, theme) {
+var initDrawEngineSingleChart = function (wasmContext, canvases, resolve, theme) {
     Guard_1.Guard.notNull(theme, "theme");
     var width = canvases.domCanvas2D.width;
     var height = canvases.domCanvas2D.height;
@@ -81,3 +82,4 @@ exports.initDrawEngineSingleChart = function (wasmContext, canvases, resolve, th
     // @ts-ignore
     wasmContext.callMain();
 };
+exports.initDrawEngineSingleChart = initDrawEngineSingleChart;

package/Charting/Visuals/licenseManager2D.js

@@ -93,13 +93,14 @@ var fetchFromWizard = function (path) { return __awaiter(void 0, void 0, void 0,
 }); };
 var licenseDependencies = {
     fetchFromWizard: function (url) { return fetchFromWizard(url); },
-    setCookie: function (name, val, validDays) { return cookie_1.setCookie(name, val, validDays); },
-    getCookie: function (name) { return cookie_1.getCookie(name); },
+    setCookie: function (name, val, validDays) { return (0, cookie_1.setCookie)(name, val, validDays); },
+    getCookie: function (name) { return (0, cookie_1.getCookie)(name); },
     fetchForChallenge: function (url) { return fetch(url); },
     updateLicenseDisplay: function (licenseInfo, sciChartSurface, is2D, applyToOther) { return updateLicenseDisplayInternal(licenseInfo, sciChartSurface, is2D, applyToOther); },
     debug: function (message) { return console.log(message); }
 };
-exports.setDependencies = function (dependencies) { return (licenseDependencies = dependencies); };
+var setDependencies = function (dependencies) { return (licenseDependencies = dependencies); };
+exports.setDependencies = setDependencies;
 var isDebug = null;
 var debug = function (message) {
     if (isDebug === null) {
@@ -111,24 +112,27 @@ var debug = function (message) {
 };
 // tslint:disable: no-console
 var licenseCallback;
-exports.setLicenseCallback = function (callback) {
+var setLicenseCallback = function (callback) {
     licenseCallback = callback;
 };
+exports.setLicenseCallback = setLicenseCallback;
 var runtimeLicenseKey = "";
 var getRuntimeLicenseKey = function () { return runtimeLicenseKey; };
-exports.setRuntimeLicenseKey = function (value) {
+var setRuntimeLicenseKey = function (value) {
     var prev = runtimeLicenseKey;
     runtimeLicenseKey = value;
     if (runtimeLicenseKey !== prev && runtimeLicenseKey !== "") {
         if (licenseContext2D !== undefined) {
-            exports.applyLicense(licenseContext2D);
+            (0, exports.applyLicense)(licenseContext2D);
         }
     }
 };
+exports.setRuntimeLicenseKey = setRuntimeLicenseKey;
 var useLicenseWizard = true;
-exports.setUseLicenseWizard = function (value) {
+var setUseLicenseWizard = function (value) {
     useLicenseWizard = value;
 };
+exports.setUseLicenseWizard = setUseLicenseWizard;
 var retryTime = app_1.IS_TEST_ENV ? 0.1 : 5;
 var maxretries = app_1.IS_TEST_ENV ? 12 : 10;
 var serverLicenseEndpoint = "api/license";
@@ -144,7 +148,8 @@ var callbacks3D = {
     setNewLicense3D: function (keyCode) { return undefined; },
     updateLicenseDisplay3D: function () { return undefined; }
 };
-exports.setCallbacks3D = function (callbacks) { return (callbacks3D = callbacks); };
+var setCallbacks3D = function (callbacks) { return (callbacks3D = callbacks); };
+exports.setCallbacks3D = setCallbacks3D;
 var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0, function () {
     var response, keyCode, _a, requiresValidation, trialExpired, err_3;
     return __generator(this, function (_b) {
@@ -170,7 +175,7 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                 }
                 else if (trialExpired) {
                     checkStatus = licensingClasses_1.LicenseCheckStatus.NoLicenseInWizard;
-                    debug("No valid license available in licensing wizard. Trying again in " + retryTime + " seconds");
+                    debug("No valid license available in licensing wizard. Trying again in ".concat(retryTime, " seconds"));
                     wizardTimer = setTimeout(function () { return getlicenseFromWizard(); }, retryTime * 1000);
                 }
                 else {
@@ -179,7 +184,7 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                 return [3 /*break*/, 4];
             case 3:
                 checkStatus = licensingClasses_1.LicenseCheckStatus.NoLicenseInWizard;
-                debug("No license available in licensing wizard. Trying again in " + retryTime + " seconds");
+                debug("No license available in licensing wizard. Trying again in ".concat(retryTime, " seconds"));
                 wizardTimer = setTimeout(function () { return getlicenseFromWizard(); }, retryTime * 1000);
                 _b.label = 4;
             case 4: return [3 /*break*/, 6];
@@ -188,7 +193,7 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                 // Failed to connect.  Retry
                 getLicenseFailCounts += 1;
                 if (getLicenseFailCounts < maxretries) {
-                    debug("Could not find licensing wizard. Trying again in " + retryTime + " seconds");
+                    debug("Could not find licensing wizard. Trying again in ".concat(retryTime, " seconds"));
                     setTimeout(function () { return getlicenseFromWizard(); }, retryTime * 1000);
                 }
                 else {
@@ -200,7 +205,7 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                 return [3 /*break*/, 6];
             case 6:
                 if (licenseContext2D !== undefined) {
-                    exports.updateLicenseDisplay(exports.getLicenseInfo(licenseContext2D), sciChartSurface2D, true, true);
+                    (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, true);
                 }
                 callbacks3D.updateLicenseDisplay3D();
                 return [2 /*return*/];
@@ -208,10 +213,10 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
     });
 }); };
 var setLicenseCookie = function (key, token, expirySeconds, lastValidated) {
-    var cookieVal = key + "," + token + "," + expirySeconds + "," + lastValidated;
+    var cookieVal = "".concat(key, ",").concat(token, ",").concat(expirySeconds, ",").concat(lastValidated);
     return licenseDependencies.setCookie("scLicense", cookieVal, 365);
 };
-exports.getLicenseCookie = function () {
+var getLicenseCookie = function () {
     var cookie;
     cookie = licenseDependencies.getCookie("scLicense");
     var parts = cookie.split(",");
@@ -226,9 +231,10 @@ exports.getLicenseCookie = function () {
     else
         return { key: parts[0], token: null, expiry: null, lastValidated: null };
 };
+exports.getLicenseCookie = getLicenseCookie;
 var refreshLicense = function () {
-    cookie_1.deleteCookie("scLicense");
-    exports.applyLicense(licenseContext2D);
+    (0, cookie_1.deleteCookie)("scLicense");
+    (0, exports.applyLicense)(licenseContext2D);
 };
 var setChallengeResponse = function (token) {
     var expirySeconds = -1;
@@ -253,7 +259,7 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                 _b.trys.push([1, 11, , 12]);
                 if (checkStatus !== licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense)
                     return [2 /*return*/];
-                debug("Attempting to validate license with " + server);
+                debug("Attempting to validate license with ".concat(server));
                 challenge = void 0;
                 orderId = void 0;
                 if (licenseContext2D !== undefined) {
@@ -264,9 +270,9 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                     (_a = callbacks3D.getLicenseChallenge3D(), challenge = _a.challenge, orderId = _a.orderId);
                 }
                 response = void 0;
-                queryString = "orderid=" + orderId + "&challenge=" + challenge;
+                queryString = "orderid=".concat(orderId, "&challenge=").concat(challenge);
                 if (!isDev) return [3 /*break*/, 3];
-                url = "/validate?" + queryString;
+                url = "/validate?".concat(queryString);
                 return [4 /*yield*/, licenseDependencies.fetchFromWizard(url)];
             case 2:
                 response = _b.sent();
@@ -291,7 +297,7 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                 if (!token.startsWith("Error")) {
                     expirySeconds = setChallengeResponse(token);
                     if (expirySeconds > 0) {
-                        key = exports.getLicenseCookie().key;
+                        key = (0, exports.getLicenseCookie)().key;
                         timeNow = Math.floor(new Date().getTime() / 1000);
                         setLicenseCookie(key, token, expirySeconds, timeNow);
                         checkStatus = licensingClasses_1.LicenseCheckStatus.LicenseOK;
@@ -322,15 +328,15 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                 // Failed to connect.  Retry
                 challengeFailCounts += 1;
                 if (challengeFailCounts < maxretries) {
-                    debug("Could not find " + server + "/" + serverLicenseEndpoint + ". Trying again in " + retryTime + " seconds");
+                    debug("Could not find ".concat(server, "/").concat(serverLicenseEndpoint, ". Trying again in ").concat(retryTime, " seconds"));
                     setTimeout(function () { return dolicenseChallenge(); }, retryTime * 1000);
                 }
                 else {
-                    expiry = exports.getLicenseCookie().expiry;
+                    expiry = (0, exports.getLicenseCookie)().expiry;
                     msg = isDev
                         ? "Please run the license wizard, ensure your license is activated, then refresh page to retry."
                         : "Please check that the endpoint is configured correctly.";
-                    console.error("Failed to connect to " + server + "/" + serverLicenseEndpoint + ".  License must be revalidated before " + expiry.toLocaleString() + ". " + msg);
+                    console.error("Failed to connect to ".concat(server, "/").concat(serverLicenseEndpoint, ".  License must be revalidated before ").concat(expiry.toLocaleString(), ". ").concat(msg));
                     challengeFailCounts = 0;
                     // Only actually show failure message if token has expired
                     if (new Date() > expiry)
@@ -339,7 +345,7 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                 return [3 /*break*/, 12];
             case 12:
                 if (licenseContext2D !== undefined) {
-                    exports.updateLicenseDisplay(exports.getLicenseInfo(licenseContext2D), sciChartSurface2D, true, true);
+                    (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, true);
                 }
                 callbacks3D.updateLicenseDisplay3D();
                 return [2 /*return*/];
@@ -357,12 +363,12 @@ var applyLicense2D = function (licenseContext, sciChartSurface, isSingle) {
     if (isSingle || shouldApplyLicense2D) {
         licenseContext2D = licenseContext;
         sciChartSurface2D = sciChartSurface;
-        exports.applyLicense(licenseContext);
+        (0, exports.applyLicense)(licenseContext);
     }
     if (!isSingle)
         shouldApplyLicense2D = false;
 };
-exports.applyLicense = function (licenseContext) {
+var applyLicense = function (licenseContext) {
     debug("applyLicense running");
     var licenseKey = "";
     var lt = licenseContext.SCRTCredentials.GetLicenseType();
@@ -396,7 +402,7 @@ exports.applyLicense = function (licenseContext) {
         }
     }
     // Get from cookie store
-    var licenseCookie = exports.getLicenseCookie();
+    var licenseCookie = (0, exports.getLicenseCookie)();
     if (licenseKey === "" && licenseCookie && licenseCookie.key !== "") {
         debug("Found license in cookie.");
         licenseKey = licenseCookie.key;
@@ -407,7 +413,7 @@ exports.applyLicense = function (licenseContext) {
             lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_TRIAL ||
             lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_REQUIRES_VALIDATION)) {
             debug("License cookie is invalid. Removing");
-            cookie_1.deleteCookie("scLicense");
+            (0, cookie_1.deleteCookie)("scLicense");
             licenseKey = "";
             lt = licenseContext.SCRTLicenseType.LICENSE_TYPE_NO_LICENSE;
         }
@@ -432,7 +438,7 @@ exports.applyLicense = function (licenseContext) {
             if (isRuntimeKey && isDev) {
                 // clear key
                 licenseContext.SCRTCredentials.ResetRuntimeLicense();
-                cookie_1.deleteCookie("scLicense");
+                (0, cookie_1.deleteCookie)("scLicense");
                 checkStatus = licensingClasses_1.LicenseCheckStatus.DevKeyInRuntimeKey;
             }
             else if (licenseCookie.expiry > new Date()) {
@@ -449,7 +455,7 @@ exports.applyLicense = function (licenseContext) {
                 }
                 var validationInterval = 60 * 60 * 24; // Once a day
                 var secondsSinceValidated = (new Date().getTime() - licenseCookie.lastValidated.getTime()) / 1000;
-                debug("License expires in " + (expirySeconds - timeNow) + " seconds.  Last validated " + secondsSinceValidated + " seconds ago");
+                debug("License expires in ".concat(expirySeconds - timeNow, " seconds.  Last validated ").concat(secondsSinceValidated, " seconds ago"));
                 if (secondsSinceValidated > validationInterval &&
                     checkStatus !== licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense) {
                     checkStatus = licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense;
@@ -474,10 +480,11 @@ exports.applyLicense = function (licenseContext) {
         }
     }
     if (licenseContext2D !== undefined) {
-        exports.updateLicenseDisplay(exports.getLicenseInfo(licenseContext2D), sciChartSurface2D, true, false);
+        (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, false);
     }
     callbacks3D.updateLicenseDisplay3D();
 };
+exports.applyLicense = applyLicense;
 var licenseModal;
 var openLicenseModal = function () {
     console.error("Modal not initialized");
@@ -494,7 +501,7 @@ var setNewLicense = function (keyCode) {
         trialExpired =
             licenseContext2D.SCRTCredentials.GetLicenseType() ===
                 licenseContext2D.SCRTLicenseType.LICENSE_TYPE_TRIAL_EXPIRED;
-        exports.updateLicenseDisplay(exports.getLicenseInfo(licenseContext2D), sciChartSurface2D, true, true);
+        (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, true);
     }
     var result3D = callbacks3D.setNewLicense3D(keyCode);
     if (result3D !== undefined) {
@@ -658,14 +665,17 @@ var convertLicenseType = function (sclt, licenseContext) {
     }
     return licenseType;
 };
-exports.getLicenseInfo = function (licenseContext) {
+var getLicenseInfo = function (licenseContext) {
     var sclt = licenseContext.SCRTCredentials.GetLicenseType();
     var licenseType = convertLicenseType(sclt, licenseContext);
     var daysRemaining = licenseContext.SCRTCredentials.GetLicenseDaysRemaining();
-    debug(licenseContext.SCRTCredentials.Dump());
+    if (isDebug) {
+        debug(licenseContext.SCRTCredentials.Dump());
+    }
     var error = licenseContext.SCRTCredentials.GetLicenseErrors();
     return { licenseType: licenseType, daysRemaining: daysRemaining, error: error };
 };
+exports.getLicenseInfo = getLicenseInfo;
 var licenseType2D;
 var licenseType3D;
 var previousCheckStatus;
@@ -692,7 +702,7 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
             licenseType3D = licenseType;
         // if (licenseType === LicenseType.Trial || licenseType === LicenseType.Full)
         //    checkStatus = LicenseCheckStatus.LicenseOK;
-        debug((is2D ? "2D" : "3D") + " license status changed");
+        debug("".concat(is2D ? "2D" : "3D", " license status changed"));
         sciChartSurface.invalidateElement();
         sciChartSurface.otherSurfaces.map(function (s) { return s.invalidateElement(); });
         // Update license message text
@@ -700,18 +710,18 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
         var contactSupportLink = "<a href=\"https://www.scichart.com/contact-us/\"  target=\"_blank\" style=\"color: orange\">contact support</a>";
         if (licenseType === licensingClasses_1.LicenseType.NoLicense) {
             premsg = "You need to have a license to use SciChart.  ";
-            postMsg = "Instructions can be seen at " + licensingLink;
+            postMsg = "Instructions can be seen at ".concat(licensingLink);
         }
         else if (licenseType === licensingClasses_1.LicenseType.Invalid) {
             if (error.startsWith("License is not valid for this domain"))
-                premsg = "Sorry! Your license key is invalid for this domain</br>Please " + contactSupportLink + " with your OrderID if you believe this to be incorrect.";
+                premsg = "Sorry! Your license key is invalid for this domain</br>Please ".concat(contactSupportLink, " with your OrderID if you believe this to be incorrect.");
             else
-                premsg = "Sorry! Your license key appears to be invalid</br>Please " + contactSupportLink + " with your OrderID if you believe this to be incorrect.";
-            postMsg = "Instructions can be seen at " + licensingLink;
+                premsg = "Sorry! Your license key appears to be invalid</br>Please ".concat(contactSupportLink, " with your OrderID if you believe this to be incorrect.");
+            postMsg = "Instructions can be seen at ".concat(licensingLink);
         }
         else if (licenseType === licensingClasses_1.LicenseType.Invalid_Developer) {
             premsg = "Sorry! You need a developer license to use SciChart on a domain not included in your runtime key.";
-            postMsg = "Instructions can be seen at " + licensingLink + "</br>\n                    Please " + contactSupportLink + " with your OrderID if you are experiencing issues.";
+            postMsg = "Instructions can be seen at ".concat(licensingLink, "</br>\n                    Please ").concat(contactSupportLink, " with your OrderID if you are experiencing issues.");
         }
         else if (licenseType === licensingClasses_1.LicenseType.Requres_Validation) {
             if (isDev) {
@@ -720,18 +730,22 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
             else {
                 premsg = "This runtime key must be validated by a server side key.";
             }
-            postMsg = "Instructions can be seen at " + licensingLink + "</br>\n                    Please " + contactSupportLink + " with your OrderID if you are experiencing issues.";
+            postMsg = "Instructions can be seen at ".concat(licensingLink, "</br>\n                    Please ").concat(contactSupportLink, " with your OrderID if you are experiencing issues.");
         }
         else if (licenseType === licensingClasses_1.LicenseType.Subscription_Expired) {
             premsg = "Sorry! Your support subscription has expired.<br>";
-            postMsg = "Please " + contactSupportLink + " us if you would like to renew your subscription.";
+            postMsg = "Please ".concat(contactSupportLink, " us if you would like to renew your subscription.");
         }
-        else if (licenseType === licensingClasses_1.LicenseType.Trial_Expired) {
+        else if (licenseType === licensingClasses_1.LicenseType.Trial_Expired && daysRemaining < 1) {
             premsg = "Sorry! Your trial has expired.";
-            postMsg = "Please " + contactSupportLink + " if you require an extension.";
+            postMsg = "Please ".concat(contactSupportLink, " if you require an extension.");
+        }
+        else if (licenseType === licensingClasses_1.LicenseType.Trial_Expired && daysRemaining > 1) {
+            premsg = "This version is too old to trial.";
+            postMsg = "Please ".concat(contactSupportLink, " if you require an extension.");
         }
         else if (licenseType === licensingClasses_1.LicenseType.Trial && daysRemaining <= 7) {
-            premsg = "You have " + daysRemaining + " day" + (daysRemaining === 1 ? "" : "s") + " remaining of the trial.";
+            premsg = "You have ".concat(daysRemaining, " day").concat(daysRemaining === 1 ? "" : "s", " remaining of the trial.");
         }
         else if (licenseType === licensingClasses_1.LicenseType.Full || (licenseType === licensingClasses_1.LicenseType.Trial && daysRemaining > 7)) {
             licenseMessageDiv.style.display = "none";
@@ -768,6 +782,8 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
             else if (checkStatus === licensingClasses_1.LicenseCheckStatus.DevKeyInRuntimeKey)
                 chartmsg = "<br><u>You have set a developer key as a runtime key, which will not work on any other machine.  Click for more information</u>";
             // tslint:disable-next-line: max-line-length
+            else if (licenseType === licensingClasses_1.LicenseType.Trial_Expired && daysRemaining > 1)
+                chartmsg = "<br><u>Please update to the latest version of SciChart. Click for more information</u>.";
             else if (checkStatus === licensingClasses_1.LicenseCheckStatus.NoLicenseInWizard &&
                 licenseType === licensingClasses_1.LicenseType.Trial_Expired) {
                 chartmsg = "<br><u>Please activate a serial key in the Licensing Wizard, or contact sales for an extension.  Click for more information</u>.";
@@ -808,10 +824,11 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
         });
     }
 };
-exports.updateLicenseDisplay = function (licenseInfo, sciChartSurface, is2D, applyToOther) { return licenseDependencies.updateLicenseDisplay(licenseInfo, sciChartSurface, is2D, applyToOther); };
+var updateLicenseDisplay = function (licenseInfo, sciChartSurface, is2D, applyToOther) { return licenseDependencies.updateLicenseDisplay(licenseInfo, sciChartSurface, is2D, applyToOther); };
+exports.updateLicenseDisplay = updateLicenseDisplay;
 exports.licenseManager = {
-    setRuntimeLicenseKey: function (value) { return exports.setRuntimeLicenseKey(value); },
-    setLicenseCallback: function (callback) { return exports.setLicenseCallback(callback); },
+    setRuntimeLicenseKey: function (value) { return (0, exports.setRuntimeLicenseKey)(value); },
+    setLicenseCallback: function (callback) { return (0, exports.setLicenseCallback)(callback); },
     setServerLicenseEndpoint: function (value) { return setServerLicenseEndpoint(value); },
     applyLicense2D: function (licenseContext, sciChartSurface, isSingle) {
         return applyLicense2D(licenseContext, sciChartSurface, isSingle);

package/Charting/Visuals/loader.js

@@ -27,7 +27,7 @@ var DefaultSciChartLoader = /** @class */ (function () {
         loaderContainerDiv.style.height = "100%";
         loaderContainerDiv.style.width = "100%";
         var loaderDiv = document.createElement("div");
-        var spinnerChunk = "<div><span style=\"background: " + theme.loadingAnimationForeground + "\"/></div>";
+        var spinnerChunk = "<div><span style=\"background: ".concat(theme.loadingAnimationForeground, "\"/></div>");
         loaderDiv.innerHTML = spinnerChunk.repeat(8);
         loaderDiv.classList.add("scichart_loader");
         loaderContainerDiv.appendChild(loaderDiv);