diff --git a/.DS_Store b/.DS_Store index 251d77d..ab891eb 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/dist/jAlert-functions.min.js b/dist/jAlert-functions.min.js index d5ba22d..4c93237 100755 --- a/dist/jAlert-functions.min.js +++ b/dist/jAlert-functions.min.js @@ -1,2 +1,2 @@ /* Optional functions that are a shortcut to call jAlert */ -function alert(e,n){"undefined"==typeof n&&(n=e,e=""),$.jAlert({title:e,content:n})}function confirm(e,n){$.jAlert({type:"confirm",onConfirm:e,onDeny:n})}function showAlert(e,n,t){$.jAlert({title:e,content:n,theme:t})}function successAlert(e,n){"undefined"==typeof n&&(n=e,e="Success"),showAlert(e,n,"green")}function errorAlert(e,n){"undefined"==typeof n&&(n=e,e="Error"),showAlert(e,n,"red")}function infoAlert(e,n){"undefined"==typeof n&&(n=e,e="Info"),showAlert(e,n,"blue")}function warningAlert(e,n){"undefined"==typeof n&&(n=e,e="Warning"),showAlert(e,n,"yellow")}function blackAlert(e,n){"undefined"==typeof n&&(n=e,e="Warning"),showAlert(e,n,"black")}function imageAlert(e,n){"auto"==typeof n&&(iframeHeight=!1),$.jAlert({image:e,imageWidth:n})}function videoAlert(e){$.jAlert({video:e})}function iframeAlert(e,n){"undefined"==typeof n&&(n=!1),$.jAlert({iframe:e,iframeHeight:n})}function ajaxAlert(e,n){"undefined"==typeof n&&(n=function(){return!1}),$.jAlert({ajax:e,onOpen:n})} \ No newline at end of file +function alert(a,b){"undefined"==typeof b&&(b=a,a=""),$.jAlert({title:a,content:b})}function confirm(a,b,c){$.jAlert({type:"confirm",confirmQuestion:c,onConfirm:a,onDeny:b})}function showAlert(a,b,c){$.jAlert({title:a,content:b,theme:c})}function successAlert(a,b){"undefined"==typeof b&&(b=a,a="Success"),showAlert(a,b,"green")}function errorAlert(a,b){"undefined"==typeof b&&(b=a,a="Error"),showAlert(a,b,"red")}function infoAlert(a,b){"undefined"==typeof b&&(b=a,a="Info"),showAlert(a,b,"blue")}function warningAlert(a,b){"undefined"==typeof b&&(b=a,a="Warning"),showAlert(a,b,"yellow")}function blackAlert(a,b){"undefined"==typeof b&&(b=a,a="Warning"),showAlert(a,b,"black")}function imageAlert(a,b){"auto"==typeof b&&(iframeHeight=!1),$.jAlert({image:a,imageWidth:b})}function videoAlert(a){$.jAlert({video:a})}function iframeAlert(a,b){"undefined"==typeof b&&(b=!1),$.jAlert({iframe:a,iframeHeight:b})}function ajaxAlert(a,b){"undefined"==typeof b&&(b=function(){return!1}),$.jAlert({ajax:a,onOpen:b})} \ No newline at end of file diff --git a/package.json b/package.json index aa820de..15ca299 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jAlert", - "version": "4.7.0", + "version": "4.8.0", "description": "Simple jQuery (Modal | Popup | Lightbox | Alert) Plugin", "repository": { "type": "git", @@ -18,4 +18,4 @@ "type": "MIT", "url": "https://www.opensource.org/licenses/mit-license.php" } -} +} \ No newline at end of file diff --git a/src/jAlert-functions.js b/src/jAlert-functions.js index 5f7a407..e8bb48a 100755 --- a/src/jAlert-functions.js +++ b/src/jAlert-functions.js @@ -12,9 +12,9 @@ function alert(title, msg){ } /* Optional: Overwrites javascript's built-in confirm function (DANGER: operates differently - returns true every time and doesn't stop execution!) - You must provide a callback */ -function confirm(confirmCallback, denyCallback) +function confirm(confirmCallback, denyCallback, confirmQuestion) { - $.jAlert({'type': 'confirm', 'onConfirm': confirmCallback, 'onDeny': denyCallback }); + $.jAlert({'type': 'confirm', 'confirmQuestion':confirmQuestion, 'onConfirm': confirmCallback, 'onDeny': denyCallback }); } /* Optional Alert shortcuts based on color */