From fec2440f05c3898efac0a98542cddd9e1107f7d8 Mon Sep 17 00:00:00 2001 From: skrupnyk Date: Mon, 14 Mar 2022 18:10:21 +0200 Subject: [PATCH 1/9] added show password function --- css/form.css | 7 +++++++ js/build.templates.js | 2 +- js/components/password.js | 15 +++++++++++++++ js/interface.templates.js | 2 +- templates/components/password.build.hbs | 2 ++ templates/configurations/password.interface.hbs | 12 ++++++++++++ 6 files changed, 38 insertions(+), 2 deletions(-) diff --git a/css/form.css b/css/form.css index 31fe6149..a3dae13a 100644 --- a/css/form.css +++ b/css/form.css @@ -7,6 +7,13 @@ opacity: 0.65; } +.fa-eye { + position: absolute; + top: 15px; + right: 30px; + display: inline-block; +} + .fl-form.form-offline .cover-form { position: absolute; top: 0; diff --git a/js/build.templates.js b/js/build.templates.js index 96d9903e..cfa4f25c 100644 --- a/js/build.templates.js +++ b/js/build.templates.js @@ -59,7 +59,7 @@ this["Fliplet"]["Widget"]["Templates"]["templates.components.paragraph"] = Handl },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.components.password"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "
{{ description }}
\r\n\r\n

Field is required.

\r\n\r\n
\r\n
Password requirements
\r\n
\r\n
\r\n = passwordMinLength\" readonly=\"readonly\" tabindex=\"-1\" />\r\n \r\n Password must be at least 8 characters.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 uppercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 lowercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 number.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 symbol.\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n
Password confirmation
\r\n
\r\n
\r\n \r\n \r\n Password confirmation must match.\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"; + return "
{{ description }}
\r\n\r\n\r\n

Field is required.

\r\n\r\n
\r\n
Password requirements
\r\n
\r\n
\r\n = passwordMinLength\" readonly=\"readonly\" tabindex=\"-1\" />\r\n \r\n Password must be at least 8 characters.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 uppercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 lowercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 number.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 symbol.\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n
\r\n
Password confirmation
\r\n
\r\n
\r\n \r\n \r\n Password confirmation must match.\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"; },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.components.radio"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { diff --git a/js/components/password.js b/js/components/password.js index 4a9baa58..be16826b 100644 --- a/js/components/password.js +++ b/js/components/password.js @@ -21,6 +21,10 @@ Fliplet.FormBuilder.field('password', { type: Boolean, default: false }, + canShowPassword: { + type: Boolean, + default: false + }, passwordConfirmation: { type: String, default: '' @@ -110,6 +114,17 @@ Fliplet.FormBuilder.field('password', { } }, methods: { + showingPassword: function() { + var $passwordInputs = $("input[autocomplete='new-password']"); + + $.each($passwordInputs, function(i, val) { + if ($(val).prop('type') === 'password') { + $(val).attr('type', 'text'); + } else { + $(val).attr('type', 'password'); + } + }); + }, generateRandomPassword: function(length) { var alphabet = 'abcdefghijklmnopqrstuvwxyz!#$%&*-ABCDEFGHIJKLMNOP1234567890'; var password = ''; diff --git a/js/interface.templates.js b/js/interface.templates.js index 8a1d9ad6..d3120450 100644 --- a/js/interface.templates.js +++ b/js/interface.templates.js @@ -60,7 +60,7 @@ this["Fliplet"]["Widget"]["Templates"]["templates.configurations.paragraph"] = H },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.configurations.password"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n \r\n

Must be at least 8 characters

\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n"; + return "
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n \r\n

Must be at least 8 characters

\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n

An icon will be shown in the password field, allowing users to toggle between masked characters and plain text.

\r\n
\r\n \r\n \r\n
\r\n
\r\n"; },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.configurations.select"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { diff --git a/templates/components/password.build.hbs b/templates/components/password.build.hbs index 3251f402..5b41c4e1 100644 --- a/templates/components/password.build.hbs +++ b/templates/components/password.build.hbs @@ -14,6 +14,7 @@ :placeholder="fieldPlaceholder" tabindex="0" /> +

Field is required.

@@ -77,6 +78,7 @@ v-on:input="onPasswordConfirmationInput($event)" tabindex="0" /> +
diff --git a/templates/configurations/password.interface.hbs b/templates/configurations/password.interface.hbs index 016e9422..6b42f918 100644 --- a/templates/configurations/password.interface.hbs +++ b/templates/configurations/password.interface.hbs @@ -60,3 +60,15 @@
+ +
+ +

An icon will be shown in the password field, allowing users to toggle between masked characters and plain text.

+
+ + +
+
From c2b28dba1bb3cd6bcc53f4bb2cb1f1d190f9cc3b Mon Sep 17 00:00:00 2001 From: skrupnyk Date: Mon, 14 Mar 2022 21:32:31 +0200 Subject: [PATCH 2/9] refactor --- js/build.templates.js | 2 +- js/components/password.js | 8 ++------ templates/components/password.build.hbs | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/js/build.templates.js b/js/build.templates.js index cfa4f25c..a5d6a31c 100644 --- a/js/build.templates.js +++ b/js/build.templates.js @@ -59,7 +59,7 @@ this["Fliplet"]["Widget"]["Templates"]["templates.components.paragraph"] = Handl },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.components.password"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "
{{ description }}
\r\n\r\n\r\n

Field is required.

\r\n\r\n
\r\n
Password requirements
\r\n
\r\n
\r\n = passwordMinLength\" readonly=\"readonly\" tabindex=\"-1\" />\r\n \r\n Password must be at least 8 characters.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 uppercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 lowercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 number.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 symbol.\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n
\r\n
Password confirmation
\r\n
\r\n
\r\n \r\n \r\n Password confirmation must match.\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"; + return "
{{ description }}
\r\n\r\n\r\n

Field is required.

\r\n\r\n
\r\n
Password requirements
\r\n
\r\n
\r\n = passwordMinLength\" readonly=\"readonly\" tabindex=\"-1\" />\r\n \r\n Password must be at least 8 characters.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 uppercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 lowercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 number.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 symbol.\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n
\r\n
Password confirmation
\r\n
\r\n
\r\n \r\n \r\n Password confirmation must match.\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"; },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.components.radio"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { diff --git a/js/components/password.js b/js/components/password.js index be16826b..db45edae 100644 --- a/js/components/password.js +++ b/js/components/password.js @@ -114,15 +114,11 @@ Fliplet.FormBuilder.field('password', { } }, methods: { - showingPassword: function() { + showPassword: function() { var $passwordInputs = $("input[autocomplete='new-password']"); $.each($passwordInputs, function(i, val) { - if ($(val).prop('type') === 'password') { - $(val).attr('type', 'text'); - } else { - $(val).attr('type', 'password'); - } + $(val).prop('type') === 'password' ? $(val).attr('type', 'text') : $(val).attr('type', 'password'); }); }, generateRandomPassword: function(length) { diff --git a/templates/components/password.build.hbs b/templates/components/password.build.hbs index 5b41c4e1..4d6b5167 100644 --- a/templates/components/password.build.hbs +++ b/templates/components/password.build.hbs @@ -14,7 +14,7 @@ :placeholder="fieldPlaceholder" tabindex="0" /> - +

Field is required.

@@ -78,7 +78,7 @@ v-on:input="onPasswordConfirmationInput($event)" tabindex="0" /> - +
From 24f78ab05bb6ac1eeb8549bd0405bd67f9a5bb4c Mon Sep 17 00:00:00 2001 From: skrupnyk Date: Mon, 14 Mar 2022 21:57:34 +0200 Subject: [PATCH 3/9] refactor --- js/components/password.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/components/password.js b/js/components/password.js index db45edae..5445fd25 100644 --- a/js/components/password.js +++ b/js/components/password.js @@ -117,8 +117,8 @@ Fliplet.FormBuilder.field('password', { showPassword: function() { var $passwordInputs = $("input[autocomplete='new-password']"); - $.each($passwordInputs, function(i, val) { - $(val).prop('type') === 'password' ? $(val).attr('type', 'text') : $(val).attr('type', 'password'); + $.each($passwordInputs, function(i, el) { + $(el).prop('type') === 'password' ? $(el).attr('type', 'text') : $(el).attr('type', 'password'); }); }, generateRandomPassword: function(length) { From 2baef47b105958d429825ba1bb559ff9619bbfe0 Mon Sep 17 00:00:00 2001 From: skrupnyk Date: Tue, 15 Mar 2022 12:00:36 +0200 Subject: [PATCH 4/9] added slash eye icon, refactor --- css/form.css | 2 +- js/build.templates.js | 2 +- js/components/password.js | 5 +++-- templates/components/password.build.hbs | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/css/form.css b/css/form.css index a3dae13a..9f862d68 100644 --- a/css/form.css +++ b/css/form.css @@ -7,7 +7,7 @@ opacity: 0.65; } -.fa-eye { +.fa-eye, .fa-eye-slash { position: absolute; top: 15px; right: 30px; diff --git a/js/build.templates.js b/js/build.templates.js index a5d6a31c..82bff1bf 100644 --- a/js/build.templates.js +++ b/js/build.templates.js @@ -59,7 +59,7 @@ this["Fliplet"]["Widget"]["Templates"]["templates.components.paragraph"] = Handl },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.components.password"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "
{{ description }}
\r\n\r\n\r\n

Field is required.

\r\n\r\n
\r\n
Password requirements
\r\n
\r\n
\r\n = passwordMinLength\" readonly=\"readonly\" tabindex=\"-1\" />\r\n \r\n Password must be at least 8 characters.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 uppercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 lowercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 number.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 symbol.\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n
\r\n
Password confirmation
\r\n
\r\n
\r\n \r\n \r\n Password confirmation must match.\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"; + return "
{{ description }}
\r\n\r\n\r\n

Field is required.

\r\n\r\n
\r\n
Password requirements
\r\n
\r\n
\r\n = passwordMinLength\" readonly=\"readonly\" tabindex=\"-1\" />\r\n \r\n Password must be at least 8 characters.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 uppercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 lowercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 number.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 symbol.\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n
\r\n
Password confirmation
\r\n
\r\n
\r\n \r\n \r\n Password confirmation must match.\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"; },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.components.radio"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { diff --git a/js/components/password.js b/js/components/password.js index 5445fd25..e5b8310c 100644 --- a/js/components/password.js +++ b/js/components/password.js @@ -115,10 +115,11 @@ Fliplet.FormBuilder.field('password', { }, methods: { showPassword: function() { - var $passwordInputs = $("input[autocomplete='new-password']"); + var $passwordInputs = $('.input-password'); $.each($passwordInputs, function(i, el) { - $(el).prop('type') === 'password' ? $(el).attr('type', 'text') : $(el).attr('type', 'password'); + $(el).attr('type', $(el).prop('type') === 'password' ? 'text' : 'password'); + $('.fa-eye').toggleClass('fa-eye-slash', $(el).prop('type') === 'text'); }); }, generateRandomPassword: function(length) { diff --git a/templates/components/password.build.hbs b/templates/components/password.build.hbs index 4d6b5167..0598bc5b 100644 --- a/templates/components/password.build.hbs +++ b/templates/components/password.build.hbs @@ -1,7 +1,7 @@
\{{ description }}
Date: Tue, 15 Mar 2022 12:25:00 +0200 Subject: [PATCH 5/9] refactor --- js/components/password.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/components/password.js b/js/components/password.js index e5b8310c..249582df 100644 --- a/js/components/password.js +++ b/js/components/password.js @@ -118,8 +118,10 @@ Fliplet.FormBuilder.field('password', { var $passwordInputs = $('.input-password'); $.each($passwordInputs, function(i, el) { - $(el).attr('type', $(el).prop('type') === 'password' ? 'text' : 'password'); - $('.fa-eye').toggleClass('fa-eye-slash', $(el).prop('type') === 'text'); + var $passwordInput = $(el); + + $passwordInput.attr('type', $passwordInput.prop('type') === 'password' ? 'text' : 'password'); + $('.fa-eye').toggleClass('fa-eye-slash', $passwordInput.prop('type') === 'text'); }); }, generateRandomPassword: function(length) { From cbf230f20331bd890d9a789d0f086d34896244df Mon Sep 17 00:00:00 2001 From: skrupnyk Date: Tue, 24 May 2022 17:45:54 +0300 Subject: [PATCH 6/9] updated --- js/build.templates.js | 2 +- js/components/password.js | 10 +++------- js/interface.templates.js | 2 +- templates/components/password.build.hbs | 1 - templates/configurations/password.interface.hbs | 8 ++++---- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/js/build.templates.js b/js/build.templates.js index 82bff1bf..3dbadb88 100644 --- a/js/build.templates.js +++ b/js/build.templates.js @@ -59,7 +59,7 @@ this["Fliplet"]["Widget"]["Templates"]["templates.components.paragraph"] = Handl },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.components.password"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "
{{ description }}
\r\n\r\n\r\n

Field is required.

\r\n\r\n
\r\n
Password requirements
\r\n
\r\n
\r\n = passwordMinLength\" readonly=\"readonly\" tabindex=\"-1\" />\r\n \r\n Password must be at least 8 characters.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 uppercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 lowercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 number.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 symbol.\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n
\r\n
Password confirmation
\r\n
\r\n
\r\n \r\n \r\n Password confirmation must match.\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"; + return "
{{ description }}
\r\n\r\n\r\n

Field is required.

\r\n\r\n
\r\n
Password requirements
\r\n
\r\n
\r\n = passwordMinLength\" readonly=\"readonly\" tabindex=\"-1\" />\r\n \r\n Password must be at least 8 characters.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 uppercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 lowercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 number.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 symbol.\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n
Password confirmation
\r\n
\r\n
\r\n \r\n \r\n Password confirmation must match.\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"; },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.components.radio"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { diff --git a/js/components/password.js b/js/components/password.js index 249582df..5117d581 100644 --- a/js/components/password.js +++ b/js/components/password.js @@ -115,14 +115,10 @@ Fliplet.FormBuilder.field('password', { }, methods: { showPassword: function() { - var $passwordInputs = $('.input-password'); + var $passwordInput = $('.input-password'); - $.each($passwordInputs, function(i, el) { - var $passwordInput = $(el); - - $passwordInput.attr('type', $passwordInput.prop('type') === 'password' ? 'text' : 'password'); - $('.fa-eye').toggleClass('fa-eye-slash', $passwordInput.prop('type') === 'text'); - }); + $passwordInput.attr('type', $passwordInput.prop('type') === 'password' ? 'text' : 'password'); + $('.fa-eye').toggleClass('fa-eye-slash', $passwordInput.prop('type') === 'text'); }, generateRandomPassword: function(length) { var alphabet = 'abcdefghijklmnopqrstuvwxyz!#$%&*-ABCDEFGHIJKLMNOP1234567890'; diff --git a/js/interface.templates.js b/js/interface.templates.js index d3120450..922442f6 100644 --- a/js/interface.templates.js +++ b/js/interface.templates.js @@ -60,7 +60,7 @@ this["Fliplet"]["Widget"]["Templates"]["templates.configurations.paragraph"] = H },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.configurations.password"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n \r\n

Must be at least 8 characters

\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n

An icon will be shown in the password field, allowing users to toggle between masked characters and plain text.

\r\n
\r\n \r\n \r\n
\r\n
\r\n"; + return "
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n \r\n

Must be at least 8 characters

\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n

An icon will be shown in the password field, allowing users to toggle between masked characters and plain text.

\r\n
\r\n \r\n \r\n
\r\n
\r\n"; },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.configurations.select"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { diff --git a/templates/components/password.build.hbs b/templates/components/password.build.hbs index 0598bc5b..05ddcd66 100644 --- a/templates/components/password.build.hbs +++ b/templates/components/password.build.hbs @@ -78,7 +78,6 @@ v-on:input="onPasswordConfirmationInput($event)" tabindex="0" /> -
diff --git a/templates/configurations/password.interface.hbs b/templates/configurations/password.interface.hbs index 6b42f918..3b7dc412 100644 --- a/templates/configurations/password.interface.hbs +++ b/templates/configurations/password.interface.hbs @@ -48,9 +48,9 @@
- +
@@ -65,10 +65,10 @@

An icon will be shown in the password field, allowing users to toggle between masked characters and plain text.

- +
From 094bc645cc4eac135f9db2d08171a65d1f871907 Mon Sep 17 00:00:00 2001 From: SerhiyKr Date: Thu, 26 May 2022 19:39:00 +0300 Subject: [PATCH 7/9] fix $ refactor --- js/build.templates.js | 2 +- js/components/password.js | 11 +++++------ templates/components/password.build.hbs | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/js/build.templates.js b/js/build.templates.js index 3dbadb88..12969d5b 100644 --- a/js/build.templates.js +++ b/js/build.templates.js @@ -59,7 +59,7 @@ this["Fliplet"]["Widget"]["Templates"]["templates.components.paragraph"] = Handl },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.components.password"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "
{{ description }}
\r\n\r\n\r\n

Field is required.

\r\n\r\n
\r\n
Password requirements
\r\n
\r\n
\r\n = passwordMinLength\" readonly=\"readonly\" tabindex=\"-1\" />\r\n \r\n Password must be at least 8 characters.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 uppercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 lowercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 number.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 symbol.\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n
Password confirmation
\r\n
\r\n
\r\n \r\n \r\n Password confirmation must match.\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"; + return "
{{ description }}
\r\n\r\n\r\n

Field is required.

\r\n\r\n
\r\n
Password requirements
\r\n
\r\n
\r\n = passwordMinLength\" readonly=\"readonly\" tabindex=\"-1\" />\r\n \r\n Password must be at least 8 characters.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 uppercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 lowercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 number.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 symbol.\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n
Password confirmation
\r\n
\r\n
\r\n \r\n \r\n Password confirmation must match.\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"; },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.components.radio"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { diff --git a/js/components/password.js b/js/components/password.js index 5117d581..0b18f85f 100644 --- a/js/components/password.js +++ b/js/components/password.js @@ -60,6 +60,7 @@ Fliplet.FormBuilder.field('password', { data: function() { return { isFocused: false, + isShowPassword: false, passwordMinLength: 8, defaultClass: 'panel-default', invalidClass: 'panel-danger', @@ -114,12 +115,6 @@ Fliplet.FormBuilder.field('password', { } }, methods: { - showPassword: function() { - var $passwordInput = $('.input-password'); - - $passwordInput.attr('type', $passwordInput.prop('type') === 'password' ? 'text' : 'password'); - $('.fa-eye').toggleClass('fa-eye-slash', $passwordInput.prop('type') === 'text'); - }, generateRandomPassword: function(length) { var alphabet = 'abcdefghijklmnopqrstuvwxyz!#$%&*-ABCDEFGHIJKLMNOP1234567890'; var password = ''; @@ -151,6 +146,10 @@ Fliplet.FormBuilder.field('password', { this.value = oldVal; this.updateValue(); } + + if (!newVal) { + this.isShowPassword = false; + } }, '$v.passwordConfirmation.$invalid': function(value) { if (!value) { diff --git a/templates/components/password.build.hbs b/templates/components/password.build.hbs index 05ddcd66..0edbf14c 100644 --- a/templates/components/password.build.hbs +++ b/templates/components/password.build.hbs @@ -1,6 +1,6 @@
\{{ description }}
- +

Field is required.

From 938117cd492ea19d5f62d3b0eef8110e598dd515 Mon Sep 17 00:00:00 2001 From: SerhiyKr Date: Thu, 26 May 2022 20:02:32 +0300 Subject: [PATCH 8/9] refactor --- js/build.templates.js | 2 +- templates/components/password.build.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/build.templates.js b/js/build.templates.js index 12969d5b..95d55f5d 100644 --- a/js/build.templates.js +++ b/js/build.templates.js @@ -59,7 +59,7 @@ this["Fliplet"]["Widget"]["Templates"]["templates.components.paragraph"] = Handl },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.components.password"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "
{{ description }}
\r\n\r\n\r\n

Field is required.

\r\n\r\n
\r\n
Password requirements
\r\n
\r\n
\r\n = passwordMinLength\" readonly=\"readonly\" tabindex=\"-1\" />\r\n \r\n Password must be at least 8 characters.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 uppercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 lowercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 number.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 symbol.\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n
Password confirmation
\r\n
\r\n
\r\n \r\n \r\n Password confirmation must match.\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"; + return "
{{ description }}
\r\n\r\n\r\n

Field is required.

\r\n\r\n
\r\n
Password requirements
\r\n
\r\n
\r\n = passwordMinLength\" readonly=\"readonly\" tabindex=\"-1\" />\r\n \r\n Password must be at least 8 characters.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 uppercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 lowercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 number.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 symbol.\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n
Password confirmation
\r\n
\r\n
\r\n \r\n \r\n Password confirmation must match.\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"; },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.components.radio"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { diff --git a/templates/components/password.build.hbs b/templates/components/password.build.hbs index 0edbf14c..5b1d76a3 100644 --- a/templates/components/password.build.hbs +++ b/templates/components/password.build.hbs @@ -14,7 +14,7 @@ :placeholder="fieldPlaceholder" tabindex="0" /> - +

Field is required.

From 343895ec823ed25a3d86d4ebf359633372072d84 Mon Sep 17 00:00:00 2001 From: SerhiyKr Date: Tue, 7 Jun 2022 18:18:30 +0300 Subject: [PATCH 9/9] refactor --- css/form.css | 2 +- js/build.templates.js | 2 +- js/interface.templates.js | 2 +- templates/components/password.build.hbs | 4 ++-- templates/configurations/password.interface.hbs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/css/form.css b/css/form.css index 9f862d68..32be82c0 100644 --- a/css/form.css +++ b/css/form.css @@ -7,7 +7,7 @@ opacity: 0.65; } -.fa-eye, .fa-eye-slash { +.fl-form .fa-eye, .fl-form .fa-eye-slash { position: absolute; top: 15px; right: 30px; diff --git a/js/build.templates.js b/js/build.templates.js index 95d55f5d..afb9e97f 100644 --- a/js/build.templates.js +++ b/js/build.templates.js @@ -59,7 +59,7 @@ this["Fliplet"]["Widget"]["Templates"]["templates.components.paragraph"] = Handl },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.components.password"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "
{{ description }}
\r\n\r\n\r\n

Field is required.

\r\n\r\n
\r\n
Password requirements
\r\n
\r\n
\r\n = passwordMinLength\" readonly=\"readonly\" tabindex=\"-1\" />\r\n \r\n Password must be at least 8 characters.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 uppercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 lowercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 number.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 symbol.\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n
Password confirmation
\r\n
\r\n
\r\n \r\n \r\n Password confirmation must match.\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"; + return "
{{ description }}
\r\n\r\n\r\n

Field is required.

\r\n\r\n
\r\n
Password requirements
\r\n
\r\n
\r\n = passwordMinLength\" readonly=\"readonly\" tabindex=\"-1\" />\r\n \r\n Password must be at least 8 characters.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 uppercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 lowercase character.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 number.\r\n
\r\n
\r\n \r\n \r\n Password must contain at least 1 symbol.\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n
Password confirmation
\r\n
\r\n
\r\n \r\n \r\n Password confirmation must match.\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"; },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.components.radio"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { diff --git a/js/interface.templates.js b/js/interface.templates.js index 922442f6..85a73db1 100644 --- a/js/interface.templates.js +++ b/js/interface.templates.js @@ -60,7 +60,7 @@ this["Fliplet"]["Widget"]["Templates"]["templates.configurations.paragraph"] = H },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.configurations.password"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n \r\n

Must be at least 8 characters

\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n

An icon will be shown in the password field, allowing users to toggle between masked characters and plain text.

\r\n
\r\n \r\n \r\n
\r\n
\r\n"; + return "
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n \r\n

Must be at least 8 characters

\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n\r\n
\r\n \r\n

An icon will be shown in the password field, allowing users to toggle between masked characters and plain text.

\r\n
\r\n \r\n \r\n
\r\n
\r\n"; },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.configurations.select"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { diff --git a/templates/components/password.build.hbs b/templates/components/password.build.hbs index 5b1d76a3..04c53928 100644 --- a/templates/components/password.build.hbs +++ b/templates/components/password.build.hbs @@ -1,7 +1,7 @@
\{{ description }}
@@ -68,7 +68,7 @@