From 2c5a198366b035f5b37d6446d620aa86b3abbf83 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 20 Sep 2009 19:14:40 +0000
Subject: [PATCH] - Patch #444402 by sun: clean up of parseInt() usage.
---
misc/tabledrag.js | 12 ++++++------
misc/tableheader.js | 2 +-
modules/color/color.js | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/misc/tabledrag.js b/misc/tabledrag.js
index 0c7acbc751ee..d79eda06c23b 100644
--- a/misc/tabledrag.js
+++ b/misc/tabledrag.js
@@ -293,7 +293,7 @@ Drupal.tableDrag.prototype.makeDraggable = function (item) {
self.rowObject.swap('before', previousRow);
self.rowObject.interval = null;
self.rowObject.indent(0);
- window.scrollBy(0, -parseInt(item.offsetHeight));
+ window.scrollBy(0, -parseInt(item.offsetHeight, 10));
}
handle.get(0).focus(); // Regain focus after the DOM manipulation.
}
@@ -325,7 +325,7 @@ Drupal.tableDrag.prototype.makeDraggable = function (item) {
nextGroupRow = $(nextGroup.group).filter(':last').get(0);
self.rowObject.swap('after', nextGroupRow);
// No need to check for indentation, 0 is the only valid one.
- window.scrollBy(0, parseInt(groupHeight));
+ window.scrollBy(0, parseInt(groupHeight, 10));
}
}
else {
@@ -333,7 +333,7 @@ Drupal.tableDrag.prototype.makeDraggable = function (item) {
self.rowObject.swap('after', nextRow);
self.rowObject.interval = null;
self.rowObject.indent(0);
- window.scrollBy(0, parseInt(item.offsetHeight));
+ window.scrollBy(0, parseInt(item.offsetHeight, 10));
}
handle.get(0).focus(); // Regain focus after the DOM manipulation.
}
@@ -524,11 +524,11 @@ Drupal.tableDrag.prototype.findDropTargetRow = function (x, y) {
// table cells, grab the firstChild of the row and use that instead.
// http://jacob.peargrove.com/blog/2006/technical/table-row-offsettop-bug-in-safari.
if (row.offsetHeight == 0) {
- var rowHeight = parseInt(row.firstChild.offsetHeight) / 2;
+ var rowHeight = parseInt(row.firstChild.offsetHeight, 10) / 2;
}
// Other browsers.
else {
- var rowHeight = parseInt(row.offsetHeight) / 2;
+ var rowHeight = parseInt(row.offsetHeight, 10) / 2;
}
// Because we always insert before, we need to offset the height a bit.
@@ -697,7 +697,7 @@ Drupal.tableDrag.prototype.updateField = function (changedRow, group) {
}
else {
// Assume a numeric input field.
- var weight = parseInt($(targetClass, siblings[0]).val()) || 0;
+ var weight = parseInt($(targetClass, siblings[0]).val(), 10) || 0;
$(targetClass, siblings).each(function () {
this.value = weight;
weight++;
diff --git a/misc/tableheader.js b/misc/tableheader.js
index 1b772af3ca7e..813e4c7cab7d 100644
--- a/misc/tableheader.js
+++ b/misc/tableheader.js
@@ -10,7 +10,7 @@ Drupal.tableHeaderDoScroll = function () {
Drupal.behaviors.tableHeader = {
attach: function (context, settings) {
// This breaks in anything less than IE 7. Prevent it from running.
- if ($.browser.msie && parseInt($.browser.version) < 7) {
+ if ($.browser.msie && parseInt($.browser.version, 10) < 7) {
return;
}
diff --git a/modules/color/color.js b/modules/color/color.js
index a834f11edac7..f6ebc8774ada 100644
--- a/modules/color/color.js
+++ b/modules/color/color.js
@@ -26,7 +26,7 @@ Drupal.behaviors.color = {
// Build a preview.
$('#preview').once('color').append('<div id="gradient"></div>');
var gradient = $('#preview #gradient');
- var h = parseInt(gradient.css('height')) / 10;
+ var h = parseInt(gradient.css('height'), 10) / 10;
for (i = 0; i < h; ++i) {
gradient.append('<div class="gradient-line"></div>');
}
--
GitLab