Changeset 15698 in webkit for trunk/JavaScriptCore/kjs/date_object.cpp
- Timestamp:
- Jul 29, 2006, 5:04:22 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/kjs/date_object.cpp
- Property allow-tabs deleted
r15595 r15698 117 117 { 118 118 if (string == "short") 119 119 return kCFDateFormatterShortStyle; 120 120 if (string == "medium") 121 121 return kCFDateFormatterMediumStyle; 122 122 if (string == "long") 123 123 return kCFDateFormatterLongStyle; 124 124 if (string == "full") 125 125 return kCFDateFormatterFullStyle; 126 126 return defaultStyle; 127 127 } … … 137 137 UString arg0String = args[0]->toString(exec); 138 138 if (arg0String == "custom" && !args[1]->isUndefined()) { 139 140 139 useCustomFormat = true; 140 customFormatString = args[1]->toString(exec); 141 141 } else if (includeDate && includeTime && !args[1]->isUndefined()) { 142 143 142 dateStyle = styleFromArgString(arg0String, dateStyle); 143 timeStyle = styleFromArgString(args[1]->toString(exec), timeStyle); 144 144 } else if (includeDate && !args[0]->isUndefined()) { 145 145 dateStyle = styleFromArgString(arg0String, dateStyle); 146 146 } else if (includeTime && !args[0]->isUndefined()) { 147 147 timeStyle = styleFromArgString(arg0String, timeStyle); 148 148 } 149 149 … … 153 153 154 154 if (useCustomFormat) { 155 156 157 155 CFStringRef customFormatCFString = CFStringCreateWithCharacters(0, (UniChar *)customFormatString.data(), customFormatString.size()); 156 CFDateFormatterSetFormat(formatter, customFormatCFString); 157 CFRelease(customFormatCFString); 158 158 } 159 159 … … 453 453 We use a negative ID to denote the "UTC" variant. 454 454 @begin dateTable 61 455 toString DateProtoFunc::ToString DontEnum|Function0456 toUTCString -DateProtoFunc::ToUTCString DontEnum|Function0457 toDateString DateProtoFunc::ToDateString DontEnum|Function0458 toTimeString DateProtoFunc::ToTimeString DontEnum|Function0459 toLocaleString DateProtoFunc::ToLocaleString DontEnum|Function0460 toLocaleDateString DateProtoFunc::ToLocaleDateString DontEnum|Function0461 toLocaleTimeString DateProtoFunc::ToLocaleTimeString DontEnum|Function0462 valueOf DateProtoFunc::ValueOf DontEnum|Function0463 getTime DateProtoFunc::GetTime DontEnum|Function0464 getFullYear DateProtoFunc::GetFullYear DontEnum|Function0465 getUTCFullYear -DateProtoFunc::GetFullYear DontEnum|Function0466 toGMTString -DateProtoFunc::ToGMTString DontEnum|Function0467 getMonth DateProtoFunc::GetMonth DontEnum|Function0468 getUTCMonth -DateProtoFunc::GetMonth DontEnum|Function0469 getDate DateProtoFunc::GetDate DontEnum|Function0470 getUTCDate -DateProtoFunc::GetDate DontEnum|Function0471 getDay DateProtoFunc::GetDay DontEnum|Function0472 getUTCDay -DateProtoFunc::GetDay DontEnum|Function0473 getHours DateProtoFunc::GetHours DontEnum|Function0474 getUTCHours -DateProtoFunc::GetHours DontEnum|Function0475 getMinutes DateProtoFunc::GetMinutes DontEnum|Function0476 getUTCMinutes -DateProtoFunc::GetMinutes DontEnum|Function0477 getSeconds DateProtoFunc::GetSeconds DontEnum|Function0478 getUTCSeconds -DateProtoFunc::GetSeconds DontEnum|Function0479 getMilliseconds DateProtoFunc::GetMilliSeconds DontEnum|Function0480 getUTCMilliseconds -DateProtoFunc::GetMilliSeconds DontEnum|Function0481 getTimezoneOffset DateProtoFunc::GetTimezoneOffset DontEnum|Function0482 setTime DateProtoFunc::SetTime DontEnum|Function1483 setMilliseconds DateProtoFunc::SetMilliSeconds DontEnum|Function1484 setUTCMilliseconds -DateProtoFunc::SetMilliSeconds DontEnum|Function1485 setSeconds DateProtoFunc::SetSeconds DontEnum|Function2486 setUTCSeconds -DateProtoFunc::SetSeconds DontEnum|Function2487 setMinutes DateProtoFunc::SetMinutes DontEnum|Function3488 setUTCMinutes -DateProtoFunc::SetMinutes DontEnum|Function3489 setHours DateProtoFunc::SetHours DontEnum|Function4490 setUTCHours -DateProtoFunc::SetHours DontEnum|Function4491 setDate DateProtoFunc::SetDate DontEnum|Function1492 setUTCDate -DateProtoFunc::SetDate DontEnum|Function1493 setMonth DateProtoFunc::SetMonth DontEnum|Function2494 setUTCMonth -DateProtoFunc::SetMonth DontEnum|Function2495 setFullYear DateProtoFunc::SetFullYear DontEnum|Function3496 setUTCFullYear -DateProtoFunc::SetFullYear DontEnum|Function3497 setYear DateProtoFunc::SetYear DontEnum|Function1498 getYear DateProtoFunc::GetYear DontEnum|Function0455 toString DateProtoFunc::ToString DontEnum|Function 0 456 toUTCString -DateProtoFunc::ToUTCString DontEnum|Function 0 457 toDateString DateProtoFunc::ToDateString DontEnum|Function 0 458 toTimeString DateProtoFunc::ToTimeString DontEnum|Function 0 459 toLocaleString DateProtoFunc::ToLocaleString DontEnum|Function 0 460 toLocaleDateString DateProtoFunc::ToLocaleDateString DontEnum|Function 0 461 toLocaleTimeString DateProtoFunc::ToLocaleTimeString DontEnum|Function 0 462 valueOf DateProtoFunc::ValueOf DontEnum|Function 0 463 getTime DateProtoFunc::GetTime DontEnum|Function 0 464 getFullYear DateProtoFunc::GetFullYear DontEnum|Function 0 465 getUTCFullYear -DateProtoFunc::GetFullYear DontEnum|Function 0 466 toGMTString -DateProtoFunc::ToGMTString DontEnum|Function 0 467 getMonth DateProtoFunc::GetMonth DontEnum|Function 0 468 getUTCMonth -DateProtoFunc::GetMonth DontEnum|Function 0 469 getDate DateProtoFunc::GetDate DontEnum|Function 0 470 getUTCDate -DateProtoFunc::GetDate DontEnum|Function 0 471 getDay DateProtoFunc::GetDay DontEnum|Function 0 472 getUTCDay -DateProtoFunc::GetDay DontEnum|Function 0 473 getHours DateProtoFunc::GetHours DontEnum|Function 0 474 getUTCHours -DateProtoFunc::GetHours DontEnum|Function 0 475 getMinutes DateProtoFunc::GetMinutes DontEnum|Function 0 476 getUTCMinutes -DateProtoFunc::GetMinutes DontEnum|Function 0 477 getSeconds DateProtoFunc::GetSeconds DontEnum|Function 0 478 getUTCSeconds -DateProtoFunc::GetSeconds DontEnum|Function 0 479 getMilliseconds DateProtoFunc::GetMilliSeconds DontEnum|Function 0 480 getUTCMilliseconds -DateProtoFunc::GetMilliSeconds DontEnum|Function 0 481 getTimezoneOffset DateProtoFunc::GetTimezoneOffset DontEnum|Function 0 482 setTime DateProtoFunc::SetTime DontEnum|Function 1 483 setMilliseconds DateProtoFunc::SetMilliSeconds DontEnum|Function 1 484 setUTCMilliseconds -DateProtoFunc::SetMilliSeconds DontEnum|Function 1 485 setSeconds DateProtoFunc::SetSeconds DontEnum|Function 2 486 setUTCSeconds -DateProtoFunc::SetSeconds DontEnum|Function 2 487 setMinutes DateProtoFunc::SetMinutes DontEnum|Function 3 488 setUTCMinutes -DateProtoFunc::SetMinutes DontEnum|Function 3 489 setHours DateProtoFunc::SetHours DontEnum|Function 4 490 setUTCHours -DateProtoFunc::SetHours DontEnum|Function 4 491 setDate DateProtoFunc::SetDate DontEnum|Function 1 492 setUTCDate -DateProtoFunc::SetDate DontEnum|Function 1 493 setMonth DateProtoFunc::SetMonth DontEnum|Function 2 494 setUTCMonth -DateProtoFunc::SetMonth DontEnum|Function 2 495 setFullYear DateProtoFunc::SetFullYear DontEnum|Function 3 496 setUTCFullYear -DateProtoFunc::SetFullYear DontEnum|Function 3 497 setYear DateProtoFunc::SetYear DontEnum|Function 1 498 getYear DateProtoFunc::GetYear DontEnum|Function 0 499 499 @end 500 500 */ … … 1018 1018 dateString = newPosStr; 1019 1019 } else if (*dateString == '/' && month == -1) { 1020 1020 dateString++; 1021 1021 // This looks like a MM/DD/YYYY date, not an RFC date. 1022 1022 month = day - 1; // 0-based
Note:
See TracChangeset
for help on using the changeset viewer.