diff --git a/README.markdown b/README.markdown index 905f0cf4..7e6eff95 100644 Binary files a/README.markdown and b/README.markdown differ diff --git a/docs/example-option-date-format.html b/docs/example-option-date-format.html index 421feff4..45bfcdc4 100644 --- a/docs/example-option-date-format.html +++ b/docs/example-option-date-format.html @@ -25,9 +25,9 @@ // or to change the format for specific columns, add the dateFormat to the headers option: headers: { - 0: { sorter: "shortDate" }, // dateFormat will parsed as the default above - 1: { sorter: "shortDate", dateFormat: "ddmmyyyy" }, // set day first format - 2: { sorter: "shortDate", dateFormat: "yyyymmdd" } // set year first format + 0: { sorter: "shortDate" } //, dateFormat will parsed as the default above + // 1: { sorter: "shortDate", dateFormat: "ddmmyyyy" }, // set day first format; set using class names + // 2: { sorter: "shortDate", dateFormat: "yyyymmdd" } // set year first format; set using data attributes (jQuery data) } }); @@ -49,6 +49,15 @@
  • The dateFormat option will ONLY work with the shortDate parser.
  • The date can be separated by any of the following: slash, dash, period, comma, space(s) or tab (/-., ).
  • This date format parser will only work with a four digit year. You can write your own if you need a two digit year parser. +
  • In versions 2.3+, columns can be disabled using any of the following methods, in order of priority: + +
  • @@ -57,8 +66,8 @@ Date MMDDYYYY - Date DDMMYYYY - Date YYYYMMDD + Date DDMMYYYY + Date YYYYMMDD diff --git a/docs/example-options-headers-locked.html b/docs/example-options-headers-locked.html index 15ca6ff3..d140ef1b 100644 --- a/docs/example-options-headers-locked.html +++ b/docs/example-options-headers-locked.html @@ -2,7 +2,7 @@ - jQuery plugin: Tablesorter 2.0 - Lock sort order using header options + jQuery plugin: Tablesorter 2.0 - Lock sort order @@ -24,10 +24,6 @@ 0: { // lock the sort order of the first column to ascending (always Bruce to Peter when sorting on that column) lockedOrder: 'asc' - }, - 2: { - // lock the sort order of the third column to descending (always 45 to 18 when sorting on that column) - lockedOrder: 'desc' } } }); @@ -36,27 +32,37 @@

    - TIP! Sort the first and third columns to see how the sort is locked. Override this by using the multisort key (shift) while clicking on the header.
    - NOTE! This option was part of the original plugin, but it was broken. + NOTE! +

    -

    Demo

    - + - + diff --git a/docs/example-options-headers-order.html b/docs/example-options-headers-order.html index a5e8a8f6..407b7904 100644 --- a/docs/example-options-headers-order.html +++ b/docs/example-options-headers-order.html @@ -2,7 +2,7 @@ - jQuery plugin: Tablesorter 2.0 - Set initial sort order using header options + jQuery plugin: Tablesorter 2.0 - Set initial sort order @@ -26,9 +26,7 @@ // pass the headers argument and passing a object headers: { // set initial sort order by column, this headers option setting overrides the sortInitialOrder option - 0: { sortInitialOrder: 'desc' }, - 2: { sortInitialOrder: 'desc' }, - 4: { sortInitialOrder: 'desc' } + 0: { sortInitialOrder: 'desc' } } }); @@ -37,14 +35,26 @@

    - NOTE! The functionality to add a "sortInitialOrder" inside of the "headers" option was added in version 2.0.8 (not part of the original plugin). + NOTE! +

      +
    • Adding "sortInitialOrder" inside of the "headers" option was added in version 2.0.8 (not part of the original plugin).
    • +
    • In versions 2.3+, the initial sort order of the columns can be set using any of the following methods, in order of priority: +
        +
      • jQuery data data-sort-initial-order="desc" (equivalent to data-sortinitialorder="desc").
      • +
      • metadata class="{ sortInitialOrder: "desc" }". This requires the metadata plugin.
      • +
      • headers option headers : { 0 : { sortInitialOrder: "desc" } }.
      • +
      • header class name class="sortInitialOrder-desc".
      • +
      • overall sortInitialOrder option setting.
      • +
      +
    • +

    Demo

    @@ -53,9 +63,9 @@
    - + - + diff --git a/docs/example-options-headers.html b/docs/example-options-headers.html index 60d2584e..a696dcd1 100644 --- a/docs/example-options-headers.html +++ b/docs/example-options-headers.html @@ -2,7 +2,7 @@ - jQuery plugin: Tablesorter 2.0 - Disable sort using headers options + jQuery plugin: Tablesorter 2.0 - Disable sort @@ -18,16 +18,15 @@
    First Name Last NameAgeAge TotalDiscountDiscount Date
    First Name Last NameAgeAge TotalDiscountDiscount Date