newforms-admin: Moved js from AdminOptions to ModelAdmin.

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4340 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/contrib/admin/options.py

@@ -43,6 +43,7 @@ class ModelAdmin(object):
     save_as = False
     save_on_top = False
     ordering = None
+    js = None
 
     def __init__(self, model):
         self.model = model

django/contrib/admin/views/main.py

@@ -57,8 +57,8 @@ def get_javascript_imports(opts, auto_populated_fields, field_sets):
         js.extend(['js/calendar.js', 'js/admin/DateTimeShortcuts.js'])
     if opts.get_ordered_objects():
         js.extend(['js/getElementsBySelector.js', 'js/dom-drag.js' , 'js/admin/ordering.js'])
-    if opts.admin.js:
-        js.extend(opts.admin.js)
+    if opts.ModelAdmin.js:
+        js.extend(opts.ModelAdmin.js)
     seen_collapse = False
     for field_set in field_sets:
         if not seen_collapse and 'collapse' in field_set.classes:

django/db/models/options.py

@@ -199,10 +199,8 @@ class Options(object):
         return self._field_types[field_type]
 
 class AdminOptions(object):
-    def __init__(self, fields=None, js=None,
-        manager=None):
+    def __init__(self, fields=None, manager=None):
         self.fields = fields
-        self.js = js or []
         self.manager = manager or Manager()
 
     def get_field_sets(self, opts):