|
276 | 276 |
|
277 | 277 | $scope.year = Number($scope.year) + 1; |
278 | 278 | } |
279 | | - , localDateTimestamp = function localDateTimestamp(rawDate, dateFormat) { |
| 279 | + , localDateTimestamp = function localDateTimestamp(rawDate, dateFormatDefinition) { |
280 | 280 |
|
281 | | - var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|MM?M?M?|dd?d?|yy?yy?y?|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g; |
282 | | - var formatDate = dateFormat.match(formattingTokens); |
283 | | - var dateSplit = rawDate.split(/\D/); |
284 | | - var m; |
285 | | - var d; |
286 | | - var y; |
| 281 | + var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|MM?M?M?|dd?d?|yy?yy?y?|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g |
| 282 | + ,formatDate = dateFormatDefinition.match(formattingTokens) |
| 283 | + ,dateSplit, m, d, y, index, el; |
| 284 | + |
| 285 | + for (index = 0; index < datetime.MONTH.length; index += 1) { |
| 286 | + el = datetime.MONTH[index]; |
| 287 | + if (rawDate.indexOf(el) > -1) { |
| 288 | + rawDate = rawDate.replace(el, index + 1); |
| 289 | + break; |
| 290 | + } |
| 291 | + } |
| 292 | + |
| 293 | + dateSplit = rawDate.split(/\D/); |
287 | 294 |
|
288 | | - console.log('tutu'); |
| 295 | + dateSplit = dateSplit.filter(function dateSplitFilter(item) { |
| 296 | + if (item.length > 0) { |
| 297 | + return item; |
| 298 | + } |
| 299 | + }); |
289 | 300 |
|
290 | | - formatDate = formatDate.filter(function (item) { |
| 301 | + formatDate = formatDate.filter(function fromatDateFilter(item) { |
291 | 302 | if (item.match(/^[a-zA-Z]+$/i) !== null) { |
292 | 303 | return item; |
293 | 304 | } |
294 | 305 | }); |
295 | 306 |
|
296 | | - for (var index = 0; index < formatDate.length; index++) { |
297 | | - var element = formatDate[index]; |
| 307 | + for (index = 0; index < formatDate.length; index += 1) { |
| 308 | + el = formatDate[index]; |
298 | 309 |
|
299 | | - if (element.indexOf('d') > -1) { |
| 310 | + if (el.indexOf('d') > -1) { |
300 | 311 | d = dateSplit[index]; |
301 | 312 | } |
302 | 313 |
|
303 | | - if (element.indexOf('M') > -1) { |
| 314 | + if (el.indexOf('M') > -1) { |
304 | 315 | m = dateSplit[index]; |
305 | 316 | } |
306 | 317 |
|
307 | | - if (element.indexOf('y') > -1) { |
| 318 | + if (el.indexOf('y') > -1) { |
308 | 319 | y = dateSplit[index]; |
309 | 320 | } |
310 | 321 | } |
|
0 commit comments