diff options
-rw-r--r-- | misc/machine-name.js | 2 | ||||
-rw-r--r-- | misc/tabledrag.js | 6 | ||||
-rw-r--r-- | misc/tableselect.js | 6 | ||||
-rw-r--r-- | modules/block/block.js | 2 | ||||
-rw-r--r-- | modules/field_ui/field_ui.js | 8 | ||||
-rw-r--r-- | modules/file/file.js | 11 | ||||
-rw-r--r-- | modules/filter/filter.js | 4 | ||||
-rw-r--r-- | modules/shortcut/shortcut.admin.js | 2 | ||||
-rw-r--r-- | modules/simpletest/simpletest.js | 2 |
9 files changed, 21 insertions, 22 deletions
diff --git a/misc/machine-name.js b/misc/machine-name.js index 66eb9d472..ced8c4bee 100644 --- a/misc/machine-name.js +++ b/misc/machine-name.js @@ -30,7 +30,7 @@ Drupal.behaviors.machineName = { var $source = $(source_id, context).addClass('machine-name-source'); var $target = $(options.target, context).addClass('machine-name-target'); var $suffix = $(options.suffix, context); - var $wrapper = $target.parents('.form-item:first'); + var $wrapper = $target.closest('.form-item'); // All elements have to exist. if (!$source.length || !$target.length || !$suffix.length || !$wrapper.length) { return; diff --git a/misc/tabledrag.js b/misc/tabledrag.js index 4d4edfbd0..437b08c0f 100644 --- a/misc/tabledrag.js +++ b/misc/tabledrag.js @@ -125,7 +125,7 @@ Drupal.tableDrag.prototype.initColumns = function () { var field = $('.' + this.tableSettings[group][d].target + ':first', this.table); if (field.length && this.tableSettings[group][d].hidden) { var hidden = this.tableSettings[group][d].hidden; - var cell = field.parents('td:first'); + var cell = field.closest('td'); break; } } @@ -754,7 +754,7 @@ Drupal.tableDrag.prototype.updateField = function (changedRow, group) { switch (rowSettings.action) { case 'depth': // Get the depth of the target row. - targetElement.value = $('.indentation', $(sourceElement).parents('tr:first')).length; + targetElement.value = $('.indentation', $(sourceElement).closest('tr')).length; break; case 'match': // Update the value. @@ -886,7 +886,7 @@ Drupal.tableDrag.prototype.row = function (tableRow, method, indentEnabled, maxD this.group = [tableRow]; this.groupDepth = $('.indentation', tableRow).length; this.changed = false; - this.table = $(tableRow).parents('table:first').get(0); + this.table = $(tableRow).closest('table').get(0); this.indentEnabled = indentEnabled; this.maxDepth = maxDepth; this.direction = ''; // Direction the row is being moved. diff --git a/misc/tableselect.js b/misc/tableselect.js index 60b492197..5a88ac20c 100644 --- a/misc/tableselect.js +++ b/misc/tableselect.js @@ -30,7 +30,7 @@ Drupal.tableSelect = function () { checkboxes.each(function () { this.checked = event.target.checked; // Either add or remove the selected class based on the state of the check all checkbox. - $(this).parents('tr:first')[ this.checked ? 'addClass' : 'removeClass' ]('selected'); + $(this).closest('tr').toggleClass('selected', this.checked); }); // Update the title and the state of the check all box. updateSelectAll(event.target.checked); @@ -40,14 +40,14 @@ Drupal.tableSelect = function () { // For each of the checkboxes within the table that are not disabled. checkboxes = $('td input:checkbox:enabled', table).click(function (e) { // Either add or remove the selected class based on the state of the check all checkbox. - $(this).parents('tr:first')[ this.checked ? 'addClass' : 'removeClass' ]('selected'); + $(this).closest('tr').toggleClass('selected', this.checked); // If this is a shift click, we need to highlight everything in the range. // Also make sure that we are actually checking checkboxes over a range and // that a checkbox has been checked or unchecked before. if (e.shiftKey && lastChecked && lastChecked != e.target) { // We use the checkbox's parent TR to do our range searching. - Drupal.tableSelectRange($(e.target).parents('tr')[0], $(lastChecked).parents('tr')[0], e.target.checked); + Drupal.tableSelectRange($(e.target).closest('tr')[0], $(lastChecked).closest('tr')[0], e.target.checked); } // If all checkboxes are checked, make sure the select-all one is checked too, otherwise keep unchecked. diff --git a/modules/block/block.js b/modules/block/block.js index e36737441..72b56733a 100644 --- a/modules/block/block.js +++ b/modules/block/block.js @@ -113,7 +113,7 @@ Drupal.behaviors.blockDrag = { $('select.block-region-select', context).once('block-region-select', function () { $(this).change(function (event) { // Make our new row and select field. - var row = $(this).parents('tr:first'); + var row = $(this).closest('tr'); var select = $(this); tableDrag.rowObject = new tableDrag.row(row); diff --git a/modules/field_ui/field_ui.js b/modules/field_ui/field_ui.js index 3d8881e61..1017937b6 100644 --- a/modules/field_ui/field_ui.js +++ b/modules/field_ui/field_ui.js @@ -28,7 +28,7 @@ Drupal.fieldUIFieldOverview = { // 'Field type' select updates its 'Widget' select. $('.field-type-select', table).each(function () { - this.targetSelect = $('.widget-type-select', $(this).parents('tr').eq(0)); + this.targetSelect = $('.widget-type-select', $(this).closest('tr')); $(this).bind('change keyup', function () { var selectedFieldType = this.options[this.selectedIndex].value; @@ -43,8 +43,8 @@ Drupal.fieldUIFieldOverview = { // 'Existing field' select updates its 'Widget' select and 'Label' textfield. $('.field-select', table).each(function () { - this.targetSelect = $('.widget-type-select', $(this).parents('tr').eq(0)); - this.targetTextfield = $('.label-textfield', $(this).parents('tr').eq(0)); + this.targetSelect = $('.widget-type-select', $(this).closest('tr')); + this.targetTextfield = $('.label-textfield', $(this).closest('tr')); this.targetTextfield .data('field_ui_edited', false) .bind('keyup', function (e) { @@ -140,7 +140,7 @@ Drupal.fieldUIOverview = { */ onChange: function () { var $trigger = $(this); - var row = $trigger.parents('tr:first').get(0); + var row = $trigger.closest('tr').get(0); var rowHandler = $(row).data('fieldUIRowHandler'); var refreshRows = {}; diff --git a/modules/file/file.js b/modules/file/file.js index 827374c0f..1a9f87e4f 100644 --- a/modules/file/file.js +++ b/modules/file/file.js @@ -1,4 +1,3 @@ - /** * @file * Provides JavaScript additions to the managed file field type. @@ -77,7 +76,7 @@ Drupal.file = Drupal.file || { '%filename': this.value, '%extensions': extensionPattern.replace(/\|/g, ', ') }); - $(this).parents('div.form-managed-file').prepend('<div class="messages error file-upload-js-error">' + error + '</div>'); + $(this).closest('div.form-managed-file').prepend('<div class="messages error file-upload-js-error">' + error + '</div>'); this.value = ''; return false; } @@ -96,8 +95,8 @@ Drupal.file = Drupal.file || { // Check if we're working with an "Upload" button. var $enabledFields = []; - if ($(this).parents('div.form-managed-file').length > 0) { - $enabledFields = $(this).parents('div.form-managed-file').find('input.form-file'); + if ($(this).closest('div.form-managed-file').length > 0) { + $enabledFields = $(this).closest('div.form-managed-file').find('input.form-file'); } // Temporarily disable upload fields other than the one we're currently @@ -119,7 +118,7 @@ Drupal.file = Drupal.file || { */ progressBar: function (event) { var clickedButton = this; - var $progressId = $(clickedButton).parents('div.form-managed-file').find('input.file-progress'); + var $progressId = $(clickedButton).closest('div.form-managed-file').find('input.file-progress'); if ($progressId.length) { var originalName = $progressId.attr('name'); @@ -133,7 +132,7 @@ Drupal.file = Drupal.file || { } // Show the progress bar if the upload takes longer than half a second. setTimeout(function () { - $(clickedButton).parents('div.form-managed-file').find('div.ajax-progress-bar').slideDown(); + $(clickedButton).closest('div.form-managed-file').find('div.ajax-progress-bar').slideDown(); }, 500); }, /** diff --git a/modules/filter/filter.js b/modules/filter/filter.js index 94e01c1af..c286159fe 100644 --- a/modules/filter/filter.js +++ b/modules/filter/filter.js @@ -7,9 +7,9 @@ Drupal.behaviors.filterGuidelines = { attach: function (context) { $('.filter-guidelines', context).once('filter-guidelines') .find(':header').hide() - .parents('.filter-wrapper').find('select.filter-list') + .closest('.filter-wrapper').find('select.filter-list') .bind('change', function () { - $(this).parents('.filter-wrapper') + $(this).closest('.filter-wrapper') .find('.filter-guidelines-item').hide() .siblings('.filter-guidelines-' + this.value).show(); }) diff --git a/modules/shortcut/shortcut.admin.js b/modules/shortcut/shortcut.admin.js index dfb76cb06..5554e5a7c 100644 --- a/modules/shortcut/shortcut.admin.js +++ b/modules/shortcut/shortcut.admin.js @@ -106,7 +106,7 @@ Drupal.behaviors.shortcutDrag = { Drupal.behaviors.newSet = { attach: function (context, settings) { var selectDefault = function() { - $($(this).parents('div.form-item').get(1)).find('> label > input').attr('checked', 'checked'); + $(this).closest('form').find('.form-item-set .form-type-radio:last input').attr('checked', 'checked'); }; $('div.form-item-new input').focus(selectDefault).keyup(selectDefault); } diff --git a/modules/simpletest/simpletest.js b/modules/simpletest/simpletest.js index 18ba73480..9cab26101 100644 --- a/modules/simpletest/simpletest.js +++ b/modules/simpletest/simpletest.js @@ -14,7 +14,7 @@ Drupal.behaviors.simpleTestMenuCollapse = { // Adds group toggling functionality to arrow images. $('div.simpletest-image').click(function () { - var trs = $(this).parents('tbody').children('.' + settings.simpleTest[this.id].testClass); + var trs = $(this).closest('tbody').children('.' + settings.simpleTest[this.id].testClass); var direction = settings.simpleTest[this.id].imageDirection; var row = direction ? trs.length - 1 : 0; |