Merge pull request #3 from marks/66-add-field-desc-to-tabe

66 add field desc to table
marks · Jan 19, 2016 · f7cd54e · f7cd54e
2 parents c3298b9 + 4fcbddc
commit f7cd54e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/scripts/collections/socrata-fields.js b/src/scripts/collections/socrata-fields.js
@@ -28,11 +28,16 @@ module.exports = Backbone.Collection.extend({
   },
   parse: function (response) {
     return response.columns.map(function (row, key) {
+      var titleForRow = row.name
+      if(!_.isEmpty(row.description)){
+        titleForRow += ' <span class="fa fa-info-circle" data-toggle="tooltip" data-placement="top" title="'+row.description+'"></span>'
+      }
       return {
         data: row.fieldName,
-        title: row.name,
+        title: titleForRow,
         type: this.typeMap[row.renderTypeName] || this.typeMap.default,
-        defaultContent: ''
+        defaultContent: '',
+        description: row.description
       }
     }, this)
   }

diff --git a/src/scripts/views/table.js b/src/scripts/views/table.js
@@ -4,6 +4,7 @@ var LoaderOn = require('../util/loader').on
 var LoaderOff = require('../util/loader').off
 require('datatables')
 require('datatables/media/js/dataTables.bootstrap')
+require('bootstrap/js/tooltip')
 
 module.exports = Card.extend({
   initialize: function (options) {
@@ -99,6 +100,12 @@ module.exports = Card.extend({
         }
       })
     }
+
+    // Initialize bootstrap-powered tooltips
+    jQuery('.dataTables_scrollHeadInner th span[data-toggle="tooltip"]').tooltip({
+      container : 'body'
+    });
+
   },
   // When another chart is filtered, filter this collection
   onFilter: function (data) {