dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixup js/tools.js

Browse Source 
1. Replace == with === and != with !==
2. Add missing semicolons to lines 238 and 241
This commit is contained in:
Milow
2012-11-23 22:58:54 -06:00
parent 1a2a714a16
commit bceb2ee3f9
1 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/js/tools.js
+43 -43
View File
@@ -25,40 +25,40 @@
function ps_round(value, precision) function ps_round(value, precision)
{ {
if (typeof(roundMode) == 'undefined') if (typeof(roundMode) === 'undefined')
roundMode = 2; roundMode = 2;
if (typeof(precision) == 'undefined') if (typeof(precision) === 'undefined')
precision = 2; precision = 2;
method = roundMode; method = roundMode;
if (method == 0) if (method === 0)
return ceilf(value, precision); return ceilf(value, precision);
else if (method == 1) else if (method === 1)
return floorf(value, precision); return floorf(value, precision);
precisionFactor = precision == 0 ? 1 : Math.pow(10, precision); precisionFactor = precision === 0 ? 1 : Math.pow(10, precision);
return Math.round(value * precisionFactor) / precisionFactor; return Math.round(value * precisionFactor) / precisionFactor;
} }
function ceilf(value, precision) function ceilf(value, precision)
{ {
if (typeof(precision) == 'undefined') if (typeof(precision) === 'undefined')
precision = 0; precision = 0;
precisionFactor = precision == 0 ? 1 : Math.pow(10, precision); precisionFactor = precision === 0 ? 1 : Math.pow(10, precision);
tmp = value * precisionFactor; tmp = value * precisionFactor;
tmp2 = tmp.toString(); tmp2 = tmp.toString();
if (tmp2[tmp2.length - 1] == 0) if (tmp2[tmp2.length - 1] === 0)
return value; return value;
return Math.ceil(value * precisionFactor) / precisionFactor; return Math.ceil(value * precisionFactor) / precisionFactor;
} }
function floorf(value, precision) function floorf(value, precision)
{ {
if (typeof(precision) == 'undefined') if (typeof(precision) === 'undefined')
precision = 0; precision = 0;
precisionFactor = precision == 0 ? 1 : Math.pow(10, precision); precisionFactor = precision === 0 ? 1 : Math.pow(10, precision);
tmp = value * precisionFactor; tmp = value * precisionFactor;
tmp2 = tmp.toString(); tmp2 = tmp.toString();
if (tmp2[tmp2.length - 1] == 0) if (tmp2[tmp2.length - 1] === 0)
return value; return value;
return Math.floor(value * precisionFactor) / precisionFactor; return Math.floor(value * precisionFactor) / precisionFactor;
} }
@@ -66,13 +66,13 @@ function floorf(value, precision)
function formatedNumberToFloat(price, currencyFormat, currencySign) function formatedNumberToFloat(price, currencyFormat, currencySign)
{ {
price = price.replace(currencySign, ''); price = price.replace(currencySign, '');
if (currencyFormat == 1) if (currencyFormat === 1)
return parseFloat(price.replace(',', '').replace(' ', '')); return parseFloat(price.replace(',', '').replace(' ', ''));
else if (currencyFormat == 2) else if (currencyFormat === 2)
return parseFloat(price.replace(' ', '').replace(',', '.')); return parseFloat(price.replace(' ', '').replace(',', '.'));
else if (currencyFormat == 3) else if (currencyFormat === 3)
return parseFloat(price.replace('.', '').replace(' ', '').replace(',', '.')); return parseFloat(price.replace('.', '').replace(' ', '').replace(',', '.'));
else if (currencyFormat == 4) else if (currencyFormat === 4)
return parseFloat(price.replace(',', '').replace(' ', '')); return parseFloat(price.replace(',', '').replace(' ', ''));
return price; return price;
} }
@@ -86,15 +86,15 @@ function formatCurrency(price, currencyFormat, currencySign, currencyBlank)
price = ps_round(price, priceDisplayPrecision); price = ps_round(price, priceDisplayPrecision);
if (currencyBlank > 0) if (currencyBlank > 0)
blank = ' '; blank = ' ';
if (currencyFormat == 1) if (currencyFormat === 1)
return currencySign + blank + formatNumber(price, priceDisplayPrecision, ',', '.'); return currencySign + blank + formatNumber(price, priceDisplayPrecision, ',', '.');
if (currencyFormat == 2) if (currencyFormat === 2)
return (formatNumber(price, priceDisplayPrecision, ' ', ',') + blank + currencySign); return (formatNumber(price, priceDisplayPrecision, ' ', ',') + blank + currencySign);
if (currencyFormat == 3) if (currencyFormat === 3)
return (currencySign + blank + formatNumber(price, priceDisplayPrecision, '.', ',')); return (currencySign + blank + formatNumber(price, priceDisplayPrecision, '.', ','));
if (currencyFormat == 4) if (currencyFormat === 4)
return (formatNumber(price, priceDisplayPrecision, ',', '.') + blank + currencySign); return (formatNumber(price, priceDisplayPrecision, ',', '.') + blank + currencySign);
if (currencyFormat == 5) if (currencyFormat === 5)
return (formatNumber(price, priceDisplayPrecision, ' ', '.') + blank + currencySign); return (formatNumber(price, priceDisplayPrecision, ' ', '.') + blank + currencySign);
return price; return price;
} }
@@ -105,15 +105,15 @@ function formatNumber(value, numberOfDecimal, thousenSeparator, virgule)
value = value.toFixed(numberOfDecimal); value = value.toFixed(numberOfDecimal);
var val_string = value+''; var val_string = value+'';
var tmp = val_string.split('.'); var tmp = val_string.split('.');
var abs_val_string = (tmp.length == 2) ? tmp[0] : val_string; var abs_val_string = (tmp.length === 2) ? tmp[0] : val_string;
var deci_string = ('0.' + (tmp.length == 2 ? tmp[1] : 0)).substr(2); var deci_string = ('0.' + (tmp.length === 2 ? tmp[1] : 0)).substr(2);
var nb = abs_val_string.length; var nb = abs_val_string.length;
for (var i = 1 ; i < 4; i++) for (var i = 1 ; i < 4; i++)
if (value >= Math.pow(10, (3 * i))) if (value >= Math.pow(10, (3 * i)))
abs_val_string = abs_val_string.substring(0, nb - (3 * i)) + thousenSeparator + abs_val_string.substring(nb - (3 * i)); abs_val_string = abs_val_string.substring(0, nb - (3 * i)) + thousenSeparator + abs_val_string.substring(nb - (3 * i));
if (parseInt(numberOfDecimal) == 0) if (parseInt(numberOfDecimal) === 0)
return abs_val_string; return abs_val_string;
return abs_val_string + virgule + (deci_string > 0 ? deci_string : '00'); return abs_val_string + virgule + (deci_string > 0 ? deci_string : '00');
} }
@@ -121,27 +121,27 @@ function formatNumber(value, numberOfDecimal, thousenSeparator, virgule)
//change the text of a jQuery element with a sliding effect (velocity could be a number in ms, 'slow' or 'fast', effect1 and effect2 could be slide, fade, hide, show) //change the text of a jQuery element with a sliding effect (velocity could be a number in ms, 'slow' or 'fast', effect1 and effect2 could be slide, fade, hide, show)
function updateTextWithEffect(jQueryElement, text, velocity, effect1, effect2, newClass) function updateTextWithEffect(jQueryElement, text, velocity, effect1, effect2, newClass)
{ {
if(jQueryElement.text() != text) if(jQueryElement.text() !== text)
if(effect1 == 'fade') if(effect1 === 'fade')
jQueryElement.fadeOut(velocity, function(){ jQueryElement.fadeOut(velocity, function(){
$(this).addClass(newClass); $(this).addClass(newClass);
if(effect2 == 'fade') $(this).text(text).fadeIn(velocity); if(effect2 === 'fade') $(this).text(text).fadeIn(velocity);
else if(effect2 == 'slide') $(this).text(text).slideDown(velocity); else if(effect2 === 'slide') $(this).text(text).slideDown(velocity);
else if(effect2 == 'show') $(this).text(text).show(velocity, function(){}); else if(effect2 === 'show') $(this).text(text).show(velocity, function(){});
}); });
else if(effect1 == 'slide') else if(effect1 === 'slide')
jQueryElement.slideUp(velocity, function(){ jQueryElement.slideUp(velocity, function(){
$(this).addClass(newClass); $(this).addClass(newClass);
if(effect2 == 'fade') $(this).text(text).fadeIn(velocity); if(effect2 === 'fade') $(this).text(text).fadeIn(velocity);
else if(effect2 == 'slide') $(this).text(text).slideDown(velocity); else if(effect2 === 'slide') $(this).text(text).slideDown(velocity);
else if(effect2 == 'show') $(this).text(text).show(velocity); else if(effect2 === 'show') $(this).text(text).show(velocity);
}); });
else if(effect1 == 'hide') else if(effect1 === 'hide')
jQueryElement.hide(velocity, function(){ jQueryElement.hide(velocity, function(){
$(this).addClass(newClass); $(this).addClass(newClass);
if(effect2 == 'fade') $(this).text(text).fadeIn(velocity); if(effect2 === 'fade') $(this).text(text).fadeIn(velocity);
else if(effect2 == 'slide') $(this).text(text).slideDown(velocity); else if(effect2 === 'slide') $(this).text(text).slideDown(velocity);
else if(effect2 == 'show') $(this).text(text).show(velocity); else if(effect2 === 'show') $(this).text(text).show(velocity);
}); });
} }
@@ -179,12 +179,12 @@ function print_r(arr, level)
for (var j = 0 ; j < level + 1; j++) for (var j = 0 ; j < level + 1; j++)
level_padding += " "; level_padding += " ";
if (typeof(arr) == 'object') if (typeof(arr) === 'object')
{ //Array/Hashes/Objects { //Array/Hashes/Objects
for (var item in arr) for (var item in arr)
{ {
var value = arr[item]; var value = arr[item];
if (typeof(value) == 'object') { //If it is an array, if (typeof(value) === 'object') { //If it is an array,
dumped_text += level_padding + "'" + item + "' ...\n"; dumped_text += level_padding + "'" + item + "' ...\n";
dumped_text += dump(value,level+1); dumped_text += dump(value,level+1);
} }
@@ -205,7 +205,7 @@ function print_r(arr, level)
function in_array(value, array) function in_array(value, array)
{ {
for (var i in array) for (var i in array)
if (array[i] == value) if (array[i] === value)
return true; return true;
return false; return false;
} }
@@ -214,7 +214,7 @@ function resizeAddressesBox(nameBox)
{ {
maxHeight = 0; maxHeight = 0;
if (typeof(nameBox) == 'undefined') if (typeof(nameBox) === 'undefined')
nameBox = '.address'; nameBox = '.address';
$(nameBox).each(function() $(nameBox).each(function()
{ {
@@ -235,10 +235,10 @@ $(document).ready(function() {
if (!$(this).attr('eventCheckboxChange')) if (!$(this).attr('eventCheckboxChange'))
{ {
$(this).live('change', function() { $(this).checkboxChange(fnChecked, fnUnchecked) }); $(this).live('change', function() { $(this).checkboxChange(fnChecked, fnUnchecked); });
$(this).attr('eventCheckboxChange', true); $(this).attr('eventCheckboxChange', true);
} }
} };
}); });
@@ -248,4 +248,4 @@ $(function(){
window.open(this.href); window.open(this.href);
return false; return false;
}); });
}); });