diff options
author | webchick <webchick@24967.no-reply.drupal.org> | 2012-02-14 13:46:20 -0500 |
---|---|---|
committer | webchick <webchick@24967.no-reply.drupal.org> | 2012-02-14 13:46:20 -0500 |
commit | 476843c25e4da2ac1c6c375b2ee6e2c0f97275ff (patch) | |
tree | e6f669d2c3bf52ec814276050db4ffcb45b32d50 | |
parent | 5251e90c982b867d4bc25386b30f098f365cd52c (diff) | |
download | brdo-476843c25e4da2ac1c6c375b2ee6e2c0f97275ff.tar.gz brdo-476843c25e4da2ac1c6c375b2ee6e2c0f97275ff.tar.bz2 |
Issue #1346914 by droplet: Use .length instead of jQuery.size().
-rw-r--r-- | misc/autocomplete.js | 6 | ||||
-rw-r--r-- | misc/tabledrag.js | 22 | ||||
-rw-r--r-- | misc/tableselect.js | 2 | ||||
-rw-r--r-- | modules/block/block.js | 2 | ||||
-rw-r--r-- | modules/file/file.js | 4 | ||||
-rw-r--r-- | modules/openid/openid.js | 2 | ||||
-rw-r--r-- | modules/profile/profile.js | 2 | ||||
-rw-r--r-- | modules/simpletest/simpletest.js | 4 | ||||
-rw-r--r-- | modules/taxonomy/taxonomy.js | 2 | ||||
-rw-r--r-- | modules/user/user.js | 2 |
10 files changed, 24 insertions, 24 deletions
diff --git a/misc/autocomplete.js b/misc/autocomplete.js index 02a886c21..e5a089259 100644 --- a/misc/autocomplete.js +++ b/misc/autocomplete.js @@ -32,7 +32,7 @@ Drupal.behaviors.autocomplete = { Drupal.autocompleteSubmit = function () { return $('#autocomplete').each(function () { this.owner.hidePopup(); - }).size() == 0; + }).length == 0; }; /** @@ -123,7 +123,7 @@ Drupal.jsAC.prototype.selectDown = function () { } else if (this.popup) { var lis = $('li', this.popup); - if (lis.size() > 0) { + if (lis.length > 0) { this.highlight(lis.get(0)); } } @@ -227,7 +227,7 @@ Drupal.jsAC.prototype.found = function (matches) { // Show popup with matches, if any. if (this.popup) { - if (ul.children().size()) { + if (ul.children().length) { $(this.popup).empty().append(ul).show(); $(this.ariaLive).html(Drupal.t('Autocomplete popup')); } diff --git a/misc/tabledrag.js b/misc/tabledrag.js index 41fd47b6e..0461491f2 100644 --- a/misc/tabledrag.js +++ b/misc/tabledrag.js @@ -123,7 +123,7 @@ Drupal.tableDrag.prototype.initColumns = function () { // Find the first field in this group. for (var d in this.tableSettings[group]) { var field = $('.' + this.tableSettings[group][d].target + ':first', this.table); - if (field.size() && this.tableSettings[group][d].hidden) { + if (field.length && this.tableSettings[group][d].hidden) { var hidden = this.tableSettings[group][d].hidden; var cell = field.parents('td:first'); break; @@ -256,7 +256,7 @@ Drupal.tableDrag.prototype.makeDraggable = function (item) { if ($('td:first .indentation:last', item).length) { $('td:first .indentation:last', item).after(handle); // Update the total width of indentation in this entire table. - self.indentCount = Math.max($('.indentation', item).size(), self.indentCount); + self.indentCount = Math.max($('.indentation', item).length, self.indentCount); } else { $('td:first', item).prepend(handle); @@ -362,7 +362,7 @@ Drupal.tableDrag.prototype.makeDraggable = function (item) { if ($(item).is('.tabledrag-root')) { // Swap with the previous top-level row. var groupHeight = 0; - while (previousRow && $('.indentation', previousRow).size()) { + while (previousRow && $('.indentation', previousRow).length) { previousRow = $(previousRow).prev('tr').get(0); groupHeight += $(previousRow).is(':hidden') ? 0 : previousRow.offsetHeight; } @@ -688,7 +688,7 @@ Drupal.tableDrag.prototype.updateField = function (changedRow, group) { var sourceRow = changedRow; if ($(previousRow).is('.draggable') && $('.' + group, previousRow).length) { if (this.indentEnabled) { - if ($('.indentations', previousRow).size() == $('.indentations', changedRow)) { + if ($('.indentations', previousRow).length == $('.indentations', changedRow)) { sourceRow = previousRow; } } @@ -698,7 +698,7 @@ Drupal.tableDrag.prototype.updateField = function (changedRow, group) { } else if ($(nextRow).is('.draggable') && $('.' + group, nextRow).length) { if (this.indentEnabled) { - if ($('.indentations', nextRow).size() == $('.indentations', changedRow)) { + if ($('.indentations', nextRow).length == $('.indentations', changedRow)) { sourceRow = nextRow; } } @@ -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')).size(); + targetElement.value = $('.indentation', $(sourceElement).parents('tr:first')).length; break; case 'match': // Update the value. @@ -884,7 +884,7 @@ Drupal.tableDrag.prototype.row = function (tableRow, method, indentEnabled, maxD this.element = tableRow; this.method = method; this.group = [tableRow]; - this.groupDepth = $('.indentation', tableRow).size(); + this.groupDepth = $('.indentation', tableRow).length; this.changed = false; this.table = $(tableRow).parents('table:first').get(0); this.indentEnabled = indentEnabled; @@ -892,12 +892,12 @@ Drupal.tableDrag.prototype.row = function (tableRow, method, indentEnabled, maxD this.direction = ''; // Direction the row is being moved. if (this.indentEnabled) { - this.indents = $('.indentation', tableRow).size(); + this.indents = $('.indentation', tableRow).length; this.children = this.findChildren(addClasses); this.group = $.merge(this.group, this.children); // Find the depth of this entire group. for (var n = 0; n < this.group.length; n++) { - this.groupDepth = Math.max($('.indentation', this.group[n]).size(), this.groupDepth); + this.groupDepth = Math.max($('.indentation', this.group[n]).length, this.groupDepth); } } }; @@ -1009,7 +1009,7 @@ Drupal.tableDrag.prototype.row.prototype.validIndentInterval = function (prevRow // Minimum indentation: // Do not orphan the next row. - minIndent = nextRow ? $('.indentation', nextRow).size() : 0; + minIndent = nextRow ? $('.indentation', nextRow).length : 0; // Maximum indentation: if (!prevRow || $(prevRow).is(':not(.draggable)') || $(this.element).is('.tabledrag-root')) { @@ -1021,7 +1021,7 @@ Drupal.tableDrag.prototype.row.prototype.validIndentInterval = function (prevRow } else { // Do not go deeper than as a child of the previous row. - maxIndent = $('.indentation', prevRow).size() + ($(prevRow).is('.tabledrag-leaf') ? 0 : 1); + maxIndent = $('.indentation', prevRow).length + ($(prevRow).is('.tabledrag-leaf') ? 0 : 1); // Limit by the maximum allowed depth for the table. if (this.maxDepth) { maxIndent = Math.min(maxIndent, this.maxDepth - (this.groupDepth - this.indents)); diff --git a/misc/tableselect.js b/misc/tableselect.js index 1abda24d9..8cf7f3622 100644 --- a/misc/tableselect.js +++ b/misc/tableselect.js @@ -8,7 +8,7 @@ Drupal.behaviors.tableSelect = { Drupal.tableSelect = function () { // Do not add a "Select all" checkbox if there are no rows with checkboxes in the table - if ($('td input:checkbox', this).size() == 0) { + if ($('td input:checkbox', this).length == 0) { return; } diff --git a/modules/block/block.js b/modules/block/block.js index ce4995dca..e36737441 100644 --- a/modules/block/block.js +++ b/modules/block/block.js @@ -153,7 +153,7 @@ Drupal.behaviors.blockDrag = { } } // This region has become empty. - if ($(this).next('tr').is(':not(.draggable)') || $(this).next('tr').size() == 0) { + if ($(this).next('tr').is(':not(.draggable)') || $(this).next('tr').length == 0) { $(this).removeClass('region-populated').addClass('region-empty'); } // This region has become populated. diff --git a/modules/file/file.js b/modules/file/file.js index 1071384f8..827374c0f 100644 --- a/modules/file/file.js +++ b/modules/file/file.js @@ -96,7 +96,7 @@ Drupal.file = Drupal.file || { // Check if we're working with an "Upload" button. var $enabledFields = []; - if ($(this).parents('div.form-managed-file').size() > 0) { + if ($(this).parents('div.form-managed-file').length > 0) { $enabledFields = $(this).parents('div.form-managed-file').find('input.form-file'); } @@ -120,7 +120,7 @@ Drupal.file = Drupal.file || { progressBar: function (event) { var clickedButton = this; var $progressId = $(clickedButton).parents('div.form-managed-file').find('input.file-progress'); - if ($progressId.size()) { + if ($progressId.length) { var originalName = $progressId.attr('name'); // Replace the name with the required identifier. diff --git a/modules/openid/openid.js b/modules/openid/openid.js index fdc97fa06..4a09e5a49 100644 --- a/modules/openid/openid.js +++ b/modules/openid/openid.js @@ -7,7 +7,7 @@ Drupal.behaviors.openid = { var cookie = $.cookie('Drupal.visitor.openid_identifier'); // This behavior attaches by ID, so is only valid once on a page. - if (!$('#edit-openid-identifier.openid-processed').size()) { + if (!$('#edit-openid-identifier.openid-processed').length) { if (cookie) { $('#edit-openid-identifier').val(cookie); } diff --git a/modules/profile/profile.js b/modules/profile/profile.js index f842aa08a..f262560d2 100644 --- a/modules/profile/profile.js +++ b/modules/profile/profile.js @@ -24,7 +24,7 @@ Drupal.behaviors.profileDrag = { } } // This category has become empty - if ($(this).next('tr').is(':not(.draggable)') || $(this).next('tr').size() == 0) { + if ($(this).next('tr').is(':not(.draggable)') || $(this).next('tr').length == 0) { $(this).removeClass('category-populated').addClass('category-empty'); } // This category has become populated. diff --git a/modules/simpletest/simpletest.js b/modules/simpletest/simpletest.js index c33ef982a..18ba73480 100644 --- a/modules/simpletest/simpletest.js +++ b/modules/simpletest/simpletest.js @@ -16,7 +16,7 @@ Drupal.behaviors.simpleTestMenuCollapse = { $('div.simpletest-image').click(function () { var trs = $(this).parents('tbody').children('.' + settings.simpleTest[this.id].testClass); var direction = settings.simpleTest[this.id].imageDirection; - var row = direction ? trs.size() - 1 : 0; + var row = direction ? trs.length - 1 : 0; // If clicked in the middle of expanding a group, stop so we can switch directions. if (timeout) { @@ -35,7 +35,7 @@ Drupal.behaviors.simpleTestMenuCollapse = { } } else { - if (row < trs.size()) { + if (row < trs.length) { $(trs[row]).removeClass('js-hide').show(); row++; timeout = setTimeout(rowToggle, 20); diff --git a/modules/taxonomy/taxonomy.js b/modules/taxonomy/taxonomy.js index cc9cdf7a6..1a0c7908a 100644 --- a/modules/taxonomy/taxonomy.js +++ b/modules/taxonomy/taxonomy.js @@ -10,7 +10,7 @@ Drupal.behaviors.termDrag = { attach: function (context, settings) { var table = $('#taxonomy', context); var tableDrag = Drupal.tableDrag.taxonomy; // Get the blocks tableDrag object. - var rows = $('tr', table).size(); + var rows = $('tr', table).length; // When a row is swapped, keep previous and next page classes set. tableDrag.row.prototype.onSwap = function (swappedRow) { diff --git a/modules/user/user.js b/modules/user/user.js index 73af27e5d..042668d81 100644 --- a/modules/user/user.js +++ b/modules/user/user.js @@ -180,7 +180,7 @@ Drupal.behaviors.fieldUserRegistration = { attach: function (context, settings) { var $checkbox = $('form#field-ui-field-edit-form input#edit-instance-settings-user-register-form'); - if ($checkbox.size()) { + if ($checkbox.length) { $('input#edit-instance-required', context).once('user-register-form-checkbox', function () { $(this).bind('change', function (e) { if ($(this).attr('checked')) { |