@osimatic/helpers-js 1.0.32 → 1.0.33

package/changelog.txt

@@ -37,4 +37,6 @@ let httpHeaders = {...} -> HTTPRequest.setHeader(key, value);
 remplacer l'utilisation des variables httpHeaders / _httpHeaders par HTTPRequest.getHeaders()
 
 FlashMessage.displayRequestFailure(status, exception, modal) -> FlashMessage.displayError(labelErrorOccured, modal)
-FormHelper.logRequestFailure(status, exception) -> HTTPRequest.logJqueryRequestFailure(jqxhr, status, exception) (le log de l'erreur est devenu inutile car fait de base dans la classe HTTPRequest)
+FormHelper.logRequestFailure(status, exception) -> HTTPRequest.logJqueryRequestFailure(jqxhr, status, exception) (le log de l'erreur est devenu inutile car fait de base dans la classe HTTPRequest)
+
+Location.checkCoordinates(...) -> GeographicCoordinates.check(...) (car Location est déjà défini en javascript natif)

package/form_helper.js

@@ -255,6 +255,37 @@ class FormHelper {
 	}
 
 
+	static buttonLoader(button, action) {
+		button = $(button);
+		if (action === 'start' || action === 'loading') {
+			if (button.attr('disabled')) {
+				return self;
+			}
+			button.attr('disabled', true);
+			button.attr('data-btn-text', button.html());
+			//let text = '<span class="spinner"><i class=\'fa fa-circle-notch fa-spin\'></i></span>Traitement en cours…';
+			let text = '<i class=\'fa fa-circle-notch fa-spin\'></i> Traitement en cours…';
+			if (button.data('load-text') != undefined && button.data('load-text') != null && button.data('load-text') != '') {
+				text = button.data('load-text');
+			}
+			if (button.data('loading-text') != undefined && button.data('loading-text') != null && button.data('loading-text') != '') {
+				text = button.data('loading-text');
+			}
+			button.html(text);
+			button.addClass('disabled');
+		}
+		if (action === 'stop' || action === 'reset') {
+			button.html(button.attr('data-btn-text'));
+			button.removeClass('disabled');
+			button.attr('disabled', false);
+			//button.removeAttr("disabled");
+		}
+		return button;
+	}
+	
+	
+	
+	
 
 	/** @deprecated **/
 	static logRequestFailure(status, exception) {

package/index.js

@@ -15,7 +15,7 @@ const { DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime } = require('./da
 const { Duration } = require('./duration');
 const { File, CSV, Img } = require('./file');
 const { FormHelper } = require('./form_helper');
-const { Country, PostalAddress, Location } = require('./location');
+const { Country, PostalAddress, GeographicCoordinates } = require('./location');
 const { SocialNetwork } = require('./social_network');
 const { sleep, refresh } = require('./util');
 const { chr, ord, trim, empty } = require('./php.min');
@@ -40,11 +40,9 @@ const { GoogleRecaptcha } = require('./google_recaptcha');
 const { GoogleMap } = require('./google_maps');
 const { OpenStreetMap } = require('./open_street_map');
 
-// deprecated
-
 module.exports = {
 	Array, Object, Number, String,
-	HTTPRequest, Cookie, UrlAndQueryString, IBAN, BankCard, AudioMedia, UserMedia, PersonName, Email, TelephoneNumber, DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, Location, SocialNetwork,
+	HTTPRequest, Cookie, UrlAndQueryString, IBAN, BankCard, AudioMedia, UserMedia, PersonName, Email, TelephoneNumber, DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, GeographicCoordinates, SocialNetwork,
 	DataTable, Pagination, Navigation, DetailsSubArray, SelectAll, MultipleActionInTable, FormDate, InputPeriod, ShoppingCart, FlashMessage, CountDown, ImportFromCsv, JwtToken, JwtSession, ListBox,
 	sleep, refresh, chr, ord, trim, empty,
 	GoogleCharts, GoogleRecaptcha, GoogleMap, OpenStreetMap

package/location.js

@@ -394,10 +394,10 @@ class PostalAddress {
 	}
 }
 
-class Location {
-	static checkCoordinates(str) {
+class GeographicCoordinates {
+	static check(str) {
 		return /^[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?),\s*[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)$/.test(str);
 	}
 }
 
-module.exports = { Country, PostalAddress, Location };
+module.exports = { Country, PostalAddress, GeographicCoordinates };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/todos/button_loader.js

@@ -1,50 +0,0 @@
-
-// Loading button plugin (removed from BS4)
-(function($) {
-	"use strict";
-
-	$.fn.extend({
-		/*
-		button: function (action) {
-			console.log(action);
-			if (action === 'loading' && this.data('loading-text')) {
-				console.log('loading');
-				this.data('original-text', this.html()).html(this.data('loading-text')).prop('disabled', true);
-			}
-			if (action === 'reset' && this.data('original-text')) {
-				console.log('reset');
-				this.html(this.data('original-text')).prop('disabled', false);
-			}
-		},
-		*/
-
-		buttonLoader: function (action) {
-			//console.log(action);
-			var self = $(this);
-			if (action === 'start' || action === 'loading') {
-				if ($(self).attr('disabled')) {
-					return self;
-				}
-				$(self).attr('disabled', true);
-				$(self).attr('data-btn-text', $(self).html());
-				//let text = '<span class="spinner"><i class=\'fa fa-circle-notch fa-spin\'></i></span>Traitement en cours…';
-				let text = '<i class=\'fa fa-circle-notch fa-spin\'></i> Traitement en cours…';
-				if ($(self).data('load-text') != undefined && $(self).data('load-text') != null && $(self).data('load-text') != '') {
-					text = $(self).data('load-text');
-				}
-				if ($(self).data('loading-text') != undefined && $(self).data('loading-text') != null && $(self).data('loading-text') != '') {
-					text = $(self).data('loading-text');
-				}
-				$(self).html(text);
-				$(self).addClass('disabled');
-			}
-			if (action === 'stop' || action === 'reset') {
-				$(self).html($(self).attr('data-btn-text'));
-				$(self).removeClass('disabled');
-				$(self).attr('disabled', false);
-				//$(self).removeAttr("disabled");
-			}
-			return self;
-		}
-	});
-}(jQuery));