Ticket #12882: 12882.1.diff

File 12882.1.diff, 858 bytes (added by Jannis Leidel, 10 years ago)

Pass true to noConflict as mentioned on http://api.jquery.com/jQuery.noConflict/

  • django/contrib/admin/templates/admin/edit_inline/stacked.html

    diff --git a/django/contrib/admin/templates/admin/edit_inline/stacked.html b/django/contrib/admin/templates/admin/edit_inline/stacked.html
    index fb112a0..2c7e878 100644
    a b  
    6363            })
    6464        });
    6565    });
    66 })(jQuery.noConflict());
     66})(jQuery.noConflict(true));
    6767</script>
  • django/contrib/admin/templates/admin/edit_inline/tabular.html

    diff --git a/django/contrib/admin/templates/admin/edit_inline/tabular.html b/django/contrib/admin/templates/admin/edit_inline/tabular.html
    index dc9552f..ecbed7c 100644
    a b  
    109109            })
    110110        });
    111111    });
    112 })(jQuery.noConflict());
     112})(jQuery.noConflict(true));
    113113</script>
Back to Top