app/assets/javascripts/jqr-helpers.js in jqr-helpers-1.0.19 vs app/assets/javascripts/jqr-helpers.js in jqr-helpers-1.0.20
- old
+ new
@@ -112,10 +112,15 @@
}
dialogElement.load(url, function() {
if (closeX) {
dialogElement.prepend('<span class="ujs-dialog-x"></span>');
}
+ if (dialogElement.find('.ujs-dialog-title-hidden').length) {
+ if (!dialogOptions['title'])
+ dialogOptions['title'] =
+ dialogElement.find('.ujs-dialog-title-hidden').text();
+ }
$('.ui-widget-overlay').remove();
hideThrobber(ujsDialogElement);
$('#ujs-dialog-throbber').remove();
$(this).dialog(dialogOptions);
$(dialogElement).trigger('jqr.load');
@@ -170,12 +175,15 @@
function ujsAjaxBeforeSend() {
var element = $(this);
if (element.data('real-element')) {
element = $('#' + element.data('real-element'));
}
- if (element.is('form') &&
- $(ujsSubmitElement).parents('form').index(element) >= 0)
- element = ujsSubmitElement;
+ if (element.is('form')) {
+ if ($(ujsSubmitElement).parents('form').index(element) >= 0)
+ element = ujsSubmitElement;
+ else
+ $(element).data('throbber', 'large');
+ }
showThrobber(element);
}
function ujsAjaxSuccess(evt, data, status, xhr) {
var element = $(this);