Skip to content

Added alertify.password and alertify.select #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Added alertify.password and alertify.select #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33db3fd
Higher z-index for logs
jor3l May 12, 2016
9d18d0e
Adds support for alertify.password and alertify.select
jor3l Jul 10, 2016
7d2c39c
Adds support for alertify.password and alertify.select
jor3l Jul 10, 2016
193daf5
Merge branch 'master' into master
jor3l Jul 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions src/js/alertify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
cancel: "<button class='cancel' tabindex='2'>{{cancel}}</button>"
},
input: "<input type='text'>",
select: "<select>",
message: "<p class='msg'>{{message}}</p>",
log: "<div class='{{class}}'>{{message}}</div>"
},
Expand All @@ -66,6 +67,7 @@
cancel: "<button class='cancel' tabindex='2'>{{cancel}}</button>"
},
input: "<input type='text'>",
select: "<select>",
message: "<p class='msg'>{{message}}</p>",
log: "<div class='{{class}}'>{{message}}</div>"
},
Expand All @@ -82,14 +84,29 @@
var btnTxt = this.dialogs.buttons.ok;
var html = "<div class='dialog'>" + "<div>" + this.dialogs.message.replace("{{message}}", item.message);

if(item.type === "confirm" || item.type === "prompt") {
if(["confirm", "prompt", "password", "select"].indexOf(item.type) >= 0) {
btnTxt = this.dialogs.buttons.cancel + this.dialogs.buttons.ok;
}

if (item.type === "prompt") {
html += this.dialogs.input;
}

if (item.type === "password") {
html += this.dialogs.input.replace("type='text'", "type='password'");
}

if (item.type == 'select') {
var select = this.dialogs.select;

for(var key in item.selectOptions) {
select += '<option value="' + key + '">' + item.selectOptions[key] + '</option>';
}

select += '</select>';
html += select;
}

html = (html + this.dialogs.buttons.holder + "</div>" + "</div>")
.replace("{{buttons}}", btnTxt)
.replace("{{ok}}", this.okLabel)
Expand Down Expand Up @@ -141,12 +158,13 @@
*
* @return {Object}
*/
dialog: function(message, type, onOkay, onCancel) {
dialog: function(message, type, onOkay, onCancel, selectOptions) {
return this.setup({
type: type,
message: message,
onOkay: onOkay,
onCancel: onCancel
onCancel: onCancel,
selectOptions: selectOptions
});
},

Expand Down Expand Up @@ -247,7 +265,7 @@

var btnOK = el.querySelector(".ok");
var btnCancel = el.querySelector(".cancel");
var input = el.querySelector("input");
var input = el.querySelector("input,select");
var label = el.querySelector("label");

// Set default value/placeholder of input
Expand Down Expand Up @@ -333,7 +351,7 @@
this.parent.appendChild(el);
setTimeout(function() {
el.classList.remove("hide");
if(input && item.type && item.type === "prompt") {
if(input && item.type && (item.type === "prompt" || item.type === "password")) {
input.select();
input.focus();
} else {
Expand Down Expand Up @@ -372,6 +390,7 @@
this.dialogs.buttons.ok = "<button class='ok btn btn-primary' tabindex='1'>{{ok}}</button>";
this.dialogs.buttons.cancel = "<button class='cancel btn btn-default' tabindex='2'>{{cancel}}</button>";
this.dialogs.input = "<input type='text' class='form-control'>";
this.dialogs.select = "<select class='form-comtrol'>";
break;
case "purecss":
this.dialogs.buttons.ok = "<button class='ok pure-button' tabindex='1'>{{ok}}</button>";
Expand All @@ -393,6 +412,7 @@
this.dialogs.buttons.ok = this.defaultDialogs.buttons.ok;
this.dialogs.buttons.cancel = this.defaultDialogs.buttons.cancel;
this.dialogs.input = this.defaultDialogs.input;
this.dialogs.select = this.defaultDialogs.select;
break;
}
},
Expand Down Expand Up @@ -448,9 +468,15 @@
confirm: function(message, onOkay, onCancel) {
return _alertify.dialog(message, "confirm", onOkay, onCancel) || this;
},
password: function(message, onOkay, onCancel) {
return _alertify.dialog(message, "password", onOkay, onCancel) || this;
},
prompt: function(message, onOkay, onCancel) {
return _alertify.dialog(message, "prompt", onOkay, onCancel) || this;
},
select: function(message, selectOptions, onOkay, onCancel) {
return _alertify.dialog(message, "select", onOkay, onCancel, selectOptions) || this;
},
log: function(message, click) {
_alertify.log(message, "default", click);
return this;
Expand Down
9 changes: 7 additions & 2 deletions src/sass/alertify.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,13 @@ $border-radius: 1px;
margin: 0;
text-align: left;
}

input:not(.form-control){

select:not(.form-control) {
border: 1px solid #eaeaea;
height: 40px;
}

select:not(.form-control), input:not(.form-control){
margin-bottom: 15px;
width: 100%;
font-size: 100%;
Expand Down