Skip to content

Commit 4ac6df7

Browse files
committed
force curly, updated packages
1 parent 71034a7 commit 4ac6df7

File tree

5 files changed

+1024
-557
lines changed

5 files changed

+1024
-557
lines changed

dist/index.js

Lines changed: 49 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ var String = (function () {
55
}
66
String.IsNullOrWhiteSpace = function (value) {
77
try {
8-
if (value == null || value == 'undefined')
8+
if (value == null || value == 'undefined') {
99
return true;
10+
}
1011
return value.toString().replace(/\s/g, '').length < 1;
1112
}
1213
catch (e) {
@@ -26,10 +27,12 @@ var String = (function () {
2627
var count = 0;
2728
for (var i = 0; i < firstArg.length; i++) {
2829
var current = firstArg[i];
29-
if (i < firstArg.length - 1)
30+
if (i < firstArg.length - 1) {
3031
tempString += current + delimiter;
31-
else
32+
}
33+
else {
3234
tempString += current;
35+
}
3336
}
3437
return tempString;
3538
}
@@ -55,10 +58,12 @@ var String = (function () {
5558
args[_i - 1] = arguments[_i];
5659
}
5760
try {
58-
if (format.match(String.regexNumber))
61+
if (format.match(String.regexNumber)) {
5962
return String.format(String.regexNumber, format, args);
60-
if (format.match(String.regexObject))
63+
}
64+
if (format.match(String.regexObject)) {
6165
return String.format(String.regexObject, format, args, true);
66+
}
6267
return format;
6368
}
6469
catch (e) {
@@ -75,46 +80,54 @@ var String = (function () {
7580
match = s[1].replace('}', '');
7681
}
7782
var arg;
78-
if (parseByObject)
83+
if (parseByObject) {
7984
arg = args[0][x];
80-
else
85+
}
86+
else {
8187
arg = args[x];
82-
if (arg == null || arg == undefined || match.match(/{\d+}/))
88+
}
89+
if (arg == null || arg == undefined || match.match(/{\d+}/)) {
8390
return arg;
91+
}
8492
arg = String.parsePattern(match, arg);
8593
return typeof arg != 'undefined' && arg != null ? arg : String.Empty;
8694
});
8795
};
8896
String.parsePattern = function (match, arg) {
8997
switch (match) {
90-
case 'L':
98+
case 'L': {
9199
arg = arg.toLowerCase();
92100
return arg;
93-
case 'U':
101+
}
102+
case 'U': {
94103
arg = arg.toUpperCase();
95104
return arg;
96-
case 'd':
105+
}
106+
case 'd': {
97107
if (typeof (arg) === 'string') {
98108
return String.getDisplayDateFromString(arg);
99109
}
100110
else if (arg instanceof Date) {
101111
return String.Format('{0:00}.{1:00}.{2:0000}', arg.getDate(), arg.getMonth(), arg.getFullYear());
102112
}
103113
break;
104-
case 's':
114+
}
115+
case 's': {
105116
if (typeof (arg) === 'string') {
106117
return String.getSortableDateFromString(arg);
107118
}
108119
else if (arg instanceof Date) {
109120
return String.Format('{0:0000}-{1:00}-{2:00}', arg.getFullYear(), arg.getMonth(), arg.getDate());
110121
}
111122
break;
112-
case 'n':
123+
}
124+
case 'n': {
113125
if (typeof (arg) !== "string")
114126
arg = arg.toString();
115127
var replacedString = arg.replace(/,/g, '.');
116-
if (isNaN(parseFloat(replacedString)) || replacedString.length <= 3)
128+
if (isNaN(parseFloat(replacedString)) || replacedString.length <= 3) {
117129
break;
130+
}
118131
var numberparts = replacedString.split(/[^0-9]+/g);
119132
var parts = numberparts;
120133
if (numberparts.length > 1) {
@@ -128,18 +141,22 @@ var String = (function () {
128141
output = output + '.' + String.Join('.', remainingGroups);
129142
arg = output + (parts.length > 1 ? ',' + parts[1] : '');
130143
return arg;
131-
default:
144+
}
145+
default: {
132146
break;
147+
}
133148
}
134-
if ((typeof (arg) === 'number' || !isNaN(arg)) && !isNaN(+match) && !String.IsNullOrWhiteSpace(arg))
149+
if ((typeof (arg) === 'number' || !isNaN(arg)) && !isNaN(+match) && !String.IsNullOrWhiteSpace(arg)) {
135150
return String.formatNumber(arg, match);
151+
}
136152
return arg;
137153
};
138154
String.getDisplayDateFromString = function (input) {
139155
var splitted;
140156
splitted = input.split('-');
141-
if (splitted.length <= 1)
157+
if (splitted.length <= 1) {
142158
return input;
159+
}
143160
var day = splitted[splitted.length - 1];
144161
var month = splitted[splitted.length - 2];
145162
var year = splitted[splitted.length - 3];
@@ -149,27 +166,32 @@ var String = (function () {
149166
};
150167
String.getSortableDateFromString = function (input) {
151168
var splitted = input.replace(',', '').split('.');
152-
if (splitted.length <= 1)
169+
if (splitted.length <= 1) {
153170
return input;
171+
}
154172
var times = splitted[splitted.length - 1].split(' ');
155173
var time = String.Empty;
156-
if (times.length > 1)
174+
if (times.length > 1) {
157175
time = times[times.length - 1];
176+
}
158177
var year = splitted[splitted.length - 1].split(' ')[0];
159178
var month = splitted[splitted.length - 2];
160179
var day = splitted[splitted.length - 3];
161180
var result = year + "-" + month + "-" + day;
162-
if (!String.IsNullOrWhiteSpace(time) && time.length > 1)
181+
if (!String.IsNullOrWhiteSpace(time) && time.length > 1) {
163182
result += "T" + time;
164-
else
183+
}
184+
else {
165185
result += "T00:00:00";
186+
}
166187
return result;
167188
};
168189
String.formatNumber = function (input, formatTemplate) {
169190
var count = formatTemplate.length;
170191
var stringValue = input.toString();
171-
if (count <= stringValue.length)
192+
if (count <= stringValue.length) {
172193
return stringValue;
194+
}
173195
var remainingCount = count - stringValue.length;
174196
remainingCount += 1;
175197
return new Array(remainingCount).join('0') + stringValue;
@@ -181,13 +203,16 @@ var String = (function () {
181203
}
182204
var temp = String.Empty;
183205
for (var i = 0; i < args.length; i++) {
184-
if ((typeof args[i] == 'string' && String.IsNullOrWhiteSpace(args[i])) || (typeof args[i] != "number" && typeof args[i] != "string"))
206+
if ((typeof args[i] == 'string' && String.IsNullOrWhiteSpace(args[i]))
207+
|| (typeof args[i] != "number" && typeof args[i] != "string")) {
185208
continue;
209+
}
186210
var arg = "" + args[i];
187211
temp += arg;
188212
for (var i2 = i + 1; i2 < args.length; i2++) {
189-
if (String.IsNullOrWhiteSpace(args[i2]))
213+
if (String.IsNullOrWhiteSpace(args[i2])) {
190214
continue;
215+
}
191216
temp += delimiter;
192217
i = i2 - 1;
193218
break;

0 commit comments

Comments
 (0)