@osimatic/helpers-js 1.0.710 → 1.1.1

package/number.js

@@ -22,7 +22,7 @@ if (!Number.format) {
  * @param integer x: length of sections
  */
 Number.prototype.formatForDisplay = Number.prototype.formatForDisplay || function(n, s, c, x) {
-	var re = '\\d(?=(\\d{' + (x || 3) + '})+' + (n > 0 ? '\\D' : '$') + ')',
+	let re = '\\d(?=(\\d{' + (x || 3) + '})+' + (n > 0 ? '\\D' : '$') + ')',
 		num = this.toFixed(Math.max(0, ~~n));
 	return (c ? num.replace('.', c) : num).replace(new RegExp(re, 'g'), '$&' + (s || ','));
 };

package/open_street_map.js

@@ -81,7 +81,7 @@ class OpenStreetMap {
 
 		//marker.on('click', () => {
 		marker.on('popupopen', () => {
-			console.log('popupopen');
+			//console.log('popupopen');
 			if (typeof options['on_click'] == 'function') {
 				options['on_click']();
 			}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.0.710",
-  "main": "index.js",
+  "version": "1.1.1",
+  "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },

package/string.js

@@ -4,7 +4,7 @@ String.prototype.copyToClipboard = String.prototype.copyToClipboard || function(
 		window.clipboardData.setData('Text', this);
 	}
 	else if (document.body.createTextRange) {
-		var textRange = document.body.createTextRange();
+		let textRange = document.body.createTextRange();
 		textRange.moveToElementText(this);
 		textRange.execCommand("Copy");
 	}
@@ -18,7 +18,7 @@ String.prototype.copyToClipboard = String.prototype.copyToClipboard || function(
 			alert("Impossible d'accéder au presse-papier.");
 		}
 		// Initialisation du composant fournit par Mozilla.
-		var gClipboardHelper = Components.classes["@mozilla.org/widget/clipboardhelper;1"].getService(Components.interfaces.nsIClipboardHelper);
+		let gClipboardHelper = Components.classes["@mozilla.org/widget/clipboardhelper;1"].getService(Components.interfaces.nsIClipboardHelper);
 		// Copie du texte dans le presse papier.
 		gClipboardHelper.copyString(this);
 	}
@@ -33,14 +33,14 @@ String.prototype.truncateOnWord = String.prototype.truncateOnWord || function(li
 	if (fromLeft) {
 		return this.reverseString(this.truncateOnWord(this.reverseString(), limit));
 	}
-	var TRIM_CHARS = '\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u2028\u2029\u3000\uFEFF';
-	var words = this.split(RegExp('(?=['+TRIM_CHARS+'])'));
-	var count = 0;
+	let TRIM_CHARS = '\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u2028\u2029\u3000\uFEFF';
+	let words = this.split(RegExp('(?=['+TRIM_CHARS+'])'));
+	let count = 0;
 
 	function filter(arr, fn) {
-		var result = [];
-		for (var i = 0, len = arr.length; i < len; i++) {
-			var el = arr[i];
+		let result = [];
+		for (let i = 0, len = arr.length; i < len; i++) {
+			let el = arr[i];
 			if (i in arr && fn(el, i)) {
 				result.push(el);
 			}
@@ -105,7 +105,7 @@ String.prototype.escapeRegExp = String.prototype.escapeRegExp || function() {
 	return this.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
 };
 String.prototype.format = String.prototype.format || function() {
-	var args = arguments;
+	let args = arguments;
 	return this.replace(/{(\d+)}/g, (match, number) => (typeof args[number] != 'undefined' ? args[number] : match));
 };
 
@@ -136,7 +136,7 @@ String.prototype.isNumeric = String.prototype.isNumeric || function() {
 // s'utilise : "ma chaine {0} de caracteres"
 if (!String.format) {
 	String.format = function(format) {
-		var args = Array.prototype.slice.call(arguments, 1);
+		let args = Array.prototype.slice.call(arguments, 1);
 		return format.replace(/{(\d+)}/g, (match, number) => (typeof args[number] != 'undefined' ? args[number] : match));
 	};
 }

package/visitor.js

@@ -12,6 +12,7 @@ class Browser {
 		return !!window.chrome && !!window.chrome.webstore;
 	}
 	static isIE() {
+		//return window.navigator.userAgent.indexOf("MSIE ") > 0 || !!navigator.userAgent.match(/Trident.*rv\:11\./);
 		return /*@cc_on!@*/false || !!document.documentMode;
 	}
 	static isEdge() {
@@ -19,4 +20,59 @@ class Browser {
 	}
 }
 
-module.exports = { Browser };
+class UserAgent {
+	static getOsDisplay(osName) {
+		let str = '';
+		if (osName === 'Windows') {
+			str += '<i class="fab fa-windows"></i>';
+		}
+		if (osName === 'Linux') {
+			str += '<i class="fab fa-linux"></i>';
+		}
+		if (osName === 'macOS' || osName === 'iOS') {
+			str += '<i class="fab fa-apple"></i>';
+		}
+		if (osName === 'Android') {
+			str += '<i class="fab fa-android"></i>';
+		}
+		str += ' '+osName;
+		return str.trim();
+	}
+	
+	static getBrowserDisplay(browserName) {
+		let str = '';
+		if (browserName === 'Chrome') {
+			str += '<i class="fab fa-chrome"></i>';
+		}
+		if (browserName === 'Firefox') {
+			str += '<i class="fab fa-firefox"></i>';
+		}
+		if (browserName === 'Edge') {
+			str += '<i class="fab fa-edge"></i>';
+		}
+		if (browserName === 'Safari') {
+			str += '<i class="fab fa-safari"></i>';
+		}
+		if (browserName === 'Opera') {
+			str += '<i class="fab fa-opera"></i>';
+		}
+		str += ' '+browserName;
+		return str.trim();
+	}
+
+	static getDeviceDisplay(device) {
+		let str = '';
+		if (device['type'] === 'desktop') {
+			str += '<i class="fas fa-desktop"></i> Ordinateur';
+		}
+		else {
+			if (device['is_mobile']) {
+				str += '<i class="fas fa-mobile-alt"></i> '+(null == device['manufacturer'] && null == device['model'] ? 'Mobile' : '');
+			}
+			str += device['manufacturer']+' '+device['model'];
+		}
+		return str.trim();
+	}
+}
+
+module.exports = { Browser, UserAgent };