Release 2.1.0

firstandthird · Sep 8, 2016 · db4745a · db4745a
1 parent 545b147
commit db4745a
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+2.1.0 / 2016-09-08
+==================
+
+  * actions can now be bound to module element
 
 2.0.1 / 2016-07-20
 ==================

diff --git a/dist/domodule.js b/dist/domodule.js
@@ -14,7 +14,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 var Domodule = function () {
   // eslint-disable-line no-unused-vars
-
   function Domodule(el) {
     var requiredOptions = arguments.length <= 1 || arguments[1] === undefined ? [] : arguments[1];
 
@@ -53,35 +52,17 @@ var Domodule = function () {
   }, {
     key: 'setupActions',
     value: function setupActions() {
-      var _this2 = this;
+      this.setupAction(this.el);
 
       var _iteratorNormalCompletion = true;
       var _didIteratorError = false;
       var _iteratorError = undefined;
 
       try {
-        var _loop = function _loop() {
-          var action = _step.value;
-
-          if (action.dataset.domoduleActionProcessed) {
-            return 'continue';
-          }
-
-          action.addEventListener(action.dataset.actionType || 'click', function (event) {
-            if (typeof _this2[action.dataset.action] !== 'function') {
-              return;
-            }
-
-            _this2[action.dataset.action].call(_this2, action, event, _this2.serializeAttrs('action', action));
-          });
-
-          action.dataset.domoduleActionProcessed = true;
-        };
-
         for (var _iterator = this.find('[data-action]')[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-          var _ret = _loop();
+          var action = _step.value;
 
-          if (_ret === 'continue') continue;
+          this.setupAction(action);
         }
       } catch (err) {
         _didIteratorError = true;
@@ -98,6 +79,25 @@ var Domodule = function () {
         }
       }
     }
+  }, {
+    key: 'setupAction',
+    value: function setupAction(action) {
+      var _this2 = this;
+
+      if (action.dataset.domoduleActionProcessed) {
+        return;
+      }
+
+      action.addEventListener(action.dataset.actionType || 'click', function (event) {
+        if (typeof _this2[action.dataset.action] !== 'function') {
+          return;
+        }
+
+        _this2[action.dataset.action].call(_this2, action, event, _this2.serializeAttrs('action', action));
+      });
+
+      action.dataset.domoduleActionProcessed = true;
+    }
   }, {
     key: 'setupNamed',
     value: function setupNamed() {

diff --git a/example/example.js b/example/example.js
@@ -31,8 +31,9 @@ export default class Example extends Domodule { // eslint-disable-line no-unused
     console.log(this.els);
   }
 
-  click(el, event, values) {
+  click(el, event, values = {}) {
     console.log('clicked', el, values);
+
     console.log(`clicked index ${values.index}`);
     return false;
   }

diff --git a/example/index.html b/example/index.html
@@ -7,7 +7,7 @@
   </head>
   <body>
 
-    <div id="ExampleModule" data-module="Example" data-module-test="true" data-module-title="Example Module" data-module-global-screen="screen">
+    <div id="ExampleModule" data-module="Example" data-module-test="true" data-module-title="Example Module" data-module-global-screen="screen" data-action="click">
       <div data-action="testMouseOver" data-action-type="mouseover" style="height: 100px; width: 100px; background: black"></div>
       <div data-name="tester"></div>
     </div>

diff --git a/example/test.js b/example/test.js
@@ -34,6 +34,15 @@ test('actions', assert => {
   assert.end();
 });
 
+test('action on module', assert => {
+  window.logHistory = [];
+  Domodule.getInstance(document.getElementById('ExampleModule')).click();
+  assert.ok(window.logHistory.indexOf('clicked') !== -1, 'Action fired on event');
+  assert.ok(document.getElementById('ExampleModule').dataset.domoduleActionProcessed, 'Should have processed = true');
+
+  assert.end();
+});
+
 test('refs', assert => {
   assert.ok(typeof Domodule.refs !== 'undefined' && Domodule.refs instanceof Object, 'Refs object exists');
   assert.ok(Domodule.getInstance(document.getElementById('ExampleModule')) instanceof Domodule, 'getInstance returns module instance');

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "domodule",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Class based modules",
   "main": "lib/domodule.js",
   "keywords": [