Merge branch 'master' of github.com:DataTables/Plugins

sorting/date-uk.js

@@ -20,6 +20,9 @@
 
  jQuery.extend( jQuery.fn.dataTableExt.oSort, {
 	"date-uk-pre": function ( a ) {
+		if (a == null || a == "") {
+			return 0;
+		}
 		var ukDatea = a.split('/');
 		return (ukDatea[2] + ukDatea[1] + ukDatea[0]) * 1;
 	},

sorting/stringMonthYear.js

@@ -0,0 +1,46 @@
+/**
+ * This sorting plug-in will sort, in calendar order, data which
+ * is in the format "MMM yyyy" or "MMMM yyyy". Inspired by forum discussion:
+ * http://datatables.net/forums/discussion/1242/sorting-dates-with-only-month-and-year
+ *
+ *  @name Date (MMM yyyy) or (MMMM yyyy)
+ *  @anchor Sort dates in the format `MMM yyyy` or `MMMM yyyy`
+ *  @author Phil Hurwitz
+ *
+ *  @example
+ *    $('#example').DataTable( {
+ *       columnDefs: [
+ *         { type: 'stringMonthYear', targets: 0 }
+ *       ]
+ *    } );
+ */
+
+jQuery.extend(jQuery.fn.dataTableExt.oSort, {
+    "stringMonthYear-pre": function (s) {
+        var months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+
+        var dateComponents = s.split(" ");
+        dateComponents[0] = dateComponents[0].replace(",", "");
+        dateComponents[1] = jQuery.trim(dateComponents[1]);
+
+        var year = dateComponents[1];
+
+        var month = 0;
+        for (var i = 0; i < months.length; i++) {
+            if (months[i].toLowerCase() == dateComponents[0].toLowerCase().substring(0,3)) {
+                month = i;
+                break;
+            }
+        }
+
+        return new Date(year, month, 1);
+    },
+
+    "stringMonthYear-asc": function (a, b) {
+        return ((a < b) ? -1 : ((a > b) ? 1 : 0));
+    },
+
+    "stringMonthYear-desc": function (a, b) {
+        return ((a < b) ? 1 : ((a > b) ? -1 : 0));
+    }
+});