From c4ab98ace2037cff97400a8eec74a9050934c324 Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Tue, 26 Nov 2019 17:48:48 +0100 Subject: [PATCH] set different log level between ifsm and blapy --- Blapy.jquery.json | 2 +- Blapy.js | 11 +++++++++-- package.json | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Blapy.jquery.json b/Blapy.jquery.json index 5057057..c330f1c 100644 --- a/Blapy.jquery.json +++ b/Blapy.jquery.json @@ -6,7 +6,7 @@ "Application", "Ajax" ], - "version": "1.10.1", + "version": "1.13.5", "author": { "name": "Emmanuel Podvin", "url": "http://fr.linkedin.com/in/podvin" diff --git a/Blapy.js b/Blapy.js index 7b625b9..1f94e4d 100644 --- a/Blapy.js +++ b/Blapy.js @@ -11,10 +11,13 @@ * @fileoverview : Blapy is a jQuery plugin that helps you to create and manage an ajax web application. * @see {@link https://github.com/intersel/Blapy} * @author : Emmanuel Podvin - emmanuel.podvin@intersel.fr - * @version : 1.13.3 + * @version : 1.13.5 * @license : donationware - see https://github.com/intersel/Blapy/blob/master/LICENSE * ----------------------------------------------------------------------------------------- * Modifications : + * - 2019/11/26 - E.Podvin - 1.13.5 + * - different log level between ifsm and blapy + * - fix in postData when console log on embeddingBLockId not set (use of aFSM instead of myFSM) * - 2019/11/15 - E.Podvin - 1.13.4 * - add data-blapy-params property for A tag element to specify data to send to url * - 2019/11/14 - E.Podvin - 1.13.3 @@ -255,6 +258,7 @@ return; this.params['embeddingBlockId'] = myBlapy.extractembeddingBlockIdName(myBlapy.hashURL()); + if (!this.params['embeddingBlockId']) delete(this.params['embeddingBlockId']); myBlapy.myUIObject.trigger('loadUrl', { aUrl: myBlapy.hashURL(), @@ -269,6 +273,7 @@ return; this.params['embeddingBlockId'] = myBlapy.extractembeddingBlockIdName(myBlapy.hashURL(this.path)); + if (!this.params['embeddingBlockId']) delete(this.params['embeddingBlockId']); myBlapy.myUIObject.trigger('postData', { aUrl: myBlapy.hashURL(this.path), @@ -282,6 +287,8 @@ if (($(this.target).attr("data-blapy-active-blapyid")) && ($(this.target).attr("data-blapy-active-blapyid") != myBlapy.myUIObjectID)) return; this.params['embeddingBlockId'] = myBlapy.extractembeddingBlockIdName(myBlapy.hashURL(this.path)); + if (!this.params['embeddingBlockId']) delete(this.params['embeddingBlockId']); + myBlapy.myUIObject.trigger('postData', { aUrl: myBlapy.hashURL(this.path), params: myBlapy.filterAttributes(this.params), @@ -950,7 +957,7 @@ theBlapy.prototype.getObjects = function (obj, key, val) { if ( ("embeddingBlockId" in params) && (!params.embeddingBlockId) ) { - myFSM.opts.theBlapy._log('[postData on '+aFSM.myUIObject.attr('id')+'] embeddingBlockId has been set but is undefined! must be an error...', 1); + aFSM.opts.theBlapy._log('[postData on '+aFSM.myUIObject.attr('id')+'] embeddingBlockId has been set but is undefined! must be an error...', 1); } var aembeddingBlockId = params.embeddingBlockId; diff --git a/package.json b/package.json index 3525cc1..4438517 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "dynamic web", "Ajax" ], - "version": "1.10.1", + "version": "1.13.5", "author": { "name": "Emmanuel Podvin", "url": "http://fr.linkedin.com/in/podvin"