diff --git a/js/jquery.bootstrap.js b/js/jquery.bootstrap.js index c374ffd..3a9cee8 100644 --- a/js/jquery.bootstrap.js +++ b/js/jquery.bootstrap.js @@ -185,7 +185,7 @@ require: $.messager = (function() { - var alert = function(title, message) { + var alert = function(title, message, okCallback, closeCallback) { var model = $.messager.model; if (arguments.length < 2) { @@ -198,18 +198,20 @@ $.messager = (function() { // override destroy methods; , onClose: function() { $(this).dialog("destroy"); + closeCallback && closeCallback(); } , buttons: [{ text: model.ok.text , classed: model.ok.classed || "btn-success" , click: function() { $(this).dialog("destroy"); + okCallback && okCallback(); } }] }); }; - var confirm = function(title, message, callback) { + var confirm = function(title, message, okCallback, cancelCallback) { var model = $.messager.model; $("
" + message + "
").dialog({ @@ -217,13 +219,14 @@ $.messager = (function() { // override destroy methods; , onClose: function() { $(this).dialog("destroy"); + cancelCallback && cancelCallback(); } , buttons: [{ text: model.ok.text , classed: model.ok.classed || "btn-success" , click: function() { $(this).dialog("destroy"); - callback && callback(); + okCallback && okCallback(); } }, { @@ -231,6 +234,7 @@ $.messager = (function() { , classed : model.cancel.classed || "btn-danger" , click: function() { $(this).dialog("destroy"); + cancelCallback && cancelCallback(); } }] }); diff --git a/js/jquery.bootstrap.min.js b/js/jquery.bootstrap.min.js index 3f348cc..d80863e 100644 --- a/js/jquery.bootstrap.min.js +++ b/js/jquery.bootstrap.min.js @@ -3,4 +3,4 @@ Copyright (c) Kris Zhang License: MIT (https://github.com/newghost/bootstrap-jquery-plugin/blob/master/LICENSE) */ -String.prototype.format||(String.prototype.format=function(){var e=arguments;return this.replace(/{(\d+)}/g,function(t,n){return typeof e[n]!="undefined"?e[n]:t})}),function(e){e.fn.dialog=function(t){var n=this,r=e(n),i=e(document.body),s=r.closest(".dialog"),o="dialog-parent",u=arguments[1],a=arguments[2],f=function(){var t='';s=e(t),e(document.body).append(s),s.find(".modal-body").append(r)},l=function(r){var i=(r||t||{}).buttons||{},o=s.find(".modal-footer");o.empty();var u=i.constructor==Array;for(var a in i){var f=i[a],l="",c="",h="btn-default",p="";if(f.constructor==Object)l=f.id,c=f.text,h=f["class"]||f.classed||h,p=f.click;else{if(!!u||f.constructor!=Function)continue;c=a,p=f}$button=e(''; n = t(e), t(document.body).append(n), n.find(".modal-body").append(a) }, l = function (a) { var d = (a || e || {}).buttons || {}, s = n.find(".modal-footer"); s.empty(); var i = d.constructor == Array; for (var r in d) { var l = d[r], c = "", u = "", f = "btn-default", h = ""; if (l.constructor == Object) c = l.id, u = l.text, f = l["class"] || l.classed || f, h = l.click; else { if (i || l.constructor != Function) continue; u = r, h = l } $button = t('