@osimatic/helpers-js 1.0.19 → 1.0.22

package/.idea/helpers-js.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/helpers-js.iml" filepath="$PROJECT_DIR$/.idea/helpers-js.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

package/form_helper.js

@@ -72,7 +72,7 @@ class FormHelper {
 
 			var input = form.find('[name="'+key+'"]');
 
-			if (input.prop('type') == 'radio' || input.prop('type') == 'checkbox') {
+			if (input.prop('type') === 'radio' || input.prop('type') === 'checkbox') {
 				input.prop('checked', false);
 				input.filter('[value="'+value+'"]').prop('checked', true);
 				return;
@@ -187,8 +187,8 @@ class FormHelper {
 	}
 
 	static getFormErrorText(errors) {
-		var errorLabels = '';
-		for (var property in errors) {
+		let errorLabels = '';
+		for (let property in errors) {
 			if (typeof errors[property] != 'function') {
 				errorLabels += '<span>' + errors[property] + '</span><br>';
 			}
@@ -197,8 +197,8 @@ class FormHelper {
 	}
 
 	static getFormErrorTextBis(errors) {
-		var errorLabels = '';
-		for (var property in errors) {
+		let errorLabels = '';
+		for (let property in errors) {
 			// console.log(property);
 			if (typeof errors[property] != 'function') {
 				if (typeof errors[property]['error_description'] === 'undefined') {
@@ -211,8 +211,8 @@ class FormHelper {
 		return errorLabels;
 	}
 
-	static displayFormErrors(form, btnSubmit, errors) {
-		this.displayFormErrorsFromText(form, this.getFormErrorTextBis(errors));
+	static displayFormErrors(form, btnSubmit, errors, errorWrapperDiv) {
+		this.displayFormErrorsFromText(form, this.getFormErrorTextBis(errors), errorWrapperDiv);
 		if (btnSubmit != null) {
 			if (btnSubmit.buttonLoader != null) {
 				btnSubmit.buttonLoader('reset');
@@ -226,20 +226,25 @@ class FormHelper {
 		this.displayFormErrors(form, btnSubmit, xhr.responseJSON);
 	}
 
-	static displayFormErrorsFromText(form, errorLabels) {
-		var errorDiv = '<div class="alert alert-danger form_errors">'+errorLabels+'</div>';
-		var errorsParentDiv = form;
+	static displayFormErrorsFromText(form, errorLabels, errorWrapperDiv) {
+		let errorDiv = '<div class="alert alert-danger form_errors">'+errorLabels+'</div>';
+
+		if (typeof errorWrapperDiv != 'undefined' && errorWrapperDiv != null) {
+			errorWrapperDiv.append(errorDiv);
+			return;
+		}
 
 		if (form.find('.form_errors_content').length) {
 			form.find('.form_errors_content').append(errorDiv);
 			return;
 		}
 
+		let errorsParentDiv = form;
 		if (form.find('.modal-body').length) {
 			errorsParentDiv = form.find('.modal-body');
 		}
 
-		var firstFormGroup = errorsParentDiv.find('.form-group:first');
+		let firstFormGroup = errorsParentDiv.find('.form-group:first');
 		if (firstFormGroup.length) {
 			if (firstFormGroup.parent().parent().hasClass('row')) {
 				firstFormGroup.parent().parent().before(errorDiv);

package/media.js

@@ -84,18 +84,17 @@ class UserMedia {
 	static requestMediaPermissions(constraints) {
 		return new Promise((resolve, reject) => {	
 			const bowser = require('bowser');
-			const browser = bowser.getParser(window.navigator.userAgent).getBrowserName();
+			const browser = bowser.getParser(window.navigator.userAgent);
+            const browserName = browser.getBrowserName();
 
 			navigator.mediaDevices.getUserMedia(constraints !== 'undefined' ? constraints : { audio: true, video: true })
-			.then((stream) => {
-				stream.getTracks().forEach((track) => track.stop());
-				resolve(stream);
-			}).catch((error) => {
+			.then((stream) => resolve(stream))
+			.catch((error) => {
 				const errName = error.name;
 				const errMessage = error.message;
 				let errorType = "Generic";
 
-				if (browser === 'Chrome') {
+				if (browserName === 'Chrome') {
 					if (errName === 'NotAllowedError') {
 						if (errMessage === 'Permission denied by system') {
 							errorType = "SystemPermissionDenied";
@@ -105,17 +104,17 @@ class UserMedia {
 					} else if (errName === 'NotReadableError') {
 						errorType = "CouldNotStartVideoSource";
 					}
-				} else if (browser === 'Safari') {
+				} else if (browserName === 'Safari') {
 					if (errName === 'NotAllowedError') {
 						errorType = "UserPermissionDenied";
 					}
-				} else if (browser === 'Microsoft Edge') {
+				} else if (browserName === 'Microsoft Edge') {
 					if (errName === 'NotAllowedError') {
 						errorType = "UserPermissionDenied";
 					} else if (errName === 'NotReadableError') {
 						errorType = "CouldNotStartVideoSource";
 					}
-				} else if (browser === 'Firefox') {
+				} else if (browserName === 'Firefox') {
 					// https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getUserMedia#exceptions
 					if (errName === 'NotFoundError') {
 						errorType = "SystemPermissionDenied";
@@ -128,7 +127,7 @@ class UserMedia {
 					}
 				}
 
-				reject({ browser, type: errorType, name: error.name, message: error.message });
+				reject({ type: errorType, name: error.name, message: error.message });
 			});
 		});
 	}

package/package.json

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