Guest User

Admin Disable Document Ready Initialization

a guest
May 8th, 2016
112
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.08 KB | None | 0 0
  1. diff --git a/django/contrib/admin/static/admin/js/actions.js b/django/contrib/admin/static/admin/js/actions.js
  2. index 7041701..d9b63b2 100644
  3. --- a/django/contrib/admin/static/admin/js/actions.js
  4. +++ b/django/contrib/admin/static/admin/js/actions.js
  5. @@ -145,9 +145,12 @@
  6.          selectedClass: "selected"
  7.      };
  8.      $(document).ready(function() {
  9. -        var $actionsEls = $('tr input.action-select');
  10. -        if ($actionsEls.length > 0) {
  11. -            $actionsEls.actions();
  12. +        var $actions = $('.actions');
  13. +        if ($actions.length > 0 && !$actions.data().disableDocumentReady) {
  14. +            var $actionsEls = $('tr input.action-select');
  15. +            if ($actionsEls.length > 0) {
  16. +                $actionsEls.actions();
  17. +            }
  18.          }
  19.      });
  20.  })(django.jQuery);
  21. diff --git a/django/contrib/admin/static/admin/js/inlines.js b/django/contrib/admin/static/admin/js/inlines.js
  22. index a284d76..2ea4f6a 100644
  23. --- a/django/contrib/admin/static/admin/js/inlines.js
  24. +++ b/django/contrib/admin/static/admin/js/inlines.js
  25. @@ -277,13 +277,15 @@
  26.          $(".js-inline-admin-formset").each(function() {
  27.              var data = $(this).data(),
  28.                  inlineOptions = data.inlineFormset;
  29. -            switch(data.inlineType) {
  30. -            case "stacked":
  31. -                $(inlineOptions.name + "-group .inline-related").stackedFormset(inlineOptions.options);
  32. -                break;
  33. -            case "tabular":
  34. -                $(inlineOptions.name + "-group .tabular.inline-related tbody tr").tabularFormset(inlineOptions.options);
  35. -                break;
  36. +            if (!data.disableDocumentReady) {
  37. +                switch(data.inlineType) {
  38. +                case "stacked":
  39. +                    $(inlineOptions.name + "-group .inline-related").stackedFormset(inlineOptions.options);
  40. +                    break;
  41. +                case "tabular":
  42. +                    $(inlineOptions.name + "-group .tabular.inline-related tbody tr").tabularFormset(inlineOptions.options);
  43. +                    break;
  44. +                }
  45.              }
  46.          });
  47.      });
Advertisement
Add Comment
Please, Sign In to add comment