diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2014-08-31 16:20:00 -0400 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2014-08-31 16:20:00 -0400 |
| commit | 9a864dce3bbc73e7ac2d3b6b86210d6bd1e89813 (patch) | |
| tree | 9276debac221bd0fcf76e5e0a740c260079c25d9 /src/jquery-impromptu.js | |
| parent | d8ed0ddbec0e950611707c129ac7e9aaa66c3150 (diff) | |
| download | jQuery-Impromptu-9a864dce3bbc73e7ac2d3b6b86210d6bd1e89813.zip jQuery-Impromptu-9a864dce3bbc73e7ac2d3b6b86210d6bd1e89813.tar.gz jQuery-Impromptu-9a864dce3bbc73e7ac2d3b6b86210d6bd1e89813.tar.bz2 | |
#39 verify buttons object hasOwnProperty before creating button
Diffstat (limited to 'src/jquery-impromptu.js')
| -rw-r--r-- | src/jquery-impromptu.js | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/src/jquery-impromptu.js b/src/jquery-impromptu.js index 6c1f0f4..281100f 100644 --- a/src/jquery-impromptu.js +++ b/src/jquery-impromptu.js @@ -431,7 +431,8 @@ title = "",
opts = $.prompt.options,
$jqistates = $('.'+ $.prompt.currentPrefix +'states'),
- defbtn,k,v,i=0;
+ buttons = [],
+ showHtml,defbtn,k,v,l,i=0;
stateobj = $.extend({},$.prompt.defaults.state, {name:statename}, stateobj);
@@ -442,35 +443,42 @@ title = '<div class="lead '+ opts.prefix + 'title '+ opts.classes.title +'">'+ stateobj.title +'</div>';
}
- var showHtml = stateobj.html;
- if (typeof stateobj.html === 'function') {
- showHtml = 'Error: html function must return text';
- }
+ showHtml = stateobj.html;
+ if (typeof stateobj.html === 'function') {
+ showHtml = 'Error: html function must return text';
+ }
state += '<div id="'+ opts.prefix +'state_'+ statename +'" class="'+ opts.prefix + 'state" data-jqi-name="'+ statename +'" style="display:none;">'+
arrow + title +
'<div class="'+ opts.prefix +'message '+ opts.classes.message +'">' + showHtml +'</div>'+
'<div class="'+ opts.prefix +'buttons '+ opts.classes.buttons +'"'+ ($.isEmptyObject(stateobj.buttons)? 'style="display:none;"':'') +'>';
- for(k in stateobj.buttons){
- v = stateobj.buttons[k],
- defbtn = stateobj.focus === i || (isNaN(stateobj.focus) && stateobj.defaultButton === i) ? ($.prompt.currentPrefix + 'defaultbutton ' + opts.classes.defaultButton) : '';
-
- if(typeof v === 'object'){
- state += '<button class="'+ opts.classes.button +' '+ $.prompt.currentPrefix + 'button '+ defbtn;
-
- if(typeof v.classes !== "undefined"){
- state += ' '+ ($.isArray(v.classes)? v.classes.join(' ') : v.classes) + ' ';
+ // state buttons may be in object or array, lets convert objects to arrays
+ if($.isArray(stateobj.buttons)){
+ buttons = stateobj.buttons;
+ }
+ else if($.isPlainObject(stateobj.buttons)){
+ for(k in stateobj.buttons){
+ if(stateobj.buttons.hasOwnProperty(k)){
+ buttons.push({ title: k, value: stateobj.buttons[k] });
}
+ }
+ }
- state += '" name="' + opts.prefix + '_' + statename + '_button' + v.title.replace(/[^a-z0-9]+/gi,'') + '" id="' + opts.prefix + '_' + statename + '_button' + v.title.replace(/[^a-z0-9]+/gi,'') + '" value="' + v.value + '">' + v.title + '</button>';
+ // iterate over each button and create them
+ for(i=0, l=buttons.length; i<l; i++){
+ v = buttons[i],
+ defbtn = stateobj.focus === i || (isNaN(stateobj.focus) && stateobj.defaultButton === i) ? ($.prompt.currentPrefix + 'defaultbutton ' + opts.classes.defaultButton) : '';
- } else {
- state += '<button class="'+ $.prompt.currentPrefix + 'button '+ opts.classes.button +' '+ defbtn +'" name="' + opts.prefix + '_' + statename + '_button' + k.replace(/[^a-z0-9]+/gi,'') + '" id="' + opts.prefix + '_' + statename + '_button' + k.replace(/[^a-z0-9]+/gi,'') + '" value="' + v + '">' + k + '</button>';
+ state += '<button class="'+ opts.classes.button +' '+ $.prompt.currentPrefix + 'button '+ defbtn;
+ if(typeof v.classes !== "undefined"){
+ state += ' '+ ($.isArray(v.classes)? v.classes.join(' ') : v.classes) + ' ';
}
- i++;
+
+ state += '" name="' + opts.prefix + '_' + statename + '_button' + v.title.replace(/[^a-z0-9]+/gi,'') + '" id="' + opts.prefix + '_' + statename + '_button' + v.title.replace(/[^a-z0-9]+/gi,'') + '" value="' + v.value + '">' + v.title + '</button>';
}
+
state += '</div></div>';
$state = $(state);
@@ -633,7 +641,7 @@ }
} // end isDefaultPrevented()
}// end stateobj !== undefined
-
+
return $state;
};
|