Refactor block models/collections

src/block_manager/index.js

@@ -44,6 +44,7 @@
 import { isElement } from 'underscore';
 import Module from 'common/module';
 import defaults from './config/config';
+import Block from './model/Block';
 import Blocks from './model/Blocks';
 import BlockCategories from './model/Categories';
 import BlocksView from './view/BlocksView';
@@ -68,6 +69,10 @@ export default () => {
 
     name: 'BlockManager',
 
+    Block,
+
+    Blocks,
+
     events: {
       all: evAll,
       update: evUpdate,

src/block_manager/model/Blocks.js

@@ -1,6 +1,6 @@
-import Backbone from 'backbone';
+import { Collection } from 'common';
 import Block from './Block';
 
-export default Backbone.Collection.extend({
-  model: Block
-});
+export default class Blocks extends Collection {}
+
+Blocks.prototype.model = Block;

src/block_manager/model/Categories.js

@@ -1,6 +1,6 @@
-import Backbone from 'backbone';
+import { Collection } from 'common';
 import Category from './Category';
 
-export default Backbone.Collection.extend({
-  model: Category
-});
+export default class Categories extends Collection {}
+
+Categories.prototype.model = Category;

src/block_manager/model/Category.js

@@ -1,10 +1,12 @@
-import Backbone from 'backbone';
+import { Model } from 'common';
 
-export default Backbone.Model.extend({
-  defaults: {
-    id: '',
-    label: '',
-    open: true,
-    attributes: {}
+export default class Category extends Model {
+  defaults() {
+    return {
+      id: '',
+      label: '',
+      open: true,
+      attributes: {}
+    };
   }
-});
+}