X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fviews_ui%2Fjs%2Fajax.js;fp=web%2Fcore%2Fmodules%2Fviews_ui%2Fjs%2Fajax.js;h=b7b9dcf53b27a6dfd463620cac49ced9152afed9;hp=00024f5715cdf4a0568c1bc345b3998dd0f7e4bd;hb=af6d1fb995500ae68849458ee10d66abbdcfb252;hpb=680c79a86e3ed402f263faeac92e89fb6d9edcc0 diff --git a/web/core/modules/views_ui/js/ajax.js b/web/core/modules/views_ui/js/ajax.js index 00024f571..b7b9dcf53 100644 --- a/web/core/modules/views_ui/js/ajax.js +++ b/web/core/modules/views_ui/js/ajax.js @@ -14,19 +14,19 @@ Drupal.AjaxCommands.prototype.viewsSetForm = function (ajax, response, status) { var $form = $('.js-views-ui-dialog form'); - var $submit_buttons = $form.find('input[type=submit].js-form-submit, button.js-form-submit').once('views-ajax-submit'); - $submit_buttons.on('click mousedown', function () { + var $submitButtons = $form.find('input[type=submit].js-form-submit, button.js-form-submit').once('views-ajax-submit'); + $submitButtons.on('click mousedown', function () { this.form.clk = this; }); $form.once('views-ajax-submit').each(function () { var $form = $(this); - var element_settings = { + var elementSettings = { url: response.url, event: 'submit', base: $form.attr('id'), element: this }; - var ajaxForm = Drupal.ajax(element_settings); + var ajaxForm = Drupal.ajax(elementSettings); ajaxForm.$form = $form; }); }; @@ -75,9 +75,9 @@ $('#views-tabset a').once('views-ajax').on('click', function () { var href = $(this).attr('href'); - var display_id = href.substr(11); + var displayId = href.substr(11); - $('#views-live-preview #preview-display-id').val(display_id); + $('#views-live-preview #preview-display-id').val(displayId); }); } }; @@ -85,20 +85,20 @@ Drupal.behaviors.viewsAjax = { collapseReplaced: false, attach: function attach(context, settings) { - var base_element_settings = { + var baseElementSettings = { event: 'click', progress: { type: 'fullscreen' } }; $('a.views-ajax-link', context).once('views-ajax').each(function () { - var element_settings = base_element_settings; - element_settings.base = $(this).attr('id'); - element_settings.element = this; + var elementSettings = baseElementSettings; + elementSettings.base = $(this).attr('id'); + elementSettings.element = this; if ($(this).attr('href')) { - element_settings.url = $(this).attr('href'); + elementSettings.url = $(this).attr('href'); } - Drupal.ajax(element_settings); + Drupal.ajax(elementSettings); }); $('div#views-live-preview a').once('views-ajax').each(function () { @@ -106,18 +106,18 @@ return true; } - var element_settings = base_element_settings; + var elementSettings = baseElementSettings; - element_settings.url = $(this).attr('href'); - if (Drupal.Views.getPath(element_settings.url).substring(0, 21) !== 'admin/structure/views') { + elementSettings.url = $(this).attr('href'); + if (Drupal.Views.getPath(elementSettings.url).substring(0, 21) !== 'admin/structure/views') { return true; } - element_settings.wrapper = 'views-preview-wrapper'; - element_settings.method = 'replaceWith'; - element_settings.base = $(this).attr('id'); - element_settings.element = this; - Drupal.ajax(element_settings); + elementSettings.wrapper = 'views-preview-wrapper'; + elementSettings.method = 'replaceWith'; + elementSettings.base = $(this).attr('id'); + elementSettings.element = this; + Drupal.ajax(elementSettings); }); $('div#views-live-preview input[type=submit]').once('views-ajax').each(function (event) { @@ -125,20 +125,20 @@ this.form.clk = this; return true; }); - var element_settings = base_element_settings; + var elementSettings = baseElementSettings; - element_settings.url = $(this.form).attr('action'); - if (Drupal.Views.getPath(element_settings.url).substring(0, 21) !== 'admin/structure/views') { + elementSettings.url = $(this.form).attr('action'); + if (Drupal.Views.getPath(elementSettings.url).substring(0, 21) !== 'admin/structure/views') { return true; } - element_settings.wrapper = 'views-preview-wrapper'; - element_settings.method = 'replaceWith'; - element_settings.event = 'click'; - element_settings.base = $(this).attr('id'); - element_settings.element = this; + elementSettings.wrapper = 'views-preview-wrapper'; + elementSettings.method = 'replaceWith'; + elementSettings.event = 'click'; + elementSettings.base = $(this).attr('id'); + elementSettings.element = this; - Drupal.ajax(element_settings); + Drupal.ajax(elementSettings); }); } };