From 857999310782bddf28745d25803edc72fb1d7f98 Mon Sep 17 00:00:00 2001 From: "AppleGrew (applegrew)" Date: Sun, 19 Aug 2012 23:13:15 +0530 Subject: [PATCH 01/10] v1.1 changes. Lots of fixes and redesign. Also added a full fledged project for testing out the components. --- .gitignore | 4 + django_select2/__init__.py | 2 +- django_select2/fields.py | 156 ++++++++++------ django_select2/static/css/extra.css | 3 + django_select2/static/js/heavy_data.js | 194 ++++++++++++++++---- django_select2/util.py | 14 ++ django_select2/views.py | 2 +- django_select2/widgets.py | 116 ++++++++---- testapp/manage.py | 10 + testapp/test.db | Bin 0 -> 131072 bytes testapp/testapp/__init__.py | 0 testapp/testapp/settings.py | 164 +++++++++++++++++ testapp/testapp/templates/form.html | 9 + testapp/testapp/templates/index.html | 5 + testapp/testapp/templates/list.html | 8 + testapp/testapp/urls.py | 15 ++ testapp/testapp/wsgi.py | 28 +++ testapp/testmain/__init__.py | 0 testapp/testmain/fixtures/initial_data.json | 81 ++++++++ testapp/testmain/forms.py | 17 ++ testapp/testmain/models.py | 16 ++ testapp/testmain/urls.py | 6 + testapp/testmain/views.py | 25 +++ 23 files changed, 744 insertions(+), 131 deletions(-) create mode 100644 .gitignore create mode 100644 testapp/manage.py create mode 100644 testapp/test.db create mode 100644 testapp/testapp/__init__.py create mode 100644 testapp/testapp/settings.py create mode 100644 testapp/testapp/templates/form.html create mode 100644 testapp/testapp/templates/index.html create mode 100644 testapp/testapp/templates/list.html create mode 100644 testapp/testapp/urls.py create mode 100644 testapp/testapp/wsgi.py create mode 100644 testapp/testmain/__init__.py create mode 100644 testapp/testmain/fixtures/initial_data.json create mode 100644 testapp/testmain/forms.py create mode 100644 testapp/testmain/models.py create mode 100644 testapp/testmain/urls.py create mode 100644 testapp/testmain/views.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..01b11e8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ + +testapp/tt.py + +*.pyc diff --git a/django_select2/__init__.py b/django_select2/__init__.py index 5c7ebe3..e155cd7 100644 --- a/django_select2/__init__.py +++ b/django_select2/__init__.py @@ -1,4 +1,4 @@ -__version__ = "1.0" +__version__ = "1.1" from django.conf import settings if settings.configured: diff --git a/django_select2/fields.py b/django_select2/fields.py index ececda6..e981934 100644 --- a/django_select2/fields.py +++ b/django_select2/fields.py @@ -12,11 +12,12 @@ class AutoViewFieldMixin(object): return True def get_results(self, request, term, page, context): - raise NotImplemented + raise NotImplementedError import copy from django import forms +from django.forms.models import ModelChoiceIterator from django.db.models import Q from django.utils.translation import ugettext_lazy as _ from django.utils.encoding import smart_unicode @@ -28,8 +29,8 @@ from .views import NO_ERR_RESP class ModelResultJsonMixin(object): - def __init__(self, **kwargs): - if self.queryset is None: + def __init__(self, *args, **kwargs): + if self.queryset is None and not kwargs.has_key('queryset'): raise ValueError('queryset is required.') if not self.search_fields: @@ -38,7 +39,7 @@ class ModelResultJsonMixin(object): self.max_results = getattr(self, 'max_results', None) self.to_field_name = getattr(self, 'to_field_name', 'pk') - super(ModelResultJsonMixin, self).__init__(**kwargs) + super(ModelResultJsonMixin, self).__init__(*args, **kwargs) def label_from_instance(self, obj): return smart_unicode(obj) @@ -72,48 +73,105 @@ class ModelResultJsonMixin(object): res = [ (getattr(obj, self.to_field_name), self.label_from_instance(obj), ) for obj in res ] return (NO_ERR_RESP, has_more, res, ) -class ModelValueMixin(object): - default_error_messages = { - 'invalid_choice': _(u'Select a valid choice. That choice is not one of' - u' the available choices.'), - } +class UnhideableQuerysetType(type): - def __init__(self, **kwargs): - if self.queryset is None: - raise ValueError('queryset is required.') + def __new__(cls, name, bases, dct): + _q = dct.get('queryset', None) + if _q is not None and not isinstance(_q, property): + # This hack is needed since users are allowed to + # provide queryset in sub-classes by declaring + # class variable named - queryset, which will + # effectively hide the queryset declared in this + # mixin. + dct.pop('queryset') # Throwing away the sub-class queryset + dct['_subclass_queryset'] = _q - self.to_field_name = getattr(self, 'to_field_name', 'pk') + return type.__new__(cls, name, bases, dct) - super(ModelValueMixin, self).__init__(**kwargs) + def __call__(cls, *args, **kwargs): + queryset = kwargs.get('queryset', None) + if not queryset and hasattr(cls, '_subclass_queryset'): + kwargs['queryset'] = getattr(cls, '_subclass_queryset') + return type.__call__(cls, *args, **kwargs) - def to_python(self, value): - if value in EMPTY_VALUES: - return None - try: - key = self.to_field_name - value = self.queryset.get(**{key: value}) - except (ValueError, self.queryset.model.DoesNotExist): - raise ValidationError(self.error_messages['invalid_choice']) - return value +class ChoiceMixin(object): + def _get_choices(self): + if hasattr(self, '_choices'): + return self._choices + + def _set_choices(self, value): + # Setting choices also sets the choices on the widget. + # choices can be any iterable, but we call list() on it because + # it will be consumed more than once. + self._choices = self.widget.choices = list(value) + + choices = property(_get_choices, _set_choices) + +class QuerysetChoiceMixin(ChoiceMixin): + def _get_choices(self): + # If self._choices is set, then somebody must have manually set + # the property self.choices. In this case, just return self._choices. + if hasattr(self, '_choices'): + return self._choices + + # Otherwise, execute the QuerySet in self.queryset to determine the + # choices dynamically. Return a fresh ModelChoiceIterator that has not been + # consumed. Note that we're instantiating a new ModelChoiceIterator *each* + # time _get_choices() is called (and, thus, each time self.choices is + # accessed) so that we can ensure the QuerySet has not been consumed. This + # construct might look complicated but it allows for lazy evaluation of + # the queryset. + return ModelChoiceIterator(self) + + choices = property(_get_choices, ChoiceMixin._set_choices) + +class ModelChoiceField(forms.ModelChoiceField): + def __init__(self, *args, **kwargs): + queryset = kwargs.pop('queryset', None) + empty_label = kwargs.pop('empty_label', u"---------") + cache_choices = kwargs.pop('cache_choices', False) + required = kwargs.pop('required', True) + widget = kwargs.pop('widget', getattr(self, 'widget', None)) + label = kwargs.pop('label', None) + initial = kwargs.pop('initial', None) + help_text = kwargs.pop('help_text', None) + to_field_name = kwargs.pop('to_field_name', 'pk') + + if hasattr(self, '_choices'): # If it exists then probably it is set by HeavySelect2FieldBase. + # We are not gonna use that anyway. + del self._choices + + super(ModelChoiceField, self).__init__(queryset, empty_label, cache_choices, required, + widget, label, initial, help_text, to_field_name) + + if hasattr(self, 'set_placeholder'): + self.widget.set_placeholder(self.empty_label) + + def _get_queryset(self): + if hasattr(self, '_queryset'): + return self._queryset + + queryset = property(_get_queryset, forms.ModelChoiceField._set_queryset) class Select2ChoiceField(forms.ChoiceField): widget = Select2Widget -class Select2MultipleChoiceField(forms.ChoiceField): +class Select2MultipleChoiceField(forms.MultipleChoiceField): widget = Select2MultipleWidget -class HeavySelect2FieldBase(forms.Field): - def __init__(self, **kwargs): +class HeavySelect2FieldBase(ChoiceMixin, forms.Field): + def __init__(self, *args, **kwargs): data_view = kwargs.pop('data_view', None) - kargs = {} + self.choices = kwargs.pop('choices', []) + kargs = {} if data_view is not None: kargs['widget'] = self.widget(data_view=data_view) elif kwargs.get('widget', None) is None: raise ValueError('data_view is required else you need to provide your own widget instance.') kargs.update(kwargs) - super(HeavySelect2FieldBase, self).__init__(**kargs) + super(HeavySelect2FieldBase, self).__init__(*args, **kargs) class HeavySelect2ChoiceField(HeavySelect2FieldBase): widget = HeavySelect2Widget @@ -121,6 +179,11 @@ class HeavySelect2ChoiceField(HeavySelect2FieldBase): class HeavySelect2MultipleChoiceField(HeavySelect2FieldBase): widget = HeavySelect2MultipleWidget +class HeavyModelSelect2ChoiceField(QuerysetChoiceMixin, HeavySelect2ChoiceField, ModelChoiceField): + def __init__(self, *args, **kwargs): + kwargs.pop('choices', None) + super(HeavyModelSelect2ChoiceField, self).__init__(*args, **kwargs) + class AutoSelect2Field(ModelResultJsonMixin, AutoViewFieldMixin, HeavySelect2ChoiceField): """ This needs to be subclassed. The first instance of a class (sub-class) is used to serve all incoming @@ -129,45 +192,26 @@ class AutoSelect2Field(ModelResultJsonMixin, AutoViewFieldMixin, HeavySelect2Cho widget = AutoHeavySelect2Widget - def __init__(self, **kwargs): + def __init__(self, *args, **kwargs): self.data_view = "django_select2_central_json" kwargs['data_view'] = self.data_view - super(AutoSelect2Field, self).__init__(**kwargs) + super(AutoSelect2Field, self).__init__(*args, **kwargs) -class AutoModelSelect2Field(ModelResultJsonMixin, AutoViewFieldMixin, ModelValueMixin, HeavySelect2ChoiceField): +class AutoModelSelect2Field(ModelResultJsonMixin, AutoViewFieldMixin, HeavyModelSelect2ChoiceField): """ This needs to be subclassed. The first instance of a class (sub-class) is used to serve all incoming json query requests for that type (class). """ + __metaclass__ = UnhideableQuerysetType widget = AutoHeavySelect2Widget - def __init__(self, **kwargs): + def __init__(self, *args, **kwargs): self.data_view = "django_select2_central_json" kwargs['data_view'] = self.data_view - super(AutoModelSelect2Field, self).__init__(**kwargs) + super(AutoModelSelect2Field, self).__init__(*args, **kwargs) -class ModelSelect2Field(ModelValueMixin, Select2ChoiceField): - def __init__(self, **kwargs): - self.queryset = kwargs.pop('queryset', None) - self.to_field_name = kwargs.pop('to_field_name', 'pk') - - choices = kwargs.pop('choices', None) - if choices is None: - choices = [] - for obj in self.queryset.all(): - choices.append((getattr(obj, self.to_field_name), smart_unicode(obj), )) +class ModelSelect2Field(ModelChoiceField) : + "Light Model Select2 field" + widget = Select2Widget - kwargs['choices'] = choices - - super(ModelSelect2Field, self).__init__(**kwargs) - - def valid_value(self, value): - val = getattr(value, self.to_field_name) - for k, v in self.choices: - if k == val: - return True - return False - - - diff --git a/django_select2/static/css/extra.css b/django_select2/static/css/extra.css index a2db915..6ac6dd7 100644 --- a/django_select2/static/css/extra.css +++ b/django_select2/static/css/extra.css @@ -1,3 +1,6 @@ .error a.select2-choice { border: 1px solid #B94A48; +} +.select2-container { + min-width: 150px; } \ No newline at end of file diff --git a/django_select2/static/js/heavy_data.js b/django_select2/static/js/heavy_data.js index ea170e9..3a7da47 100644 --- a/django_select2/static/js/heavy_data.js +++ b/django_select2/static/js/heavy_data.js @@ -1,5 +1,6 @@ var django_select2 = { + MULTISEPARATOR: String.fromCharCode(0), get_url_params: function (term, page, context) { var field_id = $(this).data('field_id'), res = { @@ -35,56 +36,173 @@ var django_select2 = { return results; }, setCookie: function (c_name, value) { - document.cookie=c_name + "=" + escape(value); + document.cookie = c_name + "=" + escape(value); }, getCookie: function (c_name) { - var i,x,y,ARRcookies=document.cookie.split(";"); - for (i=0; i 0) { + return data[0]; + } else { + return null; } } - django_select2.delCookie(id + '_heavy_val'); - django_select2.delCookie(id + '_heavy_txt'); }, - onInit: function (e) { - e = $(e); - var id = e.attr('id'), - val = django_select2.getCookie(id + '_heavy_val'), - txt = django_select2.getCookie(id + '_heavy_txt'); + getValText: function ($e, isGetFromCookieAllowed) { + var val = $e.select2('val'), res = $e.data('results'), txt = $e.txt(), isMultiple = !!$e.attr('multiple'), + f, id = $e.attr('id'); + if (val || val === 0) { // Means value is set. A numerical 0 is also a valid value. + + if (!isMultiple) { + val = [val]; + if (txt || txt === 0) { + txt = [txt]; + } + } + + if (txt || txt === 0) { + return [val, txt]; + } + + f = $e.data('userGetValText'); + if (f) { + txt = f($e, val, isMultiple); + if (txt || txt === 0) { + return [val, txt]; + } + } + + if (res) { + txt = []; + $(val).each(function (idx) { + var i, value = this; + + for (i in res) { + if (res[i].id == value) { + val[idx] = res[i].id; // To set it to correct data type. + txt.push(res[i].text); + } + } + }); + if (txt || txt === 0) { + return [val, txt]; + } + } + + if (isGetFromCookieAllowed) { + txt = []; + $(val).each(function (idx) { + var value = this, cookieVal; + + cookieVal = django_select2.getCookie(id + '_heavy_val:' + idx); + + if (cookieVal == value) { + txt.push(django_select2.getCookie(id + '_heavy_txt:' + idx)); + } + }); + if (txt || txt === 0) { + return [val, txt]; + } + } - if (txt && e.val() == val) { - // Restores persisted value text. - return {'id': val, 'text': txt}; - } else { - e.val(null); } return null; + }, + onInit: function (e, callback) { + e = $(e); + var id = e.attr('id'), data = null, val = e.select2('val'); + + if (val || val === 0) { + // Value is set so need to get the text. + data = django_select2.getValText(e); + if (data && data[0]) { + data = django_select2.prepareValText(data[0], data[1], !!e.attr('multiple')); + } + } + if (!data) { + e.val(null); // Nulling out set value so as not to confuse users. + } + callback(data); // Change for 2.3.x + }, + onMultipleHiddenChange: function () { + var $e = $(this), valContainer = $e.data('valContainer'), name = $e.data('name'); + valContainer.empty(); + $($e.val()).each(function () { + var inp = $('').appendTo(valContainer); + inp.attr('type', 'hidden'); + inp.attr('name', name); + inp.val(this); + }); + }, + initMultipleHidden: function ($e) { + var valContainer; + + $e.data('name', $e.attr('name')); + $e.attr('name', ''); + + valContainer = $e.after('
').css({'display': 'none'}); + $e.data('valContainer', valContainer); + + $e.change(django_select2.onMultipleHiddenChange); + }, + convertArrToStr: function (arr) { + return arr.join(django_select2.MULTISEPARATOR); } -}; \ No newline at end of file +}; + +(function( $ ){ + $.fn.txt = function() { + return this.attr('txt'); + }; +})( jQuery ); \ No newline at end of file diff --git a/django_select2/util.py b/django_select2/util.py index 1e725b4..83ff375 100644 --- a/django_select2/util.py +++ b/django_select2/util.py @@ -1,3 +1,17 @@ +def convert_to_js_string_arr(lst): + lst = ['"%s"' % l for l in lst] + return u"[%s]" % (",".join(lst)) + +def render_js_script(inner_code): + return u""" + """ % inner_code + +### Auto view helper utils ### + import re import threading import datetime diff --git a/django_select2/views.py b/django_select2/views.py index 6124e68..6e9d196 100644 --- a/django_select2/views.py +++ b/django_select2/views.py @@ -104,7 +104,7 @@ class Select2View(JSONResponseMixin, View): When everything is fine then the `err` must be 'nil'. `has_more` should be true if there are more rows. """ - raise NotImplemented + raise NotImplementedError class AutoResponseView(Select2View): diff --git a/django_select2/widgets.py b/django_select2/widgets.py index 61d1e31..84c22a4 100644 --- a/django_select2/widgets.py +++ b/django_select2/widgets.py @@ -1,17 +1,24 @@ import types +from itertools import chain from django import forms from django.utils.safestring import mark_safe from django.core.urlresolvers import reverse -class JSFunction(str): +from .util import render_js_script, convert_to_js_string_arr + +class JSVar(unicode): + "Denotes a JS variable name, so it must not be quoted while rendering." + pass + +class JSFunction(JSVar): """ Flags that the string is the name of a JS function. Used by Select2Mixin.render_options() to make sure that this string is not quoted like other strings. """ pass -class JSFunctionInContext(str): +class JSFunctionInContext(JSVar): """ Like JSFunction, this too flags the string as JS function, but with a special requirement. The JS function needs to be invoked in the context of the current Select2 Html DOM, @@ -23,10 +30,10 @@ class Select2Mixin(object): # For details on these options refer: http://ivaynberg.github.com/select2/#documentation options = { 'minimumResultsForSearch': 6, # Only applicable for single value select. - 'placeholder': '', + 'placeholder': '', # Empty text label 'allowClear': True, # Not allowed when field is multiple since there each value has a clear button. 'multiple': False, # Not allowed when attached to + \ No newline at end of file diff --git a/testapp/testapp/templates/index.html b/testapp/testapp/templates/index.html new file mode 100644 index 0000000..566c975 --- /dev/null +++ b/testapp/testapp/templates/index.html @@ -0,0 +1,5 @@ +{% load url from future %} +

Manual Tests

+ \ No newline at end of file diff --git a/testapp/testapp/templates/list.html b/testapp/testapp/templates/list.html new file mode 100644 index 0000000..45a5dcd --- /dev/null +++ b/testapp/testapp/templates/list.html @@ -0,0 +1,8 @@ +{% load url from future %} +

{{title}}

+
    + {% for e in object_list %} +
  • {{ e }}
    • + {% endfor %} +
+ diff --git a/testapp/testapp/urls.py b/testapp/testapp/urls.py new file mode 100644 index 0000000..7cd3d20 --- /dev/null +++ b/testapp/testapp/urls.py @@ -0,0 +1,15 @@ +from django.conf.urls import patterns, include, url +from django.views.generic import TemplateView + +# Uncomment the next two lines to enable the admin: +# from django.contrib import admin +# admin.autodiscover() + +urlpatterns = patterns('', + url(r'^$', TemplateView.as_view(template_name="index.html"), name='home'), + url(r'^test/', include('testmain.urls')), + url(r'^ext/', include('django_select2.urls')), + + # Uncomment the next line to enable the admin: + # url(r'^admin/', include(admin.site.urls)), +) diff --git a/testapp/testapp/wsgi.py b/testapp/testapp/wsgi.py new file mode 100644 index 0000000..35b5f32 --- /dev/null +++ b/testapp/testapp/wsgi.py @@ -0,0 +1,28 @@ +""" +WSGI config for testapp project. + +This module contains the WSGI application used by Django's development server +and any production WSGI deployments. It should expose a module-level variable +named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover +this application via the ``WSGI_APPLICATION`` setting. + +Usually you will have the standard Django WSGI application here, but it also +might make sense to replace the whole Django WSGI application with a custom one +that later delegates to the Django one. For example, you could introduce WSGI +middleware here, or combine a Django application with an application of another +framework. + +""" +import os + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testapp.settings") + +# This application object is used by any WSGI server configured to use this +# file. This includes Django's development server, if the WSGI_APPLICATION +# setting points here. +from django.core.wsgi import get_wsgi_application +application = get_wsgi_application() + +# Apply WSGI middleware here. +# from helloworld.wsgi import HelloWorldApplication +# application = HelloWorldApplication(application) diff --git a/testapp/testmain/__init__.py b/testapp/testmain/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/testapp/testmain/fixtures/initial_data.json b/testapp/testmain/fixtures/initial_data.json new file mode 100644 index 0000000..adb5e59 --- /dev/null +++ b/testapp/testmain/fixtures/initial_data.json @@ -0,0 +1,81 @@ +[ + { + "pk": 1, + "model": "testmain.dept", + "fields": { + "name": "Chemistry" + } + }, + { + "pk": 2, + "model": "testmain.dept", + "fields": { + "name": "Biology" + } + }, + { + "pk": 3, + "model": "testmain.dept", + "fields": { + "name": "Physics" + } + }, + { + "pk": 1, + "model": "testmain.employee", + "fields": { + "name": "John Roger", + "salary": 8000, + "dept": 1 + } + }, + { + "pk": 2, + "model": "testmain.employee", + "fields": { + "name": "John Doe", + "salary": 9000, + "dept": 2 + } + }, + { + "pk": 3, + "model": "testmain.employee", + "fields": { + "name": "John Mark", + "salary": 10000, + "dept": 3 + } + }, + { + "pk": 4, + "model": "testmain.employee", + "fields": { + "name": "Mary Jane", + "salary": 2000, + "dept": 1, + "manager": 1 + } + }, + { + "pk": 5, + "model": "testmain.employee", + "fields": { + "name": "Hulk", + "salary": 7000, + "dept": 2, + "manager": 2 + } + }, + { + "pk": 6, + "model": "testmain.employee", + "fields": { + "name": "Green Gold", + "salary": 4000, + "dept": 2, + "manager": 2 + } + } +] + diff --git a/testapp/testmain/forms.py b/testapp/testmain/forms.py new file mode 100644 index 0000000..7d8cb90 --- /dev/null +++ b/testapp/testmain/forms.py @@ -0,0 +1,17 @@ +from django import forms + +from django_select2 import * + +from .models import Employee, Dept + +class EmployeeChoices(AutoModelSelect2Field): + queryset = Employee.objects + search_fields = ['name__icontains', ] + +class EmployeeForm(forms.ModelForm): + manager = EmployeeChoices() + dept = ModelSelect2Field(queryset=Dept.objects) + + class Meta: + model = Employee + \ No newline at end of file diff --git a/testapp/testmain/models.py b/testapp/testmain/models.py new file mode 100644 index 0000000..0c585ee --- /dev/null +++ b/testapp/testmain/models.py @@ -0,0 +1,16 @@ +from django.db import models + +class Dept(models.Model): + name = models.CharField(max_length=10) + + def __unicode__(self): + return unicode(self.name) + +class Employee(models.Model): + name = models.CharField(max_length=30) + salary = models.FloatField() + dept = models.ForeignKey(Dept) + manager = models.ForeignKey('Employee', null=True, blank=True) + + def __unicode__(self): + return unicode(self.name) diff --git a/testapp/testmain/urls.py b/testapp/testmain/urls.py new file mode 100644 index 0000000..61188ee --- /dev/null +++ b/testapp/testmain/urls.py @@ -0,0 +1,6 @@ +from django.conf.urls.defaults import * + +urlpatterns = patterns("", + url(r'auto/model/field/$', 'testmain.views.test_auto_model_field', name='test_auto_model_field'), + url(r'auto/model/field/([0-9]+)/$', 'testmain.views.test_auto_model_field1', name='test_auto_model_field2'), +) diff --git a/testapp/testmain/views.py b/testapp/testmain/views.py new file mode 100644 index 0000000..0c728d2 --- /dev/null +++ b/testapp/testmain/views.py @@ -0,0 +1,25 @@ +from django.core.urlresolvers import reverse +from django.http import HttpResponseRedirect +from django.shortcuts import render_to_response +from django.template import RequestContext + +from .forms import EmployeeForm +from .models import Employee + +def test_auto_model_field(request): + return render_to_response('list.html', RequestContext(request, { + 'title': 'Employees', + 'href': 'test_auto_model_field2', + 'object_list': Employee.objects.all() + })) + +def test_auto_model_field1(request, id): + emp = Employee.objects.get(id=id) + if request.POST: + form = EmployeeForm(data=request.POST, instance=emp) + if form.is_valid(): + form.save() + return HttpResponseRedirect(reverse('home')) + else: + form = EmployeeForm(instance=emp) + return render_to_response('form.html', RequestContext(request, {'form': form})) \ No newline at end of file From 703d54068911d50136a71d3eb54c8c4fab0f8e53 Mon Sep 17 00:00:00 2001 From: "AppleGrew (applegrew)" Date: Mon, 20 Aug 2012 19:08:52 +0530 Subject: [PATCH 02/10] The changes in this code crashes Python 2.7.1 (OSX build) --- .gitignore | 2 + README.md | 7 ++++ django_select2/__init__.py | 4 +- django_select2/fields.py | 15 ++++++- django_select2/util.py | 19 +++++++++ django_select2/widgets.py | 21 +--------- testapp/test.db | Bin 131072 -> 151552 bytes testapp/testapp/templates/index.html | 3 +- testapp/testmain/fixtures/initial_data.json | 44 ++++++++++++++++++-- testapp/testmain/forms.py | 9 +++- testapp/testmain/models.py | 8 ++++ testapp/testmain/urls.py | 7 +++- testapp/testmain/views.py | 36 ++++++++++++---- 13 files changed, 135 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index 01b11e8..81f1ec4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ testapp/tt.py *.pyc + +testapp/tt2.py diff --git a/README.md b/README.md index 5f398f5..7fb81cd 100644 --- a/README.md +++ b/README.md @@ -12,3 +12,10 @@ External dependencies * Django - This is obvious. * jQuery - This is not included in the package since it is expected that in most scenarios this would already be available. + +Changelog Summary +================= + +v2.0 +---- +Mostly major bug fixes in code and design. The changes were many, raising the possibility of backward incompatibilty. However, the backward incompatibilty would be subtle. diff --git a/django_select2/__init__.py b/django_select2/__init__.py index e155cd7..5d7d5fb 100644 --- a/django_select2/__init__.py +++ b/django_select2/__init__.py @@ -1,9 +1,9 @@ -__version__ = "1.1" +__version__ = "2.0" from django.conf import settings if settings.configured: from .widgets import Select2Widget, Select2MultipleWidget, HeavySelect2Widget, HeavySelect2MultipleWidget, AutoHeavySelect2Widget from .fields import Select2ChoiceField, Select2MultipleChoiceField, \ HeavySelect2ChoiceField, HeavySelect2MultipleChoiceField, \ - ModelSelect2Field, AutoSelect2Field, AutoModelSelect2Field + ModelSelect2Field, AutoSelect2Field, AutoModelSelect2Field #, ModelMultipleSelect2Field from .views import Select2View, NO_ERR_RESP diff --git a/django_select2/fields.py b/django_select2/fields.py index e981934..b9014f3 100644 --- a/django_select2/fields.py +++ b/django_select2/fields.py @@ -125,7 +125,9 @@ class QuerysetChoiceMixin(ChoiceMixin): choices = property(_get_choices, ChoiceMixin._set_choices) -class ModelChoiceField(forms.ModelChoiceField): +class ModelChoiceFieldMixin(object): +#class ModelChoiceField(forms.ModelChoiceField): + def __init__(self, *args, **kwargs): queryset = kwargs.pop('queryset', None) empty_label = kwargs.pop('empty_label', u"---------") @@ -151,7 +153,13 @@ class ModelChoiceField(forms.ModelChoiceField): if hasattr(self, '_queryset'): return self._queryset - queryset = property(_get_queryset, forms.ModelChoiceField._set_queryset) +# queryset = property(_get_queryset, forms.ModelChoiceField._set_queryset) + +class ModelChoiceField(ModelChoiceFieldMixin, forms.ModelChoiceField): + queryset = property(ModelChoiceFieldMixin._get_queryset, forms.ModelChoiceField._set_queryset) + +#class ModelMultipleChoiceField(ModelChoiceFieldMixin, forms.ModelMultipleChoiceField): +# queryset = property(ModelChoiceFieldMixin._get_queryset, forms.ModelMultipleChoiceField._set_queryset) class Select2ChoiceField(forms.ChoiceField): widget = Select2Widget @@ -215,3 +223,6 @@ class ModelSelect2Field(ModelChoiceField) : "Light Model Select2 field" widget = Select2Widget +#class ModelMultipleSelect2Field(ModelMultipleChoiceField) : +# "Light multiple-value Model Select2 field" +# widget = Select2MultipleWidget diff --git a/django_select2/util.py b/django_select2/util.py index 83ff375..6956c80 100644 --- a/django_select2/util.py +++ b/django_select2/util.py @@ -10,6 +10,25 @@ def render_js_script(inner_code): }); """ % inner_code +class JSVar(unicode): + "Denotes a JS variable name, so it must not be quoted while rendering." + pass + +class JSFunction(JSVar): + """ + Flags that the string is the name of a JS function. Used by Select2Mixin.render_options() + to make sure that this string is not quoted like other strings. + """ + pass + +class JSFunctionInContext(JSVar): + """ + Like JSFunction, this too flags the string as JS function, but with a special requirement. + The JS function needs to be invoked in the context of the current Select2 Html DOM, + such that 'this' inside the function refers to the source Select2 DOM. + """ + pass + ### Auto view helper utils ### import re diff --git a/django_select2/widgets.py b/django_select2/widgets.py index 84c22a4..aab8bed 100644 --- a/django_select2/widgets.py +++ b/django_select2/widgets.py @@ -5,26 +5,7 @@ from django import forms from django.utils.safestring import mark_safe from django.core.urlresolvers import reverse -from .util import render_js_script, convert_to_js_string_arr - -class JSVar(unicode): - "Denotes a JS variable name, so it must not be quoted while rendering." - pass - -class JSFunction(JSVar): - """ - Flags that the string is the name of a JS function. Used by Select2Mixin.render_options() - to make sure that this string is not quoted like other strings. - """ - pass - -class JSFunctionInContext(JSVar): - """ - Like JSFunction, this too flags the string as JS function, but with a special requirement. - The JS function needs to be invoked in the context of the current Select2 Html DOM, - such that 'this' inside the function refers to the source Select2 DOM. - """ - pass +from .util import render_js_script, convert_to_js_string_arr, JSVar, JSFunction, JSFunctionInContext class Select2Mixin(object): # For details on these options refer: http://ivaynberg.github.com/select2/#documentation diff --git a/testapp/test.db b/testapp/test.db index 46885a939a9ed52fc9177703642f34174070031a..d620b36020850b4170c8b19e1bb5753a4d456892 100644 GIT binary patch delta 3146 zcmcguYiu0V6`nKi+1K%7pSCw1Z&=5!<9NpQCMHUew~lKPoVcl7T#6dA@h+~xkFD(( z5}|H3MS`lL#GM~k5TTI%Kp>S0VZ{s7U@H|;q!N(|3HTA}CTavy5l*F&J`l9`&OWf+ z;PeOTX!o2u=keWh&b@Q)J#j)k@vL^Ly1a?wxG4P>pU~X)HY#ksS}Rcz;Ac!xJ(sT4 zD)`5RSK;s6)w#3#g_9M2a(n@HK!Cik0N21rp3Ff#_{l;JMlvUNR4Re)ZusfYOybB` zY9=*3GoBco7)qwnGee27vB{a4RB~u)a&mlnGo82VyWR1DZhavBt=?`uvYBZ_Z*b`J ziHs&AI$1ppTS+VjA+q`uDBAE?VtSg*W+faEa&Hc_FGa+B8Ul58VAOTH9w`|Q(f3A2 z+N+kl3%|DFU=22ryW|zdOtc*LB_X zJJ(s)L$3X<2Im*^@v>zn-%xF3Yk~&qYW9Q2^)Vb31-=bn_O-u>ZxTz|ox@rlp`8_QT-F2Yt=Ted2{2+i8%uD8z}1&dwR!MRvhGT zaK79)fT3(XxVeDa-JIP90P%PtIX*hU_NkR#(lZZq9PK@pF!~02%%isr^!I(cY4o11 zuHMljJ0CngY#yEMnYyd>&bud#*^vYNKOX4c+rMw;$e|+x2fj(MS`D+c+309)HFVS5 zZFcOAwe9F=ZM(hA{A!KEZbvsbyumsWH;>DoqF+Oq!z=g}zKT!c6duMs7)6cX{Ou5nRWT4w9;%5xOIkHZh}V|*K5#%J&s_zeKG9O9Jb6&}Fpp#KKFG_hXh&Bg7$a9|0 zbAW|qfHEhYLdKtQ_!oRX=eh)=IQNp*@0De)jtA(ON~I?Bp2@K!KFjmu%nIBtmh&=4 zF0Vj?P>qL)qC*2df)C*1IEzU^f;Qo5A$oN``$N2_qOIx^o1Lvg!$xdZM|-SeGo!5xJCI>}cf-+Ka*ybJ z2XA@&Za6rzMr}UKL$?mI-83TR{q3!>&EkyMaUQr?oYdcT|KH-Y5!l)O$QJVG5|~g& z7M5VYkcBXTC5VA;&GA9fw*+lMma8E@d4tMoi!#MBK(*4ey;hTpufsmrLN$$~^9|U; zH&j_Y{5}X%$$j+hkzIs1)Xv{H-ej92r`>p2>uT@ zGtc^MM6R3$^XtEi-LctTxz%ONv+laO;WGPYUJO_*VjBe6(pj_O9egNAuKkuSW>s-9 z_kv>{jDOeusx-Rq+ys|H8lFC$zm^#mo3EUdq*7heg~gsI2)2icM+5r#(}$ zsmLg8tc>zDEi_^q>M{j;w*Xgw>Xd9K-iD&hojQs(lwd;%HWa@GO2*49s*flXi|G^E wFfZgACh+9SD(IDVS6<=pGrWO+rM>wYu27@j=Z(Vrns7m+XA}sG@QlEJ08-4Cn*aa+ delta 1586 zcmb7EYfKzf6rMA?vopIhyJy*DA3U~9OQB176c{KJW9eGRR%%L#6{;q*D?3Yxu)FdM zl?Y2r)L1Qb67P?uk&uFDY)RNeG%=}vOpGP zyB4qy8WN0$ygUun;3X|HbU85%JXxHEQo+r8o(w?ZDRN^5WKuQ*d%&Y}BH$t)&A{W} z)~zD4JOctz-h~4~Chs|Z2ojAXItRIWgq0M&1{su3iB9s#960n{fqX;RhD4T=bk0El zGB@1~hJ?{UzP}C%rKe){&B0;P{yxklJGjdhbGB%u2k}ay8gDNYAF+C*HR-1Go-~>a z$U%wqd*90SjtXJ5TkTiRs6FxS*s!X~9*!x7{G*|$oc7RHyq{lZ>Dce)7zK)TM#s5O zv{RKgVuiH*FqdmH*E%zmYn`RzJ@uI!QwjxovQRkuFcUR4(_}k2rT}~!oKz0ouY+Wp z?;30H+KMz@E)*}=I&Jl~VOxu>D49`y*E;GlLNRPVqBp|``LOj!o-}V;`R+7tOSvwG z5eh)qT3n{h2tMF9>T#xGOzXcZIa}7AFt#$-O3QfyvlIKk%6P2S0~7!R0->YC?IKi1sa-FC35^XcMK(V?T2$A+J4 zQ@RI+IuBNd`yQpqD$6S>OUr9ZD-^k+rmniOuClgFsZJvOYl*mUp>%j&b>1`p@rI`}%uAT~Qrt?aMPXHp1X{ z_%nWm^LPc{#1V|p*b}HVueuyUhSBGOtwG5*R{P3%y$mnL2_FZ)c^n7vRT>wkakWUk z&SQ;E!OIx{c#pmc?i41kjKVNjl2HD4-qaC$`kp^xv{#Az8pE%dP3A_6YMB=U;-EAs ztyzDwDZ*vpmU-DyX!%9lFD^=Fr9Z7#Y{zVW;0PV=(+g+Dpo3>+ISoj`MVQqS`W;+^ z5q!c)bI3eviCI1npA}c6m#lf#FKjQ`{=#wof@z4m!$pz-dmU#;@IGRif*Ps{78u20c{zB2`T4dad+a`PIL!7gn#>(Pqg7G!Jpp%8r3?$lm4D+@3Sl7apA zjMvk7->wCg#IFA-DE|KzrZRKcPFkk2JIG%N3*NVNSei6b5Xe=rsn%u$TXRl-E=S5tEy2s80!w> zBmj9Q28WEaRh(og27bEp?U&Ef{X)67>si@J+uDSS3_ifSxJbXb gj6YD)XK7MCuzDkbNncqmg^fl70|xpDj@1$T14-AkhyVZp diff --git a/testapp/testapp/templates/index.html b/testapp/testapp/templates/index.html index 566c975..7d8d429 100644 --- a/testapp/testapp/templates/index.html +++ b/testapp/testapp/templates/index.html @@ -1,5 +1,6 @@ {% load url from future %}

Manual Tests

\ No newline at end of file diff --git a/testapp/testmain/fixtures/initial_data.json b/testapp/testmain/fixtures/initial_data.json index adb5e59..aaf576d 100644 --- a/testapp/testmain/fixtures/initial_data.json +++ b/testapp/testmain/fixtures/initial_data.json @@ -1,23 +1,61 @@ [ + { + "pk": 1, + "model": "testmain.classroom", + "fields": { + "number": "100" + } + }, + { + "pk": 2, + "model": "testmain.classroom", + "fields": { + "number": "200" + } + }, + { + "pk": 3, + "model": "testmain.classroom", + "fields": { + "number": "203" + } + }, + { + "pk": 4, + "model": "testmain.classroom", + "fields": { + "number": "203A" + } + }, + { + "pk": 5, + "model": "testmain.classroom", + "fields": { + "number": "500" + } + }, { "pk": 1, "model": "testmain.dept", "fields": { - "name": "Chemistry" + "name": "Chemistry", + "allotted_rooms": [1, 2, 3] } }, { "pk": 2, "model": "testmain.dept", "fields": { - "name": "Biology" + "name": "Biology", + "allotted_rooms": [3, 4] } }, { "pk": 3, "model": "testmain.dept", "fields": { - "name": "Physics" + "name": "Physics", + "allotted_rooms": [1, 2, 5] } }, { diff --git a/testapp/testmain/forms.py b/testapp/testmain/forms.py index 7d8cb90..ea897cf 100644 --- a/testapp/testmain/forms.py +++ b/testapp/testmain/forms.py @@ -2,7 +2,7 @@ from django import forms from django_select2 import * -from .models import Employee, Dept +from .models import Employee, Dept, ClassRoom class EmployeeChoices(AutoModelSelect2Field): queryset = Employee.objects @@ -14,4 +14,9 @@ class EmployeeForm(forms.ModelForm): class Meta: model = Employee - \ No newline at end of file + +#class DeptForm(forms.ModelForm): +# allotted_rooms = ModelMultipleSelect2Field(queryset=ClassRoom.objects) + +# class Meta: +# model = Dept \ No newline at end of file diff --git a/testapp/testmain/models.py b/testapp/testmain/models.py index 0c585ee..0e5afe8 100644 --- a/testapp/testmain/models.py +++ b/testapp/testmain/models.py @@ -1,7 +1,14 @@ from django.db import models +class ClassRoom(models.Model): + number = models.CharField(max_length=4) + + def __unicode__(self): + return unicode(self.number) + class Dept(models.Model): name = models.CharField(max_length=10) + allotted_rooms = models.ManyToManyField(ClassRoom) def __unicode__(self): return unicode(self.name) @@ -14,3 +21,4 @@ class Employee(models.Model): def __unicode__(self): return unicode(self.name) + diff --git a/testapp/testmain/urls.py b/testapp/testmain/urls.py index 61188ee..0727880 100644 --- a/testapp/testmain/urls.py +++ b/testapp/testmain/urls.py @@ -1,6 +1,9 @@ from django.conf.urls.defaults import * urlpatterns = patterns("", - url(r'auto/model/field/$', 'testmain.views.test_auto_model_field', name='test_auto_model_field'), - url(r'auto/model/field/([0-9]+)/$', 'testmain.views.test_auto_model_field1', name='test_auto_model_field2'), + url(r'single/model/field/$', 'testmain.views.test_single_value_model_field', name='test_single_value_model_field'), + url(r'single/model/field/([0-9]+)/$', 'testmain.views.test_single_value_model_field1', name='test_single_value_model_field1'), + + url(r'multi/model/field/$', 'testmain.views.test_multi_values_model_field', name='test_multi_values_model_field'), + url(r'multi/model/field/([0-9]+)/$', 'testmain.views.test_multi_values_model_field1', name='test_multi_values_model_field1'), ) diff --git a/testapp/testmain/views.py b/testapp/testmain/views.py index 0c728d2..8050eac 100644 --- a/testapp/testmain/views.py +++ b/testapp/testmain/views.py @@ -1,20 +1,20 @@ from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect -from django.shortcuts import render_to_response +from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext -from .forms import EmployeeForm -from .models import Employee +from .forms import EmployeeForm #, DeptForm +from .models import Employee, Dept -def test_auto_model_field(request): +def test_single_value_model_field(request): return render_to_response('list.html', RequestContext(request, { 'title': 'Employees', - 'href': 'test_auto_model_field2', + 'href': 'test_single_value_model_field1', 'object_list': Employee.objects.all() })) -def test_auto_model_field1(request, id): - emp = Employee.objects.get(id=id) +def test_single_value_model_field1(request, id): + emp = get_object_or_404(Employee, pk=id) if request.POST: form = EmployeeForm(data=request.POST, instance=emp) if form.is_valid(): @@ -22,4 +22,24 @@ def test_auto_model_field1(request, id): return HttpResponseRedirect(reverse('home')) else: form = EmployeeForm(instance=emp) - return render_to_response('form.html', RequestContext(request, {'form': form})) \ No newline at end of file + return render_to_response('form.html', RequestContext(request, {'form': form})) + + +def test_multi_values_model_field(request): + return render_to_response('list.html', RequestContext(request, { + 'title': 'Departments', + 'href': 'test_multi_values_model_field1', + 'object_list': Dept.objects.all() + })) + +def test_multi_values_model_field1(request, id): + dept = get_object_or_404(Dept, pk=id) + if request.POST: + form = DeptForm(data=request.POST, instance=dept) + if form.is_valid(): + form.save() + return HttpResponseRedirect(reverse('home')) + else: + form = DeptForm(instance=dept) + return render_to_response('form.html', RequestContext(request, {'form': form})) + From a291f73418cfc683934fab848a4696e89071517f Mon Sep 17 00:00:00 2001 From: "AppleGrew (applegrew)" Date: Tue, 21 Aug 2012 00:00:21 +0530 Subject: [PATCH 03/10] Temp file to ignore. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 01b11e8..81f1ec4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ testapp/tt.py *.pyc + +testapp/tt2.py From f3569bcea2a1ec766f57be3c1b7737bba90dc92c Mon Sep 17 00:00:00 2001 From: "AppleGrew (applegrew)" Date: Tue, 21 Aug 2012 01:38:31 +0530 Subject: [PATCH 04/10] Multi value tests added and more fixes. * Fixed infinite recursion causing Python crash bug. * Multi-value is working. * Tested added for multi-value field. --- django_select2/__init__.py | 2 +- django_select2/fields.py | 61 +++++++++++--------- django_select2/static/css/extra.css | 3 + django_select2/util.py | 8 +++ django_select2/widgets.py | 81 ++++++++++++++++----------- testapp/test.db | Bin 151552 -> 151552 bytes testapp/testapp/templates/form.html | 11 +++- testapp/testapp/templates/index.html | 8 ++- testapp/testapp/templates/list.html | 7 ++- testapp/testmain/forms.py | 8 +-- testapp/testmain/views.py | 2 +- 11 files changed, 123 insertions(+), 68 deletions(-) diff --git a/django_select2/__init__.py b/django_select2/__init__.py index 5d7d5fb..705bb2b 100644 --- a/django_select2/__init__.py +++ b/django_select2/__init__.py @@ -5,5 +5,5 @@ if settings.configured: from .widgets import Select2Widget, Select2MultipleWidget, HeavySelect2Widget, HeavySelect2MultipleWidget, AutoHeavySelect2Widget from .fields import Select2ChoiceField, Select2MultipleChoiceField, \ HeavySelect2ChoiceField, HeavySelect2MultipleChoiceField, \ - ModelSelect2Field, AutoSelect2Field, AutoModelSelect2Field #, ModelMultipleSelect2Field + ModelSelect2Field, AutoSelect2Field, AutoModelSelect2Field, ModelMultipleSelect2Field from .views import Select2View, NO_ERR_RESP diff --git a/django_select2/fields.py b/django_select2/fields.py index b9014f3..9eb5d97 100644 --- a/django_select2/fields.py +++ b/django_select2/fields.py @@ -26,6 +26,17 @@ from django.core.validators import EMPTY_VALUES from .widgets import Select2Widget, Select2MultipleWidget,\ HeavySelect2Widget, HeavySelect2MultipleWidget, AutoHeavySelect2Widget from .views import NO_ERR_RESP +from .util import extract_some_key_val + +### Light general fields ### + +class Select2ChoiceField(forms.ChoiceField): + widget = Select2Widget + +class Select2MultipleChoiceField(forms.MultipleChoiceField): + widget = Select2MultipleWidget + +### Model fields related mixins ### class ModelResultJsonMixin(object): @@ -126,25 +137,20 @@ class QuerysetChoiceMixin(ChoiceMixin): choices = property(_get_choices, ChoiceMixin._set_choices) class ModelChoiceFieldMixin(object): -#class ModelChoiceField(forms.ModelChoiceField): def __init__(self, *args, **kwargs): queryset = kwargs.pop('queryset', None) - empty_label = kwargs.pop('empty_label', u"---------") - cache_choices = kwargs.pop('cache_choices', False) - required = kwargs.pop('required', True) - widget = kwargs.pop('widget', getattr(self, 'widget', None)) - label = kwargs.pop('label', None) - initial = kwargs.pop('initial', None) - help_text = kwargs.pop('help_text', None) - to_field_name = kwargs.pop('to_field_name', 'pk') + kargs = extract_some_key_val(kwargs, [ + 'empty_label', 'cache_choices', 'required', 'label', 'initial', 'help_text', + ]) + kargs['widget'] = kwargs.pop('widget', getattr(self, 'widget', None)) + kargs['to_field_name'] = kwargs.pop('to_field_name', 'pk') if hasattr(self, '_choices'): # If it exists then probably it is set by HeavySelect2FieldBase. # We are not gonna use that anyway. del self._choices - super(ModelChoiceField, self).__init__(queryset, empty_label, cache_choices, required, - widget, label, initial, help_text, to_field_name) + super(ModelChoiceFieldMixin, self).__init__(queryset, **kargs) if hasattr(self, 'set_placeholder'): self.widget.set_placeholder(self.empty_label) @@ -153,20 +159,26 @@ class ModelChoiceFieldMixin(object): if hasattr(self, '_queryset'): return self._queryset -# queryset = property(_get_queryset, forms.ModelChoiceField._set_queryset) +### Slightly altered versions of the Django counterparts with the same name in forms module. ### class ModelChoiceField(ModelChoiceFieldMixin, forms.ModelChoiceField): queryset = property(ModelChoiceFieldMixin._get_queryset, forms.ModelChoiceField._set_queryset) -#class ModelMultipleChoiceField(ModelChoiceFieldMixin, forms.ModelMultipleChoiceField): -# queryset = property(ModelChoiceFieldMixin._get_queryset, forms.ModelMultipleChoiceField._set_queryset) +class ModelMultipleChoiceField(ModelChoiceFieldMixin, forms.ModelMultipleChoiceField): + queryset = property(ModelChoiceFieldMixin._get_queryset, forms.ModelMultipleChoiceField._set_queryset) -class Select2ChoiceField(forms.ChoiceField): +### Light Fileds specialized for Models ### + +class ModelSelect2Field(ModelChoiceField) : + "Light Model Select2 field" widget = Select2Widget -class Select2MultipleChoiceField(forms.MultipleChoiceField): +class ModelMultipleSelect2Field(ModelMultipleChoiceField) : + "Light multiple-value Model Select2 field" widget = Select2MultipleWidget +### Heavy fields ### + class HeavySelect2FieldBase(ChoiceMixin, forms.Field): def __init__(self, *args, **kwargs): data_view = kwargs.pop('data_view', None) @@ -187,11 +199,15 @@ class HeavySelect2ChoiceField(HeavySelect2FieldBase): class HeavySelect2MultipleChoiceField(HeavySelect2FieldBase): widget = HeavySelect2MultipleWidget +### Heavy field specialized for Models (Single valued) ### + class HeavyModelSelect2ChoiceField(QuerysetChoiceMixin, HeavySelect2ChoiceField, ModelChoiceField): def __init__(self, *args, **kwargs): kwargs.pop('choices', None) super(HeavyModelSelect2ChoiceField, self).__init__(*args, **kwargs) +### Heavy general field that uses central AutoView ### + class AutoSelect2Field(ModelResultJsonMixin, AutoViewFieldMixin, HeavySelect2ChoiceField): """ This needs to be subclassed. The first instance of a class (sub-class) is used to serve all incoming @@ -205,12 +221,15 @@ class AutoSelect2Field(ModelResultJsonMixin, AutoViewFieldMixin, HeavySelect2Cho kwargs['data_view'] = self.data_view super(AutoSelect2Field, self).__init__(*args, **kwargs) +### Heavy field, specialized for Model, that uses central AutoView ### + class AutoModelSelect2Field(ModelResultJsonMixin, AutoViewFieldMixin, HeavyModelSelect2ChoiceField): """ This needs to be subclassed. The first instance of a class (sub-class) is used to serve all incoming json query requests for that type (class). """ - __metaclass__ = UnhideableQuerysetType + __metaclass__ = UnhideableQuerysetType # Makes sure that user defined queryset class variable is replaced by + # queryset property (as it is needed by super classes). widget = AutoHeavySelect2Widget @@ -218,11 +237,3 @@ class AutoModelSelect2Field(ModelResultJsonMixin, AutoViewFieldMixin, HeavyModel self.data_view = "django_select2_central_json" kwargs['data_view'] = self.data_view super(AutoModelSelect2Field, self).__init__(*args, **kwargs) - -class ModelSelect2Field(ModelChoiceField) : - "Light Model Select2 field" - widget = Select2Widget - -#class ModelMultipleSelect2Field(ModelMultipleChoiceField) : -# "Light multiple-value Model Select2 field" -# widget = Select2MultipleWidget diff --git a/django_select2/static/css/extra.css b/django_select2/static/css/extra.css index 6ac6dd7..c49c77e 100644 --- a/django_select2/static/css/extra.css +++ b/django_select2/static/css/extra.css @@ -3,4 +3,7 @@ } .select2-container { min-width: 150px; +} +.select2-container.select2-container-multi { + width: 300px; } \ No newline at end of file diff --git a/django_select2/util.py b/django_select2/util.py index 6956c80..854ea94 100644 --- a/django_select2/util.py +++ b/django_select2/util.py @@ -29,6 +29,14 @@ class JSFunctionInContext(JSVar): """ pass +def extract_some_key_val(dct, keys): + edct = {} + for k in keys: + v = dct.get(k, None) + if v is not None: + edct[k] = v + return edct + ### Auto view helper utils ### import re diff --git a/django_select2/widgets.py b/django_select2/widgets.py index aab8bed..ac2077d 100644 --- a/django_select2/widgets.py +++ b/django_select2/widgets.py @@ -7,6 +7,8 @@ from django.core.urlresolvers import reverse from .util import render_js_script, convert_to_js_string_arr, JSVar, JSFunction, JSFunctionInContext +### Light mixin and widgets ### + class Select2Mixin(object): # For details on these options refer: http://ivaynberg.github.com/select2/#documentation options = { @@ -96,6 +98,45 @@ class Select2Mixin(object): js = ('js/select2.min.js', ) css = {'screen': ('css/select2.css', 'css/extra.css', )} +class Select2Widget(Select2Mixin, forms.Select): + def init_options(self): + self.options.pop('multiple', None) + + def render_options(self, choices, selected_choices): + if not self.is_required: + choices = list(choices) + choices.append(('', '', )) # Adding an empty choice + return super(Select2Widget, self).render_options(choices, selected_choices) + +class Select2MultipleWidget(Select2Mixin, forms.SelectMultiple): + def init_options(self): + self.options.pop('multiple', None) + self.options.pop('allowClear', None) + self.options.pop('minimumResultsForSearch', None) + +### Specialized Multiple Hidden Input Widget ### +class MultipleSelect2HiddenInput(forms.TextInput): + """ + This is a specialized multiple Hidden Input widget. This includes a special + JS component which renders multiple Hidden Input boxes as there are values. + So, if user suppose chooses values 1,4,9 then Select2 would would write them + to the hidden input. The JS component of this widget will read that value and + will render three more hidden input boxes each with values 1, 4 and 9 respectively. + They will all share the name of this field, and the name of the primary source + hidden input would be removed. This way, when submitted all the selected values + would be available was would have been for a - \ No newline at end of file + + \ No newline at end of file diff --git a/testapp/testapp/templates/index.html b/testapp/testapp/templates/index.html index 7d8d429..4eff15a 100644 --- a/testapp/testapp/templates/index.html +++ b/testapp/testapp/templates/index.html @@ -1,6 +1,12 @@ {% load url from future %} + + + + +

Manual Tests

\ No newline at end of file + + \ No newline at end of file diff --git a/testapp/testapp/templates/list.html b/testapp/testapp/templates/list.html index 45a5dcd..29f2dd1 100644 --- a/testapp/testapp/templates/list.html +++ b/testapp/testapp/templates/list.html @@ -1,8 +1,13 @@ {% load url from future %} + + + + +

{{title}}

    {% for e in object_list %}
  • {{ e }}
    • {% endfor %}
- + diff --git a/testapp/testmain/forms.py b/testapp/testmain/forms.py index ea897cf..1b0cf80 100644 --- a/testapp/testmain/forms.py +++ b/testapp/testmain/forms.py @@ -15,8 +15,8 @@ class EmployeeForm(forms.ModelForm): class Meta: model = Employee -#class DeptForm(forms.ModelForm): -# allotted_rooms = ModelMultipleSelect2Field(queryset=ClassRoom.objects) +class DeptForm(forms.ModelForm): + allotted_rooms = ModelMultipleSelect2Field(queryset=ClassRoom.objects) -# class Meta: -# model = Dept \ No newline at end of file + class Meta: + model = Dept diff --git a/testapp/testmain/views.py b/testapp/testmain/views.py index 8050eac..92a713b 100644 --- a/testapp/testmain/views.py +++ b/testapp/testmain/views.py @@ -3,7 +3,7 @@ from django.http import HttpResponseRedirect from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext -from .forms import EmployeeForm #, DeptForm +from .forms import EmployeeForm, DeptForm from .models import Employee, Dept def test_single_value_model_field(request): From 0e0b21119d71e50b78593c208557da80841b8430 Mon Sep 17 00:00:00 2001 From: "AppleGrew (applegrew)" Date: Tue, 21 Aug 2012 01:48:55 +0530 Subject: [PATCH 05/10] Updated AutoView mixin --- django_select2/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_select2/fields.py b/django_select2/fields.py index 9eb5d97..ac782a9 100644 --- a/django_select2/fields.py +++ b/django_select2/fields.py @@ -3,7 +3,7 @@ class AutoViewFieldMixin(object): def __init__(self, *args, **kwargs): name = self.__class__.__name__ from .util import register_field - if name not in ['AutoViewFieldMixin', 'AutoModelSelect2Field']: + if name not in ['AutoViewFieldMixin', 'AutoSelect2Field', 'AutoModelSelect2Field']: id_ = register_field("%s.%s" % (self.__module__, name), self) self.widget.field_id = id_ super(AutoViewFieldMixin, self).__init__(*args, **kwargs) From 8d42210053cbd76bde3935147d6f1c5b8d84e060 Mon Sep 17 00:00:00 2001 From: "AppleGrew (applegrew)" Date: Tue, 21 Aug 2012 01:50:18 +0530 Subject: [PATCH 06/10] Readme update --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7fb81cd..20f49c2 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ External dependencies * Django - This is obvious. * jQuery - This is not included in the package since it is expected that in most scenarios this would already be available. +================= Changelog Summary ================= From 691fa14e2e381d835ee8339970bc4ee9ab1dc38a Mon Sep 17 00:00:00 2001 From: "AppleGrew (applegrew)" Date: Tue, 21 Aug 2012 23:21:41 +0530 Subject: [PATCH 07/10] Multi value bu fixes Many bugs ironed out of Multi value fields. Added many new tests for multi value fields. --- README.md | 5 +- django_select2/__init__.py | 10 ++-- django_select2/fields.py | 48 +++++++++++++++-- django_select2/static/js/heavy_data.js | 51 ++++++++++++++---- django_select2/util.py | 51 ++++++++++++++++-- django_select2/widgets.py | 57 ++++++++------------ testapp/test.db | Bin 151552 -> 172032 bytes testapp/testmain/fixtures/initial_data.json | 30 +++++++++-- testapp/testmain/forms.py | 12 +++-- testapp/testmain/models.py | 7 +++ 10 files changed, 204 insertions(+), 67 deletions(-) diff --git a/README.md b/README.md index 20f49c2..63a7c07 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,9 @@ External dependencies * Django - This is obvious. * jQuery - This is not included in the package since it is expected that in most scenarios this would already be available. -================= Changelog Summary ================= -v2.0 ----- +### v2.0 + Mostly major bug fixes in code and design. The changes were many, raising the possibility of backward incompatibilty. However, the backward incompatibilty would be subtle. diff --git a/django_select2/__init__.py b/django_select2/__init__.py index 705bb2b..6e129e1 100644 --- a/django_select2/__init__.py +++ b/django_select2/__init__.py @@ -2,8 +2,10 @@ __version__ = "2.0" from django.conf import settings if settings.configured: - from .widgets import Select2Widget, Select2MultipleWidget, HeavySelect2Widget, HeavySelect2MultipleWidget, AutoHeavySelect2Widget - from .fields import Select2ChoiceField, Select2MultipleChoiceField, \ - HeavySelect2ChoiceField, HeavySelect2MultipleChoiceField, \ - ModelSelect2Field, AutoSelect2Field, AutoModelSelect2Field, ModelMultipleSelect2Field + from .widgets import Select2Widget, Select2MultipleWidget, HeavySelect2Widget, HeavySelect2MultipleWidget, \ + AutoHeavySelect2Widget, AutoHeavySelect2MultipleWidget + from .fields import Select2ChoiceField, Select2MultipleChoiceField, HeavySelect2ChoiceField, \ + HeavySelect2MultipleChoiceField, HeavyModelSelect2ChoiceField, HeavyModelSelect2MultipleChoiceField, \ + ModelSelect2Field, ModelSelect2MultipleField, AutoSelect2Field, AutoSelect2MultipleField, \ + AutoModelSelect2Field, AutoModelSelect2MultipleField from .views import Select2View, NO_ERR_RESP diff --git a/django_select2/fields.py b/django_select2/fields.py index ac782a9..4cdf7df 100644 --- a/django_select2/fields.py +++ b/django_select2/fields.py @@ -2,8 +2,10 @@ class AutoViewFieldMixin(object): """Registers itself with AutoResponseView.""" def __init__(self, *args, **kwargs): name = self.__class__.__name__ + print '<><><><><><>', self.__module__, ' :::: ', name, from .util import register_field - if name not in ['AutoViewFieldMixin', 'AutoSelect2Field', 'AutoModelSelect2Field']: + if name not in ['AutoViewFieldMixin', 'AutoSelect2Field', 'AutoModelSelect2Field', + 'AutoSelect2MultipleField', 'AutoModelSelect2MultipleField']: id_ = register_field("%s.%s" % (self.__module__, name), self) self.widget.field_id = id_ super(AutoViewFieldMixin, self).__init__(*args, **kwargs) @@ -24,7 +26,8 @@ from django.utils.encoding import smart_unicode from django.core.validators import EMPTY_VALUES from .widgets import Select2Widget, Select2MultipleWidget,\ - HeavySelect2Widget, HeavySelect2MultipleWidget, AutoHeavySelect2Widget + HeavySelect2Widget, HeavySelect2MultipleWidget, AutoHeavySelect2Widget, \ + AutoHeavySelect2MultipleWidget from .views import NO_ERR_RESP from .util import extract_some_key_val @@ -173,7 +176,7 @@ class ModelSelect2Field(ModelChoiceField) : "Light Model Select2 field" widget = Select2Widget -class ModelMultipleSelect2Field(ModelMultipleChoiceField) : +class ModelSelect2MultipleField(ModelMultipleChoiceField) : "Light multiple-value Model Select2 field" widget = Select2MultipleWidget @@ -199,16 +202,21 @@ class HeavySelect2ChoiceField(HeavySelect2FieldBase): class HeavySelect2MultipleChoiceField(HeavySelect2FieldBase): widget = HeavySelect2MultipleWidget -### Heavy field specialized for Models (Single valued) ### +### Heavy field specialized for Models ### class HeavyModelSelect2ChoiceField(QuerysetChoiceMixin, HeavySelect2ChoiceField, ModelChoiceField): def __init__(self, *args, **kwargs): kwargs.pop('choices', None) super(HeavyModelSelect2ChoiceField, self).__init__(*args, **kwargs) +class HeavyModelSelect2MultipleChoiceField(QuerysetChoiceMixin, HeavySelect2MultipleChoiceField, ModelMultipleChoiceField): + def __init__(self, *args, **kwargs): + kwargs.pop('choices', None) + super(HeavyModelSelect2MultipleChoiceField, self).__init__(*args, **kwargs) + ### Heavy general field that uses central AutoView ### -class AutoSelect2Field(ModelResultJsonMixin, AutoViewFieldMixin, HeavySelect2ChoiceField): +class AutoSelect2Field(AutoViewFieldMixin, HeavySelect2ChoiceField): """ This needs to be subclassed. The first instance of a class (sub-class) is used to serve all incoming json query requests for that type (class). @@ -221,6 +229,19 @@ class AutoSelect2Field(ModelResultJsonMixin, AutoViewFieldMixin, HeavySelect2Cho kwargs['data_view'] = self.data_view super(AutoSelect2Field, self).__init__(*args, **kwargs) +class AutoSelect2MultipleField(AutoViewFieldMixin, HeavySelect2MultipleChoiceField): + """ + This needs to be subclassed. The first instance of a class (sub-class) is used to serve all incoming + json query requests for that type (class). + """ + + widget = AutoHeavySelect2MultipleWidget + + def __init__(self, *args, **kwargs): + self.data_view = "django_select2_central_json" + kwargs['data_view'] = self.data_view + super(AutoSelect2MultipleField, self).__init__(*args, **kwargs) + ### Heavy field, specialized for Model, that uses central AutoView ### class AutoModelSelect2Field(ModelResultJsonMixin, AutoViewFieldMixin, HeavyModelSelect2ChoiceField): @@ -237,3 +258,20 @@ class AutoModelSelect2Field(ModelResultJsonMixin, AutoViewFieldMixin, HeavyModel self.data_view = "django_select2_central_json" kwargs['data_view'] = self.data_view super(AutoModelSelect2Field, self).__init__(*args, **kwargs) + +class AutoModelSelect2MultipleField(ModelResultJsonMixin, AutoViewFieldMixin, HeavyModelSelect2MultipleChoiceField): + """ + This needs to be subclassed. The first instance of a class (sub-class) is used to serve all incoming + json query requests for that type (class). + """ + __metaclass__ = UnhideableQuerysetType # Makes sure that user defined queryset class variable is replaced by + # queryset property (as it is needed by super classes). + + widget = AutoHeavySelect2MultipleWidget + + def __init__(self, *args, **kwargs): + self.data_view = "django_select2_central_json" + kwargs['data_view'] = self.data_view + super(AutoModelSelect2MultipleField, self).__init__(*args, **kwargs) + + diff --git a/django_select2/static/js/heavy_data.js b/django_select2/static/js/heavy_data.js index 3a7da47..d3931ed 100644 --- a/django_select2/static/js/heavy_data.js +++ b/django_select2/static/js/heavy_data.js @@ -1,6 +1,6 @@ var django_select2 = { - MULTISEPARATOR: String.fromCharCode(0), + MULTISEPARATOR: String.fromCharCode(0), // We use this unprintable char as separator, since this can't be entered by user. get_url_params: function (term, page, context) { var field_id = $(this).data('field_id'), res = { @@ -163,6 +163,10 @@ var django_select2 = { e = $(e); var id = e.attr('id'), data = null, val = e.select2('val'); + if (!val && val !== 0) { + val = e.data('initVal'); + } + if (val || val === 0) { // Value is set so need to get the text. data = django_select2.getValText(e); @@ -176,14 +180,16 @@ var django_select2 = { callback(data); // Change for 2.3.x }, onMultipleHiddenChange: function () { - var $e = $(this), valContainer = $e.data('valContainer'), name = $e.data('name'); + var $e = $(this), valContainer = $e.data('valContainer'), name = $e.data('name'), vals = $e.val(); valContainer.empty(); - $($e.val()).each(function () { - var inp = $('').appendTo(valContainer); - inp.attr('type', 'hidden'); - inp.attr('name', name); - inp.val(this); - }); + if (vals) { + vals = vals.split(django_select2.MULTISEPARATOR); + $(vals).each(function () { + var inp = $('').appendTo(valContainer); + inp.attr('name', name); + inp.val(this); + }); + } }, initMultipleHidden: function ($e) { var valContainer; @@ -191,18 +197,41 @@ var django_select2 = { $e.data('name', $e.attr('name')); $e.attr('name', ''); - valContainer = $e.after('
').css({'display': 'none'}); + valContainer = $('
').insertAfter($e).css({'display': 'none'}); $e.data('valContainer', valContainer); $e.change(django_select2.onMultipleHiddenChange); + if ($e.val()) { + $e.change(); + } }, convertArrToStr: function (arr) { return arr.join(django_select2.MULTISEPARATOR); + }, + runInContextHelper: function (f, id) { + return function () { + var args = Array.prototype.slice.call(arguments); + return f.apply($('#' + id).get(0), args); + } } }; (function( $ ){ - $.fn.txt = function() { - return this.attr('txt'); + // This sets or gets the text lables for an element. It merely takes care returing array or single + // value, based on if element is multiple type. + $.fn.txt = function(val) { + if (typeof(val) !== 'undefined') { + if (val instanceof Array) { + val = django_select2.convertArrToStr(val); + } + this.attr('txt', val); + return this; + } else { + val = this.attr('txt'); + if (val && this.attr('multiple')) { + val = val.split(django_select2.MULTISEPARATOR); + } + return val; + } }; })( jQuery ); \ No newline at end of file diff --git a/django_select2/util.py b/django_select2/util.py index 854ea94..b795c3f 100644 --- a/django_select2/util.py +++ b/django_select2/util.py @@ -1,6 +1,4 @@ -def convert_to_js_string_arr(lst): - lst = ['"%s"' % l for l in lst] - return u"[%s]" % (",".join(lst)) +import types def render_js_script(inner_code): return u""" @@ -37,6 +35,53 @@ def extract_some_key_val(dct, keys): edct[k] = v return edct +def convert_py_to_js_data(val, id_): + if type(val) == types.BooleanType: + return u'true' if val else u'false' + elif type(val) in [types.IntType, types.LongType, types.FloatType]: + return unicode(val) + elif isinstance(val, JSFunctionInContext): + return u"django_select2.runInContextHelper(%s, '%s')" % (val, id_) + elif isinstance(val, JSVar): + return val # No quotes here + elif isinstance(val, dict): + return convert_dict_to_js_map(val, id_) + elif isinstance(val, list): + return convert_to_js_arr(val, id_) + else: + return u"'%s'" % unicode(val) + +def convert_dict_to_js_map(dct, id_): + out = u'{' + is_first = True + for name in dct: + if not is_first: + out += u", " + else: + is_first = False + + out += u"'%s': " % name + out += convert_py_to_js_data(dct[name], id_) + + return out + u'}' + +def convert_to_js_arr(lst, id_): + out = u'[' + is_first = True + for val in lst: + if not is_first: + out += u", " + else: + is_first = False + + out += convert_py_to_js_data(val, id_) + + return out + u']' + +def convert_to_js_string_arr(lst): + lst = ['"%s"' % l for l in lst] + return u"[%s]" % (",".join(lst)) + ### Auto view helper utils ### import re diff --git a/django_select2/widgets.py b/django_select2/widgets.py index ac2077d..26a3a5c 100644 --- a/django_select2/widgets.py +++ b/django_select2/widgets.py @@ -1,11 +1,12 @@ -import types from itertools import chain from django import forms from django.utils.safestring import mark_safe from django.core.urlresolvers import reverse +from django.utils.datastructures import MultiValueDict, MergeDict -from .util import render_js_script, convert_to_js_string_arr, JSVar, JSFunction, JSFunctionInContext +from .util import render_js_script, convert_to_js_string_arr, JSVar, JSFunction, JSFunctionInContext, \ + convert_dict_to_js_map, convert_to_js_arr ### Light mixin and widgets ### @@ -44,33 +45,7 @@ class Select2Mixin(object): return options def render_select2_options_code(self, options, id_): - out = '{' - is_first = True - for name in options: - if not is_first: - out += u", " - else: - is_first = False - - out += u"'%s': " % name - val = options[name] - if type(val) == types.BooleanType: - out += u'true' if val else u'false' - elif type(val) in [types.IntType, types.LongType, types.FloatType]: - out += unicode(val) - elif isinstance(val, JSFunctionInContext): - out += u"""function () { - var args = Array.prototype.slice.call(arguments); - return %s.apply($('#%s').get(0), args); - }""" % (val, id_) - elif isinstance(val, JSVar): - out += val # No quotes here - elif isinstance(val, dict): - out += self.render_select2_options_code(val, id_) - else: - out += u"'%s'" % val - - return out + u'}' + return convert_dict_to_js_map(options, id_) def render_js_code(self, id_, *args): if id_: @@ -129,12 +104,22 @@ class MultipleSelect2HiddenInput(forms.TextInput): input_type = 'hidden' # We want it hidden but should be treated as if is_hidden is False def render(self, name, value, attrs=None, choices=()): attrs = self.build_attrs(attrs, multiple='multiple') - s = unicode(super(MultipleSelect2HiddenInput, self).render(name, value, attrs, choices)) + s = unicode(super(MultipleSelect2HiddenInput, self).render(name, u"", attrs)) id_ = attrs.get('id', None) if id_: - s += render_js_script(u"django_select2.initMultipleHidden($('#%s'));" % id_) + jscode = u'' + if value: + jscode = u"$('#%s').val(django_select2.convertArrToStr(%s));" \ + % (id_, convert_to_js_arr(value, id_)) + jscode += u"django_select2.initMultipleHidden($('#%s'));" % id_ + s += render_js_script(jscode) return s + def value_from_datadict(self, data, files, name): + if isinstance(data, (MultiValueDict, MergeDict)): + return data.getlist(name) + return data.get(name, None) + ### Heavy mixins and widgets ### class HeavySelect2Mixin(Select2Mixin): @@ -146,7 +131,6 @@ class HeavySelect2Mixin(Select2Mixin): self.choices = kwargs.pop('choices', []) if not self.view and not self.url: raise ValueError('data_view or data_url is required') - self.url = None self.options['ajax'] = { 'dataType': 'json', 'quietMillis': 100, @@ -209,15 +193,18 @@ class HeavySelect2MultipleWidget(HeavySelect2Mixin, MultipleSelect2HiddenInput): if value: # Just like forms.SelectMultiple.render() it assumes that value will be multi-valued (list). texts = self.render_texts(value, choices) if texts: - return render_js_script(u"$('#%s').attr('txt', %s);" % (id_, texts)) + return u"$('#%s').txt(%s);" % (id_, texts) ### Auto Heavy widgets ### class AutoHeavySelect2Mixin(HeavySelect2Mixin): def render_inner_js_code(self, id_, *args): - js = super(AutoHeavySelect2Mixin, self).render_inner_js_code(id_, *args) - js += u"$('#%s').data('field_id', '%s');" % (id_, self.field_id) + js = u"$('#%s').data('field_id', '%s');" % (id_, self.field_id) + js += super(AutoHeavySelect2Mixin, self).render_inner_js_code(id_, *args) return js class AutoHeavySelect2Widget(AutoHeavySelect2Mixin, HeavySelect2Widget): pass + +class AutoHeavySelect2MultipleWidget(AutoHeavySelect2Mixin, HeavySelect2MultipleWidget): + pass diff --git a/testapp/test.db b/testapp/test.db index 1d941f74aa3ac65cecaf720622a1bd4e26cde148..6f372e598f69b7cb752c4dd868cdec8afea8fcbf 100644 GIT binary patch delta 2642 zcmbtVYit}>6`nIQJF_#pGiMxoch>gqdcCgWb=TcGa-xu`O=6s)K%C}L!s7?no9?DD zO6*{}p_L+<4TU5>QkqWHOI5W3+i_CGjU!g7Q>hXbL{SPwF$h9a1#A$HNK~#PP!$Cb zoO}1d78UUWkM};ld%o|Sd(X_dN55+voj0FruG=a}(!KPn{KZap^}yECgWaa`4BS=H zFbR{zUdI4!kE^*uecov!!u~!3u67{1cWhwIi&NnG`7m-U)4(pChb<8DTIFWu%)m7W zv85UKTxYltsMp>0b|`#tJiGTmemp-melR;UJV3l&3pgb=QNh1&;^66nrS?1eODr15*^|U?3Tf`=m~2?aK})a(V76 zL4y9$kULDpo{vV>nq?q=@X&#gr}Ftk)F-8(t%jA$9~w8xR(zap_WGmgr{hgk`N#HW zhaWG=mxe;V(I@plnhTZJD=y5kQDvTpR9%)Wh0C&)aOwJ_^>AN})??oFXj4-p?33D{ znd8}9PVA3*?%i97x?p<#SPK}%RP3g##H~3`PozSdtrh$8wrM6(y%Fpb<#j6n$H%j^mj_wf~c z7Qcp{#f`X+M3d<4_#o6~)~T@&RCpp)jvA}4BBWG2{K2!EO$FbR@Gtl$e2>WQ;3or$ zBE|Z%hx5a^{HQ4_QuCwPefvg7h66wgeWODM$A(6RExaY^cu~Ryyo&R7__DKkq5B3ZIxlV@dD_OMHdQ$w*PuQV&Ww9$oYRe(t|sIUy-0)R)wEeRs5n zwO{ClzsG;V_@;3s;03M(e`Uq3KiEn8XE_dY#>%&J7%ef5>w`JPsTE zb8rr3l+^!KtlroOs-8m2+eMns@mVLICD?@t@UxW( zXgAXBy1S%z$OD0lDG94Jo zB|HE7ZQz8DHHLM!uMfVlLEHx1h00x2eYxTWIXVfZxD38}64tOCGmzjjFKZ^*%mpyS z(&haR>Q(0|dOBbMr!C5-# zj#=0Q&Ft}6=w&;n33zK3wwQ%@RCl*+fWpIUcow28GYuA7eG=-Rh3%S#dTzCfqki`D zvv9vsNX6KtY4|jqIxTmyMZVH=7BWUAuDg%+LSYa4!8ENBB}s`Tqr5D&uxHM|I?6sx zBkYkgptBoipi73tiyUvO;yv<_+LvLQ-2HKH%=(Xexpo;{_mq;qT_j%|>W7oiDstZO z@0^Q;PfbBbE6)_qG_Qan)fQDP4aWihOf~B=j?X!RkV7^*Lf8Mv5m?q=db7Zr1l}m{h`?QehXo!II6L(;jDcB%?tivSY<6n@qb4p>)x9j?kE!(hj-tPb z*Qo-Fhuoh-wzxy~>BxnsBrdeb?mC-KL_J&uycz~Y3Ddx+irpl+>t(?O8q*`hf}E*V z#qO8GT}q9bsI5U!S-BcXt5mh|F8&plN$nPCEMPa@l{C<}lA?-M5%K7}1%H*bEO@jj z!HRR1Qp19eu-@pF!9jeV@^}OAZ}=hJ#v60aX8CRG5W2#XEcmjI=hLUEibN4mBl8CS E1prW}EC2ui delta 1847 zcmaJ>e{2(V6u)+w9Vp2)LERh?`7!1gLiodtLhBf?F<}fw zjH4J8V)!v@{QjXBw~1`)Kth#4AfW+b5K%@*2r)xo(Le$LOcZ|w^m|vv7BpV&-n;kS z_kG^y`|E8~>np7>3EC-`JDcRagvVUCaCib{lsTeq)HGm7T|Jwc5$FKJbBq z)c3)UtZXA6?}L1>la|lGNv`dKYSx!Vx<7?kkgodjVs2JPl)aFo_JzH$7;NOiPUuN| z!Ot@rMTypPnjgjtN}>6b*ez}p=ZYTl!$hq+X)g3QbxbjMt3oaAaAZxSE#i(ex2{>+ z5s3&XyJ5_BXT|P0(`Dl$cR148=FN;*v%Rb*Bi4|eFalsCyUr3Z3E&X;Z^EdGAU zW8=XKPm*(5c$f+kxly)7_JYjR=qH$Eq()C*;)qrF>{)gz4|yPj!r{l0u*p2QD6cns zZ%6fjOBh^2X;fopG#@0!AxTBirvRX`G8ArZYH5qCZ>xxG3ehEu_*SfKZe6}Q{A#da z{mM|Vq%=3+r%&#x@(uGlLjIa1vjZD)7uD6g;B8u3RW-k9dFkrSD*_wZXRn(Vd~xww ze|uwf-D`{LX4TCpZLD3ssQMXNCg=|Yi~Qw9LH~4jATT3PKBJ`AR~{^Wx;QW%dNN|7 z`ww`Z!TXf?ZOj!o2WV{R1QOq#-@X0x1}@^jXdW-TcV z%HiF>E218^GkA+)p2p9Il!Fk)u7ftR{RHHvr}26whXtq(t?O{l4YfoJ!$3}*fJ)AZ z^~8__55A78a2vK`7`I|8)>A@moTlRd1g9#ES*kQ-YMuk-1LXJPn;udmM+R+?C9z)NDRs~ zF!X&C4nXXf_|}l=9k|Z@hx0gpsDfAgc9vs|AXtT^Cb#JovuNHg{vee}XXGmwHZ0SB zspoZ3{sG^~o#WEk9W0lqRn7w!HB2F+Jx~UDB+yM;+_7E|KIjD_dA=74U@}?LOJli@ zW2J0~n|yQts$r_?Yl0l|VK=p=sFs(c_dq#JBGo+*pt+qrFdtmx#vqiC+BjsAlKoI@ ziZa;-$8$vxolNcw(k>bugbWJf+E2yNK`0b_PJ^Sa5~42?jDwqeH$d5p#vzM{1GJ$k zgRqeGWD#Q==1}klaVQ|u;&jNHaqzK|GD+hAR6;h92I!P%ZrRXR@4_I*ZTcy1{W;6vpZE*j z!L#({jN%AhqKAB#o~J$(@eU(`q@EQ>Bf~YUqXbohl{J@DlNL=XsoO%qMkw4R3V4%3 zj#AKJJUtGk)4=FW8E#A}?FRR;gU`}i~78d7$%Ut`xx SdNQ($wIa_kz^Q^&1^ffp5$4hW diff --git a/testapp/testmain/fixtures/initial_data.json b/testapp/testmain/fixtures/initial_data.json index aaf576d..a8d10bb 100644 --- a/testapp/testmain/fixtures/initial_data.json +++ b/testapp/testmain/fixtures/initial_data.json @@ -34,12 +34,34 @@ "number": "500" } }, + { + "pk": 1, + "model": "testmain.lab", + "fields": { + "name": "Crimsion" + } + }, + { + "pk": 2, + "model": "testmain.lab", + "fields": { + "name": "Saffron" + } + }, + { + "pk": 3, + "model": "testmain.lab", + "fields": { + "name": "Lavender" + } + }, { "pk": 1, "model": "testmain.dept", "fields": { "name": "Chemistry", - "allotted_rooms": [1, 2, 3] + "allotted_rooms": [1, 2, 3], + "allotted_labs": [1] } }, { @@ -47,7 +69,8 @@ "model": "testmain.dept", "fields": { "name": "Biology", - "allotted_rooms": [3, 4] + "allotted_rooms": [3, 4], + "allotted_labs": [2] } }, { @@ -55,7 +78,8 @@ "model": "testmain.dept", "fields": { "name": "Physics", - "allotted_rooms": [1, 2, 5] + "allotted_rooms": [1, 2, 5], + "allotted_labs": [1, 3] } }, { diff --git a/testapp/testmain/forms.py b/testapp/testmain/forms.py index 1b0cf80..9a4a13b 100644 --- a/testapp/testmain/forms.py +++ b/testapp/testmain/forms.py @@ -2,21 +2,27 @@ from django import forms from django_select2 import * -from .models import Employee, Dept, ClassRoom +from .models import Employee, Dept, ClassRoom, Lab class EmployeeChoices(AutoModelSelect2Field): queryset = Employee.objects search_fields = ['name__icontains', ] +class ClassRoomChoices(AutoModelSelect2MultipleField): + queryset = ClassRoom.objects + search_fields = ['number__icontains', ] + + class EmployeeForm(forms.ModelForm): - manager = EmployeeChoices() + manager = EmployeeChoices(required=False) dept = ModelSelect2Field(queryset=Dept.objects) class Meta: model = Employee class DeptForm(forms.ModelForm): - allotted_rooms = ModelMultipleSelect2Field(queryset=ClassRoom.objects) + allotted_rooms = ClassRoomChoices() + allotted_labs = ModelSelect2MultipleField(queryset=Lab.objects, required=False) class Meta: model = Dept diff --git a/testapp/testmain/models.py b/testapp/testmain/models.py index 0e5afe8..3599538 100644 --- a/testapp/testmain/models.py +++ b/testapp/testmain/models.py @@ -6,9 +6,16 @@ class ClassRoom(models.Model): def __unicode__(self): return unicode(self.number) +class Lab(models.Model): + name = models.CharField(max_length=10) + + def __unicode__(self): + return unicode(self.name) + class Dept(models.Model): name = models.CharField(max_length=10) allotted_rooms = models.ManyToManyField(ClassRoom) + allotted_labs = models.ManyToManyField(Lab) def __unicode__(self): return unicode(self.name) From 2c2a0073f5aa2a3ca0c73ac6707c714968f7413e Mon Sep 17 00:00:00 2001 From: "AppleGrew (applegrew)" Date: Tue, 21 Aug 2012 23:45:06 +0530 Subject: [PATCH 08/10] Added example section in Readme --- README.md | 8 +++++++- django_select2/fields.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 63a7c07..6683752 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,18 @@ The app includes Select2 driven Django Widgets and Form Fields. More details can be found on my blog at - [http://blog.applegrew.com/2012/08/django-select2/](http://blog.applegrew.com/2012/08/django-select2/). -External dependencies +External Dependencies ===================== * Django - This is obvious. * jQuery - This is not included in the package since it is expected that in most scenarios this would already be available. +Example Application +=================== +Please checkout `testapp` application. This application is used to manually test the functionalities of this component. This also serves as a good example. + +You need only django 1.4 or above to run that. + Changelog Summary ================= diff --git a/django_select2/fields.py b/django_select2/fields.py index 4cdf7df..64b7f8b 100644 --- a/django_select2/fields.py +++ b/django_select2/fields.py @@ -2,7 +2,7 @@ class AutoViewFieldMixin(object): """Registers itself with AutoResponseView.""" def __init__(self, *args, **kwargs): name = self.__class__.__name__ - print '<><><><><><>', self.__module__, ' :::: ', name, + print '<><><><><><>', self.__module__, '.', name, '\n' from .util import register_field if name not in ['AutoViewFieldMixin', 'AutoSelect2Field', 'AutoModelSelect2Field', 'AutoSelect2MultipleField', 'AutoModelSelect2MultipleField']: From 6a2c96668ddec460a936407ccbec19f02c5ee7ed Mon Sep 17 00:00:00 2001 From: "AppleGrew (applegrew)" Date: Wed, 22 Aug 2012 09:55:20 +0530 Subject: [PATCH 09/10] Loggers added --- django_select2/fields.py | 14 +++++++++----- django_select2/util.py | 8 ++++++++ django_select2/widgets.py | 7 +++++++ testapp/testapp/settings.py | 11 ++++++++++- testapp/testapp/templates/index.html | 2 +- 5 files changed, 35 insertions(+), 7 deletions(-) diff --git a/django_select2/fields.py b/django_select2/fields.py index 64b7f8b..b4e205a 100644 --- a/django_select2/fields.py +++ b/django_select2/fields.py @@ -1,13 +1,17 @@ +import logging + +logger = logging.getLogger(__name__) + class AutoViewFieldMixin(object): """Registers itself with AutoResponseView.""" def __init__(self, *args, **kwargs): name = self.__class__.__name__ - print '<><><><><><>', self.__module__, '.', name, '\n' + if logger.isEnabledFor(logging.DEBUG): + logger.debug("Registering auto field: %s.%s", self.__module__, name) + from .util import register_field - if name not in ['AutoViewFieldMixin', 'AutoSelect2Field', 'AutoModelSelect2Field', - 'AutoSelect2MultipleField', 'AutoModelSelect2MultipleField']: - id_ = register_field("%s.%s" % (self.__module__, name), self) - self.widget.field_id = id_ + id_ = register_field("%s.%s" % (self.__module__, name), self) + self.widget.field_id = id_ super(AutoViewFieldMixin, self).__init__(*args, **kwargs) def security_check(self, request, *args, **kwargs): diff --git a/django_select2/util.py b/django_select2/util.py index b795c3f..71dfac1 100644 --- a/django_select2/util.py +++ b/django_select2/util.py @@ -1,4 +1,7 @@ import types +import logging + +logger = logging.getLogger(__name__) def render_js_script(inner_code): return u""" @@ -120,8 +123,13 @@ def register_field(name, field): __field_store[name] = id_ __id_store[id_] = field + + if logger.isEnabledFor(logging.DEBUG): + logger.debug("Registering new field: %s; With actual id: %s", name, id_) else: id_ = __field_store[name] + if logger.isEnabledFor(logging.DEBUG): + logger.debug("Field already registered: %s; With actual id: %s", name, id_) return id_ def get_field(id_): diff --git a/django_select2/widgets.py b/django_select2/widgets.py index 26a3a5c..85399a6 100644 --- a/django_select2/widgets.py +++ b/django_select2/widgets.py @@ -1,3 +1,4 @@ +import logging from itertools import chain from django import forms @@ -8,6 +9,8 @@ from django.utils.datastructures import MultiValueDict, MergeDict from .util import render_js_script, convert_to_js_string_arr, JSVar, JSFunction, JSFunctionInContext, \ convert_dict_to_js_map, convert_to_js_arr +logger = logging.getLogger(__name__) + ### Light mixin and widgets ### class Select2Mixin(object): @@ -67,6 +70,10 @@ class Select2Mixin(object): final_attrs = self.build_attrs(attrs) id_ = final_attrs.get('id', None) s += self.render_js_code(id_, name, value, attrs, choices) + + if logger.isEnabledFor(logging.DEBUG): + logger.debug("Generated widget code:-\n%s", s) + return mark_safe(s) class Media: diff --git a/testapp/testapp/settings.py b/testapp/testapp/settings.py index 0002012..9705401 100644 --- a/testapp/testapp/settings.py +++ b/testapp/testapp/settings.py @@ -152,9 +152,18 @@ LOGGING = { 'level': 'ERROR', 'filters': ['require_debug_false'], 'class': 'django.utils.log.AdminEmailHandler' - } + }, + 'console':{ + 'level':'DEBUG', + 'class':'logging.StreamHandler' + }, }, 'loggers': { + 'django_select2': { + 'handlers':['console'], + 'propagate': True, + 'level':'DEBUG', + }, 'django.request': { 'handlers': ['mail_admins'], 'level': 'ERROR', diff --git a/testapp/testapp/templates/index.html b/testapp/testapp/templates/index.html index 4eff15a..5768d1c 100644 --- a/testapp/testapp/templates/index.html +++ b/testapp/testapp/templates/index.html @@ -9,4 +9,4 @@
  • Test single selection model fields
  • Test multi selection model fields
    • - \ No newline at end of file + From 878ddb839a96529dbf48ab03be56ab995c4e0616 Mon Sep 17 00:00:00 2001 From: "AppleGrew (applegrew)" Date: Wed, 22 Aug 2012 11:19:30 +0530 Subject: [PATCH 10/10] More bug fixes. And added 'auto_id' parameter for auto fields. --- README.md | 4 +++- django_select2/fields.py | 8 ++++---- django_select2/static/js/heavy_data.js | 12 +++++++++--- django_select2/util.py | 19 +++++++++++-------- django_select2/widgets.py | 5 ++++- testapp/test.db | Bin 172032 -> 172032 bytes testapp/testapp/settings.py | 2 +- testapp/testapp/static/jquery-1.7.2.min.js | 4 ++++ testapp/testapp/templates/form.html | 3 ++- testapp/testmain/forms.py | 4 ++++ 10 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 testapp/testapp/static/jquery-1.7.2.min.js diff --git a/README.md b/README.md index 6683752..e6a473a 100644 --- a/README.md +++ b/README.md @@ -24,4 +24,6 @@ Changelog Summary ### v2.0 -Mostly major bug fixes in code and design. The changes were many, raising the possibility of backward incompatibilty. However, the backward incompatibilty would be subtle. +* Mostly major bug fixes in code and design. The changes were many, raising the possibility of backward incompatibilty. However, the backward incompatibilty would be subtle. + +* Auto fields (sub-classes of AutoViewFieldMixin) now accepts `auto_id` parameter. This can be used to provide custom id for the field. The default is 'module.field_class_name'. Ideally only the first instance of an auto field is registered. This parameter can be used to force registration of additional instances by passing a unique value. diff --git a/django_select2/fields.py b/django_select2/fields.py index b4e205a..05cda4c 100644 --- a/django_select2/fields.py +++ b/django_select2/fields.py @@ -5,12 +5,12 @@ logger = logging.getLogger(__name__) class AutoViewFieldMixin(object): """Registers itself with AutoResponseView.""" def __init__(self, *args, **kwargs): - name = self.__class__.__name__ - if logger.isEnabledFor(logging.DEBUG): - logger.debug("Registering auto field: %s.%s", self.__module__, name) + name = kwargs.pop('auto_id', u"%s.%s" % (self.__module__, self.__class__.__name__)) + if logger.isEnabledFor(logging.INFO): + logger.info("Registering auto field: %s", name) from .util import register_field - id_ = register_field("%s.%s" % (self.__module__, name), self) + id_ = register_field(name, self) self.widget.field_id = id_ super(AutoViewFieldMixin, self).__init__(*args, **kwargs) diff --git a/django_select2/static/js/heavy_data.js b/django_select2/static/js/heavy_data.js index d3931ed..1ae10e4 100644 --- a/django_select2/static/js/heavy_data.js +++ b/django_select2/static/js/heavy_data.js @@ -221,10 +221,16 @@ var django_select2 = { // value, based on if element is multiple type. $.fn.txt = function(val) { if (typeof(val) !== 'undefined') { - if (val instanceof Array) { - val = django_select2.convertArrToStr(val); + if (val) { + if (val instanceof Array) { + if (this.attr('multiple')) { + val = django_select2.convertArrToStr(val); + } else { + val = val[0] + } + } + this.attr('txt', val); } - this.attr('txt', val); return this; } else { val = this.attr('txt'); diff --git a/django_select2/util.py b/django_select2/util.py index 71dfac1..a052613 100644 --- a/django_select2/util.py +++ b/django_select2/util.py @@ -1,6 +1,9 @@ import types import logging +from django.utils.html import escape +from django.utils.encoding import force_unicode + logger = logging.getLogger(__name__) def render_js_script(inner_code): @@ -42,7 +45,7 @@ def convert_py_to_js_data(val, id_): if type(val) == types.BooleanType: return u'true' if val else u'false' elif type(val) in [types.IntType, types.LongType, types.FloatType]: - return unicode(val) + return force_unicode(val) elif isinstance(val, JSFunctionInContext): return u"django_select2.runInContextHelper(%s, '%s')" % (val, id_) elif isinstance(val, JSVar): @@ -52,7 +55,7 @@ def convert_py_to_js_data(val, id_): elif isinstance(val, list): return convert_to_js_arr(val, id_) else: - return u"'%s'" % unicode(val) + return u"'%s'" % force_unicode(val) def convert_dict_to_js_map(dct, id_): out = u'{' @@ -82,7 +85,7 @@ def convert_to_js_arr(lst, id_): return out + u']' def convert_to_js_string_arr(lst): - lst = ['"%s"' % l for l in lst] + lst = [u'"%s"' % force_unicode(l) for l in lst] return u"[%s]" % (",".join(lst)) ### Auto view helper utils ### @@ -119,17 +122,17 @@ def register_field(name, field): if name not in __field_store: # Generating id - id_ = "%d:%s" % (len(__id_store), str(datetime.datetime.now())) + id_ = u"%d:%s" % (len(__id_store), unicode(datetime.datetime.now())) __field_store[name] = id_ __id_store[id_] = field - if logger.isEnabledFor(logging.DEBUG): - logger.debug("Registering new field: %s; With actual id: %s", name, id_) + if logger.isEnabledFor(logging.INFO): + logger.info("Registering new field: %s; With actual id: %s", name, id_) else: id_ = __field_store[name] - if logger.isEnabledFor(logging.DEBUG): - logger.debug("Field already registered: %s; With actual id: %s", name, id_) + if logger.isEnabledFor(logging.INFO): + logger.info("Field already registered: %s; With actual id: %s", name, id_) return id_ def get_field(id_): diff --git a/django_select2/widgets.py b/django_select2/widgets.py index 85399a6..e1a199d 100644 --- a/django_select2/widgets.py +++ b/django_select2/widgets.py @@ -2,6 +2,7 @@ import logging from itertools import chain from django import forms +from django.utils.encoding import force_unicode from django.utils.safestring import mark_safe from django.core.urlresolvers import reverse from django.utils.datastructures import MultiValueDict, MergeDict @@ -149,9 +150,11 @@ class HeavySelect2Mixin(Select2Mixin): super(HeavySelect2Mixin, self).__init__(**kwargs) def render_texts(self, selected_choices, choices): + selected_choices = list(force_unicode(v) for v in selected_choices) txts = [] all_choices = choices if choices else [] for val, txt in chain(self.choices, all_choices): + val = force_unicode(val) if val in selected_choices: txts.append(txt) if txts: @@ -169,7 +172,7 @@ class HeavySelect2Mixin(Select2Mixin): values = [value] # Just like forms.Select.render() it assumes that value will be single valued. texts = self.render_texts(values, choices) if texts: - return u"$('#%s').attr('txt', %s);" % (id_, texts) + return u"$('#%s').txt(%s);" % (id_, texts) def render_inner_js_code(self, id_, name, value, attrs=None, choices=(), *args): js = u"$('#%s').change(django_select2.onValChange).data('userGetValText', %s);" \ diff --git a/testapp/test.db b/testapp/test.db index 6f372e598f69b7cb752c4dd868cdec8afea8fcbf..0c694af5ac34b9132fce589491c7981769dd1311 100644 GIT binary patch delta 384 zcmYk%KS;ws6bA73-X&3D@H54L5Lc&CsB;Ge7q>XNHM@>=ucMoSkg?zSGSZzkudL{93RDpB6_CvRoA0`m*%1D@@`wdP!f8W zVvKifHNrqYq)XdfBP$cBRRgvm0`^^_2|^#A8eY{%-C*ISYI^7`R8wjQX3+zgDH~g) mUir}2L&7h<@r5B?F;Ve^Y}kMo7(8q;vE&^{vjr9e+tZGc;oE{z8`<#tc%d1Rkw|8>3w$nR4s3i0d zk7&!66=H>FOz|#36O3h@yd>@xLEPbH!=g;Wq)eeqRRiB5FVsZ1aX}{XmMW+&H(}-K uW-cz&z-4Y(U!t87{_u+*r1-$A5RVAbKAX0#$rtIFtX?W").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"":"")+""),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;e=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
    a",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="
    "+""+"
    ",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="
    t
    ",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="
    ",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function( +a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&j.push({elem:this,matches:d.slice(e)});for(k=0;k0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

    ";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
    ";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*",""],legend:[1,"
    ","
    "],thead:[1,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],col:[2,"","
    "],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
    ","
    "]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f +.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(;d1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]===""&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]&&typeof (u=l.length)=="number")for(i=0;i1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
    ").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file diff --git a/testapp/testapp/templates/form.html b/testapp/testapp/templates/form.html index 99e9d80..1663753 100644 --- a/testapp/testapp/templates/form.html +++ b/testapp/testapp/templates/form.html @@ -1,7 +1,8 @@ +{% load staticfiles %} - +
    diff --git a/testapp/testmain/forms.py b/testapp/testmain/forms.py index 9a4a13b..6abe284 100644 --- a/testapp/testmain/forms.py +++ b/testapp/testmain/forms.py @@ -26,3 +26,7 @@ class DeptForm(forms.ModelForm): class Meta: model = Dept + +# These are just for testing Auto registration of fields +EmployeeChoices() # Should already be registered +EmployeeChoices(auto_id="EmployeeChoices_CustomAutoId") # Should get registered