sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

better event handling in Ox.Element

Browse source
This commit is contained in:
rolux 2011-04-30 00:07:23 +02:00
commit 5f417fa152
4 changed files with 60 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

76
source/Ox.UI/js/Core/Ox.Element.js
View file

@ -55,6 +55,13 @@ Ox.Element = function() {
} : {}));
*/
function bind(action, event, fn) {
self.$eventHandler[action]('ox_' + event, function(event, data) {
// fixme: remove second parameter
fn(Ox.extend({_event: event}, data), data);
});
}
function mousedown(e) {
/*
better mouse events
@ -170,28 +177,19 @@ Ox.Element = function() {
/***
binds a function to an event triggered by this object
Usage
bindEvent(event, fn) or bindEvent({event0: fn0, event1: fn1, ...})
bindEvent(event, fn)
bindEvent({eventA: fnA, eventB: fnB, ...})
***/
if (arguments.length == 1) {
Ox.forEach(arguments[0], function(fn, event) {
// Ox.print(that.id, 'bind', event);
self.$eventHandler.bind('ox_' + event, fn);
});
} else {
// Ox.print(that.id, 'bind', arguments[0]);
self.$eventHandler.bind('ox_' + arguments[0], arguments[1]);
}
Ox.forEach(Ox.makeObject(arguments), function(fn, event) {
bind('bind', event, fn);
});
return that;
}
that.bindEventOnce = function() {
if (arguments.length == 1) {
Ox.forEach(arguments[0], function(fn, event) {
self.$eventHandler.one('ox_' + event, fn);
});
} else {
self.$eventHandler.one('ox_' + arguments[0], arguments[1]);
}
Ox.forEach(Ox.makeObject(arguments), function(fn, event) {
bind('one', event, fn);
});
return that;
};
@ -259,39 +257,37 @@ Ox.Element = function() {
Usage
triggerEvent(event)
triggerEvent(event, data)
triggerEvent({event0: data0, event1: data1, ...})
triggerEvent({eventA: dataA, eventB: dataB, ...})
***/
if (Ox.isObject(arguments[0])) {
Ox.forEach(arguments[0], function(data, event) {
if (['mousedown', 'mouserepeat', 'anyclick', 'singleclick', 'doubleclick', 'dragstart', 'drag', 'dragpause', 'dragend', 'playing'].indexOf(event) == -1) {
Ox.print(that.id, self.options.id, 'trigger', event, data);
}
self.$eventHandler.trigger('ox_' + event, data);
});
} else {
if (['mousedown', 'mouserepeat', 'anyclick', 'singleclick', 'doubleclick', 'dragstart', 'drag', 'dragpause', 'dragend', 'playing'].indexOf(arguments[0]) == -1) {
Ox.print(that.id, self.options ? self.options.id : '', 'trigger', arguments[0], arguments[1] || {});
Ox.forEach(Ox.makeObject(arguments), function(data, event) {
if ([
'mousedown', 'mouserepeat', 'anyclick', 'singleclick', 'doubleclick',
'dragstart', 'drag', 'dragpause', 'dragend', 'playing'
].indexOf(event) == -1) {
Ox.print(that.id, self.options.id, 'trigger', event, data);
}
self.$eventHandler.trigger('ox_' + arguments[0], arguments[1] || {});
}
self.$eventHandler.trigger('ox_' + event, data);
});
return that;
};
that.unbindEvent = function() {
/***
unbinds a function from an event triggered by this element
unbinds an event triggered by this element
Usage
unbindEvent(event, fn)
unbindEvent({event0: fn0, event1: fn1, ...})
unbindEvent() // unbinds all events
unbindEvent(event)
unbindEvent(eventA, eventB, ...)
unbindEvent([eventA, eventB, ...])
to unbind a specific handler, use namespaced events
bind('doubleclick.x', fn) ... unbind('doubleclick.x')
***/
if (arguments.length == 1) {
Ox.forEach(arguments[0], function(fn, event) {
// Ox.print(that.id, 'unbind', arguments[0]);
self.$eventHandler.unbind('ox_' + event, fn);
});
if (arguments.length == 0) {
self.$eventHandler.unbind();
} else {
// Ox.print(that.id, 'unbind', arguments[0]);
self.$eventHandler.unbind('ox_' + arguments[0], arguments[1]);
Ox.makeArray(arguments).forEach(function(event) {
self.$eventHandler.unbind('ox_' + event);
});
}
return that;
};

1
source/Ox.UI/js/Form/Ox.Range.js
View file

@ -1,4 +1,5 @@
// vim: et:ts=4:sw=4:sts=4:ft=js
Ox.Range = function(options, self) {
/**