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

.datatables-commit-sync

@@ -1 +1 @@
-761265b0352d1f3d0e0c65ee3d10090495c8ff80
+057cb866692ae6cbeeb90ef6f88921df10881bf0

examples/resources/demo.js

@@ -3,6 +3,9 @@
 SyntaxHighlighter.config.tagName = 'code';
 
 $(document).ready( function () {
+	if ( ! $.fn.dataTable ) {
+		return;
+	}
 	var dt110 = $.fn.dataTable.Api ? true : false;
 
 	// Work around for WebKit bug 55740

media/js/jquery.dataTables.js

@@ -4352,12 +4352,16 @@
 			var col = columns[i];
 			var asSorting = col.asSorting;
 			var sTitle = col.sTitle.replace( /<.*?>/g, "" );
-			var jqTh = $(col.nTh).removeAttr('aria-sort');
+			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 ) {
-					jqTh.attr('aria-sort', aSort[0].dir=="asc" ? "ascending" : "descending" );
+					th.setAttribute('aria-sort', aSort[0].dir=="asc" ? "ascending" : "descending" );
 					nextSort = asSorting[ aSort[0].index+1 ] || asSorting[0];
 				}
 				else {
@@ -4373,7 +4377,7 @@
 				label = sTitle;
 			}
 	
-			jqTh.attr('aria-label', label);
+			th.setAttribute('aria-label', label);
 		}
 	}