Skip to content

Commit b01e230

Browse files
kvzkvz
committed
Fixed many global issues
1 parent 3d98803 commit b01e230

File tree

13 files changed

+51
-11
lines changed

13 files changed

+51
-11
lines changed

‎functions/array/array_keys.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
function array_keys( input, search_value, strict ) {
22
// http://kevin.vanzonneveld.net
33
// + original by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
4+
// + input by: Brett Zamir
5+
// + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
46
// * example 1: array_keys( {firstname: 'Kevin', surname: 'van Zonneveld'} );
57
// * returns 1: {0: 'firstname', 1: 'surname'}
68

79
var tmp_arr = {}, strict = !!strict, include = true, cnt = 0;
10+
var key = '';
811

9-
for ( key in input ){
12+
for (key in input) {
1013
include = true;
11-
if ( search_value != undefined ) {
14+
if (search_value != undefined) {
1215
if( strict && input[key] !== search_value ){
1316
include = false;
1417
} else if( input[key] != search_value ){
1518
include = false;
1619
}
1720
}
1821

19-
if( include ) {
22+
if (include) {
2023
tmp_arr[cnt] = key;
2124
cnt++;
2225
}

‎functions/array/each.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ function each(arr) {
2222
}
2323
var arrpos = pointers.indexOf(arr);
2424
var cursor = pointers[arrpos+1];
25+
var pos = 0;
26+
2527
if (!(arr instanceof Array)) {
2628
var ct = 0;
2729
for (var k in arr) {

‎functions/datetime/date.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ function date ( format, timestamp ) {
99
// + improved by: Bryan Elliott
1010
// + improved by: Brett Zamir
1111
// + improved by: David Randall
12+
// + input by: Brett Zamir
13+
// + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
1214
// * example 1: date('H:m:s \\m \\i\\s \\m\\o\\n\\t\\h', 1062402400);
1315
// * returns 1: '09:09:40 m is month'
1416
// * example 2: date('F j, Y, g:i a', 1062462400);
@@ -31,6 +33,7 @@ function date ( format, timestamp ) {
3133
return n;
3234
}
3335
};
36+
var ret = '';
3437
var txt_weekdays = ["Sunday","Monday","Tuesday","Wednesday",
3538
"Thursday","Friday","Saturday"];
3639
var txt_ordin = {1:"st",2:"nd",3:"rd",21:"st",22:"nd",23:"rd",31:"st"};
@@ -92,6 +95,7 @@ function date ( format, timestamp ) {
9295
return pad(f.n(), 2);
9396
},
9497
M: function(){
98+
var t;
9599
t = f.F(); return t.substr(0,3);
96100
},
97101
n: function(){

‎functions/strings/count_chars.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@ function count_chars( str, mode ) {
33
// + original by: Ates Goral (http://magnetiq.com)
44
// + tweaked by: Jack
55
// + bugfixed by: Onno Marsman
6+
// + input by: Brett Zamir
7+
// + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
68
// * example 1: count_chars("Hello World!", 1);
79
// * returns 1: "Hd e!lWor"
810

911
var histogram = new Object(), tmp_arr = new Array();
10-
var key, i, code, mode, strl = 0;
12+
var key, i, code, strl = 0;
1113
var argc = arguments.length;
14+
var mode_even = 0;
1215

1316
if (argc == 1) {
1417
mode = 0;

‎functions/strings/md5.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ function md5 ( str ) {
88
// * example 1: md5('Kevin van Zonneveld');
99
// * returns 1: '6e658d4bfcb59cc13f96c14450ac40b9'
1010

11+
var xl;
12+
1113
var RotateLeft = function(lValue, iShiftBits) {
1214
return (lValue<<iShiftBits) | (lValue>>>(32-iShiftBits));
1315
};

‎functions/strings/md5_file.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ function md5_file ( str_filename ) {
66
// * example 1: md5_file('http://kevin.vanzonneveld.net/pj_test_supportfile_1.htm');
77
// * returns 1: '202cb962ac59075b964b07152d234b70'
88

9+
var buf = '';
10+
911
buf = file_get_contents(str_filename);
1012

1113
if (!buf) {

‎functions/strings/nl2br.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@ function nl2br (str, is_xhtml) {
55
// + improved by: Onno Marsman
66
// + improved by: Atli Þór
77
// + bugfixed by: Onno Marsman
8+
// + input by: Brett Zamir
9+
// + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
810
// * example 1: nl2br('Kevin\nvan\nZonneveld');
911
// * returns 1: 'Kevin<br />\nvan<br />\nZonneveld'
1012
// * example 2: nl2br("\nOne\nTwo\n\nThree\n", false);
1113
// * returns 2: '<br>\nOne<br>\nTwo<br>\n<br>\nThree<br>\n'
1214
// * example 3: nl2br("\nOne\nTwo\n\nThree\n", true);
1315
// * returns 3: '<br />\nOne<br />\nTwo<br />\n<br />\nThree<br />\n'
1416

17+
var breakTag = '';
18+
1519
breakTag = '<br />';
1620
if (typeof is_xhtml != 'undefined' && !is_xhtml) {
1721
breakTag = '<br>';

‎functions/strings/soundex.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@ function soundex(str) {
44
// + tweaked by: Jack
55
// + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
66
// + bugfixed by: Onno Marsman
7+
// + input by: Brett Zamir
8+
// + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
79
// * example 1: soundex('Kevin');
810
// * returns 1: 'K150'
911
// * example 2: soundex('Ellery');
1012
// * returns 2: 'E460'
1113
// * example 3: soundex('Euler');
1214
// * returns 3: 'E460'
1315

16+
var s = '';
1417
var i, j, l, r, p = isNaN(p) ? 4 : p > 10 ? 10 : p < 4 ? 4 : p;
1518
var m = {BFPV: 1, CGJKQSXZ: 2, DT: 3, L: 4, MN: 5, R: 6};
1619
var r = (s = (str+'').toUpperCase().replace(/[^A-Z]/g, "").split("")).splice(0, 1);

‎functions/strings/str_ireplace.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@ function str_ireplace ( search, replace, subject ) {
66
// + tweaked by: Jack
77
// + bugfixed by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
88
// + bugfixed by: Onno Marsman
9+
// + input by: Brett Zamir
10+
// + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
911
// * example 1: str_ireplace('l', 'l', 'HeLLo');
1012
// * returns 1: 'Hello'
1113

1214
var i, k = '';
1315
var searchl = 0;
16+
var reg;
1417

1518
search += '';
1619
searchl = search.length;

‎functions/strings/str_replace.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@ function str_replace(search, replace, subject) {
99
// + input by: Onno Marsman
1010
// + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
1111
// + tweaked by: Onno Marsman
12+
// + input by: Brett Zamir
13+
// + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
1214
// * example 1: str_replace(' ', '.', 'Kevin van Zonneveld');
1315
// * returns 1: 'Kevin.van.Zonneveld'
1416
// * example 2: str_replace(['{name}', 'l'], ['hello', 'm'], '{name}, lars');
1517
// * returns 2: 'hemmo, mars'
1618

1719
var f = search, r = replace, s = subject;
1820
var ra = r instanceof Array, sa = s instanceof Array, f = [].concat(f), r = [].concat(r), i = (s = [].concat(s)).length;
19-
21+
var j = 0;
22+
2023
while (j = 0, i--) {
2124
if (s[i]) {
2225
while (s[i] = (s[i]+'').split(f[j]).join(ra ? r[j] || "" : r[0]), ++j in f){};

0 commit comments

Comments
 (0)