- Albert Einstein":"Failure"===l?n="\"Failure is simply the opportunity to begin again, this time more intelligently.\"
- Henry Ford":"Warning"===l?n="\"The peoples who want to live comfortably without producing and fatigue; they are doomed to lose their dignity, then liberty, and then independence and destiny.\"
- Mustafa Kemal Ataturk":"Info"==l&&(n="\"Knowledge rests not upon truth alone, but upon error also.\"
- Carl Gustav Jung")),"string"!=typeof i&&(i="Okay"),a.plainText&&(e=h(e),n=h(n),i=h(i)),a.plainText||(e.length>a.titleMaxLength&&(e="HTML Tags Error",n="Your Title content length is more than \"titleMaxLength\" option.",i="Okay"),n.length>a.messageMaxLength&&(e="HTML Tags Error",n="Your Message content length is more than \"messageMaxLength\" option.",i="Okay"),i.length>a.buttonMaxLength&&(e="HTML Tags Error",n="Your Button content length is more than \"buttonMaxLength\" option.",i="Okay")),e.length>a.titleMaxLength&&(e=e.substring(0,a.titleMaxLength)+"..."),n.length>a.messageMaxLength&&(n=n.substring(0,a.messageMaxLength)+"..."),i.length>a.buttonMaxLength&&(i=i.substring(0,a.buttonMaxLength)+"..."),a.cssAnimation||(a.cssAnimationDuration=0);var d=t.document.createElement("div");d.id=c.ID,d.className=a.className,d.style.width=a.width,d.style.zIndex=a.zindex,d.style.borderRadius=a.borderRadius,d.style.fontFamily="\""+a.fontFamily+"\", "+r,a.rtl&&(d.setAttribute("dir","rtl"),d.classList.add("rtl-on"));var g="";a.backOverlay&&(g="");var u="";if("Success"===l?u=w(a.svgSize,x.svgColor):"Failure"===l?u=v(a.svgSize,x.svgColor):"Warning"===l?u=N(a.svgSize,x.svgColor):"Info"==l&&(u=C(a.svgSize,x.svgColor)),d.innerHTML=g+"
"+e+"
"+i+""+e+"
"+a+"
- Albert Einstein":"Failure"===l?n="\"Failure is simply the opportunity to begin again, this time more intelligently.\"
- Henry Ford":"Warning"===l?n="\"The peoples who want to live comfortably without producing and fatigue; they are doomed to lose their dignity, then liberty, and then independence and destiny.\"
- Mustafa Kemal Ataturk":"Info"==l&&(n="\"Knowledge rests not upon truth alone, but upon error also.\"
- Carl Gustav Jung")),"string"!=typeof i&&(i="Okay"),a.plainText&&(e=h(e),n=h(n),i=h(i)),a.plainText||(e.length>a.titleMaxLength&&(e="HTML Tags Error",n="Your Title content length is more than \"titleMaxLength\" option.",i="Okay"),n.length>a.messageMaxLength&&(e="HTML Tags Error",n="Your Message content length is more than \"messageMaxLength\" option.",i="Okay"),i.length>a.buttonMaxLength&&(e="HTML Tags Error",n="Your Button content length is more than \"buttonMaxLength\" option.",i="Okay")),e.length>a.titleMaxLength&&(e=e.substring(0,a.titleMaxLength)+"..."),n.length>a.messageMaxLength&&(n=n.substring(0,a.messageMaxLength)+"..."),i.length>a.buttonMaxLength&&(i=i.substring(0,a.buttonMaxLength)+"..."),a.cssAnimation||(a.cssAnimationDuration=0);var g=t.document.createElement("div");g.id=c.ID,g.className=a.className,g.style.width=a.width,g.style.zIndex=a.zindex,g.style.borderRadius=a.borderRadius,g.style.fontFamily="\""+a.fontFamily+"\", "+r,a.rtl&&(g.setAttribute("dir","rtl"),g.classList.add("rtl-on"));var f="";a.backOverlay&&(f="");var x="";if("Success"===l?x=w(a.svgSize,d.svgColor):"Failure"===l?x=v(a.svgSize,d.svgColor):"Warning"===l?x=N(a.svgSize,d.svgColor):"Info"==l&&(x=C(a.svgSize,d.svgColor)),g.innerHTML=f+"
"+e+"
"+i+""+e+"
"+a+k+"
- Albert Einstein":"Failure"===l?a="\"Failure is simply the opportunity to begin again, this time more intelligently.\"
- Henry Ford":"Warning"===l?a="\"The peoples who want to live comfortably without producing and fatigue; they are doomed to lose their dignity, then liberty, and then independence and destiny.\"
- Mustafa Kemal Ataturk":"Info"==l&&(a="\"Knowledge rests not upon truth alone, but upon error also.\"
- Carl Gustav Jung")),"string"!=typeof o&&(o="Okay"),i.plainText&&(e=k(e),a=k(a),o=k(o)),i.plainText||(e.length>i.titleMaxLength&&(e="HTML Tags Error",a="Your Title content length is more than \"titleMaxLength\" option.",o="Okay"),a.length>i.messageMaxLength&&(e="HTML Tags Error",a="Your Message content length is more than \"messageMaxLength\" option.",o="Okay"),o.length>i.buttonMaxLength&&(e="HTML Tags Error",a="Your Button content length is more than \"buttonMaxLength\" option.",o="Okay")),e.length>i.titleMaxLength&&(e=e.substring(0,i.titleMaxLength)+"..."),a.length>i.messageMaxLength&&(a=a.substring(0,i.messageMaxLength)+"..."),o.length>i.buttonMaxLength&&(o=o.substring(0,i.buttonMaxLength)+"..."),i.cssAnimation||(i.cssAnimationDuration=0);var d=t.document.createElement("div");d.id=m.ID,d.className=i.className,d.style.width=i.width,d.style.zIndex=i.zindex,d.style.borderRadius=i.borderRadius,d.style.fontFamily="\""+i.fontFamily+"\", "+s,i.rtl&&(d.setAttribute("dir","rtl"),d.classList.add("rtl-on"));var x="";i.backOverlay&&(x="");var u="";if("Success"===l?u=h(i.svgSize,f.svgColor):"Failure"===l?u=v(i.svgSize,f.svgColor):"Warning"===l?u=N(i.svgSize,f.svgColor):"Info"==l&&(u=z(i.svgSize,f.svgColor)),d.innerHTML=x+"
"+e+"
"+o+""+e+"
"+i+"
- Albert Einstein":"Failure"===l?a="\"Failure is simply the opportunity to begin again, this time more intelligently.\"
- Henry Ford":"Warning"===l?a="\"The peoples who want to live comfortably without producing and fatigue; they are doomed to lose their dignity, then liberty, and then independence and destiny.\"
- Mustafa Kemal Ataturk":"Info"==l&&(a="\"Knowledge rests not upon truth alone, but upon error also.\"
- Carl Gustav Jung")),"string"!=typeof o&&(o="Okay"),i.plainText&&(e=h(e),a=h(a),o=h(o)),i.plainText||(e.length>i.titleMaxLength&&(e="HTML Tags Error",a="Your Title content length is more than \"titleMaxLength\" option.",o="Okay"),a.length>i.messageMaxLength&&(e="HTML Tags Error",a="Your Message content length is more than \"messageMaxLength\" option.",o="Okay"),o.length>i.buttonMaxLength&&(e="HTML Tags Error",a="Your Button content length is more than \"buttonMaxLength\" option.",o="Okay")),e.length>i.titleMaxLength&&(e=e.substring(0,i.titleMaxLength)+"..."),a.length>i.messageMaxLength&&(a=a.substring(0,i.messageMaxLength)+"..."),o.length>i.buttonMaxLength&&(o=o.substring(0,i.buttonMaxLength)+"..."),i.cssAnimation||(i.cssAnimationDuration=0);var d=t.document.createElement("div");d.id=m.ID,d.className=i.className,d.style.width=i.width,d.style.zIndex=i.zindex,d.style.borderRadius=i.borderRadius,d.style.fontFamily="\""+i.fontFamily+"\", "+s,i.rtl&&(d.setAttribute("dir","rtl"),d.classList.add("rtl-on"));var x="";i.backOverlay&&(x="");var u="";if("Success"===l?u=w(i.svgSize,f.svgColor):"Failure"===l?u=v(i.svgSize,f.svgColor):"Warning"===l?u=N(i.svgSize,f.svgColor):"Info"==l&&(u=z(i.svgSize,f.svgColor)),d.innerHTML=x+"
"+e+"
"+o+""+e+"
"+i+k+"
// Notiflix Report
// Notiflix Confirm
' +
'
';
+ // confirm wrap content: end
// confirm wrap: end
// if there is no confirm box: begin
@@ -1173,12 +1194,50 @@
}
// position: end
- // buttons listener: begin
+ // buttons && input listener: begin
var confirmCloseWrap = window.document.getElementById(ntflxConfirmWrap.id);
var okButton = window.document.getElementById('NXConfirmButtonOk');
+ // validation input listener: begin
+ var getValidationInput = window.document.getElementById('NXConfirmValidationInput');
+ if (getValidationInput) {
+ getValidationInput.focus();
+ getValidationInput.addEventListener('keyup', function (event) {
+ var thisValue = (event.target.value || '').toString();
+ if (thisValue !== theAnswer) {
+ getValidationInput.classList.add('nx-validation-failure');
+ getValidationInput.classList.remove('nx-validation-success');
+ } else {
+ getValidationInput.classList.remove('nx-validation-failure');
+ getValidationInput.classList.add('nx-validation-success');
+ var thisEnter = (event.key || '').toLocaleLowerCase('en') === 'enter' || event.keyCode === 13;
+ if (thisEnter) {
+ okButton.dispatchEvent(new Event('click'));
+ }
+ }
+ });
+ }
+ // validation input listener: end
+
// ok button listener: begin
- okButton.addEventListener('click', function () {
+ okButton.addEventListener('click', function (event) {
+ // check the validation: begin
+ if (hasValidation && theAnswer && getValidationInput) {
+ var inputValue = (getValidationInput.value || '').toString();
+ if (inputValue !== theAnswer) {
+ getValidationInput.focus();
+ getValidationInput.classList.add('nx-validation-failure');
+ event.stopPropagation();
+ event.preventDefault();
+ event.returnValue = false;
+ event.cancelBubble = true;
+ return false;
+ } else {
+ getValidationInput.classList.remove('nx-validation-failure');
+ }
+ }
+ // check the validation: end
+
// if ok callback && if ok callback is a function
if (typeof okButtonCallback === 'function') {
okButtonCallback();
@@ -1215,9 +1274,12 @@
// cancel button listener: end
}
// if ok callback && if ok callback a function => add Cancel Button listener: end
- // buttons listener: end
+ // buttons && input listener: end
}
// if there is no confirm box: end
+
+ // extend new settings with the backup settings
+ newConfirmSettings = extendNotiflix(true, newConfirmSettings, newConfirmSettingsBackup);
};
// Notiflix: Confirm Single: end
@@ -1799,8 +1861,12 @@
}
},
// Display Confirm: Show
- Show: function (title, message, okText, cancelText, okCallback, cancelCallback) {
- NotiflixConfirm(title, message, okText, cancelText, okCallback, cancelCallback);
+ Show: function (title, message, okText, cancelText, okCallback, cancelCallback, options) {
+ NotiflixConfirm(title, message, okText, cancelText, okCallback, cancelCallback, options, false, false);
+ },
+ // Display Confirm: Ask
+ Ask: function (title, question, answer, okText, cancelText, okCallback, cancelCallback, options) {
+ NotiflixConfirm(title, question, okText, cancelText, okCallback, cancelCallback, options, true, answer);
},
},
// Confirm: end
diff --git a/src/notiflix.css b/src/notiflix.css
index 34fcfe3..ae66dc9 100644
--- a/src/notiflix.css
+++ b/src/notiflix.css
@@ -1,6 +1,6 @@
/*!
* Notiflix ("https://www.notiflix.com")
-* Version: 2.4.0
+* Version: 2.5.0
* Author: Furkan MT ("https://github.com/furcan")
* Copyright 2020 Notiflix, MIT Licence ("https://opensource.org/licenses/MIT")
*/
@@ -1217,6 +1217,47 @@
color: inherit;
}
+[id^="NotiflixConfirmWrap"] > div[class*="-content"] > div[class*="-head"] > div > div {
+ font-family: inherit !important;
+ float: left;
+ width: 100%;
+ margin: 15px 0 0;
+ padding: 0;
+}
+
+[id^="NotiflixConfirmWrap"] > div[class*="-content"] > div[class*="-head"] > div > div > input {
+ font-family: inherit !important;
+ float: left;
+ width: 100%;
+ height: 40px;
+ margin: 0;
+ padding: 0 15px;
+ border: 1px solid rgba(0, 0, 0, 0.1);
+ border-radius: 25px;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 1;
+ -webkit-transition: all 0.25s ease-in-out;
+ -o-transition: all 0.25s ease-in-out;
+ transition: all 0.25s ease-in-out;
+}
+
+[id^="NotiflixConfirmWrap"] > div[class*="-content"] > div[class*="-head"] > div > div > input:hover {
+ border-color: rgba(0, 0, 0, 0.1);
+}
+
+[id^="NotiflixConfirmWrap"] > div[class*="-content"] > div[class*="-head"] > div > div > input:focus {
+ border-color: rgba(0, 0, 0, 0.3);
+}
+
+[id^="NotiflixConfirmWrap"] > div[class*="-content"] > div[class*="-head"] > div > div > input.nx-validation-failure {
+ border-color: #ff5549;
+}
+
+[id^="NotiflixConfirmWrap"] > div[class*="-content"] > div[class*="-head"] > div > div > input.nx-validation-success {
+ border-color: #32c682;
+}
+
[id^="NotiflixConfirmWrap"] > div[class*="-content"] > div[class*="-buttons"] {
-webkit-user-select: none;
-moz-user-select: none;
diff --git a/src/notiflix.js b/src/notiflix.js
index d5da80d..3d4d180 100644
--- a/src/notiflix.js
+++ b/src/notiflix.js
@@ -1,6 +1,6 @@
/*!
* Notiflix ("https://www.notiflix.com")
-* Version: 2.4.0
+* Version: 2.5.0
* Author: Furkan MT ("https://github.com/furcan")
* Copyright 2020 Notiflix, MIT Licence ("https://opensource.org/licenses/MIT")
*/
@@ -367,7 +367,7 @@
var notiflixReportSvgSuccess = function (width, color) {
if (!width) { width = '110px'; }
if (!color) { color = '#32c682'; }
- var reportSvgSuccess = '';
+ var reportSvgSuccess = '';
return reportSvgSuccess;
};
// Notiflix: Report SVG Success: end
@@ -376,7 +376,7 @@
var notiflixReportSvgFailure = function (width, color) {
if (!width) { width = '110px'; }
if (!color) { color = '#ff5549'; }
- var reportSvgFailure = '';
+ var reportSvgFailure = '';
return reportSvgFailure;
};
// Notiflix: Report SVG Failure: end
@@ -385,7 +385,7 @@
var notiflixReportSvgWarning = function (width, color) {
if (!width) { width = '110px'; }
if (!color) { color = '#eebf31'; }
- var reportSvgWarning = '';
+ var reportSvgWarning = '';
return reportSvgWarning;
};
// Notiflix: Report SVG Warning: end
@@ -394,7 +394,7 @@
var notiflixReportSvgInfo = function (width, color) {
if (!width) { width = '110px'; }
if (!color) { color = '#26c0d3'; }
- var reportSvgInfo = '';
+ var reportSvgInfo = '';
return reportSvgInfo;
};
// Notiflix: Report SVG Info: end
@@ -403,7 +403,7 @@
var notiflixIndicatorSvgStandard = function (width, color) {
if (!width) { width = '60px'; }
if (!color) { color = '#32c682'; }
- var standard = '';
+ var standard = '';
return standard;
};
// Notiflix: Indicator SVG standard: end
@@ -412,7 +412,7 @@
var notiflixIndicatorSvgHourglass = function (width, color) {
if (!width) { width = '60px'; }
if (!color) { color = '#32c682'; }
- var hourglass = '';
+ var hourglass = '';
return hourglass;
};
// Notiflix: Indicator SVG hourglass: end
@@ -421,7 +421,7 @@
var notiflixIndicatorSvgCircle = function (width, color) {
if (!width) { width = '60px'; }
if (!color) { color = '#32c682'; }
- var circle = '';
+ var circle = '';
return circle;
};
// Notiflix: Indicator SVG circle: end
@@ -430,7 +430,7 @@
var notiflixIndicatorSvgArrows = function (width, color) {
if (!width) { width = '60px'; }
if (!color) { color = '#32c682'; }
- var arrows = '';
+ var arrows = '';
return arrows;
};
// Notiflix: Indicator SVG arrows: end
@@ -439,7 +439,7 @@
var notiflixIndicatorSvgDots = function (width, color) {
if (!width) { width = '60px'; }
if (!color) { color = '#32c682'; }
- var dots = '';
+ var dots = '';
return dots;
};
// Notiflix: Indicator SVG dots: end
@@ -448,7 +448,7 @@
var notiflixIndicatorSvgPulse = function (width, color) {
if (!width) { width = '60px'; }
if (!color) { color = '#32c682'; }
- var pulse = '';
+ var pulse = '';
return pulse;
};
// Notiflix: Indicator SVG pulse: end
@@ -458,7 +458,7 @@
if (!width) { width = '60px'; }
if (!white) { white = '#f8f8f8'; }
if (!green) { green = '#32c682'; }
- var notiflixIcon = '';
+ var notiflixIcon = '';
return notiflixIcon;
};
// Notiflix: Indicator SVG notiflix: end
@@ -674,13 +674,13 @@
else {
var svgIcon;
if (staticType === 'Success') { // success
- svgIcon = '';
+ svgIcon = '';
} else if (staticType === 'Failure') { // failure
- svgIcon = '';
+ svgIcon = '';
} else if (staticType === 'Warning') { // warning
- svgIcon = '';
+ svgIcon = '';
} else if (staticType === 'Info') { // info
- svgIcon = '';
+ svgIcon = '';
} else {
svgIcon = '';
}
@@ -1010,7 +1010,7 @@
// Notiflix: Report Single: end
// Notiflix: Confirm Single: begin
- var NotiflixConfirm = function (title, message, okButtonText, cancelButtonText, okButtonCallback, cancelButtonCallback) {
+ var NotiflixConfirm = function (title, message, okButtonText, cancelButtonText, okButtonCallback, cancelButtonCallback, options, hasValidation, answer) {
// check doc body
if (!notiflixHeadOrBodyCheck('body')) { return false; }
@@ -1019,6 +1019,16 @@
Notiflix.Confirm.Init({});
}
+ // create a backup for new settings
+ var newConfirmSettingsBackup = extendNotiflix(true, newConfirmSettings, {});
+
+ // check the "options": begin
+ if (typeof options === 'object' && !Array.isArray(options)) {
+ // extend new settings with the new options
+ newConfirmSettings = extendNotiflix(true, newConfirmSettings, options);
+ }
+ // check the "options": end
+
// check the arguments: begin
if (typeof title !== 'string') { title = 'Notiflix Confirm'; }
if (typeof message !== 'string') { message = 'Do you agree with me?'; }
@@ -1113,17 +1123,28 @@
}
// if have a callback => add cancel button: end
+ // check the validation module: begin
+ var setValidationInput = '';
+ var theAnswer = false;
+ if (hasValidation && (typeof answer === 'string' && answer.length > 0)) {
+ theAnswer = answer;
+ setValidationInput = '';
+ }
+ // check the validation module: end
+
+ // confirm wrap content: begin
ntflxConfirmWrap.innerHTML = confirmOverlay +
'' +
'
' +
'' +
'' + title + '
' + - '' + message + '
' +
+ '' + message + setValidationInput + '
' +
'' +
'
';
+ // confirm wrap content: end
// confirm wrap: end
// if there is no confirm box: begin
@@ -1172,12 +1193,50 @@
}
// position: end
- // buttons listener: begin
+ // buttons && input listener: begin
var confirmCloseWrap = window.document.getElementById(ntflxConfirmWrap.id);
var okButton = window.document.getElementById('NXConfirmButtonOk');
+ // validation input listener: begin
+ var getValidationInput = window.document.getElementById('NXConfirmValidationInput');
+ if (getValidationInput) {
+ getValidationInput.focus();
+ getValidationInput.addEventListener('keyup', function (event) {
+ var thisValue = (event.target.value || '').toString();
+ if (thisValue !== theAnswer) {
+ getValidationInput.classList.add('nx-validation-failure');
+ getValidationInput.classList.remove('nx-validation-success');
+ } else {
+ getValidationInput.classList.remove('nx-validation-failure');
+ getValidationInput.classList.add('nx-validation-success');
+ var thisEnter = (event.key || '').toLocaleLowerCase('en') === 'enter' || event.keyCode === 13;
+ if (thisEnter) {
+ okButton.dispatchEvent(new Event('click'));
+ }
+ }
+ });
+ }
+ // validation input listener: end
+
// ok button listener: begin
- okButton.addEventListener('click', function () {
+ okButton.addEventListener('click', function (event) {
+ // check the validation: begin
+ if (hasValidation && theAnswer && getValidationInput) {
+ var inputValue = (getValidationInput.value || '').toString();
+ if (inputValue !== theAnswer) {
+ getValidationInput.focus();
+ getValidationInput.classList.add('nx-validation-failure');
+ event.stopPropagation();
+ event.preventDefault();
+ event.returnValue = false;
+ event.cancelBubble = true;
+ return false;
+ } else {
+ getValidationInput.classList.remove('nx-validation-failure');
+ }
+ }
+ // check the validation: end
+
// if ok callback && if ok callback is a function
if (typeof okButtonCallback === 'function') {
okButtonCallback();
@@ -1214,9 +1273,12 @@
// cancel button listener: end
}
// if ok callback && if ok callback a function => add Cancel Button listener: end
- // buttons listener: end
+ // buttons && input listener: end
}
// if there is no confirm box: end
+
+ // extend new settings with the backup settings
+ newConfirmSettings = extendNotiflix(true, newConfirmSettings, newConfirmSettingsBackup);
};
// Notiflix: Confirm Single: end
@@ -1798,8 +1860,12 @@
}
},
// Display Confirm: Show
- Show: function (title, message, okText, cancelText, okCallback, cancelCallback) {
- NotiflixConfirm(title, message, okText, cancelText, okCallback, cancelCallback);
+ Show: function (title, message, okText, cancelText, okCallback, cancelCallback, options) {
+ NotiflixConfirm(title, message, okText, cancelText, okCallback, cancelCallback, options, false, false);
+ },
+ // Display Confirm: Ask
+ Ask: function (title, question, answer, okText, cancelText, okCallback, cancelCallback, options) {
+ NotiflixConfirm(title, question, okText, cancelText, okCallback, cancelCallback, options, true, answer);
},
},
// Confirm: end
' +
'
' +
'' +
'' + title + '
' + - '' + message + '
' +
+ '' + message + setValidationInput + '
' +
'