From a41a68d91d8e1706d3a2ec71f45891a3bb417052 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Sun, 11 Dec 2011 08:50:34 +0000 Subject: [PATCH] Don't include duplicate classes - just extend the base for the jQuery UI version --- media/js/jquery.dataTables.js | 25 ++----------------------- media/src/ext/ext.classes.js | 25 ++----------------------- 2 files changed, 4 insertions(+), 46 deletions(-) diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index d63050cd..d6192ecd 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -9799,7 +9799,7 @@ $.extend( DataTable.ext.oStdClasses, { "sTable": "dataTable", - + /* Two buttons buttons */ "sPagePrevEnabled": "paginate_enabled_previous", "sPagePrevDisabled": "paginate_disabled_previous", @@ -9861,9 +9861,7 @@ } ); - $.extend( DataTable.ext.oJUIClasses, { - "sTable": "dataTable", - + $.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", @@ -9877,25 +9875,11 @@ "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", - "sPagePrevious": "previous", - "sPageNext": "next", "sPageLast": "last ui-corner-tr ui-corner-br", - /* Striping classes */ - "sStripeOdd": "odd", - "sStripeEven": "even", - - /* Empty row */ - "sRowEmpty": "dataTables_empty", - /* Features */ - "sWrapper": "dataTables_wrapper", - "sFilter": "dataTables_filter", - "sInfo": "dataTables_info", "sPaging": "dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi "+ "ui-buttonset-multi paging_", /* Note that the type is postfixed */ - "sLength": "dataTables_length", - "sProcessing": "dataTables_processing", /* Sorting */ "sSortAsc": "ui-state-default", @@ -9904,7 +9888,6 @@ "sSortableAsc": "ui-state-default", "sSortableDesc": "ui-state-default", "sSortableNone": "ui-state-default", - "sSortColumn": "sorting_", /* Note that an int is postfixed for the sorting order */ "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", @@ -9914,12 +9897,8 @@ "sSortIcon": "DataTables_sort_icon", /* Scrolling */ - "sScrollWrapper": "dataTables_scroll", "sScrollHead": "dataTables_scrollHead ui-state-default", - "sScrollHeadInner": "dataTables_scrollHeadInner", - "sScrollBody": "dataTables_scrollBody", "sScrollFoot": "dataTables_scrollFoot ui-state-default", - "sScrollFootInner": "dataTables_scrollFootInner", /* Misc */ "sFooterTH": "ui-state-default" diff --git a/media/src/ext/ext.classes.js b/media/src/ext/ext.classes.js index 17d9b37e..393c3738 100644 --- a/media/src/ext/ext.classes.js +++ b/media/src/ext/ext.classes.js @@ -1,7 +1,7 @@ $.extend( DataTable.ext.oStdClasses, { "sTable": "dataTable", - + /* Two buttons buttons */ "sPagePrevEnabled": "paginate_enabled_previous", "sPagePrevDisabled": "paginate_disabled_previous", @@ -63,9 +63,7 @@ $.extend( DataTable.ext.oStdClasses, { } ); -$.extend( DataTable.ext.oJUIClasses, { - "sTable": "dataTable", - +$.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", @@ -79,25 +77,11 @@ $.extend( DataTable.ext.oJUIClasses, { "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", - "sPagePrevious": "previous", - "sPageNext": "next", "sPageLast": "last ui-corner-tr ui-corner-br", - /* Striping classes */ - "sStripeOdd": "odd", - "sStripeEven": "even", - - /* Empty row */ - "sRowEmpty": "dataTables_empty", - /* Features */ - "sWrapper": "dataTables_wrapper", - "sFilter": "dataTables_filter", - "sInfo": "dataTables_info", "sPaging": "dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi "+ "ui-buttonset-multi paging_", /* Note that the type is postfixed */ - "sLength": "dataTables_length", - "sProcessing": "dataTables_processing", /* Sorting */ "sSortAsc": "ui-state-default", @@ -106,7 +90,6 @@ $.extend( DataTable.ext.oJUIClasses, { "sSortableAsc": "ui-state-default", "sSortableDesc": "ui-state-default", "sSortableNone": "ui-state-default", - "sSortColumn": "sorting_", /* Note that an int is postfixed for the sorting order */ "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", @@ -116,12 +99,8 @@ $.extend( DataTable.ext.oJUIClasses, { "sSortIcon": "DataTables_sort_icon", /* Scrolling */ - "sScrollWrapper": "dataTables_scroll", "sScrollHead": "dataTables_scrollHead ui-state-default", - "sScrollHeadInner": "dataTables_scrollHeadInner", - "sScrollBody": "dataTables_scrollBody", "sScrollFoot": "dataTables_scrollFoot ui-state-default", - "sScrollFootInner": "dataTables_scrollFootInner", /* Misc */ "sFooterTH": "ui-state-default"