Author: jezdez
Date: 2010-02-01 08:16:44 -0600 (Mon, 01 Feb 2010)
New Revision: 12372
Modified:
django/trunk/django/contrib/admin/media/js/actions.min.js
django/trunk/django/contrib/admin/media/js/collapse.min.js
django/trunk/django/contrib/admin/templates/admin/change_list.html
Log:
Use a closure for embedding the admin actions JavaScript and updated the
minified versions a little bit.
Modified: django/trunk/django/contrib/admin/media/js/actions.min.js
===================================================================
--- django/trunk/django/contrib/admin/media/js/actions.min.js 2010-02-01
14:16:01 UTC (rev 12371)
+++ django/trunk/django/contrib/admin/media/js/actions.min.js 2010-02-01
14:16:44 UTC (rev 12372)
@@ -1 +1,5 @@
-(function(a){a.fn.actions=function(d){var
c=a.extend({},a.fn.actions.defaults,d);var
b=a(this);checker=function(e){if(e){showQuestion()}else{reset()}a(b).attr("checked",e).parent().parent().toggleClass(c.selectedClass,e)};updateCounter=function(){var
e=a(b).filter(":checked").length;a("span._acnt").html(e);a(c.allToggle).attr("checked",function(){if(e==b.length){value=true;showQuestion()}else{value=false;clearAcross()}return
value})};showQuestion=function(){a(c.acrossClears).hide();a(c.acrossQuestions).show();a(c.allContainer).hide()};showClear=function(){a(c.acrossClears).show();a(c.acrossQuestions).hide();a(c.actionContainer).toggleClass(c.selectedClass);a(c.allContainer).show();a(c.counterContainer).hide()};reset=function(){a(c.acrossClears).hide();a(c.acrossQuestions).hide();a(c.allContainer).hide();a(c.counterContainer).show()};clearAcross=function(){reset();a(c.acrossInput).val(0);a(c.actionContainer).removeClass(c.selectedClass)};a(c.counterContainer).show();a(this).filter(":checked").each(function(e){a(this).parent().parent().toggleClass(c.selectedClass);updateCounter();if(a(c.acrossInput).val()==1){showClear()}});a(c.allToggle).show().click(function(){checker(a(this).attr("checked"));updateCounter()});a("div.actions
span.question
a").click(function(e){e.preventDefault();a(c.acrossInput).val(1);showClear()});a("div.actions
span.clear
a").click(function(e){e.preventDefault();a(c.allToggle).attr("checked",false);clearAcross();checker(0);updateCounter()});lastChecked=null;a(b).click(function(f){if(!f){var
f=window.event}var
g=f.target?f.target:f.srcElement;if(lastChecked&&a.data(lastChecked)!=a.data(g)&&f.shiftKey==true){var
e=false;a(lastChecked).attr("checked",g.checked).parent().parent().toggleClass(c.selectedClass,g.checked);a(b).each(function(){if(a.data(this)==a.data(lastChecked)||a.data(this)==a.data(g)){e=(e)?false:true}if(e){a(this).attr("checked",g.checked).parent().parent().toggleClass(c.selectedClass,g.checked)}})}a(g).parent().parent().toggleClass(c.selectedClass,g.checked);lastChecked=g;updateCounter()})};a.fn.actions.defaults={actionContainer:"div.actions",counterContainer:"span.action-counter",allContainer:"div.actions
span.all",acrossInput:"div.actions
input.select-across",acrossQuestions:"div.actions
span.question",acrossClears:"div.actions
span.clear",allToggle:"#action-toggle",selectedClass:"selected"}})(jQuery);
\ No newline at end of file
+(function(a){a.fn.actions=function(g){var
b=a.extend({},a.fn.actions.defaults,g),e=a(this);checker=function(c){c?showQuestion():reset();a(e).attr("checked",c).parent().parent().toggleClass(b.selectedClass,c)};updateCounter=function(){var
c=a(e).filter(":checked").length;a("span._acnt").html(c);a(b.allToggle).attr("checked",function(){if(c==e.length){value=true;showQuestion()}else{value=false;clearAcross()}return
value})};showQuestion=function(){a(b.acrossClears).hide();a(b.acrossQuestions).show();
+a(b.allContainer).hide()};showClear=function(){a(b.acrossClears).show();a(b.acrossQuestions).hide();a(b.actionContainer).toggleClass(b.selectedClass);a(b.allContainer).show();a(b.counterContainer).hide()};reset=function(){a(b.acrossClears).hide();a(b.acrossQuestions).hide();a(b.allContainer).hide();a(b.counterContainer).show()};clearAcross=function(){reset();a(b.acrossInput).val(0);a(b.actionContainer).removeClass(b.selectedClass)};a(b.counterContainer).show();a(this).filter(":checked").each(function(){a(this).parent().parent().toggleClass(b.selectedClass);
+updateCounter();a(b.acrossInput).val()==1&&showClear()});a(b.allToggle).show().click(function(){checker(a(this).attr("checked"));updateCounter()});a("div.actions
span.question
a").click(function(c){c.preventDefault();a(b.acrossInput).val(1);showClear()});a("div.actions
span.clear
a").click(function(c){c.preventDefault();a(b.allToggle).attr("checked",false);clearAcross();checker(0);updateCounter()});lastChecked=null;a(e).click(function(c){if(!c)c=window.event;var
d=c.target?c.target:c.srcElement;if(lastChecked&&
+a.data(lastChecked)!=a.data(d)&&c.shiftKey==true){var
f=false;a(lastChecked).attr("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked);a(e).each(function(){if(a.data(this)==a.data(lastChecked)||a.data(this)==a.data(d))f=f?false:true;f&&a(this).attr("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked)})}a(d).parent().parent().toggleClass(b.selectedClass,d.checked);lastChecked=d;updateCounter()})};a.fn.actions.defaults={actionContainer:"div.actions",
+counterContainer:"span.action-counter",allContainer:"div.actions
span.all",acrossInput:"div.actions
input.select-across",acrossQuestions:"div.actions
span.question",acrossClears:"div.actions
span.clear",allToggle:"#action-toggle",selectedClass:"selected"}})(jQuery);
Modified: django/trunk/django/contrib/admin/media/js/collapse.min.js
===================================================================
--- django/trunk/django/contrib/admin/media/js/collapse.min.js 2010-02-01
14:16:01 UTC (rev 12371)
+++ django/trunk/django/contrib/admin/media/js/collapse.min.js 2010-02-01
14:16:44 UTC (rev 12372)
@@ -1 +1,2 @@
-(function(a){a(document).ready(function(){a("fieldset.collapse").each(function(b,c){if(a(c).find("div.errors").length==0){a(c).addClass("collapsed");a(c).find("h2").first().append('
(<a id="fieldsetcollapser'+b+'" class="collapse-toggle"
href="#">'+gettext("Show")+"</a>)")}});a("fieldset.collapse
a.collapse-toggle").toggle(function(){a(this).text(gettext("Hide"));a(this).closest("fieldset").removeClass("collapsed");return
false},function(){a(this).text(gettext("Show"));a(this).closest("fieldset").addClass("collapsed");return
false})})})(jQuery);
\ No newline at end of file
+(function(a){a(document).ready(function(){a("fieldset.collapse").each(function(c,b){if(a(b).find("div.errors").length==0){a(b).addClass("collapsed");a(b).find("h2").first().append('
(<a id="fieldsetcollapser'+c+'" class="collapse-toggle"
href="#">'+gettext("Show")+"</a>)")}});a("fieldset.collapse
a.collapse-toggle").toggle(function(){a(this).text(gettext("Hide"));a(this).closest("fieldset").removeClass("collapsed");return
false},function(){a(this).text(gettext("Show"));a(this).closest("fieldset").addClass("collapsed");
+return false})})})(jQuery);
Modified: django/trunk/django/contrib/admin/templates/admin/change_list.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/change_list.html
2010-02-01 14:16:01 UTC (rev 12371)
+++ django/trunk/django/contrib/admin/templates/admin/change_list.html
2010-02-01 14:16:44 UTC (rev 12372)
@@ -20,10 +20,11 @@
{% block extrahead %}
{{ block.super }}
<script type="text/javascript">
-jQuery.noConflict();
-jQuery(document).ready(function($) {
- $("tr input.action-select").actions();
-});
+(function($) {
+ $(document).ready(function($) {
+ $("tr input.action-select").actions();
+ });
+})(jQuery.noConflict());
</script>
{% endblock %}
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
