Update v1.4.0

Rdx11 · Jul 22, 2018 · 1b702f7 · 1b702f7
1 parent 37723f7
commit 1b702f7
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 26 deletions.
diff --git a/dist/css/iziToast.css b/dist/css/iziToast.css
@@ -1,5 +1,5 @@
 /*
-* iziToast | v1.3.1
+* iziToast | v1.4.0
 * http://izitoast.marcelodolce.com
 * by Marcelo Dolce.
 */

diff --git a/dist/css/iziToast.min.css b/dist/css/iziToast.min.css
diff --git a/dist/js/iziToast.js b/dist/js/iziToast.js
@@ -1,5 +1,5 @@
 /*
-* iziToast | v1.3.1
+* iziToast | v1.4.0
 * http://izitoast.marcelodolce.com
 * by Marcelo Dolce.
 */
@@ -198,6 +198,16 @@
 	};
 
 
+	/**
+	 * Generate new ID
+	 * @private
+	 */
+	var generateId = function(params) {
+		var newId = btoa(encodeURIComponent(params));
+		return newId.replace(/=/g, "");
+	};
+
+
 	/**
 	 * Check if is a color
 	 * @private
@@ -656,20 +666,27 @@
 			settings.time = {};
 
 		if(settings.id === null){
-			var newId = btoa(encodeURIComponent(settings.title+settings.message+settings.color));
-			settings.id = newId;
+			settings.id = generateId(settings.title+settings.message+settings.color);
 		}
 
 		if(settings.displayMode === 1 || settings.displayMode == 'once'){
-			if(document.querySelectorAll('.'+PLUGIN_NAME+'#'+settings.id).length > 0){
-				return false;
+			try {
+				if(document.querySelectorAll('.'+PLUGIN_NAME+'#'+settings.id).length > 0){
+					return false;
+				}
+			} catch (exc) {
+				console.warn('['+PLUGIN_NAME+'] Could not find an element with this selector: '+'#'+settings.id+'. Try to set an valid id.');
 			}
 		}
 
 		if(settings.displayMode === 2 || settings.displayMode == 'replace'){
-			forEach(document.querySelectorAll('.'+PLUGIN_NAME+'#'+settings.id), function(element, index) {
-				that.hide(settings, element, 'replaced');
-			});
+			try {
+				forEach(document.querySelectorAll('.'+PLUGIN_NAME+'#'+settings.id), function(element, index) {
+					that.hide(settings, element, 'replaced');
+				});
+			} catch (exc) {
+				console.warn('['+PLUGIN_NAME+'] Could not find an element with this selector: '+'#'+settings.id+'. Try to set an valid id.');
+			}
 		}
 
 		settings.ref = new Date().getTime() + Math.floor((Math.random() * 10000000) + 1);

diff --git a/dist/js/iziToast.min.js b/dist/js/iziToast.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "izitoast",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "Elegant, responsive, flexible and lightweight notification plugin with no dependencies.",
   "readmeFilename": "README.md",
   "main": "dist/js/iziToast.js",

diff --git a/src/css/animations.styl b/src/css/animations.styl
@@ -1,5 +1,5 @@
 /*
-* iziToast | v1.3.1
+* iziToast | v1.4.0
 * http://izitoast.marcelodolce.com
 * by Marcelo Dolce.
 */

diff --git a/src/css/layouts.styl b/src/css/layouts.styl
@@ -1,5 +1,5 @@
 /*
-* iziToast | v1.3.1
+* iziToast | v1.4.0
 * http://izitoast.marcelodolce.com
 * by Marcelo Dolce.
 */

diff --git a/src/css/style.styl b/src/css/style.styl
@@ -1,5 +1,5 @@
 /*
-* iziToast | v1.3.1
+* iziToast | v1.4.0
 * http://izitoast.marcelodolce.com
 * by Marcelo Dolce.
 */

diff --git a/src/css/themes.styl b/src/css/themes.styl
@@ -1,5 +1,5 @@
 /*
-* iziToast | v1.3.1
+* iziToast | v1.4.0
 * http://izitoast.marcelodolce.com
 * by Marcelo Dolce.
 */

diff --git a/src/css/toast.styl b/src/css/toast.styl
@@ -1,5 +1,5 @@
 /*
-* iziToast | v1.3.1
+* iziToast | v1.4.0
 * http://izitoast.marcelodolce.com
 * by Marcelo Dolce.
 */

diff --git a/src/js/iziToast.js b/src/js/iziToast.js
@@ -1,5 +1,5 @@
 /*
-* iziToast | v1.3.1
+* iziToast | v1.4.0
 * http://izitoast.marcelodolce.com
 * by Marcelo Dolce.
 */
@@ -198,6 +198,16 @@
 	};
 
 
+	/**
+	 * Generate new ID
+	 * @private
+	 */
+	var generateId = function(params) {
+		var newId = btoa(encodeURIComponent(params));
+		return newId.replace(/=/g, "");
+	};
+
+
 	/**
 	 * Check if is a color
 	 * @private
@@ -656,20 +666,27 @@
 			settings.time = {};
 
 		if(settings.id === null){
-			var newId = btoa(encodeURIComponent(settings.title+settings.message+settings.color));
-			settings.id = newId;
+			settings.id = generateId(settings.title+settings.message+settings.color);
 		}
 
 		if(settings.displayMode === 1 || settings.displayMode == 'once'){
-			if(document.querySelectorAll('.'+PLUGIN_NAME+'#'+settings.id).length > 0){
-				return false;
+			try {
+				if(document.querySelectorAll('.'+PLUGIN_NAME+'#'+settings.id).length > 0){
+					return false;
+				}
+			} catch (exc) {
+				console.warn('['+PLUGIN_NAME+'] Could not find an element with this selector: '+'#'+settings.id+'. Try to set an valid id.');
 			}
 		}
 
 		if(settings.displayMode === 2 || settings.displayMode == 'replace'){
-			forEach(document.querySelectorAll('.'+PLUGIN_NAME+'#'+settings.id), function(element, index) {
-				that.hide(settings, element, 'replaced');
-			});
+			try {
+				forEach(document.querySelectorAll('.'+PLUGIN_NAME+'#'+settings.id), function(element, index) {
+					that.hide(settings, element, 'replaced');
+				});
+			} catch (exc) {
+				console.warn('['+PLUGIN_NAME+'] Could not find an element with this selector: '+'#'+settings.id+'. Try to set an valid id.');
+			}
 		}
 
 		settings.ref = new Date().getTime() + Math.floor((Math.random() * 10000000) + 1);