New bootbox renders all the buttons backwards. :<
This commit is contained in:
parent
c79ab3fc2e
commit
e12dff2c31
|
@ -59,11 +59,9 @@ Discourse.ComposerController = Discourse.Controller.extend({
|
||||||
message = Em.String.i18n("composer.posting_not_on_topic", {title: this.get('content.topic.title')});
|
message = Em.String.i18n("composer.posting_not_on_topic", {title: this.get('content.topic.title')});
|
||||||
|
|
||||||
buttons = [{
|
buttons = [{
|
||||||
"label": Em.String.i18n("composer.reply_original") + "<br/><div class='topic-title'>" + this.get('content.topic.title') + "</div>",
|
"label": Em.String.i18n("composer.cancel"),
|
||||||
"class": "btn-primary btn-reply-on-original",
|
"class": "cancel",
|
||||||
"callback": function(){
|
"link": true
|
||||||
_this.save(true);
|
|
||||||
}
|
|
||||||
}];
|
}];
|
||||||
|
|
||||||
if(topic) {
|
if(topic) {
|
||||||
|
@ -79,9 +77,11 @@ Discourse.ComposerController = Discourse.Controller.extend({
|
||||||
}
|
}
|
||||||
|
|
||||||
buttons.push({
|
buttons.push({
|
||||||
"label": Em.String.i18n("composer.cancel"),
|
"label": Em.String.i18n("composer.reply_original") + "<br/><div class='topic-title'>" + this.get('content.topic.title') + "</div>",
|
||||||
"class": "cancel",
|
"class": "btn-primary btn-reply-on-original",
|
||||||
"link": true
|
"callback": function(){
|
||||||
|
_this.save(true);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
bootbox.dialog(message, buttons, {"classes": "reply-where-modal"});
|
bootbox.dialog(message, buttons, {"classes": "reply-where-modal"});
|
||||||
|
|
|
@ -350,7 +350,7 @@ var bootbox = window.bootbox || (function(document, $) {
|
||||||
href = _defaultHref;
|
href = _defaultHref;
|
||||||
}
|
}
|
||||||
|
|
||||||
buttons = "<a data-handler='"+i+"' class='"+_class+"' href='" + href + "'>"+icon+""+label+"</a>" + buttons;
|
buttons = buttons + "<a data-handler='"+i+"' class='"+_class+"' href='" + href + "'>"+icon+""+label+"</a>";
|
||||||
|
|
||||||
callbacks[i] = callback;
|
callbacks[i] = callback;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue