test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #13486 -- Corrected handling of %I in admin javascript version of strftime. Thanks to Bufke for the report, and jmil for the solution. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-05-12 11:00:12 +00:00
parent b6f0fa586b
commit 23976fa4b5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/contrib/admin/media/js/core.js
View File

@ -78,7 +78,7 @@ function findPosX(obj) {
curleft += obj.offsetLeft - ((isOpera) ? 0 : obj.scrollLeft); curleft += obj.offsetLeft - ((isOpera) ? 0 : obj.scrollLeft);
obj = obj.offsetParent; obj = obj.offsetParent;
} }
// IE offsetParent does not include the top-level // IE offsetParent does not include the top-level
if (isIE && obj.parentElement){ if (isIE && obj.parentElement){
curleft += obj.offsetLeft - obj.scrollLeft; curleft += obj.offsetLeft - obj.scrollLeft;
} }
@ -95,7 +95,7 @@ function findPosY(obj) {
curtop += obj.offsetTop - ((isOpera) ? 0 : obj.scrollTop); curtop += obj.offsetTop - ((isOpera) ? 0 : obj.scrollTop);
obj = obj.offsetParent; obj = obj.offsetParent;
} }
// IE offsetParent does not include the top-level // IE offsetParent does not include the top-level
if (isIE && obj.parentElement){ if (isIE && obj.parentElement){
curtop += obj.offsetTop - obj.scrollTop; curtop += obj.offsetTop - obj.scrollTop;
} }
@ -116,7 +116,13 @@ Date.prototype.getCorrectYear = function() {
} }
Date.prototype.getTwelveHours = function() { Date.prototype.getTwelveHours = function() {
return (this.getHours() <= 12) ? this.getHours() : 24 - this.getHours(); hours = this.getHours();
if (hours == 0) {
return 12;
}
else {
return hours <= 12 ? hours : hours-12
}
} }
Date.prototype.getTwoDigitMonth = function() { Date.prototype.getTwoDigitMonth = function() {