Merge pull request fabien-d#98 from quasipickle/master

Same changes as previous PR
namrasaheba · Jan 15, 2013 · 73c24c7 · 73c24c7
2 parents 6615290 + ac0cd44
commit 73c24c7
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/Contributors.md b/Contributors.md
@@ -25,6 +25,11 @@ Credit where credit is due
 **Stuart Keith**
 * GitHub: [stuartkeith](http://github.com/stuartkeith)
 
+***
+
+**Dylan Anderson**
+* GitHub: [quasipickle](http://github.com/quasipickle)
+
 ## Documentation Contributors
 
 **Kristoffer Berdal**

diff --git a/lib/alertify.js b/lib/alertify.js
@@ -24,7 +24,7 @@
 		    isopen    = false,
 		    keys      = { ENTER: 13, ESC: 27, SPACE: 32 },
 		    queue     = [],
-		    $, btnCancel, btnOK, btnReset, elCallee, elCover, elDialog, elLog, form, input, getTransitionEvent;
+		    $, btnCancel, btnOK, btnReset, btnFocus, elCallee, elCover, elDialog, elLog, form, input, getTransitionEvent;
 
 		/**
 		 * Markup pieces
@@ -98,6 +98,12 @@
 			 */
 			buttonReverse : false,
 
+			/**
+			 * Which button should be focused by default
+			 * @type {String}	'ok' (default), 'cancel', or 'none'
+			 */
+			buttonFocus : 'ok',
+
 			/**
 			 * Set the transition event on load
 			 * @type {[type]}
@@ -227,6 +233,8 @@
 
 				html += "<div class=\"alertify-dialog\">";
 
+				if (_alertify.buttonFocus === "none") html += "<a href=\"#\" id=\"alertify-noneFocus\" class=\"alertify-hidden\"></a>";
+
 				if (type === "prompt") html += "<form id=\"alertify-form\">";
 
 				html += "<article class=\"alertify-inner\">";
@@ -514,7 +522,7 @@
 					input.focus();
 					input.select();
 				}
-				else btnOK.focus();
+				else btnFocus.focus();
 			},
 
 			/**
@@ -546,6 +554,7 @@
 				btnReset  = $("alertify-resetFocus");
 				btnOK     = $("alertify-ok")     || undefined;
 				btnCancel = $("alertify-cancel") || undefined;
+				btnFocus  = (_alertify.buttonFocus === "cancel") ? btnCancel : ((_alertify.buttonFocus === "none") ? $('alertify-noneFocus') : btnOK),
 				input     = $("alertify-text")   || undefined;
 				form      = $("alertify-form")   || undefined;
 				// add placeholder value to the input field

diff --git a/lib/alertify.min.js b/lib/alertify.min.js
diff --git a/src/alertify.js b/src/alertify.js
@@ -12,7 +12,7 @@
 		    isopen    = false,
 		    keys      = { ENTER: 13, ESC: 27, SPACE: 32 },
 		    queue     = [],
-		    $, btnCancel, btnOK, btnReset, elCallee, elCover, elDialog, elLog, form, input, getTransitionEvent;
+		    $, btnCancel, btnOK, btnReset, btnFocus, elCallee, elCover, elDialog, elLog, form, input, getTransitionEvent;
 
 		/**
 		 * Markup pieces
@@ -21,7 +21,7 @@
 		dialogs = {
 			buttons : {
 				holder : "<nav class=\"alertify-buttons\">{{buttons}}</nav>",
-				submit : "<button type=\"submit\" class=\"alertify-button alertify-button-ok\" id=\"alertify-ok\" />{{ok}}</button>",
+				submit : "<button type=\"submit\" class=\"alertify-button alertify-button-ok\" id=\"alertify-ok\">{{ok}}</button>",
 				ok     : "<a href=\"#\" class=\"alertify-button alertify-button-ok\" id=\"alertify-ok\">{{ok}}</a>",
 				cancel : "<a href=\"#\" class=\"alertify-button alertify-button-cancel\" id=\"alertify-cancel\">{{cancel}}</a>"
 			},
@@ -86,6 +86,12 @@
 			 */
 			buttonReverse : false,
 
+			/**
+			 * Which button should be focused by default
+			 * @type {String}	"ok" (default), "cancel", or "none"
+			 */
+			buttonFocus : "ok",
+
 			/**
 			 * Set the transition event on load
 			 * @type {[type]}
@@ -215,6 +221,8 @@
 
 				html += "<div class=\"alertify-dialog\">";
 
+				if (_alertify.buttonFocus === "none") html += "<a href=\"#\" id=\"alertify-noneFocus\" class=\"alertify-hidden\"></a>";
+
 				if (type === "prompt") html += "<form id=\"alertify-form\">";
 
 				html += "<article class=\"alertify-inner\">";
@@ -502,7 +510,7 @@
 					input.focus();
 					input.select();
 				}
-				else btnOK.focus();
+				else btnFocus.focus();
 			},
 
 			/**
@@ -534,6 +542,7 @@
 				btnReset  = $("alertify-resetFocus");
 				btnOK     = $("alertify-ok")     || undefined;
 				btnCancel = $("alertify-cancel") || undefined;
+				btnFocus  = (_alertify.buttonFocus === "cancel") ? btnCancel : ((_alertify.buttonFocus === "none") ? $("alertify-noneFocus") : btnOK),
 				input     = $("alertify-text")   || undefined;
 				form      = $("alertify-form")   || undefined;
 				// add placeholder value to the input field