Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #642734 by nod_, yhahn: Fixed Simpletest behaviors should process the elements only once.

8.0.x
catch 2012-04-18 12:29:51 +09:00
parent a5e3fac8d5
commit 812413b922
1 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
core/modules/simpletest/simpletest.js
View File

@ -7,49 +7,50 @@ Drupal.behaviors.simpleTestMenuCollapse = {
attach: function (context, settings) { attach: function (context, settings) {
var timeout = null; var timeout = null;
// Adds expand-collapse functionality. // Adds expand-collapse functionality.
$('div.simpletest-image').each(function () { $('div.simpletest-image').once('simpletest-image', function () {
direction = settings.simpleTest[$(this).attr('id')].imageDirection; var $this = $(this);
$(this).html(settings.simpleTest.images[direction]);
});
// Adds group toggling functionality to arrow images.
$('div.simpletest-image').click(function () {
var trs = $(this).closest('tbody').children('.' + settings.simpleTest[this.id].testClass);
var direction = settings.simpleTest[this.id].imageDirection; var direction = settings.simpleTest[this.id].imageDirection;
var row = direction ? trs.length - 1 : 0; $this.html(settings.simpleTest.images[direction]);
// If clicked in the middle of expanding a group, stop so we can switch directions. // Adds group toggling functionality to arrow images.
if (timeout) { $this.click(function () {
clearTimeout(timeout); 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;
// Function to toggle an individual row according to the current direction. // If clicked in the middle of expanding a group, stop so we can switch directions.
// We set a timeout of 20 ms until the next row will be shown/hidden to if (timeout) {
// create a sliding effect. clearTimeout(timeout);
function rowToggle() { }
if (direction) {
if (row >= 0) { // Function to toggle an individual row according to the current direction.
$(trs[row]).hide(); // We set a timeout of 20 ms until the next row will be shown/hidden to
row--; // create a sliding effect.
timeout = setTimeout(rowToggle, 20); function rowToggle() {
if (direction) {
if (row >= 0) {
$(trs[row]).hide();
row--;
timeout = setTimeout(rowToggle, 20);
}
}
else {
if (row < trs.length) {
$(trs[row]).removeClass('js-hide').show();
row++;
timeout = setTimeout(rowToggle, 20);
}
} }
} }
else {
if (row < trs.length) {
$(trs[row]).removeClass('js-hide').show();
row++;
timeout = setTimeout(rowToggle, 20);
}
}
}
// Kick-off the toggling upon a new click. // Kick-off the toggling upon a new click.
rowToggle(); rowToggle();
// Toggle the arrow image next to the test group title. // Toggle the arrow image next to the test group title.
$(this).html(settings.simpleTest.images[(direction ? 0 : 1)]); $this.html(settings.simpleTest.images[(direction ? 0 : 1)]);
settings.simpleTest[this.id].imageDirection = !direction; settings.simpleTest[this.id].imageDirection = !direction;
});
}); });
} }
}; };
@ -60,7 +61,7 @@ Drupal.behaviors.simpleTestMenuCollapse = {
*/ */
Drupal.behaviors.simpleTestSelectAll = { Drupal.behaviors.simpleTestSelectAll = {
attach: function (context, settings) { attach: function (context, settings) {
$('td.simpletest-select-all').each(function () { $('td.simpletest-select-all').once('simpletest-select-all', function () {
var testCheckboxes = settings.simpleTest['simpletest-test-group-' + $(this).attr('id')].testNames; var testCheckboxes = settings.simpleTest['simpletest-test-group-' + $(this).attr('id')].testNames;
var groupCheckbox = $('<input type="checkbox" class="form-checkbox" id="' + $(this).attr('id') + '-select-all" />'); var groupCheckbox = $('<input type="checkbox" class="form-checkbox" id="' + $(this).attr('id') + '-select-all" />');