diff --git a/core/modules/views_ui/js/views-admin.js b/core/modules/views_ui/js/views-admin.js
index 9dc1075..d20b0af 100644
--- a/core/modules/views_ui/js/views-admin.js
+++ b/core/modules/views_ui/js/views-admin.js
@@ -2,78 +2,76 @@
* @file
* Some basic behaviors and utility functions for Views UI.
*/
-Drupal.viewsUi = {};
+(function ($, Drupal, drupalSettings, debounce) {
+
+"use strict";
-Drupal.behaviors.viewsUiEditView = {};
+Drupal.viewsUi = {};
/**
* Improve the user experience of the views edit interface.
*/
-Drupal.behaviors.viewsUiEditView.attach = function (context, settings) {
-
- "use strict";
-
- // Only show the SQL rewrite warning when the user has chosen the
- // corresponding checkbox.
- jQuery('#edit-query-options-disable-sql-rewrite').click(function () {
- jQuery('.sql-rewrite-warning').toggleClass('js-hide');
- });
+Drupal.behaviors.viewsUiEditView = {
+ attach: function () {
+ // Only show the SQL rewrite warning when the user has chosen the
+ // corresponding checkbox.
+ $('#edit-query-options-disable-sql-rewrite').on('click', function () {
+ $('.sql-rewrite-warning').toggleClass('js-hide');
+ });
+ }
};
-Drupal.behaviors.viewsUiAddView = {};
-
/**
* In the add view wizard, use the view name to prepopulate form fields such as
* page title and menu link.
*/
-Drupal.behaviors.viewsUiAddView.attach = function (context, settings) {
-
- "use strict";
-
- var $ = jQuery;
- var exclude, replace, suffix;
- // Set up regular expressions to allow only numbers, letters, and dashes.
- exclude = new RegExp('[^a-z0-9\\-]+', 'g');
- replace = '-';
-
- // The page title, block title, and menu link fields can all be prepopulated
- // with the view name - no regular expression needed.
- var $fields = $(context).find('[id^="edit-page-title"], [id^="edit-block-title"], [id^="edit-page-link-properties-title"]');
- if ($fields.length) {
- if (!this.fieldsFiller) {
- this.fieldsFiller = new Drupal.viewsUi.FormFieldFiller($fields);
- }
- else {
- // After an AJAX response, this.fieldsFiller will still have event
- // handlers bound to the old version of the form fields (which don't exist
- // anymore). The event handlers need to be unbound and then rebound to the
- // new markup. Note that jQuery.live is difficult to make work in this
- // case because the IDs of the form fields change on every AJAX response.
- this.fieldsFiller.rebind($fields);
+Drupal.behaviors.viewsUiAddView = {
+ attach: function (context) {
+ var $context = $(context);
+ // Set up regular expressions to allow only numbers, letters, and dashes.
+ var exclude = new RegExp('[^a-z0-9\\-]+', 'g');
+ var replace = '-';
+ var suffix;
+
+ // The page title, block title, and menu link fields can all be prepopulated
+ // with the view name - no regular expression needed.
+ var $fields = $context.find('[id^="edit-page-title"], [id^="edit-block-title"], [id^="edit-page-link-properties-title"]');
+ if ($fields.length) {
+ if (!this.fieldsFiller) {
+ this.fieldsFiller = new Drupal.viewsUi.FormFieldFiller($fields);
+ }
+ else {
+ // After an AJAX response, this.fieldsFiller will still have event
+ // handlers bound to the old version of the form fields (which don't exist
+ // anymore). The event handlers need to be unbound and then rebound to the
+ // new markup. Note that jQuery.live is difficult to make work in this
+ // case because the IDs of the form fields change on every AJAX response.
+ this.fieldsFiller.rebind($fields);
+ }
}
- }
- // Prepopulate the path field with a URLified version of the view name.
- var $pathField = $(context).find('[id^="edit-page-path"]');
- if ($pathField.length) {
- if (!this.pathFiller) {
- this.pathFiller = new Drupal.viewsUi.FormFieldFiller($pathField, exclude, replace);
- }
- else {
- this.pathFiller.rebind($pathField);
+ // Prepopulate the path field with a URLified version of the view name.
+ var $pathField = $context.find('[id^="edit-page-path"]');
+ if ($pathField.length) {
+ if (!this.pathFiller) {
+ this.pathFiller = new Drupal.viewsUi.FormFieldFiller($pathField, exclude, replace);
+ }
+ else {
+ this.pathFiller.rebind($pathField);
+ }
}
- }
- // Populate the RSS feed field with a URLified version of the view name, and
- // an .xml suffix (to make it unique).
- var $feedField = $(context).find('[id^="edit-page-feed-properties-path"]');
- if ($feedField.length) {
- if (!this.feedFiller) {
- suffix = '.xml';
- this.feedFiller = new Drupal.viewsUi.FormFieldFiller($feedField, exclude, replace, suffix);
- }
- else {
- this.feedFiller.rebind($feedField);
+ // Populate the RSS feed field with a URLified version of the view name, and
+ // an .xml suffix (to make it unique).
+ var $feedField = $context.find('[id^="edit-page-feed-properties-path"]');
+ if ($feedField.length) {
+ if (!this.feedFiller) {
+ suffix = '.xml';
+ this.feedFiller = new Drupal.viewsUi.FormFieldFiller($feedField, exclude, replace, suffix);
+ }
+ else {
+ this.feedFiller.rebind($feedField);
+ }
}
}
};
@@ -95,10 +93,6 @@ Drupal.behaviors.viewsUiAddView.attach = function (context, settings) {
* Optional. A suffix to append at the end of the target field content.
*/
Drupal.viewsUi.FormFieldFiller = function ($target, exclude, replace, suffix) {
-
- "use strict";
-
- var $ = jQuery;
this.source = $('#edit-label');
this.target = $target;
this.exclude = exclude || false;
@@ -118,108 +112,85 @@ Drupal.viewsUi.FormFieldFiller = function ($target, exclude, replace, suffix) {
// Object constructor; no return value.
};
-/**
- * Bind the form-filling behavior.
- */
-Drupal.viewsUi.FormFieldFiller.prototype.bind = function () {
-
- "use strict";
-
- this.unbind();
- // Populate the form field when the source changes.
- this.source.bind('keyup.viewsUi change.viewsUi', this.populate);
- // Quit populating the field as soon as it gets focus.
- this.target.bind('focus.viewsUi', this.unbind);
-};
-
-/**
- * Get the source form field value as altered by the passed-in parameters.
- */
-Drupal.viewsUi.FormFieldFiller.prototype.getTransliterated = function () {
-
- "use strict";
-
- var from = this.source.val();
- if (this.exclude) {
- from = from.toLowerCase().replace(this.exclude, this.replace);
- }
- return from + this.suffix;
-};
-
-/**
- * Populate the target form field with the altered source field value.
- */
-Drupal.viewsUi.FormFieldFiller.prototype._populate = function () {
-
- "use strict";
-
- var transliterated = this.getTransliterated();
- this.target.val(transliterated);
-};
-
-/**
- * Stop prepopulating the form fields.
- */
-Drupal.viewsUi.FormFieldFiller.prototype._unbind = function () {
-
- "use strict";
-
- this.source.unbind('keyup.viewsUi change.viewsUi', this.populate);
- this.target.unbind('focus.viewsUi', this.unbind);
-};
-
-/**
- * Bind event handlers to the new form fields, after they're replaced via AJAX.
- */
-Drupal.viewsUi.FormFieldFiller.prototype.rebind = function ($fields) {
-
- "use strict";
+$.extend(Drupal.viewsUi.FormFieldFiller.prototype, {
+ /**
+ * Bind the form-filling behavior.
+ */
+ bind: function () {
+ this.unbind();
+ // Populate the form field when the source changes.
+ this.source.on('keyup.viewsUi change.viewsUi', this.populate);
+ // Quit populating the field as soon as it gets focus.
+ this.target.on('focus.viewsUi', this.unbind);
+ },
- this.target = $fields;
- this.bind();
-};
+ /**
+ * Get the source form field value as altered by the passed-in parameters.
+ */
+ getTransliterated: function () {
+ var from = this.source.val();
+ if (this.exclude) {
+ from = from.toLowerCase().replace(this.exclude, this.replace);
+ }
+ return from + this.suffix;
+ },
-Drupal.behaviors.addItemForm = {};
-Drupal.behaviors.addItemForm.attach = function (context) {
+ /**
+ * Populate the target form field with the altered source field value.
+ */
+ _populate: function () {
+ var transliterated = this.getTransliterated();
+ this.target.val(transliterated);
+ },
- "use strict";
+ /**
+ * Stop prepopulating the form fields.
+ */
+ _unbind: function () {
+ this.source.off('keyup.viewsUi change.viewsUi', this.populate);
+ this.target.off('focus.viewsUi', this.unbind);
+ },
- var $ = jQuery;
- // The add item form may have an id of views-ui-add-item-form--n.
- var $form = $(context).find('form[id^="views-ui-add-item-form"]').first();
- // Make sure we don't add more than one event handler to the same form.
- $form = $form.once('views-ui-add-item-form');
- if ($form.length) {
- new Drupal.viewsUi.addItemForm($form);
+ /**
+ * Bind event handlers to the new form fields, after they're replaced via AJAX.
+ */
+ rebind: function ($fields) {
+ this.target = $fields;
+ this.bind();
+ }});
+
+
+Drupal.behaviors.addItemForm = {
+ attach: function (context) {
+ // The add item form may have an id of views-ui-add-item-form--n.
+ var $form = $(context).find('form[id^="views-ui-add-item-form"]').first();
+ // Make sure we don't add more than one event handler to the same form.
+ $form = $form.once('views-ui-add-item-form');
+ if ($form.length) {
+ new Drupal.viewsUi.AddItemForm($form);
+ }
}
};
-Drupal.viewsUi.addItemForm = function($form) {
-
- "use strict";
-
+Drupal.viewsUi.AddItemForm = function ($form) {
this.$form = $form;
- this.$form.find('.views-filterable-options :checkbox').click(jQuery.proxy(this.handleCheck, this));
+ this.$form.find('.views-filterable-options :checkbox').on('click', $.proxy(this.handleCheck, this));
// Find the wrapper of the displayed text.
this.$selected_div = this.$form.find('.views-selected-options').parent();
this.$selected_div.hide();
this.checkedItems = [];
};
-Drupal.viewsUi.addItemForm.prototype.handleCheck = function (event) {
-
- "use strict";
-
- var $target = jQuery(event.target);
- var label = jQuery.trim($target.next().text());
+Drupal.viewsUi.AddItemForm.prototype.handleCheck = function (event) {
+ var $target = $(event.target);
+ var label = $.trim($target.next().text());
// Add/remove the checked item to the list.
if ($target.is(':checked')) {
this.$selected_div.show();
this.checkedItems.push(label);
}
else {
- var length = this.checkedItems.length;
- var position = jQuery.inArray(label, this.checkedItems);
+ var position = $.inArray(label, this.checkedItems);
// Delete the item from the list and take sure that the list doesn't have undefined items left.
for (var i = 0; i < this.checkedItems.length; i++) {
if (i === position) {
@@ -239,10 +210,7 @@ Drupal.viewsUi.addItemForm.prototype.handleCheck = function (event) {
/**
* Refresh the display of the checked items.
*/
-Drupal.viewsUi.addItemForm.prototype.refreshCheckedItems = function() {
-
- "use strict";
-
+Drupal.viewsUi.AddItemForm.prototype.refreshCheckedItems = function () {
// Perhaps we should precache the text div, too.
this.$selected_div.find('.views-selected-options').html(this.checkedItems.join(', '));
Drupal.viewsUi.resizeModal('', true);
@@ -253,55 +221,51 @@ Drupal.viewsUi.addItemForm.prototype.refreshCheckedItems = function() {
* The following behavior detaches the elements from the DOM, wraps them
* in an unordered list, then appends them to the list of tabs.
*/
-Drupal.behaviors.viewsUiRenderAddViewButton = {};
-
-Drupal.behaviors.viewsUiRenderAddViewButton.attach = function (context, settings) {
-
- "use strict";
-
- var $ = jQuery;
- // Build the add display menu and pull the display input buttons into it.
- var $menu = $('#views-display-menu-tabs', context).once('views-ui-render-add-view-button-processed');
-
- if (!$menu.length) {
- return;
- }
- var $addDisplayDropdown = $('
');
- var $displayButtons = $menu.nextAll('input.add-display').detach();
- $displayButtons.appendTo($addDisplayDropdown.find('.action-list')).wrap('
')
- .parent().first().addClass('first').end().last().addClass('last');
- // Remove the 'Add ' prefix from the button labels since they're being palced
- // in an 'Add' dropdown.
- // @todo This assumes English, but so does $addDisplayDropdown above. Add
- // support for translation.
- $displayButtons.each(function () {
- var label = $(this).val();
- if (label.substr(0, 4) === 'Add ') {
- $(this).val(label.substr(4));
+Drupal.behaviors.viewsUiRenderAddViewButton = {
+ attach: function (context) {
+ // Build the add display menu and pull the display input buttons into it.
+ var $menu = $(context).find('#views-display-menu-tabs').once('views-ui-render-add-view-button-processed');
+ if (!$menu.length) {
+ return;
}
- });
- $addDisplayDropdown.appendTo($menu);
- // Add the click handler for the add display button
- $('li.add > a', $menu).bind('click', function (event) {
- event.preventDefault();
- var $trigger = $(this);
- Drupal.behaviors.viewsUiRenderAddViewButton.toggleMenu($trigger);
- });
- // Add a mouseleave handler to close the dropdown when the user mouses
- // away from the item. We use mouseleave instead of mouseout because
- // the user is going to trigger mouseout when she moves from the trigger
- // link to the sub menu items.
- // We use the live binder because the open class on this item will be
- // toggled on and off and we want the handler to take effect in the cases
- // that the class is present, but not when it isn't.
- $('li.add', $menu).on('mouseleave', function (event) {
- var $this = $(this);
- var $trigger = $this.children('a[href="#"]');
- if ($this.children('.action-list').is(':visible')) {
+ var $addDisplayDropdown = $('
');
+ var $displayButtons = $menu.nextAll('input.add-display').detach();
+ $displayButtons.appendTo($addDisplayDropdown.find('.action-list')).wrap('
')
+ .parent().first().addClass('first').end().last().addClass('last');
+ // Remove the 'Add ' prefix from the button labels since they're being palced
+ // in an 'Add' dropdown.
+ // @todo This assumes English, but so does $addDisplayDropdown above. Add
+ // support for translation.
+ $displayButtons.each(function () {
+ var label = $(this).val();
+ if (label.substr(0, 4) === 'Add ') {
+ $(this).val(label.substr(4));
+ }
+ });
+ $addDisplayDropdown.appendTo($menu);
+
+ // Add the click handler for the add display button
+ $menu.find('li.add > a').on('click', function (event) {
+ event.preventDefault();
+ var $trigger = $(this);
Drupal.behaviors.viewsUiRenderAddViewButton.toggleMenu($trigger);
- }
- });
+ });
+ // Add a mouseleave handler to close the dropdown when the user mouses
+ // away from the item. We use mouseleave instead of mouseout because
+ // the user is going to trigger mouseout when she moves from the trigger
+ // link to the sub menu items.
+ // We use the live binder because the open class on this item will be
+ // toggled on and off and we want the handler to take effect in the cases
+ // that the class is present, but not when it isn't.
+ $('li.add', $menu).on('mouseleave', function (event) {
+ var $this = $(this);
+ var $trigger = $this.children('a[href="#"]');
+ if ($this.children('.action-list').is(':visible')) {
+ Drupal.behaviors.viewsUiRenderAddViewButton.toggleMenu($trigger);
+ }
+ });
+ }
};
/**
@@ -309,26 +273,19 @@ Drupal.behaviors.viewsUiRenderAddViewButton.attach = function (context, settings
* not written specifically for this UI, but I'm not sure where to put it.
*/
Drupal.behaviors.viewsUiRenderAddViewButton.toggleMenu = function ($trigger) {
-
- "use strict";
-
$trigger.parent().toggleClass('open');
$trigger.next().slideToggle('fast');
};
-Drupal.behaviors.viewsUiSearchOptions = {};
-
-Drupal.behaviors.viewsUiSearchOptions.attach = function (context) {
-
- "use strict";
-
- var $ = jQuery;
- // The add item form may have an id of views-ui-add-item-form--n.
- var $form = $(context).find('form[id^="views-ui-add-item-form"]').first();
- // Make sure we don't add more than one event handler to the same form.
- $form = $form.once('views-ui-filter-options');
- if ($form.length) {
- new Drupal.viewsUi.OptionsSearch($form);
+Drupal.behaviors.viewsUiSearchOptions = {
+ attach: function (context) {
+ // The add item form may have an id of views-ui-add-item-form--n.
+ var $form = $(context).find('form[id^="views-ui-add-item-form"]').first();
+ // Make sure we don't add more than one event handler to the same form.
+ $form = $form.once('views-ui-filter-options');
+ if ($form.length) {
+ new Drupal.viewsUi.OptionsSearch($form);
+ }
}
};
@@ -340,171 +297,152 @@ Drupal.behaviors.viewsUiSearchOptions.attach = function (context) {
* containing "taxonomy" in their label.
*/
Drupal.viewsUi.OptionsSearch = function ($form) {
-
- "use strict";
-
this.$form = $form;
// Add a keyup handler to the search box.
this.$searchBox = this.$form.find('#edit-override-controls-options-search');
- this.$searchBox.keyup(jQuery.proxy(this.handleKeyup, this));
+ this.$searchBox.keyup($.proxy(this.handleKeyup, this));
// Get a list of option labels and their corresponding divs and maintain it
// in memory, so we have as little overhead as possible at keyup time.
this.options = this.getOptions(this.$form.find('.filterable-option'));
// Restripe on initial loading.
this.handleKeyup();
// Trap the ENTER key in the search box so that it doesn't submit the form.
- this.$searchBox.keypress(function(event) {
+ this.$searchBox.on('keypress', function (event) {
if (event.which === 13) {
event.preventDefault();
}
});
};
-/**
- * Assemble a list of all the filterable options on the form.
- *
- * @param $allOptions
- * A jQuery object representing the rows of filterable options to be
- * shown and hidden depending on the user's search terms.
- */
-Drupal.viewsUi.OptionsSearch.prototype.getOptions = function ($allOptions) {
-
- "use strict";
-
- var $ = jQuery;
- var i, $label, $description, $option;
- var options = [];
- var length = $allOptions.length;
- for (i = 0; i < length; i++) {
- $option = $($allOptions[i]);
- $label = $option.find('label');
- $description = $option.find('div.description');
- options[i] = {
- // Search on the lowercase version of the label text + description.
- 'searchText': $label.text().toLowerCase() + " " + $description.text().toLowerCase(),
- // Maintain a reference to the jQuery object for each row, so we don't
- // have to create a new object inside the performance-sensitive keyup
- // handler.
- '$div': $option
- };
- }
- return options;
-};
+$.extend(Drupal.viewsUi.OptionsSearch.prototype, {
+ /**
+ * Assemble a list of all the filterable options on the form.
+ *
+ * @param $allOptions
+ * A $ object representing the rows of filterable options to be
+ * shown and hidden depending on the user's search terms.
+ */
+ getOptions: function ($allOptions) {
+ var i, $label, $description, $option;
+ var options = [];
+ var length = $allOptions.length;
+ for (i = 0; i < length; i++) {
+ $option = $($allOptions[i]);
+ $label = $option.find('label');
+ $description = $option.find('div.description');
+ options[i] = {
+ // Search on the lowercase version of the label text + description.
+ 'searchText': $label.text().toLowerCase() + " " + $description.text().toLowerCase(),
+ // Maintain a reference to the jQuery object for each row, so we don't
+ // have to create a new object inside the performance-sensitive keyup
+ // handler.
+ '$div': $option
+ };
+ }
+ return options;
+ },
-/**
- * Keyup handler for the search box that hides or shows the relevant options.
- */
-Drupal.viewsUi.OptionsSearch.prototype.handleKeyup = function (event) {
-
- "use strict";
-
- var found, i, j, option, search, words, wordsLength, zebraClass, zebraCounter;
-
- // Determine the user's search query. The search text has been converted to
- // lowercase.
- search = this.$searchBox.val().toLowerCase();
- words = search.split(' ');
- wordsLength = words.length;
-
- // Start the counter for restriping rows.
- zebraCounter = 0;
-
- // Search through the search texts in the form for matching text.
- var length = this.options.length;
- for (i = 0; i < length; i++) {
- // Use a local variable for the option being searched, for performance.
- option = this.options[i];
- found = true;
- // Each word in the search string has to match the item in order for the
- // item to be shown.
- for (j = 0; j < wordsLength; j++) {
- if (option.searchText.indexOf(words[j]) === -1) {
- found = false;
+ /**
+ * Keyup handler for the search box that hides or shows the relevant options.
+ */
+ handleKeyup: function (event) {
+ var found, i, j, option, search, words, wordsLength, zebraClass, zebraCounter;
+
+ // Determine the user's search query. The search text has been converted to
+ // lowercase.
+ search = this.$searchBox.val().toLowerCase();
+ words = search.split(' ');
+ wordsLength = words.length;
+
+ // Start the counter for restriping rows.
+ zebraCounter = 0;
+
+ // Search through the search texts in the form for matching text.
+ var length = this.options.length;
+ for (i = 0; i < length; i++) {
+ // Use a local variable for the option being searched, for performance.
+ option = this.options[i];
+ found = true;
+ // Each word in the search string has to match the item in order for the
+ // item to be shown.
+ for (j = 0; j < wordsLength; j++) {
+ if (option.searchText.indexOf(words[j]) === -1) {
+ found = false;
+ }
+ }
+ if (found) {
+ // Show the checkbox row, and restripe it.
+ zebraClass = (zebraCounter % 2) ? 'odd' : 'even';
+ option.$div.show();
+ option.$div.removeClass('even odd');
+ option.$div.addClass(zebraClass);
+ zebraCounter++;
+ }
+ else {
+ // The search string wasn't found; hide this item.
+ option.$div.hide();
}
- }
- if (found) {
- // Show the checkbox row, and restripe it.
- zebraClass = (zebraCounter % 2) ? 'odd' : 'even';
- option.$div.show();
- option.$div.removeClass('even odd');
- option.$div.addClass(zebraClass);
- zebraCounter++;
- }
- else {
- // The search string wasn't found; hide this item.
- option.$div.hide();
}
}
-};
-
-Drupal.behaviors.viewsUiPreview = {};
-Drupal.behaviors.viewsUiPreview.attach = function (context, settings) {
-
- "use strict";
-
- var $ = jQuery;
+});
- // Only act on the edit view form.
- var contextualFiltersBucket = $('.views-display-column .views-ui-display-tab-bucket.contextual-filters', context);
- if (contextualFiltersBucket.length === 0) {
- return;
- }
+Drupal.behaviors.viewsUiPreview = {
+ attach: function (context) {
+ // Only act on the edit view form.
+ var $contextualFiltersBucket = $(context).find('.views-display-column .views-ui-display-tab-bucket.contextual-filters');
+ if ($contextualFiltersBucket.length === 0) {
+ return;
+ }
- // If the display has no contextual filters, hide the form where you enter
- // the contextual filters for the live preview. If it has contextual filters,
- // show the form.
- var contextualFilters = $('.views-display-setting a', contextualFiltersBucket);
- if (contextualFilters.length) {
- $('#preview-args').parent().show();
- }
- else {
- $('#preview-args').parent().hide();
- }
+ // If the display has no contextual filters, hide the form where you enter
+ // the contextual filters for the live preview. If it has contextual filters,
+ // show the form.
+ var $contextualFilters = $contextualFiltersBucket.find('.views-display-setting a');
+ if ($contextualFilters.length) {
+ $('#preview-args').parent().show();
+ }
+ else {
+ $('#preview-args').parent().hide();
+ }
- // Executes an initial preview.
- if ($('#edit-displays-live-preview').once('edit-displays-live-preview').is(':checked')) {
- $('#preview-submit').once('edit-displays-live-preview').click();
+ // Executes an initial preview.
+ if ($('#edit-displays-live-preview').once('edit-displays-live-preview').is(':checked')) {
+ $('#preview-submit').once('edit-displays-live-preview').trigger('click');
+ }
}
};
-Drupal.behaviors.viewsUiRearrangeFilter = {};
-Drupal.behaviors.viewsUiRearrangeFilter.attach = function (context, settings) {
-
- "use strict";
-
- var $ = jQuery;
- // Only act on the rearrange filter form.
- if (typeof Drupal.tableDrag === 'undefined' || typeof Drupal.tableDrag['views-rearrange-filters'] === 'undefined') {
- return;
- }
-
- var table = $('#views-rearrange-filters', context).once('views-rearrange-filters');
- var operator = $('.form-item-filter-groups-operator', context).once('views-rearrange-filters');
- if (table.length) {
- new Drupal.viewsUi.rearrangeFilterHandler(table, operator);
+Drupal.behaviors.viewsUiRearrangeFilter = {
+ attach: function (context) {
+ // Only act on the rearrange filter form.
+ if (typeof Drupal.tableDrag === 'undefined' || typeof Drupal.tableDrag['views-rearrange-filters'] === 'undefined') {
+ return;
+ }
+ var $context = $(context);
+ var $table = $context.find('#views-rearrange-filters').once('views-rearrange-filters');
+ var $operator = $context.find('.form-item-filter-groups-operator').once('views-rearrange-filters');
+ if ($table.length) {
+ new Drupal.viewsUi.RearrangeFilterHandler($table, $operator);
+ }
}
};
/**
* Improve the UI of the rearrange filters dialog box.
*/
-Drupal.viewsUi.rearrangeFilterHandler = function (table, operator) {
-
- "use strict";
-
- var $ = jQuery;
+Drupal.viewsUi.RearrangeFilterHandler = function ($table, $operator) {
// Keep a reference to the
being altered and to the div containing
// the filter groups operator dropdown (if it exists).
- this.table = table;
- this.operator = operator;
+ this.table = $table;
+ this.operator = $operator;
this.hasGroupOperator = this.operator.length > 0;
// Keep a reference to all draggable rows within the table.
- this.draggableRows = $('.draggable', table);
+ this.draggableRows = $table.find('.draggable');
// Keep a reference to the buttons for adding and removing filter groups.
this.addGroupButton = $('input#views-add-group');
- this.removeGroupButtons = $('input.views-remove-group', table);
+ this.removeGroupButtons = $table.find('input.views-remove-group');
// Add links that duplicate the functionality of the (hidden) add and remove
// buttons.
@@ -527,9 +465,9 @@ Drupal.viewsUi.rearrangeFilterHandler = function (table, operator) {
// next to the filters in each group, and bind a handler so that they change
// based on the values of the operator dropdown within that group.
this.redrawOperatorLabels();
- $('.views-group-title select', table)
+ $table.find('.views-group-title select')
.once('views-rearrange-filter-handler')
- .bind('change.views-rearrange-filter-handler', $.proxy(this, 'redrawOperatorLabels'));
+ .on('change.views-rearrange-filter-handler', $.proxy(this, 'redrawOperatorLabels'));
// Bind handlers so that when a "Remove" link is clicked, we:
// - Update the rowspans of cells containing an operator dropdown (since they
@@ -537,96 +475,92 @@ Drupal.viewsUi.rearrangeFilterHandler = function (table, operator) {
// - Redraw the operator labels next to the filters in the group (since the
// filter that is currently displayed last in each group is not supposed to
// have a label display next to it).
- $('a.views-groups-remove-link', this.table)
+ $table.find('a.views-groups-remove-link')
.once('views-rearrange-filter-handler')
- .bind('click.views-rearrange-filter-handler', $.proxy(this, 'updateRowspans'))
- .bind('click.views-rearrange-filter-handler', $.proxy(this, 'redrawOperatorLabels'));
+ .on('click.views-rearrange-filter-handler', $.proxy(this, 'updateRowspans'))
+ .on('click.views-rearrange-filter-handler', $.proxy(this, 'redrawOperatorLabels'));
};
-/**
- * Insert links that allow filter groups to be added and removed.
- */
-Drupal.viewsUi.rearrangeFilterHandler.prototype.insertAddRemoveFilterGroupLinks = function () {
-
- "use strict";
-
- var $ = jQuery;
-
- // Insert a link for adding a new group at the top of the page, and make it
- // match the action links styling used in a typical page.tpl.php. Note that
- // Drupal does not provide a theme function for this markup, so this is the
- // best we can do.
- $('
')
- .prependTo(this.table.parent())
- // When the link is clicked, dynamically click the hidden form button for
- // adding a new filter group.
- .once('views-rearrange-filter-handler')
- .bind('click.views-rearrange-filter-handler', $.proxy(this, 'clickAddGroupButton'));
-
- // Find each (visually hidden) button for removing a filter group and insert
- // a link next to it.
- var length = this.removeGroupButtons.length;
- var i;
- for (i = 0; i < length; i++) {
- var $removeGroupButton = $(this.removeGroupButtons[i]);
- var buttonId = $removeGroupButton.attr('id');
- $('' + Drupal.t('Remove group') + '')
- .insertBefore($removeGroupButton)
- // When the link is clicked, dynamically click the corresponding form
- // button.
+$.extend(Drupal.viewsUi.RearrangeFilterHandler.prototype, {
+ /**
+ * Insert links that allow filter groups to be added and removed.
+ */
+ insertAddRemoveFilterGroupLinks: function () {
+
+ // Insert a link for adding a new group at the top of the page, and make it
+ // match the action links styling used in a typical page.tpl.php. Note that
+ // Drupal does not provide a theme function for this markup, so this is the
+ // best we can do.
+ $('
')
+ .prependTo(this.table.parent())
+ // When the link is clicked, dynamically click the hidden form button for
+ // adding a new filter group.
.once('views-rearrange-filter-handler')
- .bind('click.views-rearrange-filter-handler', {buttonId: buttonId}, $.proxy(this, 'clickRemoveGroupButton'));
- }
-};
-
-/**
- * Dynamically click the button that adds a new filter group.
- */
-Drupal.viewsUi.rearrangeFilterHandler.prototype.clickAddGroupButton = function () {
-
- "use strict";
-
- // Due to conflicts between Drupal core's AJAX system and the Views AJAX
- // system, the only way to get this to work seems to be to trigger both the
- // .mousedown() and .submit() events.
- this.addGroupButton.mousedown();
- this.addGroupButton.submit();
- event.preventDefault();
-};
-
-/**
- * Dynamically click a button for removing a filter group.
- *
- * @param event
- * Event being triggered, with event.data.buttonId set to the ID of the
- * form button that should be clicked.
- */
-Drupal.viewsUi.rearrangeFilterHandler.prototype.clickRemoveGroupButton = function (event) {
+ .on('click.views-rearrange-filter-handler', $.proxy(this, 'clickAddGroupButton'));
+
+ // Find each (visually hidden) button for removing a filter group and insert
+ // a link next to it.
+ var length = this.removeGroupButtons.length;
+ var i;
+ for (i = 0; i < length; i++) {
+ var $removeGroupButton = $(this.removeGroupButtons[i]);
+ var buttonId = $removeGroupButton.attr('id');
+ $('' + Drupal.t('Remove group') + '')
+ .insertBefore($removeGroupButton)
+ // When the link is clicked, dynamically click the corresponding form
+ // button.
+ .once('views-rearrange-filter-handler')
+ .on('click.views-rearrange-filter-handler', { buttonId: buttonId }, $.proxy(this, 'clickRemoveGroupButton'));
+ }
+ },
- "use strict";
+ /**
+ * Dynamically click the button that adds a new filter group.
+ */
+ clickAddGroupButton: function () {
+ // Due to conflicts between Drupal core's AJAX system and the Views AJAX
+ // system, the only way to get this to work seems to be to trigger both the
+ // .mousedown() and .submit() events.
+ this.addGroupButton
+ .trigger('mousedown')
+ .trigger('submit');
+ event.preventDefault();
+ },
- // For some reason, here we only need to trigger .submit(), unlike for
- // Drupal.viewsUi.rearrangeFilterHandler.prototype.clickAddGroupButton()
- // where we had to trigger .mousedown() also.
- jQuery('input#' + event.data.buttonId, this.table).submit();
- event.preventDefault();
-};
+ /**
+ * Dynamically click a button for removing a filter group.
+ *
+ * @param event
+ * Event being triggered, with event.data.buttonId set to the ID of the
+ * form button that should be clicked.
+ */
+ clickRemoveGroupButton: function (event) {
+ // For some reason, here we only need to trigger .submit(), unlike for
+ // Drupal.viewsUi.RearrangeFilterHandler.prototype.clickAddGroupButton()
+ // where we had to trigger .mousedown() also.
+ this.table.find('#' + event.data.buttonId).trigger('submit');
+ event.preventDefault();
+ },
-/**
- * Move the groups operator so that it's between the first two groups, and
- * duplicate it between any subsequent groups.
- */
-Drupal.viewsUi.rearrangeFilterHandler.prototype.duplicateGroupsOperator = function () {
+ /**
+ * Move the groups operator so that it's between the first two groups, and
+ * duplicate it between any subsequent groups.
+ */
+ duplicateGroupsOperator: function () {
+ var dropdowns, newRow, titleRow;
- "use strict";
+ var titleRows = $('tr.views-group-title');
- var $ = jQuery;
- var dropdowns, newRow;
+ // Get rid of the explanatory text around the operator; its placement is
+ // explanatory enough.
+ this.operator.find('label').add('div.description').addClass('element-invisible');
+ this.operator.find('select').addClass('form-select');
- var titleRows = $('tr.views-group-title'), titleRow;
+ // Keep a list of the operator dropdowns, so we can sync their behavior later.
+ dropdowns = this.operator;
- // Get rid of the explanatory text around the operator; its placement is
- // explanatory enough.
+ // Move the operator to a new row just above the second group.
+ titleRow = $('tr#views-group-title-2');
this.operator.find('label').add('div.description').addClass('visually-hidden');
this.operator.find('select').addClass('form-select');
@@ -647,261 +581,231 @@ Drupal.viewsUi.rearrangeFilterHandler.prototype.duplicateGroupsOperator = functi
var fakeOperator = this.operator.clone();
fakeOperator.attr('id', '');
newRow = $('
');
- newRow.find('td').append(fakeOperator);
- newRow.insertBefore(titleRow);
- dropdowns = dropdowns.add(fakeOperator);
- }
-
- return dropdowns;
-};
-
-/**
- * Make the duplicated groups operators change in sync with each other.
- */
-Drupal.viewsUi.rearrangeFilterHandler.prototype.syncGroupsOperators = function () {
-
- "use strict";
-
- if (this.dropdowns.length < 2) {
- // We only have one dropdown (or none at all), so there's nothing to sync.
- return;
- }
-
- this.dropdowns.change(jQuery.proxy(this, 'operatorChangeHandler'));
-};
-
-/**
- * Click handler for the operators that appear between filter groups.
- *
- * Forces all operator dropdowns to have the same value.
- */
-Drupal.viewsUi.rearrangeFilterHandler.prototype.operatorChangeHandler = function (event) {
-
- "use strict";
-
- var $ = jQuery;
- var $target = $(event.target);
- var operators = this.dropdowns.find('select').not($target);
-
- // Change the other operators to match this new value.
- operators.val($target.val());
-};
+ newRow.find('td').append(fakeOperator);
+ newRow.insertBefore(titleRow);
+ dropdowns = dropdowns.add(fakeOperator);
+ }
-Drupal.viewsUi.rearrangeFilterHandler.prototype.modifyTableDrag = function () {
+ return dropdowns;
+ },
- "use strict";
+ /**
+ * Make the duplicated groups operators change in sync with each other.
+ */
+ syncGroupsOperators: function () {
+ if (this.dropdowns.length < 2) {
+ // We only have one dropdown (or none at all), so there's nothing to sync.
+ return;
+ }
- var tableDrag = Drupal.tableDrag['views-rearrange-filters'];
- var filterHandler = this;
+ this.dropdowns.on('change', $.proxy(this, 'operatorChangeHandler'));
+ },
/**
- * Override the row.onSwap method from tabledrag.js.
+ * Click handler for the operators that appear between filter groups.
*
- * When a row is dragged to another place in the table, several things need
- * to occur.
- * - The row needs to be moved so that it's within one of the filter groups.
- * - The operator cells that span multiple rows need their rowspan attributes
- * updated to reflect the number of rows in each group.
- * - The operator labels that are displayed next to each filter need to be
- * redrawn, to account for the row's new location.
+ * Forces all operator dropdowns to have the same value.
*/
- tableDrag.row.prototype.onSwap = function () {
- if (filterHandler.hasGroupOperator) {
- // Make sure the row that just got moved (this.group) is inside one of
- // the filter groups (i.e. below an empty marker row or a draggable). If
- // it isn't, move it down one.
- var thisRow = jQuery(this.group);
- var previousRow = thisRow.prev('tr');
- if (previousRow.length && !previousRow.hasClass('group-message') && !previousRow.hasClass('draggable')) {
- // Move the dragged row down one.
- var next = thisRow.next();
- if (next.is('tr')) {
- this.swap('after', next);
+ operatorChangeHandler: function (event) {
+ var $target = $(event.target);
+ var operators = this.dropdowns.find('select').not($target);
+
+ // Change the other operators to match this new value.
+ operators.val($target.val());
+ },
+
+ modifyTableDrag: function () {
+ var tableDrag = Drupal.tableDrag['views-rearrange-filters'];
+ var filterHandler = this;
+
+ /**
+ * Override the row.onSwap method from tabledrag.js.
+ *
+ * When a row is dragged to another place in the table, several things need
+ * to occur.
+ * - The row needs to be moved so that it's within one of the filter groups.
+ * - The operator cells that span multiple rows need their rowspan attributes
+ * updated to reflect the number of rows in each group.
+ * - The operator labels that are displayed next to each filter need to be
+ * redrawn, to account for the row's new location.
+ */
+ tableDrag.row.prototype.onSwap = function () {
+ if (filterHandler.hasGroupOperator) {
+ // Make sure the row that just got moved (this.group) is inside one of
+ // the filter groups (i.e. below an empty marker row or a draggable). If
+ // it isn't, move it down one.
+ var thisRow = $(this.group);
+ var previousRow = thisRow.prev('tr');
+ if (previousRow.length && !previousRow.hasClass('group-message') && !previousRow.hasClass('draggable')) {
+ // Move the dragged row down one.
+ var next = thisRow.next();
+ if (next.is('tr')) {
+ this.swap('after', next);
+ }
}
+ filterHandler.updateRowspans();
}
- filterHandler.updateRowspans();
- }
- // Redraw the operator labels that are displayed next to each filter, to
- // account for the row's new location.
- filterHandler.redrawOperatorLabels();
- };
+ // Redraw the operator labels that are displayed next to each filter, to
+ // account for the row's new location.
+ filterHandler.redrawOperatorLabels();
+ };
- /**
- * Override the onDrop method from tabledrag.js.
- */
- tableDrag.onDrop = function () {
- var $ = jQuery;
-
- // If the tabledrag change marker (i.e., the "*") has been inserted inside
- // a row after the operator label (i.e., "And" or "Or") rearrange the items
- // so the operator label continues to appear last.
- var changeMarker = $(this.oldRowElement).find('.tabledrag-changed');
- if (changeMarker.length) {
- // Search for occurrences of the operator label before the change marker,
- // and reverse them.
- var operatorLabel = changeMarker.prevAll('.views-operator-label');
- if (operatorLabel.length) {
- operatorLabel.insertAfter(changeMarker);
+ /**
+ * Override the onDrop method from tabledrag.js.
+ */
+ tableDrag.onDrop = function () {
+ // If the tabledrag change marker (i.e., the "*") has been inserted inside
+ // a row after the operator label (i.e., "And" or "Or") rearrange the items
+ // so the operator label continues to appear last.
+ var changeMarker = $(this.oldRowElement).find('.tabledrag-changed');
+ if (changeMarker.length) {
+ // Search for occurrences of the operator label before the change marker,
+ // and reverse them.
+ var operatorLabel = changeMarker.prevAll('.views-operator-label');
+ if (operatorLabel.length) {
+ operatorLabel.insertAfter(changeMarker);
+ }
}
- }
- // Make sure the "group" dropdown is properly updated when rows are dragged
- // into an empty filter group. This is borrowed heavily from the block.js
- // implementation of tableDrag.onDrop().
- var groupRow = $(this.rowObject.element).prevAll('tr.group-message').get(0);
- var groupName = groupRow.className.replace(/([^ ]+[ ]+)*group-([^ ]+)-message([ ]+[^ ]+)*/, '$2');
- var groupField = $('select.views-group-select', this.rowObject.element);
- if ($(this.rowObject.element).prev('tr').is('.group-message') && !groupField.is('.views-group-select-' + groupName)) {
- var oldGroupName = groupField.attr('class').replace(/([^ ]+[ ]+)*views-group-select-([^ ]+)([ ]+[^ ]+)*/, '$2');
- groupField.removeClass('views-group-select-' + oldGroupName).addClass('views-group-select-' + groupName);
- groupField.val(groupName);
- }
- };
-};
+ // Make sure the "group" dropdown is properly updated when rows are dragged
+ // into an empty filter group. This is borrowed heavily from the block.js
+ // implementation of tableDrag.onDrop().
+ var groupRow = $(this.rowObject.element).prevAll('tr.group-message').get(0);
+ var groupName = groupRow.className.replace(/([^ ]+[ ]+)*group-([^ ]+)-message([ ]+[^ ]+)*/, '$2');
+ var groupField = $('select.views-group-select', this.rowObject.element);
+ if ($(this.rowObject.element).prev('tr').is('.group-message') && !groupField.is('.views-group-select-' + groupName)) {
+ var oldGroupName = groupField.attr('class').replace(/([^ ]+[ ]+)*views-group-select-([^ ]+)([ ]+[^ ]+)*/, '$2');
+ groupField.removeClass('views-group-select-' + oldGroupName).addClass('views-group-select-' + groupName);
+ groupField.val(groupName);
+ }
+ };
+ },
-/**
- * Redraw the operator labels that are displayed next to each filter.
- */
-Drupal.viewsUi.rearrangeFilterHandler.prototype.redrawOperatorLabels = function () {
-
- "use strict";
-
- var $ = jQuery;
- var i;
- for (i = 0; i < this.draggableRows.length; i++) {
- // Within the row, the operator labels are displayed inside the first table
- // cell (next to the filter name).
- var $draggableRow = $(this.draggableRows[i]);
- var $firstCell = $('td:first', $draggableRow);
- if ($firstCell.length) {
- // The value of the operator label ("And" or "Or") is taken from the
- // first operator dropdown we encounter, going backwards from the current
- // row. This dropdown is the one associated with the current row's filter
- // group.
- var operatorValue = $draggableRow.prevAll('.views-group-title').find('option:selected').html();
- var operatorLabel = '' + operatorValue + '';
- // If the next visible row after this one is a draggable filter row,
- // display the operator label next to the current row. (Checking for
- // visibility is necessary here since the "Remove" links hide the removed
- // row but don't actually remove it from the document).
- var $nextRow = $draggableRow.nextAll(':visible').eq(0);
- var $existingOperatorLabel = $firstCell.find('.views-operator-label');
- if ($nextRow.hasClass('draggable')) {
- // If an operator label was already there, replace it with the new one.
- if ($existingOperatorLabel.length) {
- $existingOperatorLabel.replaceWith(operatorLabel);
+ /**
+ * Redraw the operator labels that are displayed next to each filter.
+ */
+ redrawOperatorLabels: function () {
+ for (var i = 0; i < this.draggableRows.length; i++) {
+ // Within the row, the operator labels are displayed inside the first table
+ // cell (next to the filter name).
+ var $draggableRow = $(this.draggableRows[i]);
+ var $firstCell = $draggableRow.find('td:first');
+ if ($firstCell.length) {
+ // The value of the operator label ("And" or "Or") is taken from the
+ // first operator dropdown we encounter, going backwards from the current
+ // row. This dropdown is the one associated with the current row's filter
+ // group.
+ var operatorValue = $draggableRow.prevAll('.views-group-title').find('option:selected').html();
+ var operatorLabel = '' + operatorValue + '';
+ // If the next visible row after this one is a draggable filter row,
+ // display the operator label next to the current row. (Checking for
+ // visibility is necessary here since the "Remove" links hide the removed
+ // row but don't actually remove it from the document).
+ var $nextRow = $draggableRow.nextAll(':visible').eq(0);
+ var $existingOperatorLabel = $firstCell.find('.views-operator-label');
+ if ($nextRow.hasClass('draggable')) {
+ // If an operator label was already there, replace it with the new one.
+ if ($existingOperatorLabel.length) {
+ $existingOperatorLabel.replaceWith(operatorLabel);
+ }
+ // Otherwise, append the operator label to the end of the table cell.
+ else {
+ $firstCell.append(operatorLabel);
+ }
}
- // Otherwise, append the operator label to the end of the table cell.
+ // If the next row doesn't contain a filter, then this is the last row
+ // in the group. We don't want to display the operator there (since
+ // operators should only display between two related filters, e.g.
+ // "filter1 AND filter2 AND filter3"). So we remove any existing label
+ // that this row has.
else {
- $firstCell.append(operatorLabel);
+ $existingOperatorLabel.remove();
}
}
- // If the next row doesn't contain a filter, then this is the last row
- // in the group. We don't want to display the operator there (since
- // operators should only display between two related filters, e.g.
- // "filter1 AND filter2 AND filter3"). So we remove any existing label
- // that this row has.
- else {
- $existingOperatorLabel.remove();
- }
}
- }
-};
+ },
-/**
- * Update the rowspan attribute of each cell containing an operator dropdown.
- */
-Drupal.viewsUi.rearrangeFilterHandler.prototype.updateRowspans = function () {
-
- "use strict";
-
- var $ = jQuery;
- var i, $row, $currentEmptyRow, draggableCount, $operatorCell;
- var rows = $(this.table).find('tr');
- var length = rows.length;
- for (i = 0; i < length; i++) {
- $row = $(rows[i]);
- if ($row.hasClass('views-group-title')) {
- // This row is a title row.
- // Keep a reference to the cell containing the dropdown operator.
- $operatorCell = $($row.find('td.group-operator'));
- // Assume this filter group is empty, until we find otherwise.
- draggableCount = 0;
- $currentEmptyRow = $row.next('tr');
- $currentEmptyRow.removeClass('group-populated').addClass('group-empty');
- // The cell with the dropdown operator should span the title row and
- // the "this group is empty" row.
- $operatorCell.attr('rowspan', 2);
- }
- else if (($row).hasClass('draggable') && $row.is(':visible')) {
- // We've found a visible filter row, so we now know the group isn't empty.
- draggableCount++;
- $currentEmptyRow.removeClass('group-empty').addClass('group-populated');
- // The operator cell should span all draggable rows, plus the title.
- $operatorCell.attr('rowspan', draggableCount + 1);
+ /**
+ * Update the rowspan attribute of each cell containing an operator dropdown.
+ */
+ updateRowspans: function () {
+ var i, $row, $currentEmptyRow, draggableCount, $operatorCell;
+ var rows = $(this.table).find('tr');
+ var length = rows.length;
+ for (i = 0; i < length; i++) {
+ $row = $(rows[i]);
+ if ($row.hasClass('views-group-title')) {
+ // This row is a title row.
+ // Keep a reference to the cell containing the dropdown operator.
+ $operatorCell = $row.find('td.group-operator');
+ // Assume this filter group is empty, until we find otherwise.
+ draggableCount = 0;
+ $currentEmptyRow = $row.next('tr');
+ $currentEmptyRow.removeClass('group-populated').addClass('group-empty');
+ // The cell with the dropdown operator should span the title row and
+ // the "this group is empty" row.
+ $operatorCell.attr('rowspan', 2);
+ }
+ else if ($row.hasClass('draggable') && $row.is(':visible')) {
+ // We've found a visible filter row, so we now know the group isn't empty.
+ draggableCount++;
+ $currentEmptyRow.removeClass('group-empty').addClass('group-populated');
+ // The operator cell should span all draggable rows, plus the title.
+ $operatorCell.attr('rowspan', draggableCount + 1);
+ }
}
- }
-};
+ }});
-Drupal.behaviors.viewsFilterConfigSelectAll = {};
/**
* Add a select all checkbox, which checks each checkbox at once.
*/
-Drupal.behaviors.viewsFilterConfigSelectAll.attach = function(context) {
-
- "use strict";
-
- var $ = jQuery;
- // Show the select all checkbox.
- $('#views-ui-config-item-form div.form-item-options-value-all', context).once(function() {
- $(this).show();
- })
- .find('input[type=checkbox]')
- .click(function() {
- var checked = $(this).is(':checked');
- // Update all checkbox beside the select all checkbox.
- $(this).parents('.form-checkboxes').find('input[type=checkbox]').each(function() {
- $(this).attr('checked', checked);
- });
- });
- // Uncheck the select all checkbox if any of the others are unchecked.
- $('#views-ui-config-item-form div.form-type-checkbox').not($('.form-item-options-value-all')).find('input[type=checkbox]').each(function() {
- $(this).click(function() {
- if ($(this).is('checked') === false) {
- $('#edit-options-value-all').prop('checked', false);
- }
- });
- });
+Drupal.behaviors.viewsFilterConfigSelectAll = {
+ attach: function (context) {
+ // Show the select all checkbox.
+ $(context).find('#views-ui-config-item-form div.form-item-options-value-all').once('filterConfigSelectAll')
+ .show()
+ .find('input[type=checkbox]')
+ .on('click', function () {
+ var checked = $(this).is(':checked');
+ // Update all checkbox beside the select all checkbox.
+ $(this).parents('.form-checkboxes').find('input[type=checkbox]').each(function () {
+ $(this).attr('checked', checked);
+ });
+ });
+ // Uncheck the select all checkbox if any of the others are unchecked.
+ $('#views-ui-config-item-form').find('div.form-type-checkbox').not($('.form-item-options-value-all'))
+ .find('input[type=checkbox]')
+ .on('click', function () {
+ if ($(this).is('checked') === false) {
+ $('#edit-options-value-all').prop('checked', false);
+ }
+ });
+ }
};
/**
* Remove icon class from elements that are themed as buttons or dropbuttons.
*/
-Drupal.behaviors.viewsRemoveIconClass = {};
-Drupal.behaviors.viewsRemoveIconClass.attach = function (context, settings) {
-
- "use strict";
-
- jQuery(context).find('.dropbutton').once('dropbutton-icon', function () {
- jQuery(this).find('.icon').removeClass('icon');
- });
+Drupal.behaviors.viewsRemoveIconClass = {
+ attach: function (context) {
+ $(context).find('.dropbutton').once('dropbutton-icon', function () {
+ $(this).find('.icon').removeClass('icon');
+ });
+ }
};
/**
* Change "Expose filter" buttons into checkboxes.
*/
-Drupal.behaviors.viewsUiCheckboxify = {};
-Drupal.behaviors.viewsUiCheckboxify.attach = function (context, settings) {
-
- "use strict";
-
- var $ = jQuery;
- var $buttons = $('#edit-options-expose-button-button, #edit-options-group-button-button').once('views-ui-checkboxify');
- var length = $buttons.length;
- var i;
- for (i = 0; i < length; i++) {
- new Drupal.viewsUi.Checkboxifier($buttons[i]);
+Drupal.behaviors.viewsUiCheckboxify = {
+ attach: function (context, settings) {
+ var $buttons = $('#edit-options-expose-button-button, #edit-options-group-button-button').once('views-ui-checkboxify');
+ var length = $buttons.length;
+ var i;
+ for (i = 0; i < length; i++) {
+ new Drupal.viewsUi.Checkboxifier($buttons[i]);
+ }
}
};
@@ -909,30 +813,26 @@ Drupal.behaviors.viewsUiCheckboxify.attach = function (context, settings) {
* Change the default widget to select the default group according to the
* selected widget for the exposed group.
*/
-Drupal.behaviors.viewsUiChangeDefaultWidget = {};
-Drupal.behaviors.viewsUiChangeDefaultWidget.attach = function (context, settings) {
-
- "use strict";
-
- var $ = jQuery;
- function change_default_widget(multiple) {
- if (multiple) {
- $('input.default-radios').hide();
- $('td.any-default-radios-row').parent().hide();
- $('input.default-checkboxes').show();
- }
- else {
- $('input.default-checkboxes').hide();
- $('td.any-default-radios-row').parent().show();
- $('input.default-radios').show();
+Drupal.behaviors.viewsUiChangeDefaultWidget = {
+ attach: function () {
+ function changeDefaultWidget (event) {
+ if ($(event.target).prop('checked')) {
+ $('input.default-radios').hide();
+ $('td.any-default-radios-row').parent().hide();
+ $('input.default-checkboxes').show();
+ }
+ else {
+ $('input.default-checkboxes').hide();
+ $('td.any-default-radios-row').parent().show();
+ $('input.default-radios').show();
+ }
}
+ // Update on widget change.
+ $('input[name="options[group_info][multiple]"]')
+ .on('change', changeDefaultWidget)
+ // Update the first time the form is rendered.
+ .trigger('change');
}
- // Update on widget change.
- $('input[name="options[group_info][multiple]"]').change(function() {
- change_default_widget($(this).attr("checked"));
- });
- // Update the first time the form is rendered.
- $('input[name="options[group_info][multiple]"]').trigger('change');
};
/**
@@ -942,10 +842,6 @@ Drupal.behaviors.viewsUiChangeDefaultWidget.attach = function (context, settings
* The DOM object representing the button to be checkboxified.
*/
Drupal.viewsUi.Checkboxifier = function (button) {
-
- "use strict";
-
- var $ = jQuery;
this.$button = $(button);
this.$parent = this.$button.parent('div.views-expose, div.views-grouped');
this.$input = this.$parent.find('input:checkbox, input:radio');
@@ -961,9 +857,6 @@ Drupal.viewsUi.Checkboxifier = function (button) {
* When the checkbox is checked or unchecked, simulate a button press.
*/
Drupal.viewsUi.Checkboxifier.prototype.clickHandler = function (e) {
-
- "use strict";
-
this.$button.mousedown();
this.$button.submit();
};
@@ -971,52 +864,48 @@ Drupal.viewsUi.Checkboxifier.prototype.clickHandler = function (e) {
/**
* Change the Apply button text based upon the override select state.
*/
-Drupal.behaviors.viewsUiOverrideSelect = {};
-Drupal.behaviors.viewsUiOverrideSelect.attach = function (context, settings) {
-
- "use strict";
-
- var $ = jQuery;
- $('#edit-override-dropdown', context).once('views-ui-override-button-text', function() {
- // Closures! :(
- var $submit = $('#edit-submit', context);
- var old_value = $submit.val();
-
- $submit.once('views-ui-override-button-text')
- .bind('mouseup', function() {
- $(this).val(old_value);
- return true;
- });
-
- $(this).bind('change', function() {
- if ($(this).val() === 'default') {
- $submit.val(Drupal.t('Apply (all displays)'));
- }
- else if ($(this).val() === 'default_revert') {
- $submit.val(Drupal.t('Revert to default'));
- }
- else {
- $submit.val(Drupal.t('Apply (this display)'));
- }
- })
- .trigger('change');
- });
+Drupal.behaviors.viewsUiOverrideSelect = {
+ attach: function (context) {
+ $(context).find('#edit-override-dropdown').once('views-ui-override-button-text', function () {
+ // Closures! :(
+ var $submit = $('#edit-submit');
+ var old_value = $submit.val();
+
+ $submit.once('views-ui-override-button-text')
+ .on('mouseup', function () {
+ $(this).val(old_value);
+ return true;
+ });
+
+ $(this).on('change', function () {
+ var $this = $(this);
+ if ($this.val() === 'default') {
+ $submit.val(Drupal.t('Apply (all displays)'));
+ }
+ else if ($this.val() === 'default_revert') {
+ $submit.val(Drupal.t('Revert to default'));
+ }
+ else {
+ $submit.val(Drupal.t('Apply (this display)'));
+ }
+ })
+ .trigger('change');
+ });
+ }
};
Drupal.viewsUi.resizeModal = function (e, no_shrink) {
-
- "use strict";
-
- var $ = jQuery;
var $modal = $('.views-ui-dialog');
- var $scroll = $('.scroll', $modal);
+ var $window = $(window);
+ var windowWidth = $window.width();
+ var $scroll = $modal.find('.scroll');
if ($modal.size() === 0 || $modal.css('display') === 'none') {
return;
}
- var maxWidth = parseInt($(window).width() * .85); // 70% of window
- var minWidth = parseInt($(window).width() * .6); // 70% of window
+ var maxWidth = parseInt(windowWidth * 0.85, 10); // 85% of window
+ var minWidth = parseInt(windowWidth * 0.6, 10); // 60% of window
// Set the modal to the minwidth so that our width calculation of
// children works.
@@ -1024,7 +913,7 @@ Drupal.viewsUi.resizeModal = function (e, no_shrink) {
var width = minWidth;
// Don't let the window get more than 80% of the display high.
- var maxHeight = parseInt($(window).height() * .8);
+ var maxHeight = parseInt($window.height() * 0.8, 10);
var minHeight = 200;
if (no_shrink) {
minHeight = $modal.height();
@@ -1039,10 +928,10 @@ Drupal.viewsUi.resizeModal = function (e, no_shrink) {
// Calculate the height of the 'scroll' region.
var scrollHeight = 0;
- scrollHeight += parseInt($scroll.css('padding-top'));
- scrollHeight += parseInt($scroll.css('padding-bottom'));
+ scrollHeight += parseInt($scroll.css('padding-top'), 10);
+ scrollHeight += parseInt($scroll.css('padding-bottom'), 10);
- $scroll.children().each(function() {
+ $scroll.children().each(function () {
var w = $(this).innerWidth();
if (w > width) {
width = w;
@@ -1054,8 +943,8 @@ Drupal.viewsUi.resizeModal = function (e, no_shrink) {
// will be.
var difference = 0;
- difference += parseInt($scroll.css('padding-top'));
- difference += parseInt($scroll.css('padding-bottom'));
+ difference += parseInt($scroll.css('padding-top'), 10);
+ difference += parseInt($scroll.css('padding-bottom'), 10);
difference += $('.views-override').outerHeight(true);
difference += $('.views-messages').outerHeight(true);
difference += $('#views-ajax-title').outerHeight(true);
@@ -1098,34 +987,29 @@ Drupal.viewsUi.resizeModal = function (e, no_shrink) {
};
-Drupal.behaviors.viewsUiHandlerRemoveLink = {};
-Drupal.behaviors.viewsUiHandlerRemoveLink.attach = function(context) {
- var $ = jQuery;
-
- // Handle handler deletion by looking for the hidden checkbox and hiding the
- // row.
- $('a.views-remove-link', context).once('views-processed').click(function(event) {
- var id = $(this).attr('id').replace('views-remove-link-', '');
- $('#views-row-' + id, context).hide();
- $('#views-removed-' + id, context).attr('checked', true);
- event.preventDefault();
- });
-
- // Handle display deletion by looking for the hidden checkbox and hiding the
- // row.
- $('a.display-remove-link', context).once('display').click(function(event) {
- var id = $(this).attr('id').replace('display-remove-link-', '');
- $('#display-row-' + id, context).hide();
- $('#display-removed-' + id, context).attr('checked', true);
- event.preventDefault();
- });
+Drupal.behaviors.viewsUiHandlerRemoveLink = {
+ attach: function (context) {
+ var $context = $(context);
+ // Handle handler deletion by looking for the hidden checkbox and hiding the
+ // row.
+ $context.find('a.views-remove-link').once('views').on('click', function (event) {
+ var id = $(this).attr('id').replace('views-remove-link-', '');
+ $context.find('#views-row-' + id).hide();
+ $context.find('#views-removed-' + id).prop('checked', true);
+ event.preventDefault();
+ });
+ // Handle display deletion by looking for the hidden checkbox and hiding the
+ // row.
+ $context.find('a.display-remove-link').once('display').on('click', function (event) {
+ var id = $(this).attr('id').replace('display-remove-link-', '');
+ $context.find('#display-row-' + id).hide();
+ $context.find('#display-removed-' + id).prop('checked', true);
+ event.preventDefault();
+ });
+ }
};
-jQuery(function() {
+$(window).on('resize scroll', debounce(Drupal.viewsUi.resizeModal, 100));
- "use strict"
-
- jQuery(window).bind('resize', Drupal.viewsUi.resizeModal);
- jQuery(window).bind('scroll', Drupal.viewsUi.resizeModal);
-});
+})(jQuery, Drupal, drupalSettings, Drupal.debounce);
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index 295c805..02ee998 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -201,6 +201,7 @@ function views_ui_library_info() {
array('system', 'jquery'),
array('system', 'drupal'),
array('system', 'drupalSettings'),
+ array('system', 'drupal.debounce'),
array('system', 'jquery.once'),
array('system', 'jquery.form'),
array('system', 'drupal.ajax'),