Refactor Modal module

src/modal_dialog/config/config.js

@@ -5,5 +5,16 @@ export default {
 
   content: '',
 
-  backdrop: true
+  backdrop: true,
+
+  /**
+   * Extend ModalView object (view/ModalView.js)
+   * @example
+   * extend: {
+   *   template() {
+   *     return '<div>...New modal template...</div>';
+   *   },
+   * },
+   */
+  extend: {}
 };

src/modal_dialog/index.js

@@ -89,7 +89,8 @@ export default () => {
     open(opts = {}) {
       opts.title && this.setTitle(opts.title);
       opts.content && this.setContent(opts.content);
-      modal.show(opts);
+      model.open();
+      modal && modal.updateAttr(opts.attributes);
       return this;
     },
 
@@ -98,7 +99,7 @@ export default () => {
      * @return {this}
      */
     close() {
-      modal.hide();
+      model.close();
       return this;
     },
 
@@ -197,8 +198,9 @@ export default () => {
      * @private
      */
     render() {
+      const View = ModalView.extend(c.extend);
       modal && modal.remove();
-      modal = new ModalView({
+      modal = new View({
         model,
         config: c
       });

src/modal_dialog/model/Modal.js

@@ -1,9 +1,19 @@
-import Backbone from 'backbone';
+import { Model } from 'backbone';
 
-export default Backbone.Model.extend({
+export default class Modal extends Model {
-  defaults: {
+  defaults() {
-    title: '',
+    return {
-    content: '',
+      title: '',
-    open: false
+      content: '',
+      open: false
+    };
   }
-});
+
+  open() {
+    this.set('open', true);
+  }
+
+  close() {
+    this.set('open', false);
+  }
+}

src/modal_dialog/view/ModalView.js

@@ -1,6 +1,6 @@
-import Backbone from 'backbone';
+import { View } from 'backbone';
 
-export default Backbone.View.extend({
+export default class ModalView extends View {
   template({ pfx, ppfx, content, title }) {
     return `<div class="${pfx}dialog ${ppfx}one-bg ${ppfx}two-color">
       <div class="${pfx}header">
@@ -13,12 +13,14 @@ export default Backbone.View.extend({
       </div>
     </div>
     <div class="${pfx}collector" style="display: none"></div>`;
-  },
+  }
 
-  events: {
+  events() {
-    click: 'onClick',
+    return {
-    'click [data-close-modal]': 'hide'
+      click: 'onClick',
-  },
+      'click [data-close-modal]': 'hide'
+    };
+  }
 
   initialize(o) {
     const model = this.model;
@@ -30,12 +32,12 @@ export default Backbone.View.extend({
     this.listenTo(model, 'change:open', this.updateOpen);
     this.listenTo(model, 'change:title', this.updateTitle);
     this.listenTo(model, 'change:content', this.updateContent);
-  },
+  }
 
   onClick(e) {
     const bkd = this.config.backdrop;
     bkd && e.target === this.el && this.hide();
-  },
+  }
 
   /**
    * Returns collector element
@@ -46,7 +48,7 @@ export default Backbone.View.extend({
     if (!this.$collector)
       this.$collector = this.$el.find('.' + this.pfx + 'collector');
     return this.$collector;
-  },
+  }
 
   /**
    * Returns content element
@@ -61,7 +63,7 @@ export default Backbone.View.extend({
     }
 
     return this.$content;
-  },
+  }
 
   /**
    * Returns title element
@@ -71,7 +73,7 @@ export default Backbone.View.extend({
   getTitle() {
     if (!this.$title) this.$title = this.$el.find('.' + this.pfx + 'title');
     return this.$title.get(0);
-  },
+  }
 
   /**
    * Update content
@@ -84,7 +86,7 @@ export default Backbone.View.extend({
     const body = this.model.get('content');
     children.length && coll.append(children);
     content.empty().append(body);
-  },
+  }
 
   /**
    * Update title
@@ -93,7 +95,7 @@ export default Backbone.View.extend({
   updateTitle() {
     var title = this.getTitle();
     if (title) title.innerHTML = this.model.get('title');
-  },
+  }
 
   /**
    * Update open
@@ -101,24 +103,23 @@ export default Backbone.View.extend({
    * */
   updateOpen() {
     this.el.style.display = this.model.get('open') ? '' : 'none';
-  },
+  }
 
   /**
    * Hide modal
    * @private
    * */
   hide() {
-    this.model.set('open', 0);
+    this.model.close();
-  },
+  }
 
   /**
    * Show modal
    * @private
    * */
-  show(opts = {}) {
+  show() {
-    this.model.set('open', 1);
+    this.model.open();
-    this.updateAttr(opts.attributes);
+  }
-  },
 
   updateAttr(attr) {
     const { pfx, $el, el } = this;
@@ -128,7 +129,7 @@ export default Backbone.View.extend({
       ...(attr || {}),
       class: `${pfx}container ${(attr && attr.class) || ''}`.trim()
     });
-  },
+  }
 
   render() {
     const el = this.$el;
@@ -140,4 +141,4 @@ export default Backbone.View.extend({
     this.updateOpen();
     return this;
   }
-});
+}

test/specs/modal/index.js

@@ -1,5 +1,4 @@
 import Modal from 'modal_dialog';
-import ModalView from './view/ModalView';
 
 describe('Modal dialog', () => {
   describe('Main', () => {