Merge branch 'dev' into INT-270_connect-dialog

Author: imlucas

src/field-list/type-list-item.js

@@ -3,6 +3,7 @@ var format = require('util').format;
 var _ = require('lodash');
 var numeral = require('numeral');
 var tooltipMixin = require('../tooltip-mixin');
+var $ = require('jquery');
 
 module.exports = View.extend(tooltipMixin, {
   namespace: 'TypeListItem',
@@ -17,14 +18,6 @@ module.exports = View.extend(tooltipMixin, {
           el.classList.add('schema-field-type-' + this.model.getId().toLowerCase());
         }
       }
-    ],
-    'model.probability': [
-      {
-        hook: 'bar',
-        type: function(el) {
-          el.style.width = Math.floor(this.model.probability * 100) + '%';
-        }
-      }
     ]
   },
   events: {
@@ -35,6 +28,9 @@ module.exports = View.extend(tooltipMixin, {
       this.tooltip({
         title: format('%s (%s)', this.model.getId(), numeral(this.model.probability).format('%'))
       });
+      $(this.queryByHook('bar')).css({
+        width: Math.floor(this.model.probability * 100) + '%'
+      });
     }.bind(this), 300));
   },
   template: require('./type-list-item.jade'),
@@ -43,5 +39,9 @@ module.exports = View.extend(tooltipMixin, {
     if (!fieldList.minichartModel || fieldList.minichartModel.modelType !== this.model.modelType) {
       fieldList.switchView(this.model);
     }
+  },
+  render: function() {
+    this.renderWithTemplate(this);
+    return this;
   }
 });

src/home/collection.jade

@@ -1,8 +1,6 @@
 .collection-view
-  .row: .col-md-12.sampling-status
-    p
-      | This report is based on a sample of 1000 documents. 
-      a(href='#') Learn More
+  .sampling-status
+    span This report is based on a sample of 100 documents.
   header
     .row
       .col-md-6

src/home/collection.js

@@ -85,7 +85,7 @@ module.exports = AmpersandView.extend({
       }
     },
     documents: {
-      waitFor: 'model.documents',
+      waitFor: 'open',
       hook: 'documents-subview',
       prepareView: function(el) {
         return new DocumentListView({

src/minicharts/viz.js

@@ -48,12 +48,7 @@ var VizView = AmpersandView.extend({
       hook: 'viz-container'
     }
   },
-
-  initialize: function() {
-    if (this.model !== undefined) {
-      this.listenTo(this.model, 'change', this.redraw);
-    }
-
+  initialize: function(opts) {
     if (this.width === 'auto' || this.width === undefined) {
       this._autoWidth = true;
       this.width = 0;
@@ -134,23 +129,22 @@ var VizView = AmpersandView.extend({
       });
     }
     return this;
-  },
-
-  redraw: function() {
-    this._chooseDataSource();
-    this.data = this.transform(this.data);
-
-    this._measure();
-
-    if (this.vizFn) {
-      this.vizFn({
-        width: this.width,
-        height: this.height,
-        data: this.data,
-        el: this.el
-      });
-    }
   }
+  // redraw: function() {
+  //   this._chooseDataSource();
+  //   this.data = this.transform(this.data);
+  //
+  //   this._measure();
+  //
+  //   if (this.vizFn) {
+  //     this.vizFn({
+  //       width: this.width,
+  //       height: this.height,
+  //       data: this.data,
+  //       el: this.el,
+  //     });
+  //   }
+  // }
 });
 
 module.exports = VizView;