@osimatic/helpers-js 1.1.26 → 1.1.27

package/CHANGELOG

@@ -60,3 +60,6 @@ HTTPRequest -> HTTPClient
 
 1.0.106
 UrlAndQueryString.getPath() -> UrlAndQueryString.getHostAndPath()
+
+1.1.27
+var serviceCountry = 'XX' -> TelephoneNumber.setLocalCountryCode('XX')

package/contact_details.js

@@ -3,10 +3,10 @@ class PersonName {
 
 	static format(firstName, lastName) {
 		let str = '';
-		if (firstName != null && firstName != '') {
+		if (firstName != null && firstName !== '') {
 			str += ' '+firstName;
 		}
-		if (lastName != null && lastName != '') {
+		if (lastName != null && lastName !== '') {
 			str += ' '+lastName;
 		}
 		return str.trim();
@@ -50,42 +50,43 @@ class Email {
 class TelephoneNumber {
 	//this class works with libphonenumber-max.min.js
 
+	static setLocalCountryCode(countryCode) {
+		TelephoneNumber.localCountryCode = countryCode;
+	}
+
 	static setIntlTelInputUtilsPath(path) {
 		TelephoneNumber.intlTelInputUtilsPath = path;
 	}
 
-	static getCountryIsoCode(phoneNumber, localCountryIsoCode) {
-		localCountryIsoCode = (typeof localCountryIsoCode != 'undefined' ? localCountryIsoCode.toUpperCase() : serviceCountry);
+	static getCountryIsoCode(phoneNumber, localCountryIsoCode=TelephoneNumber.localCountryCode) {
 		try {
-			const number = libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode);
+			const number = libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode.toUpperCase());
 			return number != null ? number.country : null;
 		} catch (error) {
 			console.error(error);
 		}
 		return null;
-		//return libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode).country || '';
+		//return libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode.toUpperCase()).country || '';
 	}
-	static getCountryName(phoneNumber, localCountryIsoCode) {
+	static getCountryName(phoneNumber, localCountryIsoCode=TelephoneNumber.localCountryCode) {
 		return Country.getCountryName(this.getCountryIsoCode(phoneNumber, localCountryIsoCode));
 	}
-	static getFlagImg(phoneNumber, localCountryIsoCode) {
+	static getFlagImg(phoneNumber, localCountryIsoCode=TelephoneNumber.localCountryCode) {
 		return Country.getFlagImg(this.getCountryIsoCode(phoneNumber, localCountryIsoCode));
 	}
-	static formatNational(phoneNumber, localCountryIsoCode) {
-		localCountryIsoCode = (typeof localCountryIsoCode != 'undefined' ? localCountryIsoCode.toUpperCase() : serviceCountry);
+	static formatNational(phoneNumber, localCountryIsoCode=TelephoneNumber.localCountryCode) {
 		try {
-			const number = libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode);
+			const number = libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode.toUpperCase());
 			return number != null ? number.formatNational() : '';
 		} catch (error) {
 			console.error(error);
 		}
 		return '';
-		//return libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode).formatNational();
+		//return libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode.toUpperCase()).formatNational();
 	}
-	static formatInternational(phoneNumber, localCountryIsoCode) {
-		localCountryIsoCode = (typeof localCountryIsoCode != 'undefined' ? localCountryIsoCode.toUpperCase() : serviceCountry);
+	static formatInternational(phoneNumber, localCountryIsoCode=TelephoneNumber.localCountryCode) {
 		try {
-			const number = libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode);
+			const number = libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode.toUpperCase());
 			return number != null ? number.formatInternational() : '';
 		} catch (error) {
 			console.error(error);
@@ -93,20 +94,19 @@ class TelephoneNumber {
 		return '';
 		//return libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode).formatInternational();
 	}
-	static formatInternationalWithTelLink(phoneNumber, localCountryIsoCode) {
+	static formatInternationalWithTelLink(phoneNumber, localCountryIsoCode=TelephoneNumber.localCountryCode) {
 		return '<a href="tel:'+phoneNumber+'">'+TelephoneNumber.formatInternational(phoneNumber, localCountryIsoCode)+'</a>';
 	}
-	static formatNationalWithFlagImg(phoneNumber, localCountryIsoCode) {
+	static formatNationalWithFlagImg(phoneNumber, localCountryIsoCode=TelephoneNumber.localCountryCode) {
 		return TelephoneNumber.getFlagImg(phoneNumber, localCountryIsoCode)+'&nbsp;'+TelephoneNumber.formatNational(phoneNumber, localCountryIsoCode);
 	}
-	static formatNationalWithFlagImgAndTelLink(phoneNumber, localCountryIsoCode) {
+	static formatNationalWithFlagImgAndTelLink(phoneNumber, localCountryIsoCode=TelephoneNumber.localCountryCode) {
 		return TelephoneNumber.getFlagImg(phoneNumber, localCountryIsoCode)+'&nbsp;<a href="tel:'+phoneNumber+'">'+TelephoneNumber.formatNational(phoneNumber, localCountryIsoCode)+'</a>';
 	}
 
-	static parse(phoneNumber, localCountryIsoCode) {
-		localCountryIsoCode = (typeof localCountryIsoCode != 'undefined' ? localCountryIsoCode.toUpperCase() : serviceCountry);
+	static parse(phoneNumber, localCountryIsoCode=TelephoneNumber.localCountryCode) {
 		try {
-			const number = libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode);
+			const number = libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode.toUpperCase());
 			return number != null ? number.formatInternational() : null;
 		} catch (error) {
 			console.error(error);
@@ -114,14 +114,13 @@ class TelephoneNumber {
 		return null;
 	}
 
-	static check(phoneNumber, localCountryIsoCode) {
-		localCountryIsoCode = (typeof localCountryIsoCode != 'undefined' ? localCountryIsoCode.toUpperCase() : serviceCountry);
+	static check(phoneNumber, localCountryIsoCode=TelephoneNumber.localCountryCode) {
 		try {
-			const number = libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode);
+			const number = libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode.toUpperCase());
 			return number != null ? number.isValid() : false;
 		} catch (error) { }
 		return false;
-		//var numberObject = libphonenumber.parse(phoneNumber, localCountryIsoCode);
+		//var numberObject = libphonenumber.parse(phoneNumber, localCountryIsoCode.toUpperCase());
 		//return (typeof numberObject.country !== 'undefined');
 	}
 
@@ -134,15 +133,13 @@ class TelephoneNumber {
 		return verifPhoneInt.exec(phoneNumber) != null;
 	}
 	
-	static getType(phoneNumber, localCountryIsoCode) {
-		localCountryIsoCode = (typeof localCountryIsoCode != 'undefined' ? localCountryIsoCode.toUpperCase() : serviceCountry);
-
+	static getType(phoneNumber, localCountryIsoCode=TelephoneNumber.localCountryCode) {
 		if (phoneNumber == null || phoneNumber.length === 0) {
 			return 'MASKED';
 		}
 		
 		try {
-			const number = libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode);
+			const number = libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode.toUpperCase());
 			return number != null ? number.getType() : null;
 		} catch (error) {
 			console.error(error);
@@ -173,7 +170,7 @@ class TelephoneNumber {
 
 	static setIntlTelInput(input, placeholderNumberType) {
 		return window.intlTelInput(input[0], {
-			initialCountry: serviceCountry,
+			initialCountry: TelephoneNumber.localCountryCode,
 			placeholderNumberType: placeholderNumberType || 'FIXED_LINE_OR_MOBILE',
 			utilsScript: typeof TelephoneNumber.intlTelInputUtilsPath != 'undefined' ? TelephoneNumber.intlTelInputUtilsPath : null
 		});

package/duration.js

@@ -1,8 +1,7 @@
 
 class Duration {
 
-	static formatNbDays(nbDays, locale) {
-		locale = (typeof locale != 'undefined'?locale:'fr-FR');
+	static formatNbDays(nbDays, locale='fr-FR') {
 		return new Intl.NumberFormat(locale, {
 			minimumFractionDigits: 2,
 			maximumFractionDigits: 2
@@ -29,9 +28,7 @@ class Duration {
 		return Duration.convertToDurationInHourChronoDisplay(Math.abs(durationInSeconds), 'input_time');
 	}
 
-	static convertToDurationInHourChronoDisplay(durationInSeconds, displayMode) {
-		displayMode = typeof displayMode != 'undefined' ? displayMode : 'chrono';
-
+	static convertToDurationInHourChronoDisplay(durationInSeconds, displayMode='chrono') {
 		let durationInSecondsOriginal = durationInSeconds;
 		durationInSeconds = Math.abs(durationInSeconds);
 		let seconds = ( durationInSeconds % 60 );
@@ -47,12 +44,7 @@ class Duration {
 		return (durationInSecondsOriginal < 0 ? '- ' : '')+hours+':'+minutes+(displayMode==='input_time'?':':'.')+seconds;
 	}
 
-	static convertToDurationInHourStringDisplay(durationInSeconds, withSecondes, withMinutes, withLibelleMinute, libelleEntier) {
-		if (withSecondes == null) withSecondes = true;
-		if (withMinutes == null) withMinutes = true;
-		if (withLibelleMinute == null) withLibelleMinute = true;
-		if (libelleEntier == null) libelleEntier = false;
-		
+	static convertToDurationInHourStringDisplay(durationInSeconds, withSecondes=true, withMinutes=true, withLibelleMinute=true, libelleEntier=false) {
 		// Heures
 		let strHeure = '';
 		let nbHeures = this.getNbHoursOfDurationInSeconds(durationInSeconds);
@@ -100,7 +92,7 @@ class Duration {
 		return (strHeure+strMinute+strSeconde).trim();
 	}
 
-	static roundNbSeconds(durationInSeconds, roundPrecision, roundMode) {
+	static roundNbSeconds(durationInSeconds, roundPrecision, roundMode='close') {
 		let hours = Math.floor(durationInSeconds / 3600);
 		let minutes = Math.floor((durationInSeconds % 3600) / 60);
 		let seconds = durationInSeconds % 60;

package/file.js

@@ -1,19 +1,18 @@
 
 class File {
 	static download(data, contentType, contentDisposition) {
-		var filename = "";
-		var disposition = contentDisposition;
+		let filename = "";
+		let disposition = contentDisposition;
 		if (disposition && (disposition.indexOf('inline') !== -1 || disposition.indexOf('attachment') !== -1)) {
-			var filenameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
-			var matches = filenameRegex.exec(disposition);
+			let filenameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
+			let matches = filenameRegex.exec(disposition);
 			if (matches != null && matches[1]) {
 				filename = matches[1].replace(/['"]/g, '');
 			}
 		}
-		var type = contentType;
 
-		var blob = new Blob([data], {
-			type: type
+		let blob = new Blob([data], {
+			type: contentType
 		});
 
 		//console.log('disposition: '+disposition+' ; filename: '+filename+' ; type: '+type);
@@ -23,10 +22,10 @@ class File {
 			// IE workaround for "HTML7007: One or more blob URLs were revoked by closing the blob for which they were created. These URLs will no longer resolve as the data backing the URL has been freed."
 			window.navigator.msSaveBlob(blob, filename);
 		} else {
-			var URL = window.URL || window.webkitURL;
-			var downloadUrl = URL.createObjectURL(blob);
+			let URL = window.URL || window.webkitURL;
+			let downloadUrl = URL.createObjectURL(blob);
 
-			var a = document.createElement("a");
+			let a = document.createElement("a");
 			// safari doesn't support this yet
 			if (typeof a.download === 'undefined') {
 				window.location = downloadUrl;
@@ -43,10 +42,9 @@ class File {
 		}
 	}
 
-	static formatFileSize(fileSizeInBytes, fractionDigits, locale) {
-		fractionDigits = (typeof fractionDigits != 'undefined' ? fractionDigits : 2);
-		var i = -1;
-		var byteUnits = ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+	static formatFileSize(fileSizeInBytes, fractionDigits=2, locale='fr-FR') {
+		let i = -1;
+		let byteUnits = ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
 		if (fileSizeInBytes === 0) {
 			return '0 ' + byteUnits[0];
 		}
@@ -56,7 +54,7 @@ class File {
 		}
 		while (fileSizeInBytes > 1024);
 		//var size = Math.max(fileSizeInBytes, 0.1).toFixed(fractionDigits);
-		var size = Math.max(fileSizeInBytes, 0.1);
+		let size = Math.max(fileSizeInBytes, 0.1);
 		return (new Intl.NumberFormat(locale, {
 			maximumFractionDigits: fractionDigits
 		}).format(size)) + ' ' + byteUnits[i];
@@ -93,13 +91,13 @@ class CSV {
 
 class Img {
 	static compress(oData) {
-		var a = [];
-		var len = oData.length;
-		var p = -1;
-		for (var i=0;i<len;i+=4) {
+		let a = [];
+		let len = oData.length;
+		let p = -1;
+		for (let i=0;i<len;i+=4) {
 			if (oData[i] > 0)
 				a[++p] = String.fromCharCode(oData[i]);
-		};
+		}
 		return a.join("");
 	}
 
@@ -128,7 +126,7 @@ class Img {
 	static setBlobToImg(img, blob) {
 		// img.attr('src', btoa(unescape(encodeURIComponent(data))));
 		// img.attr('src', 'data:image/png;base64, '+btoa(unescape(encodeURIComponent(data))));
-		var urlCreator = window.URL || window.webkitURL;
+		let urlCreator = window.URL || window.webkitURL;
 		img.attr('src', urlCreator.createObjectURL(blob));
 	}
 

package/flash_message.js

@@ -1,21 +1,20 @@
 class FlashMessage {
-	static displaySuccess(message, reload, modal) {
+	static displaySuccess(message, reload, modal=null) {
 		this.display('success', message, reload, modal);
 	}
-	static displayWarning(message, modal) {
+	static displayWarning(message, modal=null) {
 		this.display('warning', message, false, modal);
 	}
-	static displayError(message, modal) {
+	static displayError(message, modal=null) {
 		this.display('danger', message, false, modal);
 	}
 
-	static display(type, message, reload, modal) {
-		if ('undefined' !== typeof modal) {
+	static display(type, message, reload, modal=null) {
+		if (null !== modal) {
 			modal.modal('hide');
 		}
-		if ($('div.snackbar').length !== 0) {
-			$('div.snackbar').remove();
-		}
+
+		$('div.snackbar').remove();
 		let snackbar = $('<div class="snackbar '+type+'"></div>');
 		$('html body').append(snackbar);
 		snackbar.html(message);

package/form_helper.js

@@ -1,7 +1,7 @@
 class FormHelper {
-	static init(form, onSubmitCallback, submitButton) {
+	static init(form, onSubmitCallback, submitButton=null) {
 		FormHelper.reset(form, submitButton);
-		submitButton = typeof submitButton != 'undefined' && null != submitButton ? submitButton : form.find('button[name="validate"]');
+		submitButton = null != submitButton ? submitButton : form.find('button[name="validate"]');
 		submitButton.off('click').click(function(e) {
 			e.preventDefault();
 			FormHelper.buttonLoader($(this), 'loading');
@@ -13,8 +13,8 @@ class FormHelper {
 		return form;
 	}
 
-	static reset(form, submitButton) {
-		submitButton = typeof submitButton != 'undefined' && null != submitButton ? submitButton : form.find('button[name="validate"]');
+	static reset(form, submitButton=null) {
+		submitButton = null != submitButton ? submitButton : form.find('button[name="validate"]');
 		form.find('input[name]:not([type="checkbox"], [type="radio"]), select:not(.selectpicker), textarea').each((idx, el) => $(el).val('')).off('change');
 		form.find('select.selectpicker').each((idx, el) => $(el).val(''));
 		FormHelper.buttonLoader(submitButton, 'reset');
@@ -31,7 +31,7 @@ class FormHelper {
 			}
 
 			if (typeof value == 'object') {
-				var select = form.find('[name="'+key+'[]"]');
+				let select = form.find('[name="'+key+'[]"]');
 				select.find('option').prop('selected', false);
 				select.data('default_id', value.join(','));
 				$.each(value, function(key, val) {
@@ -40,7 +40,7 @@ class FormHelper {
 				return;
 			}
 
-			var input = form.find('[name="'+key+'"]');
+			let input = form.find('[name="'+key+'"]');
 
 			if (input.prop('type') === 'radio' || input.prop('type') === 'checkbox') {
 				input.prop('checked', false);
@@ -60,7 +60,7 @@ class FormHelper {
 	}
 
 	static getDataFromFormData(formData) {
-		var data = {};
+		let data = {};
 		for(let pair of formData.entries()) {
 			//console.log(pair[0]+ ', '+ pair[1]);
 			data[pair[0]] = pair[1];
@@ -100,15 +100,14 @@ class FormHelper {
 		return textarea.val().replace(/(\r\n|\n|\r)/g, "\n").split("\n").filter(word => word.length > 0);
 	}
 
-	static setOnInputChange(input, callback, doneTypingInterval) {
+	static setOnInputChange(input, callback, doneTypingInterval=700) {
 		// setup before functions
 		let typingTimer;  // timer identifier
-		doneTypingInterval = typeof doneTypingInterval != 'undefined' && null !== doneTypingInterval ? doneTypingInterval : 700;  // time in ms
 
 		// on keyup, start the countdown
 		input.on('keyup', function () {
 			clearTimeout(typingTimer);
-			typingTimer = setTimeout(callback, doneTypingInterval);
+			typingTimer = setTimeout(callback, doneTypingInterval); // time in ms
 		});
 
 		// on keydown, clear the countdown
@@ -338,10 +337,10 @@ class FormHelper {
 			button.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') != '') {
+			if (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') != '') {
+			if (button.data('loading-text') != null && button.data('loading-text') !== '') {
 				text = button.data('loading-text');
 			}
 			button.html(text);

package/network.js

@@ -28,14 +28,11 @@ class Cookie {
 }
 
 class UrlAndQueryString {
-	static displayUrl(url, withLink) {
-		withLink = typeof withLink == 'undefined' ? true : withLink;
+	static displayUrl(url, withLink=true) {
 		return (withLink ? '<a href="' + url + '">' : '') + UrlAndQueryString.getHost(url, false) + (withLink ? '</a>' : '');
 	}
 
-	static displayUrlAndPath(url, withLink, displayPathIfEmpty) {
-		withLink = typeof withLink == 'undefined' ? true : withLink;
-		displayPathIfEmpty = typeof displayPathIfEmpty == 'undefined' ? false : displayPathIfEmpty;
+	static displayUrlAndPath(url, withLink=true, displayPathIfEmpty=false) {
 		let formattedUrl = UrlAndQueryString.getHostAndPath(url, false);
 		if (!displayPathIfEmpty && UrlAndQueryString.getPath(url) === '/') {
 			formattedUrl = formattedUrl.slice(-1) === '/' ? formattedUrl.slice(0, -1) : formattedUrl;
@@ -43,8 +40,7 @@ class UrlAndQueryString {
 		return (withLink ? '<a href="' + url + '">' : '') + formattedUrl + (withLink ? '</a>' : '');
 	}
 
-	static getHost(url, withProtocol) {
-		withProtocol = typeof withProtocol == 'undefined' ? true : withProtocol;
+	static getHost(url, withProtocol=true) {
 		if (typeof url == 'undefined') {
 			return withProtocol ? window.location.origin : window.location.host;
 		}
@@ -68,7 +64,7 @@ class UrlAndQueryString {
 		return url.search;
 	}
 
-	static getHostAndPath(url, withProtocol) {
+	static getHostAndPath(url, withProtocol=true) {
 		return UrlAndQueryString.getHost(url, withProtocol) + UrlAndQueryString.getPath(url);
 
 		//let strpos = url.indexOf('?');

package/number.js

@@ -27,30 +27,30 @@ class NumberFormatter {
 	}
 }
 
-Number.prototype.format = Number.prototype.format || function(nbDecimal, locale) {
+Number.prototype.format = Number.prototype.format || function(nbDecimal=2, locale='fr-FR') {
 	return Number.format(this, nbDecimal, locale);
 }
 
 if (!Number.format) {
-	Number.format = function(number, nbDecimal, locale) {
-		return NumberFormatter.getDecimalFormatter(locale, (typeof nbDecimal != 'undefined' ? nbDecimal : 2)).format(number);
+	Number.format = function(number, nbDecimal=2, locale='fr-FR') {
+		return NumberFormatter.getDecimalFormatter(locale, nbDecimal).format(number);
 	};
 }
 
-Number.prototype.formatCurrency = Number.prototype.formatCurrency || function(currency, nbDecimal, locale) {
+Number.prototype.formatCurrency = Number.prototype.formatCurrency || function(currency, nbDecimal=2, locale='fr-FR') {
 	return Number.formatCurrency(this, currency, nbDecimal, locale);
 }
 
-Number.formatCurrency = Number.formatCurrency || function(number, currency, nbDecimal, locale) {
-	return NumberFormatter.getCurrencyFormatter(locale, currency, (typeof nbDecimal != 'undefined' ? nbDecimal : 2)).format(number);
+Number.formatCurrency = Number.formatCurrency || function(number, currency, nbDecimal=2, locale='fr-FR') {
+	return NumberFormatter.getCurrencyFormatter(locale, currency, nbDecimal).format(number);
 }
 
-Number.prototype.formatPercent = Number.prototype.formatPercent || function(nbDecimal, locale) {
+Number.prototype.formatPercent = Number.prototype.formatPercent || function(nbDecimal=2, locale='fr-FR') {
 	return Number.formatPercent(this, nbDecimal, locale);
 }
 
-Number.formatPercent = Number.formatPercent || function(number, nbDecimal, locale) {
-	return NumberFormatter.getPercentFormatter(locale, (typeof nbDecimal != 'undefined'?nbDecimal:2)).format(number);
+Number.formatPercent = Number.formatPercent || function(number, nbDecimal=2, locale='fr-FR') {
+	return NumberFormatter.getPercentFormatter(locale, nbDecimal).format(number);
 }
 
 /**

package/package.json

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

package/paging.js

@@ -144,9 +144,7 @@ class Navigation {
 		tab.show();
 	}
 
-	static addTabInHistory(tabId, queryStringKey, replace) {
-		queryStringKey = typeof queryStringKey != 'undefined' && null !== queryStringKey ? queryStringKey : 'tab';
-		replace = typeof replace != 'undefined' && null !== replace ? replace : true;
+	static addTabInHistory(tabId, queryStringKey='tab', replace=true) {
 		let url = window.location.href;
 		url = UrlAndQueryString.setParamOfUrl(queryStringKey, tabId, url);
 		if (replace) {

package/string.js

@@ -54,12 +54,11 @@ String.prototype.truncateOnWord = String.prototype.truncateOnWord || function(li
 	}).join('');
 }
 
-String.prototype.truncateString = String.prototype.truncateString || function(length, from, ellipsis, split) {
+String.prototype.truncateString = String.prototype.truncateString || function(length, from, ellipsis='…', split=false) {
 	let str1, str2, len1, len2;
 	if (this.length <= length) {
 		return this.toString();
 	}
-	ellipsis = typeof ellipsis === 'undefined' ? '…' : ellipsis;
 	switch(from) {
 		case 'left':
 			str2 = split ? this.truncateOnWord(length, true) : this.slice(this.length - length);