Merge pull request #3 from HubSpot/cleanup

Cleanup

Author: adamschwartz

Gruntfile.coffee

@@ -29,4 +29,4 @@ module.exports = (grunt) ->
   grunt.loadNpmTasks 'grunt-contrib-coffee'
   grunt.loadNpmTasks 'grunt-contrib-compass'
 
-  grunt.registerTask 'default', ['coffee', 'uglify', 'compass']
+  grunt.registerTask 'default', ['coffee', 'uglify', 'compass']

README.md

@@ -6,4 +6,4 @@ Sortable is an open-source javascript and CSS library which adds sorting functio
 
 #### Credits
 
-Loosely based on [Stuart Langridge](https://github.com/stuartlangridge)'s [SortTable](http://www.kryogenix.org/code/browser/sorttable/) ([History](https://github.com/HubSpot/sortable/commits/e068642453bb39eed676ed338e9bbeb372ca74c4/sorttable.js), [Original](https://github.com/HubSpot/sortable/blob/37894eb51bda9f0e438d735967f16eef0d403ef9/sorttable.js))
+Loosely based on [Stuart Langridge](https://github.com/stuartlangridge)'s [SortTable](http://www.kryogenix.org/code/browser/sorttable/) ([History](https://github.com/HubSpot/sortable/commits/e068642453bb39eed676ed338e9bbeb372ca74c4/sorttable.js), [Original](https://github.com/HubSpot/sortable/blob/37894eb51bda9f0e438d735967f16eef0d403ef9/sorttable.js))

coffee/sortable.coffee

@@ -1,16 +1,14 @@
-ascending = 'ascending'
-descending = 'descending'
+SELECTOR = 'table[data-sortable]'
 
 numberRegExp = /^-?[£$¤]?[\d,.]+%?$/
 trimRegExp = /^\s+|\s+$/g
 
-touchDevice = `'ontouchstart' in document.documentElement`
+touchDevice = 'ontouchstart' of document.documentElement
 clickEvent = if touchDevice then 'touchstart' else 'click'
 
 sortable =
-
   init: ->
-    tables = document.querySelectorAll 'table[data-sortable]'
+    tables = document.querySelectorAll SELECTOR
     sortable.initTable table for table in tables
 
   initTable: (table) ->
@@ -35,7 +33,7 @@ sortable =
       sortedDirection = @getAttribute 'data-sorted-direction'
 
       if sorted
-        newSortedDirection = if sortedDirection is ascending then descending else ascending
+        newSortedDirection = if sortedDirection is 'ascending' then 'descending' else 'ascending'
       else
         newSortedDirection = type.defaultSortDirection
 
@@ -74,9 +72,8 @@ sortable =
     node.textContent.replace trimRegExp, ''
 
   types:
-
     numeric:
-      defaultSortDirection: descending
+      defaultSortDirection: 'descending'
       compare: (a, b) ->
         aa = parseFloat(a[0].replace(/[^0-9.-]/g, ''))
         bb = parseFloat(b[0].replace(/[^0-9.-]/g, ''))
@@ -85,12 +82,14 @@ sortable =
         bb - aa
 
     alpha:
-      defaultSortDirection: ascending
+      defaultSortDirection: 'ascending'
       compare: (a, b) ->
         aa = a[0].toLowerCase()
         bb = b[0].toLowerCase()
         return 0 if aa is bb
         return -1 if aa < bb
         1
 
-window.sortable = sortable
+setTimeout sortable.init, 0
+
+window.Sortable = sortable

docs/api/1-Options.md

@@ -14,19 +14,21 @@ Example:
 
 ##### `init`
 
-To initialize all tables on the page, call `init`.
+All tables on the page will be automatically initted when the page is loaded.
+
+If you add tables with javascript, call `init` after they are added to the page:
 
 ```coffeescript
-sortable.init()
+Sortable.init()
 ```
 
 ##### `initTable`
 
 To initialize an individual table, call `initTable`.
 
 ```coffeescript
-exampleTable = document.querySelector('#exampleTable[data-sortable]')
-sortable.initTable(exampleTable)
+exampleTable = document.querySelector('#exampleTable')
+Sortable.initTable(exampleTable)
 ```
 
 #### Sorting options
@@ -70,4 +72,3 @@ To disable sorting on a particular column, add `data-sortable="false"` to the `<
 <p style="-webkit-transform: translateZ(0)"></p>
 <script src="/sortable/js/sortable.js"></script>
 <link rel="stylesheet" href="/sortable/css/sortable-theme-light.css" />
-<script>setTimeout(function(){ sortable.init(); }, 0);</script>

docs/api/2-Themes.md

@@ -35,7 +35,6 @@ You can download a release (containing all 6 themes) [here](/sortable). Or you c
 <!-- Resources for the demos -->
 <p style="-webkit-transform: translateZ(0)"></p>
 <script src="/sortable/js/sortable.js"></script>
-<script>setTimeout(function(){ sortable.init(); }, 0);</script>
 <style>
 .hs-doc-content table {
     border: 0;
@@ -58,4 +57,4 @@ $('[data-theme]').each(function(){
         return false;
     });
 });
-</script>
+</script>

docs/intro.md

@@ -35,7 +35,6 @@ For the most common usage of sortable, you'll want to include following:
 ```html
 <script src="sortable.min.js"></script>
 <link rel="stylesheet" href="sortable-theme-bootstrap.css" />
-<script>setTimeout(function(){ sortable.init(); }, 0);</script>
 ```
 
 Now any table with the attribute `data-sortable` will be made sortable. To get the styling, you'll also need to add a class name to the table to match the theme you chose:
@@ -75,4 +74,3 @@ Sortable was built by [Adam Schwartz](http://twitter.com/adamfschwartz)
 }
 </style>
 <link rel="stylesheet" href="/sortable/css/sortable-theme-bootstrap.css">
-<script>setTimeout(function(){ sortable.init(); }, 0);</script>

docs/welcome/index.html

@@ -216,7 +216,7 @@
     <table class="showcase hero"><tr><td>
         <div class="showcase-inner">
             <h1>Sortable</h1>
-            <h2>The simplest, most elegant way to sort a table.</h2>
+            <h2>Drop-in script to make your tables sortable.</h2>
             <p>
                 <a class="button" href="http://github.com/hubspot/sortable">★ On Github</a> &nbsp;&nbsp;
                 <a class="button dark" href="https://github.com/HubSpot/sortable/releases">Download</a>
@@ -450,4 +450,4 @@ <h2>Help us spread the word.</h2>
         ga('send', 'pageview');
     </script>
 </body>
-</html>
+</html>