INT-743 make compatible with [email protected]

Author: rueckstiess

package.json

@@ -72,7 +72,7 @@
     "ampersand-form-view": "^5.1.1",
     "ampersand-input-view": "^5.0.0",
     "ampersand-rest-collection": "^5.0.0",
-    "ampersand-state": "4.6.0",
+    "ampersand-state": "^4.8.0",
     "debug": "^2.2.0",
     "electron-squirrel-startup": "^0.1.4",
     "mongodb-collection-model": "^0.1.1",
@@ -129,8 +129,8 @@
     "mongodb-extended-json": "^1.5.3",
     "mongodb-js-fmt": "^0.0.3",
     "mongodb-js-precommit": "^0.2.4",
-    "mongodb-language-model": "^0.3.0",
-    "mongodb-schema": "^3.3.0",
+    "mongodb-language-model": "^0.3.3",
+    "mongodb-schema": "mongodb-js/mongodb-schema#INT-743-ampersand-state-4.8.0",
     "mousetrap": "^1.5.3",
     "node-notifier": "^4.3.1",
     "numeral": "^1.5.3",

src/app.js

@@ -96,7 +96,7 @@ var Application = View.extend({
     /**
      * @see statusbar.js
      */
-    statusbar: 'view',
+    statusbar: 'state',
     /**
      * Details of the MongoDB Instance we're currently connected to.
      */

src/connect/sidebar.js

@@ -1,5 +1,4 @@
 var View = require('ampersand-view');
-var Connection = require('../models/connection');
 
 /**
  * View for a connection in the sidebar. It can be clicked (will copy details to the form view)
@@ -8,7 +7,6 @@ var Connection = require('../models/connection');
 var SidebarItemView = View.extend({
   namespace: 'SidebarItemView',
   props: {
-    model: Connection,
     hover: {
       type: 'boolean',
       default: false

src/field-list/index.js

@@ -36,9 +36,7 @@ var FieldView = View.extend({
       type: 'boolean',
       default: false
     },
-    minichartView: 'view',
-    fieldListView: 'view',
-    arrayFieldListView: 'view'
+    minichartView: 'any'
   },
   bindings: {
     'model.name': {
@@ -78,32 +76,26 @@ var FieldView = View.extend({
         });
       }
     },
-    fields: {
+    fieldListView: {
       hook: 'fields-subview',
       waitFor: 'model.fields',
       prepareView: function(el) {
-        this.set('fieldListView', new FieldListView({
+        return new FieldListView({
           el: el,
           parent: this,
           collection: this.model.fields
-        }), {
-          silent: true
         });
-        return this.fieldListView;
       }
     },
-    arrayFields: {
+    arrayFieldListView: {
       hook: 'arrayfields-subview',
       waitFor: 'model.arrayFields',
       prepareView: function(el) {
-        this.set('arrayFieldListView', new FieldListView({
+        return new FieldListView({
           el: el,
           parent: this,
           collection: this.model.arrayFields
-        }), {
-          silent: true
         });
-        return this.arrayFieldListView;
       }
     }
   },
@@ -135,7 +127,7 @@ var FieldView = View.extend({
 FieldListView = View.extend({
   modelType: 'FieldListView',
   session: {
-    fieldCollectionView: 'view'
+    fieldCollectionView: 'object'
   },
   template: require('./index.jade'),
   initialize: function() {

src/minicharts/index.js

@@ -24,7 +24,7 @@ module.exports = AmpersandView.extend(QueryBuilderMixin, {
   modelType: 'MinichartView',
   template: require('./minichart.jade'),
   session: {
-    subview: 'view',
+    subview: 'state',
     viewOptions: 'object',
     selectedValues: {
       type: 'array',

src/minicharts/viz.js

@@ -13,7 +13,7 @@ var VizView = AmpersandView.extend({
     data: 'any',
     className: 'any',
     vizFn: 'any',
-    chart: 'function',
+    chart: 'any',
     debounceRender: {
       type: 'boolean',
       default: true

src/tour/index.js

@@ -3,19 +3,30 @@ var View = require('ampersand-view');
 
 var TourView = View.extend({
   props: {
-    isAnimating: { type: 'boolean', default: true },
-    tourCount: { type: 'number', default: 0 },
-    tourImages: { type: 'array', default: function() {
-      return [
-        { file: 'f1.gif', duration: 4000 },
-        { file: 'f2.gif', duration: 9000 },
-        { file: 'f3.gif', duration: 9000 },
-        { file: 'f4.gif', duration: 6000 },
-        { file: 'f5.gif', duration: 9000 }
-      ];
-    }
+    isAnimating: {
+      type: 'boolean',
+      default: true
+    },
+    tourCount: {
+      type: 'number',
+      default: 0
     },
-    tourImagesFolder: { type: 'string', default: './images/tour/' }
+    tourImages: {
+      type: 'array',
+      default: function() {
+        return [
+          { file: 'f1.gif', duration: 4000 },
+          { file: 'f2.gif', duration: 9000 },
+          { file: 'f3.gif', duration: 9000 },
+          { file: 'f4.gif', duration: 6000 },
+          { file: 'f5.gif', duration: 9000 }
+        ];
+      }
+    },
+    tourImagesFolder: {
+      type: 'string',
+      default: './images/tour/'
+    }
   },
   template: require('./index.jade'),
   events: {