update dependencies, cleanup

Author: Steffan

package.json

@@ -38,7 +38,7 @@
     "karma-safari-launcher": "^1.0.0",
     "karma-webpack": "^2.0.9",
     "replace-in-file": "^3.1.0",
-    "rollup": "^0.52.3",
+    "rollup": "^0.55.1",
     "rollup-plugin-buble": "^0.18.0",
     "uglify-js": "^3.2.2",
     "vue": "^2.5.13",

src/index.js

@@ -26,7 +26,6 @@ function initEvents() {
     if (events) {
 
         forEach(events, (listeners, event) => {
-
             forEach(isArray(listeners) ? listeners : [listeners], listener => {
 
                 var priority = 0;
@@ -36,19 +35,25 @@ function initEvents() {
                     listener = listener.handler;
                 }
 
-                if (typeof listener === 'string') {
-                    const name = listener;
-                    listener = (...args) => this[name].apply(this, args);
-                }
-
-                _events.push(Events.on(event, listener.bind(this), priority));
+                _events.push(Events.on(event, bindListener(listener, this), priority));
             });
         });
 
         this.$on('hook:beforeDestroy', () => _events.forEach(off => off()));
     }
 }
 
+function bindListener(fn, vm) {
+
+    if (typeof fn === 'string') {
+        return function () {
+            return vm[fn].apply(vm, arguments);
+        }
+    }
+
+    return fn.bind(vm);
+}
+
 if (typeof window !== 'undefined' && window.Vue) {
     window.Vue.use(Events);
 }