summaryrefslogtreecommitdiff
path: root/django/contrib/admin
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2006-07-07 04:11:10 +0000
committerAdrian Holovaty <adrian@holovaty.com>2006-07-07 04:11:10 +0000
commit83c6fff22acfe3a7994105b798403f6a16208cfc (patch)
tree9009b95f056ec2d92d1c66868421032916df4789 /django/contrib/admin
parentde9630c60e944a075b164a1d11ba4853a12b1760 (diff)
Fixed #2142 -- Fixed JavaScript warnings in admin JS. Thanks, mike.capp@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3287 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/contrib/admin')
-rw-r--r--django/contrib/admin/media/js/admin/DateTimeShortcuts.js2
-rw-r--r--django/contrib/admin/media/js/core.js1
2 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/admin/media/js/admin/DateTimeShortcuts.js b/django/contrib/admin/media/js/admin/DateTimeShortcuts.js
index ed99c6103d..35199baf84 100644
--- a/django/contrib/admin/media/js/admin/DateTimeShortcuts.js
+++ b/django/contrib/admin/media/js/admin/DateTimeShortcuts.js
@@ -217,7 +217,7 @@ var DateTimeShortcuts = {
DateTimeShortcuts.dismissCalendar(num);
},
cancelEventPropagation: function(e) {
- if (!e) var e = window.event;
+ if (!e) e = window.event;
e.cancelBubble = true;
if (e.stopPropagation) e.stopPropagation();
}
diff --git a/django/contrib/admin/media/js/core.js b/django/contrib/admin/media/js/core.js
index 8eba69c9bb..d35bd29c1c 100644
--- a/django/contrib/admin/media/js/core.js
+++ b/django/contrib/admin/media/js/core.js
@@ -19,6 +19,7 @@ function removeEvent(obj, evType, fn) {
return true;
} else if (obj.detachEvent) {
obj.detachEvent("on" + evType, fn);
+ return true;
} else {
return false;
}