Upgrade datatables, load courses over ajax
authorCharles Connell <charles@connells.org>
Mon, 12 May 2014 21:55:08 +0000 (17:55 -0400)
committerCharles Connell <charles@connells.org>
Mon, 12 May 2014 21:55:08 +0000 (17:55 -0400)
15 files changed:
karmaworld/apps/courses/migrations/0013_auto__add_field_course_thank_count.py [new file with mode: 0644]
karmaworld/apps/courses/migrations/0014_populate_file_count.py [new file with mode: 0644]
karmaworld/apps/courses/models.py
karmaworld/apps/courses/views.py
karmaworld/apps/notes/models.py
karmaworld/assets/css/global.css
karmaworld/assets/css/jquery.dataTables.css
karmaworld/assets/js/course-list.js
karmaworld/assets/js/jquery.dataTables.js
karmaworld/assets/js/setup-ajax.js
karmaworld/templates/courses/course_list.html
karmaworld/templates/courses/course_list_entry.html
karmaworld/templates/notes/note_list_entry.html
karmaworld/urls.py
reqs/common.txt

diff --git a/karmaworld/apps/courses/migrations/0013_auto__add_field_course_thank_count.py b/karmaworld/apps/courses/migrations/0013_auto__add_field_course_thank_count.py
new file mode 100644 (file)
index 0000000..6f11a44
--- /dev/null
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Course.thank_count'
+        db.add_column(u'courses_course', 'thank_count',
+                      self.gf('django.db.models.fields.IntegerField')(default=0),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Course.thank_count'
+        db.delete_column(u'courses_course', 'thank_count')
+
+
+    models = {
+        u'courses.course': {
+            'Meta': {'ordering': "['-file_count', 'school', 'name']", 'unique_together': "(('name', 'school'),)", 'object_name': 'Course'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['courses.Department']", 'null': 'True', 'blank': 'True'}),
+            'desc': ('django.db.models.fields.TextField', [], {'max_length': '511', 'null': 'True', 'blank': 'True'}),
+            'file_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'flags': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instructor_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'instructor_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'professor': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['courses.Professor']", 'null': 'True', 'blank': 'True'}),
+            'school': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['courses.School']", 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '150', 'null': 'True'}),
+            'thank_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '511', 'null': 'True', 'blank': 'True'})
+        },
+        u'courses.department': {
+            'Meta': {'unique_together': "(('name', 'school'),)", 'object_name': 'Department'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'school': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['courses.School']"}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '150', 'null': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '511', 'null': 'True', 'blank': 'True'})
+        },
+        u'courses.professor': {
+            'Meta': {'unique_together': "(('name', 'email'),)", 'object_name': 'Professor'},
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        u'courses.school': {
+            'Meta': {'ordering': "['-file_count', '-priority', 'name']", 'object_name': 'School'},
+            'alias': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'facebook_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'file_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'hashtag': ('django.db.models.fields.CharField', [], {'max_length': '16', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'priority': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '150', 'null': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '511', 'blank': 'True'}),
+            'usde_id': ('django.db.models.fields.BigIntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['courses']
\ No newline at end of file
diff --git a/karmaworld/apps/courses/migrations/0014_populate_file_count.py b/karmaworld/apps/courses/migrations/0014_populate_file_count.py
new file mode 100644 (file)
index 0000000..bd865ef
--- /dev/null
@@ -0,0 +1,157 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        for course in orm.Course.objects.all():
+            sum = 0
+            for note in orm['notes.Note'].objects.filter(course=course):
+                sum += note.thanks
+            course.thank_count = sum
+            course.save()
+
+    def backwards(self, orm):
+        pass
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'courses.course': {
+            'Meta': {'ordering': "['-file_count', 'school', 'name']", 'unique_together': "(('name', 'school'),)", 'object_name': 'Course'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['courses.Department']", 'null': 'True', 'blank': 'True'}),
+            'desc': ('django.db.models.fields.TextField', [], {'max_length': '511', 'null': 'True', 'blank': 'True'}),
+            'file_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'flags': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instructor_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'instructor_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'professor': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['courses.Professor']", 'null': 'True', 'blank': 'True'}),
+            'school': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['courses.School']", 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '150', 'null': 'True'}),
+            'thank_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '511', 'null': 'True', 'blank': 'True'})
+        },
+        u'courses.department': {
+            'Meta': {'unique_together': "(('name', 'school'),)", 'object_name': 'Department'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'school': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['courses.School']"}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '150', 'null': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '511', 'null': 'True', 'blank': 'True'})
+        },
+        u'courses.professor': {
+            'Meta': {'unique_together': "(('name', 'email'),)", 'object_name': 'Professor'},
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        u'courses.school': {
+            'Meta': {'ordering': "['-file_count', '-priority', 'name']", 'object_name': 'School'},
+            'alias': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'facebook_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'file_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'hashtag': ('django.db.models.fields.CharField', [], {'max_length': '16', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'priority': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '150', 'null': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '511', 'blank': 'True'}),
+            'usde_id': ('django.db.models.fields.BigIntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        u'licenses.license': {
+            'Meta': {'object_name': 'License'},
+            'html': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'})
+        },
+        u'notes.note': {
+            'Meta': {'ordering': "['-uploaded_at']", 'unique_together': "(('fp_file', 'upstream_link'),)", 'object_name': 'Note'},
+            'category': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'course': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['courses.Course']"}),
+            'flags': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'fp_file': ('django_filepicker.models.FPFileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'gdrive_url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'is_hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'license': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['licenses.License']", 'null': 'True', 'blank': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}),
+            'text': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'thanks': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'tweeted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow', 'null': 'True'}),
+            'upstream_link': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'})
+        },
+        u'notes.notemarkdown': {
+            'Meta': {'object_name': 'NoteMarkdown'},
+            'markdown': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'note': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['notes.Note']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        u'notes.useruploadmapping': {
+            'Meta': {'unique_together': "(('user', 'fp_file'),)", 'object_name': 'UserUploadMapping'},
+            'fp_file': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
+        },
+        u'taggit.tag': {
+            'Meta': {'object_name': 'Tag'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        u'taggit.taggeditem': {
+            'Meta': {'object_name': 'TaggedItem'},
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'taggit_taggeditem_tagged_items'", 'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'object_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
+            'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'taggit_taggeditem_items'", 'to': u"orm['taggit.Tag']"})
+        }
+    }
+
+    complete_apps = ['notes', 'courses']
\ No newline at end of file
index f6b3f8cdcb976e779ddd7ebcbf266314a19c5226..778d2b447b57b9c71818bee5c9a905d6817f7452 100644 (file)
@@ -247,6 +247,7 @@ class Course(models.Model):
     # (vistigial)
     school      = models.ForeignKey(School, null=True, blank=True)
     file_count  = models.IntegerField(default=0)
+    thank_count = models.IntegerField(default=0)
 
     desc        = models.TextField(max_length=511, blank=True, null=True)
     url         = models.URLField(max_length=511, blank=True, null=True,
@@ -310,15 +311,13 @@ class Course(models.Model):
         self.file_count = self.note_set.count()
         self.save()
 
-    def get_popularity(self):
-        """ Aggregate popularity of notes contained within. """
-        # This is optimized for the case where note_set has already been
-        # loaded into memory. In that case, we avoid making any more database
-        # queries.
-        sum = 0
-        for note in self.note_set.all():
-            sum += note.thanks
-        return sum
+
+    def update_thank_count(self):
+        """ Update the thank_count by summing the note_set
+        """
+        self.thank_count = sum([note.thanks for note in self.note_set.all()])
+        self.save()
+
 
     def get_prof_names(self):
         """ Comma separated list of professor names. """
index b6d6fc8b5b8817c4cd5967dcad764699785c7cd9..260caf8b188a8df36a5d0a942968f07eb8dd971b 100644 (file)
@@ -2,7 +2,12 @@
 # -*- coding:utf8 -*-
 # Copyright (C) 2012  FinalsClub Foundation
 """ Views for the KarmaNotes Courses app """
+import calendar
+from time import strftime
+from django.db.models import Q
+from django.utils.html import escape
 
+from querystring_parser import parser as querystring_parser
 import json
 from django.conf import settings
 from django.core import serializers
@@ -23,7 +28,7 @@ from karmaworld.apps.courses.forms import CourseForm
 from karmaworld.apps.notes.models import Note
 from karmaworld.apps.users.models import CourseKarmaEvent
 from karmaworld.apps.notes.forms import FileUploadForm
-from karmaworld.utils import ajax_increment, format_session_increment_field
+from karmaworld.utils import ajax_increment, format_session_increment_field, ajax_base
 from django.contrib import messages
 
 FLAG_FIELD = 'flags'
@@ -244,6 +249,89 @@ def flag_course(request, pk):
     return ajax_increment(Course, request, pk, FLAG_FIELD, USER_PROFILE_FLAGS_FIELD, process_course_flag_events)
 
 
+def course_json(course):
+    course_data = {
+        'school': course.school.name if course.school else course.department.school.name,
+        'department': course.department.name if course.department else None,
+        'instructor': course.instructor_name if course.instructor_name else ', '.join([p.name for p in course.professor.all()]),
+        'name': course.name,
+        'link': course.get_absolute_url(),
+        'file_count': course.file_count,
+        'popularity': course.thank_count,
+        'updated_at': strftime('%B %d, %Y', course.updated_at.utctimetuple())
+    }
+
+    # Prevent XSS attacks
+    for k in course_data:
+        course_data[k] = escape(course_data[k])
+
+    return course_data
+
+
+def course_list_ajax_handler(request):
+    request_dict = querystring_parser.parse(request.GET.urlencode())
+    draw = int(request_dict['draw'])
+    start = request_dict['start']
+    length = request_dict['length']
+    search = request_dict.get('search', None)
+
+    objects = Course.objects.all()
+
+    if search and search['value']:
+        objects = objects.filter(Q(name__icontains=search['value']) |
+                                 Q(school__name__icontains=search['value']) |
+                                 Q(department__school__name__icontains=search['value']))
+
+    order_fields = []
+    for order_index in request_dict['order']:
+        order_field = None
+        order = request_dict['order'][order_index]
+        if order['column'] == 1:
+            order_field = 'updated_at'
+        elif order['column'] == 2:
+            order_field = 'file_count'
+        elif order['column'] == 3:
+            order_field = 'thank_count'
+
+        if order['dir'] == 'desc':
+            order_field = '-' + order_field
+
+        if order_field:
+            order_fields.append(order_field)
+
+    objects = objects.order_by(*order_fields)
+
+    displayRecords = objects.count()
+
+    if start > 0:
+        objects = objects[start:]
+
+    objects = objects[:length]
+
+    row_data = [
+        [
+            course_json(course),
+            calendar.timegm(course.updated_at.timetuple()),
+            course.file_count,
+            course.thank_count,
+            course.school.name if course.school else course.department.school.name,
+        ] for course in objects
+    ]
+
+    response_dict = {
+        'draw': draw,
+        'recordsTotal': Course.objects.count(),
+        'recordsFiltered': displayRecords,
+        'data': row_data
+    }
+
+    return HttpResponse(json.dumps(response_dict), mimetype='application/json')
+
+
+def course_list_ajax(request):
+    return ajax_base(request, course_list_ajax_handler, ['GET'])
+
+
 def edit_course(request, pk):
     """
     Saves the edited course content
index 760b87ceaba40e8c9dc99c83663427dc71d9d3b8..7ac16939347334309c01cb059b63f6597a7a4ac6 100644 (file)
@@ -431,6 +431,7 @@ def update_note_counts(note_instance):
         pass
     else:
         # course exists
+        note_instance.course.update_thank_count()
         note_instance.course.update_note_count()
         if note_instance.course.school:
             note_instance.course.school.update_note_count()
@@ -456,8 +457,8 @@ def note_save_receiver(sender, **kwargs):
         return
     note = kwargs['instance']
 
-    if kwargs['created']:
-        update_note_counts(note)
+
+    update_note_counts(note)
 
     try:
         index = SearchIndex()
index 613f2820b5453bd147f9c4ec07270600a53bd03c..d9fcb9887ab72dbdc0d7b450ed177d1156df6280 100644 (file)
@@ -193,7 +193,8 @@ span.table-thanks-count {
   margin-right: 15px;
 }
 
-.table-course-name {
+.table-course-name-wrapper,
+.table-note-name {
   font-size: 1.8em;
   margin-right: 10px;
 }
@@ -222,7 +223,7 @@ table.dataTable a {
   color: inherit;
 }
 
-.dataTables_paginate {
+#data_table_list_paginate {
   float: left;
 }
 
index da738002b3538a24d26cb7d12e7245283897c130..d57b597ec673de088f634fca0cf905cf09889aca 100644 (file)
-
 /*
- * Table
+ * Table styles
  */
 table.dataTable {
-       margin: 0 auto;
-       clear: both;
-       width: 100%;
-}
-
-table.dataTable thead th {
-       padding: 3px 18px 3px 10px;
-       border-bottom: 1px solid black;
-       font-weight: bold;
-       cursor: pointer;
-       *cursor: hand;
+  width: 100%;
+  margin: 0 auto;
+  clear: both;
+  border-collapse: separate;
+  border-spacing: 0;
+  /*
+   * Header and footer styles
+   */
+  /*
+   * Body styles
+   */
 }
-
+table.dataTable thead th,
 table.dataTable tfoot th {
-       padding: 3px 18px 3px 10px;
-       border-top: 1px solid black;
-       font-weight: bold;
+  font-weight: bold;
 }
-
-table.dataTable td {
-       padding: 3px 10px;
+table.dataTable thead th,
+table.dataTable thead td {
+  padding: 10px 18px;
+  border-bottom: 1px solid #111111;
 }
-
+table.dataTable thead th:active,
+table.dataTable thead td:active {
+  outline: none;
+}
+table.dataTable tfoot th,
+table.dataTable tfoot td {
+  padding: 10px 18px 6px 18px;
+  border-top: 1px solid #111111;
+}
+table.dataTable thead .sorting_asc,
+table.dataTable thead .sorting_desc,
+table.dataTable thead .sorting {
+  cursor: pointer;
+  *cursor: hand;
+}
+table.dataTable thead .sorting {
+  background: url("../images/sort_both.png") no-repeat center right;
+}
+table.dataTable thead .sorting_asc {
+  background: url("../images/sort_asc.png") no-repeat center right;
+}
+table.dataTable thead .sorting_desc {
+  background: url("../images/sort_desc.png") no-repeat center right;
+}
+table.dataTable thead .sorting_asc_disabled {
+  background: url("../images/sort_asc_disabled.png") no-repeat center right;
+}
+table.dataTable thead .sorting_desc_disabled {
+  background: url("../images/sort_desc_disabled.png") no-repeat center right;
+}
+table.dataTable tbody tr {
+  background-color: white;
+}
+table.dataTable tbody tr.selected {
+  background-color: #b0bed9;
+}
+table.dataTable tbody th,
+table.dataTable tbody td {
+  padding: 8px 10px;
+}
+table.dataTable th.center,
 table.dataTable td.center,
 table.dataTable td.dataTables_empty {
-       text-align: center;
+  text-align: center;
+}
+table.dataTable th.right,
+table.dataTable td.right {
+  text-align: right;
+}
+table.dataTable.row-border tbody th, table.dataTable.row-border tbody td, table.dataTable.display tbody th, table.dataTable.display tbody td {
+  border-top: 1px solid #dddddd;
+}
+table.dataTable.row-border tbody tr:first-child th,
+table.dataTable.row-border tbody tr:first-child td, table.dataTable.display tbody tr:first-child th,
+table.dataTable.display tbody tr:first-child td {
+  border-top: none;
+}
+table.dataTable.cell-border tbody th, table.dataTable.cell-border tbody td {
+  border-top: 1px solid #dddddd;
+  border-right: 1px solid #dddddd;
+}
+table.dataTable.cell-border tbody tr th:first-child,
+table.dataTable.cell-border tbody tr td:first-child {
+  border-left: 1px solid #dddddd;
+}
+table.dataTable.cell-border tbody tr:first-child th,
+table.dataTable.cell-border tbody tr:first-child td {
+  border-top: none;
+}
+table.dataTable.stripe tbody tr.odd, table.dataTable.display tbody tr.odd {
+  background-color: #f9f9f9;
+}
+table.dataTable.stripe tbody tr.odd.selected, table.dataTable.display tbody tr.odd.selected {
+  background-color: #abb9d3;
+}
+table.dataTable.hover tbody tr:hover,
+table.dataTable.hover tbody tr.odd:hover,
+table.dataTable.hover tbody tr.even:hover, table.dataTable.display tbody tr:hover,
+table.dataTable.display tbody tr.odd:hover,
+table.dataTable.display tbody tr.even:hover {
+  background-color: whitesmoke;
+}
+table.dataTable.hover tbody tr:hover.selected,
+table.dataTable.hover tbody tr.odd:hover.selected,
+table.dataTable.hover tbody tr.even:hover.selected, table.dataTable.display tbody tr:hover.selected,
+table.dataTable.display tbody tr.odd:hover.selected,
+table.dataTable.display tbody tr.even:hover.selected {
+  background-color: #a9b7d1;
+}
+table.dataTable.order-column tbody tr > .sorting_1,
+table.dataTable.order-column tbody tr > .sorting_2,
+table.dataTable.order-column tbody tr > .sorting_3, table.dataTable.display tbody tr > .sorting_1,
+table.dataTable.display tbody tr > .sorting_2,
+table.dataTable.display tbody tr > .sorting_3 {
+  background-color: #f9f9f9;
+}
+table.dataTable.order-column tbody tr.selected > .sorting_1,
+table.dataTable.order-column tbody tr.selected > .sorting_2,
+table.dataTable.order-column tbody tr.selected > .sorting_3, table.dataTable.display tbody tr.selected > .sorting_1,
+table.dataTable.display tbody tr.selected > .sorting_2,
+table.dataTable.display tbody tr.selected > .sorting_3 {
+  background-color: #acbad4;
+}
+table.dataTable.display tbody tr.odd > .sorting_1, table.dataTable.order-column.stripe tbody tr.odd > .sorting_1 {
+  background-color: #f1f1f1;
+}
+table.dataTable.display tbody tr.odd > .sorting_2, table.dataTable.order-column.stripe tbody tr.odd > .sorting_2 {
+  background-color: #f3f3f3;
+}
+table.dataTable.display tbody tr.odd > .sorting_3, table.dataTable.order-column.stripe tbody tr.odd > .sorting_3 {
+  background-color: whitesmoke;
+}
+table.dataTable.display tbody tr.odd.selected > .sorting_1, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_1 {
+  background-color: #a6b3cd;
+}
+table.dataTable.display tbody tr.odd.selected > .sorting_2, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_2 {
+  background-color: #a7b5ce;
+}
+table.dataTable.display tbody tr.odd.selected > .sorting_3, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_3 {
+  background-color: #a9b6d0;
+}
+table.dataTable.display tbody tr.even > .sorting_1, table.dataTable.order-column.stripe tbody tr.even > .sorting_1 {
+  background-color: #f9f9f9;
+}
+table.dataTable.display tbody tr.even > .sorting_2, table.dataTable.order-column.stripe tbody tr.even > .sorting_2 {
+  background-color: #fbfbfb;
+}
+table.dataTable.display tbody tr.even > .sorting_3, table.dataTable.order-column.stripe tbody tr.even > .sorting_3 {
+  background-color: #fdfdfd;
+}
+table.dataTable.display tbody tr.even.selected > .sorting_1, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_1 {
+  background-color: #acbad4;
+}
+table.dataTable.display tbody tr.even.selected > .sorting_2, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_2 {
+  background-color: #adbbd6;
+}
+table.dataTable.display tbody tr.even.selected > .sorting_3, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_3 {
+  background-color: #afbdd8;
+}
+table.dataTable.display tbody tr:hover > .sorting_1,
+table.dataTable.display tbody tr.odd:hover > .sorting_1,
+table.dataTable.display tbody tr.even:hover > .sorting_1, table.dataTable.order-column.hover tbody tr:hover > .sorting_1,
+table.dataTable.order-column.hover tbody tr.odd:hover > .sorting_1,
+table.dataTable.order-column.hover tbody tr.even:hover > .sorting_1 {
+  background-color: #eaeaea;
+}
+table.dataTable.display tbody tr:hover > .sorting_2,
+table.dataTable.display tbody tr.odd:hover > .sorting_2,
+table.dataTable.display tbody tr.even:hover > .sorting_2, table.dataTable.order-column.hover tbody tr:hover > .sorting_2,
+table.dataTable.order-column.hover tbody tr.odd:hover > .sorting_2,
+table.dataTable.order-column.hover tbody tr.even:hover > .sorting_2 {
+  background-color: #ebebeb;
+}
+table.dataTable.display tbody tr:hover > .sorting_3,
+table.dataTable.display tbody tr.odd:hover > .sorting_3,
+table.dataTable.display tbody tr.even:hover > .sorting_3, table.dataTable.order-column.hover tbody tr:hover > .sorting_3,
+table.dataTable.order-column.hover tbody tr.odd:hover > .sorting_3,
+table.dataTable.order-column.hover tbody tr.even:hover > .sorting_3 {
+  background-color: #eeeeee;
+}
+table.dataTable.display tbody tr:hover.selected > .sorting_1,
+table.dataTable.display tbody tr.odd:hover.selected > .sorting_1,
+table.dataTable.display tbody tr.even:hover.selected > .sorting_1, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_1,
+table.dataTable.order-column.hover tbody tr.odd:hover.selected > .sorting_1,
+table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_1 {
+  background-color: #a1aec7;
+}
+table.dataTable.display tbody tr:hover.selected > .sorting_2,
+table.dataTable.display tbody tr.odd:hover.selected > .sorting_2,
+table.dataTable.display tbody tr.even:hover.selected > .sorting_2, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_2,
+table.dataTable.order-column.hover tbody tr.odd:hover.selected > .sorting_2,
+table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_2 {
+  background-color: #a2afc8;
+}
+table.dataTable.display tbody tr:hover.selected > .sorting_3,
+table.dataTable.display tbody tr.odd:hover.selected > .sorting_3,
+table.dataTable.display tbody tr.even:hover.selected > .sorting_3, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_3,
+table.dataTable.order-column.hover tbody tr.odd:hover.selected > .sorting_3,
+table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_3 {
+  background-color: #a4b2cb;
+}
+table.dataTable.no-footer {
+  border-bottom: 1px solid #111111;
 }
 
-table.dataTable tr.odd { background-color: #E2E4FF; }
-table.dataTable tr.even { background-color: white; }
-
-table.dataTable tr.odd td.sorting_1 { background-color: #D3D6FF; }
-table.dataTable tr.odd td.sorting_2 { background-color: #DADCFF; }
-table.dataTable tr.odd td.sorting_3 { background-color: #E0E2FF; }
-table.dataTable tr.even td.sorting_1 { background-color: #EAEBFF; }
-table.dataTable tr.even td.sorting_2 { background-color: #F2F3FF; }
-table.dataTable tr.even td.sorting_3 { background-color: #F9F9FF; }
-
+table.dataTable,
+table.dataTable th,
+table.dataTable td {
+  -webkit-box-sizing: content-box;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
 
 /*
- * Table wrapper
+ * Control feature layout
  */
 .dataTables_wrapper {
-       position: relative;
-       clear: both;
-       *zoom: 1;
+  position: relative;
+  clear: both;
+  *zoom: 1;
+  zoom: 1;
 }
-
-
-/*
- * Page length menu
- */
-.dataTables_length {
-       float: left;
+.dataTables_wrapper .dataTables_length {
+  float: left;
 }
-
-
-/*
- * Filter
- */
-.dataTables_filter {
-       float: right;
-       text-align: right;
+.dataTables_wrapper .dataTables_filter {
+  float: right;
+  text-align: right;
 }
-
-
-/*
- * Table information
- */
-.dataTables_info {
-       clear: both;
-       float: left;
+.dataTables_wrapper .dataTables_filter input {
+  margin-left: 0.5em;
 }
-
-
-/*
- * Pagination
- */
-.dataTables_paginate {
-       float: right;
-       text-align: right;
+.dataTables_wrapper .dataTables_info {
+  clear: both;
+  float: left;
+  padding-top: 0.755em;
 }
-
-/* Two button pagination - previous / next */
-.paginate_disabled_previous,
-.paginate_enabled_previous,
-.paginate_disabled_next,
-.paginate_enabled_next {
-       height: 19px;
-       float: left;
-       cursor: pointer;
-       *cursor: hand;
-       color: #111 !important;
-}
-.paginate_disabled_previous:hover,
-.paginate_enabled_previous:hover,
-.paginate_disabled_next:hover,
-.paginate_enabled_next:hover {
-       text-decoration: none !important;
-}
-.paginate_disabled_previous:active,
-.paginate_enabled_previous:active,
-.paginate_disabled_next:active,
-.paginate_enabled_next:active {
-       outline: none;
+.dataTables_wrapper .dataTables_paginate {
+  float: right;
+  text-align: right;
+  padding-top: 0.25em;
 }
-
-.paginate_disabled_previous,
-.paginate_disabled_next {
-       color: #666 !important;
+.dataTables_wrapper .dataTables_paginate .paginate_button {
+  box-sizing: border-box;
+  display: inline-block;
+  min-width: 1.5em;
+  padding: 0.5em 1em;
+  margin-left: 2px;
+  text-align: center;
+  text-decoration: none !important;
+  cursor: pointer;
+  *cursor: hand;
+  color: #333333 !important;
+  border: 1px solid transparent;
 }
-.paginate_disabled_previous,
-.paginate_enabled_previous {
-       padding-left: 23px;
+.dataTables_wrapper .dataTables_paginate .paginate_button.current, .dataTables_wrapper .dataTables_paginate .paginate_button.current:hover {
+  color: #333333 !important;
+  border: 1px solid #cacaca;
+  background-color: white;
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, gainsboro));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, white 0%, gainsboro 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -moz-linear-gradient(top, white 0%, gainsboro 100%);
+  /* FF3.6+ */
+  background: -ms-linear-gradient(top, white 0%, gainsboro 100%);
+  /* IE10+ */
+  background: -o-linear-gradient(top, white 0%, gainsboro 100%);
+  /* Opera 11.10+ */
+  background: linear-gradient(to bottom, white 0%, gainsboro 100%);
+  /* W3C */
 }
-.paginate_disabled_next,
-.paginate_enabled_next {
-       padding-right: 23px;
-       margin-left: 10px;
+.dataTables_wrapper .dataTables_paginate .paginate_button.disabled, .dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover, .dataTables_wrapper .dataTables_paginate .paginate_button.disabled:active {
+  cursor: default;
+  color: #666 !important;
+  border: 1px solid transparent;
+  background: transparent;
+  box-shadow: none;
 }
-
-.paginate_enabled_previous { background: url('/static/css/images/back_enabled.png') no-repeat top left; }
-.paginate_enabled_previous:hover { background: url('/static/css/images/back_enabled_hover.png') no-repeat top left; }
-.paginate_disabled_previous { background: url('/static/css/images/back_disabled.png') no-repeat top left; }
-
-.paginate_enabled_next { background: url('/static/css/images/forward_enabled.png') no-repeat top right; }
-.paginate_enabled_next:hover { background: url('/static/css/images/forward_enabled_hover.png') no-repeat top right; }
-.paginate_disabled_next { background: url('/static/css/images/forward_disabled.png') no-repeat top right; }
-
-/* Full number pagination */
-.paging_full_numbers {
-       height: 22px;
-       line-height: 22px;
+.dataTables_wrapper .dataTables_paginate .paginate_button:hover {
+  color: white !important;
+  border: 1px solid #111111;
+  background-color: #585858;
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #585858), color-stop(100%, #111111));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #585858 0%, #111111 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -moz-linear-gradient(top, #585858 0%, #111111 100%);
+  /* FF3.6+ */
+  background: -ms-linear-gradient(top, #585858 0%, #111111 100%);
+  /* IE10+ */
+  background: -o-linear-gradient(top, #585858 0%, #111111 100%);
+  /* Opera 11.10+ */
+  background: linear-gradient(to bottom, #585858 0%, #111111 100%);
+  /* W3C */
 }
-.paging_full_numbers a:active {
-       outline: none
+.dataTables_wrapper .dataTables_paginate .paginate_button:active {
+  outline: none;
+  background-color: #2b2b2b;
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #2b2b2b), color-stop(100%, #0c0c0c));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -moz-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);
+  /* FF3.6+ */
+  background: -ms-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);
+  /* IE10+ */
+  background: -o-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);
+  /* Opera 11.10+ */
+  background: linear-gradient(to bottom, #2b2b2b 0%, #0c0c0c 100%);
+  /* W3C */
+  box-shadow: inset 0 0 3px #111;
 }
-.paging_full_numbers a:hover {
-       text-decoration: none;
+.dataTables_wrapper .dataTables_processing {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 100%;
+  height: 40px;
+  margin-left: -50%;
+  margin-top: -25px;
+  padding-top: 20px;
+  text-align: center;
+  font-size: 1.2em;
+  background-color: white;
+  background: -webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(25%, rgba(255, 255, 255, 0.9)), color-stop(75%, rgba(255, 255, 255, 0.9)), color-stop(100%, rgba(255, 255, 255, 0)));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -moz-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
+  /* FF3.6+ */
+  background: -ms-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
+  /* IE10+ */
+  background: -o-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
+  /* Opera 11.10+ */
+  background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
+  /* W3C */
 }
-
-.paging_full_numbers a.paginate_button,
-.paging_full_numbers a.paginate_active {
-       border: 1px solid #aaa;
-       -webkit-border-radius: 5px;
-       -moz-border-radius: 5px;
-       border-radius: 5px;
-       padding: 2px 5px;
-       margin: 0 3px;
-       cursor: pointer;
-       *cursor: hand;
-       color: #333 !important;
+.dataTables_wrapper .dataTables_length,
+.dataTables_wrapper .dataTables_filter,
+.dataTables_wrapper .dataTables_info,
+.dataTables_wrapper .dataTables_processing,
+.dataTables_wrapper .dataTables_paginate {
+  color: #333333;
 }
-
-.paging_full_numbers a.paginate_button {
-       background-color: #ddd;
+.dataTables_wrapper .dataTables_scroll {
+  clear: both;
 }
-
-.paging_full_numbers a.paginate_button:hover {
-       background-color: #ccc;
-       text-decoration: none !important;
+.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody {
+  *margin-top: -1px;
+  -webkit-overflow-scrolling: touch;
 }
-
-.paging_full_numbers a.paginate_active {
-       background-color: #99B3FF;
+.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody th > div.dataTables_sizing,
+.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody td > div.dataTables_sizing {
+  height: 0;
+  overflow: hidden;
+  margin: 0 !important;
+  padding: 0 !important;
 }
-
-
-/*
- * Processing indicator
- */
-.dataTables_processing {
-       position: absolute;
-       top: 50%;
-       left: 50%;
-       width: 250px;
-       height: 30px;
-       margin-left: -125px;
-       margin-top: -15px;
-       padding: 14px 0 2px 0;
-       border: 1px solid #ddd;
-       text-align: center;
-       color: #999;
-       font-size: 14px;
-       background-color: white;
+.dataTables_wrapper.no-footer .dataTables_scrollBody {
+  border-bottom: 1px solid #111111;
 }
-
-
-/*
- * Sorting
- */
-.sorting { background: url('/static/css/images/sort_both.png') no-repeat center right; }
-.sorting_asc { background: url('/static/css/images/sort_asc.png') no-repeat center right; }
-.sorting_desc { background: url('/static/css/images/sort_desc.png') no-repeat center right; }
-
-.sorting_asc_disabled { background: url('/static/css/images/sort_asc_disabled.png') no-repeat center right; }
-.sorting_desc_disabled { background: url('/static/css/images/sort_desc_disabled.png') no-repeat center right; }
-table.dataTable thead th:active,
-table.dataTable thead td:active {
-       outline: none;
+.dataTables_wrapper.no-footer div.dataTables_scrollHead table,
+.dataTables_wrapper.no-footer div.dataTables_scrollBody table {
+  border-bottom: none;
 }
-
-
-/*
- * Scrolling
- */
-.dataTables_scroll {
-       clear: both;
+.dataTables_wrapper:after {
+  visibility: hidden;
+  display: block;
+  content: "";
+  clear: both;
+  height: 0;
 }
 
-.dataTables_scrollBody {
-       *margin-top: -1px;
-       -webkit-overflow-scrolling: touch;
+@media screen and (max-width: 767px) {
+  .dataTables_wrapper .dataTables_info,
+  .dataTables_wrapper .dataTables_paginate {
+    float: none;
+    text-align: center;
+  }
+  .dataTables_wrapper .dataTables_paginate {
+    margin-top: 0.5em;
+  }
+}
+@media screen and (max-width: 640px) {
+  .dataTables_wrapper .dataTables_length,
+  .dataTables_wrapper .dataTables_filter {
+    float: none;
+    text-align: center;
+  }
+  .dataTables_wrapper .dataTables_filter {
+    margin-top: 0.5em;
+  }
 }
-
index 31d3c144f8d2ecee9f79fab4572acfe51c617682..e67149f843c4b802e6002d4d4374896f8539090c 100644 (file)
@@ -1,38 +1,53 @@
 $(function() {
 
+  function tableRow(courseData) {
+    var rowContents = $('#data-table-entry-prototype').clone();
+    rowContents.find('.data-table-entry').removeClass('hide');
+    rowContents.find('.table-school').text(courseData['school']);
+    rowContents.find('.table-department').text(courseData['department']);
+    rowContents.find('.table-instructor').text(courseData['instructor']);
+    rowContents.find('.table-course-name').text(courseData['name']);
+    rowContents.find('.table-course-link').attr('href', courseData['link']);
+    rowContents.find('.file-count').text(courseData['file_count']);
+    rowContents.find('.thanks-count').text(courseData['popularity']);
+    rowContents.find('.updated-at').text(courseData['updated_at']);
+    return rowContents.html();
+  }
+
   // load dataTable for course data
   var dataTable = $('#data_table_list').dataTable({
     // we will set column widths explicitly
-    'bAutoWidth': false,
+    'autoWidth': false,
     // don't provide a option for the user to change the table page length
-    'bLengthChange': false,
+    'lengthChange': false,
     // sepcify the number of rows in a page
-    'iDisplayLength': 20,
+    'displayLength': 20,
     // Position the filter bar at the top
-    'sDom': '<"top">rt<"bottom"p><"clear">',
-    // Specify options for each column
-    "aoColumnDefs": [
-      {
-        // 3rd element: thanks
-        "aTargets": [ 2 ],
-        "bSortable": true,
-        "bVisible": true
-      },
-      {
-        // 2nd element: notes
-        "aTargets": [ 1 ],
-        "bSortable": true,
-        "bVisible": true
-      },
-      {
-        // 1st element: date
-        "aTargets": [ 0 ],
-        "bSortable": true,
-        "bVisible": true
-      }
-    ],
+    'dom': '<"top">rt<"bottom"p><"clear">',
     // Initial sorting
-    'aaSorting': [[2,'desc']]
+    'aaSorting': [[2,'desc']],
+    'paging': true,
+    'columns': [
+      { 'name': 'course', 'orderable': false, 'searchable': true, 'visible': true,
+        'class': 'small-12 columns data-table-entry-wrapper' },
+      { 'name': 'date', 'orderable': true, 'searchable': false, 'visible': false },
+      { 'name': 'note_count', 'orderable': true, 'searchable': false, 'visible': false },
+      { 'name': 'popularity', 'orderable': true, 'searchable': false, 'visible': false },
+    ],
+    'createdRow': function(row, data, index) {
+      $(row).addClass('table-row');
+    },
+    // Use server-side processing
+    'processing': true,
+    'serverSide': true,
+    'ajax': function(data, callback, settings) {
+        $.get(course_list_ajax_url, data, function(dataWrapper, textStatus, jqXHR) {
+          for (i = 0; i < dataWrapper.data.length; i++) {
+            dataWrapper.data[i][0] = tableRow(dataWrapper.data[i][0]);
+          }
+          callback(dataWrapper);
+        });
+    }
   });
 
   // wire up search box
index 1d8a220ba8077aa314a28b90331c7cba9b4811c8..fce3d1a9ac757b50194eabf9b6bf1f597fa81865 100644 (file)
+/*! DataTables 1.10.0
+ * Â©2008-2014 SpryMedia Ltd - datatables.net/license
+ */
+
 /**
  * @summary     DataTables
- * @description Paginate, search and sort HTML tables
- * @version     1.9.4
+ * @description Paginate, search and order HTML tables
+ * @version     1.10.0
  * @file        jquery.dataTables.js
- * @author      Allan Jardine (www.sprymedia.co.uk)
+ * @author      SpryMedia Ltd (www.sprymedia.co.uk)
  * @contact     www.sprymedia.co.uk/contact
+ * @copyright   Copyright 2008-2014 SpryMedia Ltd.
  *
- * @copyright Copyright 2008-2012 Allan Jardine, all rights reserved.
+ * This source file is free software, available under the following license:
+ *   MIT license - http://datatables.net/license
  *
- * This source file is free software, under either the GPL v2 license or a
- * BSD style license, available at:
- *   http://datatables.net/license_gpl2
- *   http://datatables.net/license_bsd
- * 
- * This source file is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+ * This source file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
- * 
+ *
  * For details please refer to: http://www.datatables.net
  */
 
 /*jslint evil: true, undef: true, browser: true */
-/*globals $, jQuery,define,_fnExternApiFunc,_fnInitialise,_fnInitComplete,_fnLanguageCompat,_fnAddColumn,_fnColumnOptions,_fnAddData,_fnCreateTr,_fnGatherData,_fnBuildHead,_fnDrawHead,_fnDraw,_fnReDraw,_fnAjaxUpdate,_fnAjaxParameters,_fnAjaxUpdateDraw,_fnServerParams,_fnAddOptionsHtml,_fnFeatureHtmlTable,_fnScrollDraw,_fnAdjustColumnSizing,_fnFeatureHtmlFilter,_fnFilterComplete,_fnFilterCustom,_fnFilterColumn,_fnFilter,_fnBuildSearchArray,_fnBuildSearchRow,_fnFilterCreateSearch,_fnDataToSearch,_fnSort,_fnSortAttachListener,_fnSortingClasses,_fnFeatureHtmlPaginate,_fnPageChange,_fnFeatureHtmlInfo,_fnUpdateInfo,_fnFeatureHtmlLength,_fnFeatureHtmlProcessing,_fnProcessingDisplay,_fnVisibleToColumnIndex,_fnColumnIndexToVisible,_fnNodeToDataIndex,_fnVisbleColumns,_fnCalculateEnd,_fnConvertToWidth,_fnCalculateColumnWidths,_fnScrollingWidthAdjust,_fnGetWidestNode,_fnGetMaxLenString,_fnStringToCss,_fnDetectType,_fnSettingsFromNode,_fnGetDataMaster,_fnGetTrNodes,_fnGetTdNodes,_fnEscapeRegex,_fnDeleteIndex,_fnReOrderIndex,_fnColumnOrdering,_fnLog,_fnClearTable,_fnSaveState,_fnLoadState,_fnCreateCookie,_fnReadCookie,_fnDetectHeader,_fnGetUniqueThs,_fnScrollBarWidth,_fnApplyToChildren,_fnMap,_fnGetRowData,_fnGetCellData,_fnSetCellData,_fnGetObjectDataFn,_fnSetObjectDataFn,_fnApplyColumnDefs,_fnBindAction,_fnCallbackReg,_fnCallbackFire,_fnJsonString,_fnRender,_fnNodeToColumnIndex,_fnInfoMacros,_fnBrowserDetect,_fnGetColumns*/
+/*globals $,require,jQuery,define,_selector_run,_selector_opts,_selector_first,_selector_row_indexes,_ext,_Api,_api_register,_api_registerPlural,_re_new_lines,_re_html,_re_formatted_numeric,_re_escape_regex,_empty,_intVal,_numToDecimal,_isNumber,_isHtml,_htmlNumeric,_pluck,_pluck_order,_range,_stripHtml,_unique,_fnBuildAjax,_fnAjaxUpdate,_fnAjaxParameters,_fnAjaxUpdateDraw,_fnAjaxDataSrc,_fnAddColumn,_fnColumnOptions,_fnAdjustColumnSizing,_fnVisibleToColumnIndex,_fnColumnIndexToVisible,_fnVisbleColumns,_fnGetColumns,_fnColumnTypes,_fnApplyColumnDefs,_fnHungarianMap,_fnCamelToHungarian,_fnLanguageCompat,_fnBrowserDetect,_fnAddData,_fnAddTr,_fnNodeToDataIndex,_fnNodeToColumnIndex,_fnGetCellData,_fnSetCellData,_fnSplitObjNotation,_fnGetObjectDataFn,_fnSetObjectDataFn,_fnGetDataMaster,_fnClearTable,_fnDeleteIndex,_fnInvalidateRow,_fnGetRowElements,_fnCreateTr,_fnBuildHead,_fnDrawHead,_fnDraw,_fnReDraw,_fnAddOptionsHtml,_fnDetectHeader,_fnGetUniqueThs,_fnFeatureHtmlFilter,_fnFilterComplete,_fnFilterCustom,_fnFilterColumn,_fnFilter,_fnFilterCreateSearch,_fnEscapeRegex,_fnFilterData,_fnFeatureHtmlInfo,_fnUpdateInfo,_fnInfoMacros,_fnInitialise,_fnInitComplete,_fnLengthChange,_fnFeatureHtmlLength,_fnFeatureHtmlPaginate,_fnPageChange,_fnFeatureHtmlProcessing,_fnProcessingDisplay,_fnFeatureHtmlTable,_fnScrollDraw,_fnApplyToChildren,_fnCalculateColumnWidths,_fnThrottle,_fnConvertToWidth,_fnScrollingWidthAdjust,_fnGetWidestNode,_fnGetMaxLenString,_fnStringToCss,_fnScrollBarWidth,_fnSortFlatten,_fnSort,_fnSortAria,_fnSortListener,_fnSortAttachListener,_fnSortingClasses,_fnSortData,_fnSaveState,_fnLoadState,_fnSettingsFromNode,_fnLog,_fnMap,_fnBindAction,_fnCallbackReg,_fnCallbackFire,_fnLengthOverflow,_fnRenderer,_fnDataSource,_fnRowAttributes*/
 
 (/** @lends <global> */function( window, document, undefined ) {
 
 (function( factory ) {
        "use strict";
 
-       // Define as an AMD module if possible
-       if ( typeof define === 'function' && define.amd )
-       {
-               define( ['jquery'], factory );
+       if ( typeof define === 'function' && define.amd ) {
+               // Define as an AMD module if possible
+               define( 'datatables', ['jquery'], factory );
        }
-       /* Define using browser globals otherwise
-        * Prevent multiple instantiations if the script is loaded twice
-        */
-       else if ( jQuery && !jQuery.fn.dataTable )
-       {
+    else if ( typeof exports === 'object' ) {
+        // Node/CommonJS
+        factory( require( 'jquery' ) );
+    }
+       else if ( jQuery && !jQuery.fn.dataTable ) {
+               // Define using browser globals otherwise
+               // Prevent multiple instantiations if the script is loaded twice
                factory( jQuery );
        }
 }
 (/** @lends <global> */function( $ ) {
        "use strict";
-       /** 
-        * DataTables is a plug-in for the jQuery Javascript library. It is a 
-        * highly flexible tool, based upon the foundations of progressive 
-        * enhancement, which will add advanced interaction controls to any 
-        * HTML table. For a full list of features please refer to
-        * <a href="http://datatables.net">DataTables.net</a>.
+
+       /**
+        * DataTables is a plug-in for the jQuery Javascript library. It is a highly
+        * flexible tool, based upon the foundations of progressive enhancement,
+        * which will add advanced interaction controls to any HTML table. For a
+        * full list of features please refer to
+        * [DataTables.net](href="http://datatables.net).
         *
-        * Note that the <i>DataTable</i> object is not a global variable but is
-        * aliased to <i>jQuery.fn.DataTable</i> and <i>jQuery.fn.dataTable</i> through which 
-        * it may be  accessed.
+        * Note that the `DataTable` object is not a global variable but is aliased
+        * to `jQuery.fn.DataTable` and `jQuery.fn.dataTable` through which it may
+        * be  accessed.
         *
         *  @class
-        *  @param {object} [oInit={}] Configuration object for DataTables. Options
+        *  @param {object} [init={}] Configuration object for DataTables. Options
         *    are defined by {@link DataTable.defaults}
-        *  @requires jQuery 1.3+
-        * 
+        *  @requires jQuery 1.7+
+        *
         *  @example
         *    // Basic initialisation
         *    $(document).ready( function {
         *      $('#example').dataTable();
         *    } );
-        *  
+        *
         *  @example
         *    // Initialisation with configuration options - in this case, disable
         *    // pagination and sorting.
         *    $(document).ready( function {
         *      $('#example').dataTable( {
-        *        "bPaginate": false,
-        *        "bSort": false 
+        *        "paginate": false,
+        *        "sort": false
         *      } );
         *    } );
         */
-       var DataTable = function( oInit )
-       {
-               
-               
-               /**
-                * Add a column to the list used for the table with default values
-                *  @param {object} oSettings dataTables settings object
-                *  @param {node} nTh The th element for this column
-                *  @memberof DataTable#oApi
-                */
-               function _fnAddColumn( oSettings, nTh )
-               {
-                       var oDefaults = DataTable.defaults.columns;
-                       var iCol = oSettings.aoColumns.length;
-                       var oCol = $.extend( {}, DataTable.models.oColumn, oDefaults, {
-                               "sSortingClass": oSettings.oClasses.sSortable,
-                               "sSortingClassJUI": oSettings.oClasses.sSortJUI,
-                               "nTh": nTh ? nTh : document.createElement('th'),
-                               "sTitle":    oDefaults.sTitle    ? oDefaults.sTitle    : nTh ? nTh.innerHTML : '',
-                               "aDataSort": oDefaults.aDataSort ? oDefaults.aDataSort : [iCol],
-                               "mData": oDefaults.mData ? oDefaults.oDefaults : iCol
-                       } );
-                       oSettings.aoColumns.push( oCol );
-                       
-                       /* Add a column specific filter */
-                       if ( oSettings.aoPreSearchCols[ iCol ] === undefined || oSettings.aoPreSearchCols[ iCol ] === null )
-                       {
-                               oSettings.aoPreSearchCols[ iCol ] = $.extend( {}, DataTable.models.oSearch );
-                       }
-                       else
-                       {
-                               var oPre = oSettings.aoPreSearchCols[ iCol ];
-                               
-                               /* Don't require that the user must specify bRegex, bSmart or bCaseInsensitive */
-                               if ( oPre.bRegex === undefined )
-                               {
-                                       oPre.bRegex = true;
-                               }
-                               
-                               if ( oPre.bSmart === undefined )
-                               {
-                                       oPre.bSmart = true;
-                               }
-                               
-                               if ( oPre.bCaseInsensitive === undefined )
-                               {
-                                       oPre.bCaseInsensitive = true;
-                               }
-                       }
-                       
-                       /* Use the column options function to initialise classes etc */
-                       _fnColumnOptions( oSettings, iCol, null );
+       var DataTable;
+
+       
+       /*
+        * It is useful to have variables which are scoped locally so only the
+        * DataTables functions can access them and they don't leak into global space.
+        * At the same time these functions are often useful over multiple files in the
+        * core and API, so we list, or at least document, all variables which are used
+        * by DataTables as private variables here. This also ensures that there is no
+        * clashing of variable names and that they can easily referenced for reuse.
+        */
+       
+       
+       // Defined else where
+       //  _selector_run
+       //  _selector_opts
+       //  _selector_first
+       //  _selector_row_indexes
+       
+       var _ext; // DataTable.ext
+       var _Api; // DataTable.Api
+       var _api_register; // DataTable.Api.register
+       var _api_registerPlural; // DataTable.Api.registerPlural
+       
+       var _re_dic = {};
+       var _re_new_lines = /[\r\n]/g;
+       var _re_html = /<.*?>/g;
+       var _re_date_start = /^[\d\+\-a-zA-Z]/;
+       
+       // Escape regular expression special characters
+       var _re_escape_regex = new RegExp( '(\\' + [ '/', '.', '*', '+', '?', '|', '(', ')', '[', ']', '{', '}', '\\', '$', '^', '-' ].join('|\\') + ')', 'g' );
+       
+       // U+2009 is thin space and U+202F is narrow no-break space, both used in many
+       // standards as thousands separators
+       var _re_formatted_numeric = /[',$£€¥%\u2009\u202F]/g;
+       
+       
+       var _empty = function ( d ) {
+               return !d || d === '-' ? true : false;
+       };
+       
+       
+       var _intVal = function ( s ) {
+               var integer = parseInt( s, 10 );
+               return !isNaN(integer) && isFinite(s) ? integer : null;
+       };
+       
+       // Convert from a formatted number with characters other than `.` as the
+       // decimal place, to a Javascript number
+       var _numToDecimal = function ( num, decimalPoint ) {
+               // Cache created regular expressions for speed as this function is called often
+               if ( ! _re_dic[ decimalPoint ] ) {
+                       _re_dic[ decimalPoint ] = new RegExp( _fnEscapeRegex( decimalPoint ), 'g' );
                }
-               
-               
-               /**
-                * Apply options for a column
-                *  @param {object} oSettings dataTables settings object
-                *  @param {int} iCol column index to consider
-                *  @param {object} oOptions object with sType, bVisible and bSearchable etc
-                *  @memberof DataTable#oApi
-                */
-               function _fnColumnOptions( oSettings, iCol, oOptions )
-               {
-                       var oCol = oSettings.aoColumns[ iCol ];
-                       
-                       /* User specified column options */
-                       if ( oOptions !== undefined && oOptions !== null )
-                       {
-                               /* Backwards compatibility for mDataProp */
-                               if ( oOptions.mDataProp && !oOptions.mData )
-                               {
-                                       oOptions.mData = oOptions.mDataProp;
-                               }
-               
-                               if ( oOptions.sType !== undefined )
-                               {
-                                       oCol.sType = oOptions.sType;
-                                       oCol._bAutoType = false;
-                               }
-                               
-                               $.extend( oCol, oOptions );
-                               _fnMap( oCol, oOptions, "sWidth", "sWidthOrig" );
-               
-                               /* iDataSort to be applied (backwards compatibility), but aDataSort will take
-                                * priority if defined
-                                */
-                               if ( oOptions.iDataSort !== undefined )
-                               {
-                                       oCol.aDataSort = [ oOptions.iDataSort ];
+               return typeof num === 'string' ?
+                       num.replace( /\./g, '' ).replace( _re_dic[ decimalPoint ], '.' ) :
+                       num;
+       };
+       
+       
+       var _isNumber = function ( d, decimalPoint, formatted ) {
+               var strType = typeof d === 'string';
+       
+               if ( decimalPoint && strType ) {
+                       d = _numToDecimal( d, decimalPoint );
+               }
+       
+               if ( formatted && strType ) {
+                       d = d.replace( _re_formatted_numeric, '' );
+               }
+       
+               return !d || d==='-' || (!isNaN( parseFloat(d) ) && isFinite( d ));
+       };
+       
+       
+       // A string without HTML in it can be considered to be HTML still
+       var _isHtml = function ( d ) {
+               return !d || typeof d === 'string';
+       };
+       
+       
+       var _htmlNumeric = function ( d, decimalPoint, formatted ) {
+               if ( _empty( d ) ) {
+                       return true;
+               }
+       
+               var html = _isHtml( d );
+               return ! html ?
+                       null :
+                       _isNumber( _stripHtml( d ), decimalPoint, formatted ) ?
+                               true :
+                               null;
+       };
+       
+       
+       var _pluck = function ( a, prop, prop2 ) {
+               var out = [];
+               var i=0, ien=a.length;
+       
+               // Could have the test in the loop for slightly smaller code, but speed
+               // is essential here
+               if ( prop2 !== undefined ) {
+                       for ( ; i<ien ; i++ ) {
+                               if ( a[i] && a[i][ prop ] ) {
+                                       out.push( a[i][ prop ][ prop2 ] );
                                }
-                               _fnMap( oCol, oOptions, "aDataSort" );
                        }
-               
-                       /* Cache the data get and set functions for speed */
-                       var mRender = oCol.mRender ? _fnGetObjectDataFn( oCol.mRender ) : null;
-                       var mData = _fnGetObjectDataFn( oCol.mData );
-               
-                       oCol.fnGetData = function (oData, sSpecific) {
-                               var innerData = mData( oData, sSpecific );
-               
-                               if ( oCol.mRender && (sSpecific && sSpecific !== '') )
-                               {
-                                       return mRender( innerData, sSpecific, oData );
+               }
+               else {
+                       for ( ; i<ien ; i++ ) {
+                               if ( a[i] ) {
+                                       out.push( a[i][ prop ] );
                                }
-                               return innerData;
-                       };
-                       oCol.fnSetData = _fnSetObjectDataFn( oCol.mData );
-                       
-                       /* Feature sorting overrides column specific when off */
-                       if ( !oSettings.oFeatures.bSort )
-                       {
-                               oCol.bSortable = false;
-                       }
-                       
-                       /* Check that the class assignment is correct for sorting */
-                       if ( !oCol.bSortable ||
-                                ($.inArray('asc', oCol.asSorting) == -1 && $.inArray('desc', oCol.asSorting) == -1) )
-                       {
-                               oCol.sSortingClass = oSettings.oClasses.sSortableNone;
-                               oCol.sSortingClassJUI = "";
-                       }
-                       else if ( $.inArray('asc', oCol.asSorting) == -1 && $.inArray('desc', oCol.asSorting) == -1 )
-                       {
-                               oCol.sSortingClass = oSettings.oClasses.sSortable;
-                               oCol.sSortingClassJUI = oSettings.oClasses.sSortJUI;
-                       }
-                       else if ( $.inArray('asc', oCol.asSorting) != -1 && $.inArray('desc', oCol.asSorting) == -1 )
-                       {
-                               oCol.sSortingClass = oSettings.oClasses.sSortableAsc;
-                               oCol.sSortingClassJUI = oSettings.oClasses.sSortJUIAscAllowed;
-                       }
-                       else if ( $.inArray('asc', oCol.asSorting) == -1 && $.inArray('desc', oCol.asSorting) != -1 )
-                       {
-                               oCol.sSortingClass = oSettings.oClasses.sSortableDesc;
-                               oCol.sSortingClassJUI = oSettings.oClasses.sSortJUIDescAllowed;
                        }
                }
-               
-               
-               /**
-                * Adjust the table column widths for new data. Note: you would probably want to 
-                * do a redraw after calling this function!
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
-                */
-               function _fnAdjustColumnSizing ( oSettings )
-               {
-                       /* Not interested in doing column width calculation if auto-width is disabled */
-                       if ( oSettings.oFeatures.bAutoWidth === false )
-                       {
-                               return false;
+       
+               return out;
+       };
+       
+       
+       // Basically the same as _pluck, but rather than looping over `a` we use `order`
+       // as the indexes to pick from `a`
+       var _pluck_order = function ( a, order, prop, prop2 )
+       {
+               var out = [];
+               var i=0, ien=order.length;
+       
+               // Could have the test in the loop for slightly smaller code, but speed
+               // is essential here
+               if ( prop2 !== undefined ) {
+                       for ( ; i<ien ; i++ ) {
+                               out.push( a[ order[i] ][ prop ][ prop2 ] );
                        }
-                       
-                       _fnCalculateColumnWidths( oSettings );
-                       for ( var i=0 , iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-                       {
-                               oSettings.aoColumns[i].nTh.style.width = oSettings.aoColumns[i].sWidth;
+               }
+               else {
+                       for ( ; i<ien ; i++ ) {
+                               out.push( a[ order[i] ][ prop ] );
                        }
                }
-               
-               
-               /**
-                * Covert the index of a visible column to the index in the data array (take account
-                * of hidden columns)
-                *  @param {object} oSettings dataTables settings object
-                *  @param {int} iMatch Visible column index to lookup
-                *  @returns {int} i the data index
-                *  @memberof DataTable#oApi
-                */
-               function _fnVisibleToColumnIndex( oSettings, iMatch )
-               {
-                       var aiVis = _fnGetColumns( oSettings, 'bVisible' );
-               
-                       return typeof aiVis[iMatch] === 'number' ?
-                               aiVis[iMatch] :
-                               null;
+       
+               return out;
+       };
+       
+       
+       var _range = function ( len, start )
+       {
+               var out = [];
+               var end;
+       
+               if ( start === undefined ) {
+                       start = 0;
+                       end = len;
                }
-               
-               
-               /**
-                * Covert the index of an index in the data array and convert it to the visible
-                *   column index (take account of hidden columns)
-                *  @param {int} iMatch Column index to lookup
-                *  @param {object} oSettings dataTables settings object
-                *  @returns {int} i the data index
-                *  @memberof DataTable#oApi
-                */
-               function _fnColumnIndexToVisible( oSettings, iMatch )
-               {
-                       var aiVis = _fnGetColumns( oSettings, 'bVisible' );
-                       var iPos = $.inArray( iMatch, aiVis );
-               
-                       return iPos !== -1 ? iPos : null;
+               else {
+                       end = start;
+                       start = len;
                }
-               
-               
-               /**
-                * Get the number of visible columns
-                *  @param {object} oSettings dataTables settings object
-                *  @returns {int} i the number of visible columns
-                *  @memberof DataTable#oApi
-                */
-               function _fnVisbleColumns( oSettings )
-               {
-                       return _fnGetColumns( oSettings, 'bVisible' ).length;
+       
+               for ( var i=start ; i<end ; i++ ) {
+                       out.push( i );
                }
-               
-               
-               /**
-                * Get an array of column indexes that match a given property
-                *  @param {object} oSettings dataTables settings object
-                *  @param {string} sParam Parameter in aoColumns to look for - typically 
-                *    bVisible or bSearchable
-                *  @returns {array} Array of indexes with matched properties
-                *  @memberof DataTable#oApi
-                */
-               function _fnGetColumns( oSettings, sParam )
-               {
-                       var a = [];
-               
-                       $.map( oSettings.aoColumns, function(val, i) {
-                               if ( val[sParam] ) {
-                                       a.push( i );
+       
+               return out;
+       };
+       
+       
+       var _stripHtml = function ( d ) {
+               return d.replace( _re_html, '' );
+       };
+       
+       
+       /**
+        * Find the unique elements in a source array.
+        *
+        * @param  {array} src Source array
+        * @return {array} Array of unique items
+        * @ignore
+        */
+       var _unique = function ( src )
+       {
+               // A faster unique method is to use object keys to identify used values,
+               // but this doesn't work with arrays or objects, which we must also
+               // consider. See jsperf.com/compare-array-unique-versions/4 for more
+               // information.
+               var
+                       out = [],
+                       val,
+                       i, ien=src.length,
+                       j, k=0;
+       
+               again: for ( i=0 ; i<ien ; i++ ) {
+                       val = src[i];
+       
+                       for ( j=0 ; j<k ; j++ ) {
+                               if ( out[j] === val ) {
+                                       continue again;
                                }
-                       } );
-               
-                       return a;
+                       }
+       
+                       out.push( val );
+                       k++;
                }
-               
-               
-               /**
-                * Get the sort type based on an input string
-                *  @param {string} sData data we wish to know the type of
-                *  @returns {string} type (defaults to 'string' if no type can be detected)
-                *  @memberof DataTable#oApi
-                */
-               function _fnDetectType( sData )
-               {
-                       var aTypes = DataTable.ext.aTypes;
-                       var iLen = aTypes.length;
-                       
-                       for ( var i=0 ; i<iLen ; i++ )
+       
+               return out;
+       };
+       
+       
+       
+       /**
+        * Create a mapping object that allows camel case parameters to be looked up
+        * for their Hungarian counterparts. The mapping is stored in a private
+        * parameter called `_hungarianMap` which can be accessed on the source object.
+        *  @param {object} o
+        *  @memberof DataTable#oApi
+        */
+       function _fnHungarianMap ( o )
+       {
+               var
+                       hungarian = 'a aa ai ao as b fn i m o s ',
+                       match,
+                       newKey,
+                       map = {};
+       
+               $.each( o, function (key, val) {
+                       match = key.match(/^([^A-Z]+?)([A-Z])/);
+       
+                       if ( match && hungarian.indexOf(match[1]+' ') !== -1 )
                        {
-                               var sType = aTypes[i]( sData );
-                               if ( sType !== null )
+                               newKey = key.replace( match[0], match[2].toLowerCase() );
+                               map[ newKey ] = key;
+       
+                               //console.log( key, match );
+                               if ( match[1] === 'o' )
                                {
-                                       return sType;
+                                       _fnHungarianMap( o[key] );
                                }
                        }
-                       
-                       return 'string';
+               } );
+       
+               o._hungarianMap = map;
+       }
+       
+       
+       /**
+        * Convert from camel case parameters to Hungarian, based on a Hungarian map
+        * created by _fnHungarianMap.
+        *  @param {object} src The model object which holds all parameters that can be
+        *    mapped.
+        *  @param {object} user The object to convert from camel case to Hungarian.
+        *  @param {boolean} force When set to `true`, properties which already have a
+        *    Hungarian value in the `user` object will be overwritten. Otherwise they
+        *    won't be.
+        *  @memberof DataTable#oApi
+        */
+       function _fnCamelToHungarian ( src, user, force )
+       {
+               if ( ! src._hungarianMap ) {
+                       _fnHungarianMap( src );
                }
-               
-               
-               /**
-                * Figure out how to reorder a display list
-                *  @param {object} oSettings dataTables settings object
-                *  @returns array {int} aiReturn index list for reordering
-                *  @memberof DataTable#oApi
-                */
-               function _fnReOrderIndex ( oSettings, sColumns )
-               {
-                       var aColumns = sColumns.split(',');
-                       var aiReturn = [];
-                       
-                       for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+       
+               var hungarianKey;
+       
+               $.each( user, function (key, val) {
+                       hungarianKey = src._hungarianMap[ key ];
+       
+                       if ( hungarianKey !== undefined && (force || user[hungarianKey] === undefined) )
                        {
-                               for ( var j=0 ; j<iLen ; j++ )
+                               // For objects, we need to buzz down into the object to copy parameters
+                               if ( hungarianKey.charAt(0) === 'o' )
                                {
-                                       if ( oSettings.aoColumns[i].sName == aColumns[j] )
-                                       {
-                                               aiReturn.push( j );
-                                               break;
+                                       // Copy the camelCase options over to the hungarian
+                                       if ( ! user[ hungarianKey ] ) {
+                                               user[ hungarianKey ] = {};
                                        }
+                                       $.extend( true, user[hungarianKey], user[key] );
+       
+                                       _fnCamelToHungarian( src[hungarianKey], user[hungarianKey], force );
+                               }
+                               else {
+                                       user[hungarianKey] = user[ key ];
                                }
                        }
-                       
-                       return aiReturn;
-               }
-               
-               
-               /**
-                * Get the column ordering that DataTables expects
-                *  @param {object} oSettings dataTables settings object
-                *  @returns {string} comma separated list of names
-                *  @memberof DataTable#oApi
+               } );
+       }
+       
+       
+       /**
+        * Language compatibility - when certain options are given, and others aren't, we
+        * need to duplicate the values over, in order to provide backwards compatibility
+        * with older language files.
+        *  @param {object} oSettings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnLanguageCompat( lang )
+       {
+               var defaults = DataTable.defaults.oLanguage;
+               var zeroRecords = lang.sZeroRecords;
+       
+               /* Backwards compatibility - if there is no sEmptyTable given, then use the same as
+                * sZeroRecords - assuming that is given.
                 */
-               function _fnColumnOrdering ( oSettings )
+               if ( ! lang.sEmptyTable && zeroRecords &&
+                       defaults.sEmptyTable === "No data available in table" )
                {
-                       var sNames = '';
-                       for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-                       {
-                               sNames += oSettings.aoColumns[i].sName+',';
-                       }
-                       if ( sNames.length == iLen )
-                       {
-                               return "";
-                       }
-                       return sNames.slice(0, -1);
+                       _fnMap( lang, lang, 'sZeroRecords', 'sEmptyTable' );
                }
-               
-               
-               /**
-                * Take the column definitions and static columns arrays and calculate how
-                * they relate to column indexes. The callback function will then apply the
-                * definition found for a column to a suitable configuration object.
-                *  @param {object} oSettings dataTables settings object
-                *  @param {array} aoColDefs The aoColumnDefs array that is to be applied
-                *  @param {array} aoCols The aoColumns array that defines columns individually
-                *  @param {function} fn Callback function - takes two parameters, the calculated
-                *    column index and the definition for that column.
-                *  @memberof DataTable#oApi
-                */
-               function _fnApplyColumnDefs( oSettings, aoColDefs, aoCols, fn )
+       
+               /* Likewise with loading records */
+               if ( ! lang.sLoadingRecords && zeroRecords &&
+                       defaults.sLoadingRecords === "Loading..." )
                {
-                       var i, iLen, j, jLen, k, kLen;
-               
-                       // Column definitions with aTargets
-                       if ( aoColDefs )
-                       {
-                               /* Loop over the definitions array - loop in reverse so first instance has priority */
-                               for ( i=aoColDefs.length-1 ; i>=0 ; i-- )
-                               {
-                                       /* Each definition can target multiple columns, as it is an array */
-                                       var aTargets = aoColDefs[i].aTargets;
-                                       if ( !$.isArray( aTargets ) )
-                                       {
-                                               _fnLog( oSettings, 1, 'aTargets must be an array of targets, not a '+(typeof aTargets) );
-                                       }
-               
-                                       for ( j=0, jLen=aTargets.length ; j<jLen ; j++ )
-                                       {
-                                               if ( typeof aTargets[j] === 'number' && aTargets[j] >= 0 )
-                                               {
-                                                       /* Add columns that we don't yet know about */
-                                                       while( oSettings.aoColumns.length <= aTargets[j] )
-                                                       {
-                                                               _fnAddColumn( oSettings );
-                                                       }
-               
-                                                       /* Integer, basic index */
-                                                       fn( aTargets[j], aoColDefs[i] );
-                                               }
-                                               else if ( typeof aTargets[j] === 'number' && aTargets[j] < 0 )
-                                               {
-                                                       /* Negative integer, right to left column counting */
-                                                       fn( oSettings.aoColumns.length+aTargets[j], aoColDefs[i] );
-                                               }
-                                               else if ( typeof aTargets[j] === 'string' )
-                                               {
-                                                       /* Class name matching on TH element */
-                                                       for ( k=0, kLen=oSettings.aoColumns.length ; k<kLen ; k++ )
-                                                       {
-                                                               if ( aTargets[j] == "_all" ||
-                                                                    $(oSettings.aoColumns[k].nTh).hasClass( aTargets[j] ) )
-                                                               {
-                                                                       fn( k, aoColDefs[i] );
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               
-                       // Statically defined columns array
-                       if ( aoCols )
-                       {
-                               for ( i=0, iLen=aoCols.length ; i<iLen ; i++ )
-                               {
-                                       fn( i, aoCols[i] );
-                               }
+                       _fnMap( lang, lang, 'sZeroRecords', 'sLoadingRecords' );
+               }
+       
+               // Old parameter name of the thousands separator mapped onto the new
+               if ( lang.sInfoThousands ) {
+                       lang.sThousands = lang.sInfoThousands;
+               }
+       
+               var decimal = lang.sDecimal;
+               if ( decimal ) {
+                       _addNumericSort( decimal );
+               }
+       }
+       
+       
+       /**
+        * Map one parameter onto another
+        *  @param {object} o Object to map
+        *  @param {*} knew The new parameter name
+        *  @param {*} old The old parameter name
+        */
+       var _fnCompatMap = function ( o, knew, old ) {
+               if ( o[ knew ] !== undefined ) {
+                       o[ old ] = o[ knew ];
+               }
+       };
+       
+       
+       /**
+        * Provide backwards compatibility for the main DT options. Note that the new
+        * options are mapped onto the old parameters, so this is an external interface
+        * change only.
+        *  @param {object} init Object to map
+        */
+       function _fnCompatOpts ( init )
+       {
+               _fnCompatMap( init, 'ordering',      'bSort' );
+               _fnCompatMap( init, 'orderMulti',    'bSortMulti' );
+               _fnCompatMap( init, 'orderClasses',  'bSortClasses' );
+               _fnCompatMap( init, 'orderCellsTop', 'bSortCellsTop' );
+               _fnCompatMap( init, 'order',         'aaSorting' );
+               _fnCompatMap( init, 'orderFixed',    'aaSortingFixed' );
+               _fnCompatMap( init, 'paging',        'bPaginate' );
+               _fnCompatMap( init, 'pagingType',    'sPaginationType' );
+               _fnCompatMap( init, 'pageLength',    'iDisplayLength' );
+               _fnCompatMap( init, 'searching',     'bFilter' );
+       }
+       
+       
+       /**
+        * Provide backwards compatibility for column options. Note that the new options
+        * are mapped onto the old parameters, so this is an external interface change
+        * only.
+        *  @param {object} init Object to map
+        */
+       function _fnCompatCols ( init )
+       {
+               _fnCompatMap( init, 'orderable',     'bSortable' );
+               _fnCompatMap( init, 'orderData',     'aDataSort' );
+               _fnCompatMap( init, 'orderSequence', 'asSorting' );
+               _fnCompatMap( init, 'orderDataType', 'sortDataType' );
+       }
+       
+       
+       /**
+        * Browser feature detection for capabilities, quirks
+        *  @param {object} settings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnBrowserDetect( settings )
+       {
+               var browser = settings.oBrowser;
+       
+               // Scrolling feature / quirks detection
+               var n = $('<div/>')
+                       .css( {
+                               position: 'absolute',
+                               top: 0,
+                               left: 0,
+                               height: 1,
+                               width: 1,
+                               overflow: 'hidden'
+                       } )
+                       .append(
+                               $('<div/>')
+                                       .css( {
+                                               position: 'absolute',
+                                               top: 1,
+                                               left: 1,
+                                               width: 100,
+                                               overflow: 'scroll'
+                                       } )
+                                       .append(
+                                               $('<div class="test"/>')
+                                                       .css( {
+                                                               width: '100%',
+                                                               height: 10
+                                                       } )
+                                       )
+                       )
+                       .appendTo( 'body' );
+       
+               var test = n.find('.test');
+       
+               // IE6/7 will oversize a width 100% element inside a scrolling element, to
+               // include the width of the scrollbar, while other browsers ensure the inner
+               // element is contained without forcing scrolling
+               browser.bScrollOversize = test[0].offsetWidth === 100;
+       
+               // In rtl text layout, some browsers (most, but not all) will place the
+               // scrollbar on the left, rather than the right.
+               browser.bScrollbarLeft = test.offset().left !== 1;
+       
+               n.remove();
+       }
+       
+       
+       /**
+        * Array.prototype reduce[Right] method, used for browsers which don't support
+        * JS 1.6. Done this way to reduce code size, since we iterate either way
+        *  @param {object} settings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnReduce ( that, fn, init, start, end, inc )
+       {
+               var
+                       i = start,
+                       value,
+                       isSet = false;
+       
+               if ( init !== undefined ) {
+                       value = init;
+                       isSet = true;
+               }
+       
+               while ( i !== end ) {
+                       if ( ! that.hasOwnProperty(i) ) {
+                               continue;
                        }
+       
+                       value = isSet ?
+                               fn( value, that[i], i, that ) :
+                               that[i];
+       
+                       isSet = true;
+                       i += inc;
                }
-               
-               /**
-                * Add a data array to the table, creating DOM node etc. This is the parallel to 
-                * _fnGatherData, but for adding rows from a Javascript source, rather than a
-                * DOM source.
-                *  @param {object} oSettings dataTables settings object
-                *  @param {array} aData data array to be added
-                *  @returns {int} >=0 if successful (index of new aoData entry), -1 if failed
-                *  @memberof DataTable#oApi
-                */
-               function _fnAddData ( oSettings, aDataSupplied )
+       
+               return value;
+       }
+       
+       /**
+        * Add a column to the list used for the table with default values
+        *  @param {object} oSettings dataTables settings object
+        *  @param {node} nTh The th element for this column
+        *  @memberof DataTable#oApi
+        */
+       function _fnAddColumn( oSettings, nTh )
+       {
+               // Add column to aoColumns array
+               var oDefaults = DataTable.defaults.column;
+               var iCol = oSettings.aoColumns.length;
+               var oCol = $.extend( {}, DataTable.models.oColumn, oDefaults, {
+                       "nTh": nTh ? nTh : document.createElement('th'),
+                       "sTitle":    oDefaults.sTitle    ? oDefaults.sTitle    : nTh ? nTh.innerHTML : '',
+                       "aDataSort": oDefaults.aDataSort ? oDefaults.aDataSort : [iCol],
+                       "mData": oDefaults.mData ? oDefaults.mData : iCol,
+                       idx: iCol
+               } );
+               oSettings.aoColumns.push( oCol );
+       
+               // Add search object for column specific search. Note that the `searchCols[ iCol ]`
+               // passed into extend can be undefined. This allows the user to give a default
+               // with only some of the parameters defined, and also not give a default
+               var searchCols = oSettings.aoPreSearchCols;
+               searchCols[ iCol ] = $.extend( {}, DataTable.models.oSearch, searchCols[ iCol ] );
+       
+               // Use the default column options function to initialise classes etc
+               _fnColumnOptions( oSettings, iCol, null );
+       }
+       
+       
+       /**
+        * Apply options for a column
+        *  @param {object} oSettings dataTables settings object
+        *  @param {int} iCol column index to consider
+        *  @param {object} oOptions object with sType, bVisible and bSearchable etc
+        *  @memberof DataTable#oApi
+        */
+       function _fnColumnOptions( oSettings, iCol, oOptions )
+       {
+               var oCol = oSettings.aoColumns[ iCol ];
+               var oClasses = oSettings.oClasses;
+               var th = $(oCol.nTh);
+       
+               // Try to get width information from the DOM. We can't get it from CSS
+               // as we'd need to parse the CSS stylesheet. `width` option can override
+               if ( ! oCol.sWidthOrig ) {
+                       // Width attribute
+                       oCol.sWidthOrig = th.attr('width') || null;
+       
+                       // Style attribute
+                       var t = (th.attr('style') || '').match(/width:\s*(\d+[pxem%])/);
+                       if ( t ) {
+                               oCol.sWidthOrig = t[1];
+                       }
+               }
+       
+               /* User specified column options */
+               if ( oOptions !== undefined && oOptions !== null )
                {
-                       var oCol;
-                       
-                       /* Take an independent copy of the data source so we can bash it about as we wish */
-                       var aDataIn = ($.isArray(aDataSupplied)) ?
-                               aDataSupplied.slice() :
-                               $.extend( true, {}, aDataSupplied );
-                       
-                       /* Create the object for storing information about this new row */
-                       var iRow = oSettings.aoData.length;
-                       var oData = $.extend( true, {}, DataTable.models.oRow );
-                       oData._aData = aDataIn;
-                       oSettings.aoData.push( oData );
-               
-                       /* Create the cells */
-                       var nTd, sThisType;
-                       for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+                       // Backwards compatibility
+                       _fnCompatCols( oOptions );
+       
+                       // Map camel case parameters to their Hungarian counterparts
+                       _fnCamelToHungarian( DataTable.defaults.column, oOptions );
+       
+                       /* Backwards compatibility for mDataProp */
+                       if ( oOptions.mDataProp !== undefined && !oOptions.mData )
                        {
-                               oCol = oSettings.aoColumns[i];
-               
-                               /* Use rendered data for filtering / sorting */
-                               if ( typeof oCol.fnRender === 'function' && oCol.bUseRendered && oCol.mData !== null )
-                               {
-                                       _fnSetCellData( oSettings, iRow, i, _fnRender(oSettings, iRow, i) );
-                               }
-                               else
-                               {
-                                       _fnSetCellData( oSettings, iRow, i, _fnGetCellData( oSettings, iRow, i ) );
-                               }
-                               
-                               /* See if we should auto-detect the column type */
-                               if ( oCol._bAutoType && oCol.sType != 'string' )
-                               {
-                                       /* Attempt to auto detect the type - same as _fnGatherData() */
-                                       var sVarType = _fnGetCellData( oSettings, iRow, i, 'type' );
-                                       if ( sVarType !== null && sVarType !== '' )
-                                       {
-                                               sThisType = _fnDetectType( sVarType );
-                                               if ( oCol.sType === null )
-                                               {
-                                                       oCol.sType = sThisType;
-                                               }
-                                               else if ( oCol.sType != sThisType && oCol.sType != "html" )
-                                               {
-                                                       /* String is always the 'fallback' option */
-                                                       oCol.sType = 'string';
-                                               }
-                                       }
-                               }
+                               oOptions.mData = oOptions.mDataProp;
                        }
-                       
-                       /* Add to the display array */
-                       oSettings.aiDisplayMaster.push( iRow );
-               
-                       /* Create the DOM information */
-                       if ( !oSettings.oFeatures.bDeferRender )
+       
+                       if ( oOptions.sType )
                        {
-                               _fnCreateTr( oSettings, iRow );
+                               oCol._sManualType = oOptions.sType;
                        }
-               
-                       return iRow;
+       
+                       // `class` is a reserved word in Javascript, so we need to provide
+                       // the ability to use a valid name for the camel case input
+                       if ( oOptions.className && ! oOptions.sClass )
+                       {
+                               oOptions.sClass = oOptions.className;
+                       }
+       
+                       $.extend( oCol, oOptions );
+                       _fnMap( oCol, oOptions, "sWidth", "sWidthOrig" );
+       
+                       /* iDataSort to be applied (backwards compatibility), but aDataSort will take
+                        * priority if defined
+                        */
+                       if ( typeof oOptions.iDataSort === 'number' )
+                       {
+                               oCol.aDataSort = [ oOptions.iDataSort ];
+                       }
+                       _fnMap( oCol, oOptions, "aDataSort" );
                }
-               
-               
-               /**
-                * Read in the data from the target table from the DOM
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
-                */
-               function _fnGatherData( oSettings )
+       
+               /* Cache the data get and set functions for speed */
+               var mDataSrc = oCol.mData;
+               var mData = _fnGetObjectDataFn( mDataSrc );
+               var mRender = oCol.mRender ? _fnGetObjectDataFn( oCol.mRender ) : null;
+       
+               var attrTest = function( src ) {
+                       return typeof src === 'string' && src.indexOf('@') !== -1;
+               };
+               oCol._bAttrSrc = $.isPlainObject( mDataSrc ) && (
+                       attrTest(mDataSrc.sort) || attrTest(mDataSrc.type) || attrTest(mDataSrc.filter)
+               );
+       
+               oCol.fnGetData = function (oData, sSpecific) {
+                       var innerData = mData( oData, sSpecific );
+       
+                       if ( oCol.mRender && (sSpecific && sSpecific !== '') )
+                       {
+                               return mRender( innerData, sSpecific, oData );
+                       }
+                       return innerData;
+               };
+               oCol.fnSetData = _fnSetObjectDataFn( mDataSrc );
+       
+               /* Feature sorting overrides column specific when off */
+               if ( !oSettings.oFeatures.bSort )
                {
-                       var iLoop, i, iLen, j, jLen, jInner,
-                               nTds, nTrs, nTd, nTr, aLocalData, iThisIndex,
-                               iRow, iRows, iColumn, iColumns, sNodeName,
-                               oCol, oData;
-                       
-                       /*
-                        * Process by row first
-                        * Add the data object for the whole table - storing the tr node. Note - no point in getting
-                        * DOM based data if we are going to go and replace it with Ajax source data.
-                        */
-                       if ( oSettings.bDeferLoading || oSettings.sAjaxSource === null )
+                       oCol.bSortable = false;
+                       th.addClass( oClasses.sSortableNone ); // Have to add class here as order event isn't called
+               }
+       
+               /* Check that the class assignment is correct for sorting */
+               var bAsc = $.inArray('asc', oCol.asSorting) !== -1;
+               var bDesc = $.inArray('desc', oCol.asSorting) !== -1;
+               if ( !oCol.bSortable || (!bAsc && !bDesc) )
+               {
+                       oCol.sSortingClass = oClasses.sSortableNone;
+                       oCol.sSortingClassJUI = "";
+               }
+               else if ( bAsc && !bDesc )
+               {
+                       oCol.sSortingClass = oClasses.sSortableAsc;
+                       oCol.sSortingClassJUI = oClasses.sSortJUIAscAllowed;
+               }
+               else if ( !bAsc && bDesc )
+               {
+                       oCol.sSortingClass = oClasses.sSortableDesc;
+                       oCol.sSortingClassJUI = oClasses.sSortJUIDescAllowed;
+               }
+               else
+               {
+                       oCol.sSortingClass = oClasses.sSortable;
+                       oCol.sSortingClassJUI = oClasses.sSortJUI;
+               }
+       }
+       
+       
+       /**
+        * Adjust the table column widths for new data. Note: you would probably want to
+        * do a redraw after calling this function!
+        *  @param {object} settings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnAdjustColumnSizing ( settings )
+       {
+               /* Not interested in doing column width calculation if auto-width is disabled */
+               if ( settings.oFeatures.bAutoWidth !== false )
+               {
+                       var columns = settings.aoColumns;
+       
+                       _fnCalculateColumnWidths( settings );
+                       for ( var i=0 , iLen=columns.length ; i<iLen ; i++ )
                        {
-                               nTr = oSettings.nTBody.firstChild;
-                               while ( nTr )
-                               {
-                                       if ( nTr.nodeName.toUpperCase() == "TR" )
-                                       {
-                                               iThisIndex = oSettings.aoData.length;
-                                               nTr._DT_RowIndex = iThisIndex;
-                                               oSettings.aoData.push( $.extend( true, {}, DataTable.models.oRow, {
-                                                       "nTr": nTr
-                                               } ) );
-               
-                                               oSettings.aiDisplayMaster.push( iThisIndex );
-                                               nTd = nTr.firstChild;
-                                               jInner = 0;
-                                               while ( nTd )
-                                               {
-                                                       sNodeName = nTd.nodeName.toUpperCase();
-                                                       if ( sNodeName == "TD" || sNodeName == "TH" )
-                                                       {
-                                                               _fnSetCellData( oSettings, iThisIndex, jInner, $.trim(nTd.innerHTML) );
-                                                               jInner++;
-                                                       }
-                                                       nTd = nTd.nextSibling;
+                               columns[i].nTh.style.width = columns[i].sWidth;
+                       }
+               }
+       
+               var scroll = settings.oScroll;
+               if ( scroll.sY !== '' || scroll.sX !== '')
+               {
+                       _fnScrollDraw( settings );
+               }
+       
+               _fnCallbackFire( settings, null, 'column-sizing', [settings] );
+       }
+       
+       
+       /**
+        * Covert the index of a visible column to the index in the data array (take account
+        * of hidden columns)
+        *  @param {object} oSettings dataTables settings object
+        *  @param {int} iMatch Visible column index to lookup
+        *  @returns {int} i the data index
+        *  @memberof DataTable#oApi
+        */
+       function _fnVisibleToColumnIndex( oSettings, iMatch )
+       {
+               var aiVis = _fnGetColumns( oSettings, 'bVisible' );
+       
+               return typeof aiVis[iMatch] === 'number' ?
+                       aiVis[iMatch] :
+                       null;
+       }
+       
+       
+       /**
+        * Covert the index of an index in the data array and convert it to the visible
+        *   column index (take account of hidden columns)
+        *  @param {int} iMatch Column index to lookup
+        *  @param {object} oSettings dataTables settings object
+        *  @returns {int} i the data index
+        *  @memberof DataTable#oApi
+        */
+       function _fnColumnIndexToVisible( oSettings, iMatch )
+       {
+               var aiVis = _fnGetColumns( oSettings, 'bVisible' );
+               var iPos = $.inArray( iMatch, aiVis );
+       
+               return iPos !== -1 ? iPos : null;
+       }
+       
+       
+       /**
+        * Get the number of visible columns
+        *  @param {object} oSettings dataTables settings object
+        *  @returns {int} i the number of visible columns
+        *  @memberof DataTable#oApi
+        */
+       function _fnVisbleColumns( oSettings )
+       {
+               return _fnGetColumns( oSettings, 'bVisible' ).length;
+       }
+       
+       
+       /**
+        * Get an array of column indexes that match a given property
+        *  @param {object} oSettings dataTables settings object
+        *  @param {string} sParam Parameter in aoColumns to look for - typically
+        *    bVisible or bSearchable
+        *  @returns {array} Array of indexes with matched properties
+        *  @memberof DataTable#oApi
+        */
+       function _fnGetColumns( oSettings, sParam )
+       {
+               var a = [];
+       
+               $.map( oSettings.aoColumns, function(val, i) {
+                       if ( val[sParam] ) {
+                               a.push( i );
+                       }
+               } );
+       
+               return a;
+       }
+       
+       
+       /**
+        * Calculate the 'type' of a column
+        *  @param {object} settings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnColumnTypes ( settings )
+       {
+               var columns = settings.aoColumns;
+               var data = settings.aoData;
+               var types = DataTable.ext.type.detect;
+               var i, ien, j, jen, k, ken;
+               var col, cell, detectedType, cache;
+       
+               // For each column, spin over the 
+               for ( i=0, ien=columns.length ; i<ien ; i++ ) {
+                       col = columns[i];
+                       cache = [];
+       
+                       if ( ! col.sType && col._sManualType ) {
+                               col.sType = col._sManualType;
+                       }
+                       else if ( ! col.sType ) {
+                               for ( j=0, jen=types.length ; j<jen ; j++ ) {
+                                       for ( k=0, ken=data.length ; k<ken ; k++ ) {
+                                               // Use a cache array so we only need to get the type data
+                                               // from the formatter once (when using multiple detectors)
+                                               if ( cache[k] === undefined ) {
+                                                       cache[k] = _fnGetCellData( settings, k, i, 'type' );
+                                               }
+       
+                                               detectedType = types[j]( cache[k], settings );
+       
+                                               // Doesn't match, so break early, since this type can't
+                                               // apply to this column. Also, HTML is a special case since
+                                               // it is so similar to `string`. Just a single match is
+                                               // needed for a column to be html type
+                                               if ( ! detectedType || detectedType === 'html' ) {
+                                                       break;
                                                }
                                        }
-                                       nTr = nTr.nextSibling;
-                               }
-                       }
-                       
-                       /* Gather in the TD elements of the Table - note that this is basically the same as
-                        * fnGetTdNodes, but that function takes account of hidden columns, which we haven't yet
-                        * setup!
-                        */
-                       nTrs = _fnGetTrNodes( oSettings );
-                       nTds = [];
-                       for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
-                       {
-                               nTd = nTrs[i].firstChild;
-                               while ( nTd )
-                               {
-                                       sNodeName = nTd.nodeName.toUpperCase();
-                                       if ( sNodeName == "TD" || sNodeName == "TH" )
-                                       {
-                                               nTds.push( nTd );
+       
+                                       // Type is valid for all data points in the column - use this
+                                       // type
+                                       if ( detectedType ) {
+                                               col.sType = detectedType;
+                                               break;
                                        }
-                                       nTd = nTd.nextSibling;
+                               }
+       
+                               // Fall back - if no type was detected, always use string
+                               if ( ! col.sType ) {
+                                       col.sType = 'string';
                                }
                        }
-                       
-                       /* Now process by column */
-                       for ( iColumn=0, iColumns=oSettings.aoColumns.length ; iColumn<iColumns ; iColumn++ )
+               }
+       }
+       
+       
+       /**
+        * Take the column definitions and static columns arrays and calculate how
+        * they relate to column indexes. The callback function will then apply the
+        * definition found for a column to a suitable configuration object.
+        *  @param {object} oSettings dataTables settings object
+        *  @param {array} aoColDefs The aoColumnDefs array that is to be applied
+        *  @param {array} aoCols The aoColumns array that defines columns individually
+        *  @param {function} fn Callback function - takes two parameters, the calculated
+        *    column index and the definition for that column.
+        *  @memberof DataTable#oApi
+        */
+       function _fnApplyColumnDefs( oSettings, aoColDefs, aoCols, fn )
+       {
+               var i, iLen, j, jLen, k, kLen, def;
+               var columns = oSettings.aoColumns;
+       
+               // Column definitions with aTargets
+               if ( aoColDefs )
+               {
+                       /* Loop over the definitions array - loop in reverse so first instance has priority */
+                       for ( i=aoColDefs.length-1 ; i>=0 ; i-- )
                        {
-                               oCol = oSettings.aoColumns[iColumn];
-               
-                               /* Get the title of the column - unless there is a user set one */
-                               if ( oCol.sTitle === null )
+                               def = aoColDefs[i];
+       
+                               /* Each definition can target multiple columns, as it is an array */
+                               var aTargets = def.targets !== undefined ?
+                                       def.targets :
+                                       def.aTargets;
+       
+                               if ( ! $.isArray( aTargets ) )
                                {
-                                       oCol.sTitle = oCol.nTh.innerHTML;
+                                       aTargets = [ aTargets ];
                                }
-                               
-                               var
-                                       bAutoType = oCol._bAutoType,
-                                       bRender = typeof oCol.fnRender === 'function',
-                                       bClass = oCol.sClass !== null,
-                                       bVisible = oCol.bVisible,
-                                       nCell, sThisType, sRendered, sValType;
-                               
-                               /* A single loop to rule them all (and be more efficient) */
-                               if ( bAutoType || bRender || bClass || !bVisible )
+       
+                               for ( j=0, jLen=aTargets.length ; j<jLen ; j++ )
                                {
-                                       for ( iRow=0, iRows=oSettings.aoData.length ; iRow<iRows ; iRow++ )
+                                       if ( typeof aTargets[j] === 'number' && aTargets[j] >= 0 )
                                        {
-                                               oData = oSettings.aoData[iRow];
-                                               nCell = nTds[ (iRow*iColumns) + iColumn ];
-                                               
-                                               /* Type detection */
-                                               if ( bAutoType && oCol.sType != 'string' )
-                                               {
-                                                       sValType = _fnGetCellData( oSettings, iRow, iColumn, 'type' );
-                                                       if ( sValType !== '' )
-                                                       {
-                                                               sThisType = _fnDetectType( sValType );
-                                                               if ( oCol.sType === null )
-                                                               {
-                                                                       oCol.sType = sThisType;
-                                                               }
-                                                               else if ( oCol.sType != sThisType && 
-                                                                         oCol.sType != "html" )
-                                                               {
-                                                                       /* String is always the 'fallback' option */
-                                                                       oCol.sType = 'string';
-                                                               }
-                                                       }
-                                               }
-               
-                                               if ( oCol.mRender )
-                                               {
-                                                       // mRender has been defined, so we need to get the value and set it
-                                                       nCell.innerHTML = _fnGetCellData( oSettings, iRow, iColumn, 'display' );
-                                               }
-                                               else if ( oCol.mData !== iColumn )
+                                               /* Add columns that we don't yet know about */
+                                               while( columns.length <= aTargets[j] )
                                                {
-                                                       // If mData is not the same as the column number, then we need to
-                                                       // get the dev set value. If it is the column, no point in wasting
-                                                       // time setting the value that is already there!
-                                                       nCell.innerHTML = _fnGetCellData( oSettings, iRow, iColumn, 'display' );
+                                                       _fnAddColumn( oSettings );
                                                }
-                                               
-                                               /* Rendering */
-                                               if ( bRender )
+       
+                                               /* Integer, basic index */
+                                               fn( aTargets[j], def );
+                                       }
+                                       else if ( typeof aTargets[j] === 'number' && aTargets[j] < 0 )
+                                       {
+                                               /* Negative integer, right to left column counting */
+                                               fn( columns.length+aTargets[j], def );
+                                       }
+                                       else if ( typeof aTargets[j] === 'string' )
+                                       {
+                                               /* Class name matching on TH element */
+                                               for ( k=0, kLen=columns.length ; k<kLen ; k++ )
                                                {
-                                                       sRendered = _fnRender( oSettings, iRow, iColumn );
-                                                       nCell.innerHTML = sRendered;
-                                                       if ( oCol.bUseRendered )
+                                                       if ( aTargets[j] == "_all" ||
+                                                            $(columns[k].nTh).hasClass( aTargets[j] ) )
                                                        {
-                                                               /* Use the rendered data for filtering / sorting */
-                                                               _fnSetCellData( oSettings, iRow, iColumn, sRendered );
+                                                               fn( k, def );
                                                        }
                                                }
-                                               
-                                               /* Classes */
-                                               if ( bClass )
-                                               {
-                                                       nCell.className += ' '+oCol.sClass;
-                                               }
-                                               
-                                               /* Column visibility */
-                                               if ( !bVisible )
-                                               {
-                                                       oData._anHidden[iColumn] = nCell;
-                                                       nCell.parentNode.removeChild( nCell );
-                                               }
-                                               else
-                                               {
-                                                       oData._anHidden[iColumn] = null;
-                                               }
-               
-                                               if ( oCol.fnCreatedCell )
-                                               {
-                                                       oCol.fnCreatedCell.call( oSettings.oInstance,
-                                                               nCell, _fnGetCellData( oSettings, iRow, iColumn, 'display' ), oData._aData, iRow, iColumn
-                                                       );
-                                               }
                                        }
                                }
                        }
-               
-                       /* Row created callbacks */
-                       if ( oSettings.aoRowCreatedCallback.length !== 0 )
+               }
+       
+               // Statically defined columns array
+               if ( aoCols )
+               {
+                       for ( i=0, iLen=aoCols.length ; i<iLen ; i++ )
                        {
-                               for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
-                               {
-                                       oData = oSettings.aoData[i];
-                                       _fnCallbackFire( oSettings, 'aoRowCreatedCallback', null, [oData.nTr, oData._aData, i] );
-                               }
+                               fn( i, aoCols[i] );
                        }
                }
-               
-               
-               /**
-                * Take a TR element and convert it to an index in aoData
-                *  @param {object} oSettings dataTables settings object
-                *  @param {node} n the TR element to find
-                *  @returns {int} index if the node is found, null if not
-                *  @memberof DataTable#oApi
-                */
-               function _fnNodeToDataIndex( oSettings, n )
+       }
+       
+       /**
+        * Add a data array to the table, creating DOM node etc. This is the parallel to
+        * _fnGatherData, but for adding rows from a Javascript source, rather than a
+        * DOM source.
+        *  @param {object} oSettings dataTables settings object
+        *  @param {array} aData data array to be added
+        *  @param {node} [nTr] TR element to add to the table - optional. If not given,
+        *    DataTables will create a row automatically
+        *  @param {array} [anTds] Array of TD|TH elements for the row - must be given
+        *    if nTr is.
+        *  @returns {int} >=0 if successful (index of new aoData entry), -1 if failed
+        *  @memberof DataTable#oApi
+        */
+       function _fnAddData ( oSettings, aDataIn, nTr, anTds )
+       {
+               /* Create the object for storing information about this new row */
+               var iRow = oSettings.aoData.length;
+               var oData = $.extend( true, {}, DataTable.models.oRow, {
+                       src: nTr ? 'dom' : 'data'
+               } );
+       
+               oData._aData = aDataIn;
+               oSettings.aoData.push( oData );
+       
+               /* Create the cells */
+               var nTd, sThisType;
+               var columns = oSettings.aoColumns;
+               for ( var i=0, iLen=columns.length ; i<iLen ; i++ )
                {
-                       return (n._DT_RowIndex!==undefined) ? n._DT_RowIndex : null;
+                       // When working with a row, the data source object must be populated. In
+                       // all other cases, the data source object is already populated, so we
+                       // don't overwrite it, which might break bindings etc
+                       if ( nTr ) {
+                               _fnSetCellData( oSettings, iRow, i, _fnGetCellData( oSettings, iRow, i ) );
+                       }
+                       columns[i].sType = null;
                }
-               
-               
-               /**
-                * Take a TD element and convert it into a column data index (not the visible index)
-                *  @param {object} oSettings dataTables settings object
-                *  @param {int} iRow The row number the TD/TH can be found in
-                *  @param {node} n The TD/TH element to find
-                *  @returns {int} index if the node is found, -1 if not
-                *  @memberof DataTable#oApi
-                */
-               function _fnNodeToColumnIndex( oSettings, iRow, n )
+       
+               /* Add to the display array */
+               oSettings.aiDisplayMaster.push( iRow );
+       
+               /* Create the DOM information */
+               if ( !oSettings.oFeatures.bDeferRender )
                {
-                       var anCells = _fnGetTdNodes( oSettings, iRow );
-               
-                       for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-                       {
-                               if ( anCells[i] === n )
-                               {
-                                       return i;
-                               }
-                       }
-                       return -1;
+                       _fnCreateTr( oSettings, iRow, nTr, anTds );
                }
-               
-               
-               /**
-                * Get an array of data for a given row from the internal data cache
-                *  @param {object} oSettings dataTables settings object
-                *  @param {int} iRow aoData row id
-                *  @param {string} sSpecific data get type ('type' 'filter' 'sort')
-                *  @param {array} aiColumns Array of column indexes to get data from
-                *  @returns {array} Data array
-                *  @memberof DataTable#oApi
-                */
-               function _fnGetRowData( oSettings, iRow, sSpecific, aiColumns )
+       
+               return iRow;
+       }
+       
+       
+       /**
+        * Add one or more TR elements to the table. Generally we'd expect to
+        * use this for reading data from a DOM sourced table, but it could be
+        * used for an TR element. Note that if a TR is given, it is used (i.e.
+        * it is not cloned).
+        *  @param {object} settings dataTables settings object
+        *  @param {array|node|jQuery} trs The TR element(s) to add to the table
+        *  @returns {array} Array of indexes for the added rows
+        *  @memberof DataTable#oApi
+        */
+       function _fnAddTr( settings, trs )
+       {
+               var row;
+       
+               // Allow an individual node to be passed in
+               if ( ! (trs instanceof $) ) {
+                       trs = $(trs);
+               }
+       
+               return trs.map( function (i, el) {
+                       row = _fnGetRowElements( settings, el );
+                       return _fnAddData( settings, row.data, el, row.cells );
+               } );
+       }
+       
+       
+       /**
+        * Take a TR element and convert it to an index in aoData
+        *  @param {object} oSettings dataTables settings object
+        *  @param {node} n the TR element to find
+        *  @returns {int} index if the node is found, null if not
+        *  @memberof DataTable#oApi
+        */
+       function _fnNodeToDataIndex( oSettings, n )
+       {
+               return (n._DT_RowIndex!==undefined) ? n._DT_RowIndex : null;
+       }
+       
+       
+       /**
+        * Take a TD element and convert it into a column data index (not the visible index)
+        *  @param {object} oSettings dataTables settings object
+        *  @param {int} iRow The row number the TD/TH can be found in
+        *  @param {node} n The TD/TH element to find
+        *  @returns {int} index if the node is found, -1 if not
+        *  @memberof DataTable#oApi
+        */
+       function _fnNodeToColumnIndex( oSettings, iRow, n )
+       {
+               return $.inArray( n, oSettings.aoData[ iRow ].anCells );
+       }
+       
+       
+       /**
+        * Get the data for a given cell from the internal cache, taking into account data mapping
+        *  @param {object} oSettings dataTables settings object
+        *  @param {int} iRow aoData row id
+        *  @param {int} iCol Column index
+        *  @param {string} sSpecific data get type ('display', 'type' 'filter' 'sort')
+        *  @returns {*} Cell data
+        *  @memberof DataTable#oApi
+        */
+       function _fnGetCellData( oSettings, iRow, iCol, sSpecific )
+       {
+               var oCol = oSettings.aoColumns[iCol];
+               var oData = oSettings.aoData[iRow]._aData;
+               var sData = oCol.fnGetData( oData, sSpecific );
+       
+               if ( sData === undefined )
                {
-                       var out = [];
-                       for ( var i=0, iLen=aiColumns.length ; i<iLen ; i++ )
+                       if ( oSettings.iDrawError != oSettings.iDraw && oCol.sDefaultContent === null )
                        {
-                               out.push( _fnGetCellData( oSettings, iRow, aiColumns[i], sSpecific ) );
+                               _fnLog( oSettings, 0, "Requested unknown parameter "+
+                                       (typeof oCol.mData=='function' ? '{function}' : "'"+oCol.mData+"'")+
+                                       " for row "+iRow, 4 );
+                               oSettings.iDrawError = oSettings.iDraw;
                        }
-                       return out;
+                       return oCol.sDefaultContent;
                }
-               
-               
-               /**
-                * Get the data for a given cell from the internal cache, taking into account data mapping
-                *  @param {object} oSettings dataTables settings object
-                *  @param {int} iRow aoData row id
-                *  @param {int} iCol Column index
-                *  @param {string} sSpecific data get type ('display', 'type' 'filter' 'sort')
-                *  @returns {*} Cell data
-                *  @memberof DataTable#oApi
-                */
-               function _fnGetCellData( oSettings, iRow, iCol, sSpecific )
+       
+               /* When the data source is null, we can use default column data */
+               if ( (sData === oData || sData === null) && oCol.sDefaultContent !== null )
                {
-                       var sData;
-                       var oCol = oSettings.aoColumns[iCol];
-                       var oData = oSettings.aoData[iRow]._aData;
-               
-                       if ( (sData=oCol.fnGetData( oData, sSpecific )) === undefined )
-                       {
-                               if ( oSettings.iDrawError != oSettings.iDraw && oCol.sDefaultContent === null )
-                               {
-                                       _fnLog( oSettings, 0, "Requested unknown parameter "+
-                                               (typeof oCol.mData=='function' ? '{mData function}' : "'"+oCol.mData+"'")+
-                                               " from the data source for row "+iRow );
-                                       oSettings.iDrawError = oSettings.iDraw;
-                               }
-                               return oCol.sDefaultContent;
-                       }
-               
-                       /* When the data source is null, we can use default column data */
-                       if ( sData === null && oCol.sDefaultContent !== null )
-                       {
-                               sData = oCol.sDefaultContent;
-                       }
-                       else if ( typeof sData === 'function' )
-                       {
-                               /* If the data source is a function, then we run it and use the return */
-                               return sData();
-                       }
-               
-                       if ( sSpecific == 'display' && sData === null )
-                       {
-                               return '';
-                       }
-                       return sData;
+                       sData = oCol.sDefaultContent;
                }
-               
-               
-               /**
-                * Set the value for a specific cell, into the internal data cache
-                *  @param {object} oSettings dataTables settings object
-                *  @param {int} iRow aoData row id
-                *  @param {int} iCol Column index
-                *  @param {*} val Value to set
-                *  @memberof DataTable#oApi
-                */
-               function _fnSetCellData( oSettings, iRow, iCol, val )
+               else if ( typeof sData === 'function' )
                {
-                       var oCol = oSettings.aoColumns[iCol];
-                       var oData = oSettings.aoData[iRow]._aData;
-               
-                       oCol.fnSetData( oData, val );
+                       // If the data source is a function, then we run it and use the return
+                       return sData();
                }
-               
-               
-               // Private variable that is used to match array syntax in the data property object
-               var __reArray = /\[.*?\]$/;
-               
-               /**
-                * Return a function that can be used to get data from a source object, taking
-                * into account the ability to use nested objects as a source
-                *  @param {string|int|function} mSource The data source for the object
-                *  @returns {function} Data get function
-                *  @memberof DataTable#oApi
-                */
-               function _fnGetObjectDataFn( mSource )
+       
+               if ( sData === null && sSpecific == 'display' )
                {
-                       if ( mSource === null )
-                       {
-                               /* Give an empty string for rendering / sorting etc */
-                               return function (data, type) {
-                                       return null;
-                               };
-                       }
-                       else if ( typeof mSource === 'function' )
-                       {
-                               return function (data, type, extra) {
-                                       return mSource( data, type, extra );
-                               };
-                       }
-                       else if ( typeof mSource === 'string' && (mSource.indexOf('.') !== -1 || mSource.indexOf('[') !== -1) )
-                       {
-                               /* If there is a . in the source string then the data source is in a 
-                                * nested object so we loop over the data for each level to get the next
-                                * level down. On each loop we test for undefined, and if found immediately
-                                * return. This allows entire objects to be missing and sDefaultContent to
-                                * be used if defined, rather than throwing an error
-                                */
-                               var fetchData = function (data, type, src) {
-                                       var a = src.split('.');
-                                       var arrayNotation, out, innerSrc;
-               
-                                       if ( src !== "" )
-                                       {
-                                               for ( var i=0, iLen=a.length ; i<iLen ; i++ )
-                                               {
-                                                       // Check if we are dealing with an array notation request
-                                                       arrayNotation = a[i].match(__reArray);
-               
-                                                       if ( arrayNotation ) {
-                                                               a[i] = a[i].replace(__reArray, '');
-               
-                                                               // Condition allows simply [] to be passed in
-                                                               if ( a[i] !== "" ) {
-                                                                       data = data[ a[i] ];
-                                                               }
-                                                               out = [];
-                                                               
-                                                               // Get the remainder of the nested object to get
-                                                               a.splice( 0, i+1 );
-                                                               innerSrc = a.join('.');
-               
-                                                               // Traverse each entry in the array getting the properties requested
-                                                               for ( var j=0, jLen=data.length ; j<jLen ; j++ ) {
-                                                                       out.push( fetchData( data[j], type, innerSrc ) );
-                                                               }
-               
-                                                               // If a string is given in between the array notation indicators, that
-                                                               // is used to join the strings together, otherwise an array is returned
-                                                               var join = arrayNotation[0].substring(1, arrayNotation[0].length-1);
-                                                               data = (join==="") ? out : out.join(join);
-               
-                                                               // The inner call to fetchData has already traversed through the remainder
-                                                               // of the source requested, so we exit from the loop
-                                                               break;
-                                                       }
-               
-                                                       if ( data === null || data[ a[i] ] === undefined )
-                                                       {
-                                                               return undefined;
-                                                       }
-                                                       data = data[ a[i] ];
-                                               }
-                                       }
-               
-                                       return data;
-                               };
-               
-                               return function (data, type) {
-                                       return fetchData( data, type, mSource );
-                               };
-                       }
-                       else
-                       {
-                               /* Array or flat object mapping */
-                               return function (data, type) {
-                                       return data[mSource];   
-                               };
-                       }
+                       return '';
                }
-               
-               
-               /**
-                * Return a function that can be used to set data from a source object, taking
-                * into account the ability to use nested objects as a source
-                *  @param {string|int|function} mSource The data source for the object
-                *  @returns {function} Data set function
-                *  @memberof DataTable#oApi
-                */
-               function _fnSetObjectDataFn( mSource )
+               return sData;
+       }
+       
+       
+       /**
+        * Set the value for a specific cell, into the internal data cache
+        *  @param {object} oSettings dataTables settings object
+        *  @param {int} iRow aoData row id
+        *  @param {int} iCol Column index
+        *  @param {*} val Value to set
+        *  @memberof DataTable#oApi
+        */
+       function _fnSetCellData( oSettings, iRow, iCol, val )
+       {
+               var oCol = oSettings.aoColumns[iCol];
+               var oData = oSettings.aoData[iRow]._aData;
+       
+               oCol.fnSetData( oData, val );
+       }
+       
+       
+       // Private variable that is used to match action syntax in the data property object
+       var __reArray = /\[.*?\]$/;
+       var __reFn = /\(\)$/;
+       
+       /**
+        * Split string on periods, taking into account escaped periods
+        * @param  {string} str String to split
+        * @return {array} Split string
+        */
+       function _fnSplitObjNotation( str )
+       {
+               return $.map( str.match(/(\\.|[^\.])+/g), function ( s ) {
+                       return s.replace('\\.', '.');
+               } );
+       }
+       
+       
+       /**
+        * Return a function that can be used to get data from a source object, taking
+        * into account the ability to use nested objects as a source
+        *  @param {string|int|function} mSource The data source for the object
+        *  @returns {function} Data get function
+        *  @memberof DataTable#oApi
+        */
+       function _fnGetObjectDataFn( mSource )
+       {
+               if ( $.isPlainObject( mSource ) )
                {
-                       if ( mSource === null )
-                       {
-                               /* Nothing to do when the data source is null */
-                               return function (data, val) {};
-                       }
-                       else if ( typeof mSource === 'function' )
-                       {
-                               return function (data, val) {
-                                       mSource( data, 'set', val );
-                               };
-                       }
-                       else if ( typeof mSource === 'string' && (mSource.indexOf('.') !== -1 || mSource.indexOf('[') !== -1) )
-                       {
-                               /* Like the get, we need to get data from a nested object */
-                               var setData = function (data, val, src) {
-                                       var a = src.split('.'), b;
-                                       var arrayNotation, o, innerSrc;
-               
-                                       for ( var i=0, iLen=a.length-1 ; i<iLen ; i++ )
+                       /* Build an object of get functions, and wrap them in a single call */
+                       var o = {};
+                       $.each( mSource, function (key, val) {
+                               if ( val ) {
+                                       o[key] = _fnGetObjectDataFn( val );
+                               }
+                       } );
+       
+                       return function (data, type, extra) {
+                               var t = o[type] || o._;
+                               return t !== undefined ?
+                                       t(data, type, extra) :
+                                       data;
+                       };
+               }
+               else if ( mSource === null )
+               {
+                       /* Give an empty string for rendering / sorting etc */
+                       return function (data, type) {
+                               return data;
+                       };
+               }
+               else if ( typeof mSource === 'function' )
+               {
+                       return function (data, type, extra) {
+                               return mSource( data, type, extra );
+                       };
+               }
+               else if ( typeof mSource === 'string' && (mSource.indexOf('.') !== -1 ||
+                             mSource.indexOf('[') !== -1 || mSource.indexOf('(') !== -1) )
+               {
+                       /* If there is a . in the source string then the data source is in a
+                        * nested object so we loop over the data for each level to get the next
+                        * level down. On each loop we test for undefined, and if found immediately
+                        * return. This allows entire objects to be missing and sDefaultContent to
+                        * be used if defined, rather than throwing an error
+                        */
+                       var fetchData = function (data, type, src) {
+                               var arrayNotation, funcNotation, out, innerSrc;
+       
+                               if ( src !== "" )
+                               {
+                                       var a = _fnSplitObjNotation( src );
+       
+                                       for ( var i=0, iLen=a.length ; i<iLen ; i++ )
                                        {
-                                               // Check if we are dealing with an array notation request
+                                               // Check if we are dealing with special notation
                                                arrayNotation = a[i].match(__reArray);
-               
+                                               funcNotation = a[i].match(__reFn);
+       
                                                if ( arrayNotation )
                                                {
+                                                       // Array notation
                                                        a[i] = a[i].replace(__reArray, '');
-                                                       data[ a[i] ] = [];
-                                                       
-                                                       // Get the remainder of the nested object to set so we can recurse
-                                                       b = a.slice();
-                                                       b.splice( 0, i+1 );
-                                                       innerSrc = b.join('.');
-               
-                                                       // Traverse each entry in the array setting the properties requested
-                                                       for ( var j=0, jLen=val.length ; j<jLen ; j++ )
-                                                       {
-                                                               o = {};
-                                                               setData( o, val[j], innerSrc );
-                                                               data[ a[i] ].push( o );
+       
+                                                       // Condition allows simply [] to be passed in
+                                                       if ( a[i] !== "" ) {
+                                                               data = data[ a[i] ];
                                                        }
-               
-                                                       // The inner call to setData has already traversed through the remainder
-                                                       // of the source and has set the data, thus we can exit here
-                                                       return;
+                                                       out = [];
+       
+                                                       // Get the remainder of the nested object to get
+                                                       a.splice( 0, i+1 );
+                                                       innerSrc = a.join('.');
+       
+                                                       // Traverse each entry in the array getting the properties requested
+                                                       for ( var j=0, jLen=data.length ; j<jLen ; j++ ) {
+                                                               out.push( fetchData( data[j], type, innerSrc ) );
+                                                       }
+       
+                                                       // If a string is given in between the array notation indicators, that
+                                                       // is used to join the strings together, otherwise an array is returned
+                                                       var join = arrayNotation[0].substring(1, arrayNotation[0].length-1);
+                                                       data = (join==="") ? out : out.join(join);
+       
+                                                       // The inner call to fetchData has already traversed through the remainder
+                                                       // of the source requested, so we exit from the loop
+                                                       break;
                                                }
-               
-                                               // If the nested object doesn't currently exist - since we are
-                                               // trying to set the value - create it
-                                               if ( data[ a[i] ] === null || data[ a[i] ] === undefined )
+                                               else if ( funcNotation )
+                                               {
+                                                       // Function call
+                                                       a[i] = a[i].replace(__reFn, '');
+                                                       data = data[ a[i] ]();
+                                                       continue;
+                                               }
+       
+                                               if ( data === null || data[ a[i] ] === undefined )
                                                {
-                                                       data[ a[i] ] = {};
+                                                       return undefined;
                                                }
                                                data = data[ a[i] ];
                                        }
-               
-                                       // If array notation is used, we just want to strip it and use the property name
-                                       // and assign the value. If it isn't used, then we get the result we want anyway
-                                       data[ a[a.length-1].replace(__reArray, '') ] = val;
-                               };
-               
-                               return function (data, val) {
-                                       return setData( data, val, mSource );
-                               };
-                       }
-                       else
-                       {
-                               /* Array or flat object mapping */
-                               return function (data, val) {
-                                       data[mSource] = val;    
-                               };
-                       }
+                               }
+       
+                               return data;
+                       };
+       
+                       return function (data, type) {
+                               return fetchData( data, type, mSource );
+                       };
                }
-               
-               
-               /**
-                * Return an array with the full table data
-                *  @param {object} oSettings dataTables settings object
-                *  @returns array {array} aData Master data array
-                *  @memberof DataTable#oApi
-                */
-               function _fnGetDataMaster ( oSettings )
+               else
                {
-                       var aData = [];
-                       var iLen = oSettings.aoData.length;
-                       for ( var i=0 ; i<iLen; i++ )
-                       {
-                               aData.push( oSettings.aoData[i]._aData );
-                       }
-                       return aData;
+                       /* Array or flat object mapping */
+                       return function (data, type) {
+                               return data[mSource];
+                       };
                }
-               
-               
-               /**
-                * Nuke the table
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
-                */
-               function _fnClearTable( oSettings )
+       }
+       
+       
+       /**
+        * Return a function that can be used to set data from a source object, taking
+        * into account the ability to use nested objects as a source
+        *  @param {string|int|function} mSource The data source for the object
+        *  @returns {function} Data set function
+        *  @memberof DataTable#oApi
+        */
+       function _fnSetObjectDataFn( mSource )
+       {
+               if ( $.isPlainObject( mSource ) )
                {
-                       oSettings.aoData.splice( 0, oSettings.aoData.length );
-                       oSettings.aiDisplayMaster.splice( 0, oSettings.aiDisplayMaster.length );
-                       oSettings.aiDisplay.splice( 0, oSettings.aiDisplay.length );
-                       _fnCalculateEnd( oSettings );
+                       /* Unlike get, only the underscore (global) option is used for for
+                        * setting data since we don't know the type here. This is why an object
+                        * option is not documented for `mData` (which is read/write), but it is
+                        * for `mRender` which is read only.
+                        */
+                       return _fnSetObjectDataFn( mSource._ );
                }
-               
-               
-                /**
-                * Take an array of integers (index array) and remove a target integer (value - not 
-                * the key!)
-                *  @param {array} a Index array to target
-                *  @param {int} iTarget value to find
-                *  @memberof DataTable#oApi
-                */
-               function _fnDeleteIndex( a, iTarget )
+               else if ( mSource === null )
                {
-                       var iTargetIndex = -1;
-                       
-                       for ( var i=0, iLen=a.length ; i<iLen ; i++ )
-                       {
-                               if ( a[i] == iTarget )
-                               {
-                                       iTargetIndex = i;
-                               }
-                               else if ( a[i] > iTarget )
-                               {
-                                       a[i]--;
-                               }
-                       }
-                       
-                       if ( iTargetIndex != -1 )
-                       {
-                               a.splice( iTargetIndex, 1 );
-                       }
+                       /* Nothing to do when the data source is null */
+                       return function (data, val) {};
                }
-               
-               
-                /**
-                * Call the developer defined fnRender function for a given cell (row/column) with
-                * the required parameters and return the result.
-                *  @param {object} oSettings dataTables settings object
-                *  @param {int} iRow aoData index for the row
-                *  @param {int} iCol aoColumns index for the column
-                *  @returns {*} Return of the developer's fnRender function
-                *  @memberof DataTable#oApi
-                */
-               function _fnRender( oSettings, iRow, iCol )
+               else if ( typeof mSource === 'function' )
                {
-                       var oCol = oSettings.aoColumns[iCol];
-               
-                       return oCol.fnRender( {
-                               "iDataRow":    iRow,
-                               "iDataColumn": iCol,
-                               "oSettings":   oSettings,
-                               "aData":       oSettings.aoData[iRow]._aData,
-                               "mDataProp":   oCol.mData
-                       }, _fnGetCellData(oSettings, iRow, iCol, 'display') );
+                       return function (data, val) {
+                               mSource( data, 'set', val );
+                       };
                }
-               /**
-                * Create a new TR element (and it's TD children) for a row
-                *  @param {object} oSettings dataTables settings object
-                *  @param {int} iRow Row to consider
-                *  @memberof DataTable#oApi
-                */
-               function _fnCreateTr ( oSettings, iRow )
+               else if ( typeof mSource === 'string' && (mSource.indexOf('.') !== -1 ||
+                             mSource.indexOf('[') !== -1 || mSource.indexOf('(') !== -1) )
                {
-                       var oData = oSettings.aoData[iRow];
-                       var nTd;
-               
-                       if ( oData.nTr === null )
-                       {
-                               oData.nTr = document.createElement('tr');
-               
-                               /* Use a private property on the node to allow reserve mapping from the node
-                                * to the aoData array for fast look up
-                                */
-                               oData.nTr._DT_RowIndex = iRow;
-               
-                               /* Special parameters can be given by the data source to be used on the row */
-                               if ( oData._aData.DT_RowId )
-                               {
-                                       oData.nTr.id = oData._aData.DT_RowId;
-                               }
-               
-                               if ( oData._aData.DT_RowClass )
-                               {
-                                       oData.nTr.className = oData._aData.DT_RowClass;
-                               }
-               
-                               /* Process each column */
-                               for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+                       /* Like the get, we need to get data from a nested object */
+                       var setData = function (data, val, src) {
+                               var a = _fnSplitObjNotation( src ), b;
+                               var aLast = a[a.length-1];
+                               var arrayNotation, funcNotation, o, innerSrc;
+       
+                               for ( var i=0, iLen=a.length-1 ; i<iLen ; i++ )
                                {
-                                       var oCol = oSettings.aoColumns[i];
-                                       nTd = document.createElement( oCol.sCellType );
-               
-                                       /* Render if needed - if bUseRendered is true then we already have the rendered
-                                        * value in the data source - so can just use that
-                                        */
-                                       nTd.innerHTML = (typeof oCol.fnRender === 'function' && (!oCol.bUseRendered || oCol.mData === null)) ?
-                                               _fnRender( oSettings, iRow, i ) :
-                                               _fnGetCellData( oSettings, iRow, i, 'display' );
-                               
-                                       /* Add user defined class */
-                                       if ( oCol.sClass !== null )
-                                       {
-                                               nTd.className = oCol.sClass;
-                                       }
-                                       
-                                       if ( oCol.bVisible )
+                                       // Check if we are dealing with an array notation request
+                                       arrayNotation = a[i].match(__reArray);
+                                       funcNotation = a[i].match(__reFn);
+       
+                                       if ( arrayNotation )
                                        {
-                                               oData.nTr.appendChild( nTd );
-                                               oData._anHidden[i] = null;
+                                               a[i] = a[i].replace(__reArray, '');
+                                               data[ a[i] ] = [];
+       
+                                               // Get the remainder of the nested object to set so we can recurse
+                                               b = a.slice();
+                                               b.splice( 0, i+1 );
+                                               innerSrc = b.join('.');
+       
+                                               // Traverse each entry in the array setting the properties requested
+                                               for ( var j=0, jLen=val.length ; j<jLen ; j++ )
+                                               {
+                                                       o = {};
+                                                       setData( o, val[j], innerSrc );
+                                                       data[ a[i] ].push( o );
+                                               }
+       
+                                               // The inner call to setData has already traversed through the remainder
+                                               // of the source and has set the data, thus we can exit here
+                                               return;
                                        }
-                                       else
+                                       else if ( funcNotation )
                                        {
-                                               oData._anHidden[i] = nTd;
+                                               // Function call
+                                               a[i] = a[i].replace(__reFn, '');
+                                               data = data[ a[i] ]( val );
                                        }
-               
-                                       if ( oCol.fnCreatedCell )
+       
+                                       // If the nested object doesn't currently exist - since we are
+                                       // trying to set the value - create it
+                                       if ( data[ a[i] ] === null || data[ a[i] ] === undefined )
                                        {
-                                               oCol.fnCreatedCell.call( oSettings.oInstance,
-                                                       nTd, _fnGetCellData( oSettings, iRow, i, 'display' ), oData._aData, iRow, i
-                                               );
+                                               data[ a[i] ] = {};
                                        }
+                                       data = data[ a[i] ];
                                }
-               
-                               _fnCallbackFire( oSettings, 'aoRowCreatedCallback', null, [oData.nTr, oData._aData, iRow] );
-                       }
-               }
-               
-               
-               /**
-                * Create the HTML header for the table
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
-                */
-               function _fnBuildHead( oSettings )
-               {
-                       var i, nTh, iLen, j, jLen;
-                       var iThs = $('th, td', oSettings.nTHead).length;
-                       var iCorrector = 0;
-                       var jqChildren;
-                       
-                       /* If there is a header in place - then use it - otherwise it's going to get nuked... */
-                       if ( iThs !== 0 )
-                       {
-                               /* We've got a thead from the DOM, so remove hidden columns and apply width to vis cols */
-                               for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+       
+                               // Last item in the input - i.e, the actual set
+                               if ( aLast.match(__reFn ) )
                                {
-                                       nTh = oSettings.aoColumns[i].nTh;
-                                       nTh.setAttribute('role', 'columnheader');
-                                       if ( oSettings.aoColumns[i].bSortable )
-                                       {
-                                               nTh.setAttribute('tabindex', oSettings.iTabIndex);
-                                               nTh.setAttribute('aria-controls', oSettings.sTableId);
-                                       }
-               
-                                       if ( oSettings.aoColumns[i].sClass !== null )
-                                       {
-                                               $(nTh).addClass( oSettings.aoColumns[i].sClass );
-                                       }
-                                       
-                                       /* Set the title of the column if it is user defined (not what was auto detected) */
-                                       if ( oSettings.aoColumns[i].sTitle != nTh.innerHTML )
-                                       {
-                                               nTh.innerHTML = oSettings.aoColumns[i].sTitle;
-                                       }
+                                       // Function call
+                                       data = data[ aLast.replace(__reFn, '') ]( val );
                                }
-                       }
-                       else
-                       {
-                               /* We don't have a header in the DOM - so we are going to have to create one */
-                               var nTr = document.createElement( "tr" );
-                               
-                               for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+                               else
                                {
-                                       nTh = oSettings.aoColumns[i].nTh;
-                                       nTh.innerHTML = oSettings.aoColumns[i].sTitle;
-                                       nTh.setAttribute('tabindex', '0');
-                                       
-                                       if ( oSettings.aoColumns[i].sClass !== null )
-                                       {
-                                               $(nTh).addClass( oSettings.aoColumns[i].sClass );
-                                       }
-                                       
-                                       nTr.appendChild( nTh );
+                                       // If array notation is used, we just want to strip it and use the property name
+                                       // and assign the value. If it isn't used, then we get the result we want anyway
+                                       data[ aLast.replace(__reArray, '') ] = val;
                                }
-                               $(oSettings.nTHead).html( '' )[0].appendChild( nTr );
-                               _fnDetectHeader( oSettings.aoHeader, oSettings.nTHead );
+                       };
+       
+                       return function (data, val) {
+                               return setData( data, val, mSource );
+                       };
+               }
+               else
+               {
+                       /* Array or flat object mapping */
+                       return function (data, val) {
+                               data[mSource] = val;
+                       };
+               }
+       }
+       
+       
+       /**
+        * Return an array with the full table data
+        *  @param {object} oSettings dataTables settings object
+        *  @returns array {array} aData Master data array
+        *  @memberof DataTable#oApi
+        */
+       function _fnGetDataMaster ( settings )
+       {
+               return _pluck( settings.aoData, '_aData' );
+       }
+       
+       
+       /**
+        * Nuke the table
+        *  @param {object} oSettings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnClearTable( settings )
+       {
+               settings.aoData.length = 0;
+               settings.aiDisplayMaster.length = 0;
+               settings.aiDisplay.length = 0;
+       }
+       
+       
+        /**
+        * Take an array of integers (index array) and remove a target integer (value - not
+        * the key!)
+        *  @param {array} a Index array to target
+        *  @param {int} iTarget value to find
+        *  @memberof DataTable#oApi
+        */
+       function _fnDeleteIndex( a, iTarget, splice )
+       {
+               var iTargetIndex = -1;
+       
+               for ( var i=0, iLen=a.length ; i<iLen ; i++ )
+               {
+                       if ( a[i] == iTarget )
+                       {
+                               iTargetIndex = i;
                        }
-                       
-                       /* ARIA role for the rows */    
-                       $(oSettings.nTHead).children('tr').attr('role', 'row');
-                       
-                       /* Add the extra markup needed by jQuery UI's themes */
-                       if ( oSettings.bJUI )
+                       else if ( a[i] > iTarget )
                        {
-                               for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-                               {
-                                       nTh = oSettings.aoColumns[i].nTh;
-                                       
-                                       var nDiv = document.createElement('div');
-                                       nDiv.className = oSettings.oClasses.sSortJUIWrapper;
-                                       $(nTh).contents().appendTo(nDiv);
-                                       
-                                       var nSpan = document.createElement('span');
-                                       nSpan.className = oSettings.oClasses.sSortIcon;
-                                       nDiv.appendChild( nSpan );
-                                       nTh.appendChild( nDiv );
+                               a[i]--;
+                       }
+               }
+       
+               if ( iTargetIndex != -1 && splice === undefined )
+               {
+                       a.splice( iTargetIndex, 1 );
+               }
+       }
+       
+       
+       /**
+        * Mark cached data as invalid such that a re-read of the data will occur when
+        * the cached data is next requested. Also update from the data source object.
+        *
+        * @param {object} settings DataTables settings object
+        * @param  {int}    rowIdx   Row index to invalidate
+        * @memberof DataTable#oApi
+        *
+        * @todo For the modularisation of v1.11 this will need to become a callback, so
+        *   the sort and filter methods can subscribe to it. That will required
+        *   initialisation options for sorting, which is why it is not already baked in
+        */
+       function _fnInvalidateRow( settings, rowIdx, src, column )
+       {
+               var row = settings.aoData[ rowIdx ];
+               var i, ien;
+       
+               // Are we reading last data from DOM or the data object?
+               if ( src === 'dom' || ((! src || src === 'auto') && row.src === 'dom') ) {
+                       // Read the data from the DOM
+                       row._aData = _fnGetRowElements( settings, row ).data;
+               }
+               else {
+                       // Reading from data object, update the DOM
+                       var cells = row.anCells;
+       
+                       if ( cells ) {
+                               for ( i=0, ien=cells.length ; i<ien ; i++ ) {
+                                       cells[i].innerHTML = _fnGetCellData( settings, rowIdx, i, 'display' );
                                }
                        }
-                       
-                       if ( oSettings.oFeatures.bSort )
-                       {
-                               for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
-                               {
-                                       if ( oSettings.aoColumns[i].bSortable !== false )
-                                       {
-                                               _fnSortAttachListener( oSettings, oSettings.aoColumns[i].nTh, i );
-                                       }
-                                       else
-                                       {
-                                               $(oSettings.aoColumns[i].nTh).addClass( oSettings.oClasses.sSortableNone );
-                                       }
+               }
+       
+               row._aSortData = null;
+               row._aFilterData = null;
+       
+               // Invalidate the type for a specific column (if given) or all columns since
+               // the data might have changed
+               var cols = settings.aoColumns;
+               if ( column !== undefined ) {
+                       cols[ column ].sType = null;
+               }
+               else {
+                       for ( i=0, ien=cols.length ; i<ien ; i++ ) {
+                               cols[i].sType = null;
+                       }
+               }
+       
+               // Update DataTables special `DT_*` attributes for the row
+               _fnRowAttributes( row );
+       }
+       
+       
+       /**
+        * Build a data source object from an HTML row, reading the contents of the
+        * cells that are in the row.
+        *
+        * @param {object} settings DataTables settings object
+        * @param {node|object} TR element from which to read data or existing row
+        *   object from which to re-read the data from the cells
+        * @returns {object} Object with two parameters: `data` the data read, in
+        *   document order, and `cells` and array of nodes (they can be useful to the
+        *   caller, so rather than needing a second traversal to get them, just return
+        *   them from here).
+        * @memberof DataTable#oApi
+        */
+       function _fnGetRowElements( settings, row )
+       {
+               var
+                       d = [],
+                       tds = [],
+                       td = row.firstChild,
+                       name, col, o, i=0, contents,
+                       columns = settings.aoColumns;
+       
+               var attr = function ( str, data, td  ) {
+                       if ( typeof str === 'string' ) {
+                               var idx = str.indexOf('@');
+       
+                               if ( idx !== -1 ) {
+                                       var src = str.substring( idx+1 );
+                                       o[ '@'+src ] = td.getAttribute( src );
                                }
                        }
-                       
-                       /* Deal with the footer - add classes if required */
-                       if ( oSettings.oClasses.sFooterTH !== "" )
-                       {
-                               $(oSettings.nTFoot).children('tr').children('th').addClass( oSettings.oClasses.sFooterTH );
+               };
+       
+               var cellProcess = function ( cell ) {
+                       col = columns[i];
+                       contents = $.trim(cell.innerHTML);
+       
+                       if ( col && col._bAttrSrc ) {
+                               o = {
+                                       display: contents
+                               };
+       
+                               attr( col.mData.sort, o, cell );
+                               attr( col.mData.type, o, cell );
+                               attr( col.mData.filter, o, cell );
+       
+                               d.push( o );
                        }
-                       
-                       /* Cache the footer elements */
-                       if ( oSettings.nTFoot !== null )
-                       {
-                               var anCells = _fnGetUniqueThs( oSettings, null, oSettings.aoFooter );
-                               for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-                               {
-                                       if ( anCells[i] )
-                                       {
-                                               oSettings.aoColumns[i].nTf = anCells[i];
-                                               if ( oSettings.aoColumns[i].sClass )
-                                               {
-                                                       $(anCells[i]).addClass( oSettings.aoColumns[i].sClass );
-                                               }
-                                       }
+                       else {
+                               d.push( contents );
+                       }
+       
+                       tds.push( cell );
+                       i++;
+               };
+       
+               if ( td ) {
+                       // `tr` element passed in
+                       while ( td ) {
+                               name = td.nodeName.toUpperCase();
+       
+                               if ( name == "TD" || name == "TH" ) {
+                                       cellProcess( td );
                                }
+       
+                               td = td.nextSibling;
                        }
                }
-               
-               
-               /**
-                * Draw the header (or footer) element based on the column visibility states. The
-                * methodology here is to use the layout array from _fnDetectHeader, modified for
-                * the instantaneous column visibility, to construct the new layout. The grid is
-                * traversed over cell at a time in a rows x columns grid fashion, although each 
-                * cell insert can cover multiple elements in the grid - which is tracks using the
-                * aApplied array. Cell inserts in the grid will only occur where there isn't
-                * already a cell in that position.
-                *  @param {object} oSettings dataTables settings object
-                *  @param array {objects} aoSource Layout array from _fnDetectHeader
-                *  @param {boolean} [bIncludeHidden=false] If true then include the hidden columns in the calc, 
-                *  @memberof DataTable#oApi
-                */
-               function _fnDrawHead( oSettings, aoSource, bIncludeHidden )
-               {
-                       var i, iLen, j, jLen, k, kLen, n, nLocalTr;
-                       var aoLocal = [];
-                       var aApplied = [];
-                       var iColumns = oSettings.aoColumns.length;
-                       var iRowspan, iColspan;
-               
-                       if (  bIncludeHidden === undefined )
-                       {
-                               bIncludeHidden = false;
+               else {
+                       // Existing row object passed in
+                       tds = row.anCells;
+                       
+                       for ( var j=0, jen=tds.length ; j<jen ; j++ ) {
+                               cellProcess( tds[j] );
                        }
-               
-                       /* Make a copy of the master layout array, but without the visible columns in it */
-                       for ( i=0, iLen=aoSource.length ; i<iLen ; i++ )
+               }
+       
+               return {
+                       data: d,
+                       cells: tds
+               };
+       }
+       /**
+        * Create a new TR element (and it's TD children) for a row
+        *  @param {object} oSettings dataTables settings object
+        *  @param {int} iRow Row to consider
+        *  @param {node} [nTrIn] TR element to add to the table - optional. If not given,
+        *    DataTables will create a row automatically
+        *  @param {array} [anTds] Array of TD|TH elements for the row - must be given
+        *    if nTr is.
+        *  @memberof DataTable#oApi
+        */
+       function _fnCreateTr ( oSettings, iRow, nTrIn, anTds )
+       {
+               var
+                       row = oSettings.aoData[iRow],
+                       rowData = row._aData,
+                       cells = [],
+                       nTr, nTd, oCol,
+                       i, iLen;
+       
+               if ( row.nTr === null )
+               {
+                       nTr = nTrIn || document.createElement('tr');
+       
+                       row.nTr = nTr;
+                       row.anCells = cells;
+       
+                       /* Use a private property on the node to allow reserve mapping from the node
+                        * to the aoData array for fast look up
+                        */
+                       nTr._DT_RowIndex = iRow;
+       
+                       /* Special parameters can be given by the data source to be used on the row */
+                       _fnRowAttributes( row );
+       
+                       /* Process each column */
+                       for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
                        {
-                               aoLocal[i] = aoSource[i].slice();
-                               aoLocal[i].nTr = aoSource[i].nTr;
-               
-                               /* Remove any columns which are currently hidden */
-                               for ( j=iColumns-1 ; j>=0 ; j-- )
+                               oCol = oSettings.aoColumns[i];
+       
+                               nTd = nTrIn ? anTds[i] : document.createElement( oCol.sCellType );
+                               cells.push( nTd );
+       
+                               // Need to create the HTML if new, or if a rendering function is defined
+                               if ( !nTrIn || oCol.mRender || oCol.mData !== i )
                                {
-                                       if ( !oSettings.aoColumns[j].bVisible && !bIncludeHidden )
-                                       {
-                                               aoLocal[i].splice( j, 1 );
-                                       }
+                                       nTd.innerHTML = _fnGetCellData( oSettings, iRow, i, 'display' );
                                }
-               
-                               /* Prep the applied array - it needs an element for each row */
-                               aApplied.push( [] );
-                       }
-               
-                       for ( i=0, iLen=aoLocal.length ; i<iLen ; i++ )
-                       {
-                               nLocalTr = aoLocal[i].nTr;
-                               
-                               /* All cells are going to be replaced, so empty out the row */
-                               if ( nLocalTr )
+       
+                               /* Add user defined class */
+                               if ( oCol.sClass )
                                {
-                                       while( (n = nLocalTr.firstChild) )
-                                       {
-                                               nLocalTr.removeChild( n );
-                                       }
+                                       nTd.className += ' '+oCol.sClass;
                                }
-               
-                               for ( j=0, jLen=aoLocal[i].length ; j<jLen ; j++ )
+       
+                               // Visibility - add or remove as required
+                               if ( oCol.bVisible && ! nTrIn )
                                {
-                                       iRowspan = 1;
-                                       iColspan = 1;
-               
-                                       /* Check to see if there is already a cell (row/colspan) covering our target
-                                        * insert point. If there is, then there is nothing to do.
-                                        */
-                                       if ( aApplied[i][j] === undefined )
-                                       {
-                                               nLocalTr.appendChild( aoLocal[i][j].cell );
-                                               aApplied[i][j] = 1;
-               
-                                               /* Expand the cell to cover as many rows as needed */
-                                               while ( aoLocal[i+iRowspan] !== undefined &&
-                                                       aoLocal[i][j].cell == aoLocal[i+iRowspan][j].cell )
-                                               {
-                                                       aApplied[i+iRowspan][j] = 1;
-                                                       iRowspan++;
-                                               }
-               
-                                               /* Expand the cell to cover as many columns as needed */
-                                               while ( aoLocal[i][j+iColspan] !== undefined &&
-                                                       aoLocal[i][j].cell == aoLocal[i][j+iColspan].cell )
-                                               {
-                                                       /* Must update the applied array over the rows for the columns */
-                                                       for ( k=0 ; k<iRowspan ; k++ )
-                                                       {
-                                                               aApplied[i+k][j+iColspan] = 1;
-                                                       }
-                                                       iColspan++;
-                                               }
-               
-                                               /* Do the actual expansion in the DOM */
-                                               aoLocal[i][j].cell.rowSpan = iRowspan;
-                                               aoLocal[i][j].cell.colSpan = iColspan;
-                                       }
+                                       nTr.appendChild( nTd );
                                }
-                       }
-               }
-               
-               
-               /**
-                * Insert the required TR nodes into the table for display
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
-                */
-               function _fnDraw( oSettings )
-               {
-                       /* Provide a pre-callback function which can be used to cancel the draw is false is returned */
-                       var aPreDraw = _fnCallbackFire( oSettings, 'aoPreDrawCallback', 'preDraw', [oSettings] );
-                       if ( $.inArray( false, aPreDraw ) !== -1 )
-                       {
-                               _fnProcessingDisplay( oSettings, false );
-                               return;
-                       }
-                       
-                       var i, iLen, n;
-                       var anRows = [];
-                       var iRowCount = 0;
-                       var iStripes = oSettings.asStripeClasses.length;
-                       var iOpenRows = oSettings.aoOpenRows.length;
-                       
-                       oSettings.bDrawing = true;
-                       
-                       /* Check and see if we have an initial draw position from state saving */
-                       if ( oSettings.iInitDisplayStart !== undefined && oSettings.iInitDisplayStart != -1 )
-                       {
-                               if ( oSettings.oFeatures.bServerSide )
+                               else if ( ! oCol.bVisible && nTrIn )
                                {
-                                       oSettings._iDisplayStart = oSettings.iInitDisplayStart;
+                                       nTd.parentNode.removeChild( nTd );
                                }
-                               else
+       
+                               if ( oCol.fnCreatedCell )
                                {
-                                       oSettings._iDisplayStart = (oSettings.iInitDisplayStart >= oSettings.fnRecordsDisplay()) ?
-                                               0 : oSettings.iInitDisplayStart;
+                                       oCol.fnCreatedCell.call( oSettings.oInstance,
+                                               nTd, _fnGetCellData( oSettings, iRow, i, 'display' ), rowData, iRow, i
+                                       );
                                }
-                               oSettings.iInitDisplayStart = -1;
-                               _fnCalculateEnd( oSettings );
                        }
-                       
-                       /* Server-side processing draw intercept */
-                       if ( oSettings.bDeferLoading )
-                       {
-                               oSettings.bDeferLoading = false;
-                               oSettings.iDraw++;
+       
+                       _fnCallbackFire( oSettings, 'aoRowCreatedCallback', null, [nTr, rowData, iRow] );
+               }
+       
+               // Remove once webkit bug 131819 and Chromium bug 365619 have been resolved
+               // and deployed
+               row.nTr.setAttribute( 'role', 'row' );
+       }
+       
+       
+       /**
+        * Add attributes to a row based on the special `DT_*` parameters in a data
+        * source object.
+        *  @param {object} DataTables row object for the row to be modified
+        *  @memberof DataTable#oApi
+        */
+       function _fnRowAttributes( row )
+       {
+               var tr = row.nTr;
+               var data = row._aData;
+       
+               if ( tr ) {
+                       if ( data.DT_RowId ) {
+                               tr.id = data.DT_RowId;
                        }
-                       else if ( !oSettings.oFeatures.bServerSide )
-                       {
-                               oSettings.iDraw++;
+       
+                       if ( data.DT_RowClass ) {
+                               // Remove any classes added by DT_RowClass before
+                               var a = data.DT_RowClass.split(' ');
+                               row.__rowc = row.__rowc ?
+                                       _unique( row.__rowc.concat( a ) ) :
+                                       a;
+       
+                               $(tr)
+                                       .removeClass( row.__rowc.join(' ') )
+                                       .addClass( data.DT_RowClass );
+                       }
+       
+                       if ( data.DT_RowData ) {
+                               $(tr).data( data.DT_RowData );
                        }
-                       else if ( !oSettings.bDestroying && !_fnAjaxUpdate( oSettings ) )
+               }
+       }
+       
+       
+       /**
+        * Create the HTML header for the table
+        *  @param {object} oSettings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnBuildHead( oSettings )
+       {
+               var i, ien, cell, row, column;
+               var thead = oSettings.nTHead;
+               var tfoot = oSettings.nTFoot;
+               var createHeader = $('th, td', thead).length === 0;
+               var classes = oSettings.oClasses;
+               var columns = oSettings.aoColumns;
+       
+               if ( createHeader ) {
+                       row = $('<tr/>').appendTo( thead );
+               }
+       
+               for ( i=0, ien=columns.length ; i<ien ; i++ ) {
+                       column = columns[i];
+                       cell = $( column.nTh ).addClass( column.sClass );
+       
+                       if ( createHeader ) {
+                               cell.appendTo( row );
+                       }
+       
+                       // 1.11 move into sorting
+                       if ( oSettings.oFeatures.bSort ) {
+                               cell.addClass( column.sSortingClass );
+       
+                               if ( column.bSortable !== false ) {
+                                       cell
+                                               .attr( 'tabindex', oSettings.iTabIndex )
+                                               .attr( 'aria-controls', oSettings.sTableId );
+       
+                                       _fnSortAttachListener( oSettings, column.nTh, i );
+                               }
+                       }
+       
+                       if ( column.sTitle != cell.html() ) {
+                               cell.html( column.sTitle );
+                       }
+       
+                       _fnRenderer( oSettings, 'header' )(
+                               oSettings, cell, column, classes
+                       );
+               }
+       
+               if ( createHeader ) {
+                       _fnDetectHeader( oSettings.aoHeader, thead );
+               }
+               
+               /* ARIA role for the rows */
+               $(thead).find('>tr').attr('role', 'row');
+       
+               /* Deal with the footer - add classes if required */
+               $(thead).find('>tr>th, >tr>td').addClass( classes.sHeaderTH );
+               $(tfoot).find('>tr>th, >tr>td').addClass( classes.sFooterTH );
+       
+               // Cache the footer cells. Note that we only take the cells from the first
+               // row in the footer. If there is more than one row the user wants to
+               // interact with, they need to use the table().foot() method. Note also this
+               // allows cells to be used for multiple columns using colspan
+               if ( tfoot !== null ) {
+                       var cells = oSettings.aoFooter[0];
+       
+                       for ( i=0, ien=cells.length ; i<ien ; i++ ) {
+                               column = columns[i];
+                               column.nTf = cells[i].cell;
+       
+                               if ( column.sClass ) {
+                                       $(column.nTf).addClass( column.sClass );
+                               }
+                       }
+               }
+       }
+       
+       
+       /**
+        * Draw the header (or footer) element based on the column visibility states. The
+        * methodology here is to use the layout array from _fnDetectHeader, modified for
+        * the instantaneous column visibility, to construct the new layout. The grid is
+        * traversed over cell at a time in a rows x columns grid fashion, although each
+        * cell insert can cover multiple elements in the grid - which is tracks using the
+        * aApplied array. Cell inserts in the grid will only occur where there isn't
+        * already a cell in that position.
+        *  @param {object} oSettings dataTables settings object
+        *  @param array {objects} aoSource Layout array from _fnDetectHeader
+        *  @param {boolean} [bIncludeHidden=false] If true then include the hidden columns in the calc,
+        *  @memberof DataTable#oApi
+        */
+       function _fnDrawHead( oSettings, aoSource, bIncludeHidden )
+       {
+               var i, iLen, j, jLen, k, kLen, n, nLocalTr;
+               var aoLocal = [];
+               var aApplied = [];
+               var iColumns = oSettings.aoColumns.length;
+               var iRowspan, iColspan;
+       
+               if ( ! aoSource )
+               {
+                       return;
+               }
+       
+               if (  bIncludeHidden === undefined )
+               {
+                       bIncludeHidden = false;
+               }
+       
+               /* Make a copy of the master layout array, but without the visible columns in it */
+               for ( i=0, iLen=aoSource.length ; i<iLen ; i++ )
+               {
+                       aoLocal[i] = aoSource[i].slice();
+                       aoLocal[i].nTr = aoSource[i].nTr;
+       
+                       /* Remove any columns which are currently hidden */
+                       for ( j=iColumns-1 ; j>=0 ; j-- )
                        {
-                               return;
+                               if ( !oSettings.aoColumns[j].bVisible && !bIncludeHidden )
+                               {
+                                       aoLocal[i].splice( j, 1 );
+                               }
                        }
-                       
-                       if ( oSettings.aiDisplay.length !== 0 )
+       
+                       /* Prep the applied array - it needs an element for each row */
+                       aApplied.push( [] );
+               }
+       
+               for ( i=0, iLen=aoLocal.length ; i<iLen ; i++ )
+               {
+                       nLocalTr = aoLocal[i].nTr;
+       
+                       /* All cells are going to be replaced, so empty out the row */
+                       if ( nLocalTr )
                        {
-                               var iStart = oSettings._iDisplayStart;
-                               var iEnd = oSettings._iDisplayEnd;
-                               
-                               if ( oSettings.oFeatures.bServerSide )
+                               while( (n = nLocalTr.firstChild) )
                                {
-                                       iStart = 0;
-                                       iEnd = oSettings.aoData.length;
+                                       nLocalTr.removeChild( n );
                                }
-                               
-                               for ( var j=iStart ; j<iEnd ; j++ )
+                       }
+       
+                       for ( j=0, jLen=aoLocal[i].length ; j<jLen ; j++ )
+                       {
+                               iRowspan = 1;
+                               iColspan = 1;
+       
+                               /* Check to see if there is already a cell (row/colspan) covering our target
+                                * insert point. If there is, then there is nothing to do.
+                                */
+                               if ( aApplied[i][j] === undefined )
                                {
-                                       var aoData = oSettings.aoData[ oSettings.aiDisplay[j] ];
-                                       if ( aoData.nTr === null )
+                                       nLocalTr.appendChild( aoLocal[i][j].cell );
+                                       aApplied[i][j] = 1;
+       
+                                       /* Expand the cell to cover as many rows as needed */
+                                       while ( aoLocal[i+iRowspan] !== undefined &&
+                                               aoLocal[i][j].cell == aoLocal[i+iRowspan][j].cell )
                                        {
-                                               _fnCreateTr( oSettings, oSettings.aiDisplay[j] );
+                                               aApplied[i+iRowspan][j] = 1;
+                                               iRowspan++;
                                        }
-               
-                                       var nRow = aoData.nTr;
-                                       
-                                       /* Remove the old striping classes and then add the new one */
-                                       if ( iStripes !== 0 )
+       
+                                       /* Expand the cell to cover as many columns as needed */
+                                       while ( aoLocal[i][j+iColspan] !== undefined &&
+                                               aoLocal[i][j].cell == aoLocal[i][j+iColspan].cell )
                                        {
-                                               var sStripe = oSettings.asStripeClasses[ iRowCount % iStripes ];
-                                               if ( aoData._sRowStripe != sStripe )
+                                               /* Must update the applied array over the rows for the columns */
+                                               for ( k=0 ; k<iRowspan ; k++ )
                                                {
-                                                       $(nRow).removeClass( aoData._sRowStripe ).addClass( sStripe );
-                                                       aoData._sRowStripe = sStripe;
-                                               }
-                                       }
-                                       
-                                       /* Row callback functions - might want to manipulate the row */
-                                       _fnCallbackFire( oSettings, 'aoRowCallback', null, 
-                                               [nRow, oSettings.aoData[ oSettings.aiDisplay[j] ]._aData, iRowCount, j] );
-                                       
-                                       anRows.push( nRow );
-                                       iRowCount++;
-                                       
-                                       /* If there is an open row - and it is attached to this parent - attach it on redraw */
-                                       if ( iOpenRows !== 0 )
-                                       {
-                                               for ( var k=0 ; k<iOpenRows ; k++ )
-                                               {
-                                                       if ( nRow == oSettings.aoOpenRows[k].nParent )
-                                                       {
-                                                               anRows.push( oSettings.aoOpenRows[k].nTr );
-                                                               break;
-                                                       }
+                                                       aApplied[i+k][j+iColspan] = 1;
                                                }
+                                               iColspan++;
                                        }
+       
+                                       /* Do the actual expansion in the DOM */
+                                       $(aoLocal[i][j].cell)
+                                               .attr('rowspan', iRowspan)
+                                               .attr('colspan', iColspan);
                                }
                        }
-                       else
+               }
+       }
+       
+       
+       /**
+        * Insert the required TR nodes into the table for display
+        *  @param {object} oSettings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnDraw( oSettings )
+       {
+               /* Provide a pre-callback function which can be used to cancel the draw is false is returned */
+               var aPreDraw = _fnCallbackFire( oSettings, 'aoPreDrawCallback', 'preDraw', [oSettings] );
+               if ( $.inArray( false, aPreDraw ) !== -1 )
+               {
+                       _fnProcessingDisplay( oSettings, false );
+                       return;
+               }
+       
+               var i, iLen, n;
+               var anRows = [];
+               var iRowCount = 0;
+               var asStripeClasses = oSettings.asStripeClasses;
+               var iStripes = asStripeClasses.length;
+               var iOpenRows = oSettings.aoOpenRows.length;
+               var oLang = oSettings.oLanguage;
+               var iInitDisplayStart = oSettings.iInitDisplayStart;
+               var bServerSide = _fnDataSource( oSettings ) == 'ssp';
+               var aiDisplay = oSettings.aiDisplay;
+       
+               oSettings.bDrawing = true;
+       
+               /* Check and see if we have an initial draw position from state saving */
+               if ( iInitDisplayStart !== undefined && iInitDisplayStart !== -1 )
+               {
+                       oSettings._iDisplayStart = bServerSide ?
+                               iInitDisplayStart :
+                               iInitDisplayStart >= oSettings.fnRecordsDisplay() ?
+                                       0 :
+                                       iInitDisplayStart;
+       
+                       oSettings.iInitDisplayStart = -1;
+               }
+       
+               var iDisplayStart = oSettings._iDisplayStart;
+               var iDisplayEnd = oSettings.fnDisplayEnd();
+       
+               /* Server-side processing draw intercept */
+               if ( oSettings.bDeferLoading )
+               {
+                       oSettings.bDeferLoading = false;
+                       oSettings.iDraw++;
+                       _fnProcessingDisplay( oSettings, false );
+               }
+               else if ( !bServerSide )
+               {
+                       oSettings.iDraw++;
+               }
+               else if ( !oSettings.bDestroying && !_fnAjaxUpdate( oSettings ) )
+               {
+                       return;
+               }
+       
+               if ( aiDisplay.length !== 0 )
+               {
+                       var iStart = bServerSide ? 0 : iDisplayStart;
+                       var iEnd = bServerSide ? oSettings.aoData.length : iDisplayEnd;
+       
+                       for ( var j=iStart ; j<iEnd ; j++ )
                        {
-                               /* Table is empty - create a row with an empty message in it */
-                               anRows[ 0 ] = document.createElement( 'tr' );
-                               
-                               if ( oSettings.asStripeClasses[0] )
-                               {
-                                       anRows[ 0 ].className = oSettings.asStripeClasses[0];
-                               }
-               
-                               var oLang = oSettings.oLanguage;
-                               var sZero = oLang.sZeroRecords;
-                               if ( oSettings.iDraw == 1 && oSettings.sAjaxSource !== null && !oSettings.oFeatures.bServerSide )
-                               {
-                                       sZero = oLang.sLoadingRecords;
-                               }
-                               else if ( oLang.sEmptyTable && oSettings.fnRecordsTotal() === 0 )
+                               var iDataIndex = aiDisplay[j];
+                               var aoData = oSettings.aoData[ iDataIndex ];
+                               if ( aoData.nTr === null )
                                {
-                                       sZero = oLang.sEmptyTable;
+                                       _fnCreateTr( oSettings, iDataIndex );
                                }
-               
-                               var nTd = document.createElement( 'td' );
-                               nTd.setAttribute( 'valign', "top" );
-                               nTd.colSpan = _fnVisbleColumns( oSettings );
-                               nTd.className = oSettings.oClasses.sRowEmpty;
-                               nTd.innerHTML = _fnInfoMacros( oSettings, sZero );
-                               
-                               anRows[ iRowCount ].appendChild( nTd );
-                       }
-                       
-                       /* Header and footer callbacks */
-                       _fnCallbackFire( oSettings, 'aoHeaderCallback', 'header', [ $(oSettings.nTHead).children('tr')[0], 
-                               _fnGetDataMaster( oSettings ), oSettings._iDisplayStart, oSettings.fnDisplayEnd(), oSettings.aiDisplay ] );
-                       
-                       _fnCallbackFire( oSettings, 'aoFooterCallback', 'footer', [ $(oSettings.nTFoot).children('tr')[0], 
-                               _fnGetDataMaster( oSettings ), oSettings._iDisplayStart, oSettings.fnDisplayEnd(), oSettings.aiDisplay ] );
-                       
-                       /* 
-                        * Need to remove any old row from the display - note we can't just empty the tbody using
-                        * $().html('') since this will unbind the jQuery event handlers (even although the node 
-                        * still exists!) - equally we can't use innerHTML, since IE throws an exception.
-                        */
-                       var
-                               nAddFrag = document.createDocumentFragment(),
-                               nRemoveFrag = document.createDocumentFragment(),
-                               nBodyPar, nTrs;
-                       
-                       if ( oSettings.nTBody )
-                       {
-                               nBodyPar = oSettings.nTBody.parentNode;
-                               nRemoveFrag.appendChild( oSettings.nTBody );
-                               
-                               /* When doing infinite scrolling, only remove child rows when sorting, filtering or start
-                                * up. When not infinite scroll, always do it.
-                                */
-                               if ( !oSettings.oScroll.bInfinite || !oSettings._bInitComplete ||
-                                       oSettings.bSorted || oSettings.bFiltered )
+       
+                               var nRow = aoData.nTr;
+       
+                               /* Remove the old striping classes and then add the new one */
+                               if ( iStripes !== 0 )
                                {
-                                       while( (n = oSettings.nTBody.firstChild) )
+                                       var sStripe = asStripeClasses[ iRowCount % iStripes ];
+                                       if ( aoData._sRowStripe != sStripe )
                                        {
-                                               oSettings.nTBody.removeChild( n );
+                                               $(nRow).removeClass( aoData._sRowStripe ).addClass( sStripe );
+                                               aoData._sRowStripe = sStripe;
                                        }
                                }
-                               
-                               /* Put the draw table into the dom */
-                               for ( i=0, iLen=anRows.length ; i<iLen ; i++ )
-                               {
-                                       nAddFrag.appendChild( anRows[i] );
-                               }
-                               
-                               oSettings.nTBody.appendChild( nAddFrag );
-                               if ( nBodyPar !== null )
-                               {
-                                       nBodyPar.appendChild( oSettings.nTBody );
-                               }
-                       }
-                       
-                       /* Call all required callback functions for the end of a draw */
-                       _fnCallbackFire( oSettings, 'aoDrawCallback', 'draw', [oSettings] );
-                       
-                       /* Draw is complete, sorting and filtering must be as well */
-                       oSettings.bSorted = false;
-                       oSettings.bFiltered = false;
-                       oSettings.bDrawing = false;
-                       
-                       if ( oSettings.oFeatures.bServerSide )
-                       {
-                               _fnProcessingDisplay( oSettings, false );
-                               if ( !oSettings._bInitComplete )
-                               {
-                                       _fnInitComplete( oSettings );
-                               }
+       
+                               /* Row callback functions - might want to manipulate the row */
+                               _fnCallbackFire( oSettings, 'aoRowCallback', null,
+                                       [nRow, aoData._aData, iRowCount, j] );
+       
+                               anRows.push( nRow );
+                               iRowCount++;
                        }
                }
-               
-               
-               /**
-                * Redraw the table - taking account of the various features which are enabled
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
-                */
-               function _fnReDraw( oSettings )
+               else
                {
-                       if ( oSettings.oFeatures.bSort )
-                       {
-                               /* Sorting will refilter and draw for us */
-                               _fnSort( oSettings, oSettings.oPreviousSearch );
-                       }
-                       else if ( oSettings.oFeatures.bFilter )
+                       /* Table is empty - create a row with an empty message in it */
+                       var sZero = oLang.sZeroRecords;
+                       if ( oSettings.iDraw == 1 &&  _fnDataSource( oSettings ) == 'ajax' )
                        {
-                               /* Filtering will redraw for us */
-                               _fnFilterComplete( oSettings, oSettings.oPreviousSearch );
+                               sZero = oLang.sLoadingRecords;
                        }
-                       else
+                       else if ( oLang.sEmptyTable && oSettings.fnRecordsTotal() === 0 )
                        {
-                               _fnCalculateEnd( oSettings );
-                               _fnDraw( oSettings );
+                               sZero = oLang.sEmptyTable;
                        }
+       
+                       anRows[ 0 ] = $( '<tr/>', { 'class': iStripes ? asStripeClasses[0] : '' } )
+                               .append( $('<td />', {
+                                       'valign':  'top',
+                                       'colSpan': _fnVisbleColumns( oSettings ),
+                                       'class':   oSettings.oClasses.sRowEmpty
+                               } ).html( sZero ) )[0];
                }
-               
-               
-               /**
-                * Add the options to the page HTML for the table
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
-                */
-               function _fnAddOptionsHtml ( oSettings )
+       
+               /* Header and footer callbacks */
+               _fnCallbackFire( oSettings, 'aoHeaderCallback', 'header', [ $(oSettings.nTHead).children('tr')[0],
+                       _fnGetDataMaster( oSettings ), iDisplayStart, iDisplayEnd, aiDisplay ] );
+       
+               _fnCallbackFire( oSettings, 'aoFooterCallback', 'footer', [ $(oSettings.nTFoot).children('tr')[0],
+                       _fnGetDataMaster( oSettings ), iDisplayStart, iDisplayEnd, aiDisplay ] );
+       
+               var body = $(oSettings.nTBody);
+       
+               body.children().detach();
+               body.append( $(anRows) );
+       
+               /* Call all required callback functions for the end of a draw */
+               _fnCallbackFire( oSettings, 'aoDrawCallback', 'draw', [oSettings] );
+       
+               /* Draw is complete, sorting and filtering must be as well */
+               oSettings.bSorted = false;
+               oSettings.bFiltered = false;
+               oSettings.bDrawing = false;
+       }
+       
+       
+       /**
+        * Redraw the table - taking account of the various features which are enabled
+        *  @param {object} oSettings dataTables settings object
+        *  @param {boolean} [holdPosition] Keep the current paging position. By default
+        *    the paging is reset to the first page
+        *  @memberof DataTable#oApi
+        */
+       function _fnReDraw( settings, holdPosition )
+       {
+               var
+                       features = settings.oFeatures,
+                       sort     = features.bSort,
+                       filter   = features.bFilter;
+       
+               if ( sort ) {
+                       _fnSort( settings );
+               }
+       
+               if ( filter ) {
+                       _fnFilterComplete( settings, settings.oPreviousSearch );
+               }
+               else {
+                       // No filtering, so we want to just use the display master
+                       settings.aiDisplay = settings.aiDisplayMaster.slice();
+               }
+       
+               if ( holdPosition !== true ) {
+                       settings._iDisplayStart = 0;
+               }
+       
+               _fnDraw( settings );
+       }
+       
+       
+       /**
+        * Add the options to the page HTML for the table
+        *  @param {object} oSettings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnAddOptionsHtml ( oSettings )
+       {
+               var classes = oSettings.oClasses;
+               var table = $(oSettings.nTable);
+               var holding = $('<div/>').insertBefore( table ); // Holding element for speed
+               var features = oSettings.oFeatures;
+       
+               // All DataTables are wrapped in a div
+               var insert = $('<div/>', {
+                       id:      oSettings.sTableId+'_wrapper',
+                       'class': classes.sWrapper + (oSettings.nTFoot ? '' : ' '+classes.sNoFooter)
+               } );
+       
+               oSettings.nHolding = holding[0];
+               oSettings.nTableWrapper = insert[0];
+               oSettings.nTableReinsertBefore = oSettings.nTable.nextSibling;
+       
+               /* Loop over the user set positioning and place the elements as needed */
+               var aDom = oSettings.sDom.split('');
+               var featureNode, cOption, nNewNode, cNext, sAttr, j;
+               for ( var i=0 ; i<aDom.length ; i++ )
                {
-                       /*
-                        * Create a temporary, empty, div which we can later on replace with what we have generated
-                        * we do it this way to rendering the 'options' html offline - speed :-)
-                        */
-                       var nHolding = $('<div></div>')[0];
-                       oSettings.nTable.parentNode.insertBefore( nHolding, oSettings.nTable );
-                       
-                       /* 
-                        * All DataTables are wrapped in a div
-                        */
-                       oSettings.nTableWrapper = $('<div id="'+oSettings.sTableId+'_wrapper" class="'+oSettings.oClasses.sWrapper+'" role="grid"></div>')[0];
-                       oSettings.nTableReinsertBefore = oSettings.nTable.nextSibling;
-               
-                       /* Track where we want to insert the option */
-                       var nInsertNode = oSettings.nTableWrapper;
-                       
-                       /* Loop over the user set positioning and place the elements as needed */
-                       var aDom = oSettings.sDom.split('');
-                       var nTmp, iPushFeature, cOption, nNewNode, cNext, sAttr, j;
-                       for ( var i=0 ; i<aDom.length ; i++ )
+                       featureNode = null;
+                       cOption = aDom[i];
+       
+                       if ( cOption == '<' )
                        {
-                               iPushFeature = 0;
-                               cOption = aDom[i];
-                               
-                               if ( cOption == '<' )
+                               /* New container div */
+                               nNewNode = $('<div/>')[0];
+       
+                               /* Check to see if we should append an id and/or a class name to the container */
+                               cNext = aDom[i+1];
+                               if ( cNext == "'" || cNext == '"' )
                                {
-                                       /* New container div */
-                                       nNewNode = $('<div></div>')[0];
-                                       
-                                       /* Check to see if we should append an id and/or a class name to the container */
-                                       cNext = aDom[i+1];
-                                       if ( cNext == "'" || cNext == '"' )
+                                       sAttr = "";
+                                       j = 2;
+                                       while ( aDom[i+j] != cNext )
                                        {
-                                               sAttr = "";
-                                               j = 2;
-                                               while ( aDom[i+j] != cNext )
-                                               {
-                                                       sAttr += aDom[i+j];
-                                                       j++;
-                                               }
-                                               
-                                               /* Replace jQuery UI constants */
-                                               if ( sAttr == "H" )
-                                               {
-                                                       sAttr = oSettings.oClasses.sJUIHeader;
-                                               }
-                                               else if ( sAttr == "F" )
-                                               {
-                                                       sAttr = oSettings.oClasses.sJUIFooter;
-                                               }
-                                               
-                                               /* The attribute can be in the format of "#id.class", "#id" or "class" This logic
-                                                * breaks the string into parts and applies them as needed
-                                                */
-                                               if ( sAttr.indexOf('.') != -1 )
-                                               {
-                                                       var aSplit = sAttr.split('.');
-                                                       nNewNode.id = aSplit[0].substr(1, aSplit[0].length-1);
-                                                       nNewNode.className = aSplit[1];
-                                               }
-                                               else if ( sAttr.charAt(0) == "#" )
-                                               {
-                                                       nNewNode.id = sAttr.substr(1, sAttr.length-1);
-                                               }
-                                               else
-                                               {
-                                                       nNewNode.className = sAttr;
-                                               }
-                                               
-                                               i += j; /* Move along the position array */
+                                               sAttr += aDom[i+j];
+                                               j++;
                                        }
-                                       
-                                       nInsertNode.appendChild( nNewNode );
-                                       nInsertNode = nNewNode;
-                               }
-                               else if ( cOption == '>' )
-                               {
-                                       /* End container div */
-                                       nInsertNode = nInsertNode.parentNode;
-                               }
-                               else if ( cOption == 'l' && oSettings.oFeatures.bPaginate && oSettings.oFeatures.bLengthChange )
-                               {
-                                       /* Length */
-                                       nTmp = _fnFeatureHtmlLength( oSettings );
-                                       iPushFeature = 1;
-                               }
-                               else if ( cOption == 'f' && oSettings.oFeatures.bFilter )
-                               {
-                                       /* Filter */
-                                       nTmp = _fnFeatureHtmlFilter( oSettings );
-                                       iPushFeature = 1;
-                               }
-                               else if ( cOption == 'r' && oSettings.oFeatures.bProcessing )
-                               {
-                                       /* pRocessing */
-                                       nTmp = _fnFeatureHtmlProcessing( oSettings );
-                                       iPushFeature = 1;
-                               }
-                               else if ( cOption == 't' )
-                               {
-                                       /* Table */
-                                       nTmp = _fnFeatureHtmlTable( oSettings );
-                                       iPushFeature = 1;
-                               }
-                               else if ( cOption ==  'i' && oSettings.oFeatures.bInfo )
-                               {
-                                       /* Info */
-                                       nTmp = _fnFeatureHtmlInfo( oSettings );
-                                       iPushFeature = 1;
-                               }
-                               else if ( cOption == 'p' && oSettings.oFeatures.bPaginate )
-                               {
-                                       /* Pagination */
-                                       nTmp = _fnFeatureHtmlPaginate( oSettings );
-                                       iPushFeature = 1;
-                               }
-                               else if ( DataTable.ext.aoFeatures.length !== 0 )
-                               {
-                                       /* Plug-in features */
-                                       var aoFeatures = DataTable.ext.aoFeatures;
-                                       for ( var k=0, kLen=aoFeatures.length ; k<kLen ; k++ )
+       
+                                       /* Replace jQuery UI constants @todo depreciated */
+                                       if ( sAttr == "H" )
                                        {
-                                               if ( cOption == aoFeatures[k].cFeature )
-                                               {
-                                                       nTmp = aoFeatures[k].fnInit( oSettings );
-                                                       if ( nTmp )
-                                                       {
-                                                               iPushFeature = 1;
-                                                       }
-                                                       break;
-                                               }
+                                               sAttr = classes.sJUIHeader;
                                        }
-                               }
-                               
-                               /* Add to the 2D features array */
-                               if ( iPushFeature == 1 && nTmp !== null )
-                               {
-                                       if ( typeof oSettings.aanFeatures[cOption] !== 'object' )
+                                       else if ( sAttr == "F" )
                                        {
-                                               oSettings.aanFeatures[cOption] = [];
+                                               sAttr = classes.sJUIFooter;
                                        }
-                                       oSettings.aanFeatures[cOption].push( nTmp );
-                                       nInsertNode.appendChild( nTmp );
-                               }
-                       }
-                       
-                       /* Built our DOM structure - replace the holding div with what we want */
-                       nHolding.parentNode.replaceChild( oSettings.nTableWrapper, nHolding );
-               }
-               
-               
-               /**
-                * Use the DOM source to create up an array of header cells. The idea here is to
-                * create a layout grid (array) of rows x columns, which contains a reference
-                * to the cell that that point in the grid (regardless of col/rowspan), such that
-                * any column / row could be removed and the new grid constructed
-                *  @param array {object} aLayout Array to store the calculated layout in
-                *  @param {node} nThead The header/footer element for the table
-                *  @memberof DataTable#oApi
-                */
-               function _fnDetectHeader ( aLayout, nThead )
-               {
-                       var nTrs = $(nThead).children('tr');
-                       var nTr, nCell;
-                       var i, k, l, iLen, jLen, iColShifted, iColumn, iColspan, iRowspan;
-                       var bUnique;
-                       var fnShiftCol = function ( a, i, j ) {
-                               var k = a[i];
-                               while ( k[j] ) {
-                                       j++;
-                               }
-                               return j;
-                       };
-               
-                       aLayout.splice( 0, aLayout.length );
-                       
-                       /* We know how many rows there are in the layout - so prep it */
-                       for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
-                       {
-                               aLayout.push( [] );
-                       }
-                       
-                       /* Calculate a layout array */
-                       for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
-                       {
-                               nTr = nTrs[i];
-                               iColumn = 0;
-                               
-                               /* For every cell in the row... */
-                               nCell = nTr.firstChild;
-                               while ( nCell ) {
-                                       if ( nCell.nodeName.toUpperCase() == "TD" ||
-                                            nCell.nodeName.toUpperCase() == "TH" )
+       
+                                       /* The attribute can be in the format of "#id.class", "#id" or "class" This logic
+                                        * breaks the string into parts and applies them as needed
+                                        */
+                                       if ( sAttr.indexOf('.') != -1 )
                                        {
-                                               /* Get the col and rowspan attributes from the DOM and sanitise them */
-                                               iColspan = nCell.getAttribute('colspan') * 1;
-                                               iRowspan = nCell.getAttribute('rowspan') * 1;
-                                               iColspan = (!iColspan || iColspan===0 || iColspan===1) ? 1 : iColspan;
-                                               iRowspan = (!iRowspan || iRowspan===0 || iRowspan===1) ? 1 : iRowspan;
-               
-                                               /* There might be colspan cells already in this row, so shift our target 
-                                                * accordingly
-                                                */
-                                               iColShifted = fnShiftCol( aLayout, i, iColumn );
-                                               
-                                               /* Cache calculation for unique columns */
-                                               bUnique = iColspan === 1 ? true : false;
-                                               
-                                               /* If there is col / rowspan, copy the information into the layout grid */
-                                               for ( l=0 ; l<iColspan ; l++ )
-                                               {
-                                                       for ( k=0 ; k<iRowspan ; k++ )
-                                                       {
-                                                               aLayout[i+k][iColShifted+l] = {
-                                                                       "cell": nCell,
-                                                                       "unique": bUnique
-                                                               };
-                                                               aLayout[i+k].nTr = nTr;
-                                                       }
-                                               }
+                                               var aSplit = sAttr.split('.');
+                                               nNewNode.id = aSplit[0].substr(1, aSplit[0].length-1);
+                                               nNewNode.className = aSplit[1];
+                                       }
+                                       else if ( sAttr.charAt(0) == "#" )
+                                       {
+                                               nNewNode.id = sAttr.substr(1, sAttr.length-1);
+                                       }
+                                       else
+                                       {
+                                               nNewNode.className = sAttr;
                                        }
-                                       nCell = nCell.nextSibling;
+       
+                                       i += j; /* Move along the position array */
                                }
+       
+                               insert.append( nNewNode );
+                               insert = $(nNewNode);
                        }
-               }
-               
-               
-               /**
-                * Get an array of unique th elements, one for each column
-                *  @param {object} oSettings dataTables settings object
-                *  @param {node} nHeader automatically detect the layout from this node - optional
-                *  @param {array} aLayout thead/tfoot layout from _fnDetectHeader - optional
-                *  @returns array {node} aReturn list of unique th's
-                *  @memberof DataTable#oApi
-                */
-               function _fnGetUniqueThs ( oSettings, nHeader, aLayout )
-               {
-                       var aReturn = [];
-                       if ( !aLayout )
+                       else if ( cOption == '>' )
                        {
-                               aLayout = oSettings.aoHeader;
-                               if ( nHeader )
-                               {
-                                       aLayout = [];
-                                       _fnDetectHeader( aLayout, nHeader );
-                               }
+                               /* End container div */
+                               insert = insert.parent();
                        }
-               
-                       for ( var i=0, iLen=aLayout.length ; i<iLen ; i++ )
+                       // @todo Move options into their own plugins?
+                       else if ( cOption == 'l' && features.bPaginate && features.bLengthChange )
                        {
-                               for ( var j=0, jLen=aLayout[i].length ; j<jLen ; j++ )
-                               {
-                                       if ( aLayout[i][j].unique && 
-                                                (!aReturn[j] || !oSettings.bSortCellsTop) )
-                                       {
-                                               aReturn[j] = aLayout[i][j].cell;
-                                       }
-                               }
+                               /* Length */
+                               featureNode = _fnFeatureHtmlLength( oSettings );
                        }
-                       
-                       return aReturn;
-               }
-               
-               
-               
-               /**
-                * Update the table using an Ajax call
-                *  @param {object} oSettings dataTables settings object
-                *  @returns {boolean} Block the table drawing or not
-                *  @memberof DataTable#oApi
-                */
-               function _fnAjaxUpdate( oSettings )
-               {
-                       if ( oSettings.bAjaxDataGet )
+                       else if ( cOption == 'f' && features.bFilter )
                        {
-                               oSettings.iDraw++;
-                               _fnProcessingDisplay( oSettings, true );
-                               var iColumns = oSettings.aoColumns.length;
-                               var aoData = _fnAjaxParameters( oSettings );
-                               _fnServerParams( oSettings, aoData );
-                               
-                               oSettings.fnServerData.call( oSettings.oInstance, oSettings.sAjaxSource, aoData,
-                                       function(json) {
-                                               _fnAjaxUpdateDraw( oSettings, json );
-                                       }, oSettings );
-                               return false;
+                               /* Filter */
+                               featureNode = _fnFeatureHtmlFilter( oSettings );
                        }
-                       else
+                       else if ( cOption == 'r' && features.bProcessing )
                        {
-                               return true;
+                               /* pRocessing */
+                               featureNode = _fnFeatureHtmlProcessing( oSettings );
                        }
-               }
-               
-               
-               /**
-                * Build up the parameters in an object needed for a server-side processing request
-                *  @param {object} oSettings dataTables settings object
-                *  @returns {bool} block the table drawing or not
-                *  @memberof DataTable#oApi
-                */
-               function _fnAjaxParameters( oSettings )
-               {
-                       var iColumns = oSettings.aoColumns.length;
-                       var aoData = [], mDataProp, aaSort, aDataSort;
-                       var i, j;
-                       
-                       aoData.push( { "name": "sEcho",          "value": oSettings.iDraw } );
-                       aoData.push( { "name": "iColumns",       "value": iColumns } );
-                       aoData.push( { "name": "sColumns",       "value": _fnColumnOrdering(oSettings) } );
-                       aoData.push( { "name": "iDisplayStart",  "value": oSettings._iDisplayStart } );
-                       aoData.push( { "name": "iDisplayLength", "value": oSettings.oFeatures.bPaginate !== false ?
-                               oSettings._iDisplayLength : -1 } );
-                               
-                       for ( i=0 ; i<iColumns ; i++ )
+                       else if ( cOption == 't' )
                        {
-                         mDataProp = oSettings.aoColumns[i].mData;
-                               aoData.push( { "name": "mDataProp_"+i, "value": typeof(mDataProp)==="function" ? 'function' : mDataProp } );
+                               /* Table */
+                               featureNode = _fnFeatureHtmlTable( oSettings );
                        }
-                       
-                       /* Filtering */
-                       if ( oSettings.oFeatures.bFilter !== false )
+                       else if ( cOption ==  'i' && features.bInfo )
                        {
-                               aoData.push( { "name": "sSearch", "value": oSettings.oPreviousSearch.sSearch } );
-                               aoData.push( { "name": "bRegex",  "value": oSettings.oPreviousSearch.bRegex } );
-                               for ( i=0 ; i<iColumns ; i++ )
-                               {
-                                       aoData.push( { "name": "sSearch_"+i,     "value": oSettings.aoPreSearchCols[i].sSearch } );
-                                       aoData.push( { "name": "bRegex_"+i,      "value": oSettings.aoPreSearchCols[i].bRegex } );
-                                       aoData.push( { "name": "bSearchable_"+i, "value": oSettings.aoColumns[i].bSearchable } );
-                               }
+                               /* Info */
+                               featureNode = _fnFeatureHtmlInfo( oSettings );
                        }
-                       
-                       /* Sorting */
-                       if ( oSettings.oFeatures.bSort !== false )
+                       else if ( cOption == 'p' && features.bPaginate )
                        {
-                               var iCounter = 0;
-               
-                               aaSort = ( oSettings.aaSortingFixed !== null ) ?
-                                       oSettings.aaSortingFixed.concat( oSettings.aaSorting ) :
-                                       oSettings.aaSorting.slice();
-                               
-                               for ( i=0 ; i<aaSort.length ; i++ )
+                               /* Pagination */
+                               featureNode = _fnFeatureHtmlPaginate( oSettings );
+                       }
+                       else if ( DataTable.ext.feature.length !== 0 )
+                       {
+                               /* Plug-in features */
+                               var aoFeatures = DataTable.ext.feature;
+                               for ( var k=0, kLen=aoFeatures.length ; k<kLen ; k++ )
                                {
-                                       aDataSort = oSettings.aoColumns[ aaSort[i][0] ].aDataSort;
-                                       
-                                       for ( j=0 ; j<aDataSort.length ; j++ )
+                                       if ( cOption == aoFeatures[k].cFeature )
                                        {
-                                               aoData.push( { "name": "iSortCol_"+iCounter,  "value": aDataSort[j] } );
-                                               aoData.push( { "name": "sSortDir_"+iCounter,  "value": aaSort[i][1] } );
-                                               iCounter++;
+                                               featureNode = aoFeatures[k].fnInit( oSettings );
+                                               break;
                                        }
                                }
-                               aoData.push( { "name": "iSortingCols",   "value": iCounter } );
-                               
-                               for ( i=0 ; i<iColumns ; i++ )
+                       }
+       
+                       /* Add to the 2D features array */
+                       if ( featureNode )
+                       {
+                               var aanFeatures = oSettings.aanFeatures;
+       
+                               if ( ! aanFeatures[cOption] )
                                {
-                                       aoData.push( { "name": "bSortable_"+i,  "value": oSettings.aoColumns[i].bSortable } );
+                                       aanFeatures[cOption] = [];
                                }
+       
+                               aanFeatures[cOption].push( featureNode );
+                               insert.append( featureNode );
                        }
-                       
-                       return aoData;
                }
-               
-               
-               /**
-                * Add Ajax parameters from plug-ins
-                *  @param {object} oSettings dataTables settings object
-                *  @param array {objects} aoData name/value pairs to send to the server
-                *  @memberof DataTable#oApi
-                */
-               function _fnServerParams( oSettings, aoData )
+       
+               /* Built our DOM structure - replace the holding div with what we want */
+               holding.replaceWith( insert );
+       }
+       
+       
+       /**
+        * Use the DOM source to create up an array of header cells. The idea here is to
+        * create a layout grid (array) of rows x columns, which contains a reference
+        * to the cell that that point in the grid (regardless of col/rowspan), such that
+        * any column / row could be removed and the new grid constructed
+        *  @param array {object} aLayout Array to store the calculated layout in
+        *  @param {node} nThead The header/footer element for the table
+        *  @memberof DataTable#oApi
+        */
+       function _fnDetectHeader ( aLayout, nThead )
+       {
+               var nTrs = $(nThead).children('tr');
+               var nTr, nCell;
+               var i, k, l, iLen, jLen, iColShifted, iColumn, iColspan, iRowspan;
+               var bUnique;
+               var fnShiftCol = function ( a, i, j ) {
+                       var k = a[i];
+                       while ( k[j] ) {
+                               j++;
+                       }
+                       return j;
+               };
+       
+               aLayout.splice( 0, aLayout.length );
+       
+               /* We know how many rows there are in the layout - so prep it */
+               for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
                {
-                       _fnCallbackFire( oSettings, 'aoServerParams', 'serverParams', [aoData] );
+                       aLayout.push( [] );
                }
-               
-               
-               /**
-                * Data the data from the server (nuking the old) and redraw the table
-                *  @param {object} oSettings dataTables settings object
-                *  @param {object} json json data return from the server.
-                *  @param {string} json.sEcho Tracking flag for DataTables to match requests
-                *  @param {int} json.iTotalRecords Number of records in the data set, not accounting for filtering
-                *  @param {int} json.iTotalDisplayRecords Number of records in the data set, accounting for filtering
-                *  @param {array} json.aaData The data to display on this page
-                *  @param {string} [json.sColumns] Column ordering (sName, comma separated)
-                *  @memberof DataTable#oApi
-                */
-               function _fnAjaxUpdateDraw ( oSettings, json )
+       
+               /* Calculate a layout array */
+               for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
                {
-                       if ( json.sEcho !== undefined )
-                       {
-                               /* Protect against old returns over-writing a new one. Possible when you get
-                                * very fast interaction, and later queries are completed much faster
-                                */
-                               if ( json.sEcho*1 < oSettings.iDraw )
-                               {
-                                       return;
-                               }
-                               else
+                       nTr = nTrs[i];
+                       iColumn = 0;
+       
+                       /* For every cell in the row... */
+                       nCell = nTr.firstChild;
+                       while ( nCell ) {
+                               if ( nCell.nodeName.toUpperCase() == "TD" ||
+                                    nCell.nodeName.toUpperCase() == "TH" )
                                {
-                                       oSettings.iDraw = json.sEcho * 1;
+                                       /* Get the col and rowspan attributes from the DOM and sanitise them */
+                                       iColspan = nCell.getAttribute('colspan') * 1;
+                                       iRowspan = nCell.getAttribute('rowspan') * 1;
+                                       iColspan = (!iColspan || iColspan===0 || iColspan===1) ? 1 : iColspan;
+                                       iRowspan = (!iRowspan || iRowspan===0 || iRowspan===1) ? 1 : iRowspan;
+       
+                                       /* There might be colspan cells already in this row, so shift our target
+                                        * accordingly
+                                        */
+                                       iColShifted = fnShiftCol( aLayout, i, iColumn );
+       
+                                       /* Cache calculation for unique columns */
+                                       bUnique = iColspan === 1 ? true : false;
+       
+                                       /* If there is col / rowspan, copy the information into the layout grid */
+                                       for ( l=0 ; l<iColspan ; l++ )
+                                       {
+                                               for ( k=0 ; k<iRowspan ; k++ )
+                                               {
+                                                       aLayout[i+k][iColShifted+l] = {
+                                                               "cell": nCell,
+                                                               "unique": bUnique
+                                                       };
+                                                       aLayout[i+k].nTr = nTr;
+                                               }
+                                       }
                                }
+                               nCell = nCell.nextSibling;
                        }
-                       
-                       if ( !oSettings.oScroll.bInfinite ||
-                                  (oSettings.oScroll.bInfinite && (oSettings.bSorted || oSettings.bFiltered)) )
-                       {
-                               _fnClearTable( oSettings );
-                       }
-                       oSettings._iRecordsTotal = parseInt(json.iTotalRecords, 10);
-                       oSettings._iRecordsDisplay = parseInt(json.iTotalDisplayRecords, 10);
-                       
-                       /* Determine if reordering is required */
-                       var sOrdering = _fnColumnOrdering(oSettings);
-                       var bReOrder = (json.sColumns !== undefined && sOrdering !== "" && json.sColumns != sOrdering );
-                       var aiIndex;
-                       if ( bReOrder )
-                       {
-                               aiIndex = _fnReOrderIndex( oSettings, json.sColumns );
-                       }
-                       
-                       var aData = _fnGetObjectDataFn( oSettings.sAjaxDataProp )( json );
-                       for ( var i=0, iLen=aData.length ; i<iLen ; i++ )
-                       {
-                               if ( bReOrder )
-                               {
-                                       /* If we need to re-order, then create a new array with the correct order and add it */
-                                       var aDataSorted = [];
-                                       for ( var j=0, jLen=oSettings.aoColumns.length ; j<jLen ; j++ )
-                                       {
-                                               aDataSorted.push( aData[i][ aiIndex[j] ] );
-                                       }
-                                       _fnAddData( oSettings, aDataSorted );
-                               }
-                               else
-                               {
-                                       /* No re-order required, sever got it "right" - just straight add */
-                                       _fnAddData( oSettings, aData[i] );
-                               }
-                       }
-                       oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-                       
-                       oSettings.bAjaxDataGet = false;
-                       _fnDraw( oSettings );
-                       oSettings.bAjaxDataGet = true;
-                       _fnProcessingDisplay( oSettings, false );
                }
-               
-               
-               
-               /**
-                * Generate the node required for filtering text
-                *  @returns {node} Filter control element
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
-                */
-               function _fnFeatureHtmlFilter ( oSettings )
+       }
+       
+       
+       /**
+        * Get an array of unique th elements, one for each column
+        *  @param {object} oSettings dataTables settings object
+        *  @param {node} nHeader automatically detect the layout from this node - optional
+        *  @param {array} aLayout thead/tfoot layout from _fnDetectHeader - optional
+        *  @returns array {node} aReturn list of unique th's
+        *  @memberof DataTable#oApi
+        */
+       function _fnGetUniqueThs ( oSettings, nHeader, aLayout )
+       {
+               var aReturn = [];
+               if ( !aLayout )
                {
-                       var oPreviousSearch = oSettings.oPreviousSearch;
-                       
-                       var sSearchStr = oSettings.oLanguage.sSearch;
-                       sSearchStr = (sSearchStr.indexOf('_INPUT_') !== -1) ?
-                         sSearchStr.replace('_INPUT_', '<input type="text" />') :
-                         sSearchStr==="" ? '<input type="text" />' : sSearchStr+' <input type="text" />';
-                       
-                       var nFilter = document.createElement( 'div' );
-                       nFilter.className = oSettings.oClasses.sFilter;
-                       nFilter.innerHTML = '<label>'+sSearchStr+'</label>';
-                       if ( !oSettings.aanFeatures.f )
+                       aLayout = oSettings.aoHeader;
+                       if ( nHeader )
                        {
-                               nFilter.id = oSettings.sTableId+'_filter';
+                               aLayout = [];
+                               _fnDetectHeader( aLayout, nHeader );
                        }
-                       
-                       var jqFilter = $('input[type="text"]', nFilter);
-               
-                       // Store a reference to the input element, so other input elements could be
-                       // added to the filter wrapper if needed (submit button for example)
-                       nFilter._DT_Input = jqFilter[0];
-               
-                       jqFilter.val( oPreviousSearch.sSearch.replace('"','&quot;') );
-                       jqFilter.bind( 'keyup.DT', function(e) {
-                               /* Update all other filter input elements for the new display */
-                               var n = oSettings.aanFeatures.f;
-                               var val = this.value==="" ? "" : this.value; // mental IE8 fix :-(
-               
-                               for ( var i=0, iLen=n.length ; i<iLen ; i++ )
-                               {
-                                       if ( n[i] != $(this).parents('div.dataTables_filter')[0] )
-                                       {
-                                               $(n[i]._DT_Input).val( val );
-                                       }
-                               }
-                               
-                               /* Now do the filter */
-                               if ( val != oPreviousSearch.sSearch )
-                               {
-                                       _fnFilterComplete( oSettings, { 
-                                               "sSearch": val, 
-                                               "bRegex": oPreviousSearch.bRegex,
-                                               "bSmart": oPreviousSearch.bSmart ,
-                                               "bCaseInsensitive": oPreviousSearch.bCaseInsensitive 
-                                       } );
-                               }
-                       } );
-               
-                       jqFilter
-                               .attr('aria-controls', oSettings.sTableId)
-                               .bind( 'keypress.DT', function(e) {
-                                       /* Prevent form submission */
-                                       if ( e.keyCode == 13 )
-                                       {
-                                               return false;
-                                       }
-                               }
-                       );
-                       
-                       return nFilter;
                }
-               
-               
-               /**
-                * Filter the table using both the global filter and column based filtering
-                *  @param {object} oSettings dataTables settings object
-                *  @param {object} oSearch search information
-                *  @param {int} [iForce] force a research of the master array (1) or not (undefined or 0)
-                *  @memberof DataTable#oApi
-                */
-               function _fnFilterComplete ( oSettings, oInput, iForce )
+       
+               for ( var i=0, iLen=aLayout.length ; i<iLen ; i++ )
                {
-                       var oPrevSearch = oSettings.oPreviousSearch;
-                       var aoPrevSearch = oSettings.aoPreSearchCols;
-                       var fnSaveFilter = function ( oFilter ) {
-                               /* Save the filtering values */
-                               oPrevSearch.sSearch = oFilter.sSearch;
-                               oPrevSearch.bRegex = oFilter.bRegex;
-                               oPrevSearch.bSmart = oFilter.bSmart;
-                               oPrevSearch.bCaseInsensitive = oFilter.bCaseInsensitive;
-                       };
-               
-                       /* In server-side processing all filtering is done by the server, so no point hanging around here */
-                       if ( !oSettings.oFeatures.bServerSide )
+                       for ( var j=0, jLen=aLayout[i].length ; j<jLen ; j++ )
                        {
-                               /* Global filter */
-                               _fnFilter( oSettings, oInput.sSearch, iForce, oInput.bRegex, oInput.bSmart, oInput.bCaseInsensitive );
-                               fnSaveFilter( oInput );
-               
-                               /* Now do the individual column filter */
-                               for ( var i=0 ; i<oSettings.aoPreSearchCols.length ; i++ )
+                               if ( aLayout[i][j].unique &&
+                                        (!aReturn[j] || !oSettings.bSortCellsTop) )
                                {
-                                       _fnFilterColumn( oSettings, aoPrevSearch[i].sSearch, i, aoPrevSearch[i].bRegex, 
-                                               aoPrevSearch[i].bSmart, aoPrevSearch[i].bCaseInsensitive );
+                                       aReturn[j] = aLayout[i][j].cell;
                                }
-                               
-                               /* Custom filtering */
-                               _fnFilterCustom( oSettings );
                        }
-                       else
-                       {
-                               fnSaveFilter( oInput );
-                       }
-                       
-                       /* Tell the draw function we have been filtering */
-                       oSettings.bFiltered = true;
-                       $(oSettings.oInstance).trigger('filter', oSettings);
-                       
-                       /* Redraw the table */
-                       oSettings._iDisplayStart = 0;
-                       _fnCalculateEnd( oSettings );
-                       _fnDraw( oSettings );
-                       
-                       /* Rebuild search array 'offline' */
-                       _fnBuildSearchArray( oSettings, 0 );
                }
-               
-               
-               /**
-                * Apply custom filtering functions
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
-                */
-               function _fnFilterCustom( oSettings )
-               {
-                       var afnFilters = DataTable.ext.afnFiltering;
-                       var aiFilterColumns = _fnGetColumns( oSettings, 'bSearchable' );
-               
-                       for ( var i=0, iLen=afnFilters.length ; i<iLen ; i++ )
-                       {
-                               var iCorrector = 0;
-                               for ( var j=0, jLen=oSettings.aiDisplay.length ; j<jLen ; j++ )
-                               {
-                                       var iDisIndex = oSettings.aiDisplay[j-iCorrector];
-                                       var bTest = afnFilters[i](
-                                               oSettings,
-                                               _fnGetRowData( oSettings, iDisIndex, 'filter', aiFilterColumns ),
-                                               iDisIndex
-                                       );
-                                       
-                                       /* Check if we should use this row based on the filtering function */
-                                       if ( !bTest )
-                                       {
-                                               oSettings.aiDisplay.splice( j-iCorrector, 1 );
-                                               iCorrector++;
+       
+               return aReturn;
+       }
+       
+       
+       
+       /**
+        * Create an Ajax call based on the table's settings, taking into account that
+        * parameters can have multiple forms, and backwards compatibility.
+        *
+        * @param {object} oSettings dataTables settings object
+        * @param {array} data Data to send to the server, required by
+        *     DataTables - may be augmented by developer callbacks
+        * @param {function} fn Callback function to run when data is obtained
+        */
+       function _fnBuildAjax( oSettings, data, fn )
+       {
+               // Compatibility with 1.9-, allow fnServerData and event to manipulate
+               _fnCallbackFire( oSettings, 'aoServerParams', 'serverParams', [data] );
+       
+               // Convert to object based for 1.10+ if using the old array scheme which can
+               // come from server-side processing or serverParams
+               if ( data && $.isArray(data) ) {
+                       var tmp = {};
+                       var rbracket = /(.*?)\[\]$/;
+       
+                       $.each( data, function (key, val) {
+                               var match = val.name.match(rbracket);
+       
+                               if ( match ) {
+                                       // Support for arrays
+                                       var name = match[0];
+       
+                                       if ( ! tmp[ name ] ) {
+                                               tmp[ name ] = [];
                                        }
+                                       tmp[ name ].push( val.value );
                                }
-                       }
+                               else {
+                                       tmp[val.name] = val.value;
+                               }
+                       } );
+                       data = tmp;
                }
-               
-               
-               /**
-                * Filter the table on a per-column basis
-                *  @param {object} oSettings dataTables settings object
-                *  @param {string} sInput string to filter on
-                *  @param {int} iColumn column to filter
-                *  @param {bool} bRegex treat search string as a regular expression or not
-                *  @param {bool} bSmart use smart filtering or not
-                *  @param {bool} bCaseInsensitive Do case insenstive matching or not
-                *  @memberof DataTable#oApi
-                */
-               function _fnFilterColumn ( oSettings, sInput, iColumn, bRegex, bSmart, bCaseInsensitive )
+       
+               var ajaxData;
+               var ajax = oSettings.ajax;
+               var instance = oSettings.oInstance;
+       
+               if ( $.isPlainObject( ajax ) && ajax.data )
                {
-                       if ( sInput === "" )
-                       {
-                               return;
-                       }
-                       
-                       var iIndexCorrector = 0;
-                       var rpSearch = _fnFilterCreateSearch( sInput, bRegex, bSmart, bCaseInsensitive );
-                       
-                       for ( var i=oSettings.aiDisplay.length-1 ; i>=0 ; i-- )
-                       {
-                               var sData = _fnDataToSearch( _fnGetCellData( oSettings, oSettings.aiDisplay[i], iColumn, 'filter' ),
-                                       oSettings.aoColumns[iColumn].sType );
-                               if ( ! rpSearch.test( sData ) )
-                               {
-                                       oSettings.aiDisplay.splice( i, 1 );
-                                       iIndexCorrector++;
+                       ajaxData = ajax.data;
+       
+                       var newData = $.isFunction( ajaxData ) ?
+                               ajaxData( data ) :  // fn can manipulate data or return an object
+                               ajaxData;           // object or array to merge
+       
+                       // If the function returned an object, use that alone
+                       data = $.isFunction( ajaxData ) && newData ?
+                               newData :
+                               $.extend( true, data, newData );
+       
+                       // Remove the data property as we've resolved it already and don't want
+                       // jQuery to do it again (it is restored at the end of the function)
+                       delete ajax.data;
+               }
+       
+               var baseAjax = {
+                       "data": data,
+                       "success": function (json) {
+                               var error = json.error || json.sError;
+                               if ( error ) {
+                                       oSettings.oApi._fnLog( oSettings, 0, error );
+                               }
+       
+                               oSettings.json = json;
+                               _fnCallbackFire( oSettings, null, 'xhr', [oSettings, json] );
+                               fn( json );
+                       },
+                       "dataType": "json",
+                       "cache": false,
+                       "type": oSettings.sServerMethod,
+                       "error": function (xhr, error, thrown) {
+                               var log = oSettings.oApi._fnLog;
+       
+                               if ( error == "parsererror" ) {
+                                       log( oSettings, 0, 'Invalid JSON response', 1 );
                                }
+                               else if ( xhr.readyState === 4 ) {
+                                       log( oSettings, 0, 'Ajax error', 7 );
+                               }
+       
+                               _fnProcessingDisplay( oSettings, false );
                        }
-               }
-               
-               
-               /**
-                * Filter the data table based on user input and draw the table
-                *  @param {object} oSettings dataTables settings object
-                *  @param {string} sInput string to filter on
-                *  @param {int} iForce optional - force a research of the master array (1) or not (undefined or 0)
-                *  @param {bool} bRegex treat as a regular expression or not
-                *  @param {bool} bSmart perform smart filtering or not
-                *  @param {bool} bCaseInsensitive Do case insenstive matching or not
-                *  @memberof DataTable#oApi
-                */
-               function _fnFilter( oSettings, sInput, iForce, bRegex, bSmart, bCaseInsensitive )
+               };
+       
+               // Store the data submitted for the API
+               oSettings.oAjaxData = data;
+       
+               // Allow plug-ins and external processes to modify the data
+               _fnCallbackFire( oSettings, null, 'preXhr', [oSettings, data] );
+       
+               if ( oSettings.fnServerData )
                {
-                       var i;
-                       var rpSearch = _fnFilterCreateSearch( sInput, bRegex, bSmart, bCaseInsensitive );
-                       var oPrevSearch = oSettings.oPreviousSearch;
-                       
-                       /* Check if we are forcing or not - optional parameter */
-                       if ( !iForce )
-                       {
-                               iForce = 0;
-                       }
-                       
-                       /* Need to take account of custom filtering functions - always filter */
-                       if ( DataTable.ext.afnFiltering.length !== 0 )
-                       {
-                               iForce = 1;
-                       }
-                       
-                       /*
-                        * If the input is blank - we want the full data set
-                        */
-                       if ( sInput.length <= 0 )
-                       {
-                               oSettings.aiDisplay.splice( 0, oSettings.aiDisplay.length);
-                               oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-                       }
-                       else
-                       {
-                               /*
-                                * We are starting a new search or the new search string is smaller 
-                                * then the old one (i.e. delete). Search from the master array
-                                */
-                               if ( oSettings.aiDisplay.length == oSettings.aiDisplayMaster.length ||
-                                          oPrevSearch.sSearch.length > sInput.length || iForce == 1 ||
-                                          sInput.indexOf(oPrevSearch.sSearch) !== 0 )
-                               {
-                                       /* Nuke the old display array - we are going to rebuild it */
-                                       oSettings.aiDisplay.splice( 0, oSettings.aiDisplay.length);
-                                       
-                                       /* Force a rebuild of the search array */
-                                       _fnBuildSearchArray( oSettings, 1 );
-                                       
-                                       /* Search through all records to populate the search array
-                                        * The the oSettings.aiDisplayMaster and asDataSearch arrays have 1 to 1 
-                                        * mapping
-                                        */
-                                       for ( i=0 ; i<oSettings.aiDisplayMaster.length ; i++ )
-                                       {
-                                               if ( rpSearch.test(oSettings.asDataSearch[i]) )
-                                               {
-                                                       oSettings.aiDisplay.push( oSettings.aiDisplayMaster[i] );
-                                               }
-                                       }
-                         }
-                         else
-                               {
-                               /* Using old search array - refine it - do it this way for speed
-                                * Don't have to search the whole master array again
-                                        */
-                               var iIndexCorrector = 0;
-                               
-                               /* Search the current results */
-                               for ( i=0 ; i<oSettings.asDataSearch.length ; i++ )
-                                       {
-                                       if ( ! rpSearch.test(oSettings.asDataSearch[i]) )
-                                               {
-                                               oSettings.aiDisplay.splice( i-iIndexCorrector, 1 );
-                                               iIndexCorrector++;
-                                       }
-                               }
-                         }
-                       }
+                       // DataTables 1.9- compatibility
+                       oSettings.fnServerData.call( instance,
+                               oSettings.sAjaxSource,
+                               $.map( data, function (val, key) { // Need to convert back to 1.9 trad format
+                                       return { name: key, value: val };
+                               } ),
+                               fn,
+                               oSettings
+                       );
                }
-               
-               
-               /**
-                * Create an array which can be quickly search through
-                *  @param {object} oSettings dataTables settings object
-                *  @param {int} iMaster use the master data array - optional
-                *  @memberof DataTable#oApi
-                */
-               function _fnBuildSearchArray ( oSettings, iMaster )
+               else if ( oSettings.sAjaxSource || typeof ajax === 'string' )
                {
-                       if ( !oSettings.oFeatures.bServerSide )
-                       {
-                               /* Clear out the old data */
-                               oSettings.asDataSearch = [];
-               
-                               var aiFilterColumns = _fnGetColumns( oSettings, 'bSearchable' );
-                               var aiIndex = (iMaster===1) ?
-                                       oSettings.aiDisplayMaster :
-                                       oSettings.aiDisplay;
-                               
-                               for ( var i=0, iLen=aiIndex.length ; i<iLen ; i++ )
-                               {
-                                       oSettings.asDataSearch[i] = _fnBuildSearchRow(
-                                               oSettings,
-                                               _fnGetRowData( oSettings, aiIndex[i], 'filter', aiFilterColumns )
-                                       );
-                               }
-                       }
+                       // DataTables 1.9- compatibility
+                       oSettings.jqXHR = $.ajax( $.extend( baseAjax, {
+                               url: ajax || oSettings.sAjaxSource
+                       } ) );
                }
-               
-               
-               /**
-                * Create a searchable string from a single data row
-                *  @param {object} oSettings dataTables settings object
-                *  @param {array} aData Row data array to use for the data to search
-                *  @memberof DataTable#oApi
-                */
-               function _fnBuildSearchRow( oSettings, aData )
+               else if ( $.isFunction( ajax ) )
                {
-                       var sSearch = aData.join('  ');
-                       
-                       /* If it looks like there is an HTML entity in the string, attempt to decode it */
-                       if ( sSearch.indexOf('&') !== -1 )
-                       {
-                               sSearch = $('<div>').html(sSearch).text();
-                       }
-                       
-                       // Strip newline characters
-                       return sSearch.replace( /[\n\r]/g, " " );
+                       // Is a function - let the caller define what needs to be done
+                       oSettings.jqXHR = ajax.call( instance, data, fn, oSettings );
                }
-               
-               /**
-                * Build a regular expression object suitable for searching a table
-                *  @param {string} sSearch string to search for
-                *  @param {bool} bRegex treat as a regular expression or not
-                *  @param {bool} bSmart perform smart filtering or not
-                *  @param {bool} bCaseInsensitive Do case insensitive matching or not
-                *  @returns {RegExp} constructed object
-                *  @memberof DataTable#oApi
-                */
-               function _fnFilterCreateSearch( sSearch, bRegex, bSmart, bCaseInsensitive )
+               else
                {
-                       var asSearch, sRegExpString;
-                       
-                       if ( bSmart )
-                       {
-                               /* Generate the regular expression to use. Something along the lines of:
-                                * ^(?=.*?\bone\b)(?=.*?\btwo\b)(?=.*?\bthree\b).*$
-                                */
-                               asSearch = bRegex ? sSearch.split( ' ' ) : _fnEscapeRegex( sSearch ).split( ' ' );
-                               sRegExpString = '^(?=.*?'+asSearch.join( ')(?=.*?' )+').*$';
-                               return new RegExp( sRegExpString, bCaseInsensitive ? "i" : "" );
-                       }
-                       else
-                       {
-                               sSearch = bRegex ? sSearch : _fnEscapeRegex( sSearch );
-                               return new RegExp( sSearch, bCaseInsensitive ? "i" : "" );
-                       }
+                       // Object to extend the base settings
+                       oSettings.jqXHR = $.ajax( $.extend( baseAjax, ajax ) );
+       
+                       // Restore for next time around
+                       ajax.data = ajaxData;
                }
-               
-               
-               /**
-                * Convert raw data into something that the user can search on
-                *  @param {string} sData data to be modified
-                *  @param {string} sType data type
-                *  @returns {string} search string
-                *  @memberof DataTable#oApi
-                */
-               function _fnDataToSearch ( sData, sType )
+       }
+       
+       
+       /**
+        * Update the table using an Ajax call
+        *  @param {object} oSettings dataTables settings object
+        *  @returns {boolean} Block the table drawing or not
+        *  @memberof DataTable#oApi
+        */
+       function _fnAjaxUpdate( oSettings )
+       {
+               if ( oSettings.bAjaxDataGet )
                {
-                       if ( typeof DataTable.ext.ofnSearch[sType] === "function" )
-                       {
-                               return DataTable.ext.ofnSearch[sType]( sData );
-                       }
-                       else if ( sData === null )
-                       {
-                               return '';
+                       oSettings.iDraw++;
+                       _fnProcessingDisplay( oSettings, true );
+                       var iColumns = oSettings.aoColumns.length;
+                       var aoData = _fnAjaxParameters( oSettings );
+       
+                       _fnBuildAjax( oSettings, aoData, function(json) {
+                               _fnAjaxUpdateDraw( oSettings, json );
+                       }, oSettings );
+       
+                       return false;
+               }
+               return true;
+       }
+       
+       
+       /**
+        * Build up the parameters in an object needed for a server-side processing
+        * request. Note that this is basically done twice, is different ways - a modern
+        * method which is used by default in DataTables 1.10 which uses objects and
+        * arrays, or the 1.9- method with is name / value pairs. 1.9 method is used if
+        * the sAjaxSource option is used in the initialisation, or the legacyAjax
+        * option is set.
+        *  @param {object} oSettings dataTables settings object
+        *  @returns {bool} block the table drawing or not
+        *  @memberof DataTable#oApi
+        */
+       function _fnAjaxParameters( settings )
+       {
+               var
+                       columns = settings.aoColumns,
+                       columnCount = columns.length,
+                       features = settings.oFeatures,
+                       preSearch = settings.oPreviousSearch,
+                       preColSearch = settings.aoPreSearchCols,
+                       i, data = [], dataProp, column, columnSearch,
+                       sort = _fnSortFlatten( settings ),
+                       displayStart = settings._iDisplayStart,
+                       displayLength = features.bPaginate !== false ?
+                               settings._iDisplayLength :
+                               -1;
+       
+               var param = function ( name, value ) {
+                       data.push( { 'name': name, 'value': value } );
+               };
+       
+               // DataTables 1.9- compatible method
+               param( 'sEcho',          settings.iDraw );
+               param( 'iColumns',       columnCount );
+               param( 'sColumns',       _pluck( columns, 'sName' ).join(',') );
+               param( 'iDisplayStart',  displayStart );
+               param( 'iDisplayLength', displayLength );
+       
+               // DataTables 1.10+ method
+               var d = {
+                       draw:    settings.iDraw,
+                       columns: [],
+                       order:   [],
+                       start:   displayStart,
+                       length:  displayLength,
+                       search:  {
+                               value: preSearch.sSearch,
+                               regex: preSearch.bRegex
                        }
-                       else if ( sType == "html" )
-                       {
-                               return sData.replace(/[\r\n]/g," ").replace( /<.*?>/g, "" );
+               };
+       
+               for ( i=0 ; i<columnCount ; i++ ) {
+                       column = columns[i];
+                       columnSearch = preColSearch[i];
+                       dataProp = typeof column.mData=="function" ? 'function' : column.mData ;
+       
+                       d.columns.push( {
+                               data:       dataProp,
+                               name:       column.sName,
+                               searchable: column.bSearchable,
+                               orderable:  column.bSortable,
+                               search:     {
+                                       value: columnSearch.sSearch,
+                                       regex: columnSearch.bRegex
+                               }
+                       } );
+       
+                       param( "mDataProp_"+i, dataProp );
+       
+                       if ( features.bFilter ) {
+                               param( 'sSearch_'+i,     columnSearch.sSearch );
+                               param( 'bRegex_'+i,      columnSearch.bRegex );
+                               param( 'bSearchable_'+i, column.bSearchable );
                        }
-                       else if ( typeof sData === "string" )
-                       {
-                               return sData.replace(/[\r\n]/g," ");
+       
+                       if ( features.bSort ) {
+                               param( 'bSortable_'+i, column.bSortable );
                        }
-                       return sData;
                }
-               
-               
-               /**
-                * scape a string such that it can be used in a regular expression
-                *  @param {string} sVal string to escape
-                *  @returns {string} escaped string
-                *  @memberof DataTable#oApi
-                */
-               function _fnEscapeRegex ( sVal )
-               {
-                       var acEscape = [ '/', '.', '*', '+', '?', '|', '(', ')', '[', ']', '{', '}', '\\', '$', '^', '-' ];
-                       var reReplace = new RegExp( '(\\' + acEscape.join('|\\') + ')', 'g' );
-                       return sVal.replace(reReplace, '\\$1');
+       
+               if ( features.bFilter ) {
+                       param( 'sSearch', preSearch.sSearch );
+                       param( 'bRegex', preSearch.bRegex );
                }
-               
-               
-               /**
-                * Generate the node required for the info display
-                *  @param {object} oSettings dataTables settings object
-                *  @returns {node} Information element
-                *  @memberof DataTable#oApi
-                */
-               function _fnFeatureHtmlInfo ( oSettings )
-               {
-                       var nInfo = document.createElement( 'div' );
-                       nInfo.className = oSettings.oClasses.sInfo;
-                       
-                       /* Actions that are to be taken once only for this feature */
-                       if ( !oSettings.aanFeatures.i )
-                       {
-                               /* Add draw callback */
-                               oSettings.aoDrawCallback.push( {
-                                       "fn": _fnUpdateInfo,
-                                       "sName": "information"
-                               } );
-                               
-                               /* Add id */
-                               nInfo.id = oSettings.sTableId+'_info';
-                       }
-                       oSettings.nTable.setAttribute( 'aria-describedby', oSettings.sTableId+'_info' );
-                       
-                       return nInfo;
+       
+               if ( features.bSort ) {
+                       $.each( sort, function ( i, val ) {
+                               d.order.push( { column: val.col, dir: val.dir } );
+       
+                               param( 'iSortCol_'+i, val.col );
+                               param( 'sSortDir_'+i, val.dir );
+                       } );
+       
+                       param( 'iSortingCols', sort.length );
                }
-               
-               
-               /**
-                * Update the information elements in the display
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
-                */
-               function _fnUpdateInfo ( oSettings )
-               {
-                       /* Show information about the table */
-                       if ( !oSettings.oFeatures.bInfo || oSettings.aanFeatures.i.length === 0 )
-                       {
+       
+               // If the legacy.ajax parameter is null, then we automatically decide which
+               // form to use, based on sAjaxSource
+               var legacy = DataTable.ext.legacy.ajax;
+               if ( legacy === null ) {
+                       return settings.sAjaxSource ? data : d;
+               }
+       
+               // Otherwise, if legacy has been specified then we use that to decide on the
+               // form
+               return legacy ? data : d;
+       }
+       
+       
+       /**
+        * Data the data from the server (nuking the old) and redraw the table
+        *  @param {object} oSettings dataTables settings object
+        *  @param {object} json json data return from the server.
+        *  @param {string} json.sEcho Tracking flag for DataTables to match requests
+        *  @param {int} json.iTotalRecords Number of records in the data set, not accounting for filtering
+        *  @param {int} json.iTotalDisplayRecords Number of records in the data set, accounting for filtering
+        *  @param {array} json.aaData The data to display on this page
+        *  @param {string} [json.sColumns] Column ordering (sName, comma separated)
+        *  @memberof DataTable#oApi
+        */
+       function _fnAjaxUpdateDraw ( settings, json )
+       {
+               // v1.10 uses camelCase variables, while 1.9 uses Hungarian notation.
+               // Support both
+               var compat = function ( old, modern ) {
+                       return json[old] !== undefined ? json[old] : json[modern];
+               };
+       
+               var draw            = compat( 'sEcho',                'draw' );
+               var recordsTotal    = compat( 'iTotalRecords',        'recordsTotal' );
+               var rocordsFiltered = compat( 'iTotalDisplayRecords', 'recordsFiltered' );
+       
+               if ( draw ) {
+                       // Protect against out of sequence returns
+                       if ( draw*1 < settings.iDraw ) {
                                return;
                        }
-                       
-                       var
-                               oLang = oSettings.oLanguage,
-                               iStart = oSettings._iDisplayStart+1,
-                               iEnd = oSettings.fnDisplayEnd(),
-                               iMax = oSettings.fnRecordsTotal(),
-                               iTotal = oSettings.fnRecordsDisplay(),
-                               sOut;
-                       
-                       if ( iTotal === 0 )
-                       {
-                               /* Empty record set */
-                               sOut = oLang.sInfoEmpty;
-                       }
-                       else {
-                               /* Normal record set */
-                               sOut = oLang.sInfo;
-                       }
-               
-                       if ( iTotal != iMax )
-                       {
-                               /* Record set after filtering */
-                               sOut += ' ' + oLang.sInfoFiltered;
-                       }
-               
-                       // Convert the macros
-                       sOut += oLang.sInfoPostFix;
-                       sOut = _fnInfoMacros( oSettings, sOut );
-                       
-                       if ( oLang.fnInfoCallback !== null )
-                       {
-                               sOut = oLang.fnInfoCallback.call( oSettings.oInstance, 
-                                       oSettings, iStart, iEnd, iMax, iTotal, sOut );
+                       settings.iDraw = draw * 1;
+               }
+       
+               _fnClearTable( settings );
+               settings._iRecordsTotal   = parseInt(recordsTotal, 10);
+               settings._iRecordsDisplay = parseInt(rocordsFiltered, 10);
+       
+               var data = _fnAjaxDataSrc( settings, json );
+               for ( var i=0, ien=data.length ; i<ien ; i++ ) {
+                       _fnAddData( settings, data[i] );
+               }
+               settings.aiDisplay = settings.aiDisplayMaster.slice();
+       
+               settings.bAjaxDataGet = false;
+               _fnDraw( settings );
+       
+               if ( ! settings._bInitComplete ) {
+                       _fnInitComplete( settings, json );
+               }
+       
+               settings.bAjaxDataGet = true;
+               _fnProcessingDisplay( settings, false );
+       }
+       
+       
+       /**
+        * Get the data from the JSON data source to use for drawing a table. Using
+        * `_fnGetObjectDataFn` allows the data to be sourced from a property of the
+        * source object, or from a processing function.
+        *  @param {object} oSettings dataTables settings object
+        *  @param  {object} json Data source object / array from the server
+        *  @return {array} Array of data to use
+        */
+       function _fnAjaxDataSrc ( oSettings, json )
+       {
+               var dataSrc = $.isPlainObject( oSettings.ajax ) && oSettings.ajax.dataSrc !== undefined ?
+                       oSettings.ajax.dataSrc :
+                       oSettings.sAjaxDataProp; // Compatibility with 1.9-.
+       
+               // Compatibility with 1.9-. In order to read from aaData, check if the
+               // default has been changed, if not, check for aaData
+               if ( dataSrc === 'data' ) {
+                       return json.aaData || json[dataSrc];
+               }
+       
+               return dataSrc !== "" ?
+                       _fnGetObjectDataFn( dataSrc )( json ) :
+                       json;
+       }
+       
+       
+       /**
+        * Generate the node required for filtering text
+        *  @returns {node} Filter control element
+        *  @param {object} oSettings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnFeatureHtmlFilter ( settings )
+       {
+               var classes = settings.oClasses;
+               var tableId = settings.sTableId;
+               var previousSearch = settings.oPreviousSearch;
+               var features = settings.aanFeatures;
+               var input = '<input type="search" class="'+classes.sFilterInput+'"/>';
+       
+               var str = settings.oLanguage.sSearch;
+               str = str.match(/_INPUT_/) ?
+                       str.replace('_INPUT_', input) :
+                       str+input;
+       
+               var filter = $('<div/>', {
+                               'id': ! features.f ? tableId+'_filter' : null,
+                               'class': classes.sFilter
+                       } )
+                       .append( $('<label/>' ).append( str ) );
+       
+               var searchFn = function() {
+                       /* Update all other filter input elements for the new display */
+                       var n = features.f;
+                       var val = !this.value ? "" : this.value; // mental IE8 fix :-(
+       
+                       /* Now do the filter */
+                       if ( val != previousSearch.sSearch ) {
+                               _fnFilterComplete( settings, {
+                                       "sSearch": val,
+                                       "bRegex": previousSearch.bRegex,
+                                       "bSmart": previousSearch.bSmart ,
+                                       "bCaseInsensitive": previousSearch.bCaseInsensitive
+                               } );
+       
+                               // Need to redraw, without resorting
+                               settings._iDisplayStart = 0;
+                               _fnDraw( settings );
                        }
-                       
-                       var n = oSettings.aanFeatures.i;
-                       for ( var i=0, iLen=n.length ; i<iLen ; i++ )
-                       {
-                               $(n[i]).html( sOut );
+               };
+               var jqFilter = $('input', filter)
+                       .val( previousSearch.sSearch.replace('"','&quot;') )
+                       .bind(
+                               'keyup.DT search.DT input.DT paste.DT cut.DT',
+                               _fnDataSource( settings ) === 'ssp' ?
+                                       _fnThrottle( searchFn, 400 ):
+                                       searchFn
+                       )
+                       .bind( 'keypress.DT', function(e) {
+                               /* Prevent form submission */
+                               if ( e.keyCode == 13 ) {
+                                       return false;
+                               }
+                       } )
+                       .attr('aria-controls', tableId);
+       
+               // Update the input elements whenever the table is filtered
+               $(settings.nTable).on( 'filter.DT', function () {
+                       // IE9 throws an 'unknown error' if document.activeElement is used
+                       // inside an iframe or frame...
+                       try {
+                               if ( jqFilter[0] !== document.activeElement ) {
+                                       jqFilter.val( previousSearch.sSearch );
+                               }
                        }
-               }
-               
-               
-               function _fnInfoMacros ( oSettings, str )
+                       catch ( e ) {}
+               } );
+       
+               return filter[0];
+       }
+       
+       
+       /**
+        * Filter the table using both the global filter and column based filtering
+        *  @param {object} oSettings dataTables settings object
+        *  @param {object} oSearch search information
+        *  @param {int} [iForce] force a research of the master array (1) or not (undefined or 0)
+        *  @memberof DataTable#oApi
+        */
+       function _fnFilterComplete ( oSettings, oInput, iForce )
+       {
+               var oPrevSearch = oSettings.oPreviousSearch;
+               var aoPrevSearch = oSettings.aoPreSearchCols;
+               var fnSaveFilter = function ( oFilter ) {
+                       /* Save the filtering values */
+                       oPrevSearch.sSearch = oFilter.sSearch;
+                       oPrevSearch.bRegex = oFilter.bRegex;
+                       oPrevSearch.bSmart = oFilter.bSmart;
+                       oPrevSearch.bCaseInsensitive = oFilter.bCaseInsensitive;
+               };
+               var fnRegex = function ( o ) {
+                       // Backwards compatibility with the bEscapeRegex option
+                       return o.bEscapeRegex !== undefined ? !o.bEscapeRegex : o.bRegex;
+               };
+       
+               // Resolve any column types that are unknown due to addition or invalidation
+               // @todo As per sort - can this be moved into an event handler?
+               _fnColumnTypes( oSettings );
+       
+               /* In server-side processing all filtering is done by the server, so no point hanging around here */
+               if ( _fnDataSource( oSettings ) != 'ssp' )
                {
-                       var
-                               iStart = oSettings._iDisplayStart+1,
-                               sStart = oSettings.fnFormatNumber( iStart ),
-                               iEnd = oSettings.fnDisplayEnd(),
-                               sEnd = oSettings.fnFormatNumber( iEnd ),
-                               iTotal = oSettings.fnRecordsDisplay(),
-                               sTotal = oSettings.fnFormatNumber( iTotal ),
-                               iMax = oSettings.fnRecordsTotal(),
-                               sMax = oSettings.fnFormatNumber( iMax );
-               
-                       // When infinite scrolling, we are always starting at 1. _iDisplayStart is used only
-                       // internally
-                       if ( oSettings.oScroll.bInfinite )
+                       /* Global filter */
+                       _fnFilter( oSettings, oInput.sSearch, iForce, fnRegex(oInput), oInput.bSmart, oInput.bCaseInsensitive );
+                       fnSaveFilter( oInput );
+       
+                       /* Now do the individual column filter */
+                       for ( var i=0 ; i<aoPrevSearch.length ; i++ )
                        {
-                               sStart = oSettings.fnFormatNumber( 1 );
+                               _fnFilterColumn( oSettings, aoPrevSearch[i].sSearch, i, fnRegex(aoPrevSearch[i]),
+                                       aoPrevSearch[i].bSmart, aoPrevSearch[i].bCaseInsensitive );
                        }
-               
-                       return str.
-                               replace(/_START_/g, sStart).
-                               replace(/_END_/g,   sEnd).
-                               replace(/_TOTAL_/g, sTotal).
-                               replace(/_MAX_/g,   sMax);
+       
+                       /* Custom filtering */
+                       _fnFilterCustom( oSettings );
                }
-               
-               
-               
-               /**
-                * Draw the table for the first time, adding all required features
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
-                */
-               function _fnInitialise ( oSettings )
+               else
                {
-                       var i, iLen, iAjaxStart=oSettings.iInitDisplayStart;
-                       
-                       /* Ensure that the table data is fully initialised */
-                       if ( oSettings.bInitialised === false )
-                       {
-                               setTimeout( function(){ _fnInitialise( oSettings ); }, 200 );
-                               return;
+                       fnSaveFilter( oInput );
+               }
+       
+               /* Tell the draw function we have been filtering */
+               oSettings.bFiltered = true;
+               _fnCallbackFire( oSettings, null, 'search', [oSettings] );
+       }
+       
+       
+       /**
+        * Apply custom filtering functions
+        *  @param {object} oSettings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnFilterCustom( settings )
+       {
+               var filters = DataTable.ext.search;
+               var displayRows = settings.aiDisplay;
+               var row, rowIdx;
+       
+               for ( var i=0, iLen=filters.length ; i<iLen ; i++ ) {
+                       for ( var j=displayRows.length-1 ; j>=0 ; j-- ) {
+                               rowIdx = displayRows[ j ];
+                               row = settings.aoData[ rowIdx ];
+       
+                               if ( ! filters[i]( settings, row._aFilterData, rowIdx, row._aData ) ) {
+                                       displayRows.splice( j, 1 );
+                               }
                        }
-                       
-                       /* Show the display HTML options */
-                       _fnAddOptionsHtml( oSettings );
-                       
-                       /* Build and draw the header / footer for the table */
-                       _fnBuildHead( oSettings );
-                       _fnDrawHead( oSettings, oSettings.aoHeader );
-                       if ( oSettings.nTFoot )
-                       {
-                               _fnDrawHead( oSettings, oSettings.aoFooter );
+               }
+       }
+       
+       
+       /**
+        * Filter the table on a per-column basis
+        *  @param {object} oSettings dataTables settings object
+        *  @param {string} sInput string to filter on
+        *  @param {int} iColumn column to filter
+        *  @param {bool} bRegex treat search string as a regular expression or not
+        *  @param {bool} bSmart use smart filtering or not
+        *  @param {bool} bCaseInsensitive Do case insenstive matching or not
+        *  @memberof DataTable#oApi
+        */
+       function _fnFilterColumn ( settings, searchStr, colIdx, regex, smart, caseInsensitive )
+       {
+               if ( searchStr === '' ) {
+                       return;
+               }
+       
+               var data;
+               var display = settings.aiDisplay;
+               var rpSearch = _fnFilterCreateSearch( searchStr, regex, smart, caseInsensitive );
+       
+               for ( var i=display.length-1 ; i>=0 ; i-- ) {
+                       data = settings.aoData[ display[i] ]._aFilterData[ colIdx ];
+       
+                       if ( ! rpSearch.test( data ) ) {
+                               display.splice( i, 1 );
                        }
-               
-                       /* Okay to show that something is going on now */
-                       _fnProcessingDisplay( oSettings, true );
-                       
-                       /* Calculate sizes for columns */
-                       if ( oSettings.oFeatures.bAutoWidth )
-                       {
-                               _fnCalculateColumnWidths( oSettings );
+               }
+       }
+       
+       
+       /**
+        * Filter the data table based on user input and draw the table
+        *  @param {object} settings dataTables settings object
+        *  @param {string} input string to filter on
+        *  @param {int} force optional - force a research of the master array (1) or not (undefined or 0)
+        *  @param {bool} regex treat as a regular expression or not
+        *  @param {bool} smart perform smart filtering or not
+        *  @param {bool} caseInsensitive Do case insenstive matching or not
+        *  @memberof DataTable#oApi
+        */
+       function _fnFilter( settings, input, force, regex, smart, caseInsensitive )
+       {
+               var rpSearch = _fnFilterCreateSearch( input, regex, smart, caseInsensitive );
+               var prevSearch = settings.oPreviousSearch.sSearch;
+               var displayMaster = settings.aiDisplayMaster;
+               var display, invalidated, i;
+       
+               // Need to take account of custom filtering functions - always filter
+               if ( DataTable.ext.search.length !== 0 ) {
+                       force = true;
+               }
+       
+               // Check if any of the rows were invalidated
+               invalidated = _fnFilterData( settings );
+       
+               // If the input is blank - we just want the full data set
+               if ( input.length <= 0 ) {
+                       settings.aiDisplay = displayMaster.slice();
+               }
+               else {
+                       // New search - start from the master array
+                       if ( invalidated ||
+                                force ||
+                                prevSearch.length > input.length ||
+                                input.indexOf(prevSearch) !== 0 ||
+                                settings.bSorted // On resort, the display master needs to be
+                                                 // re-filtered since indexes will have changed
+                       ) {
+                               settings.aiDisplay = displayMaster.slice();
                        }
-                       
-                       for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-                       {
-                               if ( oSettings.aoColumns[i].sWidth !== null )
-                               {
-                                       oSettings.aoColumns[i].nTh.style.width = _fnStringToCss( oSettings.aoColumns[i].sWidth );
+       
+                       // Search the display array
+                       display = settings.aiDisplay;
+       
+                       for ( i=display.length-1 ; i>=0 ; i-- ) {
+                               if ( ! rpSearch.test( settings.aoData[ display[i] ]._sFilterRow ) ) {
+                                       display.splice( i, 1 );
                                }
                        }
-                       
-                       /* If there is default sorting required - let's do it. The sort function will do the
-                        * drawing for us. Otherwise we draw the table regardless of the Ajax source - this allows
-                        * the table to look initialised for Ajax sourcing data (show 'loading' message possibly)
+               }
+       }
+       
+       
+       /**
+        * Build a regular expression object suitable for searching a table
+        *  @param {string} sSearch string to search for
+        *  @param {bool} bRegex treat as a regular expression or not
+        *  @param {bool} bSmart perform smart filtering or not
+        *  @param {bool} bCaseInsensitive Do case insensitive matching or not
+        *  @returns {RegExp} constructed object
+        *  @memberof DataTable#oApi
+        */
+       function _fnFilterCreateSearch( search, regex, smart, caseInsensitive )
+       {
+               search = regex ?
+                       search :
+                       _fnEscapeRegex( search );
+               
+               if ( smart ) {
+                       /* For smart filtering we want to allow the search to work regardless of
+                        * word order. We also want double quoted text to be preserved, so word
+                        * order is important - a la google. So this is what we want to
+                        * generate:
+                        * 
+                        * ^(?=.*?\bone\b)(?=.*?\btwo three\b)(?=.*?\bfour\b).*$
                         */
-                       if ( oSettings.oFeatures.bSort )
-                       {
-                               _fnSort( oSettings );
-                       }
-                       else if ( oSettings.oFeatures.bFilter )
-                       {
-                               _fnFilterComplete( oSettings, oSettings.oPreviousSearch );
-                       }
-                       else
-                       {
-                               oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-                               _fnCalculateEnd( oSettings );
-                               _fnDraw( oSettings );
-                       }
-                       
-                       /* if there is an ajax source load the data */
-                       if ( oSettings.sAjaxSource !== null && !oSettings.oFeatures.bServerSide )
-                       {
-                               var aoData = [];
-                               _fnServerParams( oSettings, aoData );
-                               oSettings.fnServerData.call( oSettings.oInstance, oSettings.sAjaxSource, aoData, function(json) {
-                                       var aData = (oSettings.sAjaxDataProp !== "") ?
-                                               _fnGetObjectDataFn( oSettings.sAjaxDataProp )(json) : json;
-               
-                                       /* Got the data - add it to the table */
-                                       for ( i=0 ; i<aData.length ; i++ )
-                                       {
-                                               _fnAddData( oSettings, aData[i] );
+                       var a = $.map( search.match( /"[^"]+"|[^ ]+/g ) || '', function ( word ) {
+                               return word.charAt(0) === '"' ?
+                                       word.match( /^"(.*)"$/ )[1] :
+                                       word;
+                       } );
+       
+                       search = '^(?=.*?'+a.join( ')(?=.*?' )+').*$';
+               }
+       
+               return new RegExp( search, caseInsensitive ? 'i' : '' );
+       }
+       
+       
+       /**
+        * scape a string such that it can be used in a regular expression
+        *  @param {string} sVal string to escape
+        *  @returns {string} escaped string
+        *  @memberof DataTable#oApi
+        */
+       function _fnEscapeRegex ( sVal )
+       {
+               return sVal.replace( _re_escape_regex, '\\$1' );
+       }
+       
+       
+       
+       var __filter_div = $('<div>')[0];
+       var __filter_div_textContent = __filter_div.textContent !== undefined;
+       
+       // Update the filtering data for each row if needed (by invalidation or first run)
+       function _fnFilterData ( settings )
+       {
+               var columns = settings.aoColumns;
+               var column;
+               var i, j, ien, jen, filterData, cellData, row;
+               var fomatters = DataTable.ext.type.search;
+               var wasInvalidated = false;
+       
+               for ( i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
+                       row = settings.aoData[i];
+       
+                       if ( ! row._aFilterData ) {
+                               filterData = [];
+       
+                               for ( j=0, jen=columns.length ; j<jen ; j++ ) {
+                                       column = columns[j];
+       
+                                       if ( column.bSearchable ) {
+                                               cellData = _fnGetCellData( settings, i, j, 'filter' );
+       
+                                               cellData = fomatters[ column.sType ] ?
+                                                       fomatters[ column.sType ]( cellData ) :
+                                                       cellData !== null ?
+                                                               cellData :
+                                                               '';
                                        }
-                                       
-                                       /* Reset the init display for cookie saving. We've already done a filter, and
-                                        * therefore cleared it before. So we need to make it appear 'fresh'
-                                        */
-                                       oSettings.iInitDisplayStart = iAjaxStart;
-                                       
-                                       if ( oSettings.oFeatures.bSort )
-                                       {
-                                               _fnSort( oSettings );
+                                       else {
+                                               cellData = '';
                                        }
-                                       else
-                                       {
-                                               oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-                                               _fnCalculateEnd( oSettings );
-                                               _fnDraw( oSettings );
+       
+                                       // If it looks like there is an HTML entity in the string,
+                                       // attempt to decode it so sorting works as expected. Note that
+                                       // we could use a single line of jQuery to do this, but the DOM
+                                       // method used here is much faster http://jsperf.com/html-decode
+                                       if ( cellData.indexOf && cellData.indexOf('&') !== -1 ) {
+                                               __filter_div.innerHTML = cellData;
+                                               cellData = __filter_div_textContent ?
+                                                       __filter_div.textContent :
+                                                       __filter_div.innerText;
                                        }
-                                       
-                                       _fnProcessingDisplay( oSettings, false );
-                                       _fnInitComplete( oSettings, json );
-                               }, oSettings );
-                               return;
-                       }
-                       
-                       /* Server-side processing initialisation complete is done at the end of _fnDraw */
-                       if ( !oSettings.oFeatures.bServerSide )
-                       {
-                               _fnProcessingDisplay( oSettings, false );
-                               _fnInitComplete( oSettings );
+       
+                                       if ( cellData.replace ) {
+                                               cellData = cellData.replace(/[\r\n]/g, '');
+                                       }
+       
+                                       filterData.push( cellData );
+                               }
+       
+                               row._aFilterData = filterData;
+                               row._sFilterRow = filterData.join('  ');
+                               wasInvalidated = true;
                        }
                }
-               
-               
-               /**
-                * Draw the table for the first time, adding all required features
-                *  @param {object} oSettings dataTables settings object
-                *  @param {object} [json] JSON from the server that completed the table, if using Ajax source
-                *    with client-side processing (optional)
-                *  @memberof DataTable#oApi
-                */
-               function _fnInitComplete ( oSettings, json )
-               {
-                       oSettings._bInitComplete = true;
-                       _fnCallbackFire( oSettings, 'aoInitComplete', 'init', [oSettings, json] );
+       
+               return wasInvalidated;
+       }
+       
+       /**
+        * Generate the node required for the info display
+        *  @param {object} oSettings dataTables settings object
+        *  @returns {node} Information element
+        *  @memberof DataTable#oApi
+        */
+       function _fnFeatureHtmlInfo ( settings )
+       {
+               var
+                       tid = settings.sTableId,
+                       nodes = settings.aanFeatures.i,
+                       n = $('<div/>', {
+                               'class': settings.oClasses.sInfo,
+                               'id': ! nodes ? tid+'_info' : null
+                       } );
+       
+               if ( ! nodes ) {
+                       // Update display on each draw
+                       settings.aoDrawCallback.push( {
+                               "fn": _fnUpdateInfo,
+                               "sName": "information"
+                       } );
+       
+                       n
+                               .attr( 'role', 'status' )
+                               .attr( 'aria-live', 'polite' );
+       
+                       // Table is described by our info div
+                       $(settings.nTable).attr( 'aria-describedby', tid+'_info' );
                }
-               
-               
-               /**
-                * Language compatibility - when certain options are given, and others aren't, we
-                * need to duplicate the values over, in order to provide backwards compatibility
-                * with older language files.
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
-                */
-               function _fnLanguageCompat( oLanguage )
-               {
-                       var oDefaults = DataTable.defaults.oLanguage;
-               
-                       /* Backwards compatibility - if there is no sEmptyTable given, then use the same as
-                        * sZeroRecords - assuming that is given.
-                        */
-                       if ( !oLanguage.sEmptyTable && oLanguage.sZeroRecords &&
-                               oDefaults.sEmptyTable === "No data available in table" )
-                       {
-                               _fnMap( oLanguage, oLanguage, 'sZeroRecords', 'sEmptyTable' );
-                       }
-               
-                       /* Likewise with loading records */
-                       if ( !oLanguage.sLoadingRecords && oLanguage.sZeroRecords &&
-                               oDefaults.sLoadingRecords === "Loading..." )
-                       {
-                               _fnMap( oLanguage, oLanguage, 'sZeroRecords', 'sLoadingRecords' );
-                       }
+       
+               return n[0];
+       }
+       
+       
+       /**
+        * Update the information elements in the display
+        *  @param {object} settings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnUpdateInfo ( settings )
+       {
+               /* Show information about the table */
+               var nodes = settings.aanFeatures.i;
+               if ( nodes.length === 0 ) {
+                       return;
                }
-               
-               
-               
-               /**
-                * Generate the node required for user display length changing
-                *  @param {object} oSettings dataTables settings object
-                *  @returns {node} Display length feature node
-                *  @memberof DataTable#oApi
-                */
-               function _fnFeatureHtmlLength ( oSettings )
-               {
-                       if ( oSettings.oScroll.bInfinite )
-                       {
-                               return null;
+       
+               var
+                       lang  = settings.oLanguage,
+                       start = settings._iDisplayStart+1,
+                       end   = settings.fnDisplayEnd(),
+                       max   = settings.fnRecordsTotal(),
+                       total = settings.fnRecordsDisplay(),
+                       out   = total ?
+                               lang.sInfo :
+                               lang.sInfoEmpty;
+       
+               if ( total !== max ) {
+                       /* Record set after filtering */
+                       out += ' ' + lang.sInfoFiltered;
+               }
+       
+               // Convert the macros
+               out += lang.sInfoPostFix;
+               out = _fnInfoMacros( settings, out );
+       
+               var callback = lang.fnInfoCallback;
+               if ( callback !== null ) {
+                       out = callback.call( settings.oInstance,
+                               settings, start, end, max, total, out
+                       );
+               }
+       
+               $(nodes).html( out );
+       }
+       
+       
+       function _fnInfoMacros ( settings, str )
+       {
+               // When infinite scrolling, we are always starting at 1. _iDisplayStart is used only
+               // internally
+               var
+                       formatter  = settings.fnFormatNumber,
+                       start      = settings._iDisplayStart+1,
+                       len        = settings._iDisplayLength,
+                       vis        = settings.fnRecordsDisplay(),
+                       all        = len === -1;
+       
+               return str.
+                       replace(/_START_/g, formatter.call( settings, start ) ).
+                       replace(/_END_/g,   formatter.call( settings, settings.fnDisplayEnd() ) ).
+                       replace(/_MAX_/g,   formatter.call( settings, settings.fnRecordsTotal() ) ).
+                       replace(/_TOTAL_/g, formatter.call( settings, vis ) ).
+                       replace(/_PAGE_/g,  formatter.call( settings, all ? 1 : Math.ceil( start / len ) ) ).
+                       replace(/_PAGES_/g, formatter.call( settings, all ? 1 : Math.ceil( vis / len ) ) );
+       }
+       
+       
+       
+       /**
+        * Draw the table for the first time, adding all required features
+        *  @param {object} settings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnInitialise ( settings )
+       {
+               var i, iLen, iAjaxStart=settings.iInitDisplayStart;
+               var columns = settings.aoColumns, column;
+               var features = settings.oFeatures;
+       
+               /* Ensure that the table data is fully initialised */
+               if ( ! settings.bInitialised ) {
+                       setTimeout( function(){ _fnInitialise( settings ); }, 200 );
+                       return;
+               }
+       
+               /* Show the display HTML options */
+               _fnAddOptionsHtml( settings );
+       
+               /* Build and draw the header / footer for the table */
+               _fnBuildHead( settings );
+               _fnDrawHead( settings, settings.aoHeader );
+               _fnDrawHead( settings, settings.aoFooter );
+       
+               /* Okay to show that something is going on now */
+               _fnProcessingDisplay( settings, true );
+       
+               /* Calculate sizes for columns */
+               if ( features.bAutoWidth ) {
+                       _fnCalculateColumnWidths( settings );
+               }
+       
+               for ( i=0, iLen=columns.length ; i<iLen ; i++ ) {
+                       column = columns[i];
+       
+                       if ( column.sWidth ) {
+                               column.nTh.style.width = _fnStringToCss( column.sWidth );
                        }
-                       
-                       /* This can be overruled by not using the _MENU_ var/macro in the language variable */
-                       var sName = 'name="'+oSettings.sTableId+'_length"';
-                       var sStdMenu = '<select size="1" '+sName+'>';
-                       var i, iLen;
-                       var aLengthMenu = oSettings.aLengthMenu;
-                       
-                       if ( aLengthMenu.length == 2 && typeof aLengthMenu[0] === 'object' && 
-                                       typeof aLengthMenu[1] === 'object' )
-                       {
-                               for ( i=0, iLen=aLengthMenu[0].length ; i<iLen ; i++ )
-                               {
-                                       sStdMenu += '<option value="'+aLengthMenu[0][i]+'">'+aLengthMenu[1][i]+'</option>';
-                               }
+               }
+       
+               // If there is default sorting required - let's do it. The sort function
+               // will do the drawing for us. Otherwise we draw the table regardless of the
+               // Ajax source - this allows the table to look initialised for Ajax sourcing
+               // data (show 'loading' message possibly)
+               _fnReDraw( settings );
+       
+               // Server-side processing init complete is done by _fnAjaxUpdateDraw
+               var dataSrc = _fnDataSource( settings );
+               if ( dataSrc != 'ssp' ) {
+                       // if there is an ajax source load the data
+                       if ( dataSrc == 'ajax' ) {
+                               _fnBuildAjax( settings, [], function(json) {
+                                       var aData = _fnAjaxDataSrc( settings, json );
+       
+                                       // Got the data - add it to the table
+                                       for ( i=0 ; i<aData.length ; i++ ) {
+                                               _fnAddData( settings, aData[i] );
+                                       }
+       
+                                       // Reset the init display for cookie saving. We've already done
+                                       // a filter, and therefore cleared it before. So we need to make
+                                       // it appear 'fresh'
+                                       settings.iInitDisplayStart = iAjaxStart;
+       
+                                       _fnReDraw( settings );
+       
+                                       _fnProcessingDisplay( settings, false );
+                                       _fnInitComplete( settings, json );
+                               }, settings );
                        }
-                       else
-                       {
-                               for ( i=0, iLen=aLengthMenu.length ; i<iLen ; i++ )
-                               {
-                                       sStdMenu += '<option value="'+aLengthMenu[i]+'">'+aLengthMenu[i]+'</option>';
-                               }
+                       else {
+                               _fnProcessingDisplay( settings, false );
+                               _fnInitComplete( settings );
                        }
-                       sStdMenu += '</select>';
-                       
-                       var nLength = document.createElement( 'div' );
-                       if ( !oSettings.aanFeatures.l )
-                       {
-                               nLength.id = oSettings.sTableId+'_length';
-                       }
-                       nLength.className = oSettings.oClasses.sLength;
-                       nLength.innerHTML = '<label>'+oSettings.oLanguage.sLengthMenu.replace( '_MENU_', sStdMenu )+'</label>';
-                       
-                       /*
-                        * Set the length to the current display length - thanks to Andrea Pavlovic for this fix,
-                        * and Stefan Skopnik for fixing the fix!
-                        */
-                       $('select option[value="'+oSettings._iDisplayLength+'"]', nLength).attr("selected", true);
-                       
-                       $('select', nLength).bind( 'change.DT', function(e) {
-                               var iVal = $(this).val();
-                               
-                               /* Update all other length options for the new display */
-                               var n = oSettings.aanFeatures.l;
-                               for ( i=0, iLen=n.length ; i<iLen ; i++ )
-                               {
-                                       if ( n[i] != this.parentNode )
-                                       {
-                                               $('select', n[i]).val( iVal );
+               }
+       }
+       
+       
+       /**
+        * Draw the table for the first time, adding all required features
+        *  @param {object} oSettings dataTables settings object
+        *  @param {object} [json] JSON from the server that completed the table, if using Ajax source
+        *    with client-side processing (optional)
+        *  @memberof DataTable#oApi
+        */
+       function _fnInitComplete ( settings, json )
+       {
+               settings._bInitComplete = true;
+       
+               // On an Ajax load we now have data and therefore want to apply the column
+               // sizing
+               if ( json ) {
+                       _fnAdjustColumnSizing( settings );
+               }
+       
+               _fnCallbackFire( settings, 'aoInitComplete', 'init', [settings, json] );
+       }
+       
+       
+       function _fnLengthChange ( settings, val )
+       {
+               var len = parseInt( val, 10 );
+               settings._iDisplayLength = len;
+       
+               _fnLengthOverflow( settings );
+       
+               // Fire length change event
+               _fnCallbackFire( settings, null, 'length', [settings, len] );
+       }
+       
+       
+       /**
+        * Generate the node required for user display length changing
+        *  @param {object} settings dataTables settings object
+        *  @returns {node} Display length feature node
+        *  @memberof DataTable#oApi
+        */
+       function _fnFeatureHtmlLength ( settings )
+       {
+               var
+                       classes  = settings.oClasses,
+                       tableId  = settings.sTableId,
+                       menu     = settings.aLengthMenu,
+                       d2       = $.isArray( menu[0] ),
+                       lengths  = d2 ? menu[0] : menu,
+                       language = d2 ? menu[1] : menu;
+       
+               var select = $('<select/>', {
+                       'name':          tableId+'_length',
+                       'aria-controls': tableId,
+                       'class':         classes.sLengthSelect
+               } );
+       
+               for ( var i=0, ien=lengths.length ; i<ien ; i++ ) {
+                       select[0][ i ] = new Option( language[i], lengths[i] );
+               }
+       
+               var div = $('<div><label/></div>').addClass( classes.sLength );
+               if ( ! settings.aanFeatures.l ) {
+                       div[0].id = tableId+'_length';
+               }
+       
+               var a = settings.oLanguage.sLengthMenu.split(/(_MENU_)/);
+               div.children().append( a.length > 1 ?
+                       [ a[0], select, a[2] ] :
+                       a[0]
+               );
+       
+               // Can't use `select` variable, as user might provide their own select menu
+               $('select', div)
+                       .val( settings._iDisplayLength )
+                       .bind( 'change.DT', function(e) {
+                               _fnLengthChange( settings, $(this).val() );
+                               _fnDraw( settings );
+                       } );
+       
+               // Update node value whenever anything changes the table's length
+               $(settings.nTable).bind( 'length.dt.DT', function (e, s, len) {
+                       $('select', div).val( len );
+               } );
+       
+               return div[0];
+       }
+       
+       
+       
+       /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+        * Note that most of the paging logic is done in
+        * DataTable.ext.pager
+        */
+       
+       /**
+        * Generate the node required for default pagination
+        *  @param {object} oSettings dataTables settings object
+        *  @returns {node} Pagination feature node
+        *  @memberof DataTable#oApi
+        */
+       function _fnFeatureHtmlPaginate ( settings )
+       {
+               var
+                       type   = settings.sPaginationType,
+                       plugin = DataTable.ext.pager[ type ],
+                       modern = typeof plugin === 'function',
+                       redraw = function( settings ) {
+                               _fnDraw( settings );
+                       },
+                       node = $('<div/>').addClass( settings.oClasses.sPaging + type )[0],
+                       features = settings.aanFeatures;
+       
+               if ( ! modern ) {
+                       plugin.fnInit( settings, node, redraw );
+               }
+       
+               /* Add a draw callback for the pagination on first instance, to update the paging display */
+               if ( ! features.p )
+               {
+                       node.id = settings.sTableId+'_paginate';
+       
+                       settings.aoDrawCallback.push( {
+                               "fn": function( settings ) {
+                                       if ( modern ) {
+                                               var
+                                                       start      = settings._iDisplayStart,
+                                                       len        = settings._iDisplayLength,
+                                                       visRecords = settings.fnRecordsDisplay(),
+                                                       all        = len === -1,
+                                                       page = all ? 0 : Math.ceil( start / len ),
+                                                       pages = all ? 1 : Math.ceil( visRecords / len ),
+                                                       buttons = plugin(page, pages),
+                                                       i, ien;
+       
+                                               for ( i=0, ien=features.p.length ; i<ien ; i++ ) {
+                                                       _fnRenderer( settings, 'pageButton' )(
+                                                               settings, features.p[i], i, buttons, page, pages
+                                                       );
+                                               }
                                        }
-                               }
-                               
-                               /* Redraw the table */
-                               oSettings._iDisplayLength = parseInt(iVal, 10);
-                               _fnCalculateEnd( oSettings );
-                               
-                               /* If we have space to show extra rows (backing up from the end point - then do so */
-                               if ( oSettings.fnDisplayEnd() == oSettings.fnRecordsDisplay() )
-                               {
-                                       oSettings._iDisplayStart = oSettings.fnDisplayEnd() - oSettings._iDisplayLength;
-                                       if ( oSettings._iDisplayStart < 0 )
-                                       {
-                                               oSettings._iDisplayStart = 0;
+                                       else {
+                                               plugin.fnUpdate( settings, redraw );
                                        }
-                               }
-                               
-                               if ( oSettings._iDisplayLength == -1 )
-                               {
-                                       oSettings._iDisplayStart = 0;
-                               }
-                               
-                               _fnDraw( oSettings );
+                               },
+                               "sName": "pagination"
                        } );
-               
-               
-                       $('select', nLength).attr('aria-controls', oSettings.sTableId);
-                       
-                       return nLength;
                }
-               
-               
-               /**
-                * Recalculate the end point based on the start point
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
-                */
-               function _fnCalculateEnd( oSettings )
+       
+               return node;
+       }
+       
+       
+       /**
+        * Alter the display settings to change the page
+        *  @param {object} settings DataTables settings object
+        *  @param {string|int} action Paging action to take: "first", "previous",
+        *    "next" or "last" or page number to jump to (integer)
+        *  @param [bool] redraw Automatically draw the update or not
+        *  @returns {bool} true page has changed, false - no change
+        *  @memberof DataTable#oApi
+        */
+       function _fnPageChange ( settings, action, redraw )
+       {
+               var
+                       start     = settings._iDisplayStart,
+                       len       = settings._iDisplayLength,
+                       records   = settings.fnRecordsDisplay();
+       
+               if ( records === 0 || len === -1 )
                {
-                       if ( oSettings.oFeatures.bPaginate === false )
-                       {
-                               oSettings._iDisplayEnd = oSettings.aiDisplay.length;
-                       }
-                       else
-                       {
-                               /* Set the end point of the display - based on how many elements there are
-                                * still to display
-                                */
-                               if ( oSettings._iDisplayStart + oSettings._iDisplayLength > oSettings.aiDisplay.length ||
-                                          oSettings._iDisplayLength == -1 )
-                               {
-                                       oSettings._iDisplayEnd = oSettings.aiDisplay.length;
-                               }
-                               else
-                               {
-                                       oSettings._iDisplayEnd = oSettings._iDisplayStart + oSettings._iDisplayLength;
-                               }
-                       }
+                       start = 0;
                }
-               
-               
-               
-               /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-                * Note that most of the paging logic is done in 
-                * DataTable.ext.oPagination
-                */
-               
-               /**
-                * Generate the node required for default pagination
-                *  @param {object} oSettings dataTables settings object
-                *  @returns {node} Pagination feature node
-                *  @memberof DataTable#oApi
-                */
-               function _fnFeatureHtmlPaginate ( oSettings )
+               else if ( typeof action === "number" )
                {
-                       if ( oSettings.oScroll.bInfinite )
-                       {
-                               return null;
-                       }
-                       
-                       var nPaginate = document.createElement( 'div' );
-                       nPaginate.className = oSettings.oClasses.sPaging+oSettings.sPaginationType;
-                       
-                       DataTable.ext.oPagination[ oSettings.sPaginationType ].fnInit( oSettings, nPaginate, 
-                               function( oSettings ) {
-                                       _fnCalculateEnd( oSettings );
-                                       _fnDraw( oSettings );
-                               }
-                       );
-                       
-                       /* Add a draw callback for the pagination on first instance, to update the paging display */
-                       if ( !oSettings.aanFeatures.p )
+                       start = action * len;
+       
+                       if ( start > records )
                        {
-                               oSettings.aoDrawCallback.push( {
-                                       "fn": function( oSettings ) {
-                                               DataTable.ext.oPagination[ oSettings.sPaginationType ].fnUpdate( oSettings, function( oSettings ) {
-                                                       _fnCalculateEnd( oSettings );
-                                                       _fnDraw( oSettings );
-                                               } );
-                                       },
-                                       "sName": "pagination"
-                               } );
+                               start = 0;
                        }
-                       return nPaginate;
                }
-               
-               
-               /**
-                * Alter the display settings to change the page
-                *  @param {object} oSettings dataTables settings object
-                *  @param {string|int} mAction Paging action to take: "first", "previous", "next" or "last"
-                *    or page number to jump to (integer)
-                *  @returns {bool} true page has changed, false - no change (no effect) eg 'first' on page 1
-                *  @memberof DataTable#oApi
-                */
-               function _fnPageChange ( oSettings, mAction )
+               else if ( action == "first" )
                {
-                       var iOldStart = oSettings._iDisplayStart;
-                       
-                       if ( typeof mAction === "number" )
-                       {
-                               oSettings._iDisplayStart = mAction * oSettings._iDisplayLength;
-                               if ( oSettings._iDisplayStart > oSettings.fnRecordsDisplay() )
-                               {
-                                       oSettings._iDisplayStart = 0;
-                               }
-                       }
-                       else if ( mAction == "first" )
+                       start = 0;
+               }
+               else if ( action == "previous" )
+               {
+                       start = len >= 0 ?
+                               start - len :
+                               0;
+       
+                       if ( start < 0 )
                        {
-                               oSettings._iDisplayStart = 0;
+                         start = 0;
                        }
-                       else if ( mAction == "previous" )
+               }
+               else if ( action == "next" )
+               {
+                       if ( start + len < records )
                        {
-                               oSettings._iDisplayStart = oSettings._iDisplayLength>=0 ?
-                                       oSettings._iDisplayStart - oSettings._iDisplayLength :
-                                       0;
-                               
-                               /* Correct for under-run */
-                               if ( oSettings._iDisplayStart < 0 )
-                               {
-                                 oSettings._iDisplayStart = 0;
-                               }
+                               start += len;
                        }
-                       else if ( mAction == "next" )
-                       {
-                               if ( oSettings._iDisplayLength >= 0 )
-                               {
-                                       /* Make sure we are not over running the display array */
-                                       if ( oSettings._iDisplayStart + oSettings._iDisplayLength < oSettings.fnRecordsDisplay() )
-                                       {
-                                               oSettings._iDisplayStart += oSettings._iDisplayLength;
-                                       }
-                               }
-                               else
-                               {
-                                       oSettings._iDisplayStart = 0;
-                               }
+               }
+               else if ( action == "last" )
+               {
+                       start = Math.floor( (records-1) / len) * len;
+               }
+               else
+               {
+                       _fnLog( settings, 0, "Unknown paging action: "+action, 5 );
+               }
+       
+               var changed = settings._iDisplayStart !== start;
+               settings._iDisplayStart = start;
+       
+               if ( changed ) {
+                       _fnCallbackFire( settings, null, 'page', [settings] );
+       
+                       if ( redraw ) {
+                               _fnDraw( settings );
                        }
-                       else if ( mAction == "last" )
-                       {
-                               if ( oSettings._iDisplayLength >= 0 )
-                               {
-                                       var iPages = parseInt( (oSettings.fnRecordsDisplay()-1) / oSettings._iDisplayLength, 10 ) + 1;
-                                       oSettings._iDisplayStart = (iPages-1) * oSettings._iDisplayLength;
-                               }
-                               else
-                               {
-                                       oSettings._iDisplayStart = 0;
+               }
+       
+               return changed;
+       }
+       
+       
+       
+       /**
+        * Generate the node required for the processing node
+        *  @param {object} settings dataTables settings object
+        *  @returns {node} Processing element
+        *  @memberof DataTable#oApi
+        */
+       function _fnFeatureHtmlProcessing ( settings )
+       {
+               return $('<div/>', {
+                               'id': ! settings.aanFeatures.r ? settings.sTableId+'_processing' : null,
+                               'class': settings.oClasses.sProcessing
+                       } )
+                       .html( settings.oLanguage.sProcessing )
+                       .insertBefore( settings.nTable )[0];
+       }
+       
+       
+       /**
+        * Display or hide the processing indicator
+        *  @param {object} settings dataTables settings object
+        *  @param {bool} show Show the processing indicator (true) or not (false)
+        *  @memberof DataTable#oApi
+        */
+       function _fnProcessingDisplay ( settings, show )
+       {
+               if ( settings.oFeatures.bProcessing ) {
+                       $(settings.aanFeatures.r).css( 'display', show ? 'block' : 'none' );
+               }
+       
+               _fnCallbackFire( settings, null, 'processing', [settings, show] );
+       }
+       
+       /**
+        * Add any control elements for the table - specifically scrolling
+        *  @param {object} settings dataTables settings object
+        *  @returns {node} Node to add to the DOM
+        *  @memberof DataTable#oApi
+        */
+       function _fnFeatureHtmlTable ( settings )
+       {
+               var table = $(settings.nTable);
+       
+               // Add the ARIA grid role to the table
+               table.attr( 'role', 'grid' );
+       
+               // Scrolling from here on in
+               var scroll = settings.oScroll;
+       
+               if ( scroll.sX === '' && scroll.sY === '' ) {
+                       return settings.nTable;
+               }
+       
+               var scrollX = scroll.sX;
+               var scrollY = scroll.sY;
+               var classes = settings.oClasses;
+               var caption = table.children('caption');
+               var captionSide = caption.length ? caption[0]._captionSide : null;
+               var headerClone = $( table[0].cloneNode(false) );
+               var footerClone = $( table[0].cloneNode(false) );
+               var footer = table.children('tfoot');
+               var _div = '<div/>';
+               var size = function ( s ) {
+                       return !s ? null : _fnStringToCss( s );
+               };
+       
+               // This is fairly messy, but with x scrolling enabled, if the table has a
+               // width attribute, regardless of any width applied using the column width
+               // options, the browser will shrink or grow the table as needed to fit into
+               // that 100%. That would make the width options useless. So we remove it.
+               // This is okay, under the assumption that width:100% is applied to the
+               // table in CSS (it is in the default stylesheet) which will set the table
+               // width as appropriate (the attribute and css behave differently...)
+               if ( scroll.sX && table.attr('width') === '100%' ) {
+                       table.removeAttr('width');
+               }
+       
+               if ( ! footer.length ) {
+                       footer = null;
+               }
+       
+               /*
+                * The HTML structure that we want to generate in this function is:
+                *  div - scroller
+                *    div - scroll head
+                *      div - scroll head inner
+                *        table - scroll head table
+                *          thead - thead
+                *    div - scroll body
+                *      table - table (master table)
+                *        thead - thead clone for sizing
+                *        tbody - tbody
+                *    div - scroll foot
+                *      div - scroll foot inner
+                *        table - scroll foot table
+                *          tfoot - tfoot
+                */
+               var scroller = $( _div, { 'class': classes.sScrollWrapper } )
+                       .append(
+                               $(_div, { 'class': classes.sScrollHead } )
+                                       .css( {
+                                               overflow: 'hidden',
+                                               position: 'relative',
+                                               border: 0,
+                                               width: scrollX ? size(scrollX) : '100%'
+                                       } )
+                                       .append(
+                                               $(_div, { 'class': classes.sScrollHeadInner } )
+                                                       .css( {
+                                                               'box-sizing': 'content-box',
+                                                               width: scroll.sXInner || '100%'
+                                                       } )
+                                                       .append(
+                                                               headerClone
+                                                                       .removeAttr('id')
+                                                                       .css( 'margin-left', 0 )
+                                                                       .append(
+                                                                               table.children('thead')
+                                                                       )
+                                                       )
+                                       )
+                                       .append( captionSide === 'top' ? caption : null )
+                       )
+                       .append(
+                               $(_div, { 'class': classes.sScrollBody } )
+                                       .css( {
+                                               overflow: 'auto',
+                                               height: size( scrollY ),
+                                               width: size( scrollX )
+                                       } )
+                                       .append( table )
+                       );
+       
+               if ( footer ) {
+                       scroller.append(
+                               $(_div, { 'class': classes.sScrollFoot } )
+                                       .css( {
+                                               overflow: 'hidden',
+                                               border: 0,
+                                               width: scrollX ? size(scrollX) : '100%'
+                                       } )
+                                       .append(
+                                               $(_div, { 'class': classes.sScrollFootInner } )
+                                                       .append(
+                                                               footerClone
+                                                                       .removeAttr('id')
+                                                                       .css( 'margin-left', 0 )
+                                                                       .append(
+                                                                               table.children('tfoot')
+                                                                       )
+                                                       )
+                                       )
+                                       .append( captionSide === 'bottom' ? caption : null )
+                       );
+               }
+       
+               var children = scroller.children();
+               var scrollHead = children[0];
+               var scrollBody = children[1];
+               var scrollFoot = footer ? children[2] : null;
+       
+               // When the body is scrolled, then we also want to scroll the headers
+               if ( scrollX ) {
+                       $(scrollBody).scroll( function (e) {
+                               var scrollLeft = this.scrollLeft;
+       
+                               scrollHead.scrollLeft = scrollLeft;
+       
+                               if ( footer ) {
+                                       scrollFoot.scrollLeft = scrollLeft;
                                }
-                       }
-                       else
-                       {
-                               _fnLog( oSettings, 0, "Unknown paging action: "+mAction );
-                       }
-                       $(oSettings.oInstance).trigger('page', oSettings);
-                       
-                       return iOldStart != oSettings._iDisplayStart;
+                       } );
                }
-               
-               
-               
-               /**
-                * Generate the node required for the processing node
-                *  @param {object} oSettings dataTables settings object
-                *  @returns {node} Processing element
-                *  @memberof DataTable#oApi
+       
+               settings.nScrollHead = scrollHead;
+               settings.nScrollBody = scrollBody;
+               settings.nScrollFoot = scrollFoot;
+       
+               // On redraw - align columns
+               settings.aoDrawCallback.push( {
+                       "fn": _fnScrollDraw,
+                       "sName": "scrolling"
+               } );
+       
+               return scroller[0];
+       }
+       
+       
+       
+       /**
+        * Update the header, footer and body tables for resizing - i.e. column
+        * alignment.
+        *
+        * Welcome to the most horrible function DataTables. The process that this
+        * function follows is basically:
+        *   1. Re-create the table inside the scrolling div
+        *   2. Take live measurements from the DOM
+        *   3. Apply the measurements to align the columns
+        *   4. Clean up
+        *
+        *  @param {object} settings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnScrollDraw ( settings )
+       {
+               // Given that this is such a monster function, a lot of variables are use
+               // to try and keep the minimised size as small as possible
+               var
+                       scroll         = settings.oScroll,
+                       scrollX        = scroll.sX,
+                       scrollXInner   = scroll.sXInner,
+                       scrollY        = scroll.sY,
+                       barWidth       = scroll.iBarWidth,
+                       divHeader      = $(settings.nScrollHead),
+                       divHeaderStyle = divHeader[0].style,
+                       divHeaderInner = divHeader.children('div'),
+                       divHeaderInnerStyle = divHeaderInner[0].style,
+                       divHeaderTable = divHeaderInner.children('table'),
+                       divBodyEl      = settings.nScrollBody,
+                       divBody        = $(divBodyEl),
+                       divBodyStyle   = divBodyEl.style,
+                       divFooter      = $(settings.nScrollFoot),
+                       divFooterInner = divFooter.children('div'),
+                       divFooterTable = divFooterInner.children('table'),
+                       header         = $(settings.nTHead),
+                       table          = $(settings.nTable),
+                       tableEl        = table[0],
+                       tableStyle     = tableEl.style,
+                       footer         = settings.nTFoot ? $(settings.nTFoot) : null,
+                       browser        = settings.oBrowser,
+                       ie67           = browser.bScrollOversize,
+                       headerTrgEls, footerTrgEls,
+                       headerSrcEls, footerSrcEls,
+                       headerCopy, footerCopy,
+                       headerWidths=[], footerWidths=[],
+                       headerContent=[],
+                       idx, correction, sanityWidth,
+                       zeroOut = function(nSizer) {
+                               var style = nSizer.style;
+                               style.paddingTop = "0";
+                               style.paddingBottom = "0";
+                               style.borderTopWidth = "0";
+                               style.borderBottomWidth = "0";
+                               style.height = 0;
+                       };
+       
+               /*
+                * 1. Re-create the table inside the scrolling div
                 */
-               function _fnFeatureHtmlProcessing ( oSettings )
-               {
-                       var nProcessing = document.createElement( 'div' );
-                       
-                       if ( !oSettings.aanFeatures.r )
-                       {
-                               nProcessing.id = oSettings.sTableId+'_processing';
-                       }
-                       nProcessing.innerHTML = oSettings.oLanguage.sProcessing;
-                       nProcessing.className = oSettings.oClasses.sProcessing;
-                       oSettings.nTable.parentNode.insertBefore( nProcessing, oSettings.nTable );
-                       
-                       return nProcessing;
+       
+               // Remove the old minimised thead and tfoot elements in the inner table
+               table.children('thead, tfoot').remove();
+       
+               // Clone the current header and footer elements and then place it into the inner table
+               headerCopy = header.clone().prependTo( table );
+               headerTrgEls = header.find('tr'); // original header is in its own table
+               headerSrcEls = headerCopy.find('tr');
+               headerCopy.find('th, td').removeAttr('tabindex');
+       
+               if ( footer ) {
+                       footerCopy = footer.clone().prependTo( table );
+                       footerTrgEls = footer.find('tr'); // the original tfoot is in its own table and must be sized
+                       footerSrcEls = footerCopy.find('tr');
                }
-               
-               
-               /**
-                * Display or hide the processing indicator
-                *  @param {object} oSettings dataTables settings object
-                *  @param {bool} bShow Show the processing indicator (true) or not (false)
-                *  @memberof DataTable#oApi
+       
+       
+               /*
+                * 2. Take live measurements from the DOM - do not alter the DOM itself!
                 */
-               function _fnProcessingDisplay ( oSettings, bShow )
+       
+               // Remove old sizing and apply the calculated column widths
+               // Get the unique column headers in the newly created (cloned) header. We want to apply the
+               // calculated sizes to this header
+               if ( ! scrollX )
                {
-                       if ( oSettings.oFeatures.bProcessing )
-                       {
-                               var an = oSettings.aanFeatures.r;
-                               for ( var i=0, iLen=an.length ; i<iLen ; i++ )
-                               {
-                                       an[i].style.visibility = bShow ? "visible" : "hidden";
-                               }
+                       divBodyStyle.width = '100%';
+                       divHeader[0].style.width = '100%';
+               }
+       
+               $.each( _fnGetUniqueThs( settings, headerCopy ), function ( i, el ) {
+                       idx = _fnVisibleToColumnIndex( settings, i );
+                       el.style.width = settings.aoColumns[idx].sWidth;
+               } );
+       
+               if ( footer ) {
+                       _fnApplyToChildren( function(n) {
+                               n.style.width = "";
+                       }, footerSrcEls );
+               }
+       
+               // If scroll collapse is enabled, when we put the headers back into the body for sizing, we
+               // will end up forcing the scrollbar to appear, making our measurements wrong for when we
+               // then hide it (end of this function), so add the header height to the body scroller.
+               if ( scroll.bCollapse && scrollY !== "" ) {
+                       divBodyStyle.height = (divBody[0].offsetHeight + header[0].offsetHeight)+"px";
+               }
+       
+               // Size the table as a whole
+               sanityWidth = table.outerWidth();
+               if ( scrollX === "" ) {
+                       // No x scrolling
+                       tableStyle.width = "100%";
+       
+                       // IE7 will make the width of the table when 100% include the scrollbar
+                       // - which is shouldn't. When there is a scrollbar we need to take this
+                       // into account.
+                       if ( ie67 && (table.find('tbody').height() > divBodyEl.offsetHeight ||
+                               divBody.css('overflow-y') == "scroll")
+                       ) {
+                               tableStyle.width = _fnStringToCss( table.outerWidth() - barWidth);
                        }
-               
-                       $(oSettings.oInstance).trigger('processing', [oSettings, bShow]);
                }
-               
-               /**
-                * Add any control elements for the table - specifically scrolling
-                *  @param {object} oSettings dataTables settings object
-                *  @returns {node} Node to add to the DOM
-                *  @memberof DataTable#oApi
-                */
-               function _fnFeatureHtmlTable ( oSettings )
+               else
                {
-                       /* Check if scrolling is enabled or not - if not then leave the DOM unaltered */
-                       if ( oSettings.oScroll.sX === "" && oSettings.oScroll.sY === "" )
-                       {
-                               return oSettings.nTable;
+                       // x scrolling
+                       if ( scrollXInner !== "" ) {
+                               // x scroll inner has been given - use it
+                               tableStyle.width = _fnStringToCss(scrollXInner);
                        }
-                       
-                       /*
-                        * The HTML structure that we want to generate in this function is:
-                        *  div - nScroller
-                        *    div - nScrollHead
-                        *      div - nScrollHeadInner
-                        *        table - nScrollHeadTable
-                        *          thead - nThead
-                        *    div - nScrollBody
-                        *      table - oSettings.nTable
-                        *        thead - nTheadSize
-                        *        tbody - nTbody
-                        *    div - nScrollFoot
-                        *      div - nScrollFootInner
-                        *        table - nScrollFootTable
-                        *          tfoot - nTfoot
-                        */
-                       var
-                               nScroller = document.createElement('div'),
-                               nScrollHead = document.createElement('div'),
-                               nScrollHeadInner = document.createElement('div'),
-                               nScrollBody = document.createElement('div'),
-                               nScrollFoot = document.createElement('div'),
-                               nScrollFootInner = document.createElement('div'),
-                               nScrollHeadTable = oSettings.nTable.cloneNode(false),
-                               nScrollFootTable = oSettings.nTable.cloneNode(false),
-                               nThead = oSettings.nTable.getElementsByTagName('thead')[0],
-                               nTfoot = oSettings.nTable.getElementsByTagName('tfoot').length === 0 ? null : 
-                                       oSettings.nTable.getElementsByTagName('tfoot')[0],
-                               oClasses = oSettings.oClasses;
-                       
-                       nScrollHead.appendChild( nScrollHeadInner );
-                       nScrollFoot.appendChild( nScrollFootInner );
-                       nScrollBody.appendChild( oSettings.nTable );
-                       nScroller.appendChild( nScrollHead );
-                       nScroller.appendChild( nScrollBody );
-                       nScrollHeadInner.appendChild( nScrollHeadTable );
-                       nScrollHeadTable.appendChild( nThead );
-                       if ( nTfoot !== null )
-                       {
-                               nScroller.appendChild( nScrollFoot );
-                               nScrollFootInner.appendChild( nScrollFootTable );
-                               nScrollFootTable.appendChild( nTfoot );
+                       else if ( sanityWidth == divBody.width() && divBody.height() < table.height() ) {
+                               // There is y-scrolling - try to take account of the y scroll bar
+                               tableStyle.width = _fnStringToCss( sanityWidth-barWidth );
+                               if ( table.outerWidth() > sanityWidth-barWidth ) {
+                                       // Not possible to take account of it
+                                       tableStyle.width = _fnStringToCss( sanityWidth );
+                               }
                        }
-                       
-                       nScroller.className = oClasses.sScrollWrapper;
-                       nScrollHead.className = oClasses.sScrollHead;
-                       nScrollHeadInner.className = oClasses.sScrollHeadInner;
-                       nScrollBody.className = oClasses.sScrollBody;
-                       nScrollFoot.className = oClasses.sScrollFoot;
-                       nScrollFootInner.className = oClasses.sScrollFootInner;
-                       
-                       if ( oSettings.oScroll.bAutoCss )
-                       {
-                               nScrollHead.style.overflow = "hidden";
-                               nScrollHead.style.position = "relative";
-                               nScrollFoot.style.overflow = "hidden";
-                               nScrollBody.style.overflow = "auto";
+                       else {
+                               // When all else fails
+                               tableStyle.width = _fnStringToCss( sanityWidth );
                        }
-                       
-                       nScrollHead.style.border = "0";
-                       nScrollHead.style.width = "100%";
-                       nScrollFoot.style.border = "0";
-                       nScrollHeadInner.style.width = oSettings.oScroll.sXInner !== "" ?
-                               oSettings.oScroll.sXInner : "100%"; /* will be overwritten */
-                       
-                       /* Modify attributes to respect the clones */
-                       nScrollHeadTable.removeAttribute('id');
-                       nScrollHeadTable.style.marginLeft = "0";
-                       oSettings.nTable.style.marginLeft = "0";
-                       if ( nTfoot !== null )
-                       {
-                               nScrollFootTable.removeAttribute('id');
-                               nScrollFootTable.style.marginLeft = "0";
+               }
+       
+               // Recalculate the sanity width - now that we've applied the required width,
+               // before it was a temporary variable. This is required because the column
+               // width calculation is done before this table DOM is created.
+               sanityWidth = table.outerWidth();
+       
+               // Hidden header should have zero height, so remove padding and borders. Then
+               // set the width based on the real headers
+       
+               // Apply all styles in one pass
+               _fnApplyToChildren( zeroOut, headerSrcEls );
+       
+               // Read all widths in next pass
+               _fnApplyToChildren( function(nSizer) {
+                       headerContent.push( nSizer.innerHTML );
+                       headerWidths.push( _fnStringToCss( $(nSizer).css('width') ) );
+               }, headerSrcEls );
+       
+               // Apply all widths in final pass
+               _fnApplyToChildren( function(nToSize, i) {
+                       nToSize.style.width = headerWidths[i];
+               }, headerTrgEls );
+       
+               $(headerSrcEls).height(0);
+       
+               /* Same again with the footer if we have one */
+               if ( footer )
+               {
+                       _fnApplyToChildren( zeroOut, footerSrcEls );
+       
+                       _fnApplyToChildren( function(nSizer) {
+                               footerWidths.push( _fnStringToCss( $(nSizer).css('width') ) );
+                       }, footerSrcEls );
+       
+                       _fnApplyToChildren( function(nToSize, i) {
+                               nToSize.style.width = footerWidths[i];
+                       }, footerTrgEls );
+       
+                       $(footerSrcEls).height(0);
+               }
+       
+       
+               /*
+                * 3. Apply the measurements
+                */
+       
+               // "Hide" the header and footer that we used for the sizing. We need to keep
+               // the content of the cell so that the width applied to the header and body
+               // both match, but we want to hide it completely. We want to also fix their
+               // width to what they currently are
+               _fnApplyToChildren( function(nSizer, i) {
+                       nSizer.innerHTML = '<div class="dataTables_sizing" style="height:0;overflow:hidden;">'+headerContent[i]+'</div>';
+                       nSizer.style.width = headerWidths[i];
+               }, headerSrcEls );
+       
+               if ( footer )
+               {
+                       _fnApplyToChildren( function(nSizer, i) {
+                               nSizer.innerHTML = "";
+                               nSizer.style.width = footerWidths[i];
+                       }, footerSrcEls );
+               }
+       
+               // Sanity check that the table is of a sensible width. If not then we are going to get
+               // misalignment - try to prevent this by not allowing the table to shrink below its min width
+               if ( table.outerWidth() < sanityWidth )
+               {
+                       // The min width depends upon if we have a vertical scrollbar visible or not */
+                       correction = ((divBodyEl.scrollHeight > divBodyEl.offsetHeight ||
+                               divBody.css('overflow-y') == "scroll")) ?
+                                       sanityWidth+barWidth :
+                                       sanityWidth;
+       
+                       // IE6/7 are a law unto themselves...
+                       if ( ie67 && (divBodyEl.scrollHeight >
+                               divBodyEl.offsetHeight || divBody.css('overflow-y') == "scroll")
+                       ) {
+                               tableStyle.width = _fnStringToCss( correction-barWidth );
                        }
-                       
-                       /* Move caption elements from the body to the header, footer or leave where it is
-                        * depending on the configuration. Note that the DTD says there can be only one caption */
-                       var nCaption = $(oSettings.nTable).children('caption');
-                       if ( nCaption.length > 0 )
-                       {
-                               nCaption = nCaption[0];
-                               if ( nCaption._captionSide === "top" )
-                               {
-                                       nScrollHeadTable.appendChild( nCaption );
-                               }
-                               else if ( nCaption._captionSide === "bottom" && nTfoot )
-                               {
-                                       nScrollFootTable.appendChild( nCaption );
-                               }
+       
+                       // And give the user a warning that we've stopped the table getting too small
+                       if ( scrollX === "" || scrollXInner !== "" ) {
+                               _fnLog( settings, 1, 'Possible column misalignment', 6 );
                        }
-                       
-                       /*
-                        * Sizing
+               }
+               else
+               {
+                       correction = '100%';
+               }
+       
+               // Apply to the container elements
+               divBodyStyle.width = _fnStringToCss( correction );
+               divHeaderStyle.width = _fnStringToCss( correction );
+       
+               if ( footer ) {
+                       settings.nScrollFoot.style.width = _fnStringToCss( correction );
+               }
+       
+       
+               /*
+                * 4. Clean up
+                */
+               if ( ! scrollY ) {
+                       /* IE7< puts a vertical scrollbar in place (when it shouldn't be) due to subtracting
+                        * the scrollbar height from the visible display, rather than adding it on. We need to
+                        * set the height in order to sort this. Don't want to do it in any other browsers.
                         */
-                       /* When x-scrolling add the width and a scroller to move the header with the body */
-                       if ( oSettings.oScroll.sX !== "" )
-                       {
-                               nScrollHead.style.width = _fnStringToCss( oSettings.oScroll.sX );
-                               nScrollBody.style.width = _fnStringToCss( oSettings.oScroll.sX );
-                               
-                               if ( nTfoot !== null )
-                               {
-                                       nScrollFoot.style.width = _fnStringToCss( oSettings.oScroll.sX );       
-                               }
-                               
-                               /* When the body is scrolled, then we also want to scroll the headers */
-                               $(nScrollBody).scroll( function (e) {
-                                       nScrollHead.scrollLeft = this.scrollLeft;
-                                       
-                                       if ( nTfoot !== null )
-                                       {
-                                               nScrollFoot.scrollLeft = this.scrollLeft;
-                                       }
-                               } );
+                       if ( ie67 ) {
+                               divBodyStyle.height = _fnStringToCss( tableEl.offsetHeight+barWidth );
                        }
-                       
-                       /* When yscrolling, add the height */
-                       if ( oSettings.oScroll.sY !== "" )
-                       {
-                               nScrollBody.style.height = _fnStringToCss( oSettings.oScroll.sY );
+               }
+       
+               if ( scrollY && scroll.bCollapse ) {
+                       divBodyStyle.height = _fnStringToCss( scrollY );
+       
+                       var iExtra = (scrollX && tableEl.offsetWidth > divBodyEl.offsetWidth) ?
+                               barWidth :
+                               0;
+       
+                       if ( tableEl.offsetHeight < divBodyEl.offsetHeight ) {
+                               divBodyStyle.height = _fnStringToCss( tableEl.offsetHeight+iExtra );
                        }
-                       
-                       /* Redraw - align columns across the tables */
-                       oSettings.aoDrawCallback.push( {
-                               "fn": _fnScrollDraw,
-                               "sName": "scrolling"
-                       } );
-                       
-                       /* Infinite scrolling event handlers */
-                       if ( oSettings.oScroll.bInfinite )
-                       {
-                               $(nScrollBody).scroll( function() {
-                                       /* Use a blocker to stop scrolling from loading more data while other data is still loading */
-                                       if ( !oSettings.bDrawing && $(this).scrollTop() !== 0 )
-                                       {
-                                               /* Check if we should load the next data set */
-                                               if ( $(this).scrollTop() + $(this).height() > 
-                                                       $(oSettings.nTable).height() - oSettings.oScroll.iLoadGap )
-                                               {
-                                                       /* Only do the redraw if we have to - we might be at the end of the data */
-                                                       if ( oSettings.fnDisplayEnd() < oSettings.fnRecordsDisplay() )
-                                                       {
-                                                               _fnPageChange( oSettings, 'next' );
-                                                               _fnCalculateEnd( oSettings );
-                                                               _fnDraw( oSettings );
-                                                       }
-                                               }
+               }
+       
+               /* Finally set the width's of the header and footer tables */
+               var iOuterWidth = table.outerWidth();
+               divHeaderTable[0].style.width = _fnStringToCss( iOuterWidth );
+               divHeaderInnerStyle.width = _fnStringToCss( iOuterWidth );
+       
+               // Figure out if there are scrollbar present - if so then we need a the header and footer to
+               // provide a bit more space to allow "overflow" scrolling (i.e. past the scrollbar)
+               var bScrolling = table.height() > divBodyEl.clientHeight || divBody.css('overflow-y') == "scroll";
+               var padding = 'padding' + (browser.bScrollbarLeft ? 'Left' : 'Right' );
+               divHeaderInnerStyle[ padding ] = bScrolling ? barWidth+"px" : "0px";
+       
+               if ( footer ) {
+                       divFooterTable[0].style.width = _fnStringToCss( iOuterWidth );
+                       divFooterInner[0].style.width = _fnStringToCss( iOuterWidth );
+                       divFooterInner[0].style[padding] = bScrolling ? barWidth+"px" : "0px";
+               }
+       
+               /* Adjust the position of the header in case we loose the y-scrollbar */
+               divBody.scroll();
+       
+               /* If sorting or filtering has occurred, jump the scrolling back to the top */
+               if ( settings.bSorted || settings.bFiltered ) {
+                       divBodyEl.scrollTop = 0;
+               }
+       }
+       
+       
+       
+       /**
+        * Apply a given function to the display child nodes of an element array (typically
+        * TD children of TR rows
+        *  @param {function} fn Method to apply to the objects
+        *  @param array {nodes} an1 List of elements to look through for display children
+        *  @param array {nodes} an2 Another list (identical structure to the first) - optional
+        *  @memberof DataTable#oApi
+        */
+       function _fnApplyToChildren( fn, an1, an2 )
+       {
+               var index=0, i=0, iLen=an1.length;
+               var nNode1, nNode2;
+       
+               while ( i < iLen ) {
+                       nNode1 = an1[i].firstChild;
+                       nNode2 = an2 ? an2[i].firstChild : null;
+       
+                       while ( nNode1 ) {
+                               if ( nNode1.nodeType === 1 ) {
+                                       if ( an2 ) {
+                                               fn( nNode1, nNode2, index );
                                        }
-                               } );
+                                       else {
+                                               fn( nNode1, index );
+                                       }
+       
+                                       index++;
+                               }
+       
+                               nNode1 = nNode1.nextSibling;
+                               nNode2 = an2 ? nNode2.nextSibling : null;
                        }
-                       
-                       oSettings.nScrollHead = nScrollHead;
-                       oSettings.nScrollFoot = nScrollFoot;
-                       
-                       return nScroller;
+       
+                       i++;
                }
-               
-               
-               /**
-                * Update the various tables for resizing. It's a bit of a pig this function, but
-                * basically the idea to:
-                *   1. Re-create the table inside the scrolling div
-                *   2. Take live measurements from the DOM
-                *   3. Apply the measurements
-                *   4. Clean up
-                *  @param {object} o dataTables settings object
-                *  @returns {node} Node to add to the DOM
-                *  @memberof DataTable#oApi
-                */
-               function _fnScrollDraw ( o )
-               {
-                       var
-                               nScrollHeadInner = o.nScrollHead.getElementsByTagName('div')[0],
-                               nScrollHeadTable = nScrollHeadInner.getElementsByTagName('table')[0],
-                               nScrollBody = o.nTable.parentNode,
-                               i, iLen, j, jLen, anHeadToSize, anHeadSizers, anFootSizers, anFootToSize, oStyle, iVis,
-                               nTheadSize, nTfootSize,
-                               iWidth, aApplied=[], aAppliedFooter=[], iSanityWidth,
-                               nScrollFootInner = (o.nTFoot !== null) ? o.nScrollFoot.getElementsByTagName('div')[0] : null,
-                               nScrollFootTable = (o.nTFoot !== null) ? nScrollFootInner.getElementsByTagName('table')[0] : null,
-                               ie67 = o.oBrowser.bScrollOversize,
-                               zeroOut = function(nSizer) {
-                                       oStyle = nSizer.style;
-                                       oStyle.paddingTop = "0";
-                                       oStyle.paddingBottom = "0";
-                                       oStyle.borderTopWidth = "0";
-                                       oStyle.borderBottomWidth = "0";
-                                       oStyle.height = 0;
-                               };
-                       
-                       /*
-                        * 1. Re-create the table inside the scrolling div
-                        */
-                       
-                       /* Remove the old minimised thead and tfoot elements in the inner table */
-                       $(o.nTable).children('thead, tfoot').remove();
-               
-                       /* Clone the current header and footer elements and then place it into the inner table */
-                       nTheadSize = $(o.nTHead).clone()[0];
-                       o.nTable.insertBefore( nTheadSize, o.nTable.childNodes[0] );
-                       anHeadToSize = o.nTHead.getElementsByTagName('tr');
-                       anHeadSizers = nTheadSize.getElementsByTagName('tr');
-                       
-                       if ( o.nTFoot !== null )
-                       {
-                               nTfootSize = $(o.nTFoot).clone()[0];
-                               o.nTable.insertBefore( nTfootSize, o.nTable.childNodes[1] );
-                               anFootToSize = o.nTFoot.getElementsByTagName('tr');
-                               anFootSizers = nTfootSize.getElementsByTagName('tr');
-                       }
-                       
-                       /*
-                        * 2. Take live measurements from the DOM - do not alter the DOM itself!
-                        */
-                       
-                       /* Remove old sizing and apply the calculated column widths
-                        * Get the unique column headers in the newly created (cloned) header. We want to apply the
-                        * calculated sizes to this header
-                        */
-                       if ( o.oScroll.sX === "" )
-                       {
-                               nScrollBody.style.width = '100%';
-                               nScrollHeadInner.parentNode.style.width = '100%';
-                       }
-                       
-                       var nThs = _fnGetUniqueThs( o, nTheadSize );
-                       for ( i=0, iLen=nThs.length ; i<iLen ; i++ )
-                       {
-                               iVis = _fnVisibleToColumnIndex( o, i );
-                               nThs[i].style.width = o.aoColumns[iVis].sWidth;
+       }
+       
+       
+       
+       var __re_html_remove = /<.*?>/g;
+       
+       
+       /**
+        * Calculate the width of columns for the table
+        *  @param {object} oSettings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnCalculateColumnWidths ( oSettings )
+       {
+               var
+                       table = oSettings.nTable,
+                       columns = oSettings.aoColumns,
+                       scroll = oSettings.oScroll,
+                       scrollY = scroll.sY,
+                       scrollX = scroll.sX,
+                       scrollXInner = scroll.sXInner,
+                       columnCount = columns.length,
+                       visibleColumns = _fnGetColumns( oSettings, 'bVisible' ),
+                       headerCells = $('th', oSettings.nTHead),
+                       tableWidthAttr = table.getAttribute('width'),
+                       tableContainer = table.parentNode,
+                       userInputs = false,
+                       i, column, columnIdx, width, outerWidth;
+       
+               /* Convert any user input sizes into pixel sizes */
+               for ( i=0 ; i<visibleColumns.length ; i++ ) {
+                       column = columns[ visibleColumns[i] ];
+       
+                       if ( column.sWidth !== null ) {
+                               column.sWidth = _fnConvertToWidth( column.sWidthOrig, tableContainer );
+       
+                               userInputs = true;
                        }
-                       
-                       if ( o.nTFoot !== null )
-                       {
-                               _fnApplyToChildren( function(n) {
-                                       n.style.width = "";
-                               }, anFootSizers );
+               }
+       
+               /* If the number of columns in the DOM equals the number that we have to
+                * process in DataTables, then we can use the offsets that are created by
+                * the web- browser. No custom sizes can be set in order for this to happen,
+                * nor scrolling used
+                */
+               if ( ! userInputs && ! scrollX && ! scrollY &&
+                   columnCount == _fnVisbleColumns( oSettings ) &&
+                       columnCount == headerCells.length
+               ) {
+                       for ( i=0 ; i<columnCount ; i++ ) {
+                               columns[i].sWidth = _fnStringToCss( headerCells.eq(i).width() );
                        }
-               
-                       // If scroll collapse is enabled, when we put the headers back into the body for sizing, we
-                       // will end up forcing the scrollbar to appear, making our measurements wrong for when we
-                       // then hide it (end of this function), so add the header height to the body scroller.
-                       if ( o.oScroll.bCollapse && o.oScroll.sY !== "" )
-                       {
-                               nScrollBody.style.height = (nScrollBody.offsetHeight + o.nTHead.offsetHeight)+"px";
+               }
+               else
+               {
+                       // Otherwise construct a single row table with the widest node in the
+                       // data, assign any user defined widths, then insert it into the DOM and
+                       // allow the browser to do all the hard work of calculating table widths
+                       var tmpTable = $( table.cloneNode( false ) )
+                               .css( 'visibility', 'hidden' )
+                               .removeAttr( 'id' )
+                               .append( $(oSettings.nTHead).clone( false ) )
+                               .append( $(oSettings.nTFoot).clone( false ) )
+                               .append( $('<tbody><tr/></tbody>') );
+       
+                       // Remove any assigned widths from the footer (from scrolling)
+                       tmpTable.find('tfoot th, tfoot td').css('width', '');
+       
+                       var tr = tmpTable.find( 'tbody tr' );
+       
+                       // Apply custom sizing to the cloned header
+                       headerCells = _fnGetUniqueThs( oSettings, tmpTable.find('thead')[0] );
+       
+                       for ( i=0 ; i<visibleColumns.length ; i++ ) {
+                               column = columns[ visibleColumns[i] ];
+       
+                               headerCells[i].style.width = column.sWidthOrig !== null && column.sWidthOrig !== '' ?
+                                       _fnStringToCss( column.sWidthOrig ) :
+                                       '';
                        }
-                       
-                       /* Size the table as a whole */
-                       iSanityWidth = $(o.nTable).outerWidth();
-                       if ( o.oScroll.sX === "" )
-                       {
-                               /* No x scrolling */
-                               o.nTable.style.width = "100%";
-                               
-                               /* I know this is rubbish - but IE7 will make the width of the table when 100% include
-                                * the scrollbar - which is shouldn't. When there is a scrollbar we need to take this
-                                * into account.
-                                */
-                               if ( ie67 && ($('tbody', nScrollBody).height() > nScrollBody.offsetHeight || 
-                                       $(nScrollBody).css('overflow-y') == "scroll")  )
-                               {
-                                       o.nTable.style.width = _fnStringToCss( $(o.nTable).outerWidth() - o.oScroll.iBarWidth);
+       
+                       // Find the widest cell for each column and put it into the table
+                       if ( oSettings.aoData.length ) {
+                               for ( i=0 ; i<visibleColumns.length ; i++ ) {
+                                       columnIdx = visibleColumns[i];
+                                       column = columns[ columnIdx ];
+       
+                                       $( _fnGetWidestNode( oSettings, columnIdx ) )
+                                               .clone( false )
+                                               .append( column.sContentPadding )
+                                               .appendTo( tr );
                                }
                        }
-                       else
-                       {
-                               if ( o.oScroll.sXInner !== "" )
-                               {
-                                       /* x scroll inner has been given - use it */
-                                       o.nTable.style.width = _fnStringToCss(o.oScroll.sXInner);
-                               }
-                               else if ( iSanityWidth == $(nScrollBody).width() &&
-                                  $(nScrollBody).height() < $(o.nTable).height() )
-                               {
-                                       /* There is y-scrolling - try to take account of the y scroll bar */
-                                       o.nTable.style.width = _fnStringToCss( iSanityWidth-o.oScroll.iBarWidth );
-                                       if ( $(o.nTable).outerWidth() > iSanityWidth-o.oScroll.iBarWidth )
-                                       {
-                                               /* Not possible to take account of it */
-                                               o.nTable.style.width = _fnStringToCss( iSanityWidth );
-                                       }
-                               }
-                               else
-                               {
-                                       /* All else fails */
-                                       o.nTable.style.width = _fnStringToCss( iSanityWidth );
-                               }
+       
+                       // Table has been built, attach to the document so we can work with it
+                       tmpTable.appendTo( tableContainer );
+       
+                       // When scrolling (X or Y) we want to set the width of the table as 
+                       // appropriate. However, when not scrolling leave the table width as it
+                       // is. This results in slightly different, but I think correct behaviour
+                       if ( scrollX && scrollXInner ) {
+                               tmpTable.width( scrollXInner );
                        }
-                       
-                       /* Recalculate the sanity width - now that we've applied the required width, before it was
-                        * a temporary variable. This is required because the column width calculation is done
-                        * before this table DOM is created.
-                        */
-                       iSanityWidth = $(o.nTable).outerWidth();
-                       
-                       /* We want the hidden header to have zero height, so remove padding and borders. Then
-                        * set the width based on the real headers
-                        */
-                       
-                       // Apply all styles in one pass. Invalidates layout only once because we don't read any 
-                       // DOM properties.
-                       _fnApplyToChildren( zeroOut, anHeadSizers );
-                        
-                       // Read all widths in next pass. Forces layout only once because we do not change 
-                       // any DOM properties.
-                       _fnApplyToChildren( function(nSizer) {
-                               aApplied.push( _fnStringToCss( $(nSizer).width() ) );
-                       }, anHeadSizers );
-                        
-                       // Apply all widths in final pass. Invalidates layout only once because we do not
-                       // read any DOM properties.
-                       _fnApplyToChildren( function(nToSize, i) {
-                               nToSize.style.width = aApplied[i];
-                       }, anHeadToSize );
-               
-                       $(anHeadSizers).height(0);
-                       
-                       /* Same again with the footer if we have one */
-                       if ( o.nTFoot !== null )
-                       {
-                               _fnApplyToChildren( zeroOut, anFootSizers );
-                                
-                               _fnApplyToChildren( function(nSizer) {
-                                       aAppliedFooter.push( _fnStringToCss( $(nSizer).width() ) );
-                               }, anFootSizers );
-                                
-                               _fnApplyToChildren( function(nToSize, i) {
-                                       nToSize.style.width = aAppliedFooter[i];
-                               }, anFootToSize );
-               
-                               $(anFootSizers).height(0);
+                       else if ( scrollX ) {
+                               tmpTable.css( 'width', 'auto' );
+       
+                               if ( tmpTable.width() < tableContainer.offsetWidth ) {
+                                       tmpTable.width( tableContainer.offsetWidth );
+                               }
                        }
-                       
-                       /*
-                        * 3. Apply the measurements
-                        */
-                       
-                       /* "Hide" the header and footer that we used for the sizing. We want to also fix their width
-                        * to what they currently are
-                        */
-                       _fnApplyToChildren( function(nSizer, i) {
-                               nSizer.innerHTML = "";
-                               nSizer.style.width = aApplied[i];
-                       }, anHeadSizers );
-                       
-                       if ( o.nTFoot !== null )
-                       {
-                               _fnApplyToChildren( function(nSizer, i) {
-                                       nSizer.innerHTML = "";
-                                       nSizer.style.width = aAppliedFooter[i];
-                               }, anFootSizers );
+                       else if ( scrollY ) {
+                               tmpTable.width( tableContainer.offsetWidth );
                        }
-                       
-                       /* Sanity check that the table is of a sensible width. If not then we are going to get
-                        * misalignment - try to prevent this by not allowing the table to shrink below its min width
-                        */
-                       if ( $(o.nTable).outerWidth() < iSanityWidth )
-                       {
-                               /* The min width depends upon if we have a vertical scrollbar visible or not */
-                               var iCorrection = ((nScrollBody.scrollHeight > nScrollBody.offsetHeight || 
-                                       $(nScrollBody).css('overflow-y') == "scroll")) ?
-                                               iSanityWidth+o.oScroll.iBarWidth : iSanityWidth;
-                               
-                               /* IE6/7 are a law unto themselves... */
-                               if ( ie67 && (nScrollBody.scrollHeight > 
-                                       nScrollBody.offsetHeight || $(nScrollBody).css('overflow-y') == "scroll")  )
-                               {
-                                       o.nTable.style.width = _fnStringToCss( iCorrection-o.oScroll.iBarWidth );
-                               }
-                               
-                               /* Apply the calculated minimum width to the table wrappers */
-                               nScrollBody.style.width = _fnStringToCss( iCorrection );
-                               o.nScrollHead.style.width = _fnStringToCss( iCorrection );
-                               
-                               if ( o.nTFoot !== null )
-                               {
-                                       o.nScrollFoot.style.width = _fnStringToCss( iCorrection );
-                               }
-                               
-                               /* And give the user a warning that we've stopped the table getting too small */
-                               if ( o.oScroll.sX === "" )
-                               {
-                                       _fnLog( o, 1, "The table cannot fit into the current element which will cause column"+
-                                               " misalignment. The table has been drawn at its minimum possible width." );
-                               }
-                               else if ( o.oScroll.sXInner !== "" )
-                               {
-                                       _fnLog( o, 1, "The table cannot fit into the current element which will cause column"+
-                                               " misalignment. Increase the sScrollXInner value or remove it to allow automatic"+
-                                               " calculation" );
-                               }
+                       else if ( tableWidthAttr ) {
+                               tmpTable.width( tableWidthAttr );
                        }
-                       else
+       
+                       // Take into account the y scrollbar
+                       _fnScrollingWidthAdjust( oSettings, tmpTable[0] );
+       
+                       // Browsers need a bit of a hand when a width is assigned to any columns
+                       // when x-scrolling as they tend to collapse the table to the min-width,
+                       // even if we sent the column widths. So we need to keep track of what
+                       // the table width should be by summing the user given values, and the
+                       // automatic values
+                       if ( scrollX )
                        {
-                               nScrollBody.style.width = _fnStringToCss( '100%' );
-                               o.nScrollHead.style.width = _fnStringToCss( '100%' );
-                               
-                               if ( o.nTFoot !== null )
-                               {
-                                       o.nScrollFoot.style.width = _fnStringToCss( '100%' );
+                               var total = 0;
+       
+                               for ( i=0 ; i<visibleColumns.length ; i++ ) {
+                                       column = columns[ visibleColumns[i] ];
+                                       outerWidth = $(headerCells[i]).outerWidth();
+       
+                                       total += column.sWidthOrig === null ?
+                                               outerWidth :
+                                               parseInt( column.sWidth, 10 ) + outerWidth - $(headerCells[i]).width();
                                }
+       
+                               tmpTable.width( _fnStringToCss( total ) );
+                               table.style.width = _fnStringToCss( total );
                        }
-                       
-                       
-                       /*
-                        * 4. Clean up
-                        */
-                       if ( o.oScroll.sY === "" )
-                       {
-                               /* IE7< puts a vertical scrollbar in place (when it shouldn't be) due to subtracting
-                                * the scrollbar height from the visible display, rather than adding it on. We need to
-                                * set the height in order to sort this. Don't want to do it in any other browsers.
-                                */
-                               if ( ie67 )
-                               {
-                                       nScrollBody.style.height = _fnStringToCss( o.nTable.offsetHeight+o.oScroll.iBarWidth );
+       
+                       // Get the width of each column in the constructed table
+                       for ( i=0 ; i<visibleColumns.length ; i++ ) {
+                               column = columns[ visibleColumns[i] ];
+                               width = $(headerCells[i]).width();
+       
+                               if ( width ) {
+                                       column.sWidth = _fnStringToCss( width );
                                }
                        }
-                       
-                       if ( o.oScroll.sY !== "" && o.oScroll.bCollapse )
-                       {
-                               nScrollBody.style.height = _fnStringToCss( o.oScroll.sY );
-                               
-                               var iExtra = (o.oScroll.sX !== "" && o.nTable.offsetWidth > nScrollBody.offsetWidth) ?
-                                       o.oScroll.iBarWidth : 0;
-                               if ( o.nTable.offsetHeight < nScrollBody.offsetHeight )
-                               {
-                                       nScrollBody.style.height = _fnStringToCss( o.nTable.offsetHeight+iExtra );
-                               }
+       
+                       table.style.width = _fnStringToCss( tmpTable.css('width') );
+       
+                       // Finished with the table - ditch it
+                       tmpTable.remove();
+               }
+       
+               // If there is a width attr, we want to attach an event listener which
+               // allows the table sizing to automatically adjust when the window is
+               // resized. Use the width attr rather than CSS, since we can't know if the
+               // CSS is a relative value or absolute - DOM read is always px.
+               if ( tableWidthAttr ) {
+                       table.style.width = _fnStringToCss( tableWidthAttr );
+               }
+       
+               if ( (tableWidthAttr || scrollX) && ! oSettings._reszEvt ) {
+                       $(window).bind('resize.DT-'+oSettings.sInstance, _fnThrottle( function () {
+                               _fnAdjustColumnSizing( oSettings );
+                       } ) );
+       
+                       oSettings._reszEvt = true;
+               }
+       }
+       
+       
+       /**
+        * Throttle the calls to a function. Arguments and context are maintained for
+        * the throttled function
+        *  @param {function} fn Function to be called
+        *  @param {int} [freq=200] call frequency in mS
+        *  @returns {function} wrapped function
+        *  @memberof DataTable#oApi
+        */
+       function _fnThrottle( fn, freq ) {
+               var
+                       frequency = freq || 200,
+                       last,
+                       timer;
+       
+               return function () {
+                       var
+                               that = this,
+                               now  = +new Date(),
+                               args = arguments;
+       
+                       if ( last && now < last + frequency ) {
+                               clearTimeout( timer );
+       
+                               timer = setTimeout( function () {
+                                       last = undefined;
+                                       fn.apply( that, args );
+                               }, frequency );
                        }
-                       
-                       /* Finally set the width's of the header and footer tables */
-                       var iOuterWidth = $(o.nTable).outerWidth();
-                       nScrollHeadTable.style.width = _fnStringToCss( iOuterWidth );
-                       nScrollHeadInner.style.width = _fnStringToCss( iOuterWidth );
-               
-                       // Figure out if there are scrollbar present - if so then we need a the header and footer to
-                       // provide a bit more space to allow "overflow" scrolling (i.e. past the scrollbar)
-                       var bScrolling = $(o.nTable).height() > nScrollBody.clientHeight || $(nScrollBody).css('overflow-y') == "scroll";
-                       nScrollHeadInner.style.paddingRight = bScrolling ? o.oScroll.iBarWidth+"px" : "0px";
-                       
-                       if ( o.nTFoot !== null )
-                       {
-                               nScrollFootTable.style.width = _fnStringToCss( iOuterWidth );
-                               nScrollFootInner.style.width = _fnStringToCss( iOuterWidth );
-                               nScrollFootInner.style.paddingRight = bScrolling ? o.oScroll.iBarWidth+"px" : "0px";
+                       else if ( last ) {
+                               last = now;
+                               fn.apply( that, args );
                        }
-               
-                       /* Adjust the position of the header in case we loose the y-scrollbar */
-                       $(nScrollBody).scroll();
-                       
-                       /* If sorting or filtering has occurred, jump the scrolling back to the top */
-                       if ( o.bSorted || o.bFiltered )
-                       {
-                               nScrollBody.scrollTop = 0;
+                       else {
+                               last = now;
                        }
+               };
+       }
+       
+       
+       /**
+        * Convert a CSS unit width to pixels (e.g. 2em)
+        *  @param {string} width width to be converted
+        *  @param {node} parent parent to get the with for (required for relative widths) - optional
+        *  @returns {int} width in pixels
+        *  @memberof DataTable#oApi
+        */
+       function _fnConvertToWidth ( width, parent )
+       {
+               if ( ! width ) {
+                       return 0;
                }
-               
-               
-               /**
-                * Apply a given function to the display child nodes of an element array (typically
-                * TD children of TR rows
-                *  @param {function} fn Method to apply to the objects
-                *  @param array {nodes} an1 List of elements to look through for display children
-                *  @param array {nodes} an2 Another list (identical structure to the first) - optional
-                *  @memberof DataTable#oApi
-                */
-               function _fnApplyToChildren( fn, an1, an2 )
-               {
-                       var index=0, i=0, iLen=an1.length;
-                       var nNode1, nNode2;
-               
-                       while ( i < iLen )
-                       {
-                               nNode1 = an1[i].firstChild;
-                               nNode2 = an2 ? an2[i].firstChild : null;
-                               while ( nNode1 )
-                               {
-                                       if ( nNode1.nodeType === 1 )
-                                       {
-                                               if ( an2 )
-                                               {
-                                                       fn( nNode1, nNode2, index );
-                                               }
-                                               else
-                                               {
-                                                       fn( nNode1, index );
-                                               }
-                                               index++;
-                                       }
-                                       nNode1 = nNode1.nextSibling;
-                                       nNode2 = an2 ? nNode2.nextSibling : null;
-                               }
-                               i++;
-                       }
+       
+               var n = $('<div/>')
+                       .css( 'width', _fnStringToCss( width ) )
+                       .appendTo( parent || document.body );
+       
+               var val = n[0].offsetWidth;
+               n.remove();
+       
+               return val;
+       }
+       
+       
+       /**
+        * Adjust a table's width to take account of vertical scroll bar
+        *  @param {object} oSettings dataTables settings object
+        *  @param {node} n table node
+        *  @memberof DataTable#oApi
+        */
+       
+       function _fnScrollingWidthAdjust ( settings, n )
+       {
+               var scroll = settings.oScroll;
+       
+               if ( scroll.sX || scroll.sY ) {
+                       // When y-scrolling only, we want to remove the width of the scroll bar
+                       // so the table + scroll bar will fit into the area available, otherwise
+                       // we fix the table at its current size with no adjustment
+                       var correction = ! scroll.sX ? scroll.iBarWidth : 0;
+                       n.style.width = _fnStringToCss( $(n).outerWidth() - correction );
                }
-               
-               /**
-                * Convert a CSS unit width to pixels (e.g. 2em)
-                *  @param {string} sWidth width to be converted
-                *  @param {node} nParent parent to get the with for (required for relative widths) - optional
-                *  @returns {int} iWidth width in pixels
-                *  @memberof DataTable#oApi
-                */
-               function _fnConvertToWidth ( sWidth, nParent )
-               {
-                       if ( !sWidth || sWidth === null || sWidth === '' )
-                       {
-                               return 0;
+       }
+       
+       
+       /**
+        * Get the widest node
+        *  @param {object} settings dataTables settings object
+        *  @param {int} colIdx column of interest
+        *  @returns {node} widest table node
+        *  @memberof DataTable#oApi
+        */
+       function _fnGetWidestNode( settings, colIdx )
+       {
+               var idx = _fnGetMaxLenString( settings, colIdx );
+               if ( idx < 0 ) {
+                       return null;
+               }
+       
+               var data = settings.aoData[ idx ];
+               return ! data.nTr ? // Might not have been created when deferred rendering
+                       $('<td/>').html( _fnGetCellData( settings, idx, colIdx, 'display' ) )[0] :
+                       data.anCells[ colIdx ];
+       }
+       
+       
+       /**
+        * Get the maximum strlen for each data column
+        *  @param {object} settings dataTables settings object
+        *  @param {int} colIdx column of interest
+        *  @returns {string} max string length for each column
+        *  @memberof DataTable#oApi
+        */
+       function _fnGetMaxLenString( settings, colIdx )
+       {
+               var s, max=-1, maxIdx = -1;
+       
+               for ( var i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
+                       s = _fnGetCellData( settings, i, colIdx, 'display' )+'';
+                       s = s.replace( __re_html_remove, '' );
+       
+                       if ( s.length > max ) {
+                               max = s.length;
+                               maxIdx = i;
                        }
-                       
-                       if ( !nParent )
-                       {
-                               nParent = document.body;
+               }
+       
+               return maxIdx;
+       }
+       
+       
+       /**
+        * Append a CSS unit (only if required) to a string
+        *  @param {string} value to css-ify
+        *  @returns {string} value with css unit
+        *  @memberof DataTable#oApi
+        */
+       function _fnStringToCss( s )
+       {
+               if ( s === null ) {
+                       return '0px';
+               }
+       
+               if ( typeof s == 'number' ) {
+                       return s < 0 ?
+                               '0px' :
+                               s+'px';
+               }
+       
+               // Check it has a unit character already
+               return s.match(/\d$/) ?
+                       s+'px' :
+                       s;
+       }
+       
+       
+       /**
+        * Get the width of a scroll bar in this browser being used
+        *  @returns {int} width in pixels
+        *  @memberof DataTable#oApi
+        */
+       function _fnScrollBarWidth ()
+       {
+               // On first run a static variable is set, since this is only needed once.
+               // Subsequent runs will just use the previously calculated value
+               if ( ! DataTable.__scrollbarWidth ) {
+                       var inner = $('<p/>').css( {
+                               width: '100%',
+                               height: 200,
+                               padding: 0
+                       } )[0];
+       
+                       var outer = $('<div/>')
+                               .css( {
+                                       position: 'absolute',
+                                       top: 0,
+                                       left: 0,
+                                       width: 200,
+                                       height: 150,
+                                       padding: 0,
+                                       overflow: 'hidden',
+                                       visibility: 'hidden'
+                               } )
+                               .append( inner )
+                               .appendTo( 'body' );
+       
+                       var w1 = inner.offsetWidth;
+                       outer.css( 'overflow', 'scroll' );
+                       var w2 = inner.offsetWidth;
+       
+                       if ( w1 === w2 ) {
+                               w2 = outer[0].clientWidth;
                        }
-                       
-                       var iWidth;
-                       var nTmp = document.createElement( "div" );
-                       nTmp.style.width = _fnStringToCss( sWidth );
-                       
-                       nParent.appendChild( nTmp );
-                       iWidth = nTmp.offsetWidth;
-                       nParent.removeChild( nTmp );
-                       
-                       return ( iWidth );
+       
+                       outer.remove();
+       
+                       DataTable.__scrollbarWidth = w1 - w2;
                }
-               
-               
-               /**
-                * Calculate the width of columns for the table
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
-                */
-               function _fnCalculateColumnWidths ( oSettings )
+       
+               return DataTable.__scrollbarWidth;
+       }
+       
+       
+       
+       function _fnSortFlatten ( settings )
+       {
+               var
+                       i, iLen, k, kLen,
+                       aSort = [],
+                       aiOrig = [],
+                       aoColumns = settings.aoColumns,
+                       aDataSort, iCol, sType, srcCol,
+                       fixed = settings.aaSortingFixed,
+                       fixedObj = $.isPlainObject( fixed ),
+                       nestedSort = [],
+                       add = function ( a ) {
+                               if ( a.length && ! $.isArray( a[0] ) ) {
+                                       // 1D array
+                                       nestedSort.push( a );
+                               }
+                               else {
+                                       // 2D array
+                                       nestedSort.push.apply( nestedSort, a );
+                               }
+                       };
+       
+               // Build the sort array, with pre-fix and post-fix options if they have been
+               // specified
+               if ( $.isArray( fixed ) ) {
+                       add( fixed );
+               }
+       
+               if ( fixedObj && fixed.pre ) {
+                       add( fixed.pre );
+               }
+       
+               add( settings.aaSorting );
+       
+               if (fixedObj && fixed.post ) {
+                       add( fixed.post );
+               }
+       
+               for ( i=0 ; i<nestedSort.length ; i++ )
                {
-                       var iTableWidth = oSettings.nTable.offsetWidth;
-                       var iUserInputs = 0;
-                       var iTmpWidth;
-                       var iVisibleColumns = 0;
-                       var iColums = oSettings.aoColumns.length;
-                       var i, iIndex, iCorrector, iWidth;
-                       var oHeaders = $('th', oSettings.nTHead);
-                       var widthAttr = oSettings.nTable.getAttribute('width');
-                       var nWrapper = oSettings.nTable.parentNode;
-                       
-                       /* Convert any user input sizes into pixel sizes */
-                       for ( i=0 ; i<iColums ; i++ )
+                       srcCol = nestedSort[i][0];
+                       aDataSort = aoColumns[ srcCol ].aDataSort;
+       
+                       for ( k=0, kLen=aDataSort.length ; k<kLen ; k++ )
                        {
-                               if ( oSettings.aoColumns[i].bVisible )
-                               {
-                                       iVisibleColumns++;
-                                       
-                                       if ( oSettings.aoColumns[i].sWidth !== null )
-                                       {
-                                               iTmpWidth = _fnConvertToWidth( oSettings.aoColumns[i].sWidthOrig, 
-                                                       nWrapper );
-                                               if ( iTmpWidth !== null )
-                                               {
-                                                       oSettings.aoColumns[i].sWidth = _fnStringToCss( iTmpWidth );
-                                               }
-                                                       
-                                               iUserInputs++;
-                                       }
-                               }
+                               iCol = aDataSort[k];
+                               sType = aoColumns[ iCol ].sType || 'string';
+       
+                               aSort.push( {
+                                       src:       srcCol,
+                                       col:       iCol,
+                                       dir:       nestedSort[i][1],
+                                       index:     nestedSort[i][2],
+                                       type:      sType,
+                                       formatter: DataTable.ext.type.order[ sType+"-pre" ]
+                               } );
                        }
-                       
-                       /* If the number of columns in the DOM equals the number that we have to process in 
-                        * DataTables, then we can use the offsets that are created by the web-browser. No custom 
-                        * sizes can be set in order for this to happen, nor scrolling used
+               }
+       
+               return aSort;
+       }
+       
+       /**
+        * Change the order of the table
+        *  @param {object} oSettings dataTables settings object
+        *  @memberof DataTable#oApi
+        *  @todo This really needs split up!
+        */
+       function _fnSort ( oSettings )
+       {
+               var
+                       i, ien, iLen, j, jLen, k, kLen,
+                       sDataType, nTh,
+                       aiOrig = [],
+                       oExtSort = DataTable.ext.type.order,
+                       aoData = oSettings.aoData,
+                       aoColumns = oSettings.aoColumns,
+                       aDataSort, data, iCol, sType, oSort,
+                       formatters = 0,
+                       sortCol,
+                       displayMaster = oSettings.aiDisplayMaster,
+                       aSort;
+       
+               // Resolve any column types that are unknown due to addition or invalidation
+               // @todo Can this be moved into a 'data-ready' handler which is called when
+               //   data is going to be used in the table?
+               _fnColumnTypes( oSettings );
+       
+               aSort = _fnSortFlatten( oSettings );
+       
+               for ( i=0, ien=aSort.length ; i<ien ; i++ ) {
+                       sortCol = aSort[i];
+       
+                       // Track if we can use the fast sort algorithm
+                       if ( sortCol.formatter ) {
+                               formatters++;
+                       }
+       
+                       // Load the data needed for the sort, for each cell
+                       _fnSortData( oSettings, sortCol.col );
+               }
+       
+               /* No sorting required if server-side or no sorting array */
+               if ( _fnDataSource( oSettings ) != 'ssp' && aSort.length !== 0 )
+               {
+                       // Create a value - key array of the current row positions such that we can use their
+                       // current position during the sort, if values match, in order to perform stable sorting
+                       for ( i=0, iLen=displayMaster.length ; i<iLen ; i++ ) {
+                               aiOrig[ displayMaster[i] ] = i;
+                       }
+       
+                       /* Do the sort - here we want multi-column sorting based on a given data source (column)
+                        * and sorting function (from oSort) in a certain direction. It's reasonably complex to
+                        * follow on it's own, but this is what we want (example two column sorting):
+                        *  fnLocalSorting = function(a,b){
+                        *    var iTest;
+                        *    iTest = oSort['string-asc']('data11', 'data12');
+                        *      if (iTest !== 0)
+                        *        return iTest;
+                        *    iTest = oSort['numeric-desc']('data21', 'data22');
+                        *    if (iTest !== 0)
+                        *      return iTest;
+                        *    return oSort['numeric-asc']( aiOrig[a], aiOrig[b] );
+                        *  }
+                        * Basically we have a test for each sorting column, if the data in that column is equal,
+                        * test the next column. If all columns match, then we use a numeric sort on the row
+                        * positions in the original data array to provide a stable sort.
+                        *
+                        * Note - I know it seems excessive to have two sorting methods, but the first is around
+                        * 15% faster, so the second is only maintained for backwards compatibility with sorting
+                        * methods which do not have a pre-sort formatting function.
                         */
-                       if ( iColums == oHeaders.length && iUserInputs === 0 && iVisibleColumns == iColums &&
-                               oSettings.oScroll.sX === "" && oSettings.oScroll.sY === "" )
-                       {
-                               for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
-                               {
-                                       iTmpWidth = $(oHeaders[i]).width();
-                                       if ( iTmpWidth !== null )
-                                       {
-                                               oSettings.aoColumns[i].sWidth = _fnStringToCss( iTmpWidth );
-                                       }
-                               }
-                       }
-                       else
-                       {
-                               /* Otherwise we are going to have to do some calculations to get the width of each column.
-                                * Construct a 1 row table with the widest node in the data, and any user defined widths,
-                                * then insert it into the DOM and allow the browser to do all the hard work of
-                                * calculating table widths.
-                                */
-                               var
-                                       nCalcTmp = oSettings.nTable.cloneNode( false ),
-                                       nTheadClone = oSettings.nTHead.cloneNode(true),
-                                       nBody = document.createElement( 'tbody' ),
-                                       nTr = document.createElement( 'tr' ),
-                                       nDivSizing;
-                               
-                               nCalcTmp.removeAttribute( "id" );
-                               nCalcTmp.appendChild( nTheadClone );
-                               if ( oSettings.nTFoot !== null )
-                               {
-                                       nCalcTmp.appendChild( oSettings.nTFoot.cloneNode(true) );
-                                       _fnApplyToChildren( function(n) {
-                                               n.style.width = "";
-                                       }, nCalcTmp.getElementsByTagName('tr') );
-                               }
-                               
-                               nCalcTmp.appendChild( nBody );
-                               nBody.appendChild( nTr );
-                               
-                               /* Remove any sizing that was previously applied by the styles */
-                               var jqColSizing = $('thead th', nCalcTmp);
-                               if ( jqColSizing.length === 0 )
-                               {
-                                       jqColSizing = $('tbody tr:eq(0)>td', nCalcTmp);
-                               }
-               
-                               /* Apply custom sizing to the cloned header */
-                               var nThs = _fnGetUniqueThs( oSettings, nTheadClone );
-                               iCorrector = 0;
-                               for ( i=0 ; i<iColums ; i++ )
-                               {
-                                       var oColumn = oSettings.aoColumns[i];
-                                       if ( oColumn.bVisible && oColumn.sWidthOrig !== null && oColumn.sWidthOrig !== "" )
-                                       {
-                                               nThs[i-iCorrector].style.width = _fnStringToCss( oColumn.sWidthOrig );
-                                       }
-                                       else if ( oColumn.bVisible )
-                                       {
-                                               nThs[i-iCorrector].style.width = "";
-                                       }
-                                       else
-                                       {
-                                               iCorrector++;
-                                       }
-                               }
-               
-                               /* Find the biggest td for each column and put it into the table */
-                               for ( i=0 ; i<iColums ; i++ )
-                               {
-                                       if ( oSettings.aoColumns[i].bVisible )
-                                       {
-                                               var nTd = _fnGetWidestNode( oSettings, i );
-                                               if ( nTd !== null )
-                                               {
-                                                       nTd = nTd.cloneNode(true);
-                                                       if ( oSettings.aoColumns[i].sContentPadding !== "" )
-                                                       {
-                                                               nTd.innerHTML += oSettings.aoColumns[i].sContentPadding;
-                                                       }
-                                                       nTr.appendChild( nTd );
-                                               }
-                                       }
-                               }
-                               
-                               /* Build the table and 'display' it */
-                               nWrapper.appendChild( nCalcTmp );
-                               
-                               /* When scrolling (X or Y) we want to set the width of the table as appropriate. However,
-                                * when not scrolling leave the table width as it is. This results in slightly different,
-                                * but I think correct behaviour
-                                */
-                               if ( oSettings.oScroll.sX !== "" && oSettings.oScroll.sXInner !== "" )
-                               {
-                                       nCalcTmp.style.width = _fnStringToCss(oSettings.oScroll.sXInner);
-                               }
-                               else if ( oSettings.oScroll.sX !== "" )
-                               {
-                                       nCalcTmp.style.width = "";
-                                       if ( $(nCalcTmp).width() < nWrapper.offsetWidth )
-                                       {
-                                               nCalcTmp.style.width = _fnStringToCss( nWrapper.offsetWidth );
-                                       }
-                               }
-                               else if ( oSettings.oScroll.sY !== "" )
-                               {
-                                       nCalcTmp.style.width = _fnStringToCss( nWrapper.offsetWidth );
-                               }
-                               else if ( widthAttr )
-                               {
-                                       nCalcTmp.style.width = _fnStringToCss( widthAttr );
-                               }
-                               nCalcTmp.style.visibility = "hidden";
-                               
-                               /* Scrolling considerations */
-                               _fnScrollingWidthAdjust( oSettings, nCalcTmp );
-                               
-                               /* Read the width's calculated by the browser and store them for use by the caller. We
-                                * first of all try to use the elements in the body, but it is possible that there are
-                                * no elements there, under which circumstances we use the header elements
-                                */
-                               var oNodes = $("tbody tr:eq(0)", nCalcTmp).children();
-                               if ( oNodes.length === 0 )
-                               {
-                                       oNodes = _fnGetUniqueThs( oSettings, $('thead', nCalcTmp)[0] );
-                               }
-               
-                               /* Browsers need a bit of a hand when a width is assigned to any columns when 
-                                * x-scrolling as they tend to collapse the table to the min-width, even if
-                                * we sent the column widths. So we need to keep track of what the table width
-                                * should be by summing the user given values, and the automatic values
-                                */
-                               if ( oSettings.oScroll.sX !== "" )
-                               {
-                                       var iTotal = 0;
-                                       iCorrector = 0;
-                                       for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
-                                       {
-                                               if ( oSettings.aoColumns[i].bVisible )
-                                               {
-                                                       if ( oSettings.aoColumns[i].sWidthOrig === null )
-                                                       {
-                                                               iTotal += $(oNodes[iCorrector]).outerWidth();
-                                                       }
-                                                       else
-                                                       {
-                                                               iTotal += parseInt(oSettings.aoColumns[i].sWidth.replace('px',''), 10) +
-                                                                       ($(oNodes[iCorrector]).outerWidth() - $(oNodes[iCorrector]).width());
-                                                       }
-                                                       iCorrector++;
+                       if ( formatters === aSort.length ) {
+                               // All sort types have formatting functions
+                               displayMaster.sort( function ( a, b ) {
+                                       var
+                                               x, y, k, test, sort,
+                                               len=aSort.length,
+                                               dataA = aoData[a]._aSortData,
+                                               dataB = aoData[b]._aSortData;
+       
+                                       for ( k=0 ; k<len ; k++ ) {
+                                               sort = aSort[k];
+       
+                                               x = dataA[ sort.col ];
+                                               y = dataB[ sort.col ];
+       
+                                               test = x<y ? -1 : x>y ? 1 : 0;
+                                               if ( test !== 0 ) {
+                                                       return sort.dir === 'asc' ? test : -test;
                                                }
                                        }
-                                       
-                                       nCalcTmp.style.width = _fnStringToCss( iTotal );
-                                       oSettings.nTable.style.width = _fnStringToCss( iTotal );
-                               }
-               
-                               iCorrector = 0;
-                               for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
-                               {
-                                       if ( oSettings.aoColumns[i].bVisible )
-                                       {
-                                               iWidth = $(oNodes[iCorrector]).width();
-                                               if ( iWidth !== null && iWidth > 0 )
-                                               {
-                                                       oSettings.aoColumns[i].sWidth = _fnStringToCss( iWidth );
+       
+                                       x = aiOrig[a];
+                                       y = aiOrig[b];
+                                       return x<y ? -1 : x>y ? 1 : 0;
+                               } );
+                       }
+                       else {
+                               // Depreciated - remove in 1.11 (providing a plug-in option)
+                               // Not all sort types have formatting methods, so we have to call their sorting
+                               // methods.
+                               displayMaster.sort( function ( a, b ) {
+                                       var
+                                               x, y, k, l, test, sort, fn,
+                                               len=aSort.length,
+                                               dataA = aoData[a]._aSortData,
+                                               dataB = aoData[b]._aSortData;
+       
+                                       for ( k=0 ; k<len ; k++ ) {
+                                               sort = aSort[k];
+       
+                                               x = dataA[ sort.col ];
+                                               y = dataB[ sort.col ];
+       
+                                               fn = oExtSort[ sort.type+"-"+sort.dir ] || oExtSort[ "string-"+sort.dir ];
+                                               test = fn( x, y );
+                                               if ( test !== 0 ) {
+                                                       return test;
                                                }
-                                               iCorrector++;
                                        }
-                               }
-               
-                               var cssWidth = $(nCalcTmp).css('width');
-                               oSettings.nTable.style.width = (cssWidth.indexOf('%') !== -1) ?
-                                   cssWidth : _fnStringToCss( $(nCalcTmp).outerWidth() );
-                               nCalcTmp.parentNode.removeChild( nCalcTmp );
-                       }
-               
-                       if ( widthAttr )
-                       {
-                               oSettings.nTable.style.width = _fnStringToCss( widthAttr );
+       
+                                       x = aiOrig[a];
+                                       y = aiOrig[b];
+                                       return x<y ? -1 : x>y ? 1 : 0;
+                               } );
                        }
                }
-               
-               
-               /**
-                * Adjust a table's width to take account of scrolling
-                *  @param {object} oSettings dataTables settings object
-                *  @param {node} n table node
-                *  @memberof DataTable#oApi
-                */
-               function _fnScrollingWidthAdjust ( oSettings, n )
-               {
-                       if ( oSettings.oScroll.sX === "" && oSettings.oScroll.sY !== "" )
-                       {
-                               /* When y-scrolling only, we want to remove the width of the scroll bar so the table
-                                * + scroll bar will fit into the area avaialble.
-                                */
-                               var iOrigWidth = $(n).width();
-                               n.style.width = _fnStringToCss( $(n).outerWidth()-oSettings.oScroll.iBarWidth );
+       
+               /* Tell the draw function that we have sorted the data */
+               oSettings.bSorted = true;
+       }
+       
+       
+       function _fnSortAria ( settings )
+       {
+               var label;
+               var nextSort;
+               var columns = settings.aoColumns;
+               var aSort = _fnSortFlatten( settings );
+               var oAria = settings.oLanguage.oAria;
+       
+               // ARIA attributes - need to loop all columns, to update all (removing old
+               // attributes as needed)
+               for ( var i=0, iLen=columns.length ; i<iLen ; i++ )
+               {
+                       var col = columns[i];
+                       var asSorting = col.asSorting;
+                       var sTitle = col.sTitle.replace( /<.*?>/g, "" );
+                       var th = col.nTh;
+       
+                       // IE7 is throwing an error when setting these properties with jQuery's
+                       // attr() and removeAttr() methods...
+                       th.removeAttribute('aria-sort');
+       
+                       /* In ARIA only the first sorting column can be marked as sorting - no multi-sort option */
+                       if ( col.bSortable ) {
+                               if ( aSort.length > 0 && aSort[0].col == i ) {
+                                       th.setAttribute('aria-sort', aSort[0].dir=="asc" ? "ascending" : "descending" );
+                                       nextSort = asSorting[ aSort[0].index+1 ] || asSorting[0];
+                               }
+                               else {
+                                       nextSort = asSorting[0];
+                               }
+       
+                               label = sTitle + ( nextSort === "asc" ?
+                                       oAria.sSortAscending :
+                                       oAria.sSortDescending
+                               );
                        }
-                       else if ( oSettings.oScroll.sX !== "" )
-                       {
-                               /* When x-scrolling both ways, fix the table at it's current size, without adjusting */
-                               n.style.width = _fnStringToCss( $(n).outerWidth() );
+                       else {
+                               label = sTitle;
                        }
+       
+                       th.setAttribute('aria-label', label);
                }
-               
-               
-               /**
-                * Get the widest node
-                *  @param {object} oSettings dataTables settings object
-                *  @param {int} iCol column of interest
-                *  @returns {node} widest table node
-                *  @memberof DataTable#oApi
-                */
-               function _fnGetWidestNode( oSettings, iCol )
-               {
-                       var iMaxIndex = _fnGetMaxLenString( oSettings, iCol );
-                       if ( iMaxIndex < 0 )
-                       {
-                               return null;
+       }
+       
+       
+       /**
+        * Function to run on user sort request
+        *  @param {object} settings dataTables settings object
+        *  @param {node} attachTo node to attach the handler to
+        *  @param {int} colIdx column sorting index
+        *  @param {boolean} [append=false] Append the requested sort to the existing
+        *    sort if true (i.e. multi-column sort)
+        *  @param {function} [callback] callback function
+        *  @memberof DataTable#oApi
+        */
+       function _fnSortListener ( settings, colIdx, append, callback )
+       {
+               var col = settings.aoColumns[ colIdx ];
+               var sorting = settings.aaSorting;
+               var asSorting = col.asSorting;
+               var nextSortIdx;
+               var next = function ( a ) {
+                       var idx = a._idx;
+                       if ( idx === undefined ) {
+                               idx = $.inArray( a[1], asSorting );
                        }
-               
-                       if ( oSettings.aoData[iMaxIndex].nTr === null )
-                       {
-                               var n = document.createElement('td');
-                               n.innerHTML = _fnGetCellData( oSettings, iMaxIndex, iCol, '' );
-                               return n;
+       
+                       return idx+1 >= asSorting.length ? 0 : idx+1;
+               };
+       
+               // If appending the sort then we are multi-column sorting
+               if ( append && settings.oFeatures.bSortMulti ) {
+                       // Are we already doing some kind of sort on this column?
+                       var sortIdx = $.inArray( colIdx, _pluck(sorting, '0') );
+       
+                       if ( sortIdx !== -1 ) {
+                               // Yes, modify the sort
+                               nextSortIdx = next( sorting[sortIdx] );
+       
+                               sorting[sortIdx][1] = asSorting[ nextSortIdx ];
+                               sorting[sortIdx]._idx = nextSortIdx;
                        }
-                       return _fnGetTdNodes(oSettings, iMaxIndex)[iCol];
-               }
-               
-               
-               /**
-                * Get the maximum strlen for each data column
-                *  @param {object} oSettings dataTables settings object
-                *  @param {int} iCol column of interest
-                *  @returns {string} max string length for each column
-                *  @memberof DataTable#oApi
-                */
-               function _fnGetMaxLenString( oSettings, iCol )
-               {
-                       var iMax = -1;
-                       var iMaxIndex = -1;
-                       
-                       for ( var i=0 ; i<oSettings.aoData.length ; i++ )
-                       {
-                               var s = _fnGetCellData( oSettings, i, iCol, 'display' )+"";
-                               s = s.replace( /<.*?>/g, "" );
-                               if ( s.length > iMax )
-                               {
-                                       iMax = s.length;
-                                       iMaxIndex = i;
-                               }
+                       else {
+                               // No sort on this column yet
+                               sorting.push( [ colIdx, asSorting[0], 0 ] );
+                               sorting[sorting.length-1]._idx = 0;
                        }
-                       
-                       return iMaxIndex;
                }
-               
-               
-               /**
-                * Append a CSS unit (only if required) to a string
-                *  @param {array} aArray1 first array
-                *  @param {array} aArray2 second array
-                *  @returns {int} 0 if match, 1 if length is different, 2 if no match
-                *  @memberof DataTable#oApi
-                */
-               function _fnStringToCss( s )
-               {
-                       if ( s === null )
-                       {
-                               return "0px";
-                       }
-                       
-                       if ( typeof s == 'number' )
-                       {
-                               if ( s < 0 )
-                               {
-                                       return "0px";
-                               }
-                               return s+"px";
-                       }
-                       
-                       /* Check if the last character is not 0-9 */
-                       var c = s.charCodeAt( s.length-1 );
-                       if (c < 0x30 || c > 0x39)
-                       {
-                               return s;
-                       }
-                       return s+"px";
+               else if ( sorting.length && sorting[0][0] == colIdx ) {
+                       // Single column - already sorting on this column, modify the sort
+                       nextSortIdx = next( sorting[0] );
+       
+                       sorting.length = 1;
+                       sorting[0][1] = asSorting[ nextSortIdx ];
+                       sorting[0]._idx = nextSortIdx;
                }
-               
-               
-               /**
-                * Get the width of a scroll bar in this browser being used
-                *  @returns {int} width in pixels
-                *  @memberof DataTable#oApi
-                */
-               function _fnScrollBarWidth ()
-               {  
-                       var inner = document.createElement('p');
-                       var style = inner.style;
-                       style.width = "100%";
-                       style.height = "200px";
-                       style.padding = "0px";
-                       
-                       var outer = document.createElement('div');
-                       style = outer.style;
-                       style.position = "absolute";
-                       style.top = "0px";
-                       style.left = "0px";
-                       style.visibility = "hidden";
-                       style.width = "200px";
-                       style.height = "150px";
-                       style.padding = "0px";
-                       style.overflow = "hidden";
-                       outer.appendChild(inner);
-                       
-                       document.body.appendChild(outer);
-                       var w1 = inner.offsetWidth;
-                       outer.style.overflow = 'scroll';
-                       var w2 = inner.offsetWidth;
-                       if ( w1 == w2 )
-                       {
-                               w2 = outer.clientWidth;
-                       }
-                       
-                       document.body.removeChild(outer);
-                       return (w1 - w2);  
+               else {
+                       // Single column - sort only on this column
+                       sorting.length = 0;
+                       sorting.push( [ colIdx, asSorting[0] ] );
+                       sorting[0]._idx = 0;
                }
-               
-               /**
-                * Change the order of the table
-                *  @param {object} oSettings dataTables settings object
-                *  @param {bool} bApplyClasses optional - should we apply classes or not
-                *  @memberof DataTable#oApi
-                */
-               function _fnSort ( oSettings, bApplyClasses )
-               {
-                       var
-                               i, iLen, j, jLen, k, kLen,
-                               sDataType, nTh,
-                               aaSort = [],
-                               aiOrig = [],
-                               oSort = DataTable.ext.oSort,
-                               aoData = oSettings.aoData,
-                               aoColumns = oSettings.aoColumns,
-                               oAria = oSettings.oLanguage.oAria;
-                       
-                       /* No sorting required if server-side or no sorting array */
-                       if ( !oSettings.oFeatures.bServerSide && 
-                               (oSettings.aaSorting.length !== 0 || oSettings.aaSortingFixed !== null) )
-                       {
-                               aaSort = ( oSettings.aaSortingFixed !== null ) ?
-                                       oSettings.aaSortingFixed.concat( oSettings.aaSorting ) :
-                                       oSettings.aaSorting.slice();
-                               
-                               /* If there is a sorting data type, and a function belonging to it, then we need to
-                                * get the data from the developer's function and apply it for this column
-                                */
-                               for ( i=0 ; i<aaSort.length ; i++ )
-                               {
-                                       var iColumn = aaSort[i][0];
-                                       var iVisColumn = _fnColumnIndexToVisible( oSettings, iColumn );
-                                       sDataType = oSettings.aoColumns[ iColumn ].sSortDataType;
-                                       if ( DataTable.ext.afnSortData[sDataType] )
-                                       {
-                                               var aData = DataTable.ext.afnSortData[sDataType].call( 
-                                                       oSettings.oInstance, oSettings, iColumn, iVisColumn
-                                               );
-                                               if ( aData.length === aoData.length )
-                                               {
-                                                       for ( j=0, jLen=aoData.length ; j<jLen ; j++ )
-                                                       {
-                                                               _fnSetCellData( oSettings, j, iColumn, aData[j] );
-                                                       }
-                                               }
-                                               else
-                                               {
-                                                       _fnLog( oSettings, 0, "Returned data sort array (col "+iColumn+") is the wrong length" );
-                                               }
-                                       }
-                               }
-                               
-                               /* Create a value - key array of the current row positions such that we can use their
-                                * current position during the sort, if values match, in order to perform stable sorting
-                                */
-                               for ( i=0, iLen=oSettings.aiDisplayMaster.length ; i<iLen ; i++ )
-                               {
-                                       aiOrig[ oSettings.aiDisplayMaster[i] ] = i;
-                               }
-               
-                               /* Build an internal data array which is specific to the sort, so we can get and prep
-                                * the data to be sorted only once, rather than needing to do it every time the sorting
-                                * function runs. This make the sorting function a very simple comparison
-                                */
-                               var iSortLen = aaSort.length;
-                               var fnSortFormat, aDataSort;
-                               for ( i=0, iLen=aoData.length ; i<iLen ; i++ )
-                               {
-                                       for ( j=0 ; j<iSortLen ; j++ )
-                                       {
-                                               aDataSort = aoColumns[ aaSort[j][0] ].aDataSort;
-               
-                                               for ( k=0, kLen=aDataSort.length ; k<kLen ; k++ )
-                                               {
-                                                       sDataType = aoColumns[ aDataSort[k] ].sType;
-                                                       fnSortFormat = oSort[ (sDataType ? sDataType : 'string')+"-pre" ];
-                                                       
-                                                       aoData[i]._aSortData[ aDataSort[k] ] = fnSortFormat ?
-                                                               fnSortFormat( _fnGetCellData( oSettings, i, aDataSort[k], 'sort' ) ) :
-                                                               _fnGetCellData( oSettings, i, aDataSort[k], 'sort' );
-                                               }
-                                       }
-                               }
-                               
-                               /* Do the sort - here we want multi-column sorting based on a given data source (column)
-                                * and sorting function (from oSort) in a certain direction. It's reasonably complex to
-                                * follow on it's own, but this is what we want (example two column sorting):
-                                *  fnLocalSorting = function(a,b){
-                                *      var iTest;
-                                *      iTest = oSort['string-asc']('data11', 'data12');
-                                *      if (iTest !== 0)
-                                *              return iTest;
-                                *    iTest = oSort['numeric-desc']('data21', 'data22');
-                                *    if (iTest !== 0)
-                                *              return iTest;
-                                *      return oSort['numeric-asc']( aiOrig[a], aiOrig[b] );
-                                *  }
-                                * Basically we have a test for each sorting column, if the data in that column is equal,
-                                * test the next column. If all columns match, then we use a numeric sort on the row 
-                                * positions in the original data array to provide a stable sort.
-                                */
-                               oSettings.aiDisplayMaster.sort( function ( a, b ) {
-                                       var k, l, lLen, iTest, aDataSort, sDataType;
-                                       for ( k=0 ; k<iSortLen ; k++ )
-                                       {
-                                               aDataSort = aoColumns[ aaSort[k][0] ].aDataSort;
-               
-                                               for ( l=0, lLen=aDataSort.length ; l<lLen ; l++ )
-                                               {
-                                                       sDataType = aoColumns[ aDataSort[l] ].sType;
-                                                       
-                                                       iTest = oSort[ (sDataType ? sDataType : 'string')+"-"+aaSort[k][1] ](
-                                                               aoData[a]._aSortData[ aDataSort[l] ],
-                                                               aoData[b]._aSortData[ aDataSort[l] ]
-                                                       );
-                                               
-                                                       if ( iTest !== 0 )
-                                                       {
-                                                               return iTest;
-                                                       }
-                                               }
+       
+               // Run the sort by calling a full redraw
+               _fnReDraw( settings );
+       
+               // callback used for async user interaction
+               if ( typeof callback == 'function' ) {
+                       callback( settings );
+               }
+       }
+       
+       
+       /**
+        * Attach a sort handler (click) to a node
+        *  @param {object} settings dataTables settings object
+        *  @param {node} attachTo node to attach the handler to
+        *  @param {int} colIdx column sorting index
+        *  @param {function} [callback] callback function
+        *  @memberof DataTable#oApi
+        */
+       function _fnSortAttachListener ( settings, attachTo, colIdx, callback )
+       {
+               var col = settings.aoColumns[ colIdx ];
+       
+               _fnBindAction( attachTo, {}, function (e) {
+                       /* If the column is not sortable - don't to anything */
+                       if ( col.bSortable === false ) {
+                               return;
+                       }
+       
+                       // If processing is enabled use a timeout to allow the processing
+                       // display to be shown - otherwise to it synchronously
+                       if ( settings.oFeatures.bProcessing ) {
+                               _fnProcessingDisplay( settings, true );
+       
+                               setTimeout( function() {
+                                       _fnSortListener( settings, colIdx, e.shiftKey, callback );
+       
+                                       // In server-side processing, the draw callback will remove the
+                                       // processing display
+                                       if ( _fnDataSource( settings ) !== 'ssp' ) {
+                                               _fnProcessingDisplay( settings, false );
                                        }
-                                       
-                                       return oSort['numeric-asc']( aiOrig[a], aiOrig[b] );
-                               } );
+                               }, 0 );
                        }
-                       
-                       /* Alter the sorting classes to take account of the changes */
-                       if ( (bApplyClasses === undefined || bApplyClasses) && !oSettings.oFeatures.bDeferRender )
-                       {
-                               _fnSortingClasses( oSettings );
+                       else {
+                               _fnSortListener( settings, colIdx, e.shiftKey, callback );
                        }
-               
-                       for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-                       {
-                               var sTitle = aoColumns[i].sTitle.replace( /<.*?>/g, "" );
-                               nTh = aoColumns[i].nTh;
-                               nTh.removeAttribute('aria-sort');
-                               nTh.removeAttribute('aria-label');
-                               
-                               /* In ARIA only the first sorting column can be marked as sorting - no multi-sort option */
-                               if ( aoColumns[i].bSortable )
-                               {
-                                       if ( aaSort.length > 0 && aaSort[0][0] == i )
-                                       {
-                                               nTh.setAttribute('aria-sort', aaSort[0][1]=="asc" ? "ascending" : "descending" );
-                                               
-                                               var nextSort = (aoColumns[i].asSorting[ aaSort[0][2]+1 ]) ? 
-                                                       aoColumns[i].asSorting[ aaSort[0][2]+1 ] : aoColumns[i].asSorting[0];
-                                               nTh.setAttribute('aria-label', sTitle+
-                                                       (nextSort=="asc" ? oAria.sSortAscending : oAria.sSortDescending) );
-                                       }
-                                       else
-                                       {
-                                               nTh.setAttribute('aria-label', sTitle+
-                                                       (aoColumns[i].asSorting[0]=="asc" ? oAria.sSortAscending : oAria.sSortDescending) );
-                                       }
-                               }
-                               else
-                               {
-                                       nTh.setAttribute('aria-label', sTitle);
-                               }
+               } );
+       }
+       
+       
+       /**
+        * Set the sorting classes on table's body, Note: it is safe to call this function
+        * when bSort and bSortClasses are false
+        *  @param {object} oSettings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnSortingClasses( settings )
+       {
+               var oldSort = settings.aLastSort;
+               var sortClass = settings.oClasses.sSortColumn;
+               var sort = _fnSortFlatten( settings );
+               var features = settings.oFeatures;
+               var i, ien, colIdx;
+       
+               if ( features.bSort && features.bSortClasses ) {
+                       // Remove old sorting classes
+                       for ( i=0, ien=oldSort.length ; i<ien ; i++ ) {
+                               colIdx = oldSort[i].src;
+       
+                               // Remove column sorting
+                               $( _pluck( settings.aoData, 'anCells', colIdx ) )
+                                       .removeClass( sortClass + (i<2 ? i+1 : 3) );
                        }
-                       
-                       /* Tell the draw function that we have sorted the data */
-                       oSettings.bSorted = true;
-                       $(oSettings.oInstance).trigger('sort', oSettings);
-                       
-                       /* Copy the master data into the draw array and re-draw */
-                       if ( oSettings.oFeatures.bFilter )
-                       {
-                               /* _fnFilter() will redraw the table for us */
-                               _fnFilterComplete( oSettings, oSettings.oPreviousSearch, 1 );
+       
+                       // Add new column sorting
+                       for ( i=0, ien=sort.length ; i<ien ; i++ ) {
+                               colIdx = sort[i].src;
+       
+                               $( _pluck( settings.aoData, 'anCells', colIdx ) )
+                                       .addClass( sortClass + (i<2 ? i+1 : 3) );
                        }
-                       else
-                       {
-                               oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-                               oSettings._iDisplayStart = 0; /* reset display back to page 0 */
-                               _fnCalculateEnd( oSettings );
-                               _fnDraw( oSettings );
+               }
+       
+               settings.aLastSort = sort;
+       }
+       
+       
+       // Get the data to sort a column, be it from cache, fresh (populating the
+       // cache), or from a sort formatter
+       function _fnSortData( settings, idx )
+       {
+               // Custom sorting function - provided by the sort data type
+               var column = settings.aoColumns[ idx ];
+               var customSort = DataTable.ext.order[ column.sSortDataType ];
+               var customData;
+       
+               if ( customSort ) {
+                       customData = customSort.call( settings.oInstance, settings, idx,
+                               _fnColumnIndexToVisible( settings, idx )
+                       );
+               }
+       
+               // Use / populate cache
+               var row, cellData;
+               var formatter = DataTable.ext.type.order[ column.sType+"-pre" ];
+       
+               for ( var i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
+                       row = settings.aoData[i];
+       
+                       if ( ! row._aSortData ) {
+                               row._aSortData = [];
+                       }
+       
+                       if ( ! row._aSortData[idx] || customSort ) {
+                               cellData = customSort ?
+                                       customData[i] : // If there was a custom sort function, use data from there
+                                       _fnGetCellData( settings, i, idx, 'sort' );
+       
+                               row._aSortData[ idx ] = formatter ?
+                                       formatter( cellData ) :
+                                       cellData;
                        }
                }
-               
-               
-               /**
-                * Attach a sort handler (click) to a node
-                *  @param {object} oSettings dataTables settings object
-                *  @param {node} nNode node to attach the handler to
-                *  @param {int} iDataIndex column sorting index
-                *  @param {function} [fnCallback] callback function
-                *  @memberof DataTable#oApi
-                */
-               function _fnSortAttachListener ( oSettings, nNode, iDataIndex, fnCallback )
+       }
+       
+       
+       
+       /**
+        * Save the state of a table
+        *  @param {object} oSettings dataTables settings object
+        *  @memberof DataTable#oApi
+        */
+       function _fnSaveState ( oSettings )
+       {
+               if ( !oSettings.oFeatures.bStateSave || oSettings.bDestroying )
                {
-                       _fnBindAction( nNode, {}, function (e) {
-                               /* If the column is not sortable - don't to anything */
-                               if ( oSettings.aoColumns[iDataIndex].bSortable === false )
-                               {
-                                       return;
-                               }
-                               
-                               /*
-                                * This is a little bit odd I admit... I declare a temporary function inside the scope of
-                                * _fnBuildHead and the click handler in order that the code presented here can be used 
-                                * twice - once for when bProcessing is enabled, and another time for when it is 
-                                * disabled, as we need to perform slightly different actions.
-                                *   Basically the issue here is that the Javascript engine in modern browsers don't 
-                                * appear to allow the rendering engine to update the display while it is still executing
-                                * it's thread (well - it does but only after long intervals). This means that the 
-                                * 'processing' display doesn't appear for a table sort. To break the js thread up a bit
-                                * I force an execution break by using setTimeout - but this breaks the expected 
-                                * thread continuation for the end-developer's point of view (their code would execute
-                                * too early), so we only do it when we absolutely have to.
-                                */
-                               var fnInnerSorting = function () {
-                                       var iColumn, iNextSort;
-                                       
-                                       /* If the shift key is pressed then we are multiple column sorting */
-                                       if ( e.shiftKey )
-                                       {
-                                               /* Are we already doing some kind of sort on this column? */
-                                               var bFound = false;
-                                               for ( var i=0 ; i<oSettings.aaSorting.length ; i++ )
-                                               {
-                                                       if ( oSettings.aaSorting[i][0] == iDataIndex )
-                                                       {
-                                                               bFound = true;
-                                                               iColumn = oSettings.aaSorting[i][0];
-                                                               iNextSort = oSettings.aaSorting[i][2]+1;
-                                                               
-                                                               if ( !oSettings.aoColumns[iColumn].asSorting[iNextSort] )
-                                                               {
-                                                                       /* Reached the end of the sorting options, remove from multi-col sort */
-                                                                       oSettings.aaSorting.splice( i, 1 );
-                                                               }
-                                                               else
-                                                               {
-                                                                       /* Move onto next sorting direction */
-                                                                       oSettings.aaSorting[i][1] = oSettings.aoColumns[iColumn].asSorting[iNextSort];
-                                                                       oSettings.aaSorting[i][2] = iNextSort;
-                                                               }
-                                                               break;
-                                                       }
-                                               }
-                                               
-                                               /* No sort yet - add it in */
-                                               if ( bFound === false )
-                                               {
-                                                       oSettings.aaSorting.push( [ iDataIndex, 
-                                                               oSettings.aoColumns[iDataIndex].asSorting[0], 0 ] );
-                                               }
-                                       }
-                                       else
-                                       {
-                                               /* If no shift key then single column sort */
-                                               if ( oSettings.aaSorting.length == 1 && oSettings.aaSorting[0][0] == iDataIndex )
-                                               {
-                                                       iColumn = oSettings.aaSorting[0][0];
-                                                       iNextSort = oSettings.aaSorting[0][2]+1;
-                                                       if ( !oSettings.aoColumns[iColumn].asSorting[iNextSort] )
-                                                       {
-                                                               iNextSort = 0;
-                                                       }
-                                                       oSettings.aaSorting[0][1] = oSettings.aoColumns[iColumn].asSorting[iNextSort];
-                                                       oSettings.aaSorting[0][2] = iNextSort;
-                                               }
-                                               else
-                                               {
-                                                       oSettings.aaSorting.splice( 0, oSettings.aaSorting.length );
-                                                       oSettings.aaSorting.push( [ iDataIndex, 
-                                                               oSettings.aoColumns[iDataIndex].asSorting[0], 0 ] );
-                                               }
-                                       }
-                                       
-                                       /* Run the sort */
-                                       _fnSort( oSettings );
-                               }; /* /fnInnerSorting */
-                               
-                               if ( !oSettings.oFeatures.bProcessing )
-                               {
-                                       fnInnerSorting();
-                               }
-                               else
-                               {
-                                       _fnProcessingDisplay( oSettings, true );
-                                       setTimeout( function() {
-                                               fnInnerSorting();
-                                               if ( !oSettings.oFeatures.bServerSide )
-                                               {
-                                                       _fnProcessingDisplay( oSettings, false );
-                                               }
-                                       }, 0 );
-                               }
-                               
-                               /* Call the user specified callback function - used for async user interaction */
-                               if ( typeof fnCallback == 'function' )
-                               {
-                                       fnCallback( oSettings );
-                               }
-                       } );
+                       return;
                }
-               
-               
-               /**
-                * Set the sorting classes on the header, Note: it is safe to call this function 
-                * when bSort and bSortClasses are false
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
+       
+               /* Store the interesting variables */
+               var i, iLen;
+               var oState = {
+                       "iCreate":      +new Date(),
+                       "iStart":       oSettings._iDisplayStart,
+                       "iLength":      oSettings._iDisplayLength,
+                       "aaSorting":    $.extend( true, [], oSettings.aaSorting ),
+                       "oSearch":      $.extend( true, {}, oSettings.oPreviousSearch ),
+                       "aoSearchCols": $.extend( true, [], oSettings.aoPreSearchCols ),
+                       "abVisCols":    _pluck( oSettings.aoColumns, 'bVisible' )
+               };
+       
+               _fnCallbackFire( oSettings, "aoStateSaveParams", 'stateSaveParams', [oSettings, oState] );
+       
+               oSettings.fnStateSaveCallback.call( oSettings.oInstance, oSettings, oState );
+       }
+       
+       
+       /**
+        * Attempt to load a saved table state
+        *  @param {object} oSettings dataTables settings object
+        *  @param {object} oInit DataTables init object so we can override settings
+        *  @memberof DataTable#oApi
+        */
+       function _fnLoadState ( oSettings, oInit )
+       {
+               var i, ien;
+               var columns = oSettings.aoColumns;
+       
+               if ( ! oSettings.oFeatures.bStateSave ) {
+                       return;
+               }
+       
+               var oData = oSettings.fnStateLoadCallback.call( oSettings.oInstance, oSettings );
+               if ( !oData ) {
+                       return;
+               }
+       
+               /* Allow custom and plug-in manipulation functions to alter the saved data set and
+                * cancelling of loading by returning false
                 */
-               function _fnSortingClasses( oSettings )
-               {
-                       var i, iLen, j, jLen, iFound;
-                       var aaSort, sClass;
-                       var iColumns = oSettings.aoColumns.length;
-                       var oClasses = oSettings.oClasses;
-                       
-                       for ( i=0 ; i<iColumns ; i++ )
-                       {
-                               if ( oSettings.aoColumns[i].bSortable )
-                               {
-                                       $(oSettings.aoColumns[i].nTh).removeClass( oClasses.sSortAsc +" "+ oClasses.sSortDesc +
-                                               " "+ oSettings.aoColumns[i].sSortingClass );
-                               }
-                       }
-                       
-                       if ( oSettings.aaSortingFixed !== null )
-                       {
-                               aaSort = oSettings.aaSortingFixed.concat( oSettings.aaSorting );
+               var abStateLoad = _fnCallbackFire( oSettings, 'aoStateLoadParams', 'stateLoadParams', [oSettings, oData] );
+               if ( $.inArray( false, abStateLoad ) !== -1 ) {
+                       return;
+               }
+       
+               /* Reject old data */
+               var duration = oSettings.iStateDuration;
+               if ( duration > 0 && oData.iCreate < +new Date() - (duration*1000) ) {
+                       return;
+               }
+       
+               // Number of columns have changed - all bets are off, no restore of settings
+               if ( columns.length !== oData.aoSearchCols.length ) {
+                       return;
+               }
+       
+               /* Store the saved state so it might be accessed at any time */
+               oSettings.oLoadedState = $.extend( true, {}, oData );
+       
+               /* Restore key features */
+               oSettings._iDisplayStart    = oData.iStart;
+               oSettings.iInitDisplayStart = oData.iStart;
+               oSettings._iDisplayLength   = oData.iLength;
+               oSettings.aaSorting = $.map( oData.aaSorting, function ( col, i ) {
+                       return col[0] >= columns.length ?
+                               [ 0, col[1] ] :
+                               col;
+               } );
+       
+               /* Search filtering  */
+               $.extend( oSettings.oPreviousSearch, oData.oSearch );
+               $.extend( true, oSettings.aoPreSearchCols, oData.aoSearchCols );
+       
+               /* Column visibility state */
+               var visColumns = oData.abVisCols;
+               for ( i=0, ien=visColumns.length ; i<ien ; i++ ) {
+                       columns[i].bVisible = visColumns[i];
+               }
+       
+               _fnCallbackFire( oSettings, 'aoStateLoaded', 'stateLoaded', [oSettings, oData] );
+       }
+       
+       
+       /**
+        * Return the settings object for a particular table
+        *  @param {node} table table we are using as a dataTable
+        *  @returns {object} Settings object - or null if not found
+        *  @memberof DataTable#oApi
+        */
+       function _fnSettingsFromNode ( table )
+       {
+               var settings = DataTable.settings;
+               var idx = $.inArray( table, _pluck( settings, 'nTable' ) );
+       
+               return idx !== -1 ?
+                       settings[ idx ] :
+                       null;
+       }
+       
+       
+       /**
+        * Log an error message
+        *  @param {object} settings dataTables settings object
+        *  @param {int} level log error messages, or display them to the user
+        *  @param {string} msg error message
+        *  @param {int} tn Technical note id to get more information about the error.
+        *  @memberof DataTable#oApi
+        */
+       function _fnLog( settings, level, msg, tn )
+       {
+               msg = 'DataTables warning: '+
+                       (settings!==null ? 'table id='+settings.sTableId+' - ' : '')+msg;
+       
+               if ( tn ) {
+                       msg += '. For more information about this error, please see '+
+                       'http://datatables.net/tn/'+tn;
+               }
+       
+               if ( ! level  ) {
+                       // Backwards compatibility pre 1.10
+                       var ext = DataTable.ext;
+                       var type = ext.sErrMode || ext.errMode;
+       
+                       if ( type == 'alert' ) {
+                               alert( msg );
                        }
-                       else
-                       {
-                               aaSort = oSettings.aaSorting.slice();
+                       else {
+                               throw new Error(msg);
                        }
-                       
-                       /* Apply the required classes to the header */
-                       for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
-                       {
-                               if ( oSettings.aoColumns[i].bSortable )
-                               {
-                                       sClass = oSettings.aoColumns[i].sSortingClass;
-                                       iFound = -1;
-                                       for ( j=0 ; j<aaSort.length ; j++ )
-                                       {
-                                               if ( aaSort[j][0] == i )
-                                               {
-                                                       sClass = ( aaSort[j][1] == "asc" ) ?
-                                                               oClasses.sSortAsc : oClasses.sSortDesc;
-                                                       iFound = j;
-                                                       break;
-                                               }
-                                       }
-                                       $(oSettings.aoColumns[i].nTh).addClass( sClass );
-                                       
-                                       if ( oSettings.bJUI )
-                                       {
-                                               /* jQuery UI uses extra markup */
-                                               var jqSpan = $("span."+oClasses.sSortIcon,  oSettings.aoColumns[i].nTh);
-                                               jqSpan.removeClass(oClasses.sSortJUIAsc +" "+ oClasses.sSortJUIDesc +" "+ 
-                                                       oClasses.sSortJUI +" "+ oClasses.sSortJUIAscAllowed +" "+ oClasses.sSortJUIDescAllowed );
-                                               
-                                               var sSpanClass;
-                                               if ( iFound == -1 )
-                                               {
-                                                       sSpanClass = oSettings.aoColumns[i].sSortingClassJUI;
-                                               }
-                                               else if ( aaSort[iFound][1] == "asc" )
-                                               {
-                                                       sSpanClass = oClasses.sSortJUIAsc;
-                                               }
-                                               else
-                                               {
-                                                       sSpanClass = oClasses.sSortJUIDesc;
-                                               }
-                                               
-                                               jqSpan.addClass( sSpanClass );
-                                       }
-                               }
-                               else
-                               {
-                                       /* No sorting on this column, so add the base class. This will have been assigned by
-                                        * _fnAddColumn
-                                        */
-                                       $(oSettings.aoColumns[i].nTh).addClass( oSettings.aoColumns[i].sSortingClass );
+               }
+               else if ( window.console && console.log ) {
+                       console.log( msg );
+               }
+       }
+       
+       
+       /**
+        * See if a property is defined on one object, if so assign it to the other object
+        *  @param {object} ret target object
+        *  @param {object} src source object
+        *  @param {string} name property
+        *  @param {string} [mappedName] name to map too - optional, name used if not given
+        *  @memberof DataTable#oApi
+        */
+       function _fnMap( ret, src, name, mappedName )
+       {
+               if ( $.isArray( name ) ) {
+                       $.each( name, function (i, val) {
+                               if ( $.isArray( val ) ) {
+                                       _fnMap( ret, src, val[0], val[1] );
                                }
-                       }
-                       
-                       /* 
-                        * Apply the required classes to the table body
-                        * Note that this is given as a feature switch since it can significantly slow down a sort
-                        * on large data sets (adding and removing of classes is always slow at the best of times..)
-                        * Further to this, note that this code is admittedly fairly ugly. It could be made a lot 
-                        * simpler using jQuery selectors and add/removeClass, but that is significantly slower
-                        * (on the order of 5 times slower) - hence the direct DOM manipulation here.
-                        * Note that for deferred drawing we do use jQuery - the reason being that taking the first
-                        * row found to see if the whole column needs processed can miss classes since the first
-                        * column might be new.
-                        */
-                       sClass = oClasses.sSortColumn;
-                       
-                       if ( oSettings.oFeatures.bSort && oSettings.oFeatures.bSortClasses )
-                       {
-                               var nTds = _fnGetTdNodes( oSettings );
-                               
-                               /* Determine what the sorting class for each column should be */
-                               var iClass, iTargetCol;
-                               var asClasses = [];
-                               for (i = 0; i < iColumns; i++)
-                               {
-                                       asClasses.push("");
+                               else {
+                                       _fnMap( ret, src, val );
                                }
-                               for (i = 0, iClass = 1; i < aaSort.length; i++)
-                               {
-                                       iTargetCol = parseInt( aaSort[i][0], 10 );
-                                       asClasses[iTargetCol] = sClass + iClass;
-                                       
-                                       if ( iClass < 3 )
-                                       {
-                                               iClass++;
+                       } );
+       
+                       return;
+               }
+       
+               if ( mappedName === undefined ) {
+                       mappedName = name;
+               }
+       
+               if ( src[name] !== undefined ) {
+                       ret[mappedName] = src[name];
+               }
+       }
+       
+       
+       /**
+        * Extend objects - very similar to jQuery.extend, but deep copy objects, and
+        * shallow copy arrays. The reason we need to do this, is that we don't want to
+        * deep copy array init values (such as aaSorting) since the dev wouldn't be
+        * able to override them, but we do want to deep copy arrays.
+        *  @param {object} out Object to extend
+        *  @param {object} extender Object from which the properties will be applied to
+        *      out
+        *  @param {boolean} breakRefs If true, then arrays will be sliced to take an
+        *      independent copy with the exception of the `data` or `aaData` parameters
+        *      if they are present. This is so you can pass in a collection to
+        *      DataTables and have that used as your data source without breaking the
+        *      references
+        *  @returns {object} out Reference, just for convenience - out === the return.
+        *  @memberof DataTable#oApi
+        *  @todo This doesn't take account of arrays inside the deep copied objects.
+        */
+       function _fnExtend( out, extender, breakRefs )
+       {
+               var val;
+       
+               for ( var prop in extender ) {
+                       if ( extender.hasOwnProperty(prop) ) {
+                               val = extender[prop];
+       
+                               if ( $.isPlainObject( val ) ) {
+                                       if ( ! $.isPlainObject( out[prop] ) ) {
+                                               out[prop] = {};
                                        }
+                                       $.extend( true, out[prop], val );
                                }
-                               
-                               /* Make changes to the classes for each cell as needed */
-                               var reClass = new RegExp(sClass + "[123]");
-                               var sTmpClass, sCurrentClass, sNewClass;
-                               for ( i=0, iLen=nTds.length; i<iLen; i++ )
-                               {
-                                       /* Determine which column we're looking at */
-                                       iTargetCol = i % iColumns;
-                                       
-                                       /* What is the full list of classes now */
-                                       sCurrentClass = nTds[i].className;
-                                       /* What sorting class should be applied? */
-                                       sNewClass = asClasses[iTargetCol];
-                                       /* What would the new full list be if we did a replacement? */
-                                       sTmpClass = sCurrentClass.replace(reClass, sNewClass);
-                                       
-                                       if ( sTmpClass != sCurrentClass )
-                                       {
-                                               /* We changed something */
-                                               nTds[i].className = $.trim( sTmpClass );
-                                       }
-                                       else if ( sNewClass.length > 0 && sCurrentClass.indexOf(sNewClass) == -1 )
-                                       {
-                                               /* We need to add a class */
-                                               nTds[i].className = sCurrentClass + " " + sNewClass;
-                                       }
+                               else if ( breakRefs && prop !== 'data' && prop !== 'aaData' && $.isArray(val) ) {
+                                       out[prop] = val.slice();
+                               }
+                               else {
+                                       out[prop] = val;
                                }
                        }
                }
-               
+       
+               return out;
+       }
+       
+       
+       /**
+        * Bind an event handers to allow a click or return key to activate the callback.
+        * This is good for accessibility since a return on the keyboard will have the
+        * same effect as a click, if the element has focus.
+        *  @param {element} n Element to bind the action to
+        *  @param {object} oData Data object to pass to the triggered function
+        *  @param {function} fn Callback function for when the event is triggered
+        *  @memberof DataTable#oApi
+        */
+       function _fnBindAction( n, oData, fn )
+       {
+               $(n)
+                       .bind( 'click.DT', oData, function (e) {
+                                       n.blur(); // Remove focus outline for mouse users
+                                       fn(e);
+                               } )
+                       .bind( 'keypress.DT', oData, function (e){
+                                       if ( e.which === 13 ) {
+                                               e.preventDefault();
+                                               fn(e);
+                                       }
+                               } )
+                       .bind( 'selectstart.DT', function () {
+                                       /* Take the brutal approach to cancelling text selection */
+                                       return false;
+                               } );
+       }
+       
+       
+       /**
+        * Register a callback function. Easily allows a callback function to be added to
+        * an array store of callback functions that can then all be called together.
+        *  @param {object} oSettings dataTables settings object
+        *  @param {string} sStore Name of the array storage for the callbacks in oSettings
+        *  @param {function} fn Function to be called back
+        *  @param {string} sName Identifying name for the callback (i.e. a label)
+        *  @memberof DataTable#oApi
+        */
+       function _fnCallbackReg( oSettings, sStore, fn, sName )
+       {
+               if ( fn )
+               {
+                       oSettings[sStore].push( {
+                               "fn": fn,
+                               "sName": sName
+                       } );
+               }
+       }
+       
+       
+       /**
+        * Fire callback functions and trigger events. Note that the loop over the
+        * callback array store is done backwards! Further note that you do not want to
+        * fire off triggers in time sensitive applications (for example cell creation)
+        * as its slow.
+        *  @param {object} settings dataTables settings object
+        *  @param {string} callbackArr Name of the array storage for the callbacks in
+        *      oSettings
+        *  @param {string} event Name of the jQuery custom event to trigger. If null no
+        *      trigger is fired
+        *  @param {array} args Array of arguments to pass to the callback function /
+        *      trigger
+        *  @memberof DataTable#oApi
+        */
+       function _fnCallbackFire( settings, callbackArr, event, args )
+       {
+               var ret = [];
+       
+               if ( callbackArr ) {
+                       ret = $.map( settings[callbackArr].slice().reverse(), function (val, i) {
+                               return val.fn.apply( settings.oInstance, args );
+                       } );
+               }
+       
+               if ( event !== null ) {
+                       $(settings.nTable).trigger( event+'.dt', args );
+               }
+       
+               return ret;
+       }
+       
+       
+       function _fnLengthOverflow ( settings )
+       {
+               var
+                       start = settings._iDisplayStart,
+                       end = settings.fnDisplayEnd(),
+                       len = settings._iDisplayLength;
+       
+               /* If we have space to show extra rows (backing up from the end point - then do so */
+               if ( end === settings.fnRecordsDisplay() )
+               {
+                       start = end - len;
+               }
+       
+               if ( len === -1 || start < 0 )
+               {
+                       start = 0;
+               }
+       
+               settings._iDisplayStart = start;
+       }
+       
+       
+       function _fnRenderer( settings, type )
+       {
+               var renderer = settings.renderer;
+               var host = DataTable.ext.renderer[type];
+       
+               if ( $.isPlainObject( renderer ) && renderer[type] ) {
+                       // Specific renderer for this type. If available use it, otherwise use
+                       // the default.
+                       return host[renderer[type]] || host._;
+               }
+               else if ( typeof renderer === 'string' ) {
+                       // Common renderer - if there is one available for this type use it,
+                       // otherwise use the default
+                       return host[renderer] || host._;
+               }
+       
+               // Use the default
+               return host._;
+       }
+       
+       
+       /**
+        * Detect the data source being used for the table. Used to simplify the code
+        * a little (ajax) and to make it compress a little smaller.
+        *
+        *  @param {object} settings dataTables settings object
+        *  @returns {string} Data source
+        *  @memberof DataTable#oApi
+        */
+       function _fnDataSource ( settings )
+       {
+               if ( settings.oFeatures.bServerSide ) {
+                       return 'ssp';
+               }
+               else if ( settings.ajax || settings.sAjaxSource ) {
+                       return 'ajax';
+               }
+               return 'dom';
+       }
+       
+
+       DataTable = function( options )
+       {
+               /**
+                * Perform a jQuery selector action on the table's TR elements (from the tbody) and
+                * return the resulting jQuery object.
+                *  @param {string|node|jQuery} sSelector jQuery selector or node collection to act on
+                *  @param {object} [oOpts] Optional parameters for modifying the rows to be included
+                *  @param {string} [oOpts.filter=none] Select TR elements that meet the current filter
+                *    criterion ("applied") or all TR elements (i.e. no filter).
+                *  @param {string} [oOpts.order=current] Order of the TR elements in the processed array.
+                *    Can be either 'current', whereby the current sorting of the table is used, or
+                *    'original' whereby the original order the data was read into the table is used.
+                *  @param {string} [oOpts.page=all] Limit the selection to the currently displayed page
+                *    ("current") or not ("all"). If 'current' is given, then order is assumed to be
+                *    'current' and filter is 'applied', regardless of what they might be given as.
+                *  @returns {object} jQuery object, filtered by the given selector.
+                *  @dtopt API
+                *  @deprecated Since v1.10
+                *
+                *  @example
+                *    $(document).ready(function() {
+                *      var oTable = $('#example').dataTable();
+                *
+                *      // Highlight every second row
+                *      oTable.$('tr:odd').css('backgroundColor', 'blue');
+                *    } );
+                *
+                *  @example
+                *    $(document).ready(function() {
+                *      var oTable = $('#example').dataTable();
+                *
+                *      // Filter to rows with 'Webkit' in them, add a background colour and then
+                *      // remove the filter, thus highlighting the 'Webkit' rows only.
+                *      oTable.fnFilter('Webkit');
+                *      oTable.$('tr', {"search": "applied"}).css('backgroundColor', 'blue');
+                *      oTable.fnFilter('');
+                *    } );
+                */
+               this.$ = function ( sSelector, oOpts )
+               {
+                       return this.api(true).$( sSelector, oOpts );
+               };
                
                
                /**
-                * Save the state of a table in a cookie such that the page can be reloaded
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
+                * Almost identical to $ in operation, but in this case returns the data for the matched
+                * rows - as such, the jQuery selector used should match TR row nodes or TD/TH cell nodes
+                * rather than any descendants, so the data can be obtained for the row/cell. If matching
+                * rows are found, the data returned is the original data array/object that was used to
+                * create the row (or a generated array if from a DOM source).
+                *
+                * This method is often useful in-combination with $ where both functions are given the
+                * same parameters and the array indexes will match identically.
+                *  @param {string|node|jQuery} sSelector jQuery selector or node collection to act on
+                *  @param {object} [oOpts] Optional parameters for modifying the rows to be included
+                *  @param {string} [oOpts.filter=none] Select elements that meet the current filter
+                *    criterion ("applied") or all elements (i.e. no filter).
+                *  @param {string} [oOpts.order=current] Order of the data in the processed array.
+                *    Can be either 'current', whereby the current sorting of the table is used, or
+                *    'original' whereby the original order the data was read into the table is used.
+                *  @param {string} [oOpts.page=all] Limit the selection to the currently displayed page
+                *    ("current") or not ("all"). If 'current' is given, then order is assumed to be
+                *    'current' and filter is 'applied', regardless of what they might be given as.
+                *  @returns {array} Data for the matched elements. If any elements, as a result of the
+                *    selector, were not TR, TD or TH elements in the DataTable, they will have a null
+                *    entry in the array.
+                *  @dtopt API
+                *  @deprecated Since v1.10
+                *
+                *  @example
+                *    $(document).ready(function() {
+                *      var oTable = $('#example').dataTable();
+                *
+                *      // Get the data from the first row in the table
+                *      var data = oTable._('tr:first');
+                *
+                *      // Do something useful with the data
+                *      alert( "First cell is: "+data[0] );
+                *    } );
+                *
+                *  @example
+                *    $(document).ready(function() {
+                *      var oTable = $('#example').dataTable();
+                *
+                *      // Filter to 'Webkit' and get all data for
+                *      oTable.fnFilter('Webkit');
+                *      var data = oTable._('tr', {"search": "applied"});
+                *
+                *      // Do something with the data
+                *      alert( data.length+" rows matched the search" );
+                *    } );
                 */
-               function _fnSaveState ( oSettings )
+               this._ = function ( sSelector, oOpts )
                {
-                       if ( !oSettings.oFeatures.bStateSave || oSettings.bDestroying )
-                       {
-                               return;
-                       }
-               
-                       /* Store the interesting variables */
-                       var i, iLen, bInfinite=oSettings.oScroll.bInfinite;
-                       var oState = {
-                               "iCreate":      new Date().getTime(),
-                               "iStart":       (bInfinite ? 0 : oSettings._iDisplayStart),
-                               "iEnd":         (bInfinite ? oSettings._iDisplayLength : oSettings._iDisplayEnd),
-                               "iLength":      oSettings._iDisplayLength,
-                               "aaSorting":    $.extend( true, [], oSettings.aaSorting ),
-                               "oSearch":      $.extend( true, {}, oSettings.oPreviousSearch ),
-                               "aoSearchCols": $.extend( true, [], oSettings.aoPreSearchCols ),
-                               "abVisCols":    []
-                       };
+                       return this.api(true).rows( sSelector, oOpts ).data();
+               };
                
-                       for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-                       {
-                               oState.abVisCols.push( oSettings.aoColumns[i].bVisible );
-                       }
                
-                       _fnCallbackFire( oSettings, "aoStateSaveParams", 'stateSaveParams', [oSettings, oState] );
-                       
-                       oSettings.fnStateSave.call( oSettings.oInstance, oSettings, oState );
-               }
+               /**
+                * Create a DataTables Api instance, with the currently selected tables for
+                * the Api's context.
+                * @param {boolean} [traditional=false] Set the API instance's context to be
+                *   only the table referred to by the `DataTable.ext.iApiIndex` option, as was
+                *   used in the API presented by DataTables 1.9- (i.e. the traditional mode),
+                *   or if all tables captured in the jQuery object should be used.
+                * @return {DataTables.Api}
+                */
+               this.api = function ( traditional )
+               {
+                       return traditional ?
+                               new _Api(
+                                       _fnSettingsFromNode( this[ _ext.iApiIndex ] )
+                               ) :
+                               new _Api( this );
+               };
                
                
                /**
-                * Attempt to load a saved table state from a cookie
-                *  @param {object} oSettings dataTables settings object
-                *  @param {object} oInit DataTables init object so we can override settings
-                *  @memberof DataTable#oApi
+                * Add a single new row or multiple rows of data to the table. Please note
+                * that this is suitable for client-side processing only - if you are using
+                * server-side processing (i.e. "bServerSide": true), then to add data, you
+                * must add it to the data source, i.e. the server-side, through an Ajax call.
+                *  @param {array|object} data The data to be added to the table. This can be:
+                *    <ul>
+                *      <li>1D array of data - add a single row with the data provided</li>
+                *      <li>2D array of arrays - add multiple rows in a single call</li>
+                *      <li>object - data object when using <i>mData</i></li>
+                *      <li>array of objects - multiple data objects when using <i>mData</i></li>
+                *    </ul>
+                *  @param {bool} [redraw=true] redraw the table or not
+                *  @returns {array} An array of integers, representing the list of indexes in
+                *    <i>aoData</i> ({@link DataTable.models.oSettings}) that have been added to
+                *    the table.
+                *  @dtopt API
+                *  @deprecated Since v1.10
+                *
+                *  @example
+                *    // Global var for counter
+                *    var giCount = 2;
+                *
+                *    $(document).ready(function() {
+                *      $('#example').dataTable();
+                *    } );
+                *
+                *    function fnClickAddRow() {
+                *      $('#example').dataTable().fnAddData( [
+                *        giCount+".1",
+                *        giCount+".2",
+                *        giCount+".3",
+                *        giCount+".4" ]
+                *      );
+                *
+                *      giCount++;
+                *    }
                 */
-               function _fnLoadState ( oSettings, oInit )
+               this.fnAddData = function( data, redraw )
                {
-                       if ( !oSettings.oFeatures.bStateSave )
-                       {
-                               return;
-                       }
+                       var api = this.api( true );
                
-                       var oData = oSettings.fnStateLoad.call( oSettings.oInstance, oSettings );
-                       if ( !oData )
-                       {
-                               return;
-                       }
-                       
-                       /* Allow custom and plug-in manipulation functions to alter the saved data set and
-                        * cancelling of loading by returning false
-                        */
-                       var abStateLoad = _fnCallbackFire( oSettings, 'aoStateLoadParams', 'stateLoadParams', [oSettings, oData] );
-                       if ( $.inArray( false, abStateLoad ) !== -1 )
-                       {
-                               return;
-                       }
-                       
-                       /* Store the saved state so it might be accessed at any time */
-                       oSettings.oLoadedState = $.extend( true, {}, oData );
-                       
-                       /* Restore key features */
-                       oSettings._iDisplayStart    = oData.iStart;
-                       oSettings.iInitDisplayStart = oData.iStart;
-                       oSettings._iDisplayEnd      = oData.iEnd;
-                       oSettings._iDisplayLength   = oData.iLength;
-                       oSettings.aaSorting         = oData.aaSorting.slice();
-                       oSettings.saved_aaSorting   = oData.aaSorting.slice();
-                       
-                       /* Search filtering  */
-                       $.extend( oSettings.oPreviousSearch, oData.oSearch );
-                       $.extend( true, oSettings.aoPreSearchCols, oData.aoSearchCols );
-                       
-                       /* Column visibility state
-                        * Pass back visibility settings to the init handler, but to do not here override
-                        * the init object that the user might have passed in
-                        */
-                       oInit.saved_aoColumns = [];
-                       for ( var i=0 ; i<oData.abVisCols.length ; i++ )
-                       {
-                               oInit.saved_aoColumns[i] = {};
-                               oInit.saved_aoColumns[i].bVisible = oData.abVisCols[i];
+                       /* Check if we want to add multiple rows or not */
+                       var rows = $.isArray(data) && ( $.isArray(data[0]) || $.isPlainObject(data[0]) ) ?
+                               api.rows.add( data ) :
+                               api.row.add( data );
+               
+                       if ( redraw === undefined || redraw ) {
+                               api.draw();
                        }
                
-                       _fnCallbackFire( oSettings, 'aoStateLoaded', 'stateLoaded', [oSettings, oData] );
-               }
+                       return rows.flatten().toArray();
+               };
                
                
                /**
-                * Create a new cookie with a value to store the state of a table
-                *  @param {string} sName name of the cookie to create
-                *  @param {string} sValue the value the cookie should take
-                *  @param {int} iSecs duration of the cookie
-                *  @param {string} sBaseName sName is made up of the base + file name - this is the base
-                *  @param {function} fnCallback User definable function to modify the cookie
-                *  @memberof DataTable#oApi
+                * This function will make DataTables recalculate the column sizes, based on the data
+                * contained in the table and the sizes applied to the columns (in the DOM, CSS or
+                * through the sWidth parameter). This can be useful when the width of the table's
+                * parent element changes (for example a window resize).
+                *  @param {boolean} [bRedraw=true] Redraw the table or not, you will typically want to
+                *  @dtopt API
+                *  @deprecated Since v1.10
+                *
+                *  @example
+                *    $(document).ready(function() {
+                *      var oTable = $('#example').dataTable( {
+                *        "sScrollY": "200px",
+                *        "bPaginate": false
+                *      } );
+                *
+                *      $(window).bind('resize', function () {
+                *        oTable.fnAdjustColumnSizing();
+                *      } );
+                *    } );
                 */
-               function _fnCreateCookie ( sName, sValue, iSecs, sBaseName, fnCallback )
+               this.fnAdjustColumnSizing = function ( bRedraw )
                {
-                       var date = new Date();
-                       date.setTime( date.getTime()+(iSecs*1000) );
-                       
-                       /* 
-                        * Shocking but true - it would appear IE has major issues with having the path not having
-                        * a trailing slash on it. We need the cookie to be available based on the path, so we
-                        * have to append the file name to the cookie name. Appalling. Thanks to vex for adding the
-                        * patch to use at least some of the path
-                        */
-                       var aParts = window.location.pathname.split('/');
-                       var sNameFile = sName + '_' + aParts.pop().replace(/[\/:]/g,"").toLowerCase();
-                       var sFullCookie, oData;
-                       
-                       if ( fnCallback !== null )
-                       {
-                               oData = (typeof $.parseJSON === 'function') ? 
-                                       $.parseJSON( sValue ) : eval( '('+sValue+')' );
-                               sFullCookie = fnCallback( sNameFile, oData, date.toGMTString(),
-                                       aParts.join('/')+"/" );
+                       var api = this.api( true ).columns.adjust();
+                       var settings = api.settings()[0];
+                       var scroll = settings.oScroll;
+               
+                       if ( bRedraw === undefined || bRedraw ) {
+                               api.draw( false );
                        }
-                       else
-                       {
-                               sFullCookie = sNameFile + "=" + encodeURIComponent(sValue) +
-                                       "; expires=" + date.toGMTString() +"; path=" + aParts.join('/')+"/";
+                       else if ( scroll.sX !== "" || scroll.sY !== "" ) {
+                               /* If not redrawing, but scrolling, we want to apply the new column sizes anyway */
+                               _fnScrollDraw( settings );
                        }
-                       
-                       /* Are we going to go over the cookie limit of 4KiB? If so, try to delete a cookies
-                        * belonging to DataTables.
-                        */
-                       var
-                               aCookies =document.cookie.split(';'),
-                               iNewCookieLen = sFullCookie.split(';')[0].length,
-                               aOldCookies = [];
-                       
-                       if ( iNewCookieLen+document.cookie.length+10 > 4096 ) /* Magic 10 for padding */
-                       {
-                               for ( var i=0, iLen=aCookies.length ; i<iLen ; i++ )
-                               {
-                                       if ( aCookies[i].indexOf( sBaseName ) != -1 )
-                                       {
-                                               /* It's a DataTables cookie, so eval it and check the time stamp */
-                                               var aSplitCookie = aCookies[i].split('=');
-                                               try {
-                                                       oData = eval( '('+decodeURIComponent(aSplitCookie[1])+')' );
-               
-                                                       if ( oData && oData.iCreate )
-                                                       {
-                                                               aOldCookies.push( {
-                                                                       "name": aSplitCookie[0],
-                                                                       "time": oData.iCreate
-                                                               } );
-                                                       }
-                                               }
-                                               catch( e ) {}
-                                       }
-                               }
-               
-                               // Make sure we delete the oldest ones first
-                               aOldCookies.sort( function (a, b) {
-                                       return b.time - a.time;
-                               } );
-               
-                               // Eliminate as many old DataTables cookies as we need to
-                               while ( iNewCookieLen + document.cookie.length + 10 > 4096 ) {
-                                       if ( aOldCookies.length === 0 ) {
-                                               // Deleted all DT cookies and still not enough space. Can't state save
-                                               return;
-                                       }
-                                       
-                                       var old = aOldCookies.pop();
-                                       document.cookie = old.name+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+
-                                               aParts.join('/') + "/";
-                               }
-                       }
-                       
-                       document.cookie = sFullCookie;
-               }
+               };
                
                
                /**
-                * Read an old cookie to get a cookie with an old table state
-                *  @param {string} sName name of the cookie to read
-                *  @returns {string} contents of the cookie - or null if no cookie with that name found
-                *  @memberof DataTable#oApi
+                * Quickly and simply clear a table
+                *  @param {bool} [bRedraw=true] redraw the table or not
+                *  @dtopt API
+                *  @deprecated Since v1.10
+                *
+                *  @example
+                *    $(document).ready(function() {
+                *      var oTable = $('#example').dataTable();
+                *
+                *      // Immediately 'nuke' the current rows (perhaps waiting for an Ajax callback...)
+                *      oTable.fnClearTable();
+                *    } );
                 */
-               function _fnReadCookie ( sName )
+               this.fnClearTable = function( bRedraw )
                {
-                       var
-                               aParts = window.location.pathname.split('/'),
-                               sNameEQ = sName + '_' + aParts[aParts.length-1].replace(/[\/:]/g,"").toLowerCase() + '=',
-                               sCookieContents = document.cookie.split(';');
-                       
-                       for( var i=0 ; i<sCookieContents.length ; i++ )
-                       {
-                               var c = sCookieContents[i];
-                               
-                               while (c.charAt(0)==' ')
-                               {
-                                       c = c.substring(1,c.length);
-                               }
-                               
-                               if (c.indexOf(sNameEQ) === 0)
-                               {
-                                       return decodeURIComponent( c.substring(sNameEQ.length,c.length) );
-                               }
+                       var api = this.api( true ).clear();
+               
+                       if ( bRedraw === undefined || bRedraw ) {
+                               api.draw();
                        }
-                       return null;
-               }
+               };
                
                
                /**
-                * Return the settings object for a particular table
-                *  @param {node} nTable table we are using as a dataTable
-                *  @returns {object} Settings object - or null if not found
-                *  @memberof DataTable#oApi
+                * The exact opposite of 'opening' a row, this function will close any rows which
+                * are currently 'open'.
+                *  @param {node} nTr the table row to 'close'
+                *  @returns {int} 0 on success, or 1 if failed (can't find the row)
+                *  @dtopt API
+                *  @deprecated Since v1.10
+                *
+                *  @example
+                *    $(document).ready(function() {
+                *      var oTable;
+                *
+                *      // 'open' an information row when a row is clicked on
+                *      $('#example tbody tr').click( function () {
+                *        if ( oTable.fnIsOpen(this) ) {
+                *          oTable.fnClose( this );
+                *        } else {
+                *          oTable.fnOpen( this, "Temporary row opened", "info_row" );
+                *        }
+                *      } );
+                *
+                *      oTable = $('#example').dataTable();
+                *    } );
                 */
-               function _fnSettingsFromNode ( nTable )
+               this.fnClose = function( nTr )
                {
-                       for ( var i=0 ; i<DataTable.settings.length ; i++ )
-                       {
-                               if ( DataTable.settings[i].nTable === nTable )
-                               {
-                                       return DataTable.settings[i];
-                               }
-                       }
-                       
-                       return null;
-               }
+                       this.api( true ).row( nTr ).child.hide();
+               };
                
                
                /**
-                * Return an array with the TR nodes for the table
-                *  @param {object} oSettings dataTables settings object
-                *  @returns {array} TR array
-                *  @memberof DataTable#oApi
+                * Remove a row for the table
+                *  @param {mixed} target The index of the row from aoData to be deleted, or
+                *    the TR element you want to delete
+                *  @param {function|null} [callBack] Callback function
+                *  @param {bool} [redraw=true] Redraw the table or not
+                *  @returns {array} The row that was deleted
+                *  @dtopt API
+                *  @deprecated Since v1.10
+                *
+                *  @example
+                *    $(document).ready(function() {
+                *      var oTable = $('#example').dataTable();
+                *
+                *      // Immediately remove the first row
+                *      oTable.fnDeleteRow( 0 );
+                *    } );
                 */
-               function _fnGetTrNodes ( oSettings )
+               this.fnDeleteRow = function( target, callback, redraw )
                {
-                       var aNodes = [];
-                       var aoData = oSettings.aoData;
-                       for ( var i=0, iLen=aoData.length ; i<iLen ; i++ )
-                       {
-                               if ( aoData[i].nTr !== null )
-                               {
-                                       aNodes.push( aoData[i].nTr );
-                               }
-                       }
-                       return aNodes;
-               }
+                       var api = this.api( true );
+                       var rows = api.rows( target );
+                       var settings = rows.settings()[0];
+                       var data = settings.aoData[ rows[0][0] ];
                
+                       rows.remove();
                
-               /**
-                * Return an flat array with all TD nodes for the table, or row
-                *  @param {object} oSettings dataTables settings object
-                *  @param {int} [iIndividualRow] aoData index to get the nodes for - optional 
-                *    if not given then the return array will contain all nodes for the table
-                *  @returns {array} TD array
-                *  @memberof DataTable#oApi
-                */
-               function _fnGetTdNodes ( oSettings, iIndividualRow )
-               {
-                       var anReturn = [];
-                       var iCorrector;
-                       var anTds, nTd;
-                       var iRow, iRows=oSettings.aoData.length,
-                               iColumn, iColumns, oData, sNodeName, iStart=0, iEnd=iRows;
-                       
-                       /* Allow the collection to be limited to just one row */
-                       if ( iIndividualRow !== undefined )
-                       {
-                               iStart = iIndividualRow;
-                               iEnd = iIndividualRow+1;
+                       if ( callback ) {
+                               callback.call( this, settings, data );
                        }
                
-                       for ( iRow=iStart ; iRow<iEnd ; iRow++ )
-                       {
-                               oData = oSettings.aoData[iRow];
-                               if ( oData.nTr !== null )
-                               {
-                                       /* get the TD child nodes - taking into account text etc nodes */
-                                       anTds = [];
-                                       nTd = oData.nTr.firstChild;
-                                       while ( nTd )
-                                       {
-                                               sNodeName = nTd.nodeName.toLowerCase();
-                                               if ( sNodeName == 'td' || sNodeName == 'th' )
-                                               {
-                                                       anTds.push( nTd );
-                                               }
-                                               nTd = nTd.nextSibling;
-                                       }
-               
-                                       iCorrector = 0;
-                                       for ( iColumn=0, iColumns=oSettings.aoColumns.length ; iColumn<iColumns ; iColumn++ )
-                                       {
-                                               if ( oSettings.aoColumns[iColumn].bVisible )
-                                               {
-                                                       anReturn.push( anTds[iColumn-iCorrector] );
-                                               }
-                                               else
-                                               {
-                                                       anReturn.push( oData._anHidden[iColumn] );
-                                                       iCorrector++;
-                                               }
-                                       }
-                               }
+                       if ( redraw === undefined || redraw ) {
+                               api.draw();
                        }
                
-                       return anReturn;
-               }
+                       return data;
+               };
                
                
                /**
-                * Log an error message
-                *  @param {object} oSettings dataTables settings object
-                *  @param {int} iLevel log error messages, or display them to the user
-                *  @param {string} sMesg error message
-                *  @memberof DataTable#oApi
+                * Restore the table to it's original state in the DOM by removing all of DataTables
+                * enhancements, alterations to the DOM structure of the table and event listeners.
+                *  @param {boolean} [remove=false] Completely remove the table from the DOM
+                *  @dtopt API
+                *  @deprecated Since v1.10
+                *
+                *  @example
+                *    $(document).ready(function() {
+                *      // This example is fairly pointless in reality, but shows how fnDestroy can be used
+                *      var oTable = $('#example').dataTable();
+                *      oTable.fnDestroy();
+                *    } );
                 */
-               function _fnLog( oSettings, iLevel, sMesg )
+               this.fnDestroy = function ( remove )
                {
-                       var sAlert = (oSettings===null) ?
-                               "DataTables warning: "+sMesg :
-                               "DataTables warning (table id = '"+oSettings.sTableId+"'): "+sMesg;
-                       
-                       if ( iLevel === 0 )
-                       {
-                               if ( DataTable.ext.sErrMode == 'alert' )
-                               {
-                                       alert( sAlert );
-                               }
-                               else
-                               {
-                                       throw new Error(sAlert);
-                               }
-                               return;
-                       }
-                       else if ( window.console && console.log )
-                       {
-                               console.log( sAlert );
-                       }
-               }
+                       this.api( true ).destroy( remove );
+               };
                
                
                /**
-                * See if a property is defined on one object, if so assign it to the other object
-                *  @param {object} oRet target object
-                *  @param {object} oSrc source object
-                *  @param {string} sName property
-                *  @param {string} [sMappedName] name to map too - optional, sName used if not given
-                *  @memberof DataTable#oApi
+                * Redraw the table
+                *  @param {bool} [complete=true] Re-filter and resort (if enabled) the table before the draw.
+                *  @dtopt API
+                *  @deprecated Since v1.10
+                *
+                *  @example
+                *    $(document).ready(function() {
+                *      var oTable = $('#example').dataTable();
+                *
+                *      // Re-draw the table - you wouldn't want to do it here, but it's an example :-)
+                *      oTable.fnDraw();
+                *    } );
                 */
-               function _fnMap( oRet, oSrc, sName, sMappedName )
+               this.fnDraw = function( complete )
                {
-                       if ( sMappedName === undefined )
-                       {
-                               sMappedName = sName;
-                       }
-                       if ( oSrc[sName] !== undefined )
-                       {
-                               oRet[sMappedName] = oSrc[sName];
-                       }
-               }
+                       // Note that this isn't an exact match to the old call to _fnDraw - it takes
+                       // into account the new data, but can old position.
+                       this.api( true ).draw( ! complete );
+               };
                
                
                /**
-                * Extend objects - very similar to jQuery.extend, but deep copy objects, and shallow
-                * copy arrays. The reason we need to do this, is that we don't want to deep copy array
-                * init values (such as aaSorting) since the dev wouldn't be able to override them, but
-                * we do want to deep copy arrays.
-                *  @param {object} oOut Object to extend
-                *  @param {object} oExtender Object from which the properties will be applied to oOut
-                *  @returns {object} oOut Reference, just for convenience - oOut === the return.
-                *  @memberof DataTable#oApi
-                *  @todo This doesn't take account of arrays inside the deep copied objects.
-                */
-               function _fnExtend( oOut, oExtender )
+                * Filter the input based on data
+                *  @param {string} sInput String to filter the table on
+                *  @param {int|null} [iColumn] Column to limit filtering to
+                *  @param {bool} [bRegex=false] Treat as regular expression or not
+                *  @param {bool} [bSmart=true] Perform smart filtering or not
+                *  @param {bool} [bShowGlobal=true] Show the input global filter in it's input box(es)
+                *  @param {bool} [bCaseInsensitive=true] Do case-insensitive matching (true) or not (false)
+                *  @dtopt API
+                *  @deprecated Since v1.10
+                *
+                *  @example
+                *    $(document).ready(function() {
+                *      var oTable = $('#example').dataTable();
+                *
+                *      // Sometime later - filter...
+                *      oTable.fnFilter( 'test string' );
+                *    } );
+                */
+               this.fnFilter = function( sInput, iColumn, bRegex, bSmart, bShowGlobal, bCaseInsensitive )
                {
-                       var val;
-                       
-                       for ( var prop in oExtender )
-                       {
-                               if ( oExtender.hasOwnProperty(prop) )
-                               {
-                                       val = oExtender[prop];
+                       var api = this.api( true );
                
-                                       if ( typeof oInit[prop] === 'object' && val !== null && $.isArray(val) === false )
-                                       {
-                                               $.extend( true, oOut[prop], val );
-                                       }
-                                       else
-                                       {
-                                               oOut[prop] = val;
-                                       }
-                               }
+                       if ( iColumn === null || iColumn === undefined ) {
+                               api.search( sInput, bRegex, bSmart, bCaseInsensitive );
+                       }
+                       else {
+                               api.column( iColumn ).search( sInput, bRegex, bSmart, bCaseInsensitive );
                        }
                
-                       return oOut;
-               }
+                       api.draw();
+               };
                
                
                /**
-                * Bind an event handers to allow a click or return key to activate the callback.
-                * This is good for accessibility since a return on the keyboard will have the
-                * same effect as a click, if the element has focus.
-                *  @param {element} n Element to bind the action to
-                *  @param {object} oData Data object to pass to the triggered function
-                *  @param {function} fn Callback function for when the event is triggered
-                *  @memberof DataTable#oApi
+                * Get the data for the whole table, an individual row or an individual cell based on the
+                * provided parameters.
+                *  @param {int|node} [src] A TR row node, TD/TH cell node or an integer. If given as
+                *    a TR node then the data source for the whole row will be returned. If given as a
+                *    TD/TH cell node then iCol will be automatically calculated and the data for the
+                *    cell returned. If given as an integer, then this is treated as the aoData internal
+                *    data index for the row (see fnGetPosition) and the data for that row used.
+                *  @param {int} [col] Optional column index that you want the data of.
+                *  @returns {array|object|string} If mRow is undefined, then the data for all rows is
+                *    returned. If mRow is defined, just data for that row, and is iCol is
+                *    defined, only data for the designated cell is returned.
+                *  @dtopt API
+                *  @deprecated Since v1.10
+                *
+                *  @example
+                *    // Row data
+                *    $(document).ready(function() {
+                *      oTable = $('#example').dataTable();
+                *
+                *      oTable.$('tr').click( function () {
+                *        var data = oTable.fnGetData( this );
+                *        // ... do something with the array / object of data for the row
+                *      } );
+                *    } );
+                *
+                *  @example
+                *    // Individual cell data
+                *    $(document).ready(function() {
+                *      oTable = $('#example').dataTable();
+                *
+                *      oTable.$('td').click( function () {
+                *        var sData = oTable.fnGetData( this );
+                *        alert( 'The cell clicked on had the value of '+sData );
+                *      } );
+                *    } );
                 */
-               function _fnBindAction( n, oData, fn )
+               this.fnGetData = function( src, col )
                {
-                       $(n)
-                               .bind( 'click.DT', oData, function (e) {
-                                               n.blur(); // Remove focus outline for mouse users
-                                               fn(e);
-                                       } )
-                               .bind( 'keypress.DT', oData, function (e){
-                                       if ( e.which === 13 ) {
-                                               fn(e);
-                                       } } )
-                               .bind( 'selectstart.DT', function () {
-                                       /* Take the brutal approach to cancelling text selection */
-                                       return false;
-                                       } );
-               }
+                       var api = this.api( true );
+               
+                       if ( src !== undefined ) {
+                               var type = src.nodeName ? src.nodeName.toLowerCase() : '';
+               
+                               return col !== undefined || type == 'td' || type == 'th' ?
+                                       api.cell( src, col ).data() :
+                                       api.row( src ).data() || null;
+                       }
+               
+                       return api.data().toArray();
+               };
                
                
                /**
-                * Register a callback function. Easily allows a callback function to be added to
-                * an array store of callback functions that can then all be called together.
-                *  @param {object} oSettings dataTables settings object
-                *  @param {string} sStore Name of the array storage for the callbacks in oSettings
-                *  @param {function} fn Function to be called back
-                *  @param {string} sName Identifying name for the callback (i.e. a label)
-                *  @memberof DataTable#oApi
+                * Get an array of the TR nodes that are used in the table's body. Note that you will
+                * typically want to use the '$' API method in preference to this as it is more
+                * flexible.
+                *  @param {int} [iRow] Optional row index for the TR element you want
+                *  @returns {array|node} If iRow is undefined, returns an array of all TR elements
+                *    in the table's body, or iRow is defined, just the TR element requested.
+                *  @dtopt API
+                *  @deprecated Since v1.10
+                *
+                *  @example
+                *    $(document).ready(function() {
+                *      var oTable = $('#example').dataTable();
+                *
+                *      // Get the nodes from the table
+                *      var nNodes = oTable.fnGetNodes( );
+                *    } );
                 */
-               function _fnCallbackReg( oSettings, sStore, fn, sName )
+               this.fnGetNodes = function( iRow )
                {
-                       if ( fn )
-                       {
-                               oSettings[sStore].push( {
-                                       "fn": fn,
-                                       "sName": sName
-                               } );
-                       }
-               }
+                       var api = this.api( true );
+               
+                       return iRow !== undefined ?
+                               api.row( iRow ).node() :
+                               api.rows().nodes().flatten().toArray();
+               };
                
                
                /**
-                * Fire callback functions and trigger events. Note that the loop over the callback
-                * array store is done backwards! Further note that you do not want to fire off triggers
-                * in time sensitive applications (for example cell creation) as its slow.
-                *  @param {object} oSettings dataTables settings object
-                *  @param {string} sStore Name of the array storage for the callbacks in oSettings
-                *  @param {string} sTrigger Name of the jQuery custom event to trigger. If null no trigger
-                *    is fired
-                *  @param {array} aArgs Array of arguments to pass to the callback function / trigger
-                *  @memberof DataTable#oApi
-                */
-               function _fnCallbackFire( oSettings, sStore, sTrigger, aArgs )
+                * Get the array indexes of a particular cell from it's DOM element
+                * and column index including hidden columns
+                *  @param {node} node this can either be a TR, TD or TH in the table's body
+                *  @returns {int} If nNode is given as a TR, then a single index is returned, or
+                *    if given as a cell, an array of [row index, column index (visible),
+                *    column index (all)] is given.
+                *  @dtopt API
+                *  @deprecated Since v1.10
+                *
+                *  @example
+                *    $(document).ready(function() {
+                *      $('#example tbody td').click( function () {
+                *        // Get the position of the current data from the node
+                *        var aPos = oTable.fnGetPosition( this );
+                *
+                *        // Get the data array for this row
+                *        var aData = oTable.fnGetData( aPos[0] );
+                *
+                *        // Update the data array and return the value
+                *        aData[ aPos[1] ] = 'clicked';
+                *        this.innerHTML = 'clicked';
+                *      } );
+                *
+                *      // Init DataTables
+                *      oTable = $('#example').dataTable();
+                *    } );
+                */
+               this.fnGetPosition = function( node )
                {
-                       var aoStore = oSettings[sStore];
-                       var aRet =[];
+                       var api = this.api( true );
+                       var nodeName = node.nodeName.toUpperCase();
                
-                       for ( var i=aoStore.length-1 ; i>=0 ; i-- )
-                       {
-                               aRet.push( aoStore[i].fn.apply( oSettings.oInstance, aArgs ) );
+                       if ( nodeName == 'TR' ) {
+                               return api.row( node ).index();
                        }
+                       else if ( nodeName == 'TD' || nodeName == 'TH' ) {
+                               var cell = api.cell( node ).index();
                
-                       if ( sTrigger !== null )
-                       {
-                               $(oSettings.oInstance).trigger(sTrigger, aArgs);
+                               return [
+                                       cell.row,
+                                       cell.columnVisible,
+                                       cell.column
+                               ];
                        }
+                       return null;
+               };
                
-                       return aRet;
-               }
                
-               
-               /**
-                * JSON stringify. If JSON.stringify it provided by the browser, json2.js or any other
-                * library, then we use that as it is fast, safe and accurate. If the function isn't 
-                * available then we need to built it ourselves - the inspiration for this function comes
-                * from Craig Buckler ( http://www.sitepoint.com/javascript-json-serialization/ ). It is
-                * not perfect and absolutely should not be used as a replacement to json2.js - but it does
-                * do what we need, without requiring a dependency for DataTables.
-                *  @param {object} o JSON object to be converted
-                *  @returns {string} JSON string
-                *  @memberof DataTable#oApi
-                */
-               var _fnJsonString = (window.JSON) ? JSON.stringify : function( o )
-               {
-                       /* Not an object or array */
-                       var sType = typeof o;
-                       if (sType !== "object" || o === null)
-                       {
-                               // simple data type
-                               if (sType === "string")
-                               {
-                                       o = '"'+o+'"';
-                               }
-                               return o+"";
-                       }
-               
-                       /* If object or array, need to recurse over it */
-                       var
-                               sProp, mValue,
-                               json = [],
-                               bArr = $.isArray(o);
-                       
-                       for (sProp in o)
-                       {
-                               mValue = o[sProp];
-                               sType = typeof mValue;
-               
-                               if (sType === "string")
-                               {
-                                       mValue = '"'+mValue+'"';
-                               }
-                               else if (sType === "object" && mValue !== null)
-                               {
-                                       mValue = _fnJsonString(mValue);
-                               }
-               
-                               json.push((bArr ? "" : '"'+sProp+'":') + mValue);
-                       }
-               
-                       return (bArr ? "[" : "{") + json + (bArr ? "]" : "}");
-               };
-               
-               
-               /**
-                * From some browsers (specifically IE6/7) we need special handling to work around browser
-                * bugs - this function is used to detect when these workarounds are needed.
-                *  @param {object} oSettings dataTables settings object
-                *  @memberof DataTable#oApi
-                */
-               function _fnBrowserDetect( oSettings )
-               {
-                       /* IE6/7 will oversize a width 100% element inside a scrolling element, to include the
-                        * width of the scrollbar, while other browsers ensure the inner element is contained
-                        * without forcing scrolling
-                        */
-                       var n = $(
-                               '<div style="position:absolute; top:0; left:0; height:1px; width:1px; overflow:hidden">'+
-                                       '<div style="position:absolute; top:1px; left:1px; width:100px; overflow:scroll;">'+
-                                               '<div id="DT_BrowserTest" style="width:100%; height:10px;"></div>'+
-                                       '</div>'+
-                               '</div>')[0];
-               
-                       document.body.appendChild( n );
-                       oSettings.oBrowser.bScrollOversize = $('#DT_BrowserTest', n)[0].offsetWidth === 100 ? true : false;
-                       document.body.removeChild( n );
-               }
-               
-
                /**
-                * Perform a jQuery selector action on the table's TR elements (from the tbody) and
-                * return the resulting jQuery object.
-                *  @param {string|node|jQuery} sSelector jQuery selector or node collection to act on
-                *  @param {object} [oOpts] Optional parameters for modifying the rows to be included
-                *  @param {string} [oOpts.filter=none] Select TR elements that meet the current filter
-                *    criterion ("applied") or all TR elements (i.e. no filter).
-                *  @param {string} [oOpts.order=current] Order of the TR elements in the processed array.
-                *    Can be either 'current', whereby the current sorting of the table is used, or
-                *    'original' whereby the original order the data was read into the table is used.
-                *  @param {string} [oOpts.page=all] Limit the selection to the currently displayed page
-                *    ("current") or not ("all"). If 'current' is given, then order is assumed to be 
-                *    'current' and filter is 'applied', regardless of what they might be given as.
-                *  @returns {object} jQuery object, filtered by the given selector.
+                * Check to see if a row is 'open' or not.
+                *  @param {node} nTr the table row to check
+                *  @returns {boolean} true if the row is currently open, false otherwise
                 *  @dtopt API
+                *  @deprecated Since v1.10
                 *
                 *  @example
                 *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable();
-                *
-                *      // Highlight every second row
-                *      oTable.$('tr:odd').css('backgroundColor', 'blue');
-                *    } );
+                *      var oTable;
                 *
-                *  @example
-                *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable();
+                *      // 'open' an information row when a row is clicked on
+                *      $('#example tbody tr').click( function () {
+                *        if ( oTable.fnIsOpen(this) ) {
+                *          oTable.fnClose( this );
+                *        } else {
+                *          oTable.fnOpen( this, "Temporary row opened", "info_row" );
+                *        }
+                *      } );
                 *
-                *      // Filter to rows with 'Webkit' in them, add a background colour and then
-                *      // remove the filter, thus highlighting the 'Webkit' rows only.
-                *      oTable.fnFilter('Webkit');
-                *      oTable.$('tr', {"filter": "applied"}).css('backgroundColor', 'blue');
-                *      oTable.fnFilter('');
+                *      oTable = $('#example').dataTable();
                 *    } );
                 */
-               this.$ = function ( sSelector, oOpts )
+               this.fnIsOpen = function( nTr )
                {
-                       var i, iLen, a = [], tr;
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-                       var aoData = oSettings.aoData;
-                       var aiDisplay = oSettings.aiDisplay;
-                       var aiDisplayMaster = oSettings.aiDisplayMaster;
-               
-                       if ( !oOpts )
-                       {
-                               oOpts = {};
-                       }
-               
-                       oOpts = $.extend( {}, {
-                               "filter": "none", // applied
-                               "order": "current", // "original"
-                               "page": "all" // current
-                       }, oOpts );
-               
-                       // Current page implies that order=current and fitler=applied, since it is fairly
-                       // senseless otherwise
-                       if ( oOpts.page == 'current' )
-                       {
-                               for ( i=oSettings._iDisplayStart, iLen=oSettings.fnDisplayEnd() ; i<iLen ; i++ )
-                               {
-                                       tr = aoData[ aiDisplay[i] ].nTr;
-                                       if ( tr )
-                                       {
-                                               a.push( tr );
-                                       }
-                               }
-                       }
-                       else if ( oOpts.order == "current" && oOpts.filter == "none" )
-                       {
-                               for ( i=0, iLen=aiDisplayMaster.length ; i<iLen ; i++ )
-                               {
-                                       tr = aoData[ aiDisplayMaster[i] ].nTr;
-                                       if ( tr )
-                                       {
-                                               a.push( tr );
-                                       }
-                               }
-                       }
-                       else if ( oOpts.order == "current" && oOpts.filter == "applied" )
-                       {
-                               for ( i=0, iLen=aiDisplay.length ; i<iLen ; i++ )
-                               {
-                                       tr = aoData[ aiDisplay[i] ].nTr;
-                                       if ( tr )
-                                       {
-                                               a.push( tr );
-                                       }
-                               }
-                       }
-                       else if ( oOpts.order == "original" && oOpts.filter == "none" )
-                       {
-                               for ( i=0, iLen=aoData.length ; i<iLen ; i++ )
-                               {
-                                       tr = aoData[ i ].nTr ;
-                                       if ( tr )
-                                       {
-                                               a.push( tr );
-                                       }
-                               }
-                       }
-                       else if ( oOpts.order == "original" && oOpts.filter == "applied" )
-                       {
-                               for ( i=0, iLen=aoData.length ; i<iLen ; i++ )
-                               {
-                                       tr = aoData[ i ].nTr;
-                                       if ( $.inArray( i, aiDisplay ) !== -1 && tr )
-                                       {
-                                               a.push( tr );
-                                       }
-                               }
-                       }
-                       else
-                       {
-                               _fnLog( oSettings, 1, "Unknown selection options" );
-                       }
-               
-                       /* We need to filter on the TR elements and also 'find' in their descendants
-                        * to make the selector act like it would in a full table - so we need
-                        * to build both results and then combine them together
-                        */
-                       var jqA = $(a);
-                       var jqTRs = jqA.filter( sSelector );
-                       var jqDescendants = jqA.find( sSelector );
-               
-                       return $( [].concat($.makeArray(jqTRs), $.makeArray(jqDescendants)) );
+                       return this.api( true ).row( nTr ).child.isShown();
                };
                
                
                /**
-                * Almost identical to $ in operation, but in this case returns the data for the matched
-                * rows - as such, the jQuery selector used should match TR row nodes or TD/TH cell nodes
-                * rather than any descendants, so the data can be obtained for the row/cell. If matching
-                * rows are found, the data returned is the original data array/object that was used to  
-                * create the row (or a generated array if from a DOM source).
-                *
-                * This method is often useful in-combination with $ where both functions are given the
-                * same parameters and the array indexes will match identically.
-                *  @param {string|node|jQuery} sSelector jQuery selector or node collection to act on
-                *  @param {object} [oOpts] Optional parameters for modifying the rows to be included
-                *  @param {string} [oOpts.filter=none] Select elements that meet the current filter
-                *    criterion ("applied") or all elements (i.e. no filter).
-                *  @param {string} [oOpts.order=current] Order of the data in the processed array.
-                *    Can be either 'current', whereby the current sorting of the table is used, or
-                *    'original' whereby the original order the data was read into the table is used.
-                *  @param {string} [oOpts.page=all] Limit the selection to the currently displayed page
-                *    ("current") or not ("all"). If 'current' is given, then order is assumed to be 
-                *    'current' and filter is 'applied', regardless of what they might be given as.
-                *  @returns {array} Data for the matched elements. If any elements, as a result of the
-                *    selector, were not TR, TD or TH elements in the DataTable, they will have a null 
-                *    entry in the array.
+                * This function will place a new row directly after a row which is currently
+                * on display on the page, with the HTML contents that is passed into the
+                * function. This can be used, for example, to ask for confirmation that a
+                * particular record should be deleted.
+                *  @param {node} nTr The table row to 'open'
+                *  @param {string|node|jQuery} mHtml The HTML to put into the row
+                *  @param {string} sClass Class to give the new TD cell
+                *  @returns {node} The row opened. Note that if the table row passed in as the
+                *    first parameter, is not found in the table, this method will silently
+                *    return.
                 *  @dtopt API
+                *  @deprecated Since v1.10
                 *
                 *  @example
                 *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable();
-                *
-                *      // Get the data from the first row in the table
-                *      var data = oTable._('tr:first');
-                *
-                *      // Do something useful with the data
-                *      alert( "First cell is: "+data[0] );
-                *    } );
+                *      var oTable;
                 *
-                *  @example
-                *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable();
+                *      // 'open' an information row when a row is clicked on
+                *      $('#example tbody tr').click( function () {
+                *        if ( oTable.fnIsOpen(this) ) {
+                *          oTable.fnClose( this );
+                *        } else {
+                *          oTable.fnOpen( this, "Temporary row opened", "info_row" );
+                *        }
+                *      } );
                 *
-                *      // Filter to 'Webkit' and get all data for 
-                *      oTable.fnFilter('Webkit');
-                *      var data = oTable._('tr', {"filter": "applied"});
-                *      
-                *      // Do something with the data
-                *      alert( data.length+" rows matched the filter" );
+                *      oTable = $('#example').dataTable();
                 *    } );
                 */
-               this._ = function ( sSelector, oOpts )
+               this.fnOpen = function( nTr, mHtml, sClass )
                {
-                       var aOut = [];
-                       var i, iLen, iIndex;
-                       var aTrs = this.$( sSelector, oOpts );
-               
-                       for ( i=0, iLen=aTrs.length ; i<iLen ; i++ )
-                       {
-                               aOut.push( this.fnGetData(aTrs[i]) );
-                       }
-               
-                       return aOut;
+                       return this.api( true )
+                               .row( nTr )
+                               .child( mHtml, sClass )
+                               .show()
+                               .child()[0];
                };
                
                
                /**
-                * Add a single new row or multiple rows of data to the table. Please note
-                * that this is suitable for client-side processing only - if you are using 
-                * server-side processing (i.e. "bServerSide": true), then to add data, you
-                * must add it to the data source, i.e. the server-side, through an Ajax call.
-                *  @param {array|object} mData The data to be added to the table. This can be:
-                *    <ul>
-                *      <li>1D array of data - add a single row with the data provided</li>
-                *      <li>2D array of arrays - add multiple rows in a single call</li>
-                *      <li>object - data object when using <i>mData</i></li>
-                *      <li>array of objects - multiple data objects when using <i>mData</i></li>
-                *    </ul>
-                *  @param {bool} [bRedraw=true] redraw the table or not
-                *  @returns {array} An array of integers, representing the list of indexes in 
-                *    <i>aoData</i> ({@link DataTable.models.oSettings}) that have been added to 
-                *    the table.
+                * Change the pagination - provides the internal logic for pagination in a simple API
+                * function. With this function you can have a DataTables table go to the next,
+                * previous, first or last pages.
+                *  @param {string|int} mAction Paging action to take: "first", "previous", "next" or "last"
+                *    or page number to jump to (integer), note that page 0 is the first page.
+                *  @param {bool} [bRedraw=true] Redraw the table or not
                 *  @dtopt API
+                *  @deprecated Since v1.10
                 *
                 *  @example
-                *    // Global var for counter
-                *    var giCount = 2;
-                *    
                 *    $(document).ready(function() {
-                *      $('#example').dataTable();
+                *      var oTable = $('#example').dataTable();
+                *      oTable.fnPageChange( 'next' );
                 *    } );
-                *    
-                *    function fnClickAddRow() {
-                *      $('#example').dataTable().fnAddData( [
-                *        giCount+".1",
-                *        giCount+".2",
-                *        giCount+".3",
-                *        giCount+".4" ]
-                *      );
-                *        
-                *      giCount++;
-                *    }
                 */
-               this.fnAddData = function( mData, bRedraw )
+               this.fnPageChange = function ( mAction, bRedraw )
                {
-                       if ( mData.length === 0 )
-                       {
-                               return [];
-                       }
-                       
-                       var aiReturn = [];
-                       var iTest;
-                       
-                       /* Find settings from table node */
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-                       
-                       /* Check if we want to add multiple rows or not */
-                       if ( typeof mData[0] === "object" && mData[0] !== null )
-                       {
-                               for ( var i=0 ; i<mData.length ; i++ )
-                               {
-                                       iTest = _fnAddData( oSettings, mData[i] );
-                                       if ( iTest == -1 )
-                                       {
-                                               return aiReturn;
-                                       }
-                                       aiReturn.push( iTest );
-                               }
-                       }
-                       else
-                       {
-                               iTest = _fnAddData( oSettings, mData );
-                               if ( iTest == -1 )
-                               {
-                                       return aiReturn;
-                               }
-                               aiReturn.push( iTest );
-                       }
-                       
-                       oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-                       
-                       if ( bRedraw === undefined || bRedraw )
-                       {
-                               _fnReDraw( oSettings );
+                       var api = this.api( true ).page( mAction );
+               
+                       if ( bRedraw === undefined || bRedraw ) {
+                               api.draw(false);
                        }
-                       return aiReturn;
                };
                
                
                /**
-                * This function will make DataTables recalculate the column sizes, based on the data 
-                * contained in the table and the sizes applied to the columns (in the DOM, CSS or 
-                * through the sWidth parameter). This can be useful when the width of the table's 
-                * parent element changes (for example a window resize).
-                *  @param {boolean} [bRedraw=true] Redraw the table or not, you will typically want to
+                * Show a particular column
+                *  @param {int} iCol The column whose display should be changed
+                *  @param {bool} bShow Show (true) or hide (false) the column
+                *  @param {bool} [bRedraw=true] Redraw the table or not
                 *  @dtopt API
+                *  @deprecated Since v1.10
                 *
                 *  @example
                 *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable( {
-                *        "sScrollY": "200px",
-                *        "bPaginate": false
-                *      } );
-                *      
-                *      $(window).bind('resize', function () {
-                *        oTable.fnAdjustColumnSizing();
-                *      } );
+                *      var oTable = $('#example').dataTable();
+                *
+                *      // Hide the second column after initialisation
+                *      oTable.fnSetColumnVis( 1, false );
                 *    } );
                 */
-               this.fnAdjustColumnSizing = function ( bRedraw )
+               this.fnSetColumnVis = function ( iCol, bShow, bRedraw )
                {
-                       var oSettings = _fnSettingsFromNode(this[DataTable.ext.iApiIndex]);
-                       _fnAdjustColumnSizing( oSettings );
-                       
-                       if ( bRedraw === undefined || bRedraw )
-                       {
-                               this.fnDraw( false );
-                       }
-                       else if ( oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "" )
-                       {
-                               /* If not redrawing, but scrolling, we want to apply the new column sizes anyway */
-                               this.oApi._fnScrollDraw(oSettings);
+                       var api = this.api( true ).column( iCol ).visible( bShow );
+               
+                       if ( bRedraw === undefined || bRedraw ) {
+                               api.columns.adjust().draw();
                        }
                };
                
                
                /**
-                * Quickly and simply clear a table
-                *  @param {bool} [bRedraw=true] redraw the table or not
+                * Get the settings for a particular table for external manipulation
+                *  @returns {object} DataTables settings object. See
+                *    {@link DataTable.models.oSettings}
                 *  @dtopt API
+                *  @deprecated Since v1.10
                 *
                 *  @example
                 *    $(document).ready(function() {
                 *      var oTable = $('#example').dataTable();
-                *      
-                *      // Immediately 'nuke' the current rows (perhaps waiting for an Ajax callback...)
-                *      oTable.fnClearTable();
+                *      var oSettings = oTable.fnSettings();
+                *
+                *      // Show an example parameter from the settings
+                *      alert( oSettings._iDisplayStart );
                 *    } );
                 */
-               this.fnClearTable = function( bRedraw )
+               this.fnSettings = function()
                {
-                       /* Find settings from table node */
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-                       _fnClearTable( oSettings );
-                       
-                       if ( bRedraw === undefined || bRedraw )
-                       {
-                               _fnDraw( oSettings );
-                       }
+                       return _fnSettingsFromNode( this[_ext.iApiIndex] );
                };
                
                
                /**
-                * The exact opposite of 'opening' a row, this function will close any rows which 
-                * are currently 'open'.
-                *  @param {node} nTr the table row to 'close'
-                *  @returns {int} 0 on success, or 1 if failed (can't find the row)
+                * Sort the table by a particular column
+                *  @param {int} iCol the data index to sort on. Note that this will not match the
+                *    'display index' if you have hidden data entries
                 *  @dtopt API
+                *  @deprecated Since v1.10
                 *
                 *  @example
                 *    $(document).ready(function() {
-                *      var oTable;
-                *      
-                *      // 'open' an information row when a row is clicked on
-                *      $('#example tbody tr').click( function () {
-                *        if ( oTable.fnIsOpen(this) ) {
-                *          oTable.fnClose( this );
-                *        } else {
-                *          oTable.fnOpen( this, "Temporary row opened", "info_row" );
-                *        }
-                *      } );
-                *      
-                *      oTable = $('#example').dataTable();
+                *      var oTable = $('#example').dataTable();
+                *
+                *      // Sort immediately with columns 0 and 1
+                *      oTable.fnSort( [ [0,'asc'], [1,'asc'] ] );
                 *    } );
                 */
-               this.fnClose = function( nTr )
+               this.fnSort = function( aaSort )
                {
-                       /* Find settings from table node */
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-                       
-                       for ( var i=0 ; i<oSettings.aoOpenRows.length ; i++ )
-                       {
-                               if ( oSettings.aoOpenRows[i].nParent == nTr )
-                               {
-                                       var nTrParent = oSettings.aoOpenRows[i].nTr.parentNode;
-                                       if ( nTrParent )
-                                       {
-                                               /* Remove it if it is currently on display */
-                                               nTrParent.removeChild( oSettings.aoOpenRows[i].nTr );
-                                       }
-                                       oSettings.aoOpenRows.splice( i, 1 );
-                                       return 0;
-                               }
-                       }
-                       return 1;
+                       this.api( true ).order( aaSort ).draw();
                };
                
                
                /**
-                * Remove a row for the table
-                *  @param {mixed} mTarget The index of the row from aoData to be deleted, or
-                *    the TR element you want to delete
-                *  @param {function|null} [fnCallBack] Callback function
+                * Attach a sort listener to an element for a given column
+                *  @param {node} nNode the element to attach the sort listener to
+                *  @param {int} iColumn the column that a click on this node will sort on
+                *  @param {function} [fnCallback] callback function when sort is run
+                *  @dtopt API
+                *  @deprecated Since v1.10
+                *
+                *  @example
+                *    $(document).ready(function() {
+                *      var oTable = $('#example').dataTable();
+                *
+                *      // Sort on column 1, when 'sorter' is clicked on
+                *      oTable.fnSortListener( document.getElementById('sorter'), 1 );
+                *    } );
+                */
+               this.fnSortListener = function( nNode, iColumn, fnCallback )
+               {
+                       this.api( true ).order.listener( nNode, iColumn, fnCallback );
+               };
+               
+               
+               /**
+                * Update a table cell or row - this method will accept either a single value to
+                * update the cell with, an array of values with one element for each column or
+                * an object in the same format as the original data source. The function is
+                * self-referencing in order to make the multi column updates easier.
+                *  @param {object|array|string} mData Data to update the cell/row with
+                *  @param {node|int} mRow TR element you want to update or the aoData index
+                *  @param {int} [iColumn] The column to update, give as null or undefined to
+                *    update a whole row.
                 *  @param {bool} [bRedraw=true] Redraw the table or not
-                *  @returns {array} The row that was deleted
+                *  @param {bool} [bAction=true] Perform pre-draw actions or not
+                *  @returns {int} 0 on success, 1 on error
                 *  @dtopt API
+                *  @deprecated Since v1.10
                 *
                 *  @example
                 *    $(document).ready(function() {
                 *      var oTable = $('#example').dataTable();
-                *      
-                *      // Immediately remove the first row
-                *      oTable.fnDeleteRow( 0 );
+                *      oTable.fnUpdate( 'Example update', 0, 0 ); // Single cell
+                *      oTable.fnUpdate( ['a', 'b', 'c', 'd', 'e'], $('tbody tr')[0] ); // Row
                 *    } );
                 */
-               this.fnDeleteRow = function( mTarget, fnCallBack, bRedraw )
+               this.fnUpdate = function( mData, mRow, iColumn, bRedraw, bAction )
                {
-                       /* Find settings from table node */
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-                       var i, iLen, iAODataIndex;
-                       
-                       iAODataIndex = (typeof mTarget === 'object') ? 
-                               _fnNodeToDataIndex(oSettings, mTarget) : mTarget;
-                       
-                       /* Return the data array from this row */
-                       var oData = oSettings.aoData.splice( iAODataIndex, 1 );
+                       var api = this.api( true );
                
-                       /* Update the _DT_RowIndex parameter */
-                       for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
-                       {
-                               if ( oSettings.aoData[i].nTr !== null )
-                               {
-                                       oSettings.aoData[i].nTr._DT_RowIndex = i;
-                               }
+                       if ( iColumn === undefined || iColumn === null ) {
+                               api.row( mRow ).data( mData );
                        }
-                       
-                       /* Remove the target row from the search array */
-                       var iDisplayIndex = $.inArray( iAODataIndex, oSettings.aiDisplay );
-                       oSettings.asDataSearch.splice( iDisplayIndex, 1 );
-                       
-                       /* Delete from the display arrays */
-                       _fnDeleteIndex( oSettings.aiDisplayMaster, iAODataIndex );
-                       _fnDeleteIndex( oSettings.aiDisplay, iAODataIndex );
-                       
-                       /* If there is a user callback function - call it */
-                       if ( typeof fnCallBack === "function" )
-                       {
-                               fnCallBack.call( this, oSettings, oData );
+                       else {
+                               api.cell( mRow, iColumn ).data( mData );
                        }
-                       
-                       /* Check for an 'overflow' they case for displaying the table */
-                       if ( oSettings._iDisplayStart >= oSettings.fnRecordsDisplay() )
-                       {
-                               oSettings._iDisplayStart -= oSettings._iDisplayLength;
-                               if ( oSettings._iDisplayStart < 0 )
-                               {
-                                       oSettings._iDisplayStart = 0;
-                               }
+               
+                       if ( bAction === undefined || bAction ) {
+                               api.columns.adjust();
                        }
-                       
-                       if ( bRedraw === undefined || bRedraw )
-                       {
-                               _fnCalculateEnd( oSettings );
-                               _fnDraw( oSettings );
+               
+                       if ( bRedraw === undefined || bRedraw ) {
+                               api.draw();
                        }
-                       
-                       return oData;
+                       return 0;
                };
                
                
                /**
-                * Restore the table to it's original state in the DOM by removing all of DataTables 
-                * enhancements, alterations to the DOM structure of the table and event listeners.
-                *  @param {boolean} [bRemove=false] Completely remove the table from the DOM
+                * Provide a common method for plug-ins to check the version of DataTables being used, in order
+                * to ensure compatibility.
+                *  @param {string} sVersion Version string to check for, in the format "X.Y.Z". Note that the
+                *    formats "X" and "X.Y" are also acceptable.
+                *  @returns {boolean} true if this version of DataTables is greater or equal to the required
+                *    version, or false if this version of DataTales is not suitable
+                *  @method
                 *  @dtopt API
+                *  @deprecated Since v1.10
                 *
                 *  @example
                 *    $(document).ready(function() {
-                *      // This example is fairly pointless in reality, but shows how fnDestroy can be used
                 *      var oTable = $('#example').dataTable();
-                *      oTable.fnDestroy();
+                *      alert( oTable.fnVersionCheck( '1.9.0' ) );
                 *    } );
                 */
-               this.fnDestroy = function ( bRemove )
-               {
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-                       var nOrig = oSettings.nTableWrapper.parentNode;
-                       var nBody = oSettings.nTBody;
-                       var i, iLen;
+               this.fnVersionCheck = _ext.fnVersionCheck;
                
-                       bRemove = (bRemove===undefined) ? false : bRemove;
+
+               var _that = this;
+               var emptyInit = options === undefined;
+               var len = this.length;
+
+               if ( emptyInit ) {
+                       options = {};
+               }
+
+               this.oApi = this.internal = _ext.internal;
+
+               // Extend with old style plug-in API methods
+               for ( var fn in DataTable.ext.internal ) {
+                       if ( fn ) {
+                               this[fn] = _fnExternApiFunc(fn);
+                       }
+               }
+
+               this.each(function() {
+                       // For each initialisation we want to give it a clean initialisation
+                       // object that can be bashed around
+                       var o = {};
+                       var oInit = len > 1 ? // optimisation for single table case
+                               _fnExtend( o, options, true ) :
+                               options;
+
+                       /*global oInit,_that,emptyInit*/
+                       var i=0, iLen, j, jLen, k, kLen;
+                       var sId = this.getAttribute( 'id' );
+                       var bInitHandedOff = false;
+                       var defaults = DataTable.defaults;
                        
-                       /* Flag to note that the table is currently being destroyed - no action should be taken */
-                       oSettings.bDestroying = true;
                        
-                       /* Fire off the destroy callbacks for plug-ins etc */
-                       _fnCallbackFire( oSettings, "aoDestroyCallback", "destroy", [oSettings] );
-               
-                       /* If the table is not being removed, restore the hidden columns */
-                       if ( !bRemove )
+                       /* Sanity check */
+                       if ( this.nodeName.toLowerCase() != 'table' )
                        {
-                               for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-                               {
-                                       if ( oSettings.aoColumns[i].bVisible === false )
-                                       {
-                                               this.fnSetColumnVis( i, true );
-                                       }
-                               }
+                               _fnLog( null, 0, 'Non-table node initialisation ('+this.nodeName+')', 2 );
+                               return;
                        }
                        
-                       /* Blitz all DT events */
-                       $(oSettings.nTableWrapper).find('*').andSelf().unbind('.DT');
+                       /* Backwards compatibility for the defaults */
+                       _fnCompatOpts( defaults );
+                       _fnCompatCols( defaults.column );
+                       
+                       /* Convert the camel-case defaults to Hungarian */
+                       _fnCamelToHungarian( defaults, defaults, true );
+                       _fnCamelToHungarian( defaults.column, defaults.column, true );
                        
-                       /* If there is an 'empty' indicator row, remove it */
-                       $('tbody>tr>td.'+oSettings.oClasses.sRowEmpty, oSettings.nTable).parent().remove();
+                       /* Setting up the initialisation object */
+                       _fnCamelToHungarian( defaults, oInit );
                        
-                       /* When scrolling we had to break the table up - restore it */
-                       if ( oSettings.nTable != oSettings.nTHead.parentNode )
+                       /* Check to see if we are re-initialising a table */
+                       var allSettings = DataTable.settings;
+                       for ( i=0, iLen=allSettings.length ; i<iLen ; i++ )
                        {
-                               $(oSettings.nTable).children('thead').remove();
-                               oSettings.nTable.appendChild( oSettings.nTHead );
+                               /* Base check on table node */
+                               if ( allSettings[i].nTable == this )
+                               {
+                                       var bRetrieve = oInit.bRetrieve !== undefined ? oInit.bRetrieve : defaults.bRetrieve;
+                                       var bDestroy = oInit.bDestroy !== undefined ? oInit.bDestroy : defaults.bDestroy;
+                       
+                                       if ( emptyInit || bRetrieve )
+                                       {
+                                               return allSettings[i].oInstance;
+                                       }
+                                       else if ( bDestroy )
+                                       {
+                                               allSettings[i].oInstance.fnDestroy();
+                                               break;
+                                       }
+                                       else
+                                       {
+                                               _fnLog( allSettings[i], 0, 'Cannot reinitialise DataTable', 3 );
+                                               return;
+                                       }
+                               }
+                       
+                               /* If the element we are initialising has the same ID as a table which was previously
+                                * initialised, but the table nodes don't match (from before) then we destroy the old
+                                * instance by simply deleting it. This is under the assumption that the table has been
+                                * destroyed by other methods. Anyone using non-id selectors will need to do this manually
+                                */
+                               if ( allSettings[i].sTableId == this.id )
+                               {
+                                       allSettings.splice( i, 1 );
+                                       break;
+                               }
                        }
                        
-                       if ( oSettings.nTFoot && oSettings.nTable != oSettings.nTFoot.parentNode )
+                       /* Ensure the table has an ID - required for accessibility */
+                       if ( sId === null || sId === "" )
                        {
-                               $(oSettings.nTable).children('tfoot').remove();
-                               oSettings.nTable.appendChild( oSettings.nTFoot );
+                               sId = "DataTables_Table_"+(DataTable.ext._unique++);
+                               this.id = sId;
                        }
                        
-                       /* Remove the DataTables generated nodes, events and classes */
-                       oSettings.nTable.parentNode.removeChild( oSettings.nTable );
-                       $(oSettings.nTableWrapper).remove();
+                       /* Create the settings object for this table and set some of the default parameters */
+                       var oSettings = $.extend( true, {}, DataTable.models.oSettings, {
+                               "nTable":        this,
+                               "oApi":          _that.internal,
+                               "oInit":         oInit,
+                               "sDestroyWidth": $(this)[0].style.width,
+                               "sInstance":     sId,
+                               "sTableId":      sId
+                       } );
+                       allSettings.push( oSettings );
                        
-                       oSettings.aaSorting = [];
-                       oSettings.aaSortingFixed = [];
-                       _fnSortingClasses( oSettings );
+                       // Need to add the instance after the instance after the settings object has been added
+                       // to the settings array, so we can self reference the table instance if more than one
+                       oSettings.oInstance = (_that.length===1) ? _that : $(this).dataTable();
                        
-                       $(_fnGetTrNodes( oSettings )).removeClass( oSettings.asStripeClasses.join(' ') );
+                       // Backwards compatibility, before we apply all the defaults
+                       _fnCompatOpts( oInit );
                        
-                       $('th, td', oSettings.nTHead).removeClass( [
-                               oSettings.oClasses.sSortable,
-                               oSettings.oClasses.sSortableAsc,
-                               oSettings.oClasses.sSortableDesc,
-                               oSettings.oClasses.sSortableNone ].join(' ')
-                       );
-                       if ( oSettings.bJUI )
+                       if ( oInit.oLanguage )
                        {
-                               $('th span.'+oSettings.oClasses.sSortIcon
-                                       + ', td span.'+oSettings.oClasses.sSortIcon, oSettings.nTHead).remove();
-               
-                               $('th, td', oSettings.nTHead).each( function () {
-                                       var jqWrapper = $('div.'+oSettings.oClasses.sSortJUIWrapper, this);
-                                       var kids = jqWrapper.contents();
-                                       $(this).append( kids );
-                                       jqWrapper.remove();
-                               } );
+                               _fnLanguageCompat( oInit.oLanguage );
                        }
                        
-                       /* Add the TR elements back into the table in their original order */
-                       if ( !bRemove && oSettings.nTableReinsertBefore )
-                       {
-                               nOrig.insertBefore( oSettings.nTable, oSettings.nTableReinsertBefore );
-                       }
-                       else if ( !bRemove )
+                       // If the length menu is given, but the init display length is not, use the length menu
+                       if ( oInit.aLengthMenu && ! oInit.iDisplayLength )
                        {
-                               nOrig.appendChild( oSettings.nTable );
-                       }
-               
-                       for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
-                       {
-                               if ( oSettings.aoData[i].nTr !== null )
-                               {
-                                       nBody.appendChild( oSettings.aoData[i].nTr );
-                               }
+                               oInit.iDisplayLength = $.isArray( oInit.aLengthMenu[0] ) ?
+                                       oInit.aLengthMenu[0][0] : oInit.aLengthMenu[0];
                        }
                        
-                       /* Restore the width of the original table */
-                       if ( oSettings.oFeatures.bAutoWidth === true )
-                       {
-                         oSettings.nTable.style.width = _fnStringToCss(oSettings.sDestroyWidth);
-                       }
+                       // Apply the defaults and init options to make a single init object will all
+                       // options defined from defaults and instance options.
+                       oInit = _fnExtend( $.extend( true, {}, defaults ), oInit );
                        
-                       /* If the were originally stripe classes - then we add them back here. Note
-                        * this is not fool proof (for example if not all rows had stripe classes - but
-                        * it's a good effort without getting carried away
-                        */
-                       iLen = oSettings.asDestroyStripes.length;
-                       if (iLen)
-                       {
-                               var anRows = $(nBody).children('tr');
-                               for ( i=0 ; i<iLen ; i++ )
-                               {
-                                       anRows.filter(':nth-child(' + iLen + 'n + ' + i + ')').addClass( oSettings.asDestroyStripes[i] );
-                               }
-                       }
                        
-                       /* Remove the settings object from the settings array */
-                       for ( i=0, iLen=DataTable.settings.length ; i<iLen ; i++ )
+                       // Map the initialisation options onto the settings object
+                       _fnMap( oSettings.oFeatures, oInit, [
+                               "bPaginate",
+                               "bLengthChange",
+                               "bFilter",
+                               "bSort",
+                               "bSortMulti",
+                               "bInfo",
+                               "bProcessing",
+                               "bAutoWidth",
+                               "bSortClasses",
+                               "bServerSide",
+                               "bDeferRender"
+                       ] );
+                       _fnMap( oSettings, oInit, [
+                               "asStripeClasses",
+                               "ajax",
+                               "fnServerData",
+                               "fnFormatNumber",
+                               "sServerMethod",
+                               "aaSorting",
+                               "aaSortingFixed",
+                               "aLengthMenu",
+                               "sPaginationType",
+                               "sAjaxSource",
+                               "sAjaxDataProp",
+                               "iStateDuration",
+                               "sDom",
+                               "bSortCellsTop",
+                               "iTabIndex",
+                               "fnStateLoadCallback",
+                               "fnStateSaveCallback",
+                               "renderer",
+                               [ "iCookieDuration", "iStateDuration" ], // backwards compat
+                               [ "oSearch", "oPreviousSearch" ],
+                               [ "aoSearchCols", "aoPreSearchCols" ],
+                               [ "iDisplayLength", "_iDisplayLength" ],
+                               [ "bJQueryUI", "bJUI" ]
+                       ] );
+                       _fnMap( oSettings.oScroll, oInit, [
+                               [ "sScrollX", "sX" ],
+                               [ "sScrollXInner", "sXInner" ],
+                               [ "sScrollY", "sY" ],
+                               [ "bScrollCollapse", "bCollapse" ]
+                       ] );
+                       _fnMap( oSettings.oLanguage, oInit, "fnInfoCallback" );
+                       
+                       /* Callback functions which are array driven */
+                       _fnCallbackReg( oSettings, 'aoDrawCallback',       oInit.fnDrawCallback,      'user' );
+                       _fnCallbackReg( oSettings, 'aoServerParams',       oInit.fnServerParams,      'user' );
+                       _fnCallbackReg( oSettings, 'aoStateSaveParams',    oInit.fnStateSaveParams,   'user' );
+                       _fnCallbackReg( oSettings, 'aoStateLoadParams',    oInit.fnStateLoadParams,   'user' );
+                       _fnCallbackReg( oSettings, 'aoStateLoaded',        oInit.fnStateLoaded,       'user' );
+                       _fnCallbackReg( oSettings, 'aoRowCallback',        oInit.fnRowCallback,       'user' );
+                       _fnCallbackReg( oSettings, 'aoRowCreatedCallback', oInit.fnCreatedRow,        'user' );
+                       _fnCallbackReg( oSettings, 'aoHeaderCallback',     oInit.fnHeaderCallback,    'user' );
+                       _fnCallbackReg( oSettings, 'aoFooterCallback',     oInit.fnFooterCallback,    'user' );
+                       _fnCallbackReg( oSettings, 'aoInitComplete',       oInit.fnInitComplete,      'user' );
+                       _fnCallbackReg( oSettings, 'aoPreDrawCallback',    oInit.fnPreDrawCallback,   'user' );
+                       
+                       var oClasses = oSettings.oClasses;
+                       
+                       // @todo Remove in 1.11
+                       if ( oInit.bJQueryUI )
                        {
-                               if ( DataTable.settings[i] == oSettings )
+                               /* Use the JUI classes object for display. You could clone the oStdClasses object if
+                                * you want to have multiple tables with multiple independent classes
+                                */
+                               $.extend( oClasses, DataTable.ext.oJUIClasses, oInit.oClasses );
+                       
+                               if ( oInit.sDom === defaults.sDom && defaults.sDom === "lfrtip" )
                                {
-                                       DataTable.settings.splice( i, 1 );
+                                       /* Set the DOM to use a layout suitable for jQuery UI's theming */
+                                       oSettings.sDom = '<"H"lfr>t<"F"ip>';
                                }
-                       }
                        
-                       /* End it all */
-                       oSettings = null;
-                       oInit = null;
-               };
-               
-               
-               /**
-                * Redraw the table
-                *  @param {bool} [bComplete=true] Re-filter and resort (if enabled) the table before the draw.
-                *  @dtopt API
-                *
-                *  @example
-                *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable();
-                *      
-                *      // Re-draw the table - you wouldn't want to do it here, but it's an example :-)
-                *      oTable.fnDraw();
-                *    } );
-                */
-               this.fnDraw = function( bComplete )
-               {
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-                       if ( bComplete === false )
-                       {
-                               _fnCalculateEnd( oSettings );
-                               _fnDraw( oSettings );
+                               if ( ! oSettings.renderer ) {
+                                       oSettings.renderer = 'jqueryui';
+                               }
+                               else if ( $.isPlainObject( oSettings.renderer ) && ! oSettings.renderer.header ) {
+                                       oSettings.renderer.header = 'jqueryui';
+                               }
                        }
                        else
                        {
-                               _fnReDraw( oSettings );
+                               $.extend( oClasses, DataTable.ext.classes, oInit.oClasses );
                        }
-               };
-               
-               
-               /**
-                * Filter the input based on data
-                *  @param {string} sInput String to filter the table on
-                *  @param {int|null} [iColumn] Column to limit filtering to
-                *  @param {bool} [bRegex=false] Treat as regular expression or not
-                *  @param {bool} [bSmart=true] Perform smart filtering or not
-                *  @param {bool} [bShowGlobal=true] Show the input global filter in it's input box(es)
-                *  @param {bool} [bCaseInsensitive=true] Do case-insensitive matching (true) or not (false)
-                *  @dtopt API
-                *
-                *  @example
-                *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable();
-                *      
-                *      // Sometime later - filter...
-                *      oTable.fnFilter( 'test string' );
-                *    } );
-                */
-               this.fnFilter = function( sInput, iColumn, bRegex, bSmart, bShowGlobal, bCaseInsensitive )
-               {
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+                       $(this).addClass( oClasses.sTable );
                        
-                       if ( !oSettings.oFeatures.bFilter )
+                       /* Calculate the scroll bar width and cache it for use later on */
+                       if ( oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "" )
                        {
-                               return;
+                               oSettings.oScroll.iBarWidth = _fnScrollBarWidth();
                        }
-                       
-                       if ( bRegex === undefined || bRegex === null )
-                       {
-                               bRegex = false;
+                       if ( oSettings.oScroll.sX === true ) { // Easy initialisation of x-scrolling
+                               oSettings.oScroll.sX = '100%';
                        }
                        
-                       if ( bSmart === undefined || bSmart === null )
+                       if ( oSettings.iInitDisplayStart === undefined )
                        {
-                               bSmart = true;
+                               /* Display start point, taking into account the save saving */
+                               oSettings.iInitDisplayStart = oInit.iDisplayStart;
+                               oSettings._iDisplayStart = oInit.iDisplayStart;
                        }
                        
-                       if ( bShowGlobal === undefined || bShowGlobal === null )
+                       if ( oInit.iDeferLoading !== null )
                        {
-                               bShowGlobal = true;
+                               oSettings.bDeferLoading = true;
+                               var tmp = $.isArray( oInit.iDeferLoading );
+                               oSettings._iRecordsDisplay = tmp ? oInit.iDeferLoading[0] : oInit.iDeferLoading;
+                               oSettings._iRecordsTotal = tmp ? oInit.iDeferLoading[1] : oInit.iDeferLoading;
                        }
                        
-                       if ( bCaseInsensitive === undefined || bCaseInsensitive === null )
-                       {
-                               bCaseInsensitive = true;
-                       }
-                       
-                       if ( iColumn === undefined || iColumn === null )
+                       /* Language definitions */
+                       if ( oInit.oLanguage.sUrl !== "" )
                        {
-                               /* Global filter */
-                               _fnFilterComplete( oSettings, {
-                                       "sSearch":sInput+"",
-                                       "bRegex": bRegex,
-                                       "bSmart": bSmart,
-                                       "bCaseInsensitive": bCaseInsensitive
-                               }, 1 );
-                               
-                               if ( bShowGlobal && oSettings.aanFeatures.f )
-                               {
-                                       var n = oSettings.aanFeatures.f;
-                                       for ( var i=0, iLen=n.length ; i<iLen ; i++ )
-                                       {
-                                               // IE9 throws an 'unknown error' if document.activeElement is used
-                                               // inside an iframe or frame...
-                                               try {
-                                                       if ( n[i]._DT_Input != document.activeElement )
-                                                       {
-                                                               $(n[i]._DT_Input).val( sInput );
-                                                       }
-                                               }
-                                               catch ( e ) {
-                                                       $(n[i]._DT_Input).val( sInput );
-                                               }
-                                       }
-                               }
+                               /* Get the language definitions from a file - because this Ajax call makes the language
+                                * get async to the remainder of this function we use bInitHandedOff to indicate that
+                                * _fnInitialise will be fired by the returned Ajax handler, rather than the constructor
+                                */
+                               oSettings.oLanguage.sUrl = oInit.oLanguage.sUrl;
+                               $.getJSON( oSettings.oLanguage.sUrl, null, function( json ) {
+                                       _fnLanguageCompat( json );
+                                       _fnCamelToHungarian( defaults.oLanguage, json );
+                                       $.extend( true, oSettings.oLanguage, oInit.oLanguage, json );
+                                       _fnInitialise( oSettings );
+                               } );
+                               bInitHandedOff = true;
                        }
                        else
                        {
-                               /* Single column filter */
-                               $.extend( oSettings.aoPreSearchCols[ iColumn ], {
-                                       "sSearch": sInput+"",
-                                       "bRegex": bRegex,
-                                       "bSmart": bSmart,
-                                       "bCaseInsensitive": bCaseInsensitive
-                               } );
-                               _fnFilterComplete( oSettings, oSettings.oPreviousSearch, 1 );
+                               $.extend( true, oSettings.oLanguage, oInit.oLanguage );
                        }
-               };
-               
-               
-               /**
-                * Get the data for the whole table, an individual row or an individual cell based on the 
-                * provided parameters.
-                *  @param {int|node} [mRow] A TR row node, TD/TH cell node or an integer. If given as
-                *    a TR node then the data source for the whole row will be returned. If given as a
-                *    TD/TH cell node then iCol will be automatically calculated and the data for the
-                *    cell returned. If given as an integer, then this is treated as the aoData internal
-                *    data index for the row (see fnGetPosition) and the data for that row used.
-                *  @param {int} [iCol] Optional column index that you want the data of.
-                *  @returns {array|object|string} If mRow is undefined, then the data for all rows is
-                *    returned. If mRow is defined, just data for that row, and is iCol is
-                *    defined, only data for the designated cell is returned.
-                *  @dtopt API
-                *
-                *  @example
-                *    // Row data
-                *    $(document).ready(function() {
-                *      oTable = $('#example').dataTable();
-                *
-                *      oTable.$('tr').click( function () {
-                *        var data = oTable.fnGetData( this );
-                *        // ... do something with the array / object of data for the row
-                *      } );
-                *    } );
-                *
-                *  @example
-                *    // Individual cell data
-                *    $(document).ready(function() {
-                *      oTable = $('#example').dataTable();
-                *
-                *      oTable.$('td').click( function () {
-                *        var sData = oTable.fnGetData( this );
-                *        alert( 'The cell clicked on had the value of '+sData );
-                *      } );
-                *    } );
-                */
-               this.fnGetData = function( mRow, iCol )
-               {
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
                        
-                       if ( mRow !== undefined )
+                       
+                       /*
+                        * Stripes
+                        */
+                       if ( oInit.asStripeClasses === null )
                        {
-                               var iRow = mRow;
-                               if ( typeof mRow === 'object' )
-                               {
-                                       var sNode = mRow.nodeName.toLowerCase();
-                                       if (sNode === "tr" )
-                                       {
-                                               iRow = _fnNodeToDataIndex(oSettings, mRow);
-                                       }
-                                       else if ( sNode === "td" )
-                                       {
-                                               iRow = _fnNodeToDataIndex(oSettings, mRow.parentNode);
-                                               iCol = _fnNodeToColumnIndex( oSettings, iRow, mRow );
-                                       }
-                               }
-               
-                               if ( iCol !== undefined )
-                               {
-                                       return _fnGetCellData( oSettings, iRow, iCol, '' );
-                               }
-                               return (oSettings.aoData[iRow]!==undefined) ?
-                                       oSettings.aoData[iRow]._aData : null;
+                               oSettings.asStripeClasses =[
+                                       oClasses.sStripeOdd,
+                                       oClasses.sStripeEven
+                               ];
                        }
-                       return _fnGetDataMaster( oSettings );
-               };
-               
-               
-               /**
-                * Get an array of the TR nodes that are used in the table's body. Note that you will 
-                * typically want to use the '$' API method in preference to this as it is more 
-                * flexible.
-                *  @param {int} [iRow] Optional row index for the TR element you want
-                *  @returns {array|node} If iRow is undefined, returns an array of all TR elements
-                *    in the table's body, or iRow is defined, just the TR element requested.
-                *  @dtopt API
-                *
-                *  @example
-                *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable();
-                *      
-                *      // Get the nodes from the table
-                *      var nNodes = oTable.fnGetNodes( );
-                *    } );
-                */
-               this.fnGetNodes = function( iRow )
-               {
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
                        
-                       if ( iRow !== undefined ) {
-                               return (oSettings.aoData[iRow]!==undefined) ?
-                                       oSettings.aoData[iRow].nTr : null;
+                       /* Remove row stripe classes if they are already on the table row */
+                       var stripeClasses = oSettings.asStripeClasses;
+                       var rowOne = $('tbody tr:eq(0)', this);
+                       if ( $.inArray( true, $.map( stripeClasses, function(el, i) {
+                               return rowOne.hasClass(el);
+                       } ) ) !== -1 ) {
+                               $('tbody tr', this).removeClass( stripeClasses.join(' ') );
+                               oSettings.asDestroyStripes = stripeClasses.slice();
                        }
-                       return _fnGetTrNodes( oSettings );
-               };
-               
-               
-               /**
-                * Get the array indexes of a particular cell from it's DOM element
-                * and column index including hidden columns
-                *  @param {node} nNode this can either be a TR, TD or TH in the table's body
-                *  @returns {int} If nNode is given as a TR, then a single index is returned, or
-                *    if given as a cell, an array of [row index, column index (visible), 
-                *    column index (all)] is given.
-                *  @dtopt API
-                *
-                *  @example
-                *    $(document).ready(function() {
-                *      $('#example tbody td').click( function () {
-                *        // Get the position of the current data from the node
-                *        var aPos = oTable.fnGetPosition( this );
-                *        
-                *        // Get the data array for this row
-                *        var aData = oTable.fnGetData( aPos[0] );
-                *        
-                *        // Update the data array and return the value
-                *        aData[ aPos[1] ] = 'clicked';
-                *        this.innerHTML = 'clicked';
-                *      } );
-                *      
-                *      // Init DataTables
-                *      oTable = $('#example').dataTable();
-                *    } );
-                */
-               this.fnGetPosition = function( nNode )
-               {
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-                       var sNodeName = nNode.nodeName.toUpperCase();
                        
-                       if ( sNodeName == "TR" )
-                       {
-                               return _fnNodeToDataIndex(oSettings, nNode);
-                       }
-                       else if ( sNodeName == "TD" || sNodeName == "TH" )
+                       /*
+                        * Columns
+                        * See if we should load columns automatically or use defined ones
+                        */
+                       var anThs = [];
+                       var aoColumnsInit;
+                       var nThead = this.getElementsByTagName('thead');
+                       if ( nThead.length !== 0 )
                        {
-                               var iDataIndex = _fnNodeToDataIndex( oSettings, nNode.parentNode );
-                               var iColumnIndex = _fnNodeToColumnIndex( oSettings, iDataIndex, nNode );
-                               return [ iDataIndex, _fnColumnIndexToVisible(oSettings, iColumnIndex ), iColumnIndex ];
+                               _fnDetectHeader( oSettings.aoHeader, nThead[0] );
+                               anThs = _fnGetUniqueThs( oSettings );
                        }
-                       return null;
-               };
-               
-               
-               /**
-                * Check to see if a row is 'open' or not.
-                *  @param {node} nTr the table row to check
-                *  @returns {boolean} true if the row is currently open, false otherwise
-                *  @dtopt API
-                *
-                *  @example
-                *    $(document).ready(function() {
-                *      var oTable;
-                *      
-                *      // 'open' an information row when a row is clicked on
-                *      $('#example tbody tr').click( function () {
-                *        if ( oTable.fnIsOpen(this) ) {
-                *          oTable.fnClose( this );
-                *        } else {
-                *          oTable.fnOpen( this, "Temporary row opened", "info_row" );
-                *        }
-                *      } );
-                *      
-                *      oTable = $('#example').dataTable();
-                *    } );
-                */
-               this.fnIsOpen = function( nTr )
-               {
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-                       var aoOpenRows = oSettings.aoOpenRows;
                        
-                       for ( var i=0 ; i<oSettings.aoOpenRows.length ; i++ )
+                       /* If not given a column array, generate one with nulls */
+                       if ( oInit.aoColumns === null )
                        {
-                               if ( oSettings.aoOpenRows[i].nParent == nTr )
+                               aoColumnsInit = [];
+                               for ( i=0, iLen=anThs.length ; i<iLen ; i++ )
                                {
-                                       return true;
+                                       aoColumnsInit.push( null );
                                }
                        }
-                       return false;
-               };
-               
-               
-               /**
-                * This function will place a new row directly after a row which is currently 
-                * on display on the page, with the HTML contents that is passed into the 
-                * function. This can be used, for example, to ask for confirmation that a 
-                * particular record should be deleted.
-                *  @param {node} nTr The table row to 'open'
-                *  @param {string|node|jQuery} mHtml The HTML to put into the row
-                *  @param {string} sClass Class to give the new TD cell
-                *  @returns {node} The row opened. Note that if the table row passed in as the
-                *    first parameter, is not found in the table, this method will silently
-                *    return.
-                *  @dtopt API
-                *
-                *  @example
-                *    $(document).ready(function() {
-                *      var oTable;
-                *      
-                *      // 'open' an information row when a row is clicked on
-                *      $('#example tbody tr').click( function () {
-                *        if ( oTable.fnIsOpen(this) ) {
-                *          oTable.fnClose( this );
-                *        } else {
-                *          oTable.fnOpen( this, "Temporary row opened", "info_row" );
-                *        }
-                *      } );
-                *      
-                *      oTable = $('#example').dataTable();
-                *    } );
-                */
-               this.fnOpen = function( nTr, mHtml, sClass )
-               {
-                       /* Find settings from table node */
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-               
-                       /* Check that the row given is in the table */
-                       var nTableRows = _fnGetTrNodes( oSettings );
-                       if ( $.inArray(nTr, nTableRows) === -1 )
+                       else
                        {
-                               return;
+                               aoColumnsInit = oInit.aoColumns;
                        }
                        
-                       /* the old open one if there is one */
-                       this.fnClose( nTr );
-                       
-                       var nNewRow = document.createElement("tr");
-                       var nNewCell = document.createElement("td");
-                       nNewRow.appendChild( nNewCell );
-                       nNewCell.className = sClass;
-                       nNewCell.colSpan = _fnVisbleColumns( oSettings );
-               
-                       if (typeof mHtml === "string")
+                       /* Add the columns */
+                       for ( i=0, iLen=aoColumnsInit.length ; i<iLen ; i++ )
                        {
-                               nNewCell.innerHTML = mHtml;
+                               _fnAddColumn( oSettings, anThs ? anThs[i] : null );
                        }
-                       else
-                       {
-                               $(nNewCell).html( mHtml );
+                       
+                       /* Apply the column definitions */
+                       _fnApplyColumnDefs( oSettings, oInit.aoColumnDefs, aoColumnsInit, function (iCol, oDef) {
+                               _fnColumnOptions( oSettings, iCol, oDef );
+                       } );
+                       
+                       /* HTML5 attribute detection - build an mData object automatically if the
+                        * attributes are found
+                        */
+                       if ( rowOne.length ) {
+                               var a = function ( cell, name ) {
+                                       return cell.getAttribute( 'data-'+name ) ? name : null;
+                               };
+                       
+                               $.each( _fnGetRowElements( oSettings, rowOne[0] ).cells, function (i, cell) {
+                                       var col = oSettings.aoColumns[i];
+                       
+                                       if ( col.mData === i ) {
+                                               var sort = a( cell, 'sort' ) || a( cell, 'order' );
+                                               var filter = a( cell, 'filter' ) || a( cell, 'search' );
+                       
+                                               if ( sort !== null || filter !== null ) {
+                                                       col.mData = {
+                                                               _:      i+'.display',
+                                                               sort:   sort !== null   ? i+'.@data-'+sort   : undefined,
+                                                               type:   sort !== null   ? i+'.@data-'+sort   : undefined,
+                                                               filter: filter !== null ? i+'.@data-'+filter : undefined
+                                                       };
+                       
+                                                       _fnColumnOptions( oSettings, i );
+                                               }
+                                       }
+                               } );
                        }
-               
-                       /* If the nTr isn't on the page at the moment - then we don't insert at the moment */
-                       var nTrs = $('tr', oSettings.nTBody);
-                       if ( $.inArray(nTr, nTrs) != -1  )
+                       
+                       var features = oSettings.oFeatures;
+                       
+                       /* Must be done after everything which can be overridden by the state saving! */
+                       if ( oInit.bStateSave )
                        {
-                               $(nNewRow).insertAfter(nTr);
+                               features.bStateSave = true;
+                               _fnLoadState( oSettings, oInit );
+                               _fnCallbackReg( oSettings, 'aoDrawCallback', _fnSaveState, 'state_save' );
                        }
                        
-                       oSettings.aoOpenRows.push( {
-                               "nTr": nNewRow,
-                               "nParent": nTr
-                       } );
                        
-                       return nNewRow;
-               };
-               
-               
-               /**
-                * Change the pagination - provides the internal logic for pagination in a simple API 
-                * function. With this function you can have a DataTables table go to the next, 
-                * previous, first or last pages.
-                *  @param {string|int} mAction Paging action to take: "first", "previous", "next" or "last"
-                *    or page number to jump to (integer), note that page 0 is the first page.
-                *  @param {bool} [bRedraw=true] Redraw the table or not
-                *  @dtopt API
-                *
-                *  @example
-                *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable();
-                *      oTable.fnPageChange( 'next' );
-                *    } );
-                */
-               this.fnPageChange = function ( mAction, bRedraw )
-               {
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-                       _fnPageChange( oSettings, mAction );
-                       _fnCalculateEnd( oSettings );
+                       /*
+                        * Sorting
+                        * @todo For modularisation (1.11) this needs to do into a sort start up handler
+                        */
                        
-                       if ( bRedraw === undefined || bRedraw )
+                       // If aaSorting is not defined, then we use the first indicator in asSorting
+                       // in case that has been altered, so the default sort reflects that option
+                       if ( oInit.aaSorting === undefined )
                        {
-                               _fnDraw( oSettings );
+                               var sorting = oSettings.aaSorting;
+                               for ( i=0, iLen=sorting.length ; i<iLen ; i++ )
+                               {
+                                       sorting[i][1] = oSettings.aoColumns[ i ].asSorting[0];
+                               }
                        }
-               };
-               
-               
-               /**
-                * Show a particular column
-                *  @param {int} iCol The column whose display should be changed
-                *  @param {bool} bShow Show (true) or hide (false) the column
-                *  @param {bool} [bRedraw=true] Redraw the table or not
-                *  @dtopt API
-                *
-                *  @example
-                *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable();
-                *      
-                *      // Hide the second column after initialisation
-                *      oTable.fnSetColumnVis( 1, false );
-                *    } );
-                */
-               this.fnSetColumnVis = function ( iCol, bShow, bRedraw )
-               {
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-                       var i, iLen;
-                       var aoColumns = oSettings.aoColumns;
-                       var aoData = oSettings.aoData;
-                       var nTd, bAppend, iBefore;
                        
-                       /* No point in doing anything if we are requesting what is already true */
-                       if ( aoColumns[iCol].bVisible == bShow )
-                       {
-                               return;
-                       }
+                       /* Do a first pass on the sorting classes (allows any size changes to be taken into
+                        * account, and also will apply sorting disabled classes if disabled
+                        */
+                       _fnSortingClasses( oSettings );
                        
-                       /* Show the column */
-                       if ( bShow )
+                       if ( features.bSort )
                        {
-                               var iInsert = 0;
-                               for ( i=0 ; i<iCol ; i++ )
-                               {
-                                       if ( aoColumns[i].bVisible )
-                                       {
-                                               iInsert++;
-                                       }
-                               }
-                               
-                               /* Need to decide if we should use appendChild or insertBefore */
-                               bAppend = (iInsert >= _fnVisbleColumns( oSettings ));
-               
-                               /* Which coloumn should we be inserting before? */
-                               if ( !bAppend )
-                               {
-                                       for ( i=iCol ; i<aoColumns.length ; i++ )
-                                       {
-                                               if ( aoColumns[i].bVisible )
-                                               {
-                                                       iBefore = i;
-                                                       break;
-                                               }
-                                       }
-                               }
-               
-                               for ( i=0, iLen=aoData.length ; i<iLen ; i++ )
-                               {
-                                       if ( aoData[i].nTr !== null )
-                                       {
-                                               if ( bAppend )
-                                               {
-                                                       aoData[i].nTr.appendChild( 
-                                                               aoData[i]._anHidden[iCol]
-                                                       );
-                                               }
-                                               else
-                                               {
-                                                       aoData[i].nTr.insertBefore(
-                                                               aoData[i]._anHidden[iCol], 
-                                                               _fnGetTdNodes( oSettings, i )[iBefore] );
-                                               }
+                               _fnCallbackReg( oSettings, 'aoDrawCallback', function () {
+                                       if ( oSettings.bSorted ) {
+                                               var aSort = _fnSortFlatten( oSettings );
+                                               var sortedColumns = {};
+                       
+                                               $.each( aSort, function (i, val) {
+                                                       sortedColumns[ val.src ] = val.dir;
+                                               } );
+                       
+                                               _fnCallbackFire( oSettings, null, 'order', [oSettings, aSort, sortedColumns] );
+                                               _fnSortAria( oSettings );
                                        }
-                               }
+                               } );
                        }
-                       else
-                       {
-                               /* Remove a column from display */
-                               for ( i=0, iLen=aoData.length ; i<iLen ; i++ )
-                               {
-                                       if ( aoData[i].nTr !== null )
-                                       {
-                                               nTd = _fnGetTdNodes( oSettings, i )[iCol];
-                                               aoData[i]._anHidden[iCol] = nTd;
-                                               nTd.parentNode.removeChild( nTd );
-                                       }
+                       
+                       _fnCallbackReg( oSettings, 'aoDrawCallback', function () {
+                               if ( oSettings.bSorted || _fnDataSource( oSettings ) === 'ssp' || features.bDeferRender ) {
+                                       _fnSortingClasses( oSettings );
                                }
-                       }
-               
-                       /* Clear to set the visible flag */
-                       aoColumns[iCol].bVisible = bShow;
-               
-                       /* Redraw the header and footer based on the new column visibility */
-                       _fnDrawHead( oSettings, oSettings.aoHeader );
-                       if ( oSettings.nTFoot )
-                       {
-                               _fnDrawHead( oSettings, oSettings.aoFooter );
-                       }
+                       }, 'sc' );
                        
-                       /* If there are any 'open' rows, then we need to alter the colspan for this col change */
-                       for ( i=0, iLen=oSettings.aoOpenRows.length ; i<iLen ; i++ )
-                       {
-                               oSettings.aoOpenRows[i].nTr.colSpan = _fnVisbleColumns( oSettings );
-                       }
                        
-                       /* Do a redraw incase anything depending on the table columns needs it 
-                        * (built-in: scrolling) 
+                       /*
+                        * Final init
+                        * Cache the header, body and footer as required, creating them if needed
                         */
-                       if ( bRedraw === undefined || bRedraw )
-                       {
-                               _fnAdjustColumnSizing( oSettings );
-                               _fnDraw( oSettings );
-                       }
                        
-                       _fnSaveState( oSettings );
-               };
-               
-               
-               /**
-                * Get the settings for a particular table for external manipulation
-                *  @returns {object} DataTables settings object. See 
-                *    {@link DataTable.models.oSettings}
-                *  @dtopt API
-                *
-                *  @example
-                *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable();
-                *      var oSettings = oTable.fnSettings();
-                *      
-                *      // Show an example parameter from the settings
-                *      alert( oSettings._iDisplayStart );
-                *    } );
-                */
-               this.fnSettings = function()
-               {
-                       return _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-               };
-               
-               
-               /**
-                * Sort the table by a particular column
-                *  @param {int} iCol the data index to sort on. Note that this will not match the 
-                *    'display index' if you have hidden data entries
-                *  @dtopt API
-                *
-                *  @example
-                *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable();
-                *      
-                *      // Sort immediately with columns 0 and 1
-                *      oTable.fnSort( [ [0,'asc'], [1,'asc'] ] );
-                *    } );
-                */
-               this.fnSort = function( aaSort )
-               {
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-                       oSettings.aaSorting = aaSort;
-                       _fnSort( oSettings );
-               };
-               
-               
-               /**
-                * Attach a sort listener to an element for a given column
-                *  @param {node} nNode the element to attach the sort listener to
-                *  @param {int} iColumn the column that a click on this node will sort on
-                *  @param {function} [fnCallback] callback function when sort is run
-                *  @dtopt API
-                *
-                *  @example
-                *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable();
-                *      
-                *      // Sort on column 1, when 'sorter' is clicked on
-                *      oTable.fnSortListener( document.getElementById('sorter'), 1 );
-                *    } );
-                */
-               this.fnSortListener = function( nNode, iColumn, fnCallback )
-               {
-                       _fnSortAttachListener( _fnSettingsFromNode( this[DataTable.ext.iApiIndex] ), nNode, iColumn,
-                               fnCallback );
-               };
-               
-               
-               /**
-                * Update a table cell or row - this method will accept either a single value to
-                * update the cell with, an array of values with one element for each column or
-                * an object in the same format as the original data source. The function is
-                * self-referencing in order to make the multi column updates easier.
-                *  @param {object|array|string} mData Data to update the cell/row with
-                *  @param {node|int} mRow TR element you want to update or the aoData index
-                *  @param {int} [iColumn] The column to update (not used of mData is an array or object)
-                *  @param {bool} [bRedraw=true] Redraw the table or not
-                *  @param {bool} [bAction=true] Perform pre-draw actions or not
-                *  @returns {int} 0 on success, 1 on error
-                *  @dtopt API
-                *
-                *  @example
-                *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable();
-                *      oTable.fnUpdate( 'Example update', 0, 0 ); // Single cell
-                *      oTable.fnUpdate( ['a', 'b', 'c', 'd', 'e'], 1, 0 ); // Row
-                *    } );
-                */
-               this.fnUpdate = function( mData, mRow, iColumn, bRedraw, bAction )
-               {
-                       var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-                       var i, iLen, sDisplay;
-                       var iRow = (typeof mRow === 'object') ? 
-                               _fnNodeToDataIndex(oSettings, mRow) : mRow;
+                       /* Browser support detection */
+                       _fnBrowserDetect( oSettings );
+                       
+                       // Work around for Webkit bug 83867 - store the caption-side before removing from doc
+                       var captions = $(this).children('caption').each( function () {
+                               this._captionSide = $(this).css('caption-side');
+                       } );
                        
-                       if ( $.isArray(mData) && iColumn === undefined )
+                       var thead = $(this).children('thead');
+                       if ( thead.length === 0 )
                        {
-                               /* Array update - update the whole row */
-                               oSettings.aoData[iRow]._aData = mData.slice();
-                               
-                               /* Flag to the function that we are recursing */
-                               for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
-                               {
-                                       this.fnUpdate( _fnGetCellData( oSettings, iRow, i ), iRow, i, false, false );
-                               }
+                               thead = $('<thead/>').appendTo(this);
                        }
-                       else if ( $.isPlainObject(mData) && iColumn === undefined )
+                       oSettings.nTHead = thead[0];
+                       
+                       var tbody = $(this).children('tbody');
+                       if ( tbody.length === 0 )
                        {
-                               /* Object update - update the whole row - assume the developer gets the object right */
-                               oSettings.aoData[iRow]._aData = $.extend( true, {}, mData );
-               
-                               for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
-                               {
-                                       this.fnUpdate( _fnGetCellData( oSettings, iRow, i ), iRow, i, false, false );
-                               }
+                               tbody = $('<tbody/>').appendTo(this);
                        }
-                       else
+                       oSettings.nTBody = tbody[0];
+                       
+                       var tfoot = $(this).children('tfoot');
+                       if ( tfoot.length === 0 && captions.length > 0 && (oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "") )
                        {
-                               /* Individual cell update */
-                               _fnSetCellData( oSettings, iRow, iColumn, mData );
-                               sDisplay = _fnGetCellData( oSettings, iRow, iColumn, 'display' );
-                               
-                               var oCol = oSettings.aoColumns[iColumn];
-                               if ( oCol.fnRender !== null )
-                               {
-                                       sDisplay = _fnRender( oSettings, iRow, iColumn );
-                                       if ( oCol.bUseRendered )
-                                       {
-                                               _fnSetCellData( oSettings, iRow, iColumn, sDisplay );
-                                       }
-                               }
-                               
-                               if ( oSettings.aoData[iRow].nTr !== null )
-                               {
-                                       /* Do the actual HTML update */
-                                       _fnGetTdNodes( oSettings, iRow )[iColumn].innerHTML = sDisplay;
-                               }
+                               // If we are a scrolling table, and no footer has been given, then we need to create
+                               // a tfoot element for the caption element to be appended to
+                               tfoot = $('<tfoot/>').appendTo(this);
                        }
                        
-                       /* Modify the search index for this row (strictly this is likely not needed, since fnReDraw
-                        * will rebuild the search array - however, the redraw might be disabled by the user)
-                        */
-                       var iDisplayIndex = $.inArray( iRow, oSettings.aiDisplay );
-                       oSettings.asDataSearch[iDisplayIndex] = _fnBuildSearchRow(
-                               oSettings, 
-                               _fnGetRowData( oSettings, iRow, 'filter', _fnGetColumns( oSettings, 'bSearchable' ) )
-                       );
-                       
-                       /* Perform pre-draw actions */
-                       if ( bAction === undefined || bAction )
-                       {
-                               _fnAdjustColumnSizing( oSettings );
+                       if ( tfoot.length === 0 || tfoot.children().length === 0 ) {
+                               $(this).addClass( oClasses.sNoFooter );
+                       }
+                       else if ( tfoot.length > 0 ) {
+                               oSettings.nTFoot = tfoot[0];
+                               _fnDetectHeader( oSettings.aoFooter, oSettings.nTFoot );
                        }
                        
-                       /* Redraw the table */
-                       if ( bRedraw === undefined || bRedraw )
+                       /* Check if there is data passing into the constructor */
+                       if ( oInit.aaData )
                        {
-                               _fnReDraw( oSettings );
+                               for ( i=0 ; i<oInit.aaData.length ; i++ )
+                               {
+                                       _fnAddData( oSettings, oInit.aaData[ i ] );
+                               }
                        }
-                       return 0;
-               };
-               
-               
-               /**
-                * Provide a common method for plug-ins to check the version of DataTables being used, in order
-                * to ensure compatibility.
-                *  @param {string} sVersion Version string to check for, in the format "X.Y.Z". Note that the
-                *    formats "X" and "X.Y" are also acceptable.
-                *  @returns {boolean} true if this version of DataTables is greater or equal to the required
-                *    version, or false if this version of DataTales is not suitable
-                *  @method
-                *  @dtopt API
-                *
-                *  @example
-                *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable();
-                *      alert( oTable.fnVersionCheck( '1.9.0' ) );
-                *    } );
-                */
-               this.fnVersionCheck = DataTable.ext.fnVersionCheck;
-               
-               
-               /*
-                * This is really a good bit rubbish this method of exposing the internal methods
-                * publicly... - To be fixed in 2.0 using methods on the prototype
-                */
-               
-               
-               /**
-                * Create a wrapper function for exporting an internal functions to an external API.
-                *  @param {string} sFunc API function name
-                *  @returns {function} wrapped function
-                *  @memberof DataTable#oApi
-                */
-               function _fnExternApiFunc (sFunc)
-               {
-                       return function() {
-                               var aArgs = [_fnSettingsFromNode(this[DataTable.ext.iApiIndex])].concat( 
-                                       Array.prototype.slice.call(arguments) );
-                               return DataTable.ext.oApi[sFunc].apply( this, aArgs );
-                       };
-               }
-               
-               
-               /**
-                * Reference to internal functions for use by plug-in developers. Note that these
-                * methods are references to internal functions and are considered to be private.
-                * If you use these methods, be aware that they are liable to change between versions
-                * (check the upgrade notes).
-                *  @namespace
-                */
-               this.oApi = {
-                       "_fnExternApiFunc": _fnExternApiFunc,
-                       "_fnInitialise": _fnInitialise,
-                       "_fnInitComplete": _fnInitComplete,
-                       "_fnLanguageCompat": _fnLanguageCompat,
-                       "_fnAddColumn": _fnAddColumn,
-                       "_fnColumnOptions": _fnColumnOptions,
-                       "_fnAddData": _fnAddData,
-                       "_fnCreateTr": _fnCreateTr,
-                       "_fnGatherData": _fnGatherData,
-                       "_fnBuildHead": _fnBuildHead,
-                       "_fnDrawHead": _fnDrawHead,
-                       "_fnDraw": _fnDraw,
-                       "_fnReDraw": _fnReDraw,
-                       "_fnAjaxUpdate": _fnAjaxUpdate,
-                       "_fnAjaxParameters": _fnAjaxParameters,
-                       "_fnAjaxUpdateDraw": _fnAjaxUpdateDraw,
-                       "_fnServerParams": _fnServerParams,
-                       "_fnAddOptionsHtml": _fnAddOptionsHtml,
-                       "_fnFeatureHtmlTable": _fnFeatureHtmlTable,
-                       "_fnScrollDraw": _fnScrollDraw,
-                       "_fnAdjustColumnSizing": _fnAdjustColumnSizing,
-                       "_fnFeatureHtmlFilter": _fnFeatureHtmlFilter,
-                       "_fnFilterComplete": _fnFilterComplete,
-                       "_fnFilterCustom": _fnFilterCustom,
-                       "_fnFilterColumn": _fnFilterColumn,
-                       "_fnFilter": _fnFilter,
-                       "_fnBuildSearchArray": _fnBuildSearchArray,
-                       "_fnBuildSearchRow": _fnBuildSearchRow,
-                       "_fnFilterCreateSearch": _fnFilterCreateSearch,
-                       "_fnDataToSearch": _fnDataToSearch,
-                       "_fnSort": _fnSort,
-                       "_fnSortAttachListener": _fnSortAttachListener,
-                       "_fnSortingClasses": _fnSortingClasses,
-                       "_fnFeatureHtmlPaginate": _fnFeatureHtmlPaginate,
-                       "_fnPageChange": _fnPageChange,
-                       "_fnFeatureHtmlInfo": _fnFeatureHtmlInfo,
-                       "_fnUpdateInfo": _fnUpdateInfo,
-                       "_fnFeatureHtmlLength": _fnFeatureHtmlLength,
-                       "_fnFeatureHtmlProcessing": _fnFeatureHtmlProcessing,
-                       "_fnProcessingDisplay": _fnProcessingDisplay,
-                       "_fnVisibleToColumnIndex": _fnVisibleToColumnIndex,
-                       "_fnColumnIndexToVisible": _fnColumnIndexToVisible,
-                       "_fnNodeToDataIndex": _fnNodeToDataIndex,
-                       "_fnVisbleColumns": _fnVisbleColumns,
-                       "_fnCalculateEnd": _fnCalculateEnd,
-                       "_fnConvertToWidth": _fnConvertToWidth,
-                       "_fnCalculateColumnWidths": _fnCalculateColumnWidths,
-                       "_fnScrollingWidthAdjust": _fnScrollingWidthAdjust,
-                       "_fnGetWidestNode": _fnGetWidestNode,
-                       "_fnGetMaxLenString": _fnGetMaxLenString,
-                       "_fnStringToCss": _fnStringToCss,
-                       "_fnDetectType": _fnDetectType,
-                       "_fnSettingsFromNode": _fnSettingsFromNode,
-                       "_fnGetDataMaster": _fnGetDataMaster,
-                       "_fnGetTrNodes": _fnGetTrNodes,
-                       "_fnGetTdNodes": _fnGetTdNodes,
-                       "_fnEscapeRegex": _fnEscapeRegex,
-                       "_fnDeleteIndex": _fnDeleteIndex,
-                       "_fnReOrderIndex": _fnReOrderIndex,
-                       "_fnColumnOrdering": _fnColumnOrdering,
-                       "_fnLog": _fnLog,
-                       "_fnClearTable": _fnClearTable,
-                       "_fnSaveState": _fnSaveState,
-                       "_fnLoadState": _fnLoadState,
-                       "_fnCreateCookie": _fnCreateCookie,
-                       "_fnReadCookie": _fnReadCookie,
-                       "_fnDetectHeader": _fnDetectHeader,
-                       "_fnGetUniqueThs": _fnGetUniqueThs,
-                       "_fnScrollBarWidth": _fnScrollBarWidth,
-                       "_fnApplyToChildren": _fnApplyToChildren,
-                       "_fnMap": _fnMap,
-                       "_fnGetRowData": _fnGetRowData,
-                       "_fnGetCellData": _fnGetCellData,
-                       "_fnSetCellData": _fnSetCellData,
-                       "_fnGetObjectDataFn": _fnGetObjectDataFn,
-                       "_fnSetObjectDataFn": _fnSetObjectDataFn,
-                       "_fnApplyColumnDefs": _fnApplyColumnDefs,
-                       "_fnBindAction": _fnBindAction,
-                       "_fnExtend": _fnExtend,
-                       "_fnCallbackReg": _fnCallbackReg,
-                       "_fnCallbackFire": _fnCallbackFire,
-                       "_fnJsonString": _fnJsonString,
-                       "_fnRender": _fnRender,
-                       "_fnNodeToColumnIndex": _fnNodeToColumnIndex,
-                       "_fnInfoMacros": _fnInfoMacros,
-                       "_fnBrowserDetect": _fnBrowserDetect,
-                       "_fnGetColumns": _fnGetColumns
-               };
-               
-               $.extend( DataTable.ext.oApi, this.oApi );
-               
-               for ( var sFunc in DataTable.ext.oApi )
-               {
-                       if ( sFunc )
+                       else if ( oSettings.bDeferLoading || _fnDataSource( oSettings ) == 'dom' )
                        {
-                               this[sFunc] = _fnExternApiFunc(sFunc);
+                               /* Grab the data from the page - only do this when deferred loading or no Ajax
+                                * source since there is no point in reading the DOM data if we are then going
+                                * to replace it with Ajax data
+                                */
+                               _fnAddTr( oSettings, $(oSettings.nTBody).children('tr') );
                        }
-               }
-               
-               
-               var _that = this;
-               this.each(function() {
-                       var i=0, iLen, j, jLen, k, kLen;
-                       var sId = this.getAttribute( 'id' );
-                       var bInitHandedOff = false;
-                       var bUsePassedData = false;
                        
+                       /* Copy the data index array */
+                       oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
                        
-                       /* Sanity check */
-                       if ( this.nodeName.toLowerCase() != 'table' )
-                       {
-                               _fnLog( null, 0, "Attempted to initialise DataTables on a node which is not a "+
-                                       "table: "+this.nodeName );
-                               return;
-                       }
+                       /* Initialisation complete - table can be drawn */
+                       oSettings.bInitialised = true;
                        
-                       /* Check to see if we are re-initialising a table */
-                       for ( i=0, iLen=DataTable.settings.length ; i<iLen ; i++ )
+                       /* Check if we need to initialise the table (it might not have been handed off to the
+                        * language processor)
+                        */
+                       if ( bInitHandedOff === false )
                        {
-                               /* Base check on table node */
-                               if ( DataTable.settings[i].nTable == this )
-                               {
-                                       if ( oInit === undefined || oInit.bRetrieve )
-                                       {
-                                               return DataTable.settings[i].oInstance;
-                                       }
-                                       else if ( oInit.bDestroy )
-                                       {
-                                               DataTable.settings[i].oInstance.fnDestroy();
-                                               break;
+                               _fnInitialise( oSettings );
+                       }
+               } );
+               _that = null;
+               return this;
+       };
+
+       
+       
+       /**
+        * Computed structure of the DataTables API, defined by the options passed to
+        * `DataTable.Api.register()` when building the API.
+        *
+        * The structure is built in order to speed creation and extension of the Api
+        * objects since the extensions are effectively pre-parsed.
+        *
+        * The array is an array of objects with the following structure, where this
+        * base array represents the Api prototype base:
+        *
+        *     [
+        *       {
+        *         name:      'data'                -- string   - Property name
+        *         val:       function () {},       -- function - Api method (or undefined if just an object
+        *         methodExt: [ ... ],              -- array    - Array of Api object definitions to extend the method result
+        *         propExt:   [ ... ]               -- array    - Array of Api object definitions to extend the property
+        *       },
+        *       {
+        *         name:     'row'
+        *         val:       {},
+        *         methodExt: [ ... ],
+        *         propExt:   [
+        *           {
+        *             name:      'data'
+        *             val:       function () {},
+        *             methodExt: [ ... ],
+        *             propExt:   [ ... ]
+        *           },
+        *           ...
+        *         ]
+        *       }
+        *     ]
+        *
+        * @type {Array}
+        * @ignore
+        */
+       var __apiStruct = [];
+       
+       
+       /**
+        * `Array.prototype` reference.
+        *
+        * @type object
+        * @ignore
+        */
+       var __arrayProto = Array.prototype;
+       
+       
+       /**
+        * Abstraction for `context` parameter of the `Api` constructor to allow it to
+        * take several different forms for ease of use.
+        *
+        * Each of the input parameter types will be converted to a DataTables settings
+        * object where possible.
+        *
+        * @param  {string|node|jQuery|object} mixed DataTable identifier. Can be one
+        *   of:
+        *
+        *   * `string` - jQuery selector. Any DataTables' matching the given selector
+        *     with be found and used.
+        *   * `node` - `TABLE` node which has already been formed into a DataTable.
+        *   * `jQuery` - A jQuery object of `TABLE` nodes.
+        *   * `object` - DataTables settings object
+        *   * `DataTables.Api` - API instance
+        * @return {array|null} Matching DataTables settings objects. `null` or
+        *   `undefined` is returned if no matching DataTable is found.
+        * @ignore
+        */
+       var _toSettings = function ( mixed )
+       {
+               var idx, jq;
+               var settings = DataTable.settings;
+               var tables = $.map( settings, function (el, i) {
+                       return el.nTable;
+               } );
+       
+               if ( ! mixed ) {
+                       return [];
+               }
+               else if ( mixed.nTable && mixed.oApi ) {
+                       // DataTables settings object
+                       return [ mixed ];
+               }
+               else if ( mixed.nodeName && mixed.nodeName.toLowerCase() === 'table' ) {
+                       // Table node
+                       idx = $.inArray( mixed, tables );
+                       return idx !== -1 ? [ settings[idx] ] : null;
+               }
+               else if ( mixed && typeof mixed.settings === 'function' ) {
+                       return mixed.settings().toArray();
+               }
+               else if ( typeof mixed === 'string' ) {
+                       // jQuery selector
+                       jq = $(mixed);
+               }
+               else if ( mixed instanceof $ ) {
+                       // jQuery object (also DataTables instance)
+                       jq = mixed;
+               }
+       
+               if ( jq ) {
+                       return jq.map( function(i) {
+                               idx = $.inArray( this, tables );
+                               return idx !== -1 ? settings[idx] : null;
+                       } ).toArray();
+               }
+       };
+       
+       
+       /**
+        * DataTables API class - used to control and interface with  one or more
+        * DataTables enhanced tables.
+        *
+        * The API class is heavily based on jQuery, presenting a chainable interface
+        * that you can use to interact with tables. Each instance of the API class has
+        * a "context" - i.e. the tables that it will operate on. This could be a single
+        * table, all tables on a page or a sub-set thereof.
+        *
+        * Additionally the API is designed to allow you to easily work with the data in
+        * the tables, retrieving and manipulating it as required. This is done by
+        * presenting the API class as an array like interface. The contents of the
+        * array depend upon the actions requested by each method (for example
+        * `rows().nodes()` will return an array of nodes, while `rows().data()` will
+        * return an array of objects or arrays depending upon your table's
+        * configuration). The API object has a number of array like methods (`push`,
+        * `pop`, `reverse` etc) as well as additional helper methods (`each`, `pluck`,
+        * `unique` etc) to assist your working with the data held in a table.
+        *
+        * Most methods (those which return an Api instance) are chainable, which means
+        * the return from a method call also has all of the methods available that the
+        * top level object had. For example, these two calls are equivalent:
+        *
+        *     // Not chained
+        *     api.row.add( {...} );
+        *     api.draw();
+        *
+        *     // Chained
+        *     api.row.add( {...} ).draw();
+        *
+        * @class DataTable.Api
+        * @param {array|object|string|jQuery} context DataTable identifier. This is
+        *   used to define which DataTables enhanced tables this API will operate on.
+        *   Can be one of:
+        *
+        *   * `string` - jQuery selector. Any DataTables' matching the given selector
+        *     with be found and used.
+        *   * `node` - `TABLE` node which has already been formed into a DataTable.
+        *   * `jQuery` - A jQuery object of `TABLE` nodes.
+        *   * `object` - DataTables settings object
+        * @param {array} [data] Data to initialise the Api instance with.
+        *
+        * @example
+        *   // Direct initialisation during DataTables construction
+        *   var api = $('#example').DataTable();
+        *
+        * @example
+        *   // Initialisation using a DataTables jQuery object
+        *   var api = $('#example').dataTable().api();
+        *
+        * @example
+        *   // Initialisation as a constructor
+        *   var api = new $.fn.DataTable.Api( 'table.dataTable' );
+        */
+       DataTable.Api = _Api = function ( context, data )
+       {
+               if ( ! this instanceof _Api ) {
+                       throw 'DT API must be constructed as a new object';
+                       // or should it do the 'new' for the caller?
+                       // return new _Api.apply( this, arguments );
+               }
+       
+               var settings = [];
+               var ctxSettings = function ( o ) {
+                       var a = _toSettings( o );
+                       if ( a ) {
+                               settings.push.apply( settings, a );
+                       }
+               };
+       
+               if ( $.isArray( context ) ) {
+                       for ( var i=0, ien=context.length ; i<ien ; i++ ) {
+                               ctxSettings( context[i] );
+                       }
+               }
+               else {
+                       ctxSettings( context );
+               }
+       
+               // Remove duplicates
+               this.context = _unique( settings );
+       
+               // Initial data
+               if ( data ) {
+                       this.push.apply( this, data.toArray ? data.toArray() : data );
+               }
+       
+               // selector
+               this.selector = {
+                       rows: null,
+                       cols: null,
+                       opts: null
+               };
+       
+               _Api.extend( this, this, __apiStruct );
+       };
+       
+       
+       _Api.prototype = /** @lends DataTables.Api */{
+               /**
+                * Return a new Api instance, comprised of the data held in the current
+                * instance, join with the other array(s) and/or value(s).
+                *
+                * An alias for `Array.prototype.concat`.
+                *
+                * @type method
+                * @param {*} value1 Arrays and/or values to concatenate.
+                * @param {*} [...] Additional arrays and/or values to concatenate.
+                * @returns {DataTables.Api} New API instance, comprising of the combined
+                *   array.
+                */
+               concat:  __arrayProto.concat,
+       
+       
+               context: [], // array of table settings objects
+       
+       
+               each: function ( fn )
+               {
+                       if ( __arrayProto.forEach ) {
+                               // Where possible, use the built-in forEach
+                               __arrayProto.forEach.call( this, fn, this );
+                       }
+                       else {
+                               // Compatibility for browsers without EMCA-252-5 (JS 1.6)
+                               for ( var i=0, ien=this.length ; i<ien; i++ ) {
+                                       // In strict mode the execution scope is the passed value
+                                       fn.call( this, this[i], i, this );
+                               }
+                       }
+       
+                       return this;
+               },
+       
+       
+               eq: function ( idx )
+               {
+                       var ctx = this.context;
+       
+                       return ctx.length > idx ?
+                               new _Api( ctx[idx], this[idx] ) :
+                               null;
+               },
+       
+       
+               filter: function ( fn )
+               {
+                       var a = [];
+       
+                       if ( __arrayProto.filter ) {
+                               a = __arrayProto.filter.call( this, fn, this );
+                       }
+                       else {
+                               // Compatibility for browsers without EMCA-252-5 (JS 1.6)
+                               for ( var i=0, ien=this.length ; i<ien ; i++ ) {
+                                       if ( fn.call( this, this[i], i, this ) ) {
+                                               a.push( this[i] );
                                        }
-                                       else
+                               }
+                       }
+       
+                       return new _Api( this.context, a );
+               },
+       
+       
+               flatten: function ()
+               {
+                       var a = [];
+                       return new _Api( this.context, a.concat.apply( a, this.toArray() ) );
+               },
+       
+       
+               join:    __arrayProto.join,
+       
+       
+               indexOf: __arrayProto.indexOf || function (obj, start)
+               {
+                       for ( var i=(start || 0), ien=this.length ; i<ien ; i++ ) {
+                               if ( this[i] === obj ) {
+                                       return i;
+                               }
+                       }
+                       return -1;
+               },
+       
+               // Internal only at the moment - relax?
+               iterator: function ( flatten, type, fn ) {
+                       var
+                               a = [], ret,
+                               i, ien, j, jen,
+                               context = this.context,
+                               rows, items, item,
+                               selector = this.selector;
+       
+                       // Argument shifting
+                       if ( typeof flatten === 'string' ) {
+                               fn = type;
+                               type = flatten;
+                               flatten = false;
+                       }
+       
+                       for ( i=0, ien=context.length ; i<ien ; i++ ) {
+                               if ( type === 'table' ) {
+                                       ret = fn( context[i], i );
+       
+                                       if ( ret !== undefined ) {
+                                               a.push( ret );
+                                       }
+                               }
+                               else if ( type === 'columns' || type === 'rows' ) {
+                                       // this has same length as context - one entry for each table
+                                       ret = fn( context[i], this[i], i );
+       
+                                       if ( ret !== undefined ) {
+                                               a.push( ret );
+                                       }
+                               }
+                               else if ( type === 'column' || type === 'column-rows' || type === 'row' || type === 'cell' ) {
+                                       // columns and rows share the same structure.
+                                       // 'this' is an array of column indexes for each context
+                                       items = this[i];
+       
+                                       if ( type === 'column-rows' ) {
+                                               rows = _selector_row_indexes( context[i], selector.opts );
+                                       }
+       
+                                       for ( j=0, jen=items.length ; j<jen ; j++ ) {
+                                               item = items[j];
+       
+                                               if ( type === 'cell' ) {
+                                                       ret = fn( context[i], item.row, item.column, i, j );
+                                               }
+                                               else {
+                                                       ret = fn( context[i], item, i, j, rows );
+                                               }
+       
+                                               if ( ret !== undefined ) {
+                                                       a.push( ret );
+                                               }
+                                       }
+                               }
+                       }
+       
+                       if ( a.length ) {
+                               var api = new _Api( context, flatten ? a.concat.apply( [], a ) : a );
+                               var apiSelector = api.selector;
+                               apiSelector.rows = selector.rows;
+                               apiSelector.cols = selector.cols;
+                               apiSelector.opts = selector.opts;
+                               return api;
+                       }
+                       return this;
+               },
+       
+       
+               lastIndexOf: __arrayProto.lastIndexOf || function (obj, start)
+               {
+                       // Bit cheeky...
+                       return this.indexOf.apply( this.toArray.reverse(), arguments );
+               },
+       
+       
+               length:  0,
+       
+       
+               map: function ( fn )
+               {
+                       var a = [];
+       
+                       if ( __arrayProto.map ) {
+                               a = __arrayProto.map.call( this, fn, this );
+                       }
+                       else {
+                               // Compatibility for browsers without EMCA-252-5 (JS 1.6)
+                               for ( var i=0, ien=this.length ; i<ien ; i++ ) {
+                                       a.push( fn.call( this, this[i], i ) );
+                               }
+                       }
+       
+                       return new _Api( this.context, a );
+               },
+       
+       
+               pluck: function ( prop )
+               {
+                       return this.map( function ( el ) {
+                               return el[ prop ];
+                       } );
+               },
+       
+               pop:     __arrayProto.pop,
+       
+       
+               push:    __arrayProto.push,
+       
+       
+               // Does not return an API instance
+               reduce: __arrayProto.reduce || function ( fn, init )
+               {
+                       return _fnReduce( this, fn, init, 0, this.length, 1 );
+               },
+       
+       
+               reduceRight: __arrayProto.reduceRight || function ( fn, init )
+               {
+                       return _fnReduce( this, fn, init, this.length-1, -1, -1 );
+               },
+       
+       
+               reverse: __arrayProto.reverse,
+       
+       
+               // Object with rows, columns and opts
+               selector: null,
+       
+       
+               shift:   __arrayProto.shift,
+       
+       
+               sort:    __arrayProto.sort, // ? name - order?
+       
+       
+               splice:  __arrayProto.splice,
+       
+       
+               toArray: function ()
+               {
+                       return __arrayProto.slice.call( this );
+               },
+       
+       
+               to$: function ()
+               {
+                       return $( this );
+               },
+       
+       
+               toJQuery: function ()
+               {
+                       return $( this );
+               },
+       
+       
+               unique: function ()
+               {
+                       return new _Api( this.context, _unique(this) );
+               },
+       
+       
+               unshift: __arrayProto.unshift
+       };
+       
+       
+       _Api.extend = function ( scope, obj, ext )
+       {
+               // Only extend API instances and static properties of the API
+               if ( ! obj || ( ! (obj instanceof _Api) && ! obj.__dt_wrapper ) ) {
+                       return;
+               }
+       
+               var
+                       i, ien,
+                       j, jen,
+                       struct, inner,
+                       methodScoping = function ( fn, struc ) {
+                               return function () {
+                                       var ret = fn.apply( scope, arguments );
+       
+                                       // Method extension
+                                       _Api.extend( ret, ret, struc.methodExt );
+                                       return ret;
+                               };
+                       };
+       
+               for ( i=0, ien=ext.length ; i<ien ; i++ ) {
+                       struct = ext[i];
+       
+                       // Value
+                       obj[ struct.name ] = typeof struct.val === 'function' ?
+                               methodScoping( struct.val, struct ) :
+                               $.isPlainObject( struct.val ) ?
+                                       {} :
+                                       struct.val;
+       
+                       obj[ struct.name ].__dt_wrapper = true;
+       
+                       // Property extension
+                       _Api.extend( scope, obj[ struct.name ], struct.propExt );
+               }
+       };
+       
+       
+       // @todo - Is there need for an augment function?
+       // _Api.augment = function ( inst, name )
+       // {
+       //      // Find src object in the structure from the name
+       //      var parts = name.split('.');
+       
+       //      _Api.extend( inst, obj );
+       // };
+       
+       
+       //     [
+       //       {
+       //         name:      'data'                -- string   - Property name
+       //         val:       function () {},       -- function - Api method (or undefined if just an object
+       //         methodExt: [ ... ],              -- array    - Array of Api object definitions to extend the method result
+       //         propExt:   [ ... ]               -- array    - Array of Api object definitions to extend the property
+       //       },
+       //       {
+       //         name:     'row'
+       //         val:       {},
+       //         methodExt: [ ... ],
+       //         propExt:   [
+       //           {
+       //             name:      'data'
+       //             val:       function () {},
+       //             methodExt: [ ... ],
+       //             propExt:   [ ... ]
+       //           },
+       //           ...
+       //         ]
+       //       }
+       //     ]
+       
+       _Api.register = _api_register = function ( name, val )
+       {
+               if ( $.isArray( name ) ) {
+                       for ( var j=0, jen=name.length ; j<jen ; j++ ) {
+                               _Api.register( name[j], val );
+                       }
+                       return;
+               }
+       
+               var
+                       i, ien,
+                       heir = name.split('.'),
+                       struct = __apiStruct,
+                       key, method;
+       
+               var find = function ( src, name ) {
+                       for ( var i=0, ien=src.length ; i<ien ; i++ ) {
+                               if ( src[i].name === name ) {
+                                       return src[i];
+                               }
+                       }
+                       return null;
+               };
+       
+               for ( i=0, ien=heir.length ; i<ien ; i++ ) {
+                       method = heir[i].indexOf('()') !== -1;
+                       key = method ?
+                               heir[i].replace('()', '') :
+                               heir[i];
+       
+                       var src = find( struct, key );
+                       if ( ! src ) {
+                               src = {
+                                       name:      key,
+                                       val:       {},
+                                       methodExt: [],
+                                       propExt:   []
+                               };
+                               struct.push( src );
+                       }
+       
+                       if ( i === ien-1 ) {
+                               src.val = val;
+                       }
+                       else {
+                               struct = method ?
+                                       src.methodExt :
+                                       src.propExt;
+                       }
+               }
+       
+               // Rebuild the API with the new construct
+               if ( _Api.ready ) {
+                       DataTable.api.build();
+               }
+       };
+       
+       
+       _Api.registerPlural = _api_registerPlural = function ( pluralName, singularName, val ) {
+               _Api.register( pluralName, val );
+       
+               _Api.register( singularName, function () {
+                       var ret = val.apply( this, arguments );
+       
+                       if ( ret === this ) {
+                               // Returned item is the API instance that was passed in, return it
+                               return this;
+                       }
+                       else if ( ret instanceof _Api ) {
+                               // New API instance returned, want the value from the first item
+                               // in the returned array for the singular result.
+                               return ret.length ?
+                                       $.isArray( ret[0] ) ?
+                                               new _Api( ret.context, ret[0] ) : // Array results are 'enhanced'
+                                               ret[0] :
+                                       undefined;
+                       }
+       
+                       // Non-API return - just fire it back
+                       return ret;
+               } );
+       };
+       
+       
+       /**
+        * Selector for HTML tables. Apply the given selector to the give array of
+        * DataTables settings objects.
+        *
+        * @param {string|integer} [selector] jQuery selector string or integer
+        * @param  {array} Array of DataTables settings objects to be filtered
+        * @return {array}
+        * @ignore
+        */
+       var __table_selector = function ( selector, a )
+       {
+               // Integer is used to pick out a table by index
+               if ( typeof selector === 'number' ) {
+                       return [ a[ selector ] ];
+               }
+       
+               // Perform a jQuery selector on the table nodes
+               var nodes = $.map( a, function (el, i) {
+                       return el.nTable;
+               } );
+       
+               return $(nodes)
+                       .filter( selector )
+                       .map( function (i) {
+                               // Need to translate back from the table node to the settings
+                               var idx = $.inArray( this, nodes );
+                               return a[ idx ];
+                       } )
+                       .toArray();
+       };
+       
+       
+       
+       /**
+        * Context selector for the API's context (i.e. the tables the API instance
+        * refers to.
+        *
+        * @name    DataTable.Api#tables
+        * @param {string|integer} [selector] Selector to pick which tables the iterator
+        *   should operate on. If not given, all tables in the current context are
+        *   used. This can be given as a jQuery selector (for example `':gt(0)'`) to
+        *   select multiple tables or as an integer to select a single table.
+        * @returns {DataTable.Api} Returns a new API instance if a selector is given.
+        */
+       _api_register( 'tables()', function ( selector ) {
+               // A new instance is created if there was a selector specified
+               return selector ?
+                       new _Api( __table_selector( selector, this.context ) ) :
+                       this;
+       } );
+       
+       
+       _api_register( 'table()', function ( selector ) {
+               var tables = this.tables( selector );
+               var ctx = tables.context;
+       
+               // Truncate to the first matched table
+               return ctx.length ?
+                       new _Api( ctx[0] ) :
+                       tables;
+       } );
+       
+       
+       _api_registerPlural( 'tables().nodes()', 'table().node()' , function () {
+               return this.iterator( 'table', function ( ctx ) {
+                       return ctx.nTable;
+               } );
+       } );
+       
+       
+       _api_registerPlural( 'tables().body()', 'table().body()' , function () {
+               return this.iterator( 'table', function ( ctx ) {
+                       return ctx.nTBody;
+               } );
+       } );
+       
+       
+       _api_registerPlural( 'tables().header()', 'table().header()' , function () {
+               return this.iterator( 'table', function ( ctx ) {
+                       return ctx.nTHead;
+               } );
+       } );
+       
+       
+       _api_registerPlural( 'tables().footer()', 'table().footer()' , function () {
+               return this.iterator( 'table', function ( ctx ) {
+                       return ctx.nTFoot;
+               } );
+       } );
+       
+       
+       
+       /**
+        * Redraw the tables in the current context.
+        *
+        * @param {boolean} [reset=true] Reset (default) or hold the current paging
+        *   position. A full re-sort and re-filter is performed when this method is
+        *   called, which is why the pagination reset is the default action.
+        * @returns {DataTables.Api} this
+        */
+       _api_register( 'draw()', function ( resetPaging ) {
+               return this.iterator( 'table', function ( settings ) {
+                       _fnReDraw( settings, resetPaging===false );
+               } );
+       } );
+       
+       
+       
+       /**
+        * Get the current page index.
+        *
+        * @return {integer} Current page index (zero based)
+        *//**
+        * Set the current page.
+        *
+        * Note that if you attempt to show a page which does not exist, DataTables will
+        * not throw an error, but rather reset the paging.
+        *
+        * @param {integer|string} action The paging action to take. This can be one of:
+        *  * `integer` - The page index to jump to
+        *  * `string` - An action to take:
+        *    * `first` - Jump to first page.
+        *    * `next` - Jump to the next page
+        *    * `previous` - Jump to previous page
+        *    * `last` - Jump to the last page.
+        * @returns {DataTables.Api} this
+        */
+       _api_register( 'page()', function ( action ) {
+               if ( action === undefined ) {
+                       return this.page.info().page; // not an expensive call
+               }
+       
+               // else, have an action to take on all tables
+               return this.iterator( 'table', function ( settings ) {
+                       _fnPageChange( settings, action );
+               } );
+       } );
+       
+       
+       /**
+        * Paging information for the first table in the current context.
+        *
+        * If you require paging information for another table, use the `table()` method
+        * with a suitable selector.
+        *
+        * @return {object} Object with the following properties set:
+        *  * `page` - Current page index (zero based - i.e. the first page is `0`)
+        *  * `pages` - Total number of pages
+        *  * `start` - Display index for the first record shown on the current page
+        *  * `end` - Display index for the last record shown on the current page
+        *  * `length` - Display length (number of records). Note that generally `start
+        *    + length = end`, but this is not always true, for example if there are
+        *    only 2 records to show on the final page, with a length of 10.
+        *  * `recordsTotal` - Full data set length
+        *  * `recordsDisplay` - Data set length once the current filtering criterion
+        *    are applied.
+        */
+       _api_register( 'page.info()', function ( action ) {
+               if ( this.context.length === 0 ) {
+                       return undefined;
+               }
+       
+               var
+                       settings   = this.context[0],
+                       start      = settings._iDisplayStart,
+                       len        = settings._iDisplayLength,
+                       visRecords = settings.fnRecordsDisplay(),
+                       all        = len === -1;
+       
+               return {
+                       "page":           all ? 0 : Math.floor( start / len ),
+                       "pages":          all ? 1 : Math.ceil( visRecords / len ),
+                       "start":          start,
+                       "end":            settings.fnDisplayEnd(),
+                       "length":         len,
+                       "recordsTotal":   settings.fnRecordsTotal(),
+                       "recordsDisplay": visRecords
+               };
+       } );
+       
+       
+       /**
+        * Get the current page length.
+        *
+        * @return {integer} Current page length. Note `-1` indicates that all records
+        *   are to be shown.
+        *//**
+        * Set the current page length.
+        *
+        * @param {integer} Page length to set. Use `-1` to show all records.
+        * @returns {DataTables.Api} this
+        */
+       _api_register( 'page.len()', function ( len ) {
+               // Note that we can't call this function 'length()' because `length`
+               // is a Javascript property of functions which defines how many arguments
+               // the function expects.
+               if ( len === undefined ) {
+                       return this.context.length !== 0 ?
+                               this.context[0]._iDisplayLength :
+                               undefined;
+               }
+       
+               // else, set the page length
+               return this.iterator( 'table', function ( settings ) {
+                       _fnLengthChange( settings, len );
+               } );
+       } );
+       
+       
+       
+       var __reload = function ( settings, holdPosition, callback ) {
+               if ( _fnDataSource( settings ) == 'ssp' ) {
+                       _fnReDraw( settings, holdPosition );
+               }
+               else {
+                       // Trigger xhr
+                       _fnProcessingDisplay( settings, true );
+       
+                       _fnBuildAjax( settings, [], function( json ) {
+                               _fnClearTable( settings );
+       
+                               var data = _fnAjaxDataSrc( settings, json );
+                               for ( var i=0, ien=data.length ; i<ien ; i++ ) {
+                                       _fnAddData( settings, data[i] );
+                               }
+       
+                               _fnReDraw( settings, holdPosition );
+                               _fnProcessingDisplay( settings, false );
+                       } );
+               }
+       
+               // Use the draw event to trigger a callback, regardless of if it is an async
+               // or sync draw
+               if ( callback ) {
+                       var api = new _Api( settings );
+       
+                       api.one( 'draw', function () {
+                               callback( api.ajax.json() );
+                       } );
+               }
+       };
+       
+       
+       /**
+        * Get the JSON response from the last Ajax request that DataTables made to the
+        * server. Note that this returns the JSON from the first table in the current
+        * context.
+        *
+        * @return {object} JSON received from the server.
+        */
+       _api_register( 'ajax.json()', function () {
+               var ctx = this.context;
+       
+               if ( ctx.length > 0 ) {
+                       return ctx[0].json;
+               }
+       
+               // else return undefined;
+       } );
+       
+       
+       /**
+        * Get the data submitted in the last Ajax request
+        */
+       _api_register( 'ajax.params()', function () {
+               var ctx = this.context;
+       
+               if ( ctx.length > 0 ) {
+                       return ctx[0].oAjaxData;
+               }
+       
+               // else return undefined;
+       } );
+       
+       
+       /**
+        * Reload tables from the Ajax data source. Note that this function will
+        * automatically re-draw the table when the remote data has been loaded.
+        *
+        * @param {boolean} [reset=true] Reset (default) or hold the current paging
+        *   position. A full re-sort and re-filter is performed when this method is
+        *   called, which is why the pagination reset is the default action.
+        * @returns {DataTables.Api} this
+        */
+       _api_register( 'ajax.reload()', function ( callback, resetPaging ) {
+               return this.iterator( 'table', function (settings) {
+                       __reload( settings, resetPaging===false, callback );
+               } );
+       } );
+       
+       
+       /**
+        * Get the current Ajax URL. Note that this returns the URL from the first
+        * table in the current context.
+        *
+        * @return {string} Current Ajax source URL
+        *//**
+        * Set the Ajax URL. Note that this will set the URL for all tables in the
+        * current context.
+        *
+        * @param {string} url URL to set.
+        * @returns {DataTables.Api} this
+        */
+       _api_register( 'ajax.url()', function ( url ) {
+               var ctx = this.context;
+       
+               if ( url === undefined ) {
+                       // get
+                       if ( ctx.length === 0 ) {
+                               return undefined;
+                       }
+                       ctx = ctx[0];
+       
+                       return ctx.ajax ?
+                               $.isPlainObject( ctx.ajax ) ?
+                                       ctx.ajax.url :
+                                       ctx.ajax :
+                               ctx.sAjaxSource;
+               }
+       
+               // set
+               return this.iterator( 'table', function ( settings ) {
+                       if ( $.isPlainObject( settings.ajax ) ) {
+                               settings.ajax.url = url;
+                       }
+                       else {
+                               settings.ajax = url;
+                       }
+                       // No need to consider sAjaxSource here since DataTables gives priority
+                       // to `ajax` over `sAjaxSource`. So setting `ajax` here, renders any
+                       // value of `sAjaxSource` redundant.
+               } );
+       } );
+       
+       
+       /**
+        * Load data from the newly set Ajax URL. Note that this method is only
+        * available when `ajax.url()` is used to set a URL. Additionally, this method
+        * has the same effect as calling `ajax.reload()` but is provided for
+        * convenience when setting a new URL. Like `ajax.reload()` it will
+        * automatically redraw the table once the remote data has been loaded.
+        *
+        * @returns {DataTables.Api} this
+        */
+       _api_register( 'ajax.url().load()', function ( callback, resetPaging ) {
+               // Same as a reload, but makes sense to present it for easy access after a
+               // url change
+               return this.iterator( 'table', function ( ctx ) {
+                       __reload( ctx, resetPaging===false, callback );
+               } );
+       } );
+       
+       
+       
+       
+       var _selector_run = function ( selector, select )
+       {
+               var
+                       out = [], res,
+                       a, i, ien, j, jen;
+       
+               // Can't just check for isArray here, as an API or jQuery instance might be
+               // given with their array like look
+               if ( ! selector || typeof selector === 'string' || selector.length === undefined ) {
+                       selector = [ selector ];
+               }
+       
+               for ( i=0, ien=selector.length ; i<ien ; i++ ) {
+                       a = selector[i] && selector[i].split ?
+                               selector[i].split(',') :
+                               [ selector[i] ];
+       
+                       for ( j=0, jen=a.length ; j<jen ; j++ ) {
+                               res = select( typeof a[j] === 'string' ? $.trim(a[j]) : a[j] );
+       
+                               if ( res && res.length ) {
+                                       out.push.apply( out, res );
+                               }
+                       }
+               }
+       
+               return out;
+       };
+       
+       
+       var _selector_opts = function ( opts )
+       {
+               if ( ! opts ) {
+                       opts = {};
+               }
+       
+               // Backwards compatibility for 1.9- which used the terminology filter rather
+               // than search
+               if ( opts.filter && ! opts.search ) {
+                       opts.search = opts.filter;
+               }
+       
+               return {
+                       search: opts.search || 'none',
+                       order:  opts.order  || 'current',
+                       page:   opts.page   || 'all'
+               };
+       };
+       
+       
+       var _selector_first = function ( inst )
+       {
+               // Reduce the API instance to the first item found
+               for ( var i=0, ien=inst.length ; i<ien ; i++ ) {
+                       if ( inst[i].length > 0 ) {
+                               // Assign the first element to the first item in the instance
+                               // and truncate the instance and context
+                               inst[0] = inst[i];
+                               inst.length = 1;
+                               inst.context = [ inst.context[i] ];
+       
+                               return inst;
+                       }
+               }
+       
+               // Not found - return an empty instance
+               inst.length = 0;
+               return inst;
+       };
+       
+       
+       var _selector_row_indexes = function ( settings, opts )
+       {
+               var
+                       i, ien, tmp, a=[],
+                       displayFiltered = settings.aiDisplay,
+                       displayMaster = settings.aiDisplayMaster;
+       
+               var
+                       search = opts.search,  // none, applied, removed
+                       order  = opts.order,   // applied, current, index (original - compatibility with 1.9)
+                       page   = opts.page;    // all, current
+       
+               if ( _fnDataSource( settings ) == 'ssp' ) {
+                       // In server-side processing mode, most options are irrelevant since
+                       // rows not shown don't exist and the index order is the applied order
+                       // Removed is a special case - for consistency just return an empty
+                       // array
+                       return search === 'removed' ?
+                               [] :
+                               _range( 0, displayMaster.length );
+               }
+               else if ( page == 'current' ) {
+                       // Current page implies that order=current and fitler=applied, since it is
+                       // fairly senseless otherwise, regardless of what order and search actually
+                       // are
+                       for ( i=settings._iDisplayStart, ien=settings.fnDisplayEnd() ; i<ien ; i++ ) {
+                               a.push( displayFiltered[i] );
+                       }
+               }
+               else if ( order == 'current' || order == 'applied' ) {
+                       a = search == 'none' ?
+                               displayMaster.slice() :                      // no search
+                               search == 'applied' ?
+                                       displayFiltered.slice() :                // applied search
+                                       $.map( displayMaster, function (el, i) { // removed search
+                                               return $.inArray( el, displayFiltered ) === -1 ? el : null;
+                                       } );
+               }
+               else if ( order == 'index' || order == 'original' ) {
+                       for ( i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
+                               if ( search == 'none' ) {
+                                       a.push( i );
+                               }
+                               else { // applied | removed
+                                       tmp = $.inArray( i, displayFiltered );
+       
+                                       if ((tmp === -1 && search == 'removed') ||
+                                               (tmp === 1  && search == 'applied') )
                                        {
-                                               _fnLog( DataTable.settings[i], 0, "Cannot reinitialise DataTable.\n\n"+
-                                                       "To retrieve the DataTables object for this table, pass no arguments or see "+
-                                                       "the docs for bRetrieve and bDestroy" );
-                                               return;
+                                               a.push( i );
                                        }
                                }
-                               
-                               /* If the element we are initialising has the same ID as a table which was previously
-                                * initialised, but the table nodes don't match (from before) then we destroy the old
-                                * instance by simply deleting it. This is under the assumption that the table has been
-                                * destroyed by other methods. Anyone using non-id selectors will need to do this manually
-                                */
-                               if ( DataTable.settings[i].sTableId == this.id )
-                               {
-                                       DataTable.settings.splice( i, 1 );
-                                       break;
-                               }
-                       }
-                       
-                       /* Ensure the table has an ID - required for accessibility */
-                       if ( sId === null || sId === "" )
-                       {
-                               sId = "DataTables_Table_"+(DataTable.ext._oExternConfig.iNextUnique++);
-                               this.id = sId;
                        }
-                       
-                       /* Create the settings object for this table and set some of the default parameters */
-                       var oSettings = $.extend( true, {}, DataTable.models.oSettings, {
-                               "nTable":        this,
-                               "oApi":          _that.oApi,
-                               "oInit":         oInit,
-                               "sDestroyWidth": $(this).width(),
-                               "sInstance":     sId,
-                               "sTableId":      sId
-                       } );
-                       DataTable.settings.push( oSettings );
-                       
-                       // Need to add the instance after the instance after the settings object has been added
-                       // to the settings array, so we can self reference the table instance if more than one
-                       oSettings.oInstance = (_that.length===1) ? _that : $(this).dataTable();
-                       
-                       /* Setting up the initialisation object */
-                       if ( !oInit )
-                       {
-                               oInit = {};
+               }
+       
+               return a;
+       };
+       
+       
+       /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+        * Rows
+        *
+        * {}          - no selector - use all available rows
+        * {integer}   - row aoData index
+        * {node}      - TR node
+        * {string}    - jQuery selector to apply to the TR elements
+        * {array}     - jQuery array of nodes, or simply an array of TR nodes
+        *
+        */
+       
+       
+       var __row_selector = function ( settings, selector, opts )
+       {
+               return _selector_run( selector, function ( sel ) {
+                       var selInt = _intVal( sel );
+       
+                       // Short cut - selector is a number and no options provided (default is
+                       // all records, so no need to check if the index is in there, since it
+                       // must be - dev error if the index doesn't exist).
+                       if ( selInt !== null && ! opts ) {
+                               return [ selInt ];
                        }
-                       
-                       // Backwards compatibility, before we apply all the defaults
-                       if ( oInit.oLanguage )
-                       {
-                               _fnLanguageCompat( oInit.oLanguage );
+       
+                       var rows = _selector_row_indexes( settings, opts );
+       
+                       if ( selInt !== null && $.inArray( selInt, rows ) !== -1 ) {
+                               // Selector - integer
+                               return [ selInt ];
                        }
-                       
-                       oInit = _fnExtend( $.extend(true, {}, DataTable.defaults), oInit );
-                       
-                       // Map the initialisation options onto the settings object
-                       _fnMap( oSettings.oFeatures, oInit, "bPaginate" );
-                       _fnMap( oSettings.oFeatures, oInit, "bLengthChange" );
-                       _fnMap( oSettings.oFeatures, oInit, "bFilter" );
-                       _fnMap( oSettings.oFeatures, oInit, "bSort" );
-                       _fnMap( oSettings.oFeatures, oInit, "bInfo" );
-                       _fnMap( oSettings.oFeatures, oInit, "bProcessing" );
-                       _fnMap( oSettings.oFeatures, oInit, "bAutoWidth" );
-                       _fnMap( oSettings.oFeatures, oInit, "bSortClasses" );
-                       _fnMap( oSettings.oFeatures, oInit, "bServerSide" );
-                       _fnMap( oSettings.oFeatures, oInit, "bDeferRender" );
-                       _fnMap( oSettings.oScroll, oInit, "sScrollX", "sX" );
-                       _fnMap( oSettings.oScroll, oInit, "sScrollXInner", "sXInner" );
-                       _fnMap( oSettings.oScroll, oInit, "sScrollY", "sY" );
-                       _fnMap( oSettings.oScroll, oInit, "bScrollCollapse", "bCollapse" );
-                       _fnMap( oSettings.oScroll, oInit, "bScrollInfinite", "bInfinite" );
-                       _fnMap( oSettings.oScroll, oInit, "iScrollLoadGap", "iLoadGap" );
-                       _fnMap( oSettings.oScroll, oInit, "bScrollAutoCss", "bAutoCss" );
-                       _fnMap( oSettings, oInit, "asStripeClasses" );
-                       _fnMap( oSettings, oInit, "asStripClasses", "asStripeClasses" ); // legacy
-                       _fnMap( oSettings, oInit, "fnServerData" );
-                       _fnMap( oSettings, oInit, "fnFormatNumber" );
-                       _fnMap( oSettings, oInit, "sServerMethod" );
-                       _fnMap( oSettings, oInit, "aaSorting" );
-                       _fnMap( oSettings, oInit, "aaSortingFixed" );
-                       _fnMap( oSettings, oInit, "aLengthMenu" );
-                       _fnMap( oSettings, oInit, "sPaginationType" );
-                       _fnMap( oSettings, oInit, "sAjaxSource" );
-                       _fnMap( oSettings, oInit, "sAjaxDataProp" );
-                       _fnMap( oSettings, oInit, "iCookieDuration" );
-                       _fnMap( oSettings, oInit, "sCookiePrefix" );
-                       _fnMap( oSettings, oInit, "sDom" );
-                       _fnMap( oSettings, oInit, "bSortCellsTop" );
-                       _fnMap( oSettings, oInit, "iTabIndex" );
-                       _fnMap( oSettings, oInit, "oSearch", "oPreviousSearch" );
-                       _fnMap( oSettings, oInit, "aoSearchCols", "aoPreSearchCols" );
-                       _fnMap( oSettings, oInit, "iDisplayLength", "_iDisplayLength" );
-                       _fnMap( oSettings, oInit, "bJQueryUI", "bJUI" );
-                       _fnMap( oSettings, oInit, "fnCookieCallback" );
-                       _fnMap( oSettings, oInit, "fnStateLoad" );
-                       _fnMap( oSettings, oInit, "fnStateSave" );
-                       _fnMap( oSettings.oLanguage, oInit, "fnInfoCallback" );
-                       
-                       /* Callback functions which are array driven */
-                       _fnCallbackReg( oSettings, 'aoDrawCallback',       oInit.fnDrawCallback,      'user' );
-                       _fnCallbackReg( oSettings, 'aoServerParams',       oInit.fnServerParams,      'user' );
-                       _fnCallbackReg( oSettings, 'aoStateSaveParams',    oInit.fnStateSaveParams,   'user' );
-                       _fnCallbackReg( oSettings, 'aoStateLoadParams',    oInit.fnStateLoadParams,   'user' );
-                       _fnCallbackReg( oSettings, 'aoStateLoaded',        oInit.fnStateLoaded,       'user' );
-                       _fnCallbackReg( oSettings, 'aoRowCallback',        oInit.fnRowCallback,       'user' );
-                       _fnCallbackReg( oSettings, 'aoRowCreatedCallback', oInit.fnCreatedRow,        'user' );
-                       _fnCallbackReg( oSettings, 'aoHeaderCallback',     oInit.fnHeaderCallback,    'user' );
-                       _fnCallbackReg( oSettings, 'aoFooterCallback',     oInit.fnFooterCallback,    'user' );
-                       _fnCallbackReg( oSettings, 'aoInitComplete',       oInit.fnInitComplete,      'user' );
-                       _fnCallbackReg( oSettings, 'aoPreDrawCallback',    oInit.fnPreDrawCallback,   'user' );
-                       
-                       if ( oSettings.oFeatures.bServerSide && oSettings.oFeatures.bSort &&
-                                  oSettings.oFeatures.bSortClasses )
-                       {
-                               /* Enable sort classes for server-side processing. Safe to do it here, since server-side
-                                * processing must be enabled by the developer
-                                */
-                               _fnCallbackReg( oSettings, 'aoDrawCallback', _fnSortingClasses, 'server_side_sort_classes' );
+                       else if ( ! sel ) {
+                               // Selector - none
+                               return rows;
                        }
-                       else if ( oSettings.oFeatures.bDeferRender )
-                       {
-                               _fnCallbackReg( oSettings, 'aoDrawCallback', _fnSortingClasses, 'defer_sort_classes' );
+       
+                       // Get nodes in the order from the `rows` array (can't use `pluck`) @todo - use pluck_order
+                       var nodes = [];
+                       for ( var i=0, ien=rows.length ; i<ien ; i++ ) {
+                               nodes.push( settings.aoData[ rows[i] ].nTr );
                        }
-                       
-                       if ( oInit.bJQueryUI )
-                       {
-                               /* Use the JUI classes object for display. You could clone the oStdClasses object if 
-                                * you want to have multiple tables with multiple independent classes 
-                                */
-                               $.extend( oSettings.oClasses, DataTable.ext.oJUIClasses );
-                               
-                               if ( oInit.sDom === DataTable.defaults.sDom && DataTable.defaults.sDom === "lfrtip" )
-                               {
-                                       /* Set the DOM to use a layout suitable for jQuery UI's theming */
-                                       oSettings.sDom = '<"H"lfr>t<"F"ip>';
+       
+                       if ( sel.nodeName ) {
+                               // Selector - node
+                               if ( $.inArray( sel, nodes ) !== -1 ) {
+                                       return [ sel._DT_RowIndex ];// sel is a TR node that is in the table
+                                                                                       // and DataTables adds a prop for fast lookup
                                }
                        }
-                       else
-                       {
-                               $.extend( oSettings.oClasses, DataTable.ext.oStdClasses );
+       
+                       // Selector - jQuery selector string, array of nodes or jQuery object/
+                       // As jQuery's .filter() allows jQuery objects to be passed in filter,
+                       // it also allows arrays, so this will cope with all three options
+                       return $(nodes)
+                               .filter( sel )
+                               .map( function () {
+                                       return this._DT_RowIndex;
+                               } )
+                               .toArray();
+               } );
+       };
+       
+       
+       /**
+        *
+        */
+       _api_register( 'rows()', function ( selector, opts ) {
+               // argument shifting
+               if ( selector === undefined ) {
+                       selector = '';
+               }
+               else if ( $.isPlainObject( selector ) ) {
+                       opts = selector;
+                       selector = '';
+               }
+       
+               opts = _selector_opts( opts );
+       
+               var inst = this.iterator( 'table', function ( settings ) {
+                       return __row_selector( settings, selector, opts );
+               } );
+       
+               // Want argument shifting here and in __row_selector?
+               inst.selector.rows = selector;
+               inst.selector.opts = opts;
+       
+               return inst;
+       } );
+       
+       
+       _api_register( 'rows().nodes()', function () {
+               return this.iterator( 'row', function ( settings, row ) {
+                       return settings.aoData[ row ].nTr || undefined;
+               } );
+       } );
+       
+       _api_register( 'rows().data()', function () {
+               return this.iterator( true, 'rows', function ( settings, rows ) {
+                       return _pluck_order( settings.aoData, rows, '_aData' );
+               } );
+       } );
+       
+       _api_registerPlural( 'rows().cache()', 'row().cache()', function ( type ) {
+               return this.iterator( 'row', function ( settings, row ) {
+                       var r = settings.aoData[ row ];
+                       return type === 'search' ? r._aFilterData : r._aSortData;
+               } );
+       } );
+       
+       _api_registerPlural( 'rows().invalidate()', 'row().invalidate()', function ( src ) {
+               return this.iterator( 'row', function ( settings, row ) {
+                       _fnInvalidateRow( settings, row, src );
+               } );
+       } );
+       
+       _api_registerPlural( 'rows().indexes()', 'row().index()', function () {
+               return this.iterator( 'row', function ( settings, row ) {
+                       return row;
+               } );
+       } );
+       
+       _api_registerPlural( 'rows().remove()', 'row().remove()', function () {
+               var that = this;
+       
+               return this.iterator( 'row', function ( settings, row, thatIdx ) {
+                       var data = settings.aoData;
+       
+                       data.splice( row, 1 );
+       
+                       // Update the _DT_RowIndex parameter on all rows in the table
+                       for ( var i=0, ien=data.length ; i<ien ; i++ ) {
+                               if ( data[i].nTr !== null ) {
+                                       data[i].nTr._DT_RowIndex = i;
+                               }
                        }
-                       $(this).addClass( oSettings.oClasses.sTable );
-                       
-                       /* Calculate the scroll bar width and cache it for use later on */
-                       if ( oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "" )
-                       {
-                               oSettings.oScroll.iBarWidth = _fnScrollBarWidth();
+       
+                       // Remove the target row from the search array
+                       var displayIndex = $.inArray( row, settings.aiDisplay );
+       
+                       // Delete from the display arrays
+                       _fnDeleteIndex( settings.aiDisplayMaster, row );
+                       _fnDeleteIndex( settings.aiDisplay, row );
+                       _fnDeleteIndex( that[ thatIdx ], row, false ); // maintain local indexes
+       
+                       // Check for an 'overflow' they case for displaying the table
+                       _fnLengthOverflow( settings );
+               } );
+       } );
+       
+       
+       _api_register( 'rows.add()', function ( rows ) {
+               var newRows = this.iterator( 'table', function ( settings ) {
+                               var row, i, ien;
+                               var out = [];
+       
+                               for ( i=0, ien=rows.length ; i<ien ; i++ ) {
+                                       row = rows[i];
+       
+                                       if ( row.nodeName && row.nodeName.toUpperCase() === 'TR' ) {
+                                               out.push( _fnAddTr( settings, row )[0] );
+                                       }
+                                       else {
+                                               out.push( _fnAddData( settings, row ) );
+                                       }
+                               }
+       
+                               return out;
+                       } );
+       
+               // Return an Api.rows() extended instance, so rows().nodes() etc can be used
+               var modRows = this.rows( -1 );
+               modRows.pop();
+               modRows.push.apply( modRows, newRows.toArray() );
+       
+               return modRows;
+       } );
+       
+       
+       
+       
+       
+       /**
+        *
+        */
+       _api_register( 'row()', function ( selector, opts ) {
+               return _selector_first( this.rows( selector, opts ) );
+       } );
+       
+       
+       _api_register( 'row().data()', function ( data ) {
+               var ctx = this.context;
+       
+               if ( data === undefined ) {
+                       // Get
+                       return ctx.length && this.length ?
+                               ctx[0].aoData[ this[0] ]._aData :
+                               undefined;
+               }
+       
+               // Set
+               ctx[0].aoData[ this[0] ]._aData = data;
+       
+               // Automatically invalidate
+               _fnInvalidateRow( ctx[0], this[0], 'data' );
+       
+               return this;
+       } );
+       
+       
+       _api_register( 'row().node()', function () {
+               var ctx = this.context;
+       
+               return ctx.length && this.length ?
+                       ctx[0].aoData[ this[0] ].nTr || null :
+                       null;
+       } );
+       
+       
+       _api_register( 'row.add()', function ( row ) {
+               // Allow a jQuery object to be passed in - only a single row is added from
+               // it though - the first element in the set
+               if ( row instanceof $ && row.length ) {
+                       row = row[0];
+               }
+       
+               var rows = this.iterator( 'table', function ( settings ) {
+                       if ( row.nodeName && row.nodeName.toUpperCase() === 'TR' ) {
+                               return _fnAddTr( settings, row )[0];
                        }
-                       
-                       if ( oSettings.iInitDisplayStart === undefined )
-                       {
-                               /* Display start point, taking into account the save saving */
-                               oSettings.iInitDisplayStart = oInit.iDisplayStart;
-                               oSettings._iDisplayStart = oInit.iDisplayStart;
+                       return _fnAddData( settings, row );
+               } );
+       
+               // Return an Api.rows() extended instance, with the newly added row selected
+               return this.row( rows[0] );
+       } );
+       
+       
+       
+       var __details_add = function ( ctx, row, data, klass )
+       {
+               // Convert to array of TR elements
+               var rows = [];
+               var addRow = function ( r, k ) {
+                       // If we get a TR element, then just add it directly - up to the dev
+                       // to add the correct number of columns etc
+                       if ( r.nodeName && r.nodeName.toLowerCase() === 'tr' ) {
+                               rows.push( r );
                        }
-                       
-                       /* Must be done after everything which can be overridden by a cookie! */
-                       if ( oInit.bStateSave )
-                       {
-                               oSettings.oFeatures.bStateSave = true;
-                               _fnLoadState( oSettings, oInit );
-                               _fnCallbackReg( oSettings, 'aoDrawCallback', _fnSaveState, 'state_save' );
+                       else {
+                               // Otherwise create a row with a wrapper
+                               var created = $('<tr><td/></tr>');
+                               $('td', created)
+                                       .addClass( k )
+                                       .html( r )
+                                       [0].colSpan = _fnVisbleColumns( ctx );
+       
+                               rows.push( created[0] );
                        }
-                       
-                       if ( oInit.iDeferLoading !== null )
-                       {
-                               oSettings.bDeferLoading = true;
-                               var tmp = $.isArray( oInit.iDeferLoading );
-                               oSettings._iRecordsDisplay = tmp ? oInit.iDeferLoading[0] : oInit.iDeferLoading;
-                               oSettings._iRecordsTotal = tmp ? oInit.iDeferLoading[1] : oInit.iDeferLoading;
+               };
+       
+               if ( $.isArray( data ) || data instanceof $ ) {
+                       for ( var i=0, ien=data.length ; i<ien ; i++ ) {
+                               addRow( data[i], klass );
                        }
-                       
-                       if ( oInit.aaData !== null )
-                       {
-                               bUsePassedData = true;
+               }
+               else {
+                       addRow( data, klass );
+               }
+       
+               if ( row._details ) {
+                       row._details.remove();
+               }
+       
+               row._details = $(rows);
+       
+               // If the children were already shown, that state should be retained
+               if ( row._detailsShow ) {
+                       row._details.insertAfter( row.nTr );
+               }
+       };
+       
+       
+       var __details_display = function ( show ) {
+               var ctx = this.context;
+       
+               if ( ctx.length && this.length ) {
+                       var row = ctx[0].aoData[ this[0] ];
+       
+                       if ( row._details ) {
+                               row._detailsShow = show;
+                               if ( show ) {
+                                       row._details.insertAfter( row.nTr );
+                               }
+                               else {
+                                       row._details.remove();
+                               }
+       
+                               __details_events( ctx[0] );
                        }
-                       
-                       /* Language definitions */
-                       if ( oInit.oLanguage.sUrl !== "" )
-                       {
-                               /* Get the language definitions from a file - because this Ajax call makes the language
-                                * get async to the remainder of this function we use bInitHandedOff to indicate that 
-                                * _fnInitialise will be fired by the returned Ajax handler, rather than the constructor
-                                */
-                               oSettings.oLanguage.sUrl = oInit.oLanguage.sUrl;
-                               $.getJSON( oSettings.oLanguage.sUrl, null, function( json ) {
-                                       _fnLanguageCompat( json );
-                                       $.extend( true, oSettings.oLanguage, oInit.oLanguage, json );
-                                       _fnInitialise( oSettings );
+               }
+       
+               return this;
+       };
+       
+       
+       var __details_events = function ( settings )
+       {
+               var api = new _Api( settings );
+               var namespace = '.dt.DT_details';
+               var drawEvent = 'draw'+namespace;
+               var colvisEvent = 'column-visibility'+namespace;
+       
+               api.off( drawEvent +' '+ colvisEvent );
+       
+               if ( _pluck( settings.aoData, '_details' ).length > 0 ) {
+                       // On each draw, insert the required elements into the document
+                       api.on( drawEvent, function () {
+                               api.rows( {page:'current'} ).eq(0).each( function (idx) {
+                                       // Internal data grab
+                                       var row = settings.aoData[ idx ];
+       
+                                       if ( row._detailsShow ) {
+                                               row._details.insertAfter( row.nTr );
+                                       }
                                } );
-                               bInitHandedOff = true;
-                       }
-                       else
-                       {
-                               $.extend( true, oSettings.oLanguage, oInit.oLanguage );
-                       }
-                       
-                       
-                       /*
-                        * Stripes
-                        */
-                       if ( oInit.asStripeClasses === null )
-                       {
-                               oSettings.asStripeClasses =[
-                                       oSettings.oClasses.sStripeOdd,
-                                       oSettings.oClasses.sStripeEven
+                       } );
+       
+                       // Column visibility change - update the colspan
+                       api.on( colvisEvent, function ( e, settings, idx, vis ) {
+                               // Update the colspan for the details rows (note, only if it already has
+                               // a colspan)
+                               var row, visible = _fnVisbleColumns( settings );
+       
+                               for ( var i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
+                                       row = settings.aoData[i];
+       
+                                       if ( row._details ) {
+                                               row._details.children('td[colspan]').attr('colspan', visible );
+                                       }
+                               }
+                       } );
+               }
+       };
+       
+       // data can be:
+       //  tr
+       //  string
+       //  jQuery or array of any of the above
+       _api_register( 'row().child()', function ( data, klass ) {
+               var ctx = this.context;
+       
+               if ( data === undefined ) {
+                       // get
+                       return ctx.length && this.length ?
+                               ctx[0].aoData[ this[0] ]._details :
+                               undefined;
+               }
+               else if ( ctx.length && this.length ) {
+                       // set
+                       __details_add( ctx[0], ctx[0].aoData[ this[0] ], data, klass );
+               }
+       
+               return this;
+       } );
+       
+       _api_register( [
+               'row().child.show()',
+               'row().child().show()'
+       ], function () {
+               __details_display.call( this, true );
+               return this;
+       } );
+       
+       _api_register( [
+               'row().child.hide()',
+               'row().child().hide()'
+       ], function () {
+               __details_display.call( this, false );
+               return this;
+       } );
+       
+       _api_register( 'row().child.isShown()', function () {
+               var ctx = this.context;
+       
+               if ( ctx.length && this.length ) {
+                       // _detailsShown as false or undefined will fall through to return false
+                       return ctx[0].aoData[ this[0] ]._detailsShow || false;
+               }
+               return false;
+       } );
+       
+       
+       
+       /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+        * Columns
+        *
+        * {integer}           - column index (>=0 count from left, <0 count from right)
+        * "{integer}:visIdx"  - visible column index (i.e. translate to column index)  (>=0 count from left, <0 count from right)
+        * "{integer}:visible" - alias for {integer}:visIdx  (>=0 count from left, <0 count from right)
+        * "{string}:name"     - column name
+        * "{string}"          - jQuery selector on column header nodes
+        *
+        */
+       
+       // can be an array of these items, comma separated list, or an array of comma
+       // separated lists
+       
+       var __re_column_selector = /^(.*):(name|visIdx|visible)$/;
+       
+       var __column_selector = function ( settings, selector, opts )
+       {
+               var
+                       columns = settings.aoColumns,
+                       names = _pluck( columns, 'sName' ),
+                       nodes = _pluck( columns, 'nTh' );
+       
+               return _selector_run( selector, function ( s ) {
+                       var selInt = _intVal( s );
+       
+                       if ( s === '' ) {
+                               // All columns
+                               return _range( columns.length );
+                       }
+                       else if ( selInt !== null ) {
+                               // Integer selector
+                               return [ selInt >= 0 ?
+                                       selInt : // Count from left
+                                       columns.length + selInt // Count from right (+ because its a negative value)
                                ];
                        }
-                       
-                       /* Remove row stripe classes if they are already on the table row */
-                       iLen=oSettings.asStripeClasses.length;
-                       oSettings.asDestroyStripes = [];
-                       if (iLen)
-                       {
-                               var bStripeRemove = false;
-                               var anRows = $(this).children('tbody').children('tr:lt(' + iLen + ')');
-                               for ( i=0 ; i<iLen ; i++ )
-                               {
-                                       if ( anRows.hasClass( oSettings.asStripeClasses[i] ) )
-                                       {
-                                               bStripeRemove = true;
-                                               
-                                               /* Store the classes which we are about to remove so they can be re-added on destroy */
-                                               oSettings.asDestroyStripes.push( oSettings.asStripeClasses[i] );
+                       else {
+                               var match = typeof s === 'string' ?
+                                       s.match( __re_column_selector ) :
+                                       '';
+       
+                               if ( match ) {
+                                       switch( match[2] ) {
+                                               case 'visIdx':
+                                               case 'visible':
+                                                       var idx = parseInt( match[1], 10 );
+                                                       // Visible index given, convert to column index
+                                                       if ( idx < 0 ) {
+                                                               // Counting from the right
+                                                               var visColumns = $.map( columns, function (col,i) {
+                                                                       return col.bVisible ? i : null;
+                                                               } );
+                                                               return [ visColumns[ visColumns.length + idx ] ];
+                                                       }
+                                                       // Counting from the left
+                                                       return [ _fnVisibleToColumnIndex( settings, idx ) ];
+       
+                                               case 'name':
+                                                       // match by name. `names` is column index complete and in order
+                                                       return $.map( names, function (name, i) {
+                                                               return name === match[1] ? i : null;
+                                                       } );
                                        }
                                }
-                               
-                               if ( bStripeRemove )
-                               {
-                                       anRows.removeClass( oSettings.asStripeClasses.join(' ') );
+                               else {
+                                       // jQuery selector on the TH elements for the columns
+                                       return $( nodes )
+                                               .filter( s )
+                                               .map( function () {
+                                                       return $.inArray( this, nodes ); // `nodes` is column index complete and in order
+                                               } )
+                                               .toArray();
                                }
                        }
-                       
-                       /*
-                        * Columns
-                        * See if we should load columns automatically or use defined ones
-                        */
-                       var anThs = [];
-                       var aoColumnsInit;
-                       var nThead = this.getElementsByTagName('thead');
-                       if ( nThead.length !== 0 )
-                       {
-                               _fnDetectHeader( oSettings.aoHeader, nThead[0] );
-                               anThs = _fnGetUniqueThs( oSettings );
-                       }
-                       
-                       /* If not given a column array, generate one with nulls */
-                       if ( oInit.aoColumns === null )
-                       {
-                               aoColumnsInit = [];
-                               for ( i=0, iLen=anThs.length ; i<iLen ; i++ )
-                               {
-                                       aoColumnsInit.push( null );
+               } );
+       };
+       
+       
+       
+       
+       
+       var __setColumnVis = function ( settings, column, vis ) {
+               var
+                       cols = settings.aoColumns,
+                       col  = cols[ column ],
+                       data = settings.aoData,
+                       row, cells, i, ien, tr;
+       
+               // Get
+               if ( vis === undefined ) {
+                       return col.bVisible;
+               }
+       
+               // Set
+               // No change
+               if ( col.bVisible === vis ) {
+                       return;
+               }
+       
+               if ( vis ) {
+                       // Insert column
+                       // Need to decide if we should use appendChild or insertBefore
+                       var insertBefore = $.inArray( true, _pluck(cols, 'bVisible'), column+1 );
+       
+                       for ( i=0, ien=data.length ; i<ien ; i++ ) {
+                               tr = data[i].nTr;
+                               cells = data[i].anCells;
+       
+                               if ( tr ) {
+                                       // insertBefore can act like appendChild if 2nd arg is null
+                                       tr.insertBefore( cells[ column ], cells[ insertBefore ] || null );
                                }
                        }
-                       else
-                       {
-                               aoColumnsInit = oInit.aoColumns;
+               }
+               else {
+                       // Remove column
+                       $( _pluck( settings.aoData, 'anCells', column ) ).detach();
+       
+                       col.bVisible = false;
+                       _fnDrawHead( settings, settings.aoHeader );
+                       _fnDrawHead( settings, settings.aoFooter );
+       
+                       _fnSaveState( settings );
+               }
+       
+               // Common actions
+               col.bVisible = vis;
+               _fnDrawHead( settings, settings.aoHeader );
+               _fnDrawHead( settings, settings.aoFooter );
+       
+               // Automatically adjust column sizing
+               _fnAdjustColumnSizing( settings );
+       
+               // Realign columns for scrolling
+               if ( settings.oScroll.sX || settings.oScroll.sY ) {
+                       _fnScrollDraw( settings );
+               }
+       
+               _fnCallbackFire( settings, null, 'column-visibility', [settings, column, vis] );
+       
+               _fnSaveState( settings );
+       };
+       
+       
+       /**
+        *
+        */
+       _api_register( 'columns()', function ( selector, opts ) {
+               // argument shifting
+               if ( selector === undefined ) {
+                       selector = '';
+               }
+               else if ( $.isPlainObject( selector ) ) {
+                       opts = selector;
+                       selector = '';
+               }
+       
+               opts = _selector_opts( opts );
+       
+               var inst = this.iterator( 'table', function ( settings ) {
+                       return __column_selector( settings, selector, opts );
+               } );
+       
+               // Want argument shifting here and in _row_selector?
+               inst.selector.cols = selector;
+               inst.selector.opts = opts;
+       
+               return inst;
+       } );
+       
+       
+       /**
+        *
+        */
+       _api_registerPlural( 'columns().header()', 'column().header()', function ( selector, opts ) {
+               return this.iterator( 'column', function ( settings, column ) {
+                       return settings.aoColumns[column].nTh;
+               } );
+       } );
+       
+       
+       /**
+        *
+        */
+       _api_registerPlural( 'columns().footer()', 'column().footer()', function ( selector, opts ) {
+               return this.iterator( 'column', function ( settings, column ) {
+                       return settings.aoColumns[column].nTf;
+               } );
+       } );
+       
+       
+       /**
+        *
+        */
+       _api_registerPlural( 'columns().data()', 'column().data()', function () {
+               return this.iterator( 'column-rows', function ( settings, column, i, j, rows ) {
+                       var a = [];
+                       for ( var row=0, ien=rows.length ; row<ien ; row++ ) {
+                               a.push( _fnGetCellData( settings, rows[row], column, '' ) );
                        }
-                       
-                       /* Add the columns */
-                       for ( i=0, iLen=aoColumnsInit.length ; i<iLen ; i++ )
-                       {
-                               /* Short cut - use the loop to check if we have column visibility state to restore */
-                               if ( oInit.saved_aoColumns !== undefined && oInit.saved_aoColumns.length == iLen )
-                               {
-                                       if ( aoColumnsInit[i] === null )
-                                       {
-                                               aoColumnsInit[i] = {};
-                                       }
-                                       aoColumnsInit[i].bVisible = oInit.saved_aoColumns[i].bVisible;
-                               }
-                               
-                               _fnAddColumn( oSettings, anThs ? anThs[i] : null );
+                       return a;
+               } );
+       } );
+       
+       
+       _api_registerPlural( 'columns().cache()', 'column().cache()', function ( type ) {
+               return this.iterator( 'column-rows', function ( settings, column, i, j, rows ) {
+                       return _pluck_order( settings.aoData, rows,
+                               type === 'search' ? '_aFilterData' : '_aSortData', column
+                       );
+               } );
+       } );
+       
+       
+       _api_registerPlural( 'columns().nodes()', 'column().nodes()', function () {
+               return this.iterator( 'column-rows', function ( settings, column, i, j, rows ) {
+                       return _pluck_order( settings.aoData, rows, 'anCells', column ) ;
+               } );
+       } );
+       
+       
+       
+       _api_registerPlural( 'columns().visible()', 'column().visible()', function ( vis ) {
+               return this.iterator( 'column', function ( settings, column ) {
+                       return vis === undefined ?
+                               settings.aoColumns[ column ].bVisible :
+                               __setColumnVis( settings, column, vis );
+               } );
+       } );
+       
+       
+       
+       _api_registerPlural( 'columns().indexes()', 'column().index()', function ( type ) {
+               return this.iterator( 'column', function ( settings, column ) {
+                       return type === 'visible' ?
+                               _fnColumnIndexToVisible( settings, column ) :
+                               column;
+               } );
+       } );
+       
+       
+       // _api_register( 'columns().show()', function () {
+       //      var selector = this.selector;
+       //      return this.columns( selector.cols, selector.opts ).visible( true );
+       // } );
+       
+       
+       // _api_register( 'columns().hide()', function () {
+       //      var selector = this.selector;
+       //      return this.columns( selector.cols, selector.opts ).visible( false );
+       // } );
+       
+       
+       
+       _api_register( 'columns.adjust()', function () {
+               return this.iterator( 'table', function ( settings ) {
+                       _fnAdjustColumnSizing( settings );
+               } );
+       } );
+       
+       
+       // Convert from one column index type, to another type
+       _api_register( 'column.index()', function ( type, idx ) {
+               if ( this.context.length !== 0 ) {
+                       var ctx = this.context[0];
+       
+                       if ( type === 'fromVisible' || type === 'toData' ) {
+                               return _fnVisibleToColumnIndex( ctx, idx );
                        }
-                       
-                       /* Apply the column definitions */
-                       _fnApplyColumnDefs( oSettings, oInit.aoColumnDefs, aoColumnsInit, function (iCol, oDef) {
-                               _fnColumnOptions( oSettings, iCol, oDef );
-                       } );
-                       
-                       
-                       /*
-                        * Sorting
-                        * Check the aaSorting array
-                        */
-                       for ( i=0, iLen=oSettings.aaSorting.length ; i<iLen ; i++ )
-                       {
-                               if ( oSettings.aaSorting[i][0] >= oSettings.aoColumns.length )
-                               {
-                                       oSettings.aaSorting[i][0] = 0;
-                               }
-                               var oColumn = oSettings.aoColumns[ oSettings.aaSorting[i][0] ];
-                               
-                               /* Add a default sorting index */
-                               if ( oSettings.aaSorting[i][2] === undefined )
-                               {
-                                       oSettings.aaSorting[i][2] = 0;
-                               }
-                               
-                               /* If aaSorting is not defined, then we use the first indicator in asSorting */
-                               if ( oInit.aaSorting === undefined && oSettings.saved_aaSorting === undefined )
-                               {
-                                       oSettings.aaSorting[i][1] = oColumn.asSorting[0];
-                               }
-                               
-                               /* Set the current sorting index based on aoColumns.asSorting */
-                               for ( j=0, jLen=oColumn.asSorting.length ; j<jLen ; j++ )
-                               {
-                                       if ( oSettings.aaSorting[i][1] == oColumn.asSorting[j] )
-                                       {
-                                               oSettings.aaSorting[i][2] = j;
-                                               break;
+                       else if ( type === 'fromData' || type === 'toVisible' ) {
+                               return _fnColumnIndexToVisible( ctx, idx );
+                       }
+               }
+       } );
+       
+       
+       _api_register( 'column()', function ( selector, opts ) {
+               return _selector_first( this.columns( selector, opts ) );
+       } );
+       
+       
+       
+       
+       var __cell_selector = function ( settings, selector, opts )
+       {
+               var data = settings.aoData;
+               var rows = _selector_row_indexes( settings, opts );
+               var cells = _pluck_order( data, rows, 'anCells' );
+               var allCells = $( [].concat.apply([], cells) );
+               var row;
+               var columns = settings.aoColumns.length;
+               var a, i, ien, j;
+       
+               return _selector_run( selector, function ( s ) {
+                       if ( ! s ) {
+                               // All cells
+                               a = [];
+       
+                               for ( i=0, ien=rows.length ; i<ien ; i++ ) {
+                                       row = rows[i];
+       
+                                       for ( j=0 ; j<columns ; j++ ) {
+                                               a.push( {
+                                                       row: row,
+                                                       column: j
+                                               } );
                                        }
                                }
+       
+                               return a;
                        }
-                               
-                       /* Do a first pass on the sorting classes (allows any size changes to be taken into
-                        * account, and also will apply sorting disabled classes if disabled
-                        */
-                       _fnSortingClasses( oSettings );
-                       
-                       
-                       /*
-                        * Final init
-                        * Cache the header, body and footer as required, creating them if needed
-                        */
-                       
-                       /* Browser support detection */
-                       _fnBrowserDetect( oSettings );
-                       
-                       // Work around for Webkit bug 83867 - store the caption-side before removing from doc
-                       var captions = $(this).children('caption').each( function () {
-                               this._captionSide = $(this).css('caption-side');
-                       } );
-                       
-                       var thead = $(this).children('thead');
-                       if ( thead.length === 0 )
-                       {
-                               thead = [ document.createElement( 'thead' ) ];
-                               this.appendChild( thead[0] );
-                       }
-                       oSettings.nTHead = thead[0];
-                       
-                       var tbody = $(this).children('tbody');
-                       if ( tbody.length === 0 )
-                       {
-                               tbody = [ document.createElement( 'tbody' ) ];
-                               this.appendChild( tbody[0] );
+                       else if ( $.isPlainObject( s ) ) {
+                               return [s];
                        }
-                       oSettings.nTBody = tbody[0];
-                       oSettings.nTBody.setAttribute( "role", "alert" );
-                       oSettings.nTBody.setAttribute( "aria-live", "polite" );
-                       oSettings.nTBody.setAttribute( "aria-relevant", "all" );
-                       
-                       var tfoot = $(this).children('tfoot');
-                       if ( tfoot.length === 0 && captions.length > 0 && (oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "") )
-                       {
-                               // If we are a scrolling table, and no footer has been given, then we need to create
-                               // a tfoot element for the caption element to be appended to
-                               tfoot = [ document.createElement( 'tfoot' ) ];
-                               this.appendChild( tfoot[0] );
+       
+                       // jQuery filtered cells
+                       return allCells
+                               .filter( s )
+                               .map( function (i, el) {
+                                       row = el.parentNode._DT_RowIndex;
+       
+                                       return {
+                                               row: row,
+                                               column: $.inArray( el, data[ row ].anCells )
+                                       };
+                               } )
+                               .toArray();
+               } );
+       };
+       
+       
+       
+       
+       _api_register( 'cells()', function ( rowSelector, columnSelector, opts ) {
+               // Argument shifting
+               if ( $.isPlainObject( rowSelector ) ) {
+                       // If passing in a cell index
+                       if ( rowSelector.row ) {
+                               opts = columnSelector;
+                               columnSelector = null;
                        }
-                       
-                       if ( tfoot.length > 0 )
-                       {
-                               oSettings.nTFoot = tfoot[0];
-                               _fnDetectHeader( oSettings.aoFooter, oSettings.nTFoot );
+                       else {
+                               opts = rowSelector;
+                               rowSelector = null;
                        }
-                       
-                       /* Check if there is data passing into the constructor */
-                       if ( bUsePassedData )
-                       {
-                               for ( i=0 ; i<oInit.aaData.length ; i++ )
-                               {
-                                       _fnAddData( oSettings, oInit.aaData[ i ] );
+               }
+               if ( $.isPlainObject( columnSelector ) ) {
+                       opts = columnSelector;
+                       columnSelector = null;
+               }
+       
+               // Cell selector
+               if ( columnSelector === null || columnSelector === undefined ) {
+                       return this.iterator( 'table', function ( settings ) {
+                               return __cell_selector( settings, rowSelector, _selector_opts( opts ) );
+                       } );
+               }
+       
+               // Row + column selector
+               var columns = this.columns( columnSelector, opts );
+               var rows = this.rows( rowSelector, opts );
+               var a, i, ien, j, jen;
+       
+               var cells = this.iterator( 'table', function ( settings, idx ) {
+                       a = [];
+       
+                       for ( i=0, ien=rows[idx].length ; i<ien ; i++ ) {
+                               for ( j=0, jen=columns[idx].length ; j<jen ; j++ ) {
+                                       a.push( {
+                                               row:    rows[idx][i],
+                                               column: columns[idx][j]
+                                       } );
                                }
                        }
-                       else
-                       {
-                               /* Grab the data from the page */
-                               _fnGatherData( oSettings );
+       
+                       return a;
+               } );
+       
+               $.extend( cells.selector, {
+                       cols: columnSelector,
+                       rows: rowSelector,
+                       opts: opts
+               } );
+       
+               return cells;
+       } );
+       
+       
+       _api_registerPlural( 'cells().nodes()', 'cell().node()', function () {
+               return this.iterator( 'cell', function ( settings, row, column ) {
+                       return settings.aoData[ row ].anCells[ column ];
+               } );
+       } );
+       
+       
+       _api_register( 'cells().data()', function () {
+               return this.iterator( 'cell', function ( settings, row, column ) {
+                       return _fnGetCellData( settings, row, column );
+               } );
+       } );
+       
+       
+       _api_registerPlural( 'cells().cache()', 'cell().cache()', function ( type ) {
+               type = type === 'search' ? '_aFilterData' : '_aSortData';
+       
+               return this.iterator( 'cell', function ( settings, row, column ) {
+                       return settings.aoData[ row ][ type ][ column ];
+               } );
+       } );
+       
+       
+       _api_registerPlural( 'cells().indexes()', 'cell().index()', function () {
+               return this.iterator( 'cell', function ( settings, row, column ) {
+                       return {
+                               row: row,
+                               column: column,
+                               columnVisible: _fnColumnIndexToVisible( settings, column )
+                       };
+               } );
+       } );
+       
+       
+       _api_register( [
+               'cells().invalidate()',
+               'cell().invalidate()'
+       ], function ( src ) {
+               var selector = this.selector;
+       
+               // Use the rows method of the instance to perform the invalidation, rather
+               // than doing it here. This avoids needing to handle duplicate rows from
+               // the cells.
+               this.rows( selector.rows, selector.opts ).invalidate( src );
+       
+               return this;
+       } );
+       
+       
+       
+       
+       _api_register( 'cell()', function ( rowSelector, columnSelector, opts ) {
+               return _selector_first( this.cells( rowSelector, columnSelector, opts ) );
+       } );
+       
+       
+       
+       _api_register( 'cell().data()', function ( data ) {
+               var ctx = this.context;
+               var cell = this[0];
+       
+               if ( data === undefined ) {
+                       // Get
+                       return ctx.length && cell.length ?
+                               _fnGetCellData( ctx[0], cell[0].row, cell[0].column ) :
+                               undefined;
+               }
+       
+               // Set
+               _fnSetCellData( ctx[0], cell[0].row, cell[0].column, data );
+               _fnInvalidateRow( ctx[0], cell[0].row, 'data', cell[0].column );
+       
+               return this;
+       } );
+       
+       
+       
+       /**
+        * Get current ordering (sorting) that has been applied to the table.
+        *
+        * @returns {array} 2D array containing the sorting information for the first
+        *   table in the current context. Each element in the parent array represents
+        *   a column being sorted upon (i.e. multi-sorting with two columns would have
+        *   2 inner arrays). The inner arrays may have 2 or 3 elements. The first is
+        *   the column index that the sorting condition applies to, the second is the
+        *   direction of the sort (`desc` or `asc`) and, optionally, the third is the
+        *   index of the sorting order from the `column.sorting` initialisation array.
+        *//**
+        * Set the ordering for the table.
+        *
+        * @param {integer} order Column index to sort upon.
+        * @param {string} direction Direction of the sort to be applied (`asc` or `desc`)
+        * @returns {DataTables.Api} this
+        *//**
+        * Set the ordering for the table.
+        *
+        * @param {array} order 1D array of sorting information to be applied.
+        * @param {array} [...] Optional additional sorting conditions
+        * @returns {DataTables.Api} this
+        *//**
+        * Set the ordering for the table.
+        *
+        * @param {array} order 2D array of sorting information to be applied.
+        * @returns {DataTables.Api} this
+        */
+       _api_register( 'order()', function ( order, dir ) {
+               var ctx = this.context;
+       
+               if ( order === undefined ) {
+                       // get
+                       return ctx.length !== 0 ?
+                               ctx[0].aaSorting :
+                               undefined;
+               }
+       
+               // set
+               if ( typeof order === 'number' ) {
+                       // Simple column / direction passed in
+                       order = [ [ order, dir ] ];
+               }
+               else if ( ! $.isArray( order[0] ) ) {
+                       // Arguments passed in (list of 1D arrays)
+                       order = Array.prototype.slice.call( arguments );
+               }
+               // otherwise a 2D array was passed in
+       
+               return this.iterator( 'table', function ( settings ) {
+                       settings.aaSorting = order.slice();
+               } );
+       } );
+       
+       
+       /**
+        * Attach a sort listener to an element for a given column
+        *
+        * @param {node|jQuery|string} node Identifier for the element(s) to attach the
+        *   listener to. This can take the form of a single DOM node, a jQuery
+        *   collection of nodes or a jQuery selector which will identify the node(s).
+        * @param {integer} column the column that a click on this node will sort on
+        * @param {function} [callback] callback function when sort is run
+        * @returns {DataTables.Api} this
+        */
+       _api_register( 'order.listener()', function ( node, column, callback ) {
+               return this.iterator( 'table', function ( settings ) {
+                       _fnSortAttachListener( settings, node, column, callback );
+               } );
+       } );
+       
+       
+       // Order by the selected column(s)
+       _api_register( [
+               'columns().order()',
+               'column().order()'
+       ], function ( dir ) {
+               var that = this;
+       
+               return this.iterator( 'table', function ( settings, i ) {
+                       var sort = [];
+       
+                       $.each( that[i], function (j, col) {
+                               sort.push( [ col, dir ] );
+                       } );
+       
+                       settings.aaSorting = sort;
+               } );
+       } );
+       
+       
+       
+       _api_register( 'search()', function ( input, regex, smart, caseInsen ) {
+               var ctx = this.context;
+       
+               if ( input === undefined ) {
+                       // get
+                       return ctx.length !== 0 ?
+                               ctx[0].oPreviousSearch.sSearch :
+                               undefined;
+               }
+       
+               // set
+               return this.iterator( 'table', function ( settings ) {
+                       if ( ! settings.oFeatures.bFilter ) {
+                               return;
                        }
-                       
-                       /* Copy the data index array */
-                       oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-                       
-                       /* Initialisation complete - table can be drawn */
-                       oSettings.bInitialised = true;
-                       
-                       /* Check if we need to initialise the table (it might not have been handed off to the
-                        * language processor)
-                        */
-                       if ( bInitHandedOff === false )
-                       {
-                               _fnInitialise( oSettings );
+       
+                       _fnFilterComplete( settings, $.extend( {}, settings.oPreviousSearch, {
+                               "sSearch": input+"",
+                               "bRegex":  regex === null ? false : regex,
+                               "bSmart":  smart === null ? true  : smart,
+                               "bCaseInsensitive": caseInsen === null ? true : caseInsen
+                       } ), 1 );
+               } );
+       } );
+       
+       
+       _api_register( [
+               'columns().search()',
+               'column().search()'
+       ], function ( input, regex, smart, caseInsen ) {
+               return this.iterator( 'column', function ( settings, column ) {
+                       var preSearch = settings.aoPreSearchCols;
+       
+                       if ( input === undefined ) {
+                               // get
+                               return preSearch[ column ].sSearch;
+                       }
+       
+                       // set
+                       if ( ! settings.oFeatures.bFilter ) {
+                               return;
                        }
+       
+                       $.extend( preSearch[ column ], {
+                               "sSearch": input+"",
+                               "bRegex":  regex === null ? false : regex,
+                               "bSmart":  smart === null ? true  : smart,
+                               "bCaseInsensitive": caseInsen === null ? true : caseInsen
+                       } );
+       
+                       _fnFilterComplete( settings, settings.oPreviousSearch, 1 );
                } );
-               _that = null;
-               return this;
-       };
-
+       } );
+       
        
        
        /**
-        * Provide a common method for plug-ins to check the version of DataTables being used, in order
-        * to ensure compatibility.
-        *  @param {string} sVersion Version string to check for, in the format "X.Y.Z". Note that the
-        *    formats "X" and "X.Y" are also acceptable.
-        *  @returns {boolean} true if this version of DataTables is greater or equal to the required
-        *    version, or false if this version of DataTales is not suitable
+        * Provide a common method for plug-ins to check the version of DataTables being
+        * used, in order to ensure compatibility.
+        *
+        *  @param {string} version Version string to check for, in the format "X.Y.Z".
+        *    Note that the formats "X" and "X.Y" are also acceptable.
+        *  @returns {boolean} true if this version of DataTables is greater or equal to
+        *    the required version, or false if this version of DataTales is not
+        *    suitable
         *  @static
         *  @dtopt API-Static
         *
         *  @example
-        *    alert( $.fn.dataTable.fnVersionCheck( '1.9.0' ) );
+        *    alert( $.fn.dataTable.versionCheck( '1.9.0' ) );
         */
-       DataTable.fnVersionCheck = function( sVersion )
+       DataTable.versionCheck = DataTable.fnVersionCheck = function( version )
        {
-               /* This is cheap, but effective */
-               var fnZPad = function (Zpad, count)
-               {
-                       while(Zpad.length < count) {
-                               Zpad += '0';
+               var aThis = DataTable.version.split('.');
+               var aThat = version.split('.');
+               var iThis, iThat;
+       
+               for ( var i=0, iLen=aThat.length ; i<iLen ; i++ ) {
+                       iThis = parseInt( aThis[i], 10 ) || 0;
+                       iThat = parseInt( aThat[i], 10 ) || 0;
+       
+                       // Parts are the same, keep comparing
+                       if (iThis === iThat) {
+                               continue;
                        }
-                       return Zpad;
-               };
-               var aThis = DataTable.ext.sVersion.split('.');
-               var aThat = sVersion.split('.');
-               var sThis = '', sThat = '';
-               
-               for ( var i=0, iLen=aThat.length ; i<iLen ; i++ )
-               {
-                       sThis += fnZPad( aThis[i], 3 );
-                       sThat += fnZPad( aThat[i], 3 );
+       
+                       // Parts are different, return immediately
+                       return iThis > iThat;
                }
-               
-               return parseInt(sThis, 10) >= parseInt(sThat, 10);
+       
+               return true;
        };
        
        
        /**
-        * Check if a TABLE node is a DataTable table already or not.
-        *  @param {node} nTable The TABLE node to check if it is a DataTable or not (note that other
-        *    node types can be passed in, but will always return false).
+        * Check if a `<table>` node is a DataTable table already or not.
+        *
+        *  @param {node|jquery|string} table Table node, jQuery object or jQuery
+        *      selector for the table to test. Note that if more than more than one
+        *      table is passed on, only the first will be checked
         *  @returns {boolean} true the table given is a DataTable, or false otherwise
         *  @static
         *  @dtopt API-Static
         *
         *  @example
-        *    var ex = document.getElementById('example');
-        *    if ( ! $.fn.DataTable.fnIsDataTable( ex ) ) {
-        *      $(ex).dataTable();
+        *    if ( ! $.fn.DataTable.isDataTable( '#example' ) ) {
+        *      $('#example').dataTable();
         *    }
         */
-       DataTable.fnIsDataTable = function ( nTable )
+       DataTable.isDataTable = DataTable.fnIsDataTable = function ( table )
        {
-               var o = DataTable.settings;
+               var t = $(table).get(0);
+               var is = false;
        
-               for ( var i=0 ; i<o.length ; i++ )
-               {
-                       if ( o[i].nTable === nTable || o[i].nScrollHead === nTable || o[i].nScrollFoot === nTable )
-                       {
-                               return true;
+               $.each( DataTable.settings, function (i, o) {
+                       if ( o.nTable === t || o.nScrollHead === t || o.nScrollFoot === t ) {
+                               is = true;
                        }
-               }
+               } );
        
-               return false;
+               return is;
        };
        
        
        /**
-        * Get all DataTable tables that have been initialised - optionally you can select to
-        * get only currently visible tables.
-        *  @param {boolean} [bVisible=false] Flag to indicate if you want all (default) or 
-        *    visible tables only.
-        *  @returns {array} Array of TABLE nodes (not DataTable instances) which are DataTables
+        * Get all DataTable tables that have been initialised - optionally you can
+        * select to get only currently visible tables.
+        *
+        *  @param {boolean} [visible=false] Flag to indicate if you want all (default)
+        *    or visible tables only.
+        *  @returns {array} Array of `table` nodes (not DataTable instances) which are
+        *    DataTables
         *  @static
         *  @dtopt API-Static
         *
         *  @example
-        *    var table = $.fn.dataTable.fnTables(true);
-        *    if ( table.length > 0 ) {
-        *      $(table).dataTable().fnAdjustColumnSizing();
-        *    }
+        *    $.each( $.fn.dataTable.tables(true), function () {
+        *      $(table).DataTable().columns.adjust();
+        *    } );
         */
-       DataTable.fnTables = function ( bVisible )
+       DataTable.tables = DataTable.fnTables = function ( visible )
        {
-               var out = [];
-       
-               jQuery.each( DataTable.settings, function (i, o) {
-                       if ( !bVisible || (bVisible === true && $(o.nTable).is(':visible')) )
-                       {
-                               out.push( o.nTable );
+               return jQuery.map( DataTable.settings, function (o) {
+                       if ( !visible || (visible && $(o.nTable).is(':visible')) ) {
+                               return o.nTable;
                        }
                } );
-       
-               return out;
        };
        
-
-       /**
-        * Version string for plug-ins to check compatibility. Allowed format is
-        * a.b.c.d.e where: a:int, b:int, c:int, d:string(dev|beta), e:int. d and
-        * e are optional
-        *  @member
-        *  @type string
-        *  @default Version number
-        */
-       DataTable.version = "1.9.4";
-
-       /**
-        * Private data store, containing all of the settings objects that are created for the
-        * tables on a given page.
-        * 
-        * Note that the <i>DataTable.settings</i> object is aliased to <i>jQuery.fn.dataTableExt</i> 
-        * through which it may be accessed and manipulated, or <i>jQuery.fn.dataTable.settings</i>.
-        *  @member
-        *  @type array
-        *  @default []
-        *  @private
-        */
-       DataTable.settings = [];
-
+       
        /**
-        * Object models container, for the various models that DataTables has available
-        * to it. These models define the objects that are used to hold the active state 
-        * and configuration of the table.
-        *  @namespace
+        * Convert from camel case parameters to Hungarian notation. This is made public
+        * for the extensions to provide the same ability as DataTables core to accept
+        * either the 1.9 style Hungarian notation, or the 1.10+ style camelCase
+        * parameters.
+        *
+        *  @param {object} src The model object which holds all parameters that can be
+        *    mapped.
+        *  @param {object} user The object to convert from camel case to Hungarian.
+        *  @param {boolean} force When set to `true`, properties which already have a
+        *    Hungarian value in the `user` object will be overwritten. Otherwise they
+        *    won't be.
         */
-       DataTable.models = {};
+       DataTable.camelToHungarian = _fnCamelToHungarian;
+       
        
        
        /**
-        * DataTables extension options and plug-ins. This namespace acts as a collection "area"
-        * for plug-ins that can be used to extend the default DataTables behaviour - indeed many
-        * of the build in methods use this method to provide their own capabilities (sorting methods
-        * for example).
-        * 
-        * Note that this namespace is aliased to jQuery.fn.dataTableExt so it can be readily accessed
-        * and modified by plug-ins.
-        *  @namespace
+        *
         */
-       DataTable.models.ext = {
-               /**
-                * Plug-in filtering functions - this method of filtering is complimentary to the default
-                * type based filtering, and a lot more comprehensive as it allows you complete control
-                * over the filtering logic. Each element in this array is a function (parameters
-                * described below) that is called for every row in the table, and your logic decides if
-                * it should be included in the filtered data set or not.
-                *   <ul>
-                *     <li>
-                *       Function input parameters:
-                *       <ul>
-                *         <li>{object} DataTables settings object: see {@link DataTable.models.oSettings}.</li>
-                *         <li>{array|object} Data for the row to be processed (same as the original format
-                *           that was passed in as the data source, or an array from a DOM data source</li>
-                *         <li>{int} Row index in aoData ({@link DataTable.models.oSettings.aoData}), which can
-                *           be useful to retrieve the TR element if you need DOM interaction.</li>
-                *       </ul>
-                *     </li>
-                *     <li>
-                *       Function return:
-                *       <ul>
-                *         <li>{boolean} Include the row in the filtered result set (true) or not (false)</li>
-                *       </ul>
-                *     </il>
-                *   </ul>
-                *  @type array
-                *  @default []
-                *
-                *  @example
-                *    // The following example shows custom filtering being applied to the fourth column (i.e.
-                *    // the aData[3] index) based on two input values from the end-user, matching the data in 
-                *    // a certain range.
-                *    $.fn.dataTableExt.afnFiltering.push(
-                *      function( oSettings, aData, iDataIndex ) {
-                *        var iMin = document.getElementById('min').value * 1;
-                *        var iMax = document.getElementById('max').value * 1;
-                *        var iVersion = aData[3] == "-" ? 0 : aData[3]*1;
-                *        if ( iMin == "" && iMax == "" ) {
-                *          return true;
-                *        }
-                *        else if ( iMin == "" && iVersion < iMax ) {
-                *          return true;
-                *        }
-                *        else if ( iMin < iVersion && "" == iMax ) {
-                *          return true;
-                *        }
-                *        else if ( iMin < iVersion && iVersion < iMax ) {
-                *          return true;
-                *        }
-                *        return false;
-                *      }
-                *    );
-                */
-               "afnFiltering": [],
+       _api_register( '$()', function ( selector, opts ) {
+               var
+                       rows   = this.rows( opts ).nodes(), // Get all rows
+                       jqRows = $(rows);
+       
+               return $( [].concat(
+                       jqRows.filter( selector ).toArray(),
+                       jqRows.find( selector ).toArray()
+               ) );
+       } );
        
        
-               /**
-                * Plug-in sorting functions - this method of sorting is complimentary to the default type
-                * based sorting that DataTables does automatically, allowing much greater control over the
-                * the data that is being used to sort a column. This is useful if you want to do sorting
-                * based on live data (for example the contents of an 'input' element) rather than just the
-                * static string that DataTables knows of. The way these plug-ins work is that you create
-                * an array of the values you wish to be sorted for the column in question and then return
-                * that array. Which pre-sorting function is run here depends on the sSortDataType parameter
-                * that is used for the column (if any). This is the corollary of <i>ofnSearch</i> for sort 
-                * data.
-                *   <ul>
-            *     <li>
-            *       Function input parameters:
-            *       <ul>
-                *         <li>{object} DataTables settings object: see {@link DataTable.models.oSettings}.</li>
-            *         <li>{int} Target column index</li>
-            *       </ul>
-            *     </li>
-                *     <li>
-                *       Function return:
-                *       <ul>
-                *         <li>{array} Data for the column to be sorted upon</li>
-                *       </ul>
-                *     </il>
-                *   </ul>
-                *  
-                * Note that as of v1.9, it is typically preferable to use <i>mData</i> to prepare data for
-                * the different uses that DataTables can put the data to. Specifically <i>mData</i> when
-                * used as a function will give you a 'type' (sorting, filtering etc) that you can use to 
-                * prepare the data as required for the different types. As such, this method is deprecated.
-                *  @type array
-                *  @default []
-                *  @deprecated
-                *
-                *  @example
-                *    // Updating the cached sorting information with user entered values in HTML input elements
-                *    jQuery.fn.dataTableExt.afnSortData['dom-text'] = function ( oSettings, iColumn )
-                *    {
-                *      var aData = [];
-                *      $( 'td:eq('+iColumn+') input', oSettings.oApi._fnGetTrNodes(oSettings) ).each( function () {
-                *        aData.push( this.value );
-                *      } );
-                *      return aData;
-                *    }
-                */
-               "afnSortData": [],
+       // jQuery functions to operate on the tables
+       $.each( [ 'on', 'one', 'off' ], function (i, key) {
+               _api_register( key+'()', function ( /* event, handler */ ) {
+                       var args = Array.prototype.slice.call(arguments);
        
+                       // Add the `dt` namespace automatically if it isn't already present
+                       if ( args[0].indexOf( '.dt' ) === -1 ) {
+                               args[0] += '.dt';
+                       }
        
-               /**
-                * Feature plug-ins - This is an array of objects which describe the feature plug-ins that are
-                * available to DataTables. These feature plug-ins are accessible through the sDom initialisation
-                * option. As such, each feature plug-in must describe a function that is used to initialise
-                * itself (fnInit), a character so the feature can be enabled by sDom (cFeature) and the name
-                * of the feature (sFeature). Thus the objects attached to this method must provide:
-                *   <ul>
-                *     <li>{function} fnInit Initialisation of the plug-in
-                *       <ul>
-            *         <li>
-            *           Function input parameters:
-            *           <ul>
-                *             <li>{object} DataTables settings object: see {@link DataTable.models.oSettings}.</li>
-            *           </ul>
-            *         </li>
-                *         <li>
-                *           Function return:
-                *           <ul>
-                *             <li>{node|null} The element which contains your feature. Note that the return
-                *                may also be void if your plug-in does not require to inject any DOM elements 
-                *                into DataTables control (sDom) - for example this might be useful when 
-                *                developing a plug-in which allows table control via keyboard entry.</li>
-                *           </ul>
-                *         </il>
-                *       </ul>
-                *     </li>
-                *     <li>{character} cFeature Character that will be matched in sDom - case sensitive</li>
-                *     <li>{string} sFeature Feature name</li>
-                *   </ul>
-                *  @type array
-                *  @default []
-                * 
-                *  @example
-                *    // How TableTools initialises itself.
-                *    $.fn.dataTableExt.aoFeatures.push( {
-                *      "fnInit": function( oSettings ) {
-                *        return new TableTools( { "oDTSettings": oSettings } );
-                *      },
-                *      "cFeature": "T",
-                *      "sFeature": "TableTools"
-                *    } );
-                */
-               "aoFeatures": [],
+                       var inst = $( this.tables().nodes() );
+                       inst[key].apply( inst, args );
+                       return this;
+               } );
+       } );
        
        
-               /**
-                * Type detection plug-in functions - DataTables utilises types to define how sorting and
-                * filtering behave, and types can be either  be defined by the developer (sType for the
-                * column) or they can be automatically detected by the methods in this array. The functions
-                * defined in the array are quite simple, taking a single parameter (the data to analyse) 
-                * and returning the type if it is a known type, or null otherwise.
-                *   <ul>
-            *     <li>
-            *       Function input parameters:
-            *       <ul>
-                *         <li>{*} Data from the column cell to be analysed</li>
-            *       </ul>
-            *     </li>
-                *     <li>
-                *       Function return:
-                *       <ul>
-                *         <li>{string|null} Data type detected, or null if unknown (and thus pass it
-                *           on to the other type detection functions.</li>
-                *       </ul>
-                *     </il>
-                *   </ul>
-                *  @type array
-                *  @default []
-                *  
-                *  @example
-                *    // Currency type detection plug-in:
-                *    jQuery.fn.dataTableExt.aTypes.push(
-                *      function ( sData ) {
-                *        var sValidChars = "0123456789.-";
-                *        var Char;
-                *        
-                *        // Check the numeric part
-                *        for ( i=1 ; i<sData.length ; i++ ) {
-                *          Char = sData.charAt(i); 
-                *          if (sValidChars.indexOf(Char) == -1) {
-                *            return null;
-                *          }
-                *        }
-                *        
-                *        // Check prefixed by currency
-                *        if ( sData.charAt(0) == '$' || sData.charAt(0) == '&pound;' ) {
-                *          return 'currency';
-                *        }
-                *        return null;
-                *      }
-                *    );
-                */
-               "aTypes": [],
+       _api_register( 'clear()', function () {
+               return this.iterator( 'table', function ( settings ) {
+                       _fnClearTable( settings );
+               } );
+       } );
        
        
-               /**
-                * Provide a common method for plug-ins to check the version of DataTables being used, 
-                * in order to ensure compatibility.
-                *  @type function
-                *  @param {string} sVersion Version string to check for, in the format "X.Y.Z". Note 
-                *    that the formats "X" and "X.Y" are also acceptable.
-                *  @returns {boolean} true if this version of DataTables is greater or equal to the 
-                *    required version, or false if this version of DataTales is not suitable
-                *
-                *  @example
-                *    $(document).ready(function() {
-                *      var oTable = $('#example').dataTable();
-                *      alert( oTable.fnVersionCheck( '1.9.0' ) );
-                *    } );
-                */
-               "fnVersionCheck": DataTable.fnVersionCheck,
+       _api_register( 'settings()', function () {
+               return new _Api( this.context, this.context );
+       } );
+       
+       
+       _api_register( 'data()', function () {
+               return this.iterator( 'table', function ( settings ) {
+                       return _pluck( settings.aoData, '_aData' );
+               } ).flatten();
+       } );
        
        
-               /**
-                * Index for what 'this' index API functions should use
-                *  @type int
-                *  @default 0
-                */
-               "iApiIndex": 0,
+       _api_register( 'destroy()', function ( remove ) {
+               remove = remove || false;
        
+               return this.iterator( 'table', function ( settings ) {
+                       var orig      = settings.nTableWrapper.parentNode;
+                       var classes   = settings.oClasses;
+                       var table     = settings.nTable;
+                       var tbody     = settings.nTBody;
+                       var thead     = settings.nTHead;
+                       var tfoot     = settings.nTFoot;
+                       var jqTable   = $(table);
+                       var jqTbody   = $(tbody);
+                       var jqWrapper = $(settings.nTableWrapper);
+                       var rows      = $.map( settings.aoData, function (r) { return r.nTr; } );
+                       var i, ien;
        
-               /**
-                * Pre-processing of filtering data plug-ins - When you assign the sType for a column
-                * (or have it automatically detected for you by DataTables or a type detection plug-in), 
-                * you will typically be using this for custom sorting, but it can also be used to provide 
-                * custom filtering by allowing you to pre-processing the data and returning the data in
-                * the format that should be filtered upon. This is done by adding functions this object 
-                * with a parameter name which matches the sType for that target column. This is the
-                * corollary of <i>afnSortData</i> for filtering data.
-                *   <ul>
-            *     <li>
-            *       Function input parameters:
-            *       <ul>
-                *         <li>{*} Data from the column cell to be prepared for filtering</li>
-            *       </ul>
-            *     </li>
-                *     <li>
-                *       Function return:
-                *       <ul>
-                *         <li>{string|null} Formatted string that will be used for the filtering.</li>
-                *       </ul>
-                *     </il>
-                *   </ul>
-                * 
-                * Note that as of v1.9, it is typically preferable to use <i>mData</i> to prepare data for
-                * the different uses that DataTables can put the data to. Specifically <i>mData</i> when
-                * used as a function will give you a 'type' (sorting, filtering etc) that you can use to 
-                * prepare the data as required for the different types. As such, this method is deprecated.
-                *  @type object
-                *  @default {}
-                *  @deprecated
-                *
-                *  @example
-                *    $.fn.dataTableExt.ofnSearch['title-numeric'] = function ( sData ) {
-                *      return sData.replace(/\n/g," ").replace( /<.*?>/g, "" );
-                *    }
-                */
-               "ofnSearch": {},
+                       // Flag to note that the table is currently being destroyed - no action
+                       // should be taken
+                       settings.bDestroying = true;
        
+                       // Fire off the destroy callbacks for plug-ins etc
+                       _fnCallbackFire( settings, "aoDestroyCallback", "destroy", [settings] );
        
-               /**
-                * Container for all private functions in DataTables so they can be exposed externally
-                *  @type object
-                *  @default {}
-                */
-               "oApi": {},
+                       // If not being removed from the document, make all columns visible
+                       if ( ! remove ) {
+                               new _Api( settings ).columns().visible( true );
+                       }
        
+                       // Blitz all `DT` namespaced events (these are internal events, the
+                       // lowercase, `dt` events are user subscribed and they are responsible
+                       // for removing them
+                       jqWrapper.unbind('.DT').find(':not(tbody *)').unbind('.DT');
+                       $(window).unbind('.DT-'+settings.sInstance);
        
-               /**
-                * Storage for the various classes that DataTables uses
-                *  @type object
-                *  @default {}
-                */
-               "oStdClasses": {},
-               
+                       // When scrolling we had to break the table up - restore it
+                       if ( table != thead.parentNode ) {
+                               jqTable.children('thead').detach();
+                               jqTable.append( thead );
+                       }
        
-               /**
-                * Storage for the various classes that DataTables uses - jQuery UI suitable
-                *  @type object
-                *  @default {}
-                */
-               "oJUIClasses": {},
+                       if ( tfoot && table != tfoot.parentNode ) {
+                               jqTable.children('tfoot').detach();
+                               jqTable.append( tfoot );
+                       }
        
+                       // Remove the DataTables generated nodes, events and classes
+                       jqTable.detach();
+                       jqWrapper.detach();
        
-               /**
-                * Pagination plug-in methods - The style and controls of the pagination can significantly 
-                * impact on how the end user interacts with the data in your table, and DataTables allows 
-                * the addition of pagination controls by extending this object, which can then be enabled
-                * through the <i>sPaginationType</i> initialisation parameter. Each pagination type that
-                * is added is an object (the property name of which is what <i>sPaginationType</i> refers
-                * to) that has two properties, both methods that are used by DataTables to update the
-                * control's state.
-                *   <ul>
-                *     <li>
-                *       fnInit -  Initialisation of the paging controls. Called only during initialisation 
-                *         of the table. It is expected that this function will add the required DOM elements 
-                *         to the page for the paging controls to work. The element pointer 
-                *         'oSettings.aanFeatures.p' array is provided by DataTables to contain the paging 
-                *         controls (note that this is a 2D array to allow for multiple instances of each 
-                *         DataTables DOM element). It is suggested that you add the controls to this element 
-                *         as children
-                *       <ul>
-            *         <li>
-            *           Function input parameters:
-            *           <ul>
-                *             <li>{object} DataTables settings object: see {@link DataTable.models.oSettings}.</li>
-                *             <li>{node} Container into which the pagination controls must be inserted</li>
-                *             <li>{function} Draw callback function - whenever the controls cause a page
-                *               change, this method must be called to redraw the table.</li>
-            *           </ul>
-            *         </li>
-                *         <li>
-                *           Function return:
-                *           <ul>
-                *             <li>No return required</li>
-                *           </ul>
-                *         </il>
-                *       </ul>
-                *     </il>
-                *     <li>
-                *       fnInit -  This function is called whenever the paging status of the table changes and is
-                *         typically used to update classes and/or text of the paging controls to reflex the new 
-                *         status.
-                *       <ul>
-            *         <li>
-            *           Function input parameters:
-            *           <ul>
-                *             <li>{object} DataTables settings object: see {@link DataTable.models.oSettings}.</li>
-                *             <li>{function} Draw callback function - in case you need to redraw the table again
-                *               or attach new event listeners</li>
-            *           </ul>
-            *         </li>
-                *         <li>
-                *           Function return:
-                *           <ul>
-                *             <li>No return required</li>
-                *           </ul>
-                *         </il>
-                *       </ul>
-                *     </il>
-                *   </ul>
-                *  @type object
-                *  @default {}
-                *
-                *  @example
-                *    $.fn.dataTableExt.oPagination.four_button = {
-                *      "fnInit": function ( oSettings, nPaging, fnCallbackDraw ) {
-                *        nFirst = document.createElement( 'span' );
-                *        nPrevious = document.createElement( 'span' );
-                *        nNext = document.createElement( 'span' );
-                *        nLast = document.createElement( 'span' );
-                *        
-                *        nFirst.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sFirst ) );
-                *        nPrevious.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sPrevious ) );
-                *        nNext.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sNext ) );
-                *        nLast.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sLast ) );
-                *        
-                *        nFirst.className = "paginate_button first";
-                *        nPrevious.className = "paginate_button previous";
-                *        nNext.className="paginate_button next";
-                *        nLast.className = "paginate_button last";
-                *        
-                *        nPaging.appendChild( nFirst );
-                *        nPaging.appendChild( nPrevious );
-                *        nPaging.appendChild( nNext );
-                *        nPaging.appendChild( nLast );
-                *        
-                *        $(nFirst).click( function () {
-                *          oSettings.oApi._fnPageChange( oSettings, "first" );
-                *          fnCallbackDraw( oSettings );
-                *        } );
-                *        
-                *        $(nPrevious).click( function() {
-                *          oSettings.oApi._fnPageChange( oSettings, "previous" );
-                *          fnCallbackDraw( oSettings );
-                *        } );
-                *        
-                *        $(nNext).click( function() {
-                *          oSettings.oApi._fnPageChange( oSettings, "next" );
-                *          fnCallbackDraw( oSettings );
-                *        } );
-                *        
-                *        $(nLast).click( function() {
-                *          oSettings.oApi._fnPageChange( oSettings, "last" );
-                *          fnCallbackDraw( oSettings );
-                *        } );
-                *        
-                *        $(nFirst).bind( 'selectstart', function () { return false; } );
-                *        $(nPrevious).bind( 'selectstart', function () { return false; } );
-                *        $(nNext).bind( 'selectstart', function () { return false; } );
-                *        $(nLast).bind( 'selectstart', function () { return false; } );
-                *      },
-                *      
-                *      "fnUpdate": function ( oSettings, fnCallbackDraw ) {
-                *        if ( !oSettings.aanFeatures.p ) {
-                *          return;
-                *        }
-                *        
-                *        // Loop over each instance of the pager
-                *        var an = oSettings.aanFeatures.p;
-                *        for ( var i=0, iLen=an.length ; i<iLen ; i++ ) {
-                *          var buttons = an[i].getElementsByTagName('span');
-                *          if ( oSettings._iDisplayStart === 0 ) {
-                *            buttons[0].className = "paginate_disabled_previous";
-                *            buttons[1].className = "paginate_disabled_previous";
-                *          }
-                *          else {
-                *            buttons[0].className = "paginate_enabled_previous";
-                *            buttons[1].className = "paginate_enabled_previous";
-                *          }
-                *          
-                *          if ( oSettings.fnDisplayEnd() == oSettings.fnRecordsDisplay() ) {
-                *            buttons[2].className = "paginate_disabled_next";
-                *            buttons[3].className = "paginate_disabled_next";
-                *          }
-                *          else {
-                *            buttons[2].className = "paginate_enabled_next";
-                *            buttons[3].className = "paginate_enabled_next";
-                *          }
-                *        }
-                *      }
-                *    };
-                */
-               "oPagination": {},
+                       settings.aaSorting = [];
+                       settings.aaSortingFixed = [];
+                       _fnSortingClasses( settings );
        
+                       $( rows ).removeClass( settings.asStripeClasses.join(' ') );
        
-               /**
-                * Sorting plug-in methods - Sorting in DataTables is based on the detected type of the
-                * data column (you can add your own type detection functions, or override automatic 
-                * detection using sType). With this specific type given to the column, DataTables will 
-                * apply the required sort from the functions in the object. Each sort type must provide
-                * two mandatory methods, one each for ascending and descending sorting, and can optionally
-                * provide a pre-formatting method that will help speed up sorting by allowing DataTables
-                * to pre-format the sort data only once (rather than every time the actual sort functions
-                * are run). The two sorting functions are typical Javascript sort methods:
-                *   <ul>
-            *     <li>
-            *       Function input parameters:
-            *       <ul>
-                *         <li>{*} Data to compare to the second parameter</li>
-                *         <li>{*} Data to compare to the first parameter</li>
-            *       </ul>
-            *     </li>
-                *     <li>
-                *       Function return:
-                *       <ul>
-                *         <li>{int} Sorting match: <0 if first parameter should be sorted lower than
-                *           the second parameter, ===0 if the two parameters are equal and >0 if
-                *           the first parameter should be sorted height than the second parameter.</li>
-                *       </ul>
-                *     </il>
-                *   </ul>
-                *  @type object
-                *  @default {}
-                *
-                *  @example
-                *    // Case-sensitive string sorting, with no pre-formatting method
-                *    $.extend( $.fn.dataTableExt.oSort, {
-                *      "string-case-asc": function(x,y) {
-                *        return ((x < y) ? -1 : ((x > y) ? 1 : 0));
-                *      },
-                *      "string-case-desc": function(x,y) {
-                *        return ((x < y) ? 1 : ((x > y) ? -1 : 0));
-                *      }
-                *    } );
-                *
-                *  @example
-                *    // Case-insensitive string sorting, with pre-formatting
-                *    $.extend( $.fn.dataTableExt.oSort, {
-                *      "string-pre": function(x) {
-                *        return x.toLowerCase();
-                *      },
-                *      "string-asc": function(x,y) {
-                *        return ((x < y) ? -1 : ((x > y) ? 1 : 0));
-                *      },
-                *      "string-desc": function(x,y) {
-                *        return ((x < y) ? 1 : ((x > y) ? -1 : 0));
-                *      }
-                *    } );
-                */
-               "oSort": {},
+                       $('th, td', thead).removeClass( classes.sSortable+' '+
+                               classes.sSortableAsc+' '+classes.sSortableDesc+' '+classes.sSortableNone
+                       );
        
+                       if ( settings.bJUI ) {
+                               $('th span.'+classes.sSortIcon+ ', td span.'+classes.sSortIcon, thead).detach();
+                               $('th, td', thead).each( function () {
+                                       var wrapper = $('div.'+classes.sSortJUIWrapper, this);
+                                       $(this).append( wrapper.contents() );
+                                       wrapper.detach();
+                               } );
+                       }
        
-               /**
-                * Version string for plug-ins to check compatibility. Allowed format is
-                * a.b.c.d.e where: a:int, b:int, c:int, d:string(dev|beta), e:int. d and
-                * e are optional
-                *  @type string
-                *  @default Version number
-                */
-               "sVersion": DataTable.version,
+                       if ( ! remove && orig ) {
+                               // insertBefore acts like appendChild if !arg[1]
+                               orig.insertBefore( table, settings.nTableReinsertBefore );
+                       }
        
+                       // Add the TR elements back into the table in their original order
+                       jqTbody.children().detach();
+                       jqTbody.append( rows );
        
-               /**
-                * How should DataTables report an error. Can take the value 'alert' or 'throw'
-                *  @type string
-                *  @default alert
-                */
-               "sErrMode": "alert",
+                       // Restore the width of the original table - was read from the style property,
+                       // so we can restore directly to that
+                       jqTable
+                               .css( 'width', settings.sDestroyWidth )
+                               .removeClass( classes.sTable );
        
+                       // If the were originally stripe classes - then we add them back here.
+                       // Note this is not fool proof (for example if not all rows had stripe
+                       // classes - but it's a good effort without getting carried away
+                       ien = settings.asDestroyStripes.length;
        
-               /**
-                * Store information for DataTables to access globally about other instances
-                *  @namespace
-                *  @private
-                */
-               "_oExternConfig": {
-                       /* int:iNextUnique - next unique number for an instance */
-                       "iNextUnique": 0
-               }
-       };
+                       if ( ien ) {
+                               jqTbody.children().each( function (i) {
+                                       $(this).addClass( settings.asDestroyStripes[i % ien] );
+                               } );
+                       }
+       
+                       /* Remove the settings object from the settings array */
+                       var idx = $.inArray( settings, DataTable.settings );
+                       if ( idx !== -1 ) {
+                               DataTable.settings.splice( idx, 1 );
+                       }
+               } );
+       } );
        
+
+       /**
+        * Version string for plug-ins to check compatibility. Allowed format is
+        * `a.b.c-d` where: a:int, b:int, c:int, d:string(dev|beta|alpha). `d` is used
+        * only for non-release builds. See http://semver.org/ for more information.
+        *  @member
+        *  @type string
+        *  @default Version number
+        */
+       DataTable.version = "1.10.0";
+
+       /**
+        * Private data store, containing all of the settings objects that are
+        * created for the tables on a given page.
+        *
+        * Note that the `DataTable.settings` object is aliased to
+        * `jQuery.fn.dataTableExt` through which it may be accessed and
+        * manipulated, or `jQuery.fn.dataTable.settings`.
+        *  @member
+        *  @type array
+        *  @default []
+        *  @private
+        */
+       DataTable.settings = [];
+
+       /**
+        * Object models container, for the various models that DataTables has
+        * available to it. These models define the objects that are used to hold
+        * the active state and configuration of the table.
+        *  @namespace
+        */
+       DataTable.models = {};
        
        
        
        
        /**
         * Template object for the way in which DataTables holds information about
-        * each individual row. This is the object format used for the settings 
+        * each individual row. This is the object format used for the settings
         * aoData array.
         *  @namespace
         */
                 */
                "nTr": null,
        
+               /**
+                * Array of TD elements for each row. This is null until the row has been
+                * created.
+                *  @type array nodes
+                *  @default []
+                */
+               "anCells": null,
+       
                /**
                 * Data object from the original data source for the row. This is either
                 * an array if using the traditional form of DataTables, or an object if
                 * using mData options. The exact type will depend on the passed in
-                * data from the data source, or will be an array if using DOM a data 
+                * data from the data source, or will be an array if using DOM a data
                 * source.
                 *  @type array|object
                 *  @default []
        
                /**
                 * Sorting data cache - this array is ostensibly the same length as the
-                * number of columns (although each index is generated only as it is 
+                * number of columns (although each index is generated only as it is
                 * needed), and holds the data that is used for sorting each column in the
                 * row. We do this cache generation at the start of the sort in order that
                 * the formatting of the sort data need be done only once for each cell
                 * per sort. This array should not be read from or written to by anything
                 * other than the master sorting methods.
                 *  @type array
-                *  @default []
+                *  @default null
                 *  @private
                 */
-               "_aSortData": [],
+               "_aSortData": null,
        
                /**
-                * Array of TD elements that are cached for hidden rows, so they can be
-                * reinserted into the table if a column is made visible again (or to act
-                * as a store if a column is made hidden). Only hidden columns have a 
-                * reference in the array. For non-hidden columns the value is either
-                * undefined or null.
-                *  @type array nodes
-                *  @default []
+                * Per cell filtering data cache. As per the sort data cache, used to
+                * increase the performance of the filtering in DataTables
+                *  @type array
+                *  @default null
+                *  @private
+                */
+               "_aFilterData": null,
+       
+               /**
+                * Filtering data cache. This is the same as the cell filtering cache, but
+                * in this case a string rather than an array. This is easily computed with
+                * a join on `_aFilterData`, but is provided as a cache so the join isn't
+                * needed on every search (memory traded for performance)
+                *  @type array
+                *  @default null
                 *  @private
                 */
-               "_anHidden": [],
+               "_sFilterRow": null,
        
                /**
                 * Cache of the class name that DataTables has applied to the row, so we
                 *  @default <i>Empty string</i>
                 *  @private
                 */
-               "_sRowStripe": ""
-       };
+               "_sRowStripe": "",
        
+               /**
+                * Denote if the original data source was from the DOM, or the data source
+                * object. This is used for invalidating data, so DataTables can
+                * automatically read data from the original source, unless uninstructed
+                * otherwise.
+                *  @type string
+                *  @default null
+                *  @private
+                */
+               "src": null
+       };
        
        
        /**
         * Template object for the column information object in DataTables. This object
         * is held in the settings aoColumns array and contains all the information that
         * DataTables needs about each individual column.
-        * 
-        * Note that this object is related to {@link DataTable.defaults.columns} 
+        *
+        * Note that this object is related to {@link DataTable.defaults.column}
         * but this one is the internal data store for DataTables's cache of columns.
         * It should NOT be manipulated outside of DataTables. Any configuration should
         * be done through the initialisation options.
         *  @namespace
         */
        DataTable.models.oColumn = {
+               /**
+                * Column index. This could be worked out on-the-fly with $.inArray, but it
+                * is faster to just hold it as a variable
+                *  @type integer
+                *  @default null
+                */
+               "idx": null,
+       
                /**
                 * A list of the columns that sorting should occur on when this column
                 * is sorted. That this property is an array allows multi-column sorting
                 *  @type array
                 */
                "asSorting": null,
-               
+       
                /**
                 * Flag to indicate if the column is searchable, and thus should be included
                 * in the filtering or not.
                 *  @type boolean
                 */
                "bSearchable": null,
-               
+       
                /**
                 * Flag to indicate if the column is sortable or not.
                 *  @type boolean
                 */
                "bSortable": null,
-               
-               /**
-                * <code>Deprecated</code> When using fnRender, you have two options for what 
-                * to do with the data, and this property serves as the switch. Firstly, you 
-                * can have the sorting and filtering use the rendered value (true - default), 
-                * or you can have the sorting and filtering us the original value (false).
-                *
-                * Please note that this option has now been deprecated and will be removed
-                * in the next version of DataTables. Please use mRender / mData rather than
-                * fnRender.
-                *  @type boolean
-                *  @deprecated
-                */
-               "bUseRendered": null,
-               
+       
                /**
                 * Flag to indicate if the column is currently visible in the table or not
                 *  @type boolean
                 */
                "bVisible": null,
-               
+       
+               /**
+                * Store for manual type assignment using the `column.type` option. This
+                * is held in store so we can manipulate the column's `sType` property.
+                *  @type string
+                *  @default null
+                *  @private
+                */
+               "_sManualType": null,
+       
                /**
-                * Flag to indicate to the type detection method if the automatic type
-                * detection should be used, or if a column type (sType) has been specified
+                * Flag to indicate if HTML5 data attributes should be used as the data
+                * source for filtering or sorting. True is either are.
                 *  @type boolean
-                *  @default true
+                *  @default false
                 *  @private
                 */
-               "_bAutoType": true,
-               
+               "_bAttrSrc": false,
+       
                /**
                 * Developer definable function that is called whenever a cell is created (Ajax source,
                 * etc) or processed for input (DOM source). This can be used as a compliment to mRender
                 *  @default null
                 */
                "fnCreatedCell": null,
-               
+       
                /**
                 * Function to get data from a cell in a column. You should <b>never</b>
                 * access data directly through _aData internally in DataTables - always use
                 * the method attached to this property. It allows mData to function as
-                * required. This function is automatically assigned by the column 
+                * required. This function is automatically assigned by the column
                 * initialisation method
                 *  @type function
-                *  @param {array|object} oData The data array/object for the array 
+                *  @param {array|object} oData The data array/object for the array
                 *    (i.e. aoData[]._aData)
-                *  @param {string} sSpecific The specific data type you want to get - 
+                *  @param {string} sSpecific The specific data type you want to get -
                 *    'display', 'type' 'filter' 'sort'
                 *  @returns {*} The data for the cell from the given row's data
                 *  @default null
                 */
                "fnGetData": null,
-               
-               /**
-                * <code>Deprecated</code> Custom display function that will be called for the 
-                * display of each cell in this column.
-                *
-                * Please note that this option has now been deprecated and will be removed
-                * in the next version of DataTables. Please use mRender / mData rather than
-                * fnRender.
-                *  @type function
-                *  @param {object} o Object with the following parameters:
-                *  @param {int}    o.iDataRow The row in aoData
-                *  @param {int}    o.iDataColumn The column in question
-                *  @param {array}  o.aData The data for the row in question
-                *  @param {object} o.oSettings The settings object for this DataTables instance
-                *  @returns {string} The string you which to use in the display
-                *  @default null
-                *  @deprecated
-                */
-               "fnRender": null,
-               
+       
                /**
-                * Function to set data for a cell in the column. You should <b>never</b> 
+                * Function to set data for a cell in the column. You should <b>never</b>
                 * set the data directly to _aData internally in DataTables - always use
                 * this method. It allows mData to function as required. This function
                 * is automatically assigned by the column initialisation method
                 *  @type function
-                *  @param {array|object} oData The data array/object for the array 
+                *  @param {array|object} oData The data array/object for the array
                 *    (i.e. aoData[]._aData)
                 *  @param {*} sValue Value to set
                 *  @default null
                 */
                "fnSetData": null,
-               
+       
                /**
-                * Property to read the value for the cells in the column from the data 
+                * Property to read the value for the cells in the column from the data
                 * source array / object. If null, then the default content is used, if a
                 * function is given then the return from the function is used.
                 *  @type function|int|string|null
                 *  @default null
                 */
                "mData": null,
-               
+       
                /**
                 * Partner property to mData which is used (only when defined) to get
                 * the data - i.e. it is basically the same as mData, but without the
                 *  @default null
                 */
                "mRender": null,
-               
+       
                /**
                 * Unique header TH/TD element for this column - this is what the sorting
                 * listener is attached to (if sorting is enabled.)
                 *  @default null
                 */
                "nTh": null,
-               
+       
                /**
-                * Unique footer TH/TD element for this column (if there is one). Not used 
-                * in DataTables as such, but can be used for plug-ins to reference the 
+                * Unique footer TH/TD element for this column (if there is one). Not used
+                * in DataTables as such, but can be used for plug-ins to reference the
                 * footer for each column.
                 *  @type node
                 *  @default null
                 */
                "nTf": null,
-               
+       
                /**
                 * The class to apply to all TD elements in the table's TBODY for the column
                 *  @type string
                 *  @default null
                 */
                "sClass": null,
-               
+       
                /**
                 * When DataTables calculates the column widths to assign to each column,
                 * it finds the longest string in each column and then constructs a
                 * temporary table and reads the widths from that. The problem with this
-                * is that "mmm" is much wider then "iiii", but the latter is a longer 
+                * is that "mmm" is much wider then "iiii", but the latter is a longer
                 * string - thus the calculation can go wrong (doing it properly and putting
                 * it into an DOM object and measuring that is horribly(!) slow). Thus as
                 * a "work around" we provide this option. It will append its value to the
                 *  @type string
                 */
                "sContentPadding": null,
-               
+       
                /**
                 * Allows a default value to be given for a column's data, and will be used
                 * whenever a null data source is encountered (this can be because mData
                 *  @default null
                 */
                "sDefaultContent": null,
-               
+       
                /**
                 * Name for the column, allowing reference to the column by name as well as
                 * by index (needs a lookup to work by name).
                 *  @type string
                 */
                "sName": null,
-               
+       
                /**
                 * Custom sorting data type - defines which of the available plug-ins in
                 * afnSortData the custom sorting will use - if any is defined.
                 *  @default std
                 */
                "sSortDataType": 'std',
-               
+       
                /**
                 * Class to be applied to the header element when sorting on this column
                 *  @type string
                 *  @default null
                 */
                "sSortingClass": null,
-               
+       
                /**
                 * Class to be applied to the header element when sorting on this column -
                 * when jQuery UI theming is used.
                 *  @default null
                 */
                "sSortingClassJUI": null,
-               
+       
                /**
                 * Title of the column - what is seen in the TH element (nTh).
                 *  @type string
                 */
                "sTitle": null,
-               
+       
                /**
                 * Column sorting and filtering type
                 *  @type string
                 *  @default null
                 */
                "sType": null,
-               
+       
                /**
                 * Width of the column
                 *  @type string
                 *  @default null
                 */
                "sWidth": null,
-               
+       
                /**
                 * Width of the column when it was first "encountered"
                 *  @type string
        };
        
        
+       /*
+        * Developer note: The properties of the object below are given in Hungarian
+        * notation, that was used as the interface for DataTables prior to v1.10, however
+        * from v1.10 onwards the primary interface is camel case. In order to avoid
+        * breaking backwards compatibility utterly with this change, the Hungarian
+        * version is still, internally the primary interface, but is is not documented
+        * - hence the @name tags in each doc comment. This allows a Javascript function
+        * to create a map from Hungarian notation to camel case (going the other direction
+        * would require each property to be listed, which would at around 3K to the size
+        * of DataTables, while this method is about a 0.5K hit.
+        *
+        * Ultimately this does pave the way for Hungarian notation to be dropped
+        * completely, but that is a massive amount of work and will break current
+        * installs (therefore is on-hold until v2).
+        */
        
        /**
-        * Initialisation options that can be given to DataTables at initialisation 
+        * Initialisation options that can be given to DataTables at initialisation
         * time.
         *  @namespace
         */
        DataTable.defaults = {
                /**
-                * An array of data to use for the table, passed in at initialisation which 
+                * An array of data to use for the table, passed in at initialisation which
                 * will be used in preference to any data which is already in the DOM. This is
                 * particularly useful for constructing tables purely in Javascript, for
                 * example with a custom Ajax call.
                 *  @type array
                 *  @default null
+                *
                 *  @dtopt Option
-                * 
+                *  @name DataTable.defaults.data
+                *
                 *  @example
                 *    // Using a 2D array data source
                 *    $(document).ready( function () {
                 *      $('#example').dataTable( {
-                *        "aaData": [
+                *        "data": [
                 *          ['Trident', 'Internet Explorer 4.0', 'Win 95+', 4, 'X'],
                 *          ['Trident', 'Internet Explorer 5.0', 'Win 95+', 5, 'C'],
                 *        ],
-                *        "aoColumns": [
-                *          { "sTitle": "Engine" },
-                *          { "sTitle": "Browser" },
-                *          { "sTitle": "Platform" },
-                *          { "sTitle": "Version" },
-                *          { "sTitle": "Grade" }
+                *        "columns": [
+                *          { "title": "Engine" },
+                *          { "title": "Browser" },
+                *          { "title": "Platform" },
+                *          { "title": "Version" },
+                *          { "title": "Grade" }
                 *        ]
                 *      } );
                 *    } );
-                *    
+                *
                 *  @example
-                *    // Using an array of objects as a data source (mData)
+                *    // Using an array of objects as a data source (`data`)
                 *    $(document).ready( function () {
                 *      $('#example').dataTable( {
-                *        "aaData": [
+                *        "data": [
                 *          {
                 *            "engine":   "Trident",
                 *            "browser":  "Internet Explorer 4.0",
                 *            "grade":    "C"
                 *          }
                 *        ],
-                *        "aoColumns": [
-                *          { "sTitle": "Engine",   "mData": "engine" },
-                *          { "sTitle": "Browser",  "mData": "browser" },
-                *          { "sTitle": "Platform", "mData": "platform" },
-                *          { "sTitle": "Version",  "mData": "version" },
-                *          { "sTitle": "Grade",    "mData": "grade" }
+                *        "columns": [
+                *          { "title": "Engine",   "data": "engine" },
+                *          { "title": "Browser",  "data": "browser" },
+                *          { "title": "Platform", "data": "platform" },
+                *          { "title": "Version",  "data": "version" },
+                *          { "title": "Grade",    "data": "grade" }
                 *        ]
                 *      } );
                 *    } );
        
        
                /**
-                * If sorting is enabled, then DataTables will perform a first pass sort on 
-                * initialisation. You can define which column(s) the sort is performed upon, 
-                * and the sorting direction, with this variable. The aaSorting array should 
-                * contain an array for each column to be sorted initially containing the 
-                * column's index and a direction string ('asc' or 'desc').
+                * If ordering is enabled, then DataTables will perform a first pass sort on
+                * initialisation. You can define which column(s) the sort is performed
+                * upon, and the sorting direction, with this variable. The `sorting` array
+                * should contain an array for each column to be sorted initially containing
+                * the column's index and a direction string ('asc' or 'desc').
                 *  @type array
                 *  @default [[0,'asc']]
+                *
                 *  @dtopt Option
-                * 
+                *  @name DataTable.defaults.order
+                *
                 *  @example
                 *    // Sort by 3rd column first, and then 4th column
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aaSorting": [[2,'asc'], [3,'desc']]
+                *        "order": [[2,'asc'], [3,'desc']]
                 *      } );
                 *    } );
-                *    
+                *
                 *    // No initial sorting
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aaSorting": []
+                *        "order": []
                 *      } );
                 *    } );
                 */
        
        
                /**
-                * This parameter is basically identical to the aaSorting parameter, but 
-                * cannot be overridden by user interaction with the table. What this means 
-                * is that you could have a column (visible or hidden) which the sorting will 
-                * always be forced on first - any sorting after that (from the user) will 
-                * then be performed as required. This can be useful for grouping rows 
+                * This parameter is basically identical to the `sorting` parameter, but
+                * cannot be overridden by user interaction with the table. What this means
+                * is that you could have a column (visible or hidden) which the sorting
+                * will always be forced on first - any sorting after that (from the user)
+                * will then be performed as required. This can be useful for grouping rows
                 * together.
                 *  @type array
                 *  @default null
+                *
                 *  @dtopt Option
-                * 
+                *  @name DataTable.defaults.orderFixed
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aaSortingFixed": [[0,'asc']]
+                *        "orderFixed": [[0,'asc']]
                 *      } );
                 *    } )
                 */
-               "aaSortingFixed": null,
+               "aaSortingFixed": [],
+       
+       
+               /**
+                * DataTables can be instructed to load data to display in the table from a
+                * Ajax source. This option defines how that Ajax call is made and where to.
+                *
+                * The `ajax` property has three different modes of operation, depending on
+                * how it is defined. These are:
+                *
+                * * `string` - Set the URL from where the data should be loaded from.
+                * * `object` - Define properties for `jQuery.ajax`.
+                * * `function` - Custom data get function
+                *
+                * `string`
+                * --------
+                *
+                * As a string, the `ajax` property simply defines the URL from which
+                * DataTables will load data.
+                *
+                * `object`
+                * --------
+                *
+                * As an object, the parameters in the object are passed to
+                * [jQuery.ajax](http://api.jquery.com/jQuery.ajax/) allowing fine control
+                * of the Ajax request. DataTables has a number of default parameters which
+                * you can override using this option. Please refer to the jQuery
+                * documentation for a full description of the options available, although
+                * the following parameters provide additional options in DataTables or
+                * require special consideration:
+                *
+                * * `data` - As with jQuery, `data` can be provided as an object, but it
+                *   can also be used as a function to manipulate the data DataTables sends
+                *   to the server. The function takes a single parameter, an object of
+                *   parameters with the values that DataTables has readied for sending. An
+                *   object may be returned which will be merged into the DataTables
+                *   defaults, or you can add the items to the object that was passed in and
+                *   not return anything from the function. This supersedes `fnServerParams`
+                *   from DataTables 1.9-.
+                *
+                * * `dataSrc` - By default DataTables will look for the property `data` (or
+                *   `aaData` for compatibility with DataTables 1.9-) when obtaining data
+                *   from an Ajax source or for server-side processing - this parameter
+                *   allows that property to be changed. You can use Javascript dotted
+                *   object notation to get a data source for multiple levels of nesting, or
+                *   it my be used as a function. As a function it takes a single parameter,
+                *   the JSON returned from the server, which can be manipulated as
+                *   required, with the returned value being that used by DataTables as the
+                *   data source for the table. This supersedes `sAjaxDataProp` from
+                *   DataTables 1.9-.
+                *
+                * * `success` - Should not be overridden it is used internally in
+                *   DataTables. To manipulate / transform the data returned by the server
+                *   use `ajax.dataSrc`, or use `ajax` as a function (see below).
+                *
+                * `function`
+                * ----------
+                *
+                * As a function, making the Ajax call is left up to yourself allowing
+                * complete control of the Ajax request. Indeed, if desired, a method other
+                * than Ajax could be used to obtain the required data, such as Web storage
+                * or an AIR database.
+                *
+                * The function is given four parameters and no return is required. The
+                * parameters are:
+                *
+                * 1. _object_ - Data to send to the server
+                * 2. _function_ - Callback function that must be executed when the required
+                *    data has been obtained. That data should be passed into the callback
+                *    as the only parameter
+                * 3. _object_ - DataTables settings object for the table
+                *
+                * Note that this supersedes `fnServerData` from DataTables 1.9-.
+                *
+                *  @type string|object|function
+                *  @default null
+                *
+                *  @dtopt Option
+                *  @name DataTable.defaults.ajax
+                *  @since 1.10.0
+                *
+                * @example
+                *   // Get JSON data from a file via Ajax.
+                *   // Note DataTables expects data in the form `{ data: [ ...data... ] }` by default).
+                *   $('#example').dataTable( {
+                *     "ajax": "data.json"
+                *   } );
+                *
+                * @example
+                *   // Get JSON data from a file via Ajax, using `dataSrc` to change
+                *   // `data` to `tableData` (i.e. `{ tableData: [ ...data... ] }`)
+                *   $('#example').dataTable( {
+                *     "ajax": {
+                *       "url": "data.json",
+                *       "dataSrc": "tableData"
+                *     }
+                *   } );
+                *
+                * @example
+                *   // Get JSON data from a file via Ajax, using `dataSrc` to read data
+                *   // from a plain array rather than an array in an object
+                *   $('#example').dataTable( {
+                *     "ajax": {
+                *       "url": "data.json",
+                *       "dataSrc": ""
+                *     }
+                *   } );
+                *
+                * @example
+                *   // Manipulate the data returned from the server - add a link to data
+                *   // (note this can, should, be done using `render` for the column - this
+                *   // is just a simple example of how the data can be manipulated).
+                *   $('#example').dataTable( {
+                *     "ajax": {
+                *       "url": "data.json",
+                *       "dataSrc": function ( json ) {
+                *         for ( var i=0, ien=json.length ; i<ien ; i++ ) {
+                *           json[i][0] = '<a href="/message/'+json[i][0]+'>View message</a>';
+                *         }
+                *         return json;
+                *       }
+                *     }
+                *   } );
+                *
+                * @example
+                *   // Add data to the request
+                *   $('#example').dataTable( {
+                *     "ajax": {
+                *       "url": "data.json",
+                *       "data": function ( d ) {
+                *         return {
+                *           "extra_search": $('#extra').val()
+                *         };
+                *       }
+                *     }
+                *   } );
+                *
+                * @example
+                *   // Send request as POST
+                *   $('#example').dataTable( {
+                *     "ajax": {
+                *       "url": "data.json",
+                *       "type": "POST"
+                *     }
+                *   } );
+                *
+                * @example
+                *   // Get the data from localStorage (could interface with a form for
+                *   // adding, editing and removing rows).
+                *   $('#example').dataTable( {
+                *     "ajax": function (data, callback, settings) {
+                *       callback(
+                *         JSON.parse( localStorage.getItem('dataTablesData') )
+                *       );
+                *     }
+                *   } );
+                */
+               "ajax": null,
        
        
                /**
                 * This parameter allows you to readily specify the entries in the length drop
-                * down menu that DataTables shows when pagination is enabled. It can be 
-                * either a 1D array of options which will be used for both the displayed 
-                * option and the value, or a 2D array which will use the array in the first 
-                * position as the value, and the array in the second position as the 
+                * down menu that DataTables shows when pagination is enabled. It can be
+                * either a 1D array of options which will be used for both the displayed
+                * option and the value, or a 2D array which will use the array in the first
+                * position as the value, and the array in the second position as the
                 * displayed options (useful for language strings such as 'All').
+                *
+                * Note that the `pageLength` property will be automatically set to the
+                * first value given in this array, unless `pageLength` is also provided.
                 *  @type array
                 *  @default [ 10, 25, 50, 100 ]
+                *
                 *  @dtopt Option
-                * 
-                *  @example
-                *    $(document).ready( function() {
-                *      $('#example').dataTable( {
-                *        "aLengthMenu": [[10, 25, 50, -1], [10, 25, 50, "All"]]
-                *      } );
-                *    } );
-                *  
+                *  @name DataTable.defaults.lengthMenu
+                *
                 *  @example
-                *    // Setting the default display length as well as length menu
-                *    // This is likely to be wanted if you remove the '10' option which
-                *    // is the iDisplayLength default.
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "iDisplayLength": 25,
-                *        "aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]]
+                *        "lengthMenu": [[10, 25, 50, -1], [10, 25, 50, "All"]]
                 *      } );
                 *    } );
                 */
        
        
                /**
-                * The aoColumns option in the initialisation parameter allows you to define
+                * The `columns` option in the initialisation parameter allows you to define
                 * details about the way individual columns behave. For a full list of
-                * column options that can be set, please see 
-                * {@link DataTable.defaults.columns}. Note that if you use aoColumns to
+                * column options that can be set, please see
+                * {@link DataTable.defaults.column}. Note that if you use `columns` to
                 * define your columns, you must have an entry in the array for every single
                 * column that you have in your table (these can be null if you don't which
                 * to specify any options).
                 *  @member
+                *
+                *  @name DataTable.defaults.column
                 */
                "aoColumns": null,
        
                /**
-                * Very similar to aoColumns, aoColumnDefs allows you to target a specific 
-                * column, multiple columns, or all columns, using the aTargets property of 
-                * each object in the array. This allows great flexibility when creating 
-                * tables, as the aoColumnDefs arrays can be of any length, targeting the 
-                * columns you specifically want. aoColumnDefs may use any of the column 
-                * options available: {@link DataTable.defaults.columns}, but it _must_
-                * have aTargets defined in each object in the array. Values in the aTargets
+                * Very similar to `columns`, `columnDefs` allows you to target a specific
+                * column, multiple columns, or all columns, using the `targets` property of
+                * each object in the array. This allows great flexibility when creating
+                * tables, as the `columnDefs` arrays can be of any length, targeting the
+                * columns you specifically want. `columnDefs` may use any of the column
+                * options available: {@link DataTable.defaults.column}, but it _must_
+                * have `targets` defined in each object in the array. Values in the `targets`
                 * array may be:
                 *   <ul>
                 *     <li>a string - class name will be matched on the TH for the column</li>
                 *     <li>the string "_all" - all columns (i.e. assign a default)</li>
                 *   </ul>
                 *  @member
+                *
+                *  @name DataTable.defaults.columnDefs
                 */
                "aoColumnDefs": null,
        
        
                /**
-                * Basically the same as oSearch, this parameter defines the individual column
-                * filtering state at initialisation time. The array must be of the same size 
+                * Basically the same as `search`, this parameter defines the individual column
+                * filtering state at initialisation time. The array must be of the same size
                 * as the number of columns, and each element be an object with the parameters
-                * "sSearch" and "bEscapeRegex" (the latter is optional). 'null' is also
+                * `search` and `escapeRegex` (the latter is optional). 'null' is also
                 * accepted and the default will be used.
                 *  @type array
                 *  @default []
+                *
                 *  @dtopt Option
-                * 
+                *  @name DataTable.defaults.searchCols
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoSearchCols": [
+                *        "searchCols": [
                 *          null,
-                *          { "sSearch": "My filter" },
+                *          { "search": "My filter" },
                 *          null,
-                *          { "sSearch": "^[0-9]", "bEscapeRegex": false }
+                *          { "search": "^[0-9]", "escapeRegex": false }
                 *        ]
                 *      } );
                 *    } )
        
        
                /**
-                * An array of CSS classes that should be applied to displayed rows. This 
-                * array may be of any length, and DataTables will apply each class 
+                * An array of CSS classes that should be applied to displayed rows. This
+                * array may be of any length, and DataTables will apply each class
                 * sequentially, looping when required.
                 *  @type array
-                *  @default null <i>Will take the values determined by the oClasses.sStripe*
+                *  @default null <i>Will take the values determined by the `oClasses.stripe*`
                 *    options</i>
+                *
                 *  @dtopt Option
-                * 
+                *  @name DataTable.defaults.stripeClasses
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "asStripeClasses": [ 'strip1', 'strip2', 'strip3' ]
+                *        "stripeClasses": [ 'strip1', 'strip2', 'strip3' ]
                 *      } );
                 *    } )
                 */
                /**
                 * Enable or disable automatic column width calculation. This can be disabled
                 * as an optimisation (it takes some time to calculate the widths) if the
-                * tables widths are passed in using aoColumns.
+                * tables widths are passed in using `columns`.
                 *  @type boolean
                 *  @default true
+                *
                 *  @dtopt Features
-                * 
+                *  @name DataTable.defaults.autoWidth
+                *
                 *  @example
                 *    $(document).ready( function () {
                 *      $('#example').dataTable( {
-                *        "bAutoWidth": false
+                *        "autoWidth": false
                 *      } );
                 *    } );
                 */
                 * time.
                 *  @type boolean
                 *  @default false
+                *
                 *  @dtopt Features
-                * 
+                *  @name DataTable.defaults.deferRender
+                *
                 *  @example
                 *    $(document).ready( function() {
-                *      var oTable = $('#example').dataTable( {
-                *        "sAjaxSource": "sources/arrays.txt",
-                *        "bDeferRender": true
+                *      $('#example').dataTable( {
+                *        "ajax": "sources/arrays.txt",
+                *        "deferRender": true
                 *      } );
                 *    } );
                 */
        
        
                /**
-                * Replace a DataTable which matches the given selector and replace it with 
+                * Replace a DataTable which matches the given selector and replace it with
                 * one which has the properties of the new initialisation object passed. If no
                 * table matches the selector, then the new DataTable will be constructed as
                 * per normal.
                 *  @type boolean
                 *  @default false
+                *
                 *  @dtopt Options
-                * 
+                *  @name DataTable.defaults.destroy
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "sScrollY": "200px",
-                *        "bPaginate": false
+                *        "srollY": "200px",
+                *        "paginate": false
                 *      } );
-                *      
+                *
                 *      // Some time later....
                 *      $('#example').dataTable( {
-                *        "bFilter": false,
-                *        "bDestroy": true
+                *        "filter": false,
+                *        "destroy": true
                 *      } );
                 *    } );
                 */
                 * specified (this allow matching across multiple columns). Note that if you
                 * wish to use filtering in DataTables this must remain 'true' - to remove the
                 * default filtering input box and retain filtering abilities, please use
-                * {@link DataTable.defaults.sDom}.
+                * {@link DataTable.defaults.dom}.
                 *  @type boolean
                 *  @default true
+                *
                 *  @dtopt Features
-                * 
+                *  @name DataTable.defaults.searching
+                *
                 *  @example
                 *    $(document).ready( function () {
                 *      $('#example').dataTable( {
-                *        "bFilter": false
+                *        "searching": false
                 *      } );
                 *    } );
                 */
        
        
                /**
-                * Enable or disable the table information display. This shows information 
+                * Enable or disable the table information display. This shows information
                 * about the data that is currently visible on the page, including information
                 * about filtered data if that action is being performed.
                 *  @type boolean
                 *  @default true
+                *
                 *  @dtopt Features
-                * 
+                *  @name DataTable.defaults.info
+                *
                 *  @example
                 *    $(document).ready( function () {
                 *      $('#example').dataTable( {
-                *        "bInfo": false
+                *        "info": false
                 *      } );
                 *    } );
                 */
                 * traditionally used).
                 *  @type boolean
                 *  @default false
+                *
                 *  @dtopt Features
-                * 
+                *  @name DataTable.defaults.jQueryUI
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "bJQueryUI": true
+                *        "jQueryUI": true
                 *      } );
                 *    } );
                 */
        
                /**
                 * Allows the end user to select the size of a formatted page from a select
-                * menu (sizes are 10, 25, 50 and 100). Requires pagination (bPaginate).
+                * menu (sizes are 10, 25, 50 and 100). Requires pagination (`paginate`).
                 *  @type boolean
                 *  @default true
+                *
                 *  @dtopt Features
-                * 
+                *  @name DataTable.defaults.lengthChange
+                *
                 *  @example
                 *    $(document).ready( function () {
                 *      $('#example').dataTable( {
-                *        "bLengthChange": false
+                *        "lengthChange": false
                 *      } );
                 *    } );
                 */
                 * Enable or disable pagination.
                 *  @type boolean
                 *  @default true
+                *
                 *  @dtopt Features
-                * 
+                *  @name DataTable.defaults.paging
+                *
                 *  @example
                 *    $(document).ready( function () {
                 *      $('#example').dataTable( {
-                *        "bPaginate": false
+                *        "paging": false
                 *      } );
                 *    } );
                 */
                 * the entries.
                 *  @type boolean
                 *  @default false
+                *
                 *  @dtopt Features
-                * 
+                *  @name DataTable.defaults.processing
+                *
                 *  @example
                 *    $(document).ready( function () {
                 *      $('#example').dataTable( {
-                *        "bProcessing": true
+                *        "processing": true
                 *      } );
                 *    } );
                 */
                 * to simply return the object that has already been set up - it will not take
                 * account of any changes you might have made to the initialisation object
                 * passed to DataTables (setting this parameter to true is an acknowledgement
-                * that you understand this). bDestroy can be used to reinitialise a table if
+                * that you understand this). `destroy` can be used to reinitialise a table if
                 * you need.
                 *  @type boolean
                 *  @default false
+                *
                 *  @dtopt Options
-                * 
+                *  @name DataTable.defaults.retrieve
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      initTable();
                 *      tableActions();
                 *    } );
-                *    
+                *
                 *    function initTable ()
                 *    {
                 *      return $('#example').dataTable( {
-                *        "sScrollY": "200px",
-                *        "bPaginate": false,
-                *        "bRetrieve": true
+                *        "scrollY": "200px",
+                *        "paginate": false,
+                *        "retrieve": true
                 *      } );
                 *    }
-                *    
+                *
                 *    function tableActions ()
                 *    {
-                *      var oTable = initTable();
-                *      // perform API operations with oTable 
+                *      var table = initTable();
+                *      // perform API operations with oTable
                 *    }
                 */
                "bRetrieve": false,
        
        
-               /**
-                * Indicate if DataTables should be allowed to set the padding / margin
-                * etc for the scrolling header elements or not. Typically you will want
-                * this.
-                *  @type boolean
-                *  @default true
-                *  @dtopt Options
-                * 
-                *  @example
-                *    $(document).ready( function() {
-                *      $('#example').dataTable( {
-                *        "bScrollAutoCss": false,
-                *        "sScrollY": "200px"
-                *      } );
-                *    } );
-                */
-               "bScrollAutoCss": true,
-       
-       
                /**
                 * When vertical (y) scrolling is enabled, DataTables will force the height of
                 * the table's viewport to the given height at all times (useful for layout).
                 * the result set will fit within the given Y height.
                 *  @type boolean
                 *  @default false
+                *
                 *  @dtopt Options
-                * 
+                *  @name DataTable.defaults.scrollCollapse
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "sScrollY": "200",
-                *        "bScrollCollapse": true
+                *        "scrollY": "200",
+                *        "scrollCollapse": true
                 *      } );
                 *    } );
                 */
        
        
                /**
-                * Enable infinite scrolling for DataTables (to be used in combination with
-                * sScrollY). Infinite scrolling means that DataTables will continually load
-                * data as a user scrolls through a table, which is very useful for large
-                * dataset. This cannot be used with pagination, which is automatically
-                * disabled. Note - the Scroller extra for DataTables is recommended in
-                * in preference to this option.
+                * Configure DataTables to use server-side processing. Note that the
+                * `ajax` parameter must also be given in order to give DataTables a
+                * source to obtain the required data for each draw.
                 *  @type boolean
                 *  @default false
+                *
                 *  @dtopt Features
-                * 
+                *  @dtopt Server-side
+                *  @name DataTable.defaults.serverSide
+                *
                 *  @example
-                *    $(document).ready( function() {
+                *    $(document).ready( function () {
                 *      $('#example').dataTable( {
-                *        "bScrollInfinite": true,
-                *        "bScrollCollapse": true,
-                *        "sScrollY": "200px"
+                *        "serverSide": true,
+                *        "ajax": "xhr.php"
                 *      } );
                 *    } );
                 */
-               "bScrollInfinite": false,
+               "bServerSide": false,
        
        
                /**
-                * Configure DataTables to use server-side processing. Note that the
-                * sAjaxSource parameter must also be given in order to give DataTables a
-                * source to obtain the required data for each draw.
+                * Enable or disable sorting of columns. Sorting of individual columns can be
+                * disabled by the `sortable` option for each column.
                 *  @type boolean
-                *  @default false
+                *  @default true
+                *
                 *  @dtopt Features
-                *  @dtopt Server-side
-                * 
+                *  @name DataTable.defaults.ordering
+                *
                 *  @example
                 *    $(document).ready( function () {
                 *      $('#example').dataTable( {
-                *        "bServerSide": true,
-                *        "sAjaxSource": "xhr.php"
+                *        "ordering": false
                 *      } );
                 *    } );
                 */
-               "bServerSide": false,
+               "bSort": true,
        
        
                /**
-                * Enable or disable sorting of columns. Sorting of individual columns can be
-                * disabled by the "bSortable" option for each column.
+                * Enable or display DataTables' ability to sort multiple columns at the
+                * same time (activated by shift-click by the user).
                 *  @type boolean
                 *  @default true
-                *  @dtopt Features
-                * 
+                *
+                *  @dtopt Options
+                *  @name DataTable.defaults.orderMulti
+                *
                 *  @example
+                *    // Disable multiple column sorting ability
                 *    $(document).ready( function () {
                 *      $('#example').dataTable( {
-                *        "bSort": false
+                *        "orderMulti": false
                 *      } );
                 *    } );
                 */
-               "bSort": true,
+               "bSortMulti": true,
        
        
                /**
                 * This is useful when using complex headers.
                 *  @type boolean
                 *  @default false
+                *
                 *  @dtopt Options
-                * 
+                *  @name DataTable.defaults.orderCellsTop
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "bSortCellsTop": true
+                *        "orderCellsTop": true
                 *      } );
                 *    } );
                 */
        
        
                /**
-                * Enable or disable the addition of the classes 'sorting_1', 'sorting_2' and
-                * 'sorting_3' to the columns which are currently being sorted on. This is
+                * Enable or disable the addition of the classes `sorting\_1`, `sorting\_2` and
+                * `sorting\_3` to the columns which are currently being sorted on. This is
                 * presented as a feature switch as it can increase processing time (while
                 * classes are removed and added) so for large data sets you might want to
                 * turn this off.
                 *  @type boolean
                 *  @default true
+                *
                 *  @dtopt Features
-                * 
+                *  @name DataTable.defaults.orderClasses
+                *
                 *  @example
                 *    $(document).ready( function () {
                 *      $('#example').dataTable( {
-                *        "bSortClasses": false
+                *        "orderClasses": false
                 *      } );
                 *    } );
                 */
        
        
                /**
-                * Enable or disable state saving. When enabled a cookie will be used to save
-                * table display information such as pagination information, display length,
-                * filtering and sorting. As such when the end user reloads the page the
-                * display display will match what thy had previously set up.
+                * Enable or disable state saving. When enabled HTML5 `localStorage` will be
+                * used to save table display information such as pagination information,
+                * display length, filtering and sorting. As such when the end user reloads
+                * the page the display display will match what thy had previously set up.
+                *
+                * Due to the use of `localStorage` the default state saving is not supported
+                * in IE6 or 7. If state saving is required in those browsers, use
+                * `stateSaveCallback` to provide a storage solution such as cookies.
                 *  @type boolean
                 *  @default false
+                *
                 *  @dtopt Features
-                * 
+                *  @name DataTable.defaults.stateSave
+                *
                 *  @example
                 *    $(document).ready( function () {
                 *      $('#example').dataTable( {
-                *        "bStateSave": true
+                *        "stateSave": true
                 *      } );
                 *    } );
                 */
                "bStateSave": false,
        
        
-               /**
-                * Customise the cookie and / or the parameters being stored when using
-                * DataTables with state saving enabled. This function is called whenever
-                * the cookie is modified, and it expects a fully formed cookie string to be
-                * returned. Note that the data object passed in is a Javascript object which
-                * must be converted to a string (JSON.stringify for example).
-                *  @type function
-                *  @param {string} sName Name of the cookie defined by DataTables
-                *  @param {object} oData Data to be stored in the cookie
-                *  @param {string} sExpires Cookie expires string
-                *  @param {string} sPath Path of the cookie to set
-                *  @returns {string} Cookie formatted string (which should be encoded by
-                *    using encodeURIComponent())
-                *  @dtopt Callbacks
-                * 
-                *  @example
-                *    $(document).ready( function () {
-                *      $('#example').dataTable( {
-                *        "fnCookieCallback": function (sName, oData, sExpires, sPath) {
-                *          // Customise oData or sName or whatever else here
-                *          return sName + "="+JSON.stringify(oData)+"; expires=" + sExpires +"; path=" + sPath;
-                *        }
-                *      } );
-                *    } );
-                */
-               "fnCookieCallback": null,
-       
-       
                /**
                 * This function is called when a TR element is created (and all TD child
                 * elements have been inserted), or registered if using a DOM source, allowing
                 * manipulation of the TR element (adding classes etc).
                 *  @type function
-                *  @param {node} nRow "TR" element for the current row
-                *  @param {array} aData Raw data array for this row
-                *  @param {int} iDataIndex The index of this row in aoData
+                *  @param {node} row "TR" element for the current row
+                *  @param {array} data Raw data array for this row
+                *  @param {int} dataIndex The index of this row in the internal aoData array
+                *
                 *  @dtopt Callbacks
-                * 
+                *  @name DataTable.defaults.createdRow
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "fnCreatedRow": function( nRow, aData, iDataIndex ) {
+                *        "createdRow": function( row, data, dataIndex ) {
                 *          // Bold the grade for all 'A' grade browsers
-                *          if ( aData[4] == "A" )
+                *          if ( data[4] == "A" )
                 *          {
-                *            $('td:eq(4)', nRow).html( '<b>A</b>' );
+                *            $('td:eq(4)', row).html( '<b>A</b>' );
                 *          }
                 *        }
                 *      } );
                 * This function is called on every 'draw' event, and allows you to
                 * dynamically modify any aspect you want about the created DOM.
                 *  @type function
-                *  @param {object} oSettings DataTables settings object
+                *  @param {object} settings DataTables settings object
+                *
                 *  @dtopt Callbacks
-                * 
+                *  @name DataTable.defaults.drawCallback
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "fnDrawCallback": function( oSettings ) {
+                *        "drawCallback": function( settings ) {
                 *          alert( 'DataTables has redrawn the table' );
                 *        }
                 *      } );
        
                /**
                 * Identical to fnHeaderCallback() but for the table footer this function
-                * allows you to modify the table footer on every 'draw' even.
+                * allows you to modify the table footer on every 'draw' event.
                 *  @type function
-                *  @param {node} nFoot "TR" element for the footer
-                *  @param {array} aData Full table data (as derived from the original HTML)
-                *  @param {int} iStart Index for the current display starting point in the 
+                *  @param {node} foot "TR" element for the footer
+                *  @param {array} data Full table data (as derived from the original HTML)
+                *  @param {int} start Index for the current display starting point in the
                 *    display array
-                *  @param {int} iEnd Index for the current display ending point in the 
+                *  @param {int} end Index for the current display ending point in the
                 *    display array
-                *  @param {array int} aiDisplay Index array to translate the visual position
+                *  @param {array int} display Index array to translate the visual position
                 *    to the full data array
+                *
                 *  @dtopt Callbacks
-                * 
+                *  @name DataTable.defaults.footerCallback
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "fnFooterCallback": function( nFoot, aData, iStart, iEnd, aiDisplay ) {
-                *          nFoot.getElementsByTagName('th')[0].innerHTML = "Starting index is "+iStart;
+                *        "footerCallback": function( tfoot, data, start, end, display ) {
+                *          tfoot.getElementsByTagName('th')[0].innerHTML = "Starting index is "+start;
                 *        }
                 *      } );
                 *    } )
                 * function will override the default method DataTables uses.
                 *  @type function
                 *  @member
-                *  @param {int} iIn number to be formatted
+                *  @param {int} toFormat number to be formatted
                 *  @returns {string} formatted string for DataTables to show the number
+                *
                 *  @dtopt Callbacks
-                * 
+                *  @name DataTable.defaults.formatNumber
+                *
                 *  @example
+                *    // Format a number using a single quote for the separator (note that
+                *    // this can also be done with the language.thousands option)
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "fnFormatNumber": function ( iIn ) {
-                *          if ( iIn &lt; 1000 ) {
-                *            return iIn;
-                *          } else {
-                *            var 
-                *              s=(iIn+""), 
-                *              a=s.split(""), out="", 
-                *              iLen=s.length;
-                *            
-                *            for ( var i=0 ; i&lt;iLen ; i++ ) {
-                *              if ( i%3 === 0 &amp;&amp; i !== 0 ) {
-                *                out = "'"+out;
-                *              }
-                *              out = a[iLen-i-1]+out;
-                *            }
-                *          }
-                *          return out;
+                *        "formatNumber": function ( toFormat ) {
+                *          return toFormat.toString().replace(
+                *            /\B(?=(\d{3})+(?!\d))/g, "'"
+                *          );
                 *        };
                 *      } );
                 *    } );
                 */
-               "fnFormatNumber": function ( iIn ) {
-                       if ( iIn < 1000 )
-                       {
-                               // A small optimisation for what is likely to be the majority of use cases
-                               return iIn;
-                       }
-       
-                       var s=(iIn+""), a=s.split(""), out="", iLen=s.length;
-                       
-                       for ( var i=0 ; i<iLen ; i++ )
-                       {
-                               if ( i%3 === 0 && i !== 0 )
-                               {
-                                       out = this.oLanguage.sInfoThousands+out;
-                               }
-                               out = a[iLen-i-1]+out;
-                       }
-                       return out;
+               "fnFormatNumber": function ( toFormat ) {
+                       return toFormat.toString().replace(
+                               /\B(?=(\d{3})+(?!\d))/g,
+                               this.oLanguage.sThousands
+                       );
                },
        
        
                 * dynamically modify the header row. This can be used to calculate and
                 * display useful information about the table.
                 *  @type function
-                *  @param {node} nHead "TR" element for the header
-                *  @param {array} aData Full table data (as derived from the original HTML)
-                *  @param {int} iStart Index for the current display starting point in the
+                *  @param {node} head "TR" element for the header
+                *  @param {array} data Full table data (as derived from the original HTML)
+                *  @param {int} start Index for the current display starting point in the
                 *    display array
-                *  @param {int} iEnd Index for the current display ending point in the
+                *  @param {int} end Index for the current display ending point in the
                 *    display array
-                *  @param {array int} aiDisplay Index array to translate the visual position
+                *  @param {array int} display Index array to translate the visual position
                 *    to the full data array
+                *
                 *  @dtopt Callbacks
-                * 
+                *  @name DataTable.defaults.headerCallback
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "fnHeaderCallback": function( nHead, aData, iStart, iEnd, aiDisplay ) {
-                *          nHead.getElementsByTagName('th')[0].innerHTML = "Displaying "+(iEnd-iStart)+" records";
+                *        "fheaderCallback": function( head, data, start, end, display ) {
+                *          head.getElementsByTagName('th')[0].innerHTML = "Displaying "+(end-start)+" records";
                 *        }
                 *      } );
                 *    } )
                 * allows you to do exactly that.
                 *  @type function
                 *  @param {object} oSettings DataTables settings object
-                *  @param {int} iStart Starting position in data for the draw
-                *  @param {int} iEnd End position in data for the draw
-                *  @param {int} iMax Total number of rows in the table (regardless of
+                *  @param {int} start Starting position in data for the draw
+                *  @param {int} end End position in data for the draw
+                *  @param {int} max Total number of rows in the table (regardless of
                 *    filtering)
-                *  @param {int} iTotal Total number of rows in the data set, after filtering
-                *  @param {string} sPre The string that DataTables has formatted using it's
+                *  @param {int} total Total number of rows in the data set, after filtering
+                *  @param {string} pre The string that DataTables has formatted using it's
                 *    own rules
                 *  @returns {string} The string to be displayed in the information element.
+                *
                 *  @dtopt Callbacks
-                * 
+                *  @name DataTable.defaults.infoCallback
+                *
                 *  @example
                 *    $('#example').dataTable( {
-                *      "fnInfoCallback": function( oSettings, iStart, iEnd, iMax, iTotal, sPre ) {
-                *        return iStart +" to "+ iEnd;
+                *      "infoCallback": function( settings, start, end, max, total, pre ) {
+                *        return start +" to "+ end;
                 *      }
                 *    } );
                 */
                 * however, this does not hold true when using external language information
                 * since that is obtained using an async XHR call.
                 *  @type function
-                *  @param {object} oSettings DataTables settings object
+                *  @param {object} settings DataTables settings object
                 *  @param {object} json The JSON object request from the server - only
                 *    present if client-side Ajax sourced data is used
+                *
                 *  @dtopt Callbacks
-                * 
+                *  @name DataTable.defaults.initComplete
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "fnInitComplete": function(oSettings, json) {
+                *        "initComplete": function(settings, json) {
                 *          alert( 'DataTables has finished its initialisation.' );
                 *        }
                 *      } );
                 * draw by returning false, any other return (including undefined) results in
                 * the full draw occurring).
                 *  @type function
-                *  @param {object} oSettings DataTables settings object
+                *  @param {object} settings DataTables settings object
                 *  @returns {boolean} False will cancel the draw, anything else (including no
                 *    return) will allow it to complete.
+                *
                 *  @dtopt Callbacks
-                * 
+                *  @name DataTable.defaults.preDrawCallback
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "fnPreDrawCallback": function( oSettings ) {
+                *        "preDrawCallback": function( settings ) {
                 *          if ( $('#test').val() == 1 ) {
                 *            return false;
                 *          }
                 * generated for each table draw, but before it is rendered on screen. This
                 * function might be used for setting the row class name etc.
                 *  @type function
-                *  @param {node} nRow "TR" element for the current row
-                *  @param {array} aData Raw data array for this row
-                *  @param {int} iDisplayIndex The display index for the current table draw
-                *  @param {int} iDisplayIndexFull The index of the data in the full list of
+                *  @param {node} row "TR" element for the current row
+                *  @param {array} data Raw data array for this row
+                *  @param {int} displayIndex The display index for the current table draw
+                *  @param {int} displayIndexFull The index of the data in the full list of
                 *    rows (after filtering)
+                *
                 *  @dtopt Callbacks
-                * 
+                *  @name DataTable.defaults.rowCallback
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
+                *        "rowCallback": function( row, data, displayIndex, displayIndexFull ) {
                 *          // Bold the grade for all 'A' grade browsers
-                *          if ( aData[4] == "A" )
-                *          {
-                *            $('td:eq(4)', nRow).html( '<b>A</b>' );
+                *          if ( data[4] == "A" ) {
+                *            $('td:eq(4)', row).html( '<b>A</b>' );
                 *          }
                 *        }
                 *      } );
        
        
                /**
+                * __Deprecated__ The functionality provided by this parameter has now been
+                * superseded by that provided through `ajax`, which should be used instead.
+                *
                 * This parameter allows you to override the default function which obtains
-                * the data from the server ($.getJSON) so something more suitable for your
-                * application. For example you could use POST data, or pull information from
-                * a Gears or AIR database.
+                * the data from the server so something more suitable for your application.
+                * For example you could use POST data, or pull information from a Gears or
+                * AIR database.
                 *  @type function
                 *  @member
-                *  @param {string} sSource HTTP source to obtain the data from (sAjaxSource)
-                *  @param {array} aoData A key/value pair object containing the data to send
+                *  @param {string} source HTTP source to obtain the data from (`ajax`)
+                *  @param {array} data A key/value pair object containing the data to send
                 *    to the server
-                *  @param {function} fnCallback to be called on completion of the data get
+                *  @param {function} callback to be called on completion of the data get
                 *    process that will draw the data on the page.
-                *  @param {object} oSettings DataTables settings object
+                *  @param {object} settings DataTables settings object
+                *
                 *  @dtopt Callbacks
                 *  @dtopt Server-side
-                * 
-                *  @example
-                *    // POST data to server
-                *    $(document).ready( function() {
-                *      $('#example').dataTable( {
-                *        "bProcessing": true,
-                *        "bServerSide": true,
-                *        "sAjaxSource": "xhr.php",
-                *        "fnServerData": function ( sSource, aoData, fnCallback, oSettings ) {
-                *          oSettings.jqXHR = $.ajax( {
-                *            "dataType": 'json', 
-                *            "type": "POST", 
-                *            "url": sSource, 
-                *            "data": aoData, 
-                *            "success": fnCallback
-                *          } );
-                *        }
-                *      } );
-                *    } );
+                *  @name DataTable.defaults.serverData
+                *
+                *  @deprecated 1.10. Please use `ajax` for this functionality now.
                 */
-               "fnServerData": function ( sUrl, aoData, fnCallback, oSettings ) {
-                       oSettings.jqXHR = $.ajax( {
-                               "url":  sUrl,
-                               "data": aoData,
-                               "success": function (json) {
-                                       if ( json.sError ) {
-                                               oSettings.oApi._fnLog( oSettings, 0, json.sError );
-                                       }
-                                       
-                                       $(oSettings.oInstance).trigger('xhr', [oSettings, json]);
-                                       fnCallback( json );
-                               },
-                               "dataType": "json",
-                               "cache": false,
-                               "type": oSettings.sServerMethod,
-                               "error": function (xhr, error, thrown) {
-                                       if ( error == "parsererror" ) {
-                                               oSettings.oApi._fnLog( oSettings, 0, "DataTables warning: JSON data from "+
-                                                       "server could not be parsed. This is caused by a JSON formatting error." );
-                                       }
-                               }
-                       } );
-               },
+               "fnServerData": null,
        
        
                /**
-                * It is often useful to send extra data to the server when making an Ajax
+                * __Deprecated__ The functionality provided by this parameter has now been
+                * superseded by that provided through `ajax`, which should be used instead.
+                *
+                *  It is often useful to send extra data to the server when making an Ajax
                 * request - for example custom filtering information, and this callback
                 * function makes it trivial to send extra information to the server. The
                 * passed in parameter is the data set that has been constructed by
                 * DataTables, and you can add to this or modify it as you require.
                 *  @type function
-                *  @param {array} aoData Data array (array of objects which are name/value
+                *  @param {array} data Data array (array of objects which are name/value
                 *    pairs) that has been constructed by DataTables and will be sent to the
                 *    server. In the case of Ajax sourced data with server-side processing
                 *    this will be an empty array, for server-side processing there will be a
                 *    significant number of parameters!
-                *  @returns {undefined} Ensure that you modify the aoData array passed in,
+                *  @returns {undefined} Ensure that you modify the data array passed in,
                 *    as this is passed by reference.
+                *
                 *  @dtopt Callbacks
                 *  @dtopt Server-side
-                * 
-                *  @example
-                *    $(document).ready( function() {
-                *      $('#example').dataTable( {
-                *        "bProcessing": true,
-                *        "bServerSide": true,
-                *        "sAjaxSource": "scripts/server_processing.php",
-                *        "fnServerParams": function ( aoData ) {
-                *          aoData.push( { "name": "more_data", "value": "my_value" } );
-                *        }
-                *      } );
-                *    } );
+                *  @name DataTable.defaults.serverParams
+                *
+                *  @deprecated 1.10. Please use `ajax` for this functionality now.
                 */
                "fnServerParams": null,
        
        
                /**
                 * Load the table state. With this function you can define from where, and how, the
-                * state of a table is loaded. By default DataTables will load from its state saving
-                * cookie, but you might wish to use local storage (HTML5) or a server-side database.
+                * state of a table is loaded. By default DataTables will load from `localStorage`
+                * but you might wish to use a server-side database or cookies.
                 *  @type function
                 *  @member
-                *  @param {object} oSettings DataTables settings object
+                *  @param {object} settings DataTables settings object
                 *  @return {object} The DataTables state object to be loaded
+                *
                 *  @dtopt Callbacks
-                * 
+                *  @name DataTable.defaults.stateLoadCallback
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "bStateSave": true,
-                *        "fnStateLoad": function (oSettings) {
+                *        "stateSave": true,
+                *        "stateLoadCallback": function (settings) {
                 *          var o;
-                *          
+                *
                 *          // Send an Ajax request to the server to get the data. Note that
                 *          // this is a synchronous request.
                 *          $.ajax( {
                 *              o = json;
                 *            }
                 *          } );
-                *          
+                *
                 *          return o;
                 *        }
                 *      } );
                 *    } );
                 */
-               "fnStateLoad": function ( oSettings ) {
-                       var sData = this.oApi._fnReadCookie( oSettings.sCookiePrefix+oSettings.sInstance );
-                       var oData;
-       
+               "fnStateLoadCallback": function ( settings ) {
                        try {
-                               oData = (typeof $.parseJSON === 'function') ? 
-                                       $.parseJSON(sData) : eval( '('+sData+')' );
-                       } catch (e) {
-                               oData = null;
-                       }
-       
-                       return oData;
+                               return JSON.parse(
+                                       (settings.iStateDuration === -1 ? sessionStorage : localStorage).getItem(
+                                               'DataTables_'+settings.sInstance+'_'+location.pathname
+                                       )
+                               );
+                       } catch (e) {}
                },
        
        
                /**
                 * Callback which allows modification of the saved state prior to loading that state.
                 * This callback is called when the table is loading state from the stored data, but
-                * prior to the settings object being modified by the saved state. Note that for 
-                * plug-in authors, you should use the 'stateLoadParams' event to load parameters for 
+                * prior to the settings object being modified by the saved state. Note that for
+                * plug-in authors, you should use the `stateLoadParams` event to load parameters for
                 * a plug-in.
                 *  @type function
-                *  @param {object} oSettings DataTables settings object
-                *  @param {object} oData The state object that is to be loaded
+                *  @param {object} settings DataTables settings object
+                *  @param {object} data The state object that is to be loaded
+                *
                 *  @dtopt Callbacks
-                * 
+                *  @name DataTable.defaults.stateLoadParams
+                *
                 *  @example
                 *    // Remove a saved filter, so filtering is never loaded
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "bStateSave": true,
-                *        "fnStateLoadParams": function (oSettings, oData) {
-                *          oData.oSearch.sSearch = "";
+                *        "stateSave": true,
+                *        "stateLoadParams": function (settings, data) {
+                *          data.oSearch.sSearch = "";
                 *        }
                 *      } );
                 *    } );
-                * 
+                *
                 *  @example
                 *    // Disallow state loading by returning false
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "bStateSave": true,
-                *        "fnStateLoadParams": function (oSettings, oData) {
+                *        "stateSave": true,
+                *        "stateLoadParams": function (settings, data) {
                 *          return false;
                 *        }
                 *      } );
                 * Callback that is called when the state has been loaded from the state saving method
                 * and the DataTables settings object has been modified as a result of the loaded state.
                 *  @type function
-                *  @param {object} oSettings DataTables settings object
-                *  @param {object} oData The state object that was loaded
+                *  @param {object} settings DataTables settings object
+                *  @param {object} data The state object that was loaded
+                *
                 *  @dtopt Callbacks
-                * 
+                *  @name DataTable.defaults.stateLoaded
+                *
                 *  @example
                 *    // Show an alert with the filtering value that was saved
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "bStateSave": true,
-                *        "fnStateLoaded": function (oSettings, oData) {
-                *          alert( 'Saved filter was: '+oData.oSearch.sSearch );
+                *        "stateSave": true,
+                *        "stateLoaded": function (settings, data) {
+                *          alert( 'Saved filter was: '+data.oSearch.sSearch );
                 *        }
                 *      } );
                 *    } );
        
                /**
                 * Save the table state. This function allows you to define where and how the state
-                * information for the table is stored - by default it will use a cookie, but you
-                * might want to use local storage (HTML5) or a server-side database.
+                * information for the table is stored By default DataTables will use `localStorage`
+                * but you might wish to use a server-side database or cookies.
                 *  @type function
                 *  @member
-                *  @param {object} oSettings DataTables settings object
-                *  @param {object} oData The state object to be saved
+                *  @param {object} settings DataTables settings object
+                *  @param {object} data The state object to be saved
+                *
                 *  @dtopt Callbacks
-                * 
+                *  @name DataTable.defaults.stateSaveCallback
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "bStateSave": true,
-                *        "fnStateSave": function (oSettings, oData) {
+                *        "stateSave": true,
+                *        "stateSaveCallback": function (settings, data) {
                 *          // Send an Ajax request to the server with the state object
                 *          $.ajax( {
                 *            "url": "/state_save",
-                *            "data": oData,
+                *            "data": data,
                 *            "dataType": "json",
                 *            "method": "POST"
                 *            "success": function () {}
                 *      } );
                 *    } );
                 */
-               "fnStateSave": function ( oSettings, oData ) {
-                       this.oApi._fnCreateCookie( 
-                               oSettings.sCookiePrefix+oSettings.sInstance, 
-                               this.oApi._fnJsonString(oData), 
-                               oSettings.iCookieDuration, 
-                               oSettings.sCookiePrefix, 
-                               oSettings.fnCookieCallback
-                       );
+               "fnStateSaveCallback": function ( settings, data ) {
+                       try {
+                               (settings.iStateDuration === -1 ? sessionStorage : localStorage).setItem(
+                                       'DataTables_'+settings.sInstance+'_'+location.pathname,
+                                       JSON.stringify( data )
+                               );
+                       } catch (e) {}
                },
        
        
                /**
-                * Callback which allows modification of the state to be saved. Called when the table 
+                * Callback which allows modification of the state to be saved. Called when the table
                 * has changed state a new state save is required. This method allows modification of
-                * the state saving object prior to actually doing the save, including addition or 
-                * other state properties or modification. Note that for plug-in authors, you should 
-                * use the 'stateSaveParams' event to save parameters for a plug-in.
+                * the state saving object prior to actually doing the save, including addition or
+                * other state properties or modification. Note that for plug-in authors, you should
+                * use the `stateSaveParams` event to save parameters for a plug-in.
                 *  @type function
-                *  @param {object} oSettings DataTables settings object
-                *  @param {object} oData The state object to be saved
+                *  @param {object} settings DataTables settings object
+                *  @param {object} data The state object to be saved
+                *
                 *  @dtopt Callbacks
-                * 
+                *  @name DataTable.defaults.stateSaveParams
+                *
                 *  @example
                 *    // Remove a saved filter, so filtering is never saved
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "bStateSave": true,
-                *        "fnStateSaveParams": function (oSettings, oData) {
-                *          oData.oSearch.sSearch = "";
+                *        "stateSave": true,
+                *        "stateSaveParams": function (settings, data) {
+                *          data.oSearch.sSearch = "";
                 *        }
                 *      } );
                 *    } );
        
        
                /**
-                * Duration of the cookie which is used for storing session information. This
-                * value is given in seconds.
+                * Duration for which the saved state information is considered valid. After this period
+                * has elapsed the state will be returned to the default.
+                * Value is given in seconds.
                 *  @type int
                 *  @default 7200 <i>(2 hours)</i>
+                *
                 *  @dtopt Options
-                * 
+                *  @name DataTable.defaults.stateDuration
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "iCookieDuration": 60*60*24; // 1 day
+                *        "stateDuration": 60*60*24; // 1 day
                 *      } );
                 *    } )
                 */
-               "iCookieDuration": 7200,
+               "iStateDuration": 7200,
        
        
                /**
                 * When enabled DataTables will not make a request to the server for the first
                 * page draw - rather it will use the data already on the page (no sorting etc
-                * will be applied to it), thus saving on an XHR at load time. iDeferLoading
+                * will be applied to it), thus saving on an XHR at load time. `deferLoading`
                 * is used to indicate that deferred loading is required, but it is also used
                 * to tell DataTables how many records there are in the full table (allowing
                 * the information element and pagination to be displayed correctly). In the case
                 * to be shown correctly).
                 *  @type int | array
                 *  @default null
+                *
                 *  @dtopt Options
-                * 
+                *  @name DataTable.defaults.deferLoading
+                *
                 *  @example
                 *    // 57 records available in the table, no filtering applied
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "bServerSide": true,
-                *        "sAjaxSource": "scripts/server_processing.php",
-                *        "iDeferLoading": 57
+                *        "serverSide": true,
+                *        "ajax": "scripts/server_processing.php",
+                *        "deferLoading": 57
                 *      } );
                 *    } );
-                * 
+                *
                 *  @example
                 *    // 57 records after filtering, 100 without filtering (an initial filter applied)
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "bServerSide": true,
-                *        "sAjaxSource": "scripts/server_processing.php",
-                *        "iDeferLoading": [ 57, 100 ],
-                *        "oSearch": {
-                *          "sSearch": "my_filter"
+                *        "serverSide": true,
+                *        "ajax": "scripts/server_processing.php",
+                *        "deferLoading": [ 57, 100 ],
+                *        "search": {
+                *          "search": "my_filter"
                 *        }
                 *      } );
                 *    } );
        
                /**
                 * Number of rows to display on a single page when using pagination. If
-                * feature enabled (bLengthChange) then the end user will be able to override
+                * feature enabled (`lengthChange`) then the end user will be able to override
                 * this to a custom setting using a pop-up menu.
                 *  @type int
                 *  @default 10
+                *
                 *  @dtopt Options
-                * 
-                *  @example
-                *    $(document).ready( function() {
-                *      $('#example').dataTable( {
-                *        "iDisplayLength": 50
-                *      } );
-                *    } )
-                */
-               "iDisplayLength": 10,
-       
-       
-               /**
-                * Define the starting point for data display when using DataTables with
-                * pagination. Note that this parameter is the number of records, rather than
-                * the page number, so if you have 10 records per page and want to start on
-                * the third page, it should be "20".
-                *  @type int
-                *  @default 0
-                *  @dtopt Options
-                * 
+                *  @name DataTable.defaults.pageLength
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "iDisplayStart": 20
+                *        "pageLength": 50
                 *      } );
                 *    } )
                 */
-               "iDisplayStart": 0,
+               "iDisplayLength": 10,
        
        
                /**
-                * The scroll gap is the amount of scrolling that is left to go before
-                * DataTables will load the next 'page' of data automatically. You typically
-                * want a gap which is big enough that the scrolling will be smooth for the
-                * user, while not so large that it will load more data than need.
+                * Define the starting point for data display when using DataTables with
+                * pagination. Note that this parameter is the number of records, rather than
+                * the page number, so if you have 10 records per page and want to start on
+                * the third page, it should be "20".
                 *  @type int
-                *  @default 100
+                *  @default 0
+                *
                 *  @dtopt Options
-                * 
+                *  @name DataTable.defaults.displayStart
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "bScrollInfinite": true,
-                *        "bScrollCollapse": true,
-                *        "sScrollY": "200px",
-                *        "iScrollLoadGap": 50
+                *        "displayStart": 20
                 *      } );
-                *    } );
+                *    } )
                 */
-               "iScrollLoadGap": 100,
+               "iDisplayStart": 0,
        
        
                /**
                 * By default DataTables allows keyboard navigation of the table (sorting, paging,
-                * and filtering) by adding a tabindex attribute to the required elements. This
+                * and filtering) by adding a `tabindex` attribute to the required elements. This
                 * allows you to tab through the controls and press the enter key to activate them.
                 * The tabindex is default 0, meaning that the tab follows the flow of the document.
                 * You can overrule this using this parameter if you wish. Use a value of -1 to
                 * disable built-in keyboard navigation.
                 *  @type int
                 *  @default 0
+                *
                 *  @dtopt Options
-                * 
+                *  @name DataTable.defaults.tabIndex
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "iTabIndex": 1
+                *        "tabIndex": 1
                 *      } );
                 *    } );
                 */
                "iTabIndex": 0,
        
        
+               /**
+                * Classes that DataTables assigns to the various components and features
+                * that it adds to the HTML table. This allows classes to be configured
+                * during initialisation in addition to through the static
+                * {@link DataTable.ext.oStdClasses} object).
+                *  @namespace
+                *  @name DataTable.defaults.classes
+                */
+               "oClasses": {},
+       
+       
                /**
                 * All strings that DataTables uses in the user interface that it creates
                 * are defined in this object, allowing you to modified them individually or
                 * completely replace them all as required.
                 *  @namespace
+                *  @name DataTable.defaults.language
                 */
                "oLanguage": {
                        /**
                         * actually visible on the page, but will be read by screenreaders, and thus
                         * must be internationalised as well).
                         *  @namespace
+                        *  @name DataTable.defaults.language.aria
                         */
                        "oAria": {
                                /**
                                 * Note that the column header is prefixed to this string.
                                 *  @type string
                                 *  @default : activate to sort column ascending
+                                *
                                 *  @dtopt Language
-                                * 
+                                *  @name DataTable.defaults.language.aria.sortAscending
+                                *
                                 *  @example
                                 *    $(document).ready( function() {
                                 *      $('#example').dataTable( {
-                                *        "oLanguage": {
-                                *          "oAria": {
-                                *            "sSortAscending": " - click/return to sort ascending"
+                                *        "language": {
+                                *          "aria": {
+                                *            "sortAscending": " - click/return to sort ascending"
                                 *          }
                                 *        }
                                 *      } );
                                 * Note that the column header is prefixed to this string.
                                 *  @type string
                                 *  @default : activate to sort column ascending
+                                *
                                 *  @dtopt Language
-                                * 
+                                *  @name DataTable.defaults.language.aria.sortDescending
+                                *
                                 *  @example
                                 *    $(document).ready( function() {
                                 *      $('#example').dataTable( {
-                                *        "oLanguage": {
-                                *          "oAria": {
-                                *            "sSortDescending": " - click/return to sort descending"
+                                *        "language": {
+                                *          "aria": {
+                                *            "sortDescending": " - click/return to sort descending"
                                 *          }
                                 *        }
                                 *      } );
                        },
        
                        /**
-                        * Pagination string used by DataTables for the two built-in pagination
-                        * control types ("two_button" and "full_numbers")
+                        * Pagination string used by DataTables for the built-in pagination
+                        * control types.
                         *  @namespace
+                        *  @name DataTable.defaults.language.paginate
                         */
                        "oPaginate": {
                                /**
                                 * button to take the user to the first page.
                                 *  @type string
                                 *  @default First
+                                *
                                 *  @dtopt Language
-                                * 
+                                *  @name DataTable.defaults.language.paginate.first
+                                *
                                 *  @example
                                 *    $(document).ready( function() {
                                 *      $('#example').dataTable( {
-                                *        "oLanguage": {
-                                *          "oPaginate": {
-                                *            "sFirst": "First page"
+                                *        "language": {
+                                *          "paginate": {
+                                *            "first": "First page"
                                 *          }
                                 *        }
                                 *      } );
                                 *    } );
                                 */
                                "sFirst": "First",
-                       
-                       
+       
+       
                                /**
                                 * Text to use when using the 'full_numbers' type of pagination for the
                                 * button to take the user to the last page.
                                 *  @type string
                                 *  @default Last
+                                *
                                 *  @dtopt Language
-                                * 
+                                *  @name DataTable.defaults.language.paginate.last
+                                *
                                 *  @example
                                 *    $(document).ready( function() {
                                 *      $('#example').dataTable( {
-                                *        "oLanguage": {
-                                *          "oPaginate": {
-                                *            "sLast": "Last page"
+                                *        "language": {
+                                *          "paginate": {
+                                *            "last": "Last page"
                                 *          }
                                 *        }
                                 *      } );
                                 *    } );
                                 */
                                "sLast": "Last",
-                       
-                       
+       
+       
                                /**
-                                * Text to use for the 'next' pagination button (to take the user to the 
+                                * Text to use for the 'next' pagination button (to take the user to the
                                 * next page).
                                 *  @type string
                                 *  @default Next
+                                *
                                 *  @dtopt Language
-                                * 
+                                *  @name DataTable.defaults.language.paginate.next
+                                *
                                 *  @example
                                 *    $(document).ready( function() {
                                 *      $('#example').dataTable( {
-                                *        "oLanguage": {
-                                *          "oPaginate": {
-                                *            "sNext": "Next page"
+                                *        "language": {
+                                *          "paginate": {
+                                *            "next": "Next page"
                                 *          }
                                 *        }
                                 *      } );
                                 *    } );
                                 */
                                "sNext": "Next",
-                       
-                       
+       
+       
                                /**
-                                * Text to use for the 'previous' pagination button (to take the user to  
+                                * Text to use for the 'previous' pagination button (to take the user to
                                 * the previous page).
                                 *  @type string
                                 *  @default Previous
+                                *
                                 *  @dtopt Language
-                                * 
+                                *  @name DataTable.defaults.language.paginate.previous
+                                *
                                 *  @example
                                 *    $(document).ready( function() {
                                 *      $('#example').dataTable( {
-                                *        "oLanguage": {
-                                *          "oPaginate": {
-                                *            "sPrevious": "Previous page"
+                                *        "language": {
+                                *          "paginate": {
+                                *            "previous": "Previous page"
                                 *          }
                                 *        }
                                 *      } );
                                 */
                                "sPrevious": "Previous"
                        },
-               
+       
                        /**
-                        * This string is shown in preference to sZeroRecords when the table is
+                        * This string is shown in preference to `zeroRecords` when the table is
                         * empty of data (regardless of filtering). Note that this is an optional
-                        * parameter - if it is not given, the value of sZeroRecords will be used
+                        * parameter - if it is not given, the value of `zeroRecords` will be used
                         * instead (either the default or given value).
                         *  @type string
                         *  @default No data available in table
+                        *
                         *  @dtopt Language
-                        * 
+                        *  @name DataTable.defaults.language.emptyTable
+                        *
                         *  @example
                         *    $(document).ready( function() {
                         *      $('#example').dataTable( {
-                        *        "oLanguage": {
-                        *          "sEmptyTable": "No data available in table"
+                        *        "language": {
+                        *          "emptyTable": "No data available in table"
                         *        }
                         *      } );
                         *    } );
                         */
                        "sEmptyTable": "No data available in table",
-               
-               
+       
+       
                        /**
-                        * This string gives information to the end user about the information that 
-                        * is current on display on the page. The _START_, _END_ and _TOTAL_ 
-                        * variables are all dynamically replaced as the table display updates, and 
-                        * can be freely moved or removed as the language requirements change.
+                        * This string gives information to the end user about the information
+                        * that is current on display on the page. The following tokens can be
+                        * used in the string and will be dynamically replaced as the table
+                        * display updates. This tokens can be placed anywhere in the string, or
+                        * removed as needed by the language requires:
+                        *
+                        * * `\_START\_` - Display index of the first record on the current page
+                        * * `\_END\_` - Display index of the last record on the current page
+                        * * `\_TOTAL\_` - Number of records in the table after filtering
+                        * * `\_MAX\_` - Number of records in the table without filtering
+                        * * `\_PAGE\_` - Current page number
+                        * * `\_PAGES\_` - Total number of pages of data in the table
+                        *
                         *  @type string
                         *  @default Showing _START_ to _END_ of _TOTAL_ entries
+                        *
                         *  @dtopt Language
-                        * 
+                        *  @name DataTable.defaults.language.info
+                        *
                         *  @example
                         *    $(document).ready( function() {
                         *      $('#example').dataTable( {
-                        *        "oLanguage": {
-                        *          "sInfo": "Got a total of _TOTAL_ entries to show (_START_ to _END_)"
+                        *        "language": {
+                        *          "info": "Showing page _PAGE_ of _PAGES_"
                         *        }
                         *      } );
                         *    } );
                         */
                        "sInfo": "Showing _START_ to _END_ of _TOTAL_ entries",
-               
-               
+       
+       
                        /**
-                        * Display information string for when the table is empty. Typically the 
-                        * format of this string should match sInfo.
+                        * Display information string for when the table is empty. Typically the
+                        * format of this string should match `info`.
                         *  @type string
                         *  @default Showing 0 to 0 of 0 entries
+                        *
                         *  @dtopt Language
-                        * 
+                        *  @name DataTable.defaults.language.infoEmpty
+                        *
                         *  @example
                         *    $(document).ready( function() {
                         *      $('#example').dataTable( {
-                        *        "oLanguage": {
-                        *          "sInfoEmpty": "No entries to show"
+                        *        "language": {
+                        *          "infoEmpty": "No entries to show"
                         *        }
                         *      } );
                         *    } );
                         */
                        "sInfoEmpty": "Showing 0 to 0 of 0 entries",
-               
-               
+       
+       
                        /**
-                        * When a user filters the information in a table, this string is appended 
-                        * to the information (sInfo) to give an idea of how strong the filtering 
+                        * When a user filters the information in a table, this string is appended
+                        * to the information (`info`) to give an idea of how strong the filtering
                         * is. The variable _MAX_ is dynamically updated.
                         *  @type string
                         *  @default (filtered from _MAX_ total entries)
+                        *
                         *  @dtopt Language
-                        * 
+                        *  @name DataTable.defaults.language.infoFiltered
+                        *
                         *  @example
                         *    $(document).ready( function() {
                         *      $('#example').dataTable( {
-                        *        "oLanguage": {
-                        *          "sInfoFiltered": " - filtering from _MAX_ records"
+                        *        "language": {
+                        *          "infoFiltered": " - filtering from _MAX_ records"
                         *        }
                         *      } );
                         *    } );
                         */
                        "sInfoFiltered": "(filtered from _MAX_ total entries)",
-               
-               
+       
+       
                        /**
                         * If can be useful to append extra information to the info string at times,
                         * and this variable does exactly that. This information will be appended to
-                        * the sInfo (sInfoEmpty and sInfoFiltered in whatever combination they are
+                        * the `info` (`infoEmpty` and `infoFiltered` in whatever combination they are
                         * being used) at all times.
                         *  @type string
                         *  @default <i>Empty string</i>
+                        *
                         *  @dtopt Language
-                        * 
+                        *  @name DataTable.defaults.language.infoPostFix
+                        *
                         *  @example
                         *    $(document).ready( function() {
                         *      $('#example').dataTable( {
-                        *        "oLanguage": {
-                        *          "sInfoPostFix": "All records shown are derived from real information."
+                        *        "language": {
+                        *          "infoPostFix": "All records shown are derived from real information."
                         *        }
                         *      } );
                         *    } );
                         */
                        "sInfoPostFix": "",
-               
-               
+       
+       
+                       /**
+                        * This decimal place operator is a little different from the other
+                        * language options since DataTables doesn't output floating point
+                        * numbers, so it won't ever use this for display of a number. Rather,
+                        * what this parameter does is modify the sort methods of the table so
+                        * that numbers which are in a format which has a character other than
+                        * a period (`.`) as a decimal place will be sorted numerically.
+                        *
+                        * Note that numbers with different decimal places cannot be shown in
+                        * the same table and still be sortable, the table must be consistent.
+                        * However, multiple different tables on the page can use different
+                        * decimal place characters.
+                        *  @type string
+                        *  @default 
+                        *
+                        *  @dtopt Language
+                        *  @name DataTable.defaults.language.decimal
+                        *
+                        *  @example
+                        *    $(document).ready( function() {
+                        *      $('#example').dataTable( {
+                        *        "language": {
+                        *          "decimal": ","
+                        *          "thousands": "."
+                        *        }
+                        *      } );
+                        *    } );
+                        */
+                       "sDecimal": "",
+       
+       
                        /**
-                        * DataTables has a build in number formatter (fnFormatNumber) which is used
-                        * to format large numbers that are used in the table information. By
-                        * default a comma is used, but this can be trivially changed to any
+                        * DataTables has a build in number formatter (`formatNumber`) which is
+                        * used to format large numbers that are used in the table information.
+                        * By default a comma is used, but this can be trivially changed to any
                         * character you wish with this parameter.
                         *  @type string
                         *  @default ,
+                        *
                         *  @dtopt Language
-                        * 
+                        *  @name DataTable.defaults.language.thousands
+                        *
                         *  @example
                         *    $(document).ready( function() {
                         *      $('#example').dataTable( {
-                        *        "oLanguage": {
-                        *          "sInfoThousands": "'"
+                        *        "language": {
+                        *          "thousands": "'"
                         *        }
                         *      } );
                         *    } );
                         */
-                       "sInfoThousands": ",",
-               
-               
+                       "sThousands": ",",
+       
+       
                        /**
                         * Detail the action that will be taken when the drop down menu for the
                         * pagination length option is changed. The '_MENU_' variable is replaced
                         * with a custom select box if required.
                         *  @type string
                         *  @default Show _MENU_ entries
+                        *
                         *  @dtopt Language
-                        * 
+                        *  @name DataTable.defaults.language.lengthMenu
+                        *
                         *  @example
                         *    // Language change only
                         *    $(document).ready( function() {
                         *      $('#example').dataTable( {
-                        *        "oLanguage": {
-                        *          "sLengthMenu": "Display _MENU_ records"
+                        *        "language": {
+                        *          "lengthMenu": "Display _MENU_ records"
                         *        }
                         *      } );
                         *    } );
-                        *    
+                        *
                         *  @example
                         *    // Language and options change
                         *    $(document).ready( function() {
                         *      $('#example').dataTable( {
-                        *        "oLanguage": {
-                        *          "sLengthMenu": 'Display <select>'+
+                        *        "language": {
+                        *          "lengthMenu": 'Display <select>'+
                         *            '<option value="10">10</option>'+
                         *            '<option value="20">20</option>'+
                         *            '<option value="30">30</option>'+
                         *    } );
                         */
                        "sLengthMenu": "Show _MENU_ entries",
-               
-               
+       
+       
                        /**
                         * When using Ajax sourced data and during the first draw when DataTables is
                         * gathering the data, this message is shown in an empty row in the table to
                         * Ajax sourced data with client-side processing.
                         *  @type string
                         *  @default Loading...
+                        *
                         *  @dtopt Language
-                        * 
+                        *  @name DataTable.defaults.language.loadingRecords
+                        *
                         *  @example
                         *    $(document).ready( function() {
                         *      $('#example').dataTable( {
-                        *        "oLanguage": {
-                        *          "sLoadingRecords": "Please wait - loading..."
+                        *        "language": {
+                        *          "loadingRecords": "Please wait - loading..."
                         *        }
                         *      } );
                         *    } );
                         */
                        "sLoadingRecords": "Loading...",
-               
-               
+       
+       
                        /**
                         * Text which is displayed when the table is processing a user action
                         * (usually a sort command or similar).
                         *  @type string
                         *  @default Processing...
+                        *
                         *  @dtopt Language
-                        * 
+                        *  @name DataTable.defaults.language.processing
+                        *
                         *  @example
                         *    $(document).ready( function() {
                         *      $('#example').dataTable( {
-                        *        "oLanguage": {
-                        *          "sProcessing": "DataTables is currently busy"
+                        *        "language": {
+                        *          "processing": "DataTables is currently busy"
                         *        }
                         *      } );
                         *    } );
                         */
                        "sProcessing": "Processing...",
-               
-               
+       
+       
                        /**
                         * Details the actions that will be taken when the user types into the
                         * filtering input text box. The variable "_INPUT_", if used in the string,
                         * then the input box is appended to the string automatically.
                         *  @type string
                         *  @default Search:
+                        *
                         *  @dtopt Language
-                        * 
+                        *  @name DataTable.defaults.language.search
+                        *
                         *  @example
                         *    // Input text box will be appended at the end automatically
                         *    $(document).ready( function() {
                         *      $('#example').dataTable( {
-                        *        "oLanguage": {
-                        *          "sSearch": "Filter records:"
+                        *        "language": {
+                        *          "search": "Filter records:"
                         *        }
                         *      } );
                         *    } );
-                        *    
+                        *
                         *  @example
                         *    // Specify where the filter should appear
                         *    $(document).ready( function() {
                         *      $('#example').dataTable( {
-                        *        "oLanguage": {
-                        *          "sSearch": "Apply filter _INPUT_ to table"
+                        *        "language": {
+                        *          "search": "Apply filter _INPUT_ to table"
                         *        }
                         *      } );
                         *    } );
                         */
                        "sSearch": "Search:",
-               
-               
+       
+       
                        /**
                         * All of the language information can be stored in a file on the
                         * server-side, which DataTables will look up if this parameter is passed.
                         * the example language files to see how this works in action.
                         *  @type string
                         *  @default <i>Empty string - i.e. disabled</i>
+                        *
                         *  @dtopt Language
-                        * 
+                        *  @name DataTable.defaults.language.url
+                        *
                         *  @example
                         *    $(document).ready( function() {
                         *      $('#example').dataTable( {
-                        *        "oLanguage": {
-                        *          "sUrl": "http://www.sprymedia.co.uk/dataTables/lang.txt"
+                        *        "language": {
+                        *          "url": "http://www.sprymedia.co.uk/dataTables/lang.txt"
                         *        }
                         *      } );
                         *    } );
                         */
                        "sUrl": "",
-               
-               
+       
+       
                        /**
                         * Text shown inside the table records when the is no information to be
-                        * displayed after filtering. sEmptyTable is shown when there is simply no
+                        * displayed after filtering. `emptyTable` is shown when there is simply no
                         * information in the table at all (regardless of filtering).
                         *  @type string
                         *  @default No matching records found
+                        *
                         *  @dtopt Language
-                        * 
+                        *  @name DataTable.defaults.language.zeroRecords
+                        *
                         *  @example
                         *    $(document).ready( function() {
                         *      $('#example').dataTable( {
-                        *        "oLanguage": {
-                        *          "sZeroRecords": "No records to display"
+                        *        "language": {
+                        *          "zeroRecords": "No records to display"
                         *        }
                         *      } );
                         *    } );
        
                /**
                 * This parameter allows you to have define the global filtering state at
-                * initialisation time. As an object the "sSearch" parameter must be
-                * defined, but all other parameters are optional. When "bRegex" is true,
+                * initialisation time. As an object the `search` parameter must be
+                * defined, but all other parameters are optional. When `regex` is true,
                 * the search string will be treated as a regular expression, when false
-                * (default) it will be treated as a straight string. When "bSmart"
+                * (default) it will be treated as a straight string. When `smart`
                 * DataTables will use it's smart filtering methods (to word match at
                 * any point in the data), when false this will not be done.
                 *  @namespace
                 *  @extends DataTable.models.oSearch
+                *
                 *  @dtopt Options
-                * 
+                *  @name DataTable.defaults.search
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "oSearch": {"sSearch": "Initial search"}
+                *        "search": {"search": "Initial search"}
                 *      } );
                 *    } )
                 */
        
        
                /**
-                * By default DataTables will look for the property 'aaData' when obtaining
-                * data from an Ajax source or for server-side processing - this parameter
-                * allows that property to be changed. You can use Javascript dotted object
-                * notation to get a data source for multiple levels of nesting.
+                * __Deprecated__ The functionality provided by this parameter has now been
+                * superseded by that provided through `ajax`, which should be used instead.
+                *
+                * By default DataTables will look for the property `data` (or `aaData` for
+                * compatibility with DataTables 1.9-) when obtaining data from an Ajax
+                * source or for server-side processing - this parameter allows that
+                * property to be changed. You can use Javascript dotted object notation to
+                * get a data source for multiple levels of nesting.
                 *  @type string
-                *  @default aaData
+                *  @default data
+                *
                 *  @dtopt Options
                 *  @dtopt Server-side
-                * 
-                *  @example
-                *    // Get data from { "data": [...] }
-                *    $(document).ready( function() {
-                *      var oTable = $('#example').dataTable( {
-                *        "sAjaxSource": "sources/data.txt",
-                *        "sAjaxDataProp": "data"
-                *      } );
-                *    } );
-                *    
-                *  @example
-                *    // Get data from { "data": { "inner": [...] } }
-                *    $(document).ready( function() {
-                *      var oTable = $('#example').dataTable( {
-                *        "sAjaxSource": "sources/data.txt",
-                *        "sAjaxDataProp": "data.inner"
-                *      } );
-                *    } );
+                *  @name DataTable.defaults.ajaxDataProp
+                *
+                *  @deprecated 1.10. Please use `ajax` for this functionality now.
                 */
-               "sAjaxDataProp": "aaData",
+               "sAjaxDataProp": "data",
        
        
                /**
-                * You can instruct DataTables to load data from an external source using this
-                * parameter (use aData if you want to pass data in you already have). Simply
-                * provide a url a JSON object can be obtained from. This object must include
-                * the parameter 'aaData' which is the data source for the table.
+                * __Deprecated__ The functionality provided by this parameter has now been
+                * superseded by that provided through `ajax`, which should be used instead.
+                *
+                * You can instruct DataTables to load data from an external
+                * source using this parameter (use aData if you want to pass data in you
+                * already have). Simply provide a url a JSON object can be obtained from.
                 *  @type string
                 *  @default null
+                *
                 *  @dtopt Options
                 *  @dtopt Server-side
-                * 
-                *  @example
-                *    $(document).ready( function() {
-                *      $('#example').dataTable( {
-                *        "sAjaxSource": "http://www.sprymedia.co.uk/dataTables/json.php"
-                *      } );
-                *    } )
+                *  @name DataTable.defaults.ajaxSource
+                *
+                *  @deprecated 1.10. Please use `ajax` for this functionality now.
                 */
                "sAjaxSource": null,
        
        
-               /**
-                * This parameter can be used to override the default prefix that DataTables
-                * assigns to a cookie when state saving is enabled.
-                *  @type string
-                *  @default SpryMedia_DataTables_
-                *  @dtopt Options
-                * 
-                *  @example
-                *    $(document).ready( function() {
-                *      $('#example').dataTable( {
-                *        "sCookiePrefix": "my_datatable_",
-                *      } );
-                *    } );
-                */
-               "sCookiePrefix": "SpryMedia_DataTables_",
-       
-       
                /**
                 * This initialisation variable allows you to specify exactly where in the
                 * DOM you want DataTables to inject the various controls it adds to the page
                 * table). DIV elements (with or without a custom class) can also be added to
                 * aid styling. The follow syntax is used:
                 *   <ul>
-                *     <li>The following options are allowed:   
+                *     <li>The following options are allowed:
                 *       <ul>
-                *         <li>'l' - Length changing</li
+                *         <li>'l' - Length changing</li>
                 *         <li>'f' - Filtering input</li>
                 *         <li>'t' - The table!</li>
                 *         <li>'i' - Information</li>
                 *     </li>
                 *   </ul>
                 *  @type string
-                *  @default lfrtip <i>(when bJQueryUI is false)</i> <b>or</b> 
-                *    <"H"lfr>t<"F"ip> <i>(when bJQueryUI is true)</i>
+                *  @default lfrtip <i>(when `jQueryUI` is false)</i> <b>or</b>
+                *    <"H"lfr>t<"F"ip> <i>(when `jQueryUI` is true)</i>
+                *
                 *  @dtopt Options
-                * 
+                *  @name DataTable.defaults.dom
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "sDom": '&lt;"top"i&gt;rt&lt;"bottom"flp&gt;&lt;"clear"&gt;'
+                *        "dom": '&lt;"top"i&gt;rt&lt;"bottom"flp&gt;&lt;"clear"&gt;'
                 *      } );
                 *    } );
                 */
        
        
                /**
-                * DataTables features two different built-in pagination interaction methods
-                * ('two_button' or 'full_numbers') which present different page controls to
-                * the end user. Further methods can be added using the API (see below).
+                * DataTables features four different built-in options for the buttons to
+                * display for pagination control:
+                *
+                * * `simple` - 'Previous' and 'Next' buttons only
+                * * 'simple_numbers` - 'Previous' and 'Next' buttons, plus page numbers
+                * * `full` - 'First', 'Previous', 'Next' and 'Last' buttons
+                * * `full_numbers` - 'First', 'Previous', 'Next' and 'Last' buttons, plus
+                *   page numbers
+                *  
+                * Further methods can be added using {@link DataTable.ext.oPagination}.
                 *  @type string
-                *  @default two_button
+                *  @default simple_numbers
+                *
                 *  @dtopt Options
-                * 
+                *  @name DataTable.defaults.pagingType
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "sPaginationType": "full_numbers"
+                *        "pagingType": "full_numbers"
                 *      } );
                 *    } )
                 */
-               "sPaginationType": "two_button",
+               "sPaginationType": "simple_numbers",
        
        
                /**
-                * Enable horizontal scrolling. When a table is too wide to fit into a certain
-                * layout, or you have a large number of columns in the table, you can enable
-                * x-scrolling to show the table in a viewport, which can be scrolled. This
-                * property can be any CSS unit, or a number (in which case it will be treated
-                * as a pixel measurement).
-                *  @type string
+                * Enable horizontal scrolling. When a table is too wide to fit into a
+                * certain layout, or you have a large number of columns in the table, you
+                * can enable x-scrolling to show the table in a viewport, which can be
+                * scrolled. This property can be `true` which will allow the table to
+                * scroll horizontally when needed, or any CSS unit, or a number (in which
+                * case it will be treated as a pixel measurement). Setting as simply `true`
+                * is recommended.
+                *  @type boolean|string
                 *  @default <i>blank string - i.e. disabled</i>
+                *
                 *  @dtopt Features
-                * 
+                *  @name DataTable.defaults.scrollX
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "sScrollX": "100%",
-                *        "bScrollCollapse": true
+                *        "scrollX": true,
+                *        "scrollCollapse": true
                 *      } );
                 *    } );
                 */
                 * measurement).
                 *  @type string
                 *  @default <i>blank string - i.e. disabled</i>
+                *
                 *  @dtopt Options
-                * 
+                *  @name DataTable.defaults.scrollXInner
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "sScrollX": "100%",
-                *        "sScrollXInner": "110%"
+                *        "scrollX": "100%",
+                *        "scrollXInner": "110%"
                 *      } );
                 *    } );
                 */
                 * (in which case it will be treated as a pixel measurement).
                 *  @type string
                 *  @default <i>blank string - i.e. disabled</i>
+                *
                 *  @dtopt Features
-                * 
+                *  @name DataTable.defaults.scrollY
+                *
                 *  @example
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "sScrollY": "200px",
-                *        "bPaginate": false
+                *        "scrollY": "200px",
+                *        "paginate": false
                 *      } );
                 *    } );
                 */
        
        
                /**
+                * __Deprecated__ The functionality provided by this parameter has now been
+                * superseded by that provided through `ajax`, which should be used instead.
+                *
                 * Set the HTTP method that is used to make the Ajax call for server-side
                 * processing or Ajax sourced data.
                 *  @type string
                 *  @default GET
+                *
                 *  @dtopt Options
                 *  @dtopt Server-side
-                * 
-                *  @example
-                *    $(document).ready( function() {
-                *      $('#example').dataTable( {
-                *        "bServerSide": true,
-                *        "sAjaxSource": "scripts/post.php",
-                *        "sServerMethod": "POST"
-                *      } );
-                *    } );
+                *  @name DataTable.defaults.serverMethod
+                *
+                *  @deprecated 1.10. Please use `ajax` for this functionality now.
+                */
+               "sServerMethod": "GET",
+       
+       
+               /**
+                * DataTables makes use of renderers when displaying HTML elements for
+                * a table. These renderers can be added or modified by plug-ins to
+                * generate suitable mark-up for a site. For example the Bootstrap
+                * integration plug-in for DataTables uses a paging button renderer to
+                * display pagination buttons in the mark-up required by Bootstrap.
+                *
+                * For further information about the renderers available see
+                * DataTable.ext.renderer
+                *  @type string|object
+                *  @default null
+                *
+                *  @name DataTable.defaults.renderer
+                *
                 */
-               "sServerMethod": "GET"
+               "renderer": null
        };
        
+       _fnHungarianMap( DataTable.defaults );
+       
        
        
+       /*
+        * Developer note - See note in model.defaults.js about the use of Hungarian
+        * notation and camel case.
+        */
+       
        /**
         * Column options that can be given to DataTables at initialisation time.
         *  @namespace
         */
-       DataTable.defaults.columns = {
-               /**
-                * Allows a column's sorting to take multiple columns into account when 
-                * doing a sort. For example first name / last name columns make sense to 
-                * do a multi-column sort over the two columns.
-                *  @type array
+       DataTable.defaults.column = {
+               /**
+                * Define which column(s) an order will occur on for this column. This
+                * allows a column's ordering to take multiple columns into account when
+                * doing a sort or use the data from a different column. For example first
+                * name / last name columns make sense to do a multi-column sort over the
+                * two columns.
+                *  @type array|int
                 *  @default null <i>Takes the value of the column index automatically</i>
+                *
+                *  @name DataTable.defaults.column.orderData
                 *  @dtopt Columns
-                * 
+                *
                 *  @example
-                *    // Using aoColumnDefs
+                *    // Using `columnDefs`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumnDefs": [
-                *          { "aDataSort": [ 0, 1 ], "aTargets": [ 0 ] },
-                *          { "aDataSort": [ 1, 0 ], "aTargets": [ 1 ] },
-                *          { "aDataSort": [ 2, 3, 4 ], "aTargets": [ 2 ] }
+                *        "columnDefs": [
+                *          { "orderData": [ 0, 1 ], "targets": [ 0 ] },
+                *          { "orderData": [ 1, 0 ], "targets": [ 1 ] },
+                *          { "orderData": 2, "targets": [ 2 ] }
                 *        ]
                 *      } );
                 *    } );
-                *    
+                *
                 *  @example
-                *    // Using aoColumns
+                *    // Using `columns`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumns": [
-                *          { "aDataSort": [ 0, 1 ] },
-                *          { "aDataSort": [ 1, 0 ] },
-                *          { "aDataSort": [ 2, 3, 4 ] },
+                *        "columns": [
+                *          { "orderData": [ 0, 1 ] },
+                *          { "orderData": [ 1, 0 ] },
+                *          { "orderData": 2 },
                 *          null,
                 *          null
                 *        ]
                 *    } );
                 */
                "aDataSort": null,
+               "iDataSort": -1,
        
        
                /**
-                * You can control the default sorting direction, and even alter the behaviour
-                * of the sort handler (i.e. only allow ascending sorting etc) using this
-                * parameter.
+                * You can control the default ordering direction, and even alter the
+                * behaviour of the sort handler (i.e. only allow ascending ordering etc)
+                * using this parameter.
                 *  @type array
                 *  @default [ 'asc', 'desc' ]
+                *
+                *  @name DataTable.defaults.column.orderSequence
                 *  @dtopt Columns
-                * 
+                *
                 *  @example
-                *    // Using aoColumnDefs
+                *    // Using `columnDefs`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumnDefs": [
-                *          { "asSorting": [ "asc" ], "aTargets": [ 1 ] },
-                *          { "asSorting": [ "desc", "asc", "asc" ], "aTargets": [ 2 ] },
-                *          { "asSorting": [ "desc" ], "aTargets": [ 3 ] }
+                *        "columnDefs": [
+                *          { "orderSequence": [ "asc" ], "targets": [ 1 ] },
+                *          { "orderSequence": [ "desc", "asc", "asc" ], "targets": [ 2 ] },
+                *          { "orderSequence": [ "desc" ], "targets": [ 3 ] }
                 *        ]
                 *      } );
                 *    } );
-                *    
+                *
                 *  @example
-                *    // Using aoColumns
+                *    // Using `columns`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumns": [
+                *        "columns": [
                 *          null,
-                *          { "asSorting": [ "asc" ] },
-                *          { "asSorting": [ "desc", "asc", "asc" ] },
-                *          { "asSorting": [ "desc" ] },
+                *          { "orderSequence": [ "asc" ] },
+                *          { "orderSequence": [ "desc", "asc", "asc" ] },
+                *          { "orderSequence": [ "desc" ] },
                 *          null
                 *        ]
                 *      } );
                 * Enable or disable filtering on the data in this column.
                 *  @type boolean
                 *  @default true
+                *
+                *  @name DataTable.defaults.column.searchable
                 *  @dtopt Columns
-                * 
+                *
                 *  @example
-                *    // Using aoColumnDefs
+                *    // Using `columnDefs`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumnDefs": [ 
-                *          { "bSearchable": false, "aTargets": [ 0 ] }
+                *        "columnDefs": [
+                *          { "searchable": false, "targets": [ 0 ] }
                 *        ] } );
                 *    } );
-                *    
+                *
                 *  @example
-                *    // Using aoColumns
+                *    // Using `columns`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumns": [ 
-                *          { "bSearchable": false },
+                *        "columns": [
+                *          { "searchable": false },
                 *          null,
                 *          null,
                 *          null,
        
        
                /**
-                * Enable or disable sorting on this column.
+                * Enable or disable ordering on this column.
                 *  @type boolean
                 *  @default true
+                *
+                *  @name DataTable.defaults.column.orderable
                 *  @dtopt Columns
-                * 
+                *
                 *  @example
-                *    // Using aoColumnDefs
+                *    // Using `columnDefs`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumnDefs": [ 
-                *          { "bSortable": false, "aTargets": [ 0 ] }
+                *        "columnDefs": [
+                *          { "orderable": false, "targets": [ 0 ] }
                 *        ] } );
                 *    } );
-                *    
+                *
                 *  @example
-                *    // Using aoColumns
+                *    // Using `columns`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumns": [ 
-                *          { "bSortable": false },
+                *        "columns": [
+                *          { "orderable": false },
                 *          null,
                 *          null,
                 *          null,
                "bSortable": true,
        
        
-               /**
-                * <code>Deprecated</code> When using fnRender() for a column, you may wish 
-                * to use the original data (before rendering) for sorting and filtering 
-                * (the default is to used the rendered data that the user can see). This 
-                * may be useful for dates etc.
-                * 
-                * Please note that this option has now been deprecated and will be removed
-                * in the next version of DataTables. Please use mRender / mData rather than
-                * fnRender.
-                *  @type boolean
-                *  @default true
-                *  @dtopt Columns
-                *  @deprecated
-                */
-               "bUseRendered": true,
-       
-       
                /**
                 * Enable or disable the display of this column.
                 *  @type boolean
                 *  @default true
+                *
+                *  @name DataTable.defaults.column.visible
                 *  @dtopt Columns
-                * 
+                *
                 *  @example
-                *    // Using aoColumnDefs
+                *    // Using `columnDefs`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumnDefs": [ 
-                *          { "bVisible": false, "aTargets": [ 0 ] }
+                *        "columnDefs": [
+                *          { "visible": false, "targets": [ 0 ] }
                 *        ] } );
                 *    } );
-                *    
+                *
                 *  @example
-                *    // Using aoColumns
+                *    // Using `columns`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumns": [ 
-                *          { "bVisible": false },
+                *        "columns": [
+                *          { "visible": false },
                 *          null,
                 *          null,
                 *          null,
                 *    } );
                 */
                "bVisible": true,
-               
-               
+       
+       
                /**
                 * Developer definable function that is called whenever a cell is created (Ajax source,
                 * etc) or processed for input (DOM source). This can be used as a compliment to mRender
                 * allowing you to modify the DOM element (add background colour for example) when the
                 * element is available.
                 *  @type function
-                *  @param {element} nTd The TD node that has been created
-                *  @param {*} sData The Data for the cell
-                *  @param {array|object} oData The data for the whole row
-                *  @param {int} iRow The row index for the aoData data store
-                *  @param {int} iCol The column index for aoColumns
-                *  @dtopt Columns
-                * 
-                *  @example
-                *    $(document).ready( function() {
-                *      $('#example').dataTable( {
-                *        "aoColumnDefs": [ {
-                *          "aTargets": [3],
-                *          "fnCreatedCell": function (nTd, sData, oData, iRow, iCol) {
-                *            if ( sData == "1.7" ) {
-                *              $(nTd).css('color', 'blue')
-                *            }
-                *          }
-                *        } ]
-                *      });
-                *    } );
-                */
-               "fnCreatedCell": null,
-       
-       
-               /**
-                * <code>Deprecated</code> Custom display function that will be called for the 
-                * display of each cell in this column.
+                *  @param {element} td The TD node that has been created
+                *  @param {*} cellData The Data for the cell
+                *  @param {array|object} rowData The data for the whole row
+                *  @param {int} row The row index for the aoData data store
+                *  @param {int} col The column index for aoColumns
+                *
+                *  @name DataTable.defaults.column.createdCell
+                *  @dtopt Columns
                 *
-                * Please note that this option has now been deprecated and will be removed
-                * in the next version of DataTables. Please use mRender / mData rather than
-                * fnRender.
-                *  @type function
-                *  @param {object} o Object with the following parameters:
-                *  @param {int}    o.iDataRow The row in aoData
-                *  @param {int}    o.iDataColumn The column in question
-                *  @param {array}  o.aData The data for the row in question
-                *  @param {object} o.oSettings The settings object for this DataTables instance
-                *  @param {object} o.mDataProp The data property used for this column
-                *  @param {*}      val The current cell value
-                *  @returns {string} The string you which to use in the display
-                *  @dtopt Columns
-                *  @deprecated
-                */
-               "fnRender": null,
-       
-       
-               /**
-                * The column index (starting from 0!) that you wish a sort to be performed
-                * upon when this column is selected for sorting. This can be used for sorting
-                * on hidden columns for example.
-                *  @type int
-                *  @default -1 <i>Use automatically calculated column index</i>
-                *  @dtopt Columns
-                * 
-                *  @example
-                *    // Using aoColumnDefs
-                *    $(document).ready( function() {
-                *      $('#example').dataTable( {
-                *        "aoColumnDefs": [ 
-                *          { "iDataSort": 1, "aTargets": [ 0 ] }
-                *        ]
-                *      } );
-                *    } );
-                *    
                 *  @example
-                *    // Using aoColumns
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumns": [ 
-                *          { "iDataSort": 1 },
-                *          null,
-                *          null,
-                *          null,
-                *          null
-                *        ]
-                *      } );
+                *        "columnDefs": [ {
+                *          "targets": [3],
+                *          "createdCell": function (td, cellData, rowData, row, col) {
+                *            if ( cellData == "1.7" ) {
+                *              $(td).css('color', 'blue')
+                *            }
+                *          }
+                *        } ]
+                *      });
                 *    } );
                 */
-               "iDataSort": -1,
+               "fnCreatedCell": null,
        
        
                /**
-                * This parameter has been replaced by mData in DataTables to ensure naming
-                * consistency. mDataProp can still be used, as there is backwards compatibility
-                * in DataTables for this option, but it is strongly recommended that you use
-                * mData in preference to mDataProp.
-                *  @name DataTable.defaults.columns.mDataProp
+                * This parameter has been replaced by `data` in DataTables to ensure naming
+                * consistency. `dataProp` can still be used, as there is backwards
+                * compatibility in DataTables for this option, but it is strongly
+                * recommended that you use `data` in preference to `dataProp`.
+                *  @name DataTable.defaults.column.dataProp
                 */
        
        
                /**
-                * This property can be used to read data from any JSON data source property,
-                * including deeply nested objects / properties. mData can be given in a
+                * This property can be used to read data from any data source property,
+                * including deeply nested objects / properties. `data` can be given in a
                 * number of different ways which effect its behaviour:
-                *   <ul>
-                *     <li>integer - treated as an array index for the data source. This is the
-                *       default that DataTables uses (incrementally increased for each column).</li>
-                *     <li>string - read an object property from the data source. Note that you can
-                *       use Javascript dotted notation to read deep properties / arrays from the
-                *       data source.</li>
-                *     <li>null - the sDefaultContent option will be used for the cell (null
-                *       by default, so you will need to specify the default content you want -
-                *       typically an empty string). This can be useful on generated columns such 
-                *       as edit / delete action columns.</li>
-                *     <li>function - the function given will be executed whenever DataTables 
-                *       needs to set or get the data for a cell in the column. The function 
-                *       takes three parameters:
-                *       <ul>
-                *         <li>{array|object} The data source for the row</li>
-                *         <li>{string} The type call data requested - this will be 'set' when
-                *           setting data or 'filter', 'display', 'type', 'sort' or undefined when 
-                *           gathering data. Note that when <i>undefined</i> is given for the type
-                *           DataTables expects to get the raw data for the object back</li>
-                *         <li>{*} Data to set when the second parameter is 'set'.</li>
-                *       </ul>
-                *       The return value from the function is not required when 'set' is the type
-                *       of call, but otherwise the return is what will be used for the data
-                *       requested.</li>
-                *    </ul>
                 *
-                * Note that prior to DataTables 1.9.2 mData was called mDataProp. The name change
-                * reflects the flexibility of this property and is consistent with the naming of
-                * mRender. If 'mDataProp' is given, then it will still be used by DataTables, as
-                * it automatically maps the old name to the new if required.
+                * * `integer` - treated as an array index for the data source. This is the
+                *   default that DataTables uses (incrementally increased for each column).
+                * * `string` - read an object property from the data source. There are
+                *   three 'special' options that can be used in the string to alter how
+                *   DataTables reads the data from the source object:
+                *    * `.` - Dotted Javascript notation. Just as you use a `.` in
+                *      Javascript to read from nested objects, so to can the options
+                *      specified in `data`. For example: `browser.version` or
+                *      `browser.name`. If your object parameter name contains a period, use
+                *      `\\` to escape it - i.e. `first\\.name`.
+                *    * `[]` - Array notation. DataTables can automatically combine data
+                *      from and array source, joining the data with the characters provided
+                *      between the two brackets. For example: `name[, ]` would provide a
+                *      comma-space separated list from the source array. If no characters
+                *      are provided between the brackets, the original array source is
+                *      returned.
+                *    * `()` - Function notation. Adding `()` to the end of a parameter will
+                *      execute a function of the name given. For example: `browser()` for a
+                *      simple function on the data source, `browser.version()` for a
+                *      function in a nested property or even `browser().version` to get an
+                *      object property if the function called returns an object. Note that
+                *      function notation is recommended for use in `render` rather than
+                *      `data` as it is much simpler to use as a renderer.
+                * * `null` - use the original data source for the row rather than plucking
+                *   data directly from it. This action has effects on two other
+                *   initialisation options:
+                *    * `defaultContent` - When null is given as the `data` option and
+                *      `defaultContent` is specified for the column, the value defined by
+                *      `defaultContent` will be used for the cell.
+                *    * `render` - When null is used for the `data` option and the `render`
+                *      option is specified for the column, the whole data source for the
+                *      row is used for the renderer.
+                * * `function` - the function given will be executed whenever DataTables
+                *   needs to set or get the data for a cell in the column. The function
+                *   takes three parameters:
+                *    * Parameters:
+                *      * `{array|object}` The data source for the row
+                *      * `{string}` The type call data requested - this will be 'set' when
+                *        setting data or 'filter', 'display', 'type', 'sort' or undefined
+                *        when gathering data. Note that when `undefined` is given for the
+                *        type DataTables expects to get the raw data for the object back<
+                *      * `{*}` Data to set when the second parameter is 'set'.
+                *    * Return:
+                *      * The return value from the function is not required when 'set' is
+                *        the type of call, but otherwise the return is what will be used
+                *        for the data requested.
+                *
+                * Note that `data` is a getter and setter option. If you just require
+                * formatting of data for output, you will likely want to use `render` which
+                * is simply a getter and thus simpler to use.
+                *
+                * Note that prior to DataTables 1.9.2 `data` was called `mDataProp`. The
+                * name change reflects the flexibility of this property and is consistent
+                * with the naming of mRender. If 'mDataProp' is given, then it will still
+                * be used by DataTables, as it automatically maps the old name to the new
+                * if required.
+                *
                 *  @type string|int|function|null
                 *  @default null <i>Use automatically calculated column index</i>
+                *
+                *  @name DataTable.defaults.column.data
                 *  @dtopt Columns
-                * 
+                *
                 *  @example
                 *    // Read table data from objects
+                *    // JSON structure for each row:
+                *    //   {
+                *    //      "engine": {value},
+                *    //      "browser": {value},
+                *    //      "platform": {value},
+                *    //      "version": {value},
+                *    //      "grade": {value}
+                *    //   }
                 *    $(document).ready( function() {
-                *      var oTable = $('#example').dataTable( {
-                *        "sAjaxSource": "sources/deep.txt",
-                *        "aoColumns": [
-                *          { "mData": "engine" },
-                *          { "mData": "browser" },
-                *          { "mData": "platform.inner" },
-                *          { "mData": "platform.details.0" },
-                *          { "mData": "platform.details.1" }
+                *      $('#example').dataTable( {
+                *        "ajaxSource": "sources/objects.txt",
+                *        "columns": [
+                *          { "data": "engine" },
+                *          { "data": "browser" },
+                *          { "data": "platform" },
+                *          { "data": "version" },
+                *          { "data": "grade" }
                 *        ]
                 *      } );
                 *    } );
-                * 
+                *
+                *  @example
+                *    // Read information from deeply nested objects
+                *    // JSON structure for each row:
+                *    //   {
+                *    //      "engine": {value},
+                *    //      "browser": {value},
+                *    //      "platform": {
+                *    //         "inner": {value}
+                *    //      },
+                *    //      "details": [
+                *    //         {value}, {value}
+                *    //      ]
+                *    //   }
+                *    $(document).ready( function() {
+                *      $('#example').dataTable( {
+                *        "ajaxSource": "sources/deep.txt",
+                *        "columns": [
+                *          { "data": "engine" },
+                *          { "data": "browser" },
+                *          { "data": "platform.inner" },
+                *          { "data": "platform.details.0" },
+                *          { "data": "platform.details.1" }
+                *        ]
+                *      } );
+                *    } );
+                *
                 *  @example
-                *    // Using mData as a function to provide different information for
+                *    // Using `data` as a function to provide different information for
                 *    // sorting, filtering and display. In this case, currency (price)
                 *    $(document).ready( function() {
-                *      var oTable = $('#example').dataTable( {
-                *        "aoColumnDefs": [ {
-                *          "aTargets": [ 0 ],
-                *          "mData": function ( source, type, val ) {
+                *      $('#example').dataTable( {
+                *        "columnDefs": [ {
+                *          "targets": [ 0 ],
+                *          "data": function ( source, type, val ) {
                 *            if (type === 'set') {
                 *              source.price = val;
                 *              // Store the computed dislay and filter values for efficiency
                 *        } ]
                 *      } );
                 *    } );
+                *
+                *  @example
+                *    // Using default content
+                *    $(document).ready( function() {
+                *      $('#example').dataTable( {
+                *        "columnDefs": [ {
+                *          "targets": [ 0 ],
+                *          "data": null,
+                *          "defaultContent": "Click to edit"
+                *        } ]
+                *      } );
+                *    } );
+                *
+                *  @example
+                *    // Using array notation - outputting a list from an array
+                *    $(document).ready( function() {
+                *      $('#example').dataTable( {
+                *        "columnDefs": [ {
+                *          "targets": [ 0 ],
+                *          "data": "name[, ]"
+                *        } ]
+                *      } );
+                *    } );
+                *
                 */
                "mData": null,
        
        
                /**
-                * This property is the rendering partner to mData and it is suggested that
-                * when you want to manipulate data for display (including filtering, sorting etc)
-                * but not altering the underlying data for the table, use this property. mData
-                * can actually do everything this property can and more, but this parameter is
-                * easier to use since there is no 'set' option. Like mData is can be given
-                * in a number of different ways to effect its behaviour, with the addition of 
-                * supporting array syntax for easy outputting of arrays (including arrays of
-                * objects):
-                *   <ul>
-                *     <li>integer - treated as an array index for the data source. This is the
-                *       default that DataTables uses (incrementally increased for each column).</li>
-                *     <li>string - read an object property from the data source. Note that you can
-                *       use Javascript dotted notation to read deep properties / arrays from the
-                *       data source and also array brackets to indicate that the data reader should
-                *       loop over the data source array. When characters are given between the array
-                *       brackets, these characters are used to join the data source array together.
-                *       For example: "accounts[, ].name" would result in a comma separated list with
-                *       the 'name' value from the 'accounts' array of objects.</li>
-                *     <li>function - the function given will be executed whenever DataTables 
-                *       needs to set or get the data for a cell in the column. The function 
-                *       takes three parameters:
-                *       <ul>
-                *         <li>{array|object} The data source for the row (based on mData)</li>
-                *         <li>{string} The type call data requested - this will be 'filter', 'display', 
-                *           'type' or 'sort'.</li>
-                *         <li>{array|object} The full data source for the row (not based on mData)</li>
-                *       </ul>
-                *       The return value from the function is what will be used for the data
-                *       requested.</li>
-                *    </ul>
-                *  @type string|int|function|null
-                *  @default null <i>Use mData</i>
+                * This property is the rendering partner to `data` and it is suggested that
+                * when you want to manipulate data for display (including filtering,
+                * sorting etc) without altering the underlying data for the table, use this
+                * property. `render` can be considered to be the the read only companion to
+                * `data` which is read / write (then as such more complex). Like `data`
+                * this option can be given in a number of different ways to effect its
+                * behaviour:
+                *
+                * * `integer` - treated as an array index for the data source. This is the
+                *   default that DataTables uses (incrementally increased for each column).
+                * * `string` - read an object property from the data source. There are
+                *   three 'special' options that can be used in the string to alter how
+                *   DataTables reads the data from the source object:
+                *    * `.` - Dotted Javascript notation. Just as you use a `.` in
+                *      Javascript to read from nested objects, so to can the options
+                *      specified in `data`. For example: `browser.version` or
+                *      `browser.name`. If your object parameter name contains a period, use
+                *      `\\` to escape it - i.e. `first\\.name`.
+                *    * `[]` - Array notation. DataTables can automatically combine data
+                *      from and array source, joining the data with the characters provided
+                *      between the two brackets. For example: `name[, ]` would provide a
+                *      comma-space separated list from the source array. If no characters
+                *      are provided between the brackets, the original array source is
+                *      returned.
+                *    * `()` - Function notation. Adding `()` to the end of a parameter will
+                *      execute a function of the name given. For example: `browser()` for a
+                *      simple function on the data source, `browser.version()` for a
+                *      function in a nested property or even `browser().version` to get an
+                *      object property if the function called returns an object.
+                * * `object` - use different data for the different data types requested by
+                *   DataTables ('filter', 'display', 'type' or 'sort'). The property names
+                *   of the object is the data type the property refers to and the value can
+                *   defined using an integer, string or function using the same rules as
+                *   `render` normally does. Note that an `_` option _must_ be specified.
+                *   This is the default value to use if you haven't specified a value for
+                *   the data type requested by DataTables.
+                * * `function` - the function given will be executed whenever DataTables
+                *   needs to set or get the data for a cell in the column. The function
+                *   takes three parameters:
+                *    * Parameters:
+                *      * {array|object} The data source for the row (based on `data`)
+                *      * {string} The type call data requested - this will be 'filter',
+                *        'display', 'type' or 'sort'.
+                *      * {array|object} The full data source for the row (not based on
+                *        `data`)
+                *    * Return:
+                *      * The return value from the function is what will be used for the
+                *        data requested.
+                *
+                *  @type string|int|function|object|null
+                *  @default null Use the data source value.
+                *
+                *  @name DataTable.defaults.column.render
                 *  @dtopt Columns
-                * 
+                *
                 *  @example
                 *    // Create a comma separated list from an array of objects
                 *    $(document).ready( function() {
-                *      var oTable = $('#example').dataTable( {
-                *        "sAjaxSource": "sources/deep.txt",
-                *        "aoColumns": [
-                *          { "mData": "engine" },
-                *          { "mData": "browser" },
+                *      $('#example').dataTable( {
+                *        "ajaxSource": "sources/deep.txt",
+                *        "columns": [
+                *          { "data": "engine" },
+                *          { "data": "browser" },
                 *          {
-                *            "mData": "platform",
-                *            "mRender": "[, ].name"
+                *            "data": "platform",
+                *            "render": "[, ].name"
                 *          }
                 *        ]
                 *      } );
                 *    } );
-                * 
+                *
+                *  @example
+                *    // Execute a function to obtain data
+                *    $(document).ready( function() {
+                *      $('#example').dataTable( {
+                *        "columnDefs": [ {
+                *          "targets": [ 0 ],
+                *          "data": null, // Use the full data source object for the renderer's source
+                *          "render": "browserName()"
+                *        } ]
+                *      } );
+                *    } );
+                *
+                *  @example
+                *    // As an object, extracting different data for the different types
+                *    // This would be used with a data source such as:
+                *    //   { "phone": 5552368, "phone_filter": "5552368 555-2368", "phone_display": "555-2368" }
+                *    // Here the `phone` integer is used for sorting and type detection, while `phone_filter`
+                *    // (which has both forms) is used for filtering for if a user inputs either format, while
+                *    // the formatted phone number is the one that is shown in the table.
+                *    $(document).ready( function() {
+                *      $('#example').dataTable( {
+                *        "columnDefs": [ {
+                *          "targets": [ 0 ],
+                *          "data": null, // Use the full data source object for the renderer's source
+                *          "render": {
+                *            "_": "phone",
+                *            "filter": "phone_filter",
+                *            "display": "phone_display"
+                *          }
+                *        } ]
+                *      } );
+                *    } );
+                *
                 *  @example
                 *    // Use as a function to create a link from the data source
                 *    $(document).ready( function() {
-                *      var oTable = $('#example').dataTable( {
-                *        "aoColumnDefs": [
-                *        {
-                *          "aTargets": [ 0 ],
-                *          "mData": "download_link",
-                *          "mRender": function ( data, type, full ) {
+                *      $('#example').dataTable( {
+                *        "columnDefs": [ {
+                *          "targets": [ 0 ],
+                *          "data": "download_link",
+                *          "render": function ( data, type, full ) {
                 *            return '<a href="'+data+'">Download</a>';
                 *          }
-                *        ]
+                *        ]
                 *      } );
                 *    } );
                 */
                 * to act as a header for a row (you may wish to add scope='row' to the TH elements).
                 *  @type string
                 *  @default td
+                *
+                *  @name DataTable.defaults.column.cellType
                 *  @dtopt Columns
-                * 
+                *
                 *  @example
                 *    // Make the first column use TH cells
                 *    $(document).ready( function() {
-                *      var oTable = $('#example').dataTable( {
-                *        "aoColumnDefs": [ {
-                *          "aTargets": [ 0 ],
-                *          "sCellType": "th"
+                *      $('#example').dataTable( {
+                *        "columnDefs": [ {
+                *          "targets": [ 0 ],
+                *          "cellType": "th"
                 *        } ]
                 *      } );
                 *    } );
                 * Class to give to each cell in this column.
                 *  @type string
                 *  @default <i>Empty string</i>
+                *
+                *  @name DataTable.defaults.column.class
                 *  @dtopt Columns
-                * 
+                *
                 *  @example
-                *    // Using aoColumnDefs
+                *    // Using `columnDefs`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumnDefs": [ 
-                *          { "sClass": "my_class", "aTargets": [ 0 ] }
+                *        "columnDefs": [
+                *          { "class": "my_class", "targets": [ 0 ] }
                 *        ]
                 *      } );
                 *    } );
-                *    
+                *
                 *  @example
-                *    // Using aoColumns
+                *    // Using `columns`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumns": [ 
-                *          { "sClass": "my_class" },
+                *        "columns": [
+                *          { "class": "my_class" },
                 *          null,
                 *          null,
                 *          null,
                 *    } );
                 */
                "sClass": "",
-               
+       
                /**
                 * When DataTables calculates the column widths to assign to each column,
                 * it finds the longest string in each column and then constructs a
                 * temporary table and reads the widths from that. The problem with this
-                * is that "mmm" is much wider then "iiii", but the latter is a longer 
+                * is that "mmm" is much wider then "iiii", but the latter is a longer
                 * string - thus the calculation can go wrong (doing it properly and putting
                 * it into an DOM object and measuring that is horribly(!) slow). Thus as
                 * a "work around" we provide this option. It will append its value to the
                 * text that is found to be the longest string for the column - i.e. padding.
-                * Generally you shouldn't need this, and it is not documented on the 
-                * general DataTables.net documentation
+                * Generally you shouldn't need this!
                 *  @type string
                 *  @default <i>Empty string<i>
+                *
+                *  @name DataTable.defaults.column.contentPadding
                 *  @dtopt Columns
-                *    
+                *
                 *  @example
-                *    // Using aoColumns
+                *    // Using `columns`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumns": [ 
+                *        "columns": [
                 *          null,
                 *          null,
                 *          null,
                 *          {
-                *            "sContentPadding": "mmm"
+                *            "contentPadding": "mmm"
                 *          }
                 *        ]
                 *      } );
        
                /**
                 * Allows a default value to be given for a column's data, and will be used
-                * whenever a null data source is encountered (this can be because mData
+                * whenever a null data source is encountered (this can be because `data`
                 * is set to null, or because the data source itself is null).
                 *  @type string
                 *  @default null
+                *
+                *  @name DataTable.defaults.column.defaultContent
                 *  @dtopt Columns
-                * 
+                *
                 *  @example
-                *    // Using aoColumnDefs
+                *    // Using `columnDefs`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumnDefs": [ 
+                *        "columnDefs": [
                 *          {
-                *            "mData": null,
-                *            "sDefaultContent": "Edit",
-                *            "aTargets": [ -1 ]
+                *            "data": null,
+                *            "defaultContent": "Edit",
+                *            "targets": [ -1 ]
                 *          }
                 *        ]
                 *      } );
                 *    } );
-                *    
+                *
                 *  @example
-                *    // Using aoColumns
+                *    // Using `columns`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumns": [ 
+                *        "columns": [
                 *          null,
                 *          null,
                 *          null,
                 *          {
-                *            "mData": null,
-                *            "sDefaultContent": "Edit"
+                *            "data": null,
+                *            "defaultContent": "Edit"
                 *          }
                 *        ]
                 *      } );
                 * client-side, your server-side code does not also need updating).
                 *  @type string
                 *  @default <i>Empty string</i>
+                *
+                *  @name DataTable.defaults.column.name
                 *  @dtopt Columns
-                * 
+                *
                 *  @example
-                *    // Using aoColumnDefs
+                *    // Using `columnDefs`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumnDefs": [ 
-                *          { "sName": "engine", "aTargets": [ 0 ] },
-                *          { "sName": "browser", "aTargets": [ 1 ] },
-                *          { "sName": "platform", "aTargets": [ 2 ] },
-                *          { "sName": "version", "aTargets": [ 3 ] },
-                *          { "sName": "grade", "aTargets": [ 4 ] }
+                *        "columnDefs": [
+                *          { "name": "engine", "targets": [ 0 ] },
+                *          { "name": "browser", "targets": [ 1 ] },
+                *          { "name": "platform", "targets": [ 2 ] },
+                *          { "name": "version", "targets": [ 3 ] },
+                *          { "name": "grade", "targets": [ 4 ] }
                 *        ]
                 *      } );
                 *    } );
-                *    
+                *
                 *  @example
-                *    // Using aoColumns
+                *    // Using `columns`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumns": [ 
-                *          { "sName": "engine" },
-                *          { "sName": "browser" },
-                *          { "sName": "platform" },
-                *          { "sName": "version" },
-                *          { "sName": "grade" }
+                *        "columns": [
+                *          { "name": "engine" },
+                *          { "name": "browser" },
+                *          { "name": "platform" },
+                *          { "name": "version" },
+                *          { "name": "grade" }
                 *        ]
                 *      } );
                 *    } );
        
        
                /**
-                * Defines a data source type for the sorting which can be used to read
+                * Defines a data source type for the ordering which can be used to read
                 * real-time information from the table (updating the internally cached
-                * version) prior to sorting. This allows sorting to occur on user editable
-                * elements such as form inputs.
+                * version) prior to ordering. This allows ordering to occur on user
+                * editable elements such as form inputs.
                 *  @type string
                 *  @default std
+                *
+                *  @name DataTable.defaults.column.orderDataType
                 *  @dtopt Columns
-                * 
+                *
                 *  @example
-                *    // Using aoColumnDefs
+                *    // Using `columnDefs`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumnDefs": [
-                *          { "sSortDataType": "dom-text", "aTargets": [ 2, 3 ] },
-                *          { "sType": "numeric", "aTargets": [ 3 ] },
-                *          { "sSortDataType": "dom-select", "aTargets": [ 4 ] },
-                *          { "sSortDataType": "dom-checkbox", "aTargets": [ 5 ] }
+                *        "columnDefs": [
+                *          { "orderDataType": "dom-text", "targets": [ 2, 3 ] },
+                *          { "type": "numeric", "targets": [ 3 ] },
+                *          { "orderDataType": "dom-select", "targets": [ 4 ] },
+                *          { "orderDataType": "dom-checkbox", "targets": [ 5 ] }
                 *        ]
                 *      } );
                 *    } );
-                *    
+                *
                 *  @example
-                *    // Using aoColumns
+                *    // Using `columns`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumns": [
+                *        "columns": [
                 *          null,
                 *          null,
-                *          { "sSortDataType": "dom-text" },
-                *          { "sSortDataType": "dom-text", "sType": "numeric" },
-                *          { "sSortDataType": "dom-select" },
-                *          { "sSortDataType": "dom-checkbox" }
+                *          { "orderDataType": "dom-text" },
+                *          { "orderDataType": "dom-text", "type": "numeric" },
+                *          { "orderDataType": "dom-select" },
+                *          { "orderDataType": "dom-checkbox" }
                 *        ]
                 *      } );
                 *    } );
                /**
                 * The title of this column.
                 *  @type string
-                *  @default null <i>Derived from the 'TH' value for this column in the 
+                *  @default null <i>Derived from the 'TH' value for this column in the
                 *    original HTML table.</i>
+                *
+                *  @name DataTable.defaults.column.title
                 *  @dtopt Columns
-                * 
+                *
                 *  @example
-                *    // Using aoColumnDefs
+                *    // Using `columnDefs`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumnDefs": [ 
-                *          { "sTitle": "My column title", "aTargets": [ 0 ] }
+                *        "columnDefs": [
+                *          { "title": "My column title", "targets": [ 0 ] }
                 *        ]
                 *      } );
                 *    } );
-                *    
+                *
                 *  @example
-                *    // Using aoColumns
+                *    // Using `columns`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumns": [ 
-                *          { "sTitle": "My column title" },
+                *        "columns": [
+                *          { "title": "My column title" },
                 *          null,
                 *          null,
                 *          null,
        
        
                /**
-                * The type allows you to specify how the data for this column will be sorted.
-                * Four types (string, numeric, date and html (which will strip HTML tags
-                * before sorting)) are currently available. Note that only date formats
-                * understood by Javascript's Date() object will be accepted as type date. For
-                * example: "Mar 26, 2008 5:03 PM". May take the values: 'string', 'numeric',
-                * 'date' or 'html' (by default). Further types can be adding through
-                * plug-ins.
+                * The type allows you to specify how the data for this column will be
+                * ordered. Four types (string, numeric, date and html (which will strip
+                * HTML tags before ordering)) are currently available. Note that only date
+                * formats understood by Javascript's Date() object will be accepted as type
+                * date. For example: "Mar 26, 2008 5:03 PM". May take the values: 'string',
+                * 'numeric', 'date' or 'html' (by default). Further types can be adding
+                * through plug-ins.
                 *  @type string
                 *  @default null <i>Auto-detected from raw data</i>
+                *
+                *  @name DataTable.defaults.column.type
                 *  @dtopt Columns
-                * 
+                *
                 *  @example
-                *    // Using aoColumnDefs
+                *    // Using `columnDefs`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumnDefs": [ 
-                *          { "sType": "html", "aTargets": [ 0 ] }
+                *        "columnDefs": [
+                *          { "type": "html", "targets": [ 0 ] }
                 *        ]
                 *      } );
                 *    } );
-                *    
+                *
                 *  @example
-                *    // Using aoColumns
+                *    // Using `columns`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumns": [ 
-                *          { "sType": "html" },
+                *        "columns": [
+                *          { "type": "html" },
                 *          null,
                 *          null,
                 *          null,
        
                /**
                 * Defining the width of the column, this parameter may take any CSS value
-                * (3em, 20px etc). DataTables apples 'smart' widths to columns which have not
+                * (3em, 20px etc). DataTables applies 'smart' widths to columns which have not
                 * been given a specific width through this interface ensuring that the table
                 * remains readable.
                 *  @type string
                 *  @default null <i>Automatic</i>
+                *
+                *  @name DataTable.defaults.column.width
                 *  @dtopt Columns
-                * 
+                *
                 *  @example
-                *    // Using aoColumnDefs
+                *    // Using `columnDefs`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumnDefs": [ 
-                *          { "sWidth": "20%", "aTargets": [ 0 ] }
+                *        "columnDefs": [
+                *          { "width": "20%", "targets": [ 0 ] }
                 *        ]
                 *      } );
                 *    } );
-                *    
+                *
                 *  @example
-                *    // Using aoColumns
+                *    // Using `columns`
                 *    $(document).ready( function() {
                 *      $('#example').dataTable( {
-                *        "aoColumns": [ 
-                *          { "sWidth": "20%" },
+                *        "columns": [
+                *          { "width": "20%" },
                 *          null,
                 *          null,
                 *          null,
                "sWidth": null
        };
        
+       _fnHungarianMap( DataTable.defaults.column );
+       
        
        
        /**
         * given table, including configuration, data and current application of the
         * table options. DataTables does not have a single instance for each DataTable
         * with the settings attached to that instance, but rather instances of the
-        * DataTable "class" are created on-the-fly as needed (typically by a 
+        * DataTable "class" are created on-the-fly as needed (typically by a
         * $().dataTable() call) and the settings object is then applied to that
         * instance.
-        * 
-        * Note that this object is related to {@link DataTable.defaults} but this 
+        *
+        * Note that this object is related to {@link DataTable.defaults} but this
         * one is the internal data store for DataTables's cache of columns. It should
         * NOT be manipulated outside of DataTables. Any configuration should be done
         * through the initialisation options.
         *  @todo Really should attach the settings object to individual instances so we
         *    don't need to create new instances on each $().dataTable() call (if the
         *    table already exists). It would also save passing oSettings around and
-        *    into every single function. However, this is a very significant 
+        *    into every single function. However, this is a very significant
         *    architecture change for DataTables and will almost certainly break
         *    backwards compatibility with older installations. This is something that
         *    will be done in 2.0.
                 *  @namespace
                 */
                "oFeatures": {
-                       
+       
                        /**
                         * Flag to say if DataTables should automatically try to calculate the
                         * optimum table and columns widths (true) or not (false).
                         *  @type boolean
                         */
                        "bDeferRender": null,
-                       
+       
                        /**
                         * Enable filtering on the table or not. Note that if this is disabled
                         * then there is no filtering at all on the table, including fnFilter.
                         *  @type boolean
                         */
                        "bFilter": null,
-                       
+       
                        /**
                         * Table information element (the 'Showing x of y records' div) enable
                         * flag.
                         *  @type boolean
                         */
                        "bInfo": null,
-                       
+       
                        /**
                         * Present a user control allowing the end user to change the page size
                         * when pagination is enabled.
                         *  @type boolean
                         */
                        "bPaginate": null,
-                       
+       
                        /**
                         * Processing indicator enable flag whenever DataTables is enacting a
                         * user request - typically an Ajax request for server-side processing.
                         *  @type boolean
                         */
                        "bProcessing": null,
-                       
+       
                        /**
                         * Server-side processing enabled flag - when enabled DataTables will
                         * get all data from the server for every draw - there is no filtering,
                         *  @type boolean
                         */
                        "bServerSide": null,
-                       
+       
                        /**
                         * Sorting enablement flag.
                         * Note that this parameter will be set by the initialisation routine. To
                         *  @type boolean
                         */
                        "bSort": null,
-                       
+       
+                       /**
+                        * Multi-column sorting
+                        * Note that this parameter will be set by the initialisation routine. To
+                        * set a default use {@link DataTable.defaults}.
+                        *  @type boolean
+                        */
+                       "bSortMulti": null,
+       
                        /**
                         * Apply a class to the columns which are being sorted to provide a
                         * visual highlight or not. This can slow things down when enabled since
                         *  @type boolean
                         */
                        "bSortClasses": null,
-                       
+       
                        /**
                         * State saving enablement flag.
                         * Note that this parameter will be set by the initialisation routine. To
                         */
                        "bStateSave": null
                },
-               
+       
        
                /**
                 * Scrolling settings for a table.
                 *  @namespace
                 */
                "oScroll": {
-                       /**
-                        * Indicate if DataTables should be allowed to set the padding / margin
-                        * etc for the scrolling header elements or not. Typically you will want
-                        * this.
-                        * Note that this parameter will be set by the initialisation routine. To
-                        * set a default use {@link DataTable.defaults}.
-                        *  @type boolean
-                        */
-                       "bAutoCss": null,
-                       
                        /**
                         * When the table is shorter in height than sScrollY, collapse the
                         * table container down to the height of the table (when true).
                         *  @type boolean
                         */
                        "bCollapse": null,
-                       
-                       /**
-                        * Infinite scrolling enablement flag. Now deprecated in favour of
-                        * using the Scroller plug-in.
-                        * Note that this parameter will be set by the initialisation routine. To
-                        * set a default use {@link DataTable.defaults}.
-                        *  @type boolean
-                        */
-                       "bInfinite": null,
-                       
+       
                        /**
                         * Width of the scrollbar for the web-browser's platform. Calculated
                         * during table initialisation.
                         *  @default 0
                         */
                        "iBarWidth": 0,
-                       
-                       /**
-                        * Space (in pixels) between the bottom of the scrolling container and 
-                        * the bottom of the scrolling viewport before the next page is loaded
-                        * when using infinite scrolling.
-                        * Note that this parameter will be set by the initialisation routine. To
-                        * set a default use {@link DataTable.defaults}.
-                        *  @type int
-                        */
-                       "iLoadGap": null,
-                       
+       
                        /**
-                        * Viewport width for horizontal scrolling. Horizontal scrolling is 
+                        * Viewport width for horizontal scrolling. Horizontal scrolling is
                         * disabled if an empty string.
                         * Note that this parameter will be set by the initialisation routine. To
                         * set a default use {@link DataTable.defaults}.
                         *  @type string
                         */
                        "sX": null,
-                       
+       
                        /**
                         * Width to expand the table to when using x-scrolling. Typically you
                         * should not need to use this.
                         *  @deprecated
                         */
                        "sXInner": null,
-                       
+       
                        /**
                         * Viewport height for vertical scrolling. Vertical scrolling is disabled
                         * if an empty string.
                         */
                        "sY": null
                },
-               
+       
                /**
                 * Language information for the table.
                 *  @namespace
                 */
                "oLanguage": {
                        /**
-                        * Information callback function. See 
+                        * Information callback function. See
                         * {@link DataTable.defaults.fnInfoCallback}
                         *  @type function
                         *  @default null
                         */
                        "fnInfoCallback": null
                },
-               
+       
                /**
                 * Browser support parameters
                 *  @namespace
                         *  @type boolean
                         *  @default false
                         */
-                       "bScrollOversize": false
+                       "bScrollOversize": false,
+       
+                       /**
+                        * Determine if the vertical scrollbar is on the right or left of the
+                        * scrolling container - needed for rtl language layout, although not
+                        * all browsers move the scrollbar (Safari).
+                        *  @type boolean
+                        *  @default false
+                        */
+                       "bScrollbarLeft": false
                },
-               
+       
+       
+               "ajax": null,
+       
+       
                /**
-                * Array referencing the nodes which are used for the features. The 
+                * Array referencing the nodes which are used for the features. The
                 * parameters of this object match what is allowed by sDom - i.e.
                 *   <ul>
                 *     <li>'l' - Length changing</li>
                 *  @default []
                 */
                "aanFeatures": [],
-               
+       
                /**
                 * Store data information - see {@link DataTable.models.oRow} for detailed
                 * information.
                 *  @default []
                 */
                "aoData": [],
-               
+       
                /**
                 * Array of indexes which are in the current display (after filtering etc)
                 *  @type array
                 *  @default []
                 */
                "aiDisplay": [],
-               
+       
                /**
                 * Array of indexes for display - no filtering
                 *  @type array
                 *  @default []
                 */
                "aiDisplayMaster": [],
-               
+       
                /**
                 * Store information about each column that is in use
                 *  @type array
                 *  @default []
                 */
                "aoColumns": [],
-               
+       
                /**
                 * Store information about the table's header
                 *  @type array
                 *  @default []
                 */
                "aoHeader": [],
-               
+       
                /**
                 * Store information about the table's footer
                 *  @type array
                 *  @default []
                 */
                "aoFooter": [],
-               
-               /**
-                * Search data array for regular expression searching
-                *  @type array
-                *  @default []
-                */
-               "asDataSearch": [],
-               
+       
                /**
-                * Store the applied global search information in case we want to force a 
+                * Store the applied global search information in case we want to force a
                 * research or compare the old search to a new one.
                 * Note that this parameter will be set by the initialisation routine. To
                 * set a default use {@link DataTable.defaults}.
                 *  @extends DataTable.models.oSearch
                 */
                "oPreviousSearch": {},
-               
+       
                /**
-                * Store the applied search for each column - see 
+                * Store the applied search for each column - see
                 * {@link DataTable.models.oSearch} for the format that is used for the
                 * filtering information for each column.
                 *  @type array
                 *  @default []
                 */
                "aoPreSearchCols": [],
-               
+       
                /**
                 * Sorting that is applied to the table. Note that the inner arrays are
                 * used in the following manner:
                 * <ul>
                 *   <li>Index 0 - column number</li>
                 *   <li>Index 1 - current sorting direction</li>
-                *   <li>Index 2 - index of asSorting for this column</li>
                 * </ul>
                 * Note that this parameter will be set by the initialisation routine. To
                 * set a default use {@link DataTable.defaults}.
                 *  @todo These inner arrays should really be objects
                 */
                "aaSorting": null,
-               
+       
                /**
                 * Sorting that is always applied to the table (i.e. prefixed in front of
                 * aaSorting).
                 * Note that this parameter will be set by the initialisation routine. To
                 * set a default use {@link DataTable.defaults}.
-                *  @type array|null
-                *  @default null
+                *  @type array
+                *  @default []
                 */
-               "aaSortingFixed": null,
-               
+               "aaSortingFixed": [],
+       
                /**
                 * Classes to use for the striping of a table.
                 * Note that this parameter will be set by the initialisation routine. To
                 *  @default []
                 */
                "asStripeClasses": null,
-               
+       
                /**
                 * If restoring a table - we should restore its striping classes as well
                 *  @type array
                 *  @default []
                 */
                "asDestroyStripes": [],
-               
+       
                /**
-                * If restoring a table - we should restore its width 
+                * If restoring a table - we should restore its width
                 *  @type int
                 *  @default 0
                 */
                "sDestroyWidth": 0,
-               
+       
                /**
                 * Callback functions array for every time a row is inserted (i.e. on a draw).
                 *  @type array
                 *  @default []
                 */
                "aoRowCallback": [],
-               
+       
                /**
                 * Callback functions for the header on each draw.
                 *  @type array
                 *  @default []
                 */
                "aoHeaderCallback": [],
-               
+       
                /**
                 * Callback function for the footer on each draw.
                 *  @type array
                 *  @default []
                 */
                "aoFooterCallback": [],
-               
+       
                /**
                 * Array of callback functions for draw callback functions
                 *  @type array
                 *  @default []
                 */
                "aoDrawCallback": [],
-               
+       
                /**
                 * Array of callback functions for row created function
                 *  @type array
                 *  @default []
                 */
                "aoRowCreatedCallback": [],
-               
+       
                /**
-                * Callback functions for just before the table is redrawn. A return of 
+                * Callback functions for just before the table is redrawn. A return of
                 * false will be used to cancel the draw.
                 *  @type array
                 *  @default []
                 */
                "aoPreDrawCallback": [],
-               
+       
                /**
                 * Callback functions for when the table has been initialised.
                 *  @type array
                 */
                "aoInitComplete": [],
        
-               
+       
                /**
                 * Callbacks for modifying the settings to be stored for state saving, prior to
                 * saving state.
                 *  @default []
                 */
                "aoStateSaveParams": [],
-               
+       
                /**
                 * Callbacks for modifying the settings that have been stored for state saving
                 * prior to using the stored values to restore the state.
                 *  @default []
                 */
                "aoStateLoadParams": [],
-               
+       
                /**
                 * Callbacks for operating on the settings object once the saved state has been
                 * loaded
                 *  @default []
                 */
                "aoStateLoaded": [],
-               
+       
                /**
                 * Cache the table ID for quick access
                 *  @type string
                 *  @default <i>Empty string</i>
                 */
                "sTableId": "",
-               
+       
                /**
                 * The TABLE node for the main table
                 *  @type node
                 *  @default null
                 */
                "nTable": null,
-               
+       
                /**
                 * Permanent ref to the thead element
                 *  @type node
                 *  @default null
                 */
                "nTHead": null,
-               
+       
                /**
                 * Permanent ref to the tfoot element - if it exists
                 *  @type node
                 *  @default null
                 */
                "nTFoot": null,
-               
+       
                /**
                 * Permanent ref to the tbody element
                 *  @type node
                 *  @default null
                 */
                "nTBody": null,
-               
+       
                /**
                 * Cache the wrapper node (contains all DataTables controlled elements)
                 *  @type node
                 *  @default null
                 */
                "nTableWrapper": null,
-               
+       
                /**
-                * Indicate if when using server-side processing the loading of data 
+                * Indicate if when using server-side processing the loading of data
                 * should be deferred until the second draw.
                 * Note that this parameter will be set by the initialisation routine. To
                 * set a default use {@link DataTable.defaults}.
                 *  @default false
                 */
                "bDeferLoading": false,
-               
+       
                /**
                 * Indicate if all required information has been read in
                 *  @type boolean
                 *  @default false
                 */
                "bInitialised": false,
-               
+       
                /**
                 * Information about open rows. Each object in the array has the parameters
                 * 'nTr' and 'nParent'
                 *  @default []
                 */
                "aoOpenRows": [],
-               
+       
                /**
                 * Dictate the positioning of DataTables' control elements - see
                 * {@link DataTable.model.oInit.sDom}.
                 *  @default null
                 */
                "sDom": null,
-               
+       
                /**
                 * Which type of pagination should be used.
                 * Note that this parameter will be set by the initialisation routine. To
                 * set a default use {@link DataTable.defaults}.
-                *  @type string 
+                *  @type string
                 *  @default two_button
                 */
                "sPaginationType": "two_button",
-               
+       
                /**
-                * The cookie duration (for bStateSave) in seconds.
+                * The state duration (for `stateSave`) in seconds.
                 * Note that this parameter will be set by the initialisation routine. To
                 * set a default use {@link DataTable.defaults}.
                 *  @type int
                 *  @default 0
                 */
-               "iCookieDuration": 0,
-               
-               /**
-                * The cookie name prefix.
-                * Note that this parameter will be set by the initialisation routine. To
-                * set a default use {@link DataTable.defaults}.
-                *  @type string
-                *  @default <i>Empty string</i>
-                */
-               "sCookiePrefix": "",
-               
-               /**
-                * Callback function for cookie creation.
-                * Note that this parameter will be set by the initialisation routine. To
-                * set a default use {@link DataTable.defaults}.
-                *  @type function
-                *  @default null
-                */
-               "fnCookieCallback": null,
-               
+               "iStateDuration": 0,
+       
                /**
-                * Array of callback functions for state saving. Each array element is an 
+                * Array of callback functions for state saving. Each array element is an
                 * object with the following parameters:
                 *   <ul>
                 *     <li>function:fn - function to call. Takes two parameters, oSettings
                 *       and the JSON string to save that has been thus far created. Returns
-                *       a JSON string to be inserted into a json object 
+                *       a JSON string to be inserted into a json object
                 *       (i.e. '"param": [ 0, 1, 2]')</li>
                 *     <li>string:sName - name of callback</li>
                 *   </ul>
                 *  @default []
                 */
                "aoStateSave": [],
-               
+       
                /**
-                * Array of callback functions for state loading. Each array element is an 
+                * Array of callback functions for state loading. Each array element is an
                 * object with the following parameters:
                 *   <ul>
-                *     <li>function:fn - function to call. Takes two parameters, oSettings 
+                *     <li>function:fn - function to call. Takes two parameters, oSettings
                 *       and the object stored. May return false to cancel state loading</li>
                 *     <li>string:sName - name of callback</li>
                 *   </ul>
                 *  @default []
                 */
                "aoStateLoad": [],
-               
+       
                /**
-                * State that was loaded from the cookie. Useful for back reference
+                * State that was loaded. Useful for back reference
                 *  @type object
                 *  @default null
                 */
                "oLoadedState": null,
-               
+       
                /**
                 * Source url for AJAX data for the table.
                 * Note that this parameter will be set by the initialisation routine. To
                 *  @default null
                 */
                "sAjaxSource": null,
-               
+       
                /**
                 * Property from a given object from which to read the table data from. This
-                * can be an empty string (when not server-side processing), in which case 
+                * can be an empty string (when not server-side processing), in which case
                 * it is  assumed an an array is given directly.
                 * Note that this parameter will be set by the initialisation routine. To
                 * set a default use {@link DataTable.defaults}.
                 *  @type string
                 */
                "sAjaxDataProp": null,
-               
+       
                /**
                 * Note if draw should be blocked while getting data
                 *  @type boolean
                 *  @default true
                 */
                "bAjaxDataGet": true,
-               
+       
                /**
-                * The last jQuery XHR object that was used for server-side data gathering. 
-                * This can be used for working with the XHR information in one of the 
+                * The last jQuery XHR object that was used for server-side data gathering.
+                * This can be used for working with the XHR information in one of the
                 * callbacks
                 *  @type object
                 *  @default null
                 */
                "jqXHR": null,
-               
+       
+               /**
+                * JSON returned from the server in the last Ajax request
+                *  @type object
+                *  @default undefined
+                */
+               "json": undefined,
+       
+               /**
+                * Data submitted as part of the last Ajax request
+                *  @type object
+                *  @default undefined
+                */
+               "oAjaxData": undefined,
+       
                /**
                 * Function to get the server-side data.
                 * Note that this parameter will be set by the initialisation routine. To
                 *  @type function
                 */
                "fnServerData": null,
-               
+       
                /**
-                * Functions which are called prior to sending an Ajax request so extra 
+                * Functions which are called prior to sending an Ajax request so extra
                 * parameters can easily be sent to the server
                 *  @type array
                 *  @default []
                 */
                "aoServerParams": [],
-               
+       
                /**
-                * Send the XHR HTTP method - GET or POST (could be PUT or DELETE if 
+                * Send the XHR HTTP method - GET or POST (could be PUT or DELETE if
                 * required).
                 * Note that this parameter will be set by the initialisation routine. To
                 * set a default use {@link DataTable.defaults}.
                 *  @type string
                 */
                "sServerMethod": null,
-               
+       
                /**
                 * Format numbers for display.
                 * Note that this parameter will be set by the initialisation routine. To
                 *  @type function
                 */
                "fnFormatNumber": null,
-               
+       
                /**
                 * List of options that can be used for the user selectable length menu.
                 * Note that this parameter will be set by the initialisation routine. To
                 *  @default []
                 */
                "aLengthMenu": null,
-               
+       
                /**
                 * Counter for the draws that the table does. Also used as a tracker for
                 * server-side processing
                 *  @default 0
                 */
                "iDraw": 0,
-               
+       
                /**
                 * Indicate if a redraw is being done - useful for Ajax
                 *  @type boolean
                 *  @default false
                 */
                "bDrawing": false,
-               
+       
                /**
                 * Draw index (iDraw) of the last error when parsing the returned data
                 *  @type int
                 *  @default -1
                 */
                "iDrawError": -1,
-               
+       
                /**
                 * Paging display length
                 *  @type int
                 */
                "_iDisplayStart": 0,
        
-               /**
-                * Paging end point - aiDisplay index. Use fnDisplayEnd rather than
-                * this property to get the end point
-                *  @type int
-                *  @default 10
-                *  @private
-                */
-               "_iDisplayEnd": 10,
-               
                /**
                 * Server-side processing - number of records in the result set
                 * (i.e. before filtering), Use fnRecordsTotal rather than
                 *  @private
                 */
                "_iRecordsDisplay": 0,
-               
+       
                /**
                 * Flag to indicate if jQuery UI marking and classes should be used.
                 * Note that this parameter will be set by the initialisation routine. To
                 * set a default use {@link DataTable.defaults}.
                 *  @type boolean
                 */
-               "bJUI": null,
-               
+               "bJUI": null,
+       
+               /**
+                * The classes to use for the table
+                *  @type object
+                *  @default {}
+                */
+               "oClasses": {},
+       
+               /**
+                * Flag attached to the settings object so you can check in the draw
+                * callback if filtering has been done in the draw. Deprecated in favour of
+                * events.
+                *  @type boolean
+                *  @default false
+                *  @deprecated
+                */
+               "bFiltered": false,
+       
+               /**
+                * Flag attached to the settings object so you can check in the draw
+                * callback if sorting has been done in the draw. Deprecated in favour of
+                * events.
+                *  @type boolean
+                *  @default false
+                *  @deprecated
+                */
+               "bSorted": false,
+       
+               /**
+                * Indicate that if multiple rows are in the header and there is more than
+                * one unique cell per column, if the top one (true) or bottom one (false)
+                * should be used for sorting / title by DataTables.
+                * Note that this parameter will be set by the initialisation routine. To
+                * set a default use {@link DataTable.defaults}.
+                *  @type boolean
+                */
+               "bSortCellsTop": null,
+       
+               /**
+                * Initialisation object that is used for the table
+                *  @type object
+                *  @default null
+                */
+               "oInit": null,
+       
+               /**
+                * Destroy callback functions - for plug-ins to attach themselves to the
+                * destroy so they can clean up markup and events.
+                *  @type array
+                *  @default []
+                */
+               "aoDestroyCallback": [],
+       
+       
+               /**
+                * Get the number of records in the current record set, before filtering
+                *  @type function
+                */
+               "fnRecordsTotal": function ()
+               {
+                       return _fnDataSource( this ) == 'ssp' ?
+                               this._iRecordsTotal * 1 :
+                               this.aiDisplayMaster.length;
+               },
+       
+               /**
+                * Get the number of records in the current record set, after filtering
+                *  @type function
+                */
+               "fnRecordsDisplay": function ()
+               {
+                       return _fnDataSource( this ) == 'ssp' ?
+                               this._iRecordsDisplay * 1 :
+                               this.aiDisplay.length;
+               },
+       
+               /**
+                * Get the display end point - aiDisplay index
+                *  @type function
+                */
+               "fnDisplayEnd": function ()
+               {
+                       var
+                               len      = this._iDisplayLength,
+                               start    = this._iDisplayStart,
+                               calc     = start + len,
+                               records  = this.aiDisplay.length,
+                               features = this.oFeatures,
+                               paginate = features.bPaginate;
+       
+                       if ( features.bServerSide ) {
+                               return paginate === false || len === -1 ?
+                                       start + records :
+                                       Math.min( start+len, this._iRecordsDisplay );
+                       }
+                       else {
+                               return ! paginate || calc>records || len===-1 ?
+                                       records :
+                                       calc;
+                       }
+               },
+       
+               /**
+                * The DataTables object for this table
+                *  @type object
+                *  @default null
+                */
+               "oInstance": null,
+       
+               /**
+                * Unique identifier for each instance of the DataTables object. If there
+                * is an ID on the table node, then it takes that value, otherwise an
+                * incrementing internal counter is used.
+                *  @type string
+                *  @default null
+                */
+               "sInstance": null,
+       
+               /**
+                * tabindex attribute value that is added to DataTables control elements, allowing
+                * keyboard navigation of the table and its controls.
+                */
+               "iTabIndex": 0,
+       
+               /**
+                * DIV container for the footer scrolling table if scrolling
+                */
+               "nScrollHead": null,
+       
+               /**
+                * DIV container for the footer scrolling table if scrolling
+                */
+               "nScrollFoot": null,
+       
+               /**
+                * Last applied sort
+                *  @type array
+                *  @default []
+                */
+               "aLastSort": [],
+       
+               /**
+                * Stored plug-in instances
+                *  @type object
+                *  @default {}
+                */
+               "oPlugins": {}
+       };
+
+       /**
+        * Extension object for DataTables that is used to provide all extension
+        * options.
+        *
+        * Note that the `DataTable.ext` object is available through
+        * `jQuery.fn.dataTable.ext` where it may be accessed and manipulated. It is
+        * also aliased to `jQuery.fn.dataTableExt` for historic reasons.
+        *  @namespace
+        *  @extends DataTable.models.ext
+        */
+       
+       
+       /**
+        * DataTables extensions
+        * 
+        * This namespace acts as a collection area for plug-ins that can be used to
+        * extend DataTables capabilities. Indeed many of the build in methods
+        * use this method to provide their own capabilities (sorting methods for
+        * example).
+        *
+        * Note that this namespace is aliased to `jQuery.fn.dataTableExt` for legacy
+        * reasons
+        *
+        *  @namespace
+        */
+       DataTable.ext = _ext = {
+               /**
+                * Element class names
+                *
+                *  @type object
+                *  @default {}
+                */
+               classes: {},
+       
+       
+               /**
+                * Error reporting.
+                * 
+                * How should DataTables report an error. Can take the value 'alert' or
+                * 'throw'
+                *
+                *  @type string
+                *  @default alert
+                */
+               errMode: "alert",
+       
+       
+               /**
+                * Feature plug-ins.
+                * 
+                * This is an array of objects which describe the feature plug-ins that are
+                * available to DataTables. These feature plug-ins are then available for
+                * use through the `dom` initialisation option.
+                * 
+                * Each feature plug-in is described by an object which must have the
+                * following properties:
+                * 
+                * * `fnInit` - function that is used to initialise the plug-in,
+                * * `cFeature` - a character so the feature can be enabled by the `dom`
+                *   instillation option. This is case sensitive.
+                *
+                * The `fnInit` function has the following input parameters:
+                *
+                * 1. `{object}` DataTables settings object: see
+                *    {@link DataTable.models.oSettings}
+                *
+                * And the following return is expected:
+                * 
+                * * {node|null} The element which contains your feature. Note that the
+                *   return may also be void if your plug-in does not require to inject any
+                *   DOM elements into DataTables control (`dom`) - for example this might
+                *   be useful when developing a plug-in which allows table control via
+                *   keyboard entry
+                *
+                *  @type array
+                *
+                *  @example
+                *    $.fn.dataTable.ext.features.push( {
+                *      "fnInit": function( oSettings ) {
+                *        return new TableTools( { "oDTSettings": oSettings } );
+                *      },
+                *      "cFeature": "T"
+                *    } );
+                */
+               feature: [],
+       
+       
+               /**
+                * Row searching.
+                * 
+                * This method of searching is complimentary to the default type based
+                * searching, and a lot more comprehensive as it allows you complete control
+                * over the searching logic. Each element in this array is a function
+                * (parameters described below) that is called for every row in the table,
+                * and your logic decides if it should be included in the searching data set
+                * or not.
+                *
+                * Searching functions have the following input parameters:
+                *
+                * 1. `{object}` DataTables settings object: see
+                *    {@link DataTable.models.oSettings}
+                * 2. `{array|object}` Data for the row to be processed (same as the
+                *    original format that was passed in as the data source, or an array
+                *    from a DOM data source
+                * 3. `{int}` Row index ({@link DataTable.models.oSettings.aoData}), which
+                *    can be useful to retrieve the `TR` element if you need DOM interaction.
+                *
+                * And the following return is expected:
+                *
+                * * {boolean} Include the row in the searched result set (true) or not
+                *   (false)
+                *
+                * Note that as with the main search ability in DataTables, technically this
+                * is "filtering", since it is subtractive. However, for consistency in
+                * naming we call it searching here.
+                *
+                *  @type array
+                *  @default []
+                *
+                *  @example
+                *    // The following example shows custom search being applied to the
+                *    // fourth column (i.e. the data[3] index) based on two input values
+                *    // from the end-user, matching the data in a certain range.
+                *    $.fn.dataTable.ext.search.push(
+                *      function( settings, data, dataIndex ) {
+                *        var min = document.getElementById('min').value * 1;
+                *        var max = document.getElementById('max').value * 1;
+                *        var version = data[3] == "-" ? 0 : data[3]*1;
+                *
+                *        if ( min == "" && max == "" ) {
+                *          return true;
+                *        }
+                *        else if ( min == "" && version < max ) {
+                *          return true;
+                *        }
+                *        else if ( min < version && "" == max ) {
+                *          return true;
+                *        }
+                *        else if ( min < version && version < max ) {
+                *          return true;
+                *        }
+                *        return false;
+                *      }
+                *    );
+                */
+               search: [],
+       
+       
                /**
-                * The classes to use for the table
+                * Internal functions, exposed for used in plug-ins.
+                * 
+                * Please note that you should not need to use the internal methods for
+                * anything other than a plug-in (and even then, try to avoid if possible).
+                * The internal function may change between releases.
+                *
                 *  @type object
                 *  @default {}
                 */
-               "oClasses": {},
-               
-               /**
-                * Flag attached to the settings object so you can check in the draw 
-                * callback if filtering has been done in the draw. Deprecated in favour of
-                * events.
-                *  @type boolean
-                *  @default false
-                *  @deprecated
-                */
-               "bFiltered": false,
-               
-               /**
-                * Flag attached to the settings object so you can check in the draw 
-                * callback if sorting has been done in the draw. Deprecated in favour of
-                * events.
-                *  @type boolean
-                *  @default false
-                *  @deprecated
-                */
-               "bSorted": false,
-               
+               internal: {},
+       
+       
                /**
-                * Indicate that if multiple rows are in the header and there is more than 
-                * one unique cell per column, if the top one (true) or bottom one (false) 
-                * should be used for sorting / title by DataTables.
-                * Note that this parameter will be set by the initialisation routine. To
-                * set a default use {@link DataTable.defaults}.
-                *  @type boolean
+                * Legacy configuration options. Enable and disable legacy options that
+                * are available in DataTables.
+                *
+                *  @type object
                 */
-               "bSortCellsTop": null,
-               
+               legacy: {
+                       /**
+                        * Enable / disable DataTables 1.9 compatible server-side processing
+                        * requests
+                        *
+                        *  @type boolean
+                        *  @default null
+                        */
+                       ajax: null
+               },
+       
+       
                /**
-                * Initialisation object that is used for the table
+                * Pagination plug-in methods.
+                * 
+                * Each entry in this object is a function and defines which buttons should
+                * be shown by the pagination rendering method that is used for the table:
+                * {@link DataTable.ext.renderer.pageButton}. The renderer addresses how the
+                * buttons are displayed in the document, while the functions here tell it
+                * what buttons to display. This is done by returning an array of button
+                * descriptions (what each button will do).
+                *
+                * Pagination types (the four built in options and any additional plug-in
+                * options defined here) can be used through the `paginationType`
+                * initialisation parameter.
+                *
+                * The functions defined take two parameters:
+                *
+                * 1. `{int} page` The current page index
+                * 2. `{int} pages` The number of pages in the table
+                *
+                * Each function is expected to return an array where each element of the
+                * array can be one of:
+                *
+                * * `first` - Jump to first page when activated
+                * * `last` - Jump to last page when activated
+                * * `previous` - Show previous page when activated
+                * * `next` - Show next page when activated
+                * * `{int}` - Show page of the index given
+                * * `{array}` - A nested array containing the above elements to add a
+                *   containing 'DIV' element (might be useful for styling).
+                *
+                * Note that DataTables v1.9- used this object slightly differently whereby
+                * an object with two functions would be defined for each plug-in. That
+                * ability is still supported by DataTables 1.10+ to provide backwards
+                * compatibility, but this option of use is now decremented and no longer
+                * documented in DataTables 1.10+.
+                *
                 *  @type object
-                *  @default null
+                *  @default {}
+                *
+                *  @example
+                *    // Show previous, next and current page buttons only
+                *    $.fn.dataTableExt.oPagination.current = function ( page, pages ) {
+                *      return [ 'previous', page, 'next' ];
+                *    };
                 */
-               "oInit": null,
-               
+               pager: {},
+       
+       
+               renderer: {
+                       pageButton: {},
+                       header: {}
+               },
+       
+       
                /**
-                * Destroy callback functions - for plug-ins to attach themselves to the
-                * destroy so they can clean up markup and events.
+                * Ordering plug-ins - custom data source
+                * 
+                * The extension options for ordering of data available here is complimentary
+                * to the default type based ordering that DataTables typically uses. It
+                * allows much greater control over the the data that is being used to
+                * order a column, but is necessarily therefore more complex.
+                * 
+                * This type of ordering is useful if you want to do ordering based on data
+                * live from the DOM (for example the contents of an 'input' element) rather
+                * than just the static string that DataTables knows of.
+                * 
+                * The way these plug-ins work is that you create an array of the values you
+                * wish to be ordering for the column in question and then return that
+                * array. The data in the array much be in the index order of the rows in
+                * the table (not the currently ordering order!). Which order data gathering
+                * function is run here depends on the `dt-init columns.orderDataType`
+                * parameter that is used for the column (if any).
+                *
+                * The functions defined take two parameters:
+                *
+                * 1. `{object}` DataTables settings object: see
+                *    {@link DataTable.models.oSettings}
+                * 2. `{int}` Target column index
+                *
+                * Each function is expected to return an array:
+                *
+                * * `{array}` Data for the column to be ordering upon
+                *
                 *  @type array
-                *  @default []
+                *
+                *  @example
+                *    // Ordering using `input` node values
+                *    $.fn.dataTable.ext.order['dom-text'] = function  ( settings, col )
+                *    {
+                *      return this.api().column( col, {order:'index'} ).nodes().map( function ( td, i ) {
+                *        return $('input', td).val();
+                *      } );
+                *    }
                 */
-               "aoDestroyCallback": [],
+               order: {},
+       
        
-               
                /**
-                * Get the number of records in the current record set, before filtering
-                *  @type function
+                * Type based plug-ins.
+                *
+                * Each column in DataTables has a type assigned to it, either by automatic
+                * detection or by direct assignment using the `type` option for the column.
+                * The type of a column will effect how it is ordering and search (plug-ins
+                * can also make use of the column type if required).
+                *
+                * @namespace
                 */
-               "fnRecordsTotal": function ()
-               {
-                       if ( this.oFeatures.bServerSide ) {
-                               return parseInt(this._iRecordsTotal, 10);
-                       } else {
-                               return this.aiDisplayMaster.length;
-                       }
+               type: {
+                       /**
+                        * Type detection functions.
+                        *
+                        * The functions defined in this object are used to automatically detect
+                        * a column's type, making initialisation of DataTables super easy, even
+                        * when complex data is in the table.
+                        *
+                        * The functions defined take two parameters:
+                        *
+                    *  1. `{*}` Data from the column cell to be analysed
+                    *  2. `{settings}` DataTables settings object. This can be used to
+                    *     perform context specific type detection - for example detection
+                    *     based on language settings such as using a comma for a decimal
+                    *     place. Generally speaking the options from the settings will not
+                    *     be required
+                        *
+                        * Each function is expected to return:
+                        *
+                        * * `{string|null}` Data type detected, or null if unknown (and thus
+                        *   pass it on to the other type detection functions.
+                        *
+                        *  @type array
+                        *
+                        *  @example
+                        *    // Currency type detection plug-in:
+                        *    $.fn.dataTable.ext.type.detect.push(
+                        *      function ( data, settings ) {
+                        *        // Check the numeric part
+                        *        if ( ! $.isNumeric( data.substring(1) ) ) {
+                        *          return null;
+                        *        }
+                        *
+                        *        // Check prefixed by currency
+                        *        if ( data.charAt(0) == '$' || data.charAt(0) == '&pound;' ) {
+                        *          return 'currency';
+                        *        }
+                        *        return null;
+                        *      }
+                        *    );
+                        */
+                       detect: [],
+       
+       
+                       /**
+                        * Type based search formatting.
+                        *
+                        * The type based searching functions can be used to pre-format the
+                        * data to be search on. For example, it can be used to strip HTML
+                        * tags or to de-format telephone numbers for numeric only searching.
+                        *
+                        * Note that is a search is not defined for a column of a given type,
+                        * no search formatting will be performed.
+                        * 
+                        * Pre-processing of searching data plug-ins - When you assign the sType
+                        * for a column (or have it automatically detected for you by DataTables
+                        * or a type detection plug-in), you will typically be using this for
+                        * custom sorting, but it can also be used to provide custom searching
+                        * by allowing you to pre-processing the data and returning the data in
+                        * the format that should be searched upon. This is done by adding
+                        * functions this object with a parameter name which matches the sType
+                        * for that target column. This is the corollary of <i>afnSortData</i>
+                        * for searching data.
+                        *
+                        * The functions defined take a single parameter:
+                        *
+                    *  1. `{*}` Data from the column cell to be prepared for searching
+                        *
+                        * Each function is expected to return:
+                        *
+                        * * `{string|null}` Formatted string that will be used for the searching.
+                        *
+                        *  @type object
+                        *  @default {}
+                        *
+                        *  @example
+                        *    $.fn.dataTable.ext.type.search['title-numeric'] = function ( d ) {
+                        *      return d.replace(/\n/g," ").replace( /<.*?>/g, "" );
+                        *    }
+                        */
+                       search: {},
+       
+       
+                       /**
+                        * Type based ordering.
+                        *
+                        * The column type tells DataTables what ordering to apply to the table
+                        * when a column is sorted upon. The order for each type that is defined,
+                        * is defined by the functions available in this object.
+                        *
+                        * Each ordering option can be described by three properties added to
+                        * this object:
+                        *
+                        * * `{type}-pre` - Pre-formatting function
+                        * * `{type}-asc` - Ascending order function
+                        * * `{type}-desc` - Descending order function
+                        *
+                        * All three can be used together, only `{type}-pre` or only
+                        * `{type}-asc` and `{type}-desc` together. It is generally recommended
+                        * that only `{type}-pre` is used, as this provides the optimal
+                        * implementation in terms of speed, although the others are provided
+                        * for compatibility with existing Javascript sort functions.
+                        *
+                        * `{type}-pre`: Functions defined take a single parameter:
+                        *
+                    *  1. `{*}` Data from the column cell to be prepared for ordering
+                        *
+                        * And return:
+                        *
+                        * * `{*}` Data to be sorted upon
+                        *
+                        * `{type}-asc` and `{type}-desc`: Functions are typical Javascript sort
+                        * functions, taking two parameters:
+                        *
+                    *  1. `{*}` Data to compare to the second parameter
+                    *  2. `{*}` Data to compare to the first parameter
+                        *
+                        * And returning:
+                        *
+                        * * `{*}` Ordering match: <0 if first parameter should be sorted lower
+                        *   than the second parameter, ===0 if the two parameters are equal and
+                        *   >0 if the first parameter should be sorted height than the second
+                        *   parameter.
+                        * 
+                        *  @type object
+                        *  @default {}
+                        *
+                        *  @example
+                        *    // Numeric ordering of formatted numbers with a pre-formatter
+                        *    $.extend( $.fn.dataTable.ext.type.order, {
+                        *      "string-pre": function(x) {
+                        *        a = (a === "-" || a === "") ? 0 : a.replace( /[^\d\-\.]/g, "" );
+                        *        return parseFloat( a );
+                        *      }
+                        *    } );
+                        *
+                        *  @example
+                        *    // Case-sensitive string ordering, with no pre-formatting method
+                        *    $.extend( $.fn.dataTable.ext.order, {
+                        *      "string-case-asc": function(x,y) {
+                        *        return ((x < y) ? -1 : ((x > y) ? 1 : 0));
+                        *      },
+                        *      "string-case-desc": function(x,y) {
+                        *        return ((x < y) ? 1 : ((x > y) ? -1 : 0));
+                        *      }
+                        *    } );
+                        */
+                       order: {}
                },
-               
+       
                /**
-                * Get the number of records in the current record set, after filtering
-                *  @type function
+                * Unique DataTables instance counter
+                *
+                * @type int
+                * @private
                 */
-               "fnRecordsDisplay": function ()
-               {
-                       if ( this.oFeatures.bServerSide ) {
-                               return parseInt(this._iRecordsDisplay, 10);
-                       } else {
-                               return this.aiDisplay.length;
-                       }
-               },
-               
+               _unique: 0,
+       
+       
+               //
+               // Depreciated
+               // The following properties are retained for backwards compatiblity only.
+               // The should not be used in new projects and will be removed in a future
+               // version
+               //
+       
                /**
-                * Set the display end point - aiDisplay index
+                * Version check function.
                 *  @type function
-                *  @todo Should do away with _iDisplayEnd and calculate it on-the-fly here
-                */
-               "fnDisplayEnd": function ()
-               {
-                       if ( this.oFeatures.bServerSide ) {
-                               if ( this.oFeatures.bPaginate === false || this._iDisplayLength == -1 ) {
-                                       return this._iDisplayStart+this.aiDisplay.length;
-                               } else {
-                                       return Math.min( this._iDisplayStart+this._iDisplayLength, 
-                                               this._iRecordsDisplay );
-                               }
-                       } else {
-                               return this._iDisplayEnd;
-                       }
-               },
-               
-               /**
-                * The DataTables object for this table
-                *  @type object
-                *  @default null
-                */
-               "oInstance": null,
-               
-               /**
-                * Unique identifier for each instance of the DataTables object. If there
-                * is an ID on the table node, then it takes that value, otherwise an
-                * incrementing internal counter is used.
-                *  @type string
-                *  @default null
+                *  @depreciated Since 1.10
                 */
-               "sInstance": null,
+               fnVersionCheck: DataTable.fnVersionCheck,
+       
        
                /**
-                * tabindex attribute value that is added to DataTables control elements, allowing
-                * keyboard navigation of the table and its controls.
+                * Index for what 'this' index API functions should use
+                *  @type int
+                *  @deprecated Since v1.10
                 */
-               "iTabIndex": 0,
+               iApiIndex: 0,
+       
        
                /**
-                * DIV container for the footer scrolling table if scrolling
+                * jQuery UI class container
+                *  @type object
+                *  @deprecated Since v1.10
                 */
-               "nScrollHead": null,
+               oJUIClasses: {},
+       
        
                /**
-                * DIV container for the footer scrolling table if scrolling
+                * Software version
+                *  @type string
+                *  @deprecated Since v1.10
                 */
-               "nScrollFoot": null
+               sVersion: DataTable.version
        };
-
-       /**
-        * Extension object for DataTables that is used to provide all extension options.
-        * 
-        * Note that the <i>DataTable.ext</i> object is available through
-        * <i>jQuery.fn.dataTable.ext</i> where it may be accessed and manipulated. It is
-        * also aliased to <i>jQuery.fn.dataTableExt</i> for historic reasons.
-        *  @namespace
-        *  @extends DataTable.models.ext
-        */
-       DataTable.ext = $.extend( true, {}, DataTable.models.ext );
        
-       $.extend( DataTable.ext.oStdClasses, {
+       
+       //
+       // Backwards compatibility. Alias to pre 1.10 Hungarian notation counter parts
+       //
+       $.extend( _ext, {
+               afnFiltering: _ext.search,
+               aTypes:       _ext.type.detect,
+               ofnSearch:    _ext.type.search,
+               oSort:        _ext.type.order,
+               afnSortData:  _ext.order,
+               aoFeatures:   _ext.feature,
+               oApi:         _ext.internal,
+               oStdClasses:  _ext.classes,
+               oPagination:  _ext.pager
+       } );
+       
+       
+       $.extend( DataTable.ext.classes, {
                "sTable": "dataTable",
+               "sNoFooter": "no-footer",
        
-               /* Two buttons buttons */
-               "sPagePrevEnabled": "paginate_enabled_previous",
-               "sPagePrevDisabled": "paginate_disabled_previous",
-               "sPageNextEnabled": "paginate_enabled_next",
-               "sPageNextDisabled": "paginate_disabled_next",
-               "sPageJUINext": "",
-               "sPageJUIPrev": "",
-               
-               /* Full numbers paging buttons */
+               /* Paging buttons */
                "sPageButton": "paginate_button",
-               "sPageButtonActive": "paginate_active",
-               "sPageButtonStaticDisabled": "paginate_button paginate_button_disabled",
-               "sPageFirst": "first",
-               "sPagePrevious": "previous",
-               "sPageNext": "next",
-               "sPageLast": "last",
-               
+               "sPageButtonActive": "current",
+               "sPageButtonDisabled": "disabled",
+       
                /* Striping classes */
                "sStripeOdd": "odd",
                "sStripeEven": "even",
-               
+       
                /* Empty row */
                "sRowEmpty": "dataTables_empty",
-               
+       
                /* Features */
                "sWrapper": "dataTables_wrapper",
                "sFilter": "dataTables_filter",
                "sPaging": "dataTables_paginate paging_", /* Note that the type is postfixed */
                "sLength": "dataTables_length",
                "sProcessing": "dataTables_processing",
-               
+       
                /* Sorting */
                "sSortAsc": "sorting_asc",
                "sSortDesc": "sorting_desc",
                "sSortableDesc": "sorting_desc_disabled",
                "sSortableNone": "sorting_disabled",
                "sSortColumn": "sorting_", /* Note that an int is postfixed for the sorting order */
-               "sSortJUIAsc": "",
-               "sSortJUIDesc": "",
-               "sSortJUI": "",
-               "sSortJUIAscAllowed": "",
-               "sSortJUIDescAllowed": "",
-               "sSortJUIWrapper": "",
-               "sSortIcon": "",
-               
+       
+               /* Filtering */
+               "sFilterInput": "",
+       
+               /* Page length */
+               "sLengthSelect": "",
+       
                /* Scrolling */
                "sScrollWrapper": "dataTables_scroll",
                "sScrollHead": "dataTables_scrollHead",
                "sScrollBody": "dataTables_scrollBody",
                "sScrollFoot": "dataTables_scrollFoot",
                "sScrollFootInner": "dataTables_scrollFootInner",
-               
+       
                /* Misc */
+               "sHeaderTH": "",
                "sFooterTH": "",
+       
+               // Deprecated
+               "sSortJUIAsc": "",
+               "sSortJUIDesc": "",
+               "sSortJUI": "",
+               "sSortJUIAscAllowed": "",
+               "sSortJUIDescAllowed": "",
+               "sSortJUIWrapper": "",
+               "sSortIcon": "",
                "sJUIHeader": "",
                "sJUIFooter": ""
        } );
        
        
-       $.extend( DataTable.ext.oJUIClasses, DataTable.ext.oStdClasses, {
-               /* Two buttons buttons */
-               "sPagePrevEnabled": "fg-button ui-button ui-state-default ui-corner-left",
-               "sPagePrevDisabled": "fg-button ui-button ui-state-default ui-corner-left ui-state-disabled",
-               "sPageNextEnabled": "fg-button ui-button ui-state-default ui-corner-right",
-               "sPageNextDisabled": "fg-button ui-button ui-state-default ui-corner-right ui-state-disabled",
-               "sPageJUINext": "ui-icon ui-icon-circle-arrow-e",
-               "sPageJUIPrev": "ui-icon ui-icon-circle-arrow-w",
-               
+       (function() {
+       
+       // Reused strings for better compression. Closure compiler appears to have a
+       // weird edge case where it is trying to expand strings rather than use the
+       // variable version. This results in about 200 bytes being added, for very
+       // little preference benefit since it this run on script load only.
+       var _empty = '';
+       _empty = '';
+       
+       var _stateDefault = _empty + 'ui-state-default';
+       var _sortIcon     = _empty + 'css_right ui-icon ui-icon-';
+       var _headerFooter = _empty + 'fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix';
+       
+       $.extend( DataTable.ext.oJUIClasses, DataTable.ext.classes, {
                /* Full numbers paging buttons */
-               "sPageButton": "fg-button ui-button ui-state-default",
-               "sPageButtonActive": "fg-button ui-button ui-state-default ui-state-disabled",
-               "sPageButtonStaticDisabled": "fg-button ui-button ui-state-default ui-state-disabled",
-               "sPageFirst": "first ui-corner-tl ui-corner-bl",
-               "sPageLast": "last ui-corner-tr ui-corner-br",
-               
+               "sPageButton":         "fg-button ui-button "+_stateDefault,
+               "sPageButtonActive":   "ui-state-disabled",
+               "sPageButtonDisabled": "ui-state-disabled",
+       
                /* Features */
                "sPaging": "dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi "+
                        "ui-buttonset-multi paging_", /* Note that the type is postfixed */
-               
+       
                /* Sorting */
-               "sSortAsc": "ui-state-default",
-               "sSortDesc": "ui-state-default",
-               "sSortable": "ui-state-default",
-               "sSortableAsc": "ui-state-default",
-               "sSortableDesc": "ui-state-default",
-               "sSortableNone": "ui-state-default",
-               "sSortJUIAsc": "css_right ui-icon ui-icon-triangle-1-n",
-               "sSortJUIDesc": "css_right ui-icon ui-icon-triangle-1-s",
-               "sSortJUI": "css_right ui-icon ui-icon-carat-2-n-s",
-               "sSortJUIAscAllowed": "css_right ui-icon ui-icon-carat-1-n",
-               "sSortJUIDescAllowed": "css_right ui-icon ui-icon-carat-1-s",
-               "sSortJUIWrapper": "DataTables_sort_wrapper",
-               "sSortIcon": "DataTables_sort_icon",
-               
+               "sSortAsc":            _stateDefault+" sorting_asc",
+               "sSortDesc":           _stateDefault+" sorting_desc",
+               "sSortable":           _stateDefault+" sorting",
+               "sSortableAsc":        _stateDefault+" sorting_asc_disabled",
+               "sSortableDesc":       _stateDefault+" sorting_desc_disabled",
+               "sSortableNone":       _stateDefault+" sorting_disabled",
+               "sSortJUIAsc":         _sortIcon+"triangle-1-n",
+               "sSortJUIDesc":        _sortIcon+"triangle-1-s",
+               "sSortJUI":            _sortIcon+"carat-2-n-s",
+               "sSortJUIAscAllowed":  _sortIcon+"carat-1-n",
+               "sSortJUIDescAllowed": _sortIcon+"carat-1-s",
+               "sSortJUIWrapper":     "DataTables_sort_wrapper",
+               "sSortIcon":           "DataTables_sort_icon",
+       
                /* Scrolling */
-               "sScrollHead": "dataTables_scrollHead ui-state-default",
-               "sScrollFoot": "dataTables_scrollFoot ui-state-default",
-               
+               "sScrollHead": "dataTables_scrollHead "+_stateDefault,
+               "sScrollFoot": "dataTables_scrollFoot "+_stateDefault,
+       
                /* Misc */
-               "sFooterTH": "ui-state-default",
-               "sJUIHeader": "fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix",
-               "sJUIFooter": "fg-toolbar ui-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix"
+               "sHeaderTH":  _stateDefault,
+               "sFooterTH":  _stateDefault,
+               "sJUIHeader": _headerFooter+" ui-corner-tl ui-corner-tr",
+               "sJUIFooter": _headerFooter+" ui-corner-bl ui-corner-br"
+       } );
+       
+       }());
+       
+       
+       
+       var extPagination = DataTable.ext.pager;
+       
+       function _numbers ( page, pages ) {
+               var
+                       numbers = [],
+                       buttons = extPagination.numbers_length,
+                       half = Math.floor( buttons / 2 ),
+                       i = 1;
+       
+               if ( pages <= buttons ) {
+                       numbers = _range( 0, pages );
+               }
+               else if ( page <= half ) {
+                       numbers = _range( 0, buttons-2 );
+                       numbers.push( 'ellipsis' );
+                       numbers.push( pages-1 );
+               }
+               else if ( page >= pages - 1 - half ) {
+                       numbers = _range( pages-(buttons-2), pages );
+                       numbers.splice( 0, 0, 'ellipsis' ); // no unshift in ie6
+                       numbers.splice( 0, 0, 0 );
+               }
+               else {
+                       numbers = _range( page-1, page+2 );
+                       numbers.push( 'ellipsis' );
+                       numbers.push( pages-1 );
+                       numbers.splice( 0, 0, 'ellipsis' );
+                       numbers.splice( 0, 0, 0 );
+               }
+       
+               numbers.DT_el = 'span';
+               return numbers;
+       }
+       
+       
+       $.extend( extPagination, {
+               simple: function ( page, pages ) {
+                       return [ 'previous', 'next' ];
+               },
+       
+               full: function ( page, pages ) {
+                       return [  'first', 'previous', 'next', 'last' ];
+               },
+       
+               simple_numbers: function ( page, pages ) {
+                       return [ 'previous', _numbers(page, pages), 'next' ];
+               },
+       
+               full_numbers: function ( page, pages ) {
+                       return [ 'first', 'previous', _numbers(page, pages), 'next', 'last' ];
+               },
+       
+               // For testing and plug-ins to use
+               _numbers: _numbers,
+               numbers_length: 7
        } );
        
-       /*
-        * Variable: oPagination
-        * Purpose:  
-        * Scope:    jQuery.fn.dataTableExt
-        */
-       $.extend( DataTable.ext.oPagination, {
-               /*
-                * Variable: two_button
-                * Purpose:  Standard two button (forward/back) pagination
-                * Scope:    jQuery.fn.dataTableExt.oPagination
-                */
-               "two_button": {
-                       /*
-                        * Function: oPagination.two_button.fnInit
-                        * Purpose:  Initialise dom elements required for pagination with forward/back buttons only
-                        * Returns:  -
-                        * Inputs:   object:oSettings - dataTables settings object
-                        *           node:nPaging - the DIV which contains this pagination control
-                        *           function:fnCallbackDraw - draw function which must be called on update
-                        */
-                       "fnInit": function ( oSettings, nPaging, fnCallbackDraw )
-                       {
-                               var oLang = oSettings.oLanguage.oPaginate;
-                               var oClasses = oSettings.oClasses;
-                               var fnClickHandler = function ( e ) {
-                                       if ( oSettings.oApi._fnPageChange( oSettings, e.data.action ) )
-                                       {
-                                               fnCallbackDraw( oSettings );
+       
+       $.extend( true, DataTable.ext.renderer, {
+               pageButton: {
+                       _: function ( settings, host, idx, buttons, page, pages ) {
+                               var classes = settings.oClasses;
+                               var lang = settings.oLanguage.oPaginate;
+                               var btnDisplay, btnClass, counter=0;
+       
+                               var attach = function( container, buttons ) {
+                                       var i, ien, node, button;
+                                       var clickHandler = function ( e ) {
+                                               _fnPageChange( settings, e.data.action, true );
+                                       };
+       
+                                       for ( i=0, ien=buttons.length ; i<ien ; i++ ) {
+                                               button = buttons[i];
+       
+                                               if ( $.isArray( button ) ) {
+                                                       var inner = $( '<'+(button.DT_el || 'div')+'/>' )
+                                                               .appendTo( container );
+                                                       attach( inner, button );
+                                               }
+                                               else {
+                                                       btnDisplay = '';
+                                                       btnClass = '';
+       
+                                                       switch ( button ) {
+                                                               case 'ellipsis':
+                                                                       container.append('<span>&hellip;</span>');
+                                                                       break;
+       
+                                                               case 'first':
+                                                                       btnDisplay = lang.sFirst;
+                                                                       btnClass = button + (page > 0 ?
+                                                                               '' : ' '+classes.sPageButtonDisabled);
+                                                                       break;
+       
+                                                               case 'previous':
+                                                                       btnDisplay = lang.sPrevious;
+                                                                       btnClass = button + (page > 0 ?
+                                                                               '' : ' '+classes.sPageButtonDisabled);
+                                                                       break;
+       
+                                                               case 'next':
+                                                                       btnDisplay = lang.sNext;
+                                                                       btnClass = button + (page < pages-1 ?
+                                                                               '' : ' '+classes.sPageButtonDisabled);
+                                                                       break;
+       
+                                                               case 'last':
+                                                                       btnDisplay = lang.sLast;
+                                                                       btnClass = button + (page < pages-1 ?
+                                                                               '' : ' '+classes.sPageButtonDisabled);
+                                                                       break;
+       
+                                                               default:
+                                                                       btnDisplay = button + 1;
+                                                                       btnClass = page === button ?
+                                                                               classes.sPageButtonActive : '';
+                                                                       break;
+                                                       }
+       
+                                                       if ( btnDisplay ) {
+                                                               node = $('<a>', {
+                                                                               'class': classes.sPageButton+' '+btnClass,
+                                                                               'aria-controls': settings.sTableId,
+                                                                               'data-dt-idx': counter,
+                                                                               'tabindex': settings.iTabIndex,
+                                                                               'id': idx === 0 && typeof button === 'string' ?
+                                                                                       settings.sTableId +'_'+ button :
+                                                                                       null
+                                                                       } )
+                                                                       .html( btnDisplay )
+                                                                       .appendTo( container );
+       
+                                                               _fnBindAction(
+                                                                       node, {action: button}, clickHandler
+                                                               );
+       
+                                                               counter++;
+                                                       }
+                                               }
                                        }
                                };
        
-                               var sAppend = (!oSettings.bJUI) ?
-                                       '<a class="'+oSettings.oClasses.sPagePrevDisabled+'" tabindex="'+oSettings.iTabIndex+'" role="button">'+oLang.sPrevious+'</a>'+
-                                       '<a class="'+oSettings.oClasses.sPageNextDisabled+'" tabindex="'+oSettings.iTabIndex+'" role="button">'+oLang.sNext+'</a>'
-                                       :
-                                       '<a class="'+oSettings.oClasses.sPagePrevDisabled+'" tabindex="'+oSettings.iTabIndex+'" role="button"><span class="'+oSettings.oClasses.sPageJUIPrev+'"></span></a>'+
-                                       '<a class="'+oSettings.oClasses.sPageNextDisabled+'" tabindex="'+oSettings.iTabIndex+'" role="button"><span class="'+oSettings.oClasses.sPageJUINext+'"></span></a>';
-                               $(nPaging).append( sAppend );
-                               
-                               var els = $('a', nPaging);
-                               var nPrevious = els[0],
-                                       nNext = els[1];
-                               
-                               oSettings.oApi._fnBindAction( nPrevious, {action: "previous"}, fnClickHandler );
-                               oSettings.oApi._fnBindAction( nNext,     {action: "next"},     fnClickHandler );
-                               
-                               /* ID the first elements only */
-                               if ( !oSettings.aanFeatures.p )
-                               {
-                                       nPaging.id = oSettings.sTableId+'_paginate';
-                                       nPrevious.id = oSettings.sTableId+'_previous';
-                                       nNext.id = oSettings.sTableId+'_next';
+                               // Because this approach is destroying and recreating the paging
+                               // elements, focus is lost on the select button which is bad for
+                               // accessibility. So we want to restore focus once the draw has
+                               // completed
+                               var activeEl = $(document.activeElement).data('dt-idx');
        
-                                       nPrevious.setAttribute('aria-controls', oSettings.sTableId);
-                                       nNext.setAttribute('aria-controls', oSettings.sTableId);
-                               }
-                       },
-                       
-                       /*
-                        * Function: oPagination.two_button.fnUpdate
-                        * Purpose:  Update the two button pagination at the end of the draw
-                        * Returns:  -
-                        * Inputs:   object:oSettings - dataTables settings object
-                        *           function:fnCallbackDraw - draw function to call on page change
-                        */
-                       "fnUpdate": function ( oSettings, fnCallbackDraw )
-                       {
-                               if ( !oSettings.aanFeatures.p )
-                               {
-                                       return;
-                               }
-                               
-                               var oClasses = oSettings.oClasses;
-                               var an = oSettings.aanFeatures.p;
-                               var nNode;
+                               attach( $(host).empty(), buttons );
        
-                               /* Loop over each instance of the pager */
-                               for ( var i=0, iLen=an.length ; i<iLen ; i++ )
-                               {
-                                       nNode = an[i].firstChild;
-                                       if ( nNode )
-                                       {
-                                               /* Previous page */
-                                               nNode.className = ( oSettings._iDisplayStart === 0 ) ?
-                                                   oClasses.sPagePrevDisabled : oClasses.sPagePrevEnabled;
-                                                   
-                                               /* Next page */
-                                               nNode = nNode.nextSibling;
-                                               nNode.className = ( oSettings.fnDisplayEnd() == oSettings.fnRecordsDisplay() ) ?
-                                                   oClasses.sPageNextDisabled : oClasses.sPageNextEnabled;
-                                       }
+                               if ( activeEl !== null ) {
+                                       $(host).find( '[data-dt-idx='+activeEl+']' ).focus();
                                }
                        }
-               },
-               
-               
-               /*
-                * Variable: iFullNumbersShowPages
-                * Purpose:  Change the number of pages which can be seen
-                * Scope:    jQuery.fn.dataTableExt.oPagination
-                */
-               "iFullNumbersShowPages": 5,
-               
-               /*
-                * Variable: full_numbers
-                * Purpose:  Full numbers pagination
-                * Scope:    jQuery.fn.dataTableExt.oPagination
-                */
-               "full_numbers": {
-                       /*
-                        * Function: oPagination.full_numbers.fnInit
-                        * Purpose:  Initialise dom elements required for pagination with a list of the pages
-                        * Returns:  -
-                        * Inputs:   object:oSettings - dataTables settings object
-                        *           node:nPaging - the DIV which contains this pagination control
-                        *           function:fnCallbackDraw - draw function which must be called on update
-                        */
-                       "fnInit": function ( oSettings, nPaging, fnCallbackDraw )
-                       {
-                               var oLang = oSettings.oLanguage.oPaginate;
-                               var oClasses = oSettings.oClasses;
-                               var fnClickHandler = function ( e ) {
-                                       if ( oSettings.oApi._fnPageChange( oSettings, e.data.action ) )
-                                       {
-                                               fnCallbackDraw( oSettings );
-                                       }
-                               };
+               }
+       } );
        
-                               $(nPaging).append(
-                                       '<a  tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButton+" "+oClasses.sPageFirst+'">'+oLang.sFirst+'</a>'+
-                                       '<a  tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButton+" "+oClasses.sPagePrevious+'">'+oLang.sPrevious+'</a>'+
-                                       '<span></span>'+
-                                       '<a tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButton+" "+oClasses.sPageNext+'">'+oLang.sNext+'</a>'+
-                                       '<a tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButton+" "+oClasses.sPageLast+'">'+oLang.sLast+'</a>'
-                               );
-                               var els = $('a', nPaging);
-                               var nFirst = els[0],
-                                       nPrev = els[1],
-                                       nNext = els[2],
-                                       nLast = els[3];
-                               
-                               oSettings.oApi._fnBindAction( nFirst, {action: "first"},    fnClickHandler );
-                               oSettings.oApi._fnBindAction( nPrev,  {action: "previous"}, fnClickHandler );
-                               oSettings.oApi._fnBindAction( nNext,  {action: "next"},     fnClickHandler );
-                               oSettings.oApi._fnBindAction( nLast,  {action: "last"},     fnClickHandler );
-                               
-                               /* ID the first elements only */
-                               if ( !oSettings.aanFeatures.p )
-                               {
-                                       nPaging.id = oSettings.sTableId+'_paginate';
-                                       nFirst.id =oSettings.sTableId+'_first';
-                                       nPrev.id =oSettings.sTableId+'_previous';
-                                       nNext.id =oSettings.sTableId+'_next';
-                                       nLast.id =oSettings.sTableId+'_last';
-                               }
-                       },
-                       
-                       /*
-                        * Function: oPagination.full_numbers.fnUpdate
-                        * Purpose:  Update the list of page buttons shows
-                        * Returns:  -
-                        * Inputs:   object:oSettings - dataTables settings object
-                        *           function:fnCallbackDraw - draw function to call on page change
-                        */
-                       "fnUpdate": function ( oSettings, fnCallbackDraw )
-                       {
-                               if ( !oSettings.aanFeatures.p )
-                               {
-                                       return;
-                               }
-                               
-                               var iPageCount = DataTable.ext.oPagination.iFullNumbersShowPages;
-                               var iPageCountHalf = Math.floor(iPageCount / 2);
-                               var iPages = Math.ceil((oSettings.fnRecordsDisplay()) / oSettings._iDisplayLength);
-                               var iCurrentPage = Math.ceil(oSettings._iDisplayStart / oSettings._iDisplayLength) + 1;
-                               var sList = "";
-                               var iStartButton, iEndButton, i, iLen;
-                               var oClasses = oSettings.oClasses;
-                               var anButtons, anStatic, nPaginateList, nNode;
-                               var an = oSettings.aanFeatures.p;
-                               var fnBind = function (j) {
-                                       oSettings.oApi._fnBindAction( this, {"page": j+iStartButton-1}, function(e) {
-                                               /* Use the information in the element to jump to the required page */
-                                               oSettings.oApi._fnPageChange( oSettings, e.data.page );
-                                               fnCallbackDraw( oSettings );
-                                               e.preventDefault();
-                                       } );
-                               };
-                               
-                               /* Pages calculation */
-                               if ( oSettings._iDisplayLength === -1 )
-                               {
-                                       iStartButton = 1;
-                                       iEndButton = 1;
-                                       iCurrentPage = 1;
-                               }
-                               else if (iPages < iPageCount)
-                               {
-                                       iStartButton = 1;
-                                       iEndButton = iPages;
-                               }
-                               else if (iCurrentPage <= iPageCountHalf)
-                               {
-                                       iStartButton = 1;
-                                       iEndButton = iPageCount;
-                               }
-                               else if (iCurrentPage >= (iPages - iPageCountHalf))
-                               {
-                                       iStartButton = iPages - iPageCount + 1;
-                                       iEndButton = iPages;
-                               }
-                               else
-                               {
-                                       iStartButton = iCurrentPage - Math.ceil(iPageCount / 2) + 1;
-                                       iEndButton = iStartButton + iPageCount - 1;
-                               }
        
-                               
-                               /* Build the dynamic list */
-                               for ( i=iStartButton ; i<=iEndButton ; i++ )
-                               {
-                                       sList += (iCurrentPage !== i) ?
-                                               '<a tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButton+'">'+oSettings.fnFormatNumber(i)+'</a>' :
-                                               '<a tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButtonActive+'">'+oSettings.fnFormatNumber(i)+'</a>';
-                               }
-                               
-                               /* Loop over each instance of the pager */
-                               for ( i=0, iLen=an.length ; i<iLen ; i++ )
-                               {
-                                       nNode = an[i];
-                                       if ( !nNode.hasChildNodes() )
-                                       {
-                                               continue;
-                                       }
-                                       
-                                       /* Build up the dynamic list first - html and listeners */
-                                       $('span:eq(0)', nNode)
-                                               .html( sList )
-                                               .children('a').each( fnBind );
-                                       
-                                       /* Update the permanent button's classes */
-                                       anButtons = nNode.getElementsByTagName('a');
-                                       anStatic = [
-                                               anButtons[0], anButtons[1], 
-                                               anButtons[anButtons.length-2], anButtons[anButtons.length-1]
-                                       ];
-       
-                                       $(anStatic).removeClass( oClasses.sPageButton+" "+oClasses.sPageButtonActive+" "+oClasses.sPageButtonStaticDisabled );
-                                       $([anStatic[0], anStatic[1]]).addClass( 
-                                               (iCurrentPage==1) ?
-                                                       oClasses.sPageButtonStaticDisabled :
-                                                       oClasses.sPageButton
-                                       );
-                                       $([anStatic[2], anStatic[3]]).addClass(
-                                               (iPages===0 || iCurrentPage===iPages || oSettings._iDisplayLength===-1) ?
-                                                       oClasses.sPageButtonStaticDisabled :
-                                                       oClasses.sPageButton
-                                       );
-                               }
+       
+       var __numericReplace = function ( d, decimalPlace, re1, re2 ) {
+               if ( !d || d === '-' ) {
+                       return -Infinity;
+               }
+       
+               // If a decimal place other than `.` is used, it needs to be given to the
+               // function so we can detect it and replace with a `.` which is the only
+               // decimal place Javascript recognises - it is not locale aware.
+               if ( decimalPlace ) {
+                       d = _numToDecimal( d, decimalPlace );
+               }
+       
+               if ( d.replace ) {
+                       if ( re1 ) {
+                               d = d.replace( re1, '' );
+                       }
+       
+                       if ( re2 ) {
+                               d = d.replace( re2, '' );
                        }
                }
-       } );
        
-       $.extend( DataTable.ext.oSort, {
-               /*
-                * text sorting
-                */
-               "string-pre": function ( a )
-               {
-                       if ( typeof a != 'string' ) {
-                               a = (a !== null && a.toString) ? a.toString() : '';
+               return d * 1;
+       };
+       
+       
+       // Add the numeric 'deformatting' functions for sorting. This is done in a
+       // function to provide an easy ability for the language options to add
+       // additional methods if a non-period decimal place is used.
+       function _addNumericSort ( decimalPlace ) {
+               $.each(
+                       {
+                               // Plain numbers
+                               "num": function ( d ) {
+                                       return __numericReplace( d, decimalPlace );
+                               },
+       
+                               // Formatted numbers
+                               "num-fmt": function ( d ) {
+                                       return __numericReplace( d, decimalPlace, _re_formatted_numeric );
+                               },
+       
+                               // HTML numeric
+                               "html-num": function ( d ) {
+                                       return __numericReplace( d, decimalPlace, _re_html );
+                               },
+       
+                               // HTML numeric, formatted
+                               "html-num-fmt": function ( d ) {
+                                       return __numericReplace( d, decimalPlace, _re_html, _re_formatted_numeric );
+                               }
+                       },
+                       function ( key, fn ) {
+                               _ext.type.order[ key+decimalPlace+'-pre' ] = fn;
                        }
-                       return a.toLowerCase();
-               },
+               );
+       }
        
-               "string-asc": function ( x, y )
-               {
-                       return ((x < y) ? -1 : ((x > y) ? 1 : 0));
+       
+       // Default sort methods
+       $.extend( _ext.type.order, {
+               // Dates
+               "date-pre": function ( d ) {
+                       return Date.parse( d ) || 0;
                },
-               
-               "string-desc": function ( x, y )
-               {
-                       return ((x < y) ? 1 : ((x > y) ? -1 : 0));
+       
+               // html
+               "html-pre": function ( a ) {
+                       return ! a ?
+                               '' :
+                               a.replace ?
+                                       a.replace( /<.*?>/g, "" ).toLowerCase() :
+                                       a+'';
                },
-               
-               
-               /*
-                * html sorting (ignore html tags)
-                */
-               "html-pre": function ( a )
-               {
-                       return a.replace( /<.*?>/g, "" ).toLowerCase();
+       
+               // string
+               "string-pre": function ( a ) {
+                       return typeof a === 'string' ?
+                               a.toLowerCase() :
+                               ! a || ! a.toString ?
+                                       '' :
+                                       a.toString();
                },
-               
-               "html-asc": function ( x, y )
-               {
+       
+               // string-asc and -desc are retained only for compatibility with the old
+               // sort methods
+               "string-asc": function ( x, y ) {
                        return ((x < y) ? -1 : ((x > y) ? 1 : 0));
                },
-               
-               "html-desc": function ( x, y )
-               {
+       
+               "string-desc": function ( x, y ) {
                        return ((x < y) ? 1 : ((x > y) ? -1 : 0));
+               }
+       } );
+       
+       
+       // Numeric sorting types - order doesn't matter here
+       _addNumericSort( '' );
+       
+       
+       // Built in type detection. See model.ext.aTypes for information about
+       // what is required from this methods.
+       $.extend( DataTable.ext.type.detect, [
+               // Plain numbers - first since V8 detects some plain numbers as dates
+               // e.g. Date.parse('55') (but not all, e.g. Date.parse('22')...).
+               function ( d, settings )
+               {
+                       var decimal = settings.oLanguage.sDecimal;
+                       return _isNumber( d, decimal ) ? 'num'+decimal : null;
                },
-               
-               
-               /*
-                * date sorting
-                */
-               "date-pre": function ( a )
+       
+               // Dates (only those recognised by the browser's Date.parse)
+               function ( d, settings )
                {
-                       var x = Date.parse( a );
-                       
-                       if ( isNaN(x) || x==="" )
-                       {
-                               x = Date.parse( "01/01/1970 00:00:00" );
+                       // V8 will remove any unknown characters at the start of the expression,
+                       // leading to false matches such as `$245.12` being a valid date. See
+                       // forum thread 18941 for detail.
+                       if ( d && ! _re_date_start.test(d) ) {
+                               return null;
                        }
-                       return x;
+                       var parsed = Date.parse(d);
+                       return (parsed !== null && !isNaN(parsed)) || _empty(d) ? 'date' : null;
                },
        
-               "date-asc": function ( x, y )
+               // Formatted numbers
+               function ( d, settings )
                {
-                       return x - y;
+                       var decimal = settings.oLanguage.sDecimal;
+                       return _isNumber( d, decimal, true ) ? 'num-fmt'+decimal : null;
                },
-               
-               "date-desc": function ( x, y )
+       
+               // HTML numeric
+               function ( d, settings )
                {
-                       return y - x;
+                       var decimal = settings.oLanguage.sDecimal;
+                       return _htmlNumeric( d, decimal ) ? 'html-num'+decimal : null;
                },
-               
-               
-               /*
-                * numerical sorting
-                */
-               "numeric-pre": function ( a )
+       
+               // HTML numeric, formatted
+               function ( d, settings )
                {
-                       return (a=="-" || a==="") ? 0 : a*1;
+                       var decimal = settings.oLanguage.sDecimal;
+                       return _htmlNumeric( d, decimal, true ) ? 'html-num-fmt'+decimal : null;
                },
        
-               "numeric-asc": function ( x, y )
+               // HTML (this is strict checking - there must be html)
+               function ( d, settings )
                {
-                       return x - y;
+                       return _empty( d ) || (typeof d === 'string' && d.indexOf('<') !== -1) ?
+                               'html' : null;
+               }
+       ] );
+       
+       
+       
+       // Filter formatting functions. See model.ext.ofnSearch for information about
+       // what is required from these methods.
+       
+       
+       $.extend( DataTable.ext.type.search, {
+               html: function ( data ) {
+                       return _empty(data) ?
+                               '' :
+                               typeof data === 'string' ?
+                                       data
+                                               .replace( _re_new_lines, " " )
+                                               .replace( _re_html, "" ) :
+                                       '';
                },
-               
-               "numeric-desc": function ( x, y )
-               {
-                       return y - x;
+       
+               string: function ( data ) {
+                       return _empty(data) ?
+                               '' :
+                               typeof data === 'string' ?
+                                       data.replace( _re_new_lines, " " ) :
+                                       data;
                }
        } );
        
        
-       $.extend( DataTable.ext.aTypes, [
-               /*
-                * Function: -
-                * Purpose:  Check to see if a string is numeric
-                * Returns:  string:'numeric' or null
-                * Inputs:   mixed:sText - string to check
-                */
-               function ( sData )
-               {
-                       /* Allow zero length strings as a number */
-                       if ( typeof sData === 'number' )
-                       {
-                               return 'numeric';
-                       }
-                       else if ( typeof sData !== 'string' )
-                       {
-                               return null;
-                       }
-                       
-                       var sValidFirstChars = "0123456789-";
-                       var sValidChars = "0123456789.";
-                       var Char;
-                       var bDecimal = false;
-                       
-                       /* Check for a valid first char (no period and allow negatives) */
-                       Char = sData.charAt(0); 
-                       if (sValidFirstChars.indexOf(Char) == -1) 
-                       {
-                               return null;
+       
+       $.extend( true, DataTable.ext.renderer, {
+               header: {
+                       _: function ( settings, cell, column, classes ) {
+                               // No additional mark-up required
+                               // Attach a sort listener to update on sort - note that using the
+                               // `DT` namespace will allow the event to be removed automatically
+                               // on destroy, while the `dt` namespaced event is the one we are
+                               // listening for
+                               $(settings.nTable).on( 'order.dt.DT', function ( e, settings, sorting, columns ) {
+                                       var colIdx = column.idx;
+       
+                                       cell
+                                               .removeClass(
+                                                       column.sSortingClass +' '+
+                                                       classes.sSortAsc +' '+
+                                                       classes.sSortDesc
+                                               )
+                                               .addClass( columns[ colIdx ] == 'asc' ?
+                                                       classes.sSortAsc : columns[ colIdx ] == 'desc' ?
+                                                               classes.sSortDesc :
+                                                               column.sSortingClass
+                                               );
+                               } );
+                       },
+       
+                       jqueryui: function ( settings, cell, column, classes ) {
+                               var colIdx = column.idx;
+       
+                               $('<div/>')
+                                       .addClass( classes.sSortJUIWrapper )
+                                       .append( cell.contents() )
+                                       .append( $('<span/>')
+                                               .addClass( classes.sSortIcon+' '+column.sSortingClassJUI )
+                                       )
+                                       .appendTo( cell );
+       
+                               // Attach a sort listener to update on sort
+                               $(settings.nTable).on( 'order.dt.DT', function ( e, settings, sorting, columns ) {
+                                       cell
+                                               .removeClass( classes.sSortAsc +" "+classes.sSortDesc )
+                                               .addClass( columns[ colIdx ] == 'asc' ?
+                                                       classes.sSortAsc : columns[ colIdx ] == 'desc' ?
+                                                               classes.sSortDesc :
+                                                               column.sSortingClass
+                                               );
+       
+                                       cell
+                                               .find( 'span.'+classes.sSortIcon )
+                                               .removeClass(
+                                                       classes.sSortJUIAsc +" "+
+                                                       classes.sSortJUIDesc +" "+
+                                                       classes.sSortJUI +" "+
+                                                       classes.sSortJUIAscAllowed +" "+
+                                                       classes.sSortJUIDescAllowed
+                                               )
+                                               .addClass( columns[ colIdx ] == 'asc' ?
+                                                       classes.sSortJUIAsc : columns[ colIdx ] == 'desc' ?
+                                                               classes.sSortJUIDesc :
+                                                               column.sSortingClassJUI
+                                               );
+                               } );
                        }
-                       
-                       /* Check all the other characters are valid */
-                       for ( var i=1 ; i<sData.length ; i++ ) 
-                       {
-                               Char = sData.charAt(i); 
-                               if (sValidChars.indexOf(Char) == -1) 
-                               {
-                                       return null;
-                               }
-                               
-                               /* Only allowed one decimal place... */
-                               if ( Char == "." )
-                               {
-                                       if ( bDecimal )
-                                       {
-                                               return null;
-                                       }
-                                       bDecimal = true;
+               }
+       } );
+       
+       /*
+        * Public helper functions. These aren't used internally by DataTables, or
+        * called by any of the options passed into DataTables, but they can be used
+        * externally by developers working with DataTables. They are helper functions
+        * to make working with DataTables a little bit easier.
+        */
+       
+       /**
+        * Helpers for `columns.render`.
+        *
+        * The options defined here can be used with the `columns.render` initialisation
+        * option to provide a display renderer. The following functions are defined:
+        *
+        * * `number` - Will format numeric data (defined by `columns.data`) for
+        *   display, retaining the original unformatted data for sorting and filtering.
+        *   It takes 4 parameters:
+        *   * `string` - Thousands grouping separator
+        *   * `string` - Decimal point indicator
+        *   * `integer` - Number of decimal points to show
+        *   * `string` (optional) - Prefix.
+        *
+        * @example
+        *   // Column definition using the number renderer
+        *   {
+        *     data: "salary",
+        *     render: $.fn.dataTable.render.number( '\'', '.', 0, '$' )
+        *   }
+        *
+        * @namespace
+        */
+       DataTable.render = {
+               number: function ( thousands, decimal, precision, prefix ) {
+                       return {
+                               display: function ( d ) {
+                                       d = parseFloat( d );
+                                       var intPart = parseInt( d, 10 );
+                                       var floatPart = precision ?
+                                               (decimal+(d - intPart).toFixed( precision )).substring( 2 ):
+                                               '';
+       
+                                       return (prefix||'') +
+                                               intPart.toString().replace(
+                                                       /\B(?=(\d{3})+(?!\d))/g, thousands
+                                               ) +
+                                               floatPart;
                                }
-                       }
-                       
-                       return 'numeric';
-               },
-               
-               /*
-                * Function: -
-                * Purpose:  Check to see if a string is actually a formatted date
-                * Returns:  string:'date' or null
-                * Inputs:   string:sText - string to check
-                */
-               function ( sData )
-               {
-                       var iParse = Date.parse(sData);
-                       if ( (iParse !== null && !isNaN(iParse)) || (typeof sData === 'string' && sData.length === 0) )
-                       {
-                               return 'date';
-                       }
-                       return null;
-               },
-               
-               /*
-                * Function: -
-                * Purpose:  Check to see if a string should be treated as an HTML string
-                * Returns:  string:'html' or null
-                * Inputs:   string:sText - string to check
-                */
-               function ( sData )
-               {
-                       if ( typeof sData === 'string' && sData.indexOf('<') != -1 && sData.indexOf('>') != -1 )
-                       {
-                               return 'html';
-                       }
-                       return null;
+                       };
                }
-       ] );
+       };
+       
+       
+       /*
+        * This is really a good bit rubbish this method of exposing the internal methods
+        * publicly... - To be fixed in 2.0 using methods on the prototype
+        */
+       
+       
+       /**
+        * Create a wrapper function for exporting an internal functions to an external API.
+        *  @param {string} fn API function name
+        *  @returns {function} wrapped function
+        *  @memberof DataTable#internal
+        */
+       function _fnExternApiFunc (fn)
+       {
+               return function() {
+                       var args = [_fnSettingsFromNode( this[DataTable.ext.iApiIndex] )].concat(
+                               Array.prototype.slice.call(arguments)
+                       );
+                       return DataTable.ext.internal[fn].apply( this, args );
+               };
+       }
+       
+       
+       /**
+        * Reference to internal functions for use by plug-in developers. Note that
+        * these methods are references to internal functions and are considered to be
+        * private. If you use these methods, be aware that they are liable to change
+        * between versions.
+        *  @namespace
+        */
+       $.extend( DataTable.ext.internal, {
+               _fnExternApiFunc: _fnExternApiFunc,
+               _fnBuildAjax: _fnBuildAjax,
+               _fnAjaxUpdate: _fnAjaxUpdate,
+               _fnAjaxParameters: _fnAjaxParameters,
+               _fnAjaxUpdateDraw: _fnAjaxUpdateDraw,
+               _fnAjaxDataSrc: _fnAjaxDataSrc,
+               _fnAddColumn: _fnAddColumn,
+               _fnColumnOptions: _fnColumnOptions,
+               _fnAdjustColumnSizing: _fnAdjustColumnSizing,
+               _fnVisibleToColumnIndex: _fnVisibleToColumnIndex,
+               _fnColumnIndexToVisible: _fnColumnIndexToVisible,
+               _fnVisbleColumns: _fnVisbleColumns,
+               _fnGetColumns: _fnGetColumns,
+               _fnColumnTypes: _fnColumnTypes,
+               _fnApplyColumnDefs: _fnApplyColumnDefs,
+               _fnHungarianMap: _fnHungarianMap,
+               _fnCamelToHungarian: _fnCamelToHungarian,
+               _fnLanguageCompat: _fnLanguageCompat,
+               _fnBrowserDetect: _fnBrowserDetect,
+               _fnAddData: _fnAddData,
+               _fnAddTr: _fnAddTr,
+               _fnNodeToDataIndex: _fnNodeToDataIndex,
+               _fnNodeToColumnIndex: _fnNodeToColumnIndex,
+               _fnGetCellData: _fnGetCellData,
+               _fnSetCellData: _fnSetCellData,
+               _fnSplitObjNotation: _fnSplitObjNotation,
+               _fnGetObjectDataFn: _fnGetObjectDataFn,
+               _fnSetObjectDataFn: _fnSetObjectDataFn,
+               _fnGetDataMaster: _fnGetDataMaster,
+               _fnClearTable: _fnClearTable,
+               _fnDeleteIndex: _fnDeleteIndex,
+               _fnInvalidateRow: _fnInvalidateRow,
+               _fnGetRowElements: _fnGetRowElements,
+               _fnCreateTr: _fnCreateTr,
+               _fnBuildHead: _fnBuildHead,
+               _fnDrawHead: _fnDrawHead,
+               _fnDraw: _fnDraw,
+               _fnReDraw: _fnReDraw,
+               _fnAddOptionsHtml: _fnAddOptionsHtml,
+               _fnDetectHeader: _fnDetectHeader,
+               _fnGetUniqueThs: _fnGetUniqueThs,
+               _fnFeatureHtmlFilter: _fnFeatureHtmlFilter,
+               _fnFilterComplete: _fnFilterComplete,
+               _fnFilterCustom: _fnFilterCustom,
+               _fnFilterColumn: _fnFilterColumn,
+               _fnFilter: _fnFilter,
+               _fnFilterCreateSearch: _fnFilterCreateSearch,
+               _fnEscapeRegex: _fnEscapeRegex,
+               _fnFilterData: _fnFilterData,
+               _fnFeatureHtmlInfo: _fnFeatureHtmlInfo,
+               _fnUpdateInfo: _fnUpdateInfo,
+               _fnInfoMacros: _fnInfoMacros,
+               _fnInitialise: _fnInitialise,
+               _fnInitComplete: _fnInitComplete,
+               _fnLengthChange: _fnLengthChange,
+               _fnFeatureHtmlLength: _fnFeatureHtmlLength,
+               _fnFeatureHtmlPaginate: _fnFeatureHtmlPaginate,
+               _fnPageChange: _fnPageChange,
+               _fnFeatureHtmlProcessing: _fnFeatureHtmlProcessing,
+               _fnProcessingDisplay: _fnProcessingDisplay,
+               _fnFeatureHtmlTable: _fnFeatureHtmlTable,
+               _fnScrollDraw: _fnScrollDraw,
+               _fnApplyToChildren: _fnApplyToChildren,
+               _fnCalculateColumnWidths: _fnCalculateColumnWidths,
+               _fnThrottle: _fnThrottle,
+               _fnConvertToWidth: _fnConvertToWidth,
+               _fnScrollingWidthAdjust: _fnScrollingWidthAdjust,
+               _fnGetWidestNode: _fnGetWidestNode,
+               _fnGetMaxLenString: _fnGetMaxLenString,
+               _fnStringToCss: _fnStringToCss,
+               _fnScrollBarWidth: _fnScrollBarWidth,
+               _fnSortFlatten: _fnSortFlatten,
+               _fnSort: _fnSort,
+               _fnSortAria: _fnSortAria,
+               _fnSortListener: _fnSortListener,
+               _fnSortAttachListener: _fnSortAttachListener,
+               _fnSortingClasses: _fnSortingClasses,
+               _fnSortData: _fnSortData,
+               _fnSaveState: _fnSaveState,
+               _fnLoadState: _fnLoadState,
+               _fnSettingsFromNode: _fnSettingsFromNode,
+               _fnLog: _fnLog,
+               _fnMap: _fnMap,
+               _fnBindAction: _fnBindAction,
+               _fnCallbackReg: _fnCallbackReg,
+               _fnCallbackFire: _fnCallbackFire,
+               _fnLengthOverflow: _fnLengthOverflow,
+               _fnRenderer: _fnRenderer,
+               _fnDataSource: _fnDataSource,
+               _fnRowAttributes: _fnRowAttributes,
+               _fnCalculateEnd: function () {} // Used by a lot of plug-ins, but redundant
+                                               // in 1.10, so this dead-end function is
+                                               // added to prevent errors
+       } );
        
 
-       // jQuery aliases
-       $.fn.DataTable = DataTable;
+       // jQuery access
        $.fn.dataTable = DataTable;
+
+       // Legacy aliases
        $.fn.dataTableSettings = DataTable.settings;
        $.fn.dataTableExt = DataTable.ext;
 
+       // With a capital `D` we return a DataTables API instance rather than a
+       // jQuery object
+       $.fn.DataTable = function ( opts ) {
+               return $(this).dataTable( opts ).api();
+       };
+
+       // All properties that are available to $.fn.dataTable should also be
+       // available on $.fn.DataTable
+       $.each( DataTable, function ( prop, val ) {
+               $.fn.DataTable[ prop ] = val;
+       } );
+
 
        // Information about events fired by DataTables - for documentation.
        /**
-        * Draw event, fired whenever the table is redrawn on the page, at the same point as
-        * fnDrawCallback. This may be useful for binding events or performing calculations when
-        * the table is altered at all.
-        *  @name DataTable#draw
+        * Draw event, fired whenever the table is redrawn on the page, at the same
+        * point as fnDrawCallback. This may be useful for binding events or
+        * performing calculations when the table is altered at all.
+        *  @name DataTable#draw.dt
         *  @event
         *  @param {event} e jQuery event object
         *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
         */
 
        /**
-        * Filter event, fired when the filtering applied to the table (using the build in global
-        * global filter, or column filters) is altered.
-        *  @name DataTable#filter
+        * Search event, fired when the searching applied to the table (using the
+        * built-in global search, or column filters) is altered.
+        *  @name DataTable#search.dt
         *  @event
         *  @param {event} e jQuery event object
         *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
 
        /**
         * Page change event, fired when the paging of the table is altered.
-        *  @name DataTable#page
+        *  @name DataTable#page.dt
         *  @event
         *  @param {event} e jQuery event object
         *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
         */
 
        /**
-        * Sort event, fired when the sorting applied to the table is altered.
-        *  @name DataTable#sort
+        * Order event, fired when the ordering applied to the table is altered.
+        *  @name DataTable#order.dt
         *  @event
         *  @param {event} e jQuery event object
         *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
         */
 
        /**
-        * DataTables initialisation complete event, fired when the table is fully drawn,
-        * including Ajax data loaded, if Ajax data is required.
-        *  @name DataTable#init
+        * DataTables initialisation complete event, fired when the table is fully
+        * drawn, including Ajax data loaded, if Ajax data is required.
+        *  @name DataTable#init.dt
         *  @event
         *  @param {event} e jQuery event object
         *  @param {object} oSettings DataTables settings object
         */
 
        /**
-        * State save event, fired when the table has changed state a new state save is required.
-        * This method allows modification of the state saving object prior to actually doing the
-        * save, including addition or other state properties (for plug-ins) or modification
-        * of a DataTables core property.
-        *  @name DataTable#stateSaveParams
+        * State save event, fired when the table has changed state a new state save
+        * is required. This event allows modification of the state saving object
+        * prior to actually doing the save, including addition or other state
+        * properties (for plug-ins) or modification of a DataTables core property.
+        *  @name DataTable#stateSaveParams.dt
         *  @event
         *  @param {event} e jQuery event object
         *  @param {object} oSettings DataTables settings object
         */
 
        /**
-        * State load event, fired when the table is loading state from the stored data, but
-        * prior to the settings object being modified by the saved state - allowing modification
-        * of the saved state is required or loading of state for a plug-in.
-        *  @name DataTable#stateLoadParams
+        * State load event, fired when the table is loading state from the stored
+        * data, but prior to the settings object being modified by the saved state
+        * - allowing modification of the saved state is required or loading of
+        * state for a plug-in.
+        *  @name DataTable#stateLoadParams.dt
         *  @event
         *  @param {event} e jQuery event object
         *  @param {object} oSettings DataTables settings object
         */
 
        /**
-        * State loaded event, fired when state has been loaded from stored data and the settings
-        * object has been modified by the loaded data.
-        *  @name DataTable#stateLoaded
+        * State loaded event, fired when state has been loaded from stored data and
+        * the settings object has been modified by the loaded data.
+        *  @name DataTable#stateLoaded.dt
         *  @event
         *  @param {event} e jQuery event object
         *  @param {object} oSettings DataTables settings object
         */
 
        /**
-        * Processing event, fired when DataTables is doing some kind of processing (be it,
-        * sort, filter or anything else). Can be used to indicate to the end user that
-        * there is something happening, or that something has finished.
-        *  @name DataTable#processing
+        * Processing event, fired when DataTables is doing some kind of processing
+        * (be it, order, searcg or anything else). It can be used to indicate to
+        * the end user that there is something happening, or that something has
+        * finished.
+        *  @name DataTable#processing.dt
         *  @event
         *  @param {event} e jQuery event object
         *  @param {object} oSettings DataTables settings object
         */
 
        /**
-        * Ajax (XHR) event, fired whenever an Ajax request is completed from a request to 
-        * made to the server for new data (note that this trigger is called in fnServerData,
-        * if you override fnServerData and which to use this event, you need to trigger it in
-        * you success function).
-        *  @name DataTable#xhr
+        * Ajax (XHR) event, fired whenever an Ajax request is completed from a
+        * request to made to the server for new data. This event is called before
+        * DataTables processed the returned data, so it can also be used to pre-
+        * process the data returned from the server, if needed.
+        *
+        * Note that this trigger is called in `fnServerData`, if you override
+        * `fnServerData` and which to use this event, you need to trigger it in you
+        * success function.
+        *  @name DataTable#xhr.dt
         *  @event
         *  @param {event} e jQuery event object
         *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
         *  @param {object} json JSON returned from the server
+        *
+        *  @example
+        *     // Use a custom property returned from the server in another DOM element
+        *     $('#table').dataTable().on('xhr.dt', function (e, settings, json) {
+        *       $('#status').html( json.status );
+        *     } );
+        *
+        *  @example
+        *     // Pre-process the data returned from the server
+        *     $('#table').dataTable().on('xhr.dt', function (e, settings, json) {
+        *       for ( var i=0, ien=json.aaData.length ; i<ien ; i++ ) {
+        *         json.aaData[i].sum = json.aaData[i].one + json.aaData[i].two;
+        *       }
+        *       // Note no return - manipulate the data directly in the JSON object.
+        *     } );
+        */
+
+       /**
+        * Destroy event, fired when the DataTable is destroyed by calling fnDestroy
+        * or passing the bDestroy:true parameter in the initialisation object. This
+        * can be used to remove bound events, added DOM nodes, etc.
+        *  @name DataTable#destroy.dt
+        *  @event
+        *  @param {event} e jQuery event object
+        *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+        */
+
+       /**
+        * Page length change event, fired when number of records to show on each
+        * page (the length) is changed.
+        *  @name DataTable#length.dt
+        *  @event
+        *  @param {event} e jQuery event object
+        *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+        *  @param {integer} len New length
+        */
+
+       /**
+        * Column sizing has changed.
+        *  @name DataTable#column-sizing.dt
+        *  @event
+        *  @param {event} e jQuery event object
+        *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
         */
 
        /**
-        * Destroy event, fired when the DataTable is destroyed by calling fnDestroy or passing
-        * the bDestroy:true parameter in the initialisation object. This can be used to remove
-        * bound events, added DOM nodes, etc.
-        *  @name DataTable#destroy
+        * Column visibility has changed.
+        *  @name DataTable#column-visibility.dt
         *  @event
         *  @param {event} e jQuery event object
         *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+        *  @param {int} column Column index
+        *  @param {bool} vis `false` if column now hidden, or `true` if visible
         */
+
+       return $.fn.dataTable;
 }));
 
 }(window, document));
index 1c7fa33db63821591d46ec99868d1d419d7df7a2..05131ab8ea3433a4d751be61efb3e751da5db212 100644 (file)
@@ -6,7 +6,6 @@ function setupAjax(){
       if (!(/^http:.*/.test(settings.url) || /^https:.*/.test(settings.url))) {
         // Only send the token to relative URLs i.e. locally.
         xhr.setRequestHeader("X-CSRFToken", csrf_token);
-        console.log("preparing request to " + settings.url);
       }
     }
   });
index c33d71833d817f55efa57147a8d1de1f77e0a90e..ba278cd16fdd73b28358dc81fcbda05366c1c560 100644 (file)
@@ -18,6 +18,7 @@
     var jump_to_form = {% if jump_to_form %} true {% else%} false {% endif %};
     var csrf_token = "{{ csrf_token }}";
     var dataTable_sDom = '<"top">rt<"bottom"p><"clear">';
+    var course_list_ajax_url = "{% url 'course_list_ajax' %}";
   </script>
   {% compress js %}
     <script type="text/javascript" src="{{ STATIC_URL }}js/setup-ajax.js"></script>
@@ -63,9 +64,9 @@
         <div class="sort-label">Sort By</div>
         <div class="select-wrapper">
           <select id="sort-by">
-            <option value="0">Date Added</option>
-            <option value="1">Number of Notes</option>
-            <option value="2" selected>Popularity</option>
+            <option value="1">Date Added</option>
+            <option value="2">Number of Notes</option>
+            <option value="3" selected>Popularity</option>
           </select>
         </div>
       </div>
       </div>
     </div>
 
+    <div id="data-table-entry-prototype">
+      <div class="data-table-entry hide">
+        <div class="table-entry-first-line">
+          <span class="table-school"></span>&nbsp;&nbsp;&bull;&nbsp;&nbsp;
+          <span class="table-department"></span>&nbsp;&nbsp;&bull;&nbsp;&nbsp;
+          <span class="table-instructor"></span>
+        </div>
+
+        <div class="table-entry-second-line museo700">
+          <span class="table-course-name-wrapper"><a class="table-course-link"><span class="table-course-name"></span></a></span>
+        </div>
+
+        <div class="table-entry-third-line">
+          <span class="table-note-count"><i class="fa fa-file-text-o"></i>&nbsp;&nbsp;<span class="file-count"></span> Notes</span>
+          <span class="table-thanks-count"><i class="fa fa-thumbs-up"></i>&nbsp;&nbsp;<span class="thanks-count"></span> Thanks </span>
+          <span>Updated <span class="updated-at"></span></span>
+        </div>
+      </div>
+    </div>
+
     <div class="row">
       <div class="small-12 columns">
         <!-- Main course table -->
         <table id="data_table_list">
           <thead class="hide">
             <tr>
+              <th class="no-display" id="data-table-course">Course</th>
               <th class="no-display" id="data-table-date">Date</th>
               <th class="no-display" id="data-table-note-count"># Notes</th>
               <th class="no-display" id="data-table-thanks">Popularity</th>
-              <th class="no-display" id="data-table-school">School</th>
-              <th class="no-display" id="data-table-course">Course</th>
             </tr>
           </thead>
-          <tbody>
-          {% for course in course_list %}
-            {% include 'courses/course_list_entry.html' %}
-          {% endfor %}
-          </tbody>
         </table>
       </div>
     </div> <!-- .row -->
index 21edc779f65b1db43b0e82bac61e01f45780882e..0f613ddbdc765929a393e278b6558bba10e75381 100644 (file)
@@ -1,7 +1,7 @@
 <tr class="table-row">
   <td class="hide">{{ course.updated_at|date:"U" }}</td>
   <td class="hide">{{ course.file_count|stringformat:"010g" }}</td>
-  <td class="hide">{{ course.get_popularity|stringformat:"010g" }}</td>
+  <td class="hide">{{ course.thank_count|stringformat:"010g" }}</td>
   {% if course.school %}
     <td class="hide">{{ course.school.name }}</td>
   {% else %}
           &nbsp;&nbsp;&bull;&nbsp;&nbsp;
           <span class="table-instructor">{{ course.instructor_name }}</span>
         {% endif %}
-        {% if couse.instructor.name %}
+        {% if course.instructor.name %}
           &nbsp;&nbsp;&bull;&nbsp;&nbsp;
-          <span class="table-instructor">{{ course.instructor.name }}</span>
+          <span class="table-instructor">{% for prof in course.professor.all %}
+                {{ prof.name }}{% if not forloop.last %},{% endif %}
+              {% endfor %}</span>
         {% endif %}
       </div>
 
@@ -39,7 +41,7 @@
 
       <div class="table-entry-third-line">
         <span class="table-note-count"><i class="fa fa-file-text-o"></i>&nbsp;&nbsp;{{ course.file_count }} Notes</span>
-        <span class="table-thanks-count"><i class="fa fa-thumbs-up"></i>&nbsp;&nbsp;{{ course.get_popularity }} Thanks </span>
+        <span class="table-thanks-count"><i class="fa fa-thumbs-up"></i>&nbsp;&nbsp;{{ course.thank_count }} Thanks </span>
         <span>Updated {{ course.updated_at|date:"b d, o"|capfirst }}</span>
       </div>
     </div>
index ebdc9a0a6047d1ceb84113804563504d6a9286d8..76e3e7e960dc595fd6df05d12f2c42b1834e9466 100644 (file)
@@ -7,7 +7,7 @@
     <div class="data-table-entry">
       <div class="note-date adelle-sans">{{ note.uploaded_at|date:"l, F j, Y" }}</div>
       <div class="note-name-line">
-        <span class="table-course-name museo700">
+        <span class="table-note-name museo700">
           <a href="{{ note.get_absolute_url }}">
             {{ note.name }}</a>
         </span>
index 6aa3b96cb21d220cdb82670c20f0d0db473cf813..28c67c756ad05af7ed2172d9e407565b75265947 100644 (file)
@@ -8,7 +8,7 @@ from django.conf import settings
 from django.conf.urls import patterns, include, url
 from django.views.generic.base import TemplateView
 
-from karmaworld.apps.courses.views import AboutView, flag_course, edit_course
+from karmaworld.apps.courses.views import AboutView, flag_course, edit_course, course_list_ajax
 from karmaworld.apps.courses.views import CourseDetailView
 from karmaworld.apps.courses.views import CourseListView
 from karmaworld.apps.courses.views import school_course_list
@@ -81,6 +81,7 @@ urlpatterns = patterns('',
         CourseDetailView.as_view(), name='course_detail'),
 
     ## Note Model
+    url(r'^ajax/courses/$', course_list_ajax, name='course_list_ajax'),
     # Ajax endpoint to thank a note
     url(r'^ajax/note/thank/(?P<pk>[\d]+)/$', thank_note, name='thank_note'),
     # Ajax endpoint to flag a note
index feeb14e7c8743adb7095770e5b076c644d64a079..60d1d3d6fb3c47c2ff1ccadcc49a57601ce4d8db 100644 (file)
@@ -26,3 +26,4 @@ django-ajax-selects
 git+https://github.com/btbonval/django-ajax-selects-cascade.git
 psycopg2
 pyth
+querystring_parser