fix events

Author: tadatuta

common.blocks/i-bem-dom/__events/_type/i-bem-dom__events_type_bem.js

@@ -37,9 +37,9 @@ var EVENT_PREFIX = '__bem__',
         var event = EVENT_PREFIX + params.bindEntityCls.getEntityName() +
             (typeof e === 'object'?
                 e instanceof events.Event?
-                    ' ' + e.type :
+                    ':' + e.type :
                     bemInternal.buildModPostfix(e.modName, e.modVal) :
-                ' ' + e);
+                ':' + e);
 
         eventMethod === 'on' && // TODO: count usage and remove on 'un'
             !eventsInUse[event] &&

common.blocks/i-bem-dom/__events/_type/i-bem-dom__events_type_dom.spec.js

@@ -44,7 +44,7 @@ describe('DOM events', function() {
                         'js' : {
                             'inited' : function() {
                                 this._domEvents()
-                                    .on('click', spy1)
+                                    .on('click keypress', spy1)
                                     .on('click', spy2)
                                     .on('click', data, wrapSpy(spy3))
                                     .once('click', spy4);

common.blocks/i-bem-dom/__events/i-bem-dom__events.js

@@ -52,38 +52,44 @@ var undef,
          * @returns {EventManager} this
          */
         on : function(e, data, fn, _fnCtx, _isOnce) {
-            var params = this._params,
-                event = this._eventBuilder(e, params, 'on');
-
             if(functions.isFunction(data)) {
                 _isOnce = _fnCtx;
                 _fnCtx = fn;
                 fn = data;
                 data = undef;
             }
 
-            var fnStorage = this._storage[event] || (this._storage[event] = {}),
-                fnId = identify(fn, _fnCtx);
-
-            if(!fnStorage[fnId]) {
-                var bindDomNodes = params.bindDomNodes,
-                    bindClassName = params.bindClassName,
-                    _this = this,
-                    handler = fnStorage[fnId] = this._handlerWrapper(
-                        _isOnce?
-                            function() {
-                                _this.un(e, fn, _fnCtx);
-                                fn.apply(this, arguments);
-                            } :
-                            fn,
-                        data,
-                        _fnCtx,
-                        fnId);
+            var _this = this,
+                params = this._params,
+                bindDomNodes = params.bindDomNodes,
+                bindClassName = params.bindClassName,
+                fnId = identify(fn, _fnCtx),
+                onEvent = function(eventName) {
+                    var event = this._eventBuilder(eventName, params, 'on'),
+                        fnStorage = this._storage[event] || (this._storage[event] = {});
+
+                    if(!fnStorage[fnId]) {
+                        fnStorage[fnId] = handler? handler : handler = this._handlerWrapper(
+                            _isOnce?
+                                function() {
+                                    _this.un(e, fn, _fnCtx);
+                                    fn.apply(this, arguments);
+                                } :
+                                fn,
+                            data,
+                            _fnCtx,
+                            fnId);
+
+                        bindDomNodes.forEach(function(domNode) {
+                            domNode.addEventListener(event, handler, false);
+                        });
+                    }
+                }.bind(this),
+                handler;
 
-                bindDomNodes.forEach(function(domNode) {
-                    domNode.addEventListener(event, handler, false);
-                });
-            }
+            typeof e === 'string'?
+                e.split(' ').forEach(onEvent, this) :
+                onEvent(e);
 
             return this;
         },
@@ -115,26 +121,32 @@ var undef,
             var argsLen = arguments.length;
             if(argsLen) {
                 var params = this._params,
-                    event = this._eventBuilder(e, params, 'un');
+                    fnId = identify(fn, _fnCtx),
+                    bindDomNodes = params.bindDomNodes,
+                    bindClassName = params.bindClassName,
+                    onEvent = function(eventName) {
+                        var event = this._eventBuilder(eventName, params, 'un');
 
-                if(argsLen === 1) {
-                    this._unbindByEvent(this._storage[event], event);
-                } else {
-                    var wrappedFn,
-                        fnId = identify(fn, _fnCtx),
-                        fnStorage = this._storage[event],
-                        bindDomNodes = params.bindDomNodes,
-                        bindClassName = params.bindClassName;
+                        if(argsLen === 1) {
+                            this._unbindByEvent(this._storage[event], event);
+                        } else {
+                            var wrappedFn,
+                                fnStorage = this._storage[event];
 
-                    if(wrappedFn = fnStorage && fnStorage[fnId])
-                        delete fnStorage[fnId];
+                            if(wrappedFn = fnStorage && fnStorage[fnId])
+                                delete fnStorage[fnId];
 
-                    var handler = wrappedFn || fn;
+                            var handler = wrappedFn || fn;
 
-                    bindDomNodes.forEach(function(domNode) {
-                        domNode.removeEventListener(event, handler);
-                    });
-                }
+                            bindDomNodes.forEach(function(domNode) {
+                                domNode.removeEventListener(event, handler);
+                            });
+                        }
+                    }.bind(this);
+
+                typeof e === 'string'?
+                    e.split(' ').forEach(onEvent):
+                    onEvent(e);
             } else {
                 objects.each(this._storage, this._unbindByEvent, this);
             }