mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUGFIX: applied patch from #4381. Observable doesnt play nice with jQuery (manual jsparty merge from r90857)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92571 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
483ed4d0f2
commit
f6c487444d
1
thirdparty/behaviour/behaviour.js
vendored
1
thirdparty/behaviour/behaviour.js
vendored
@ -588,6 +588,7 @@ Observable.prototype = {
|
|||||||
throw("Observeable.stopObserving: couldn't find '" + observerCode + "'");
|
throw("Observeable.stopObserving: couldn't find '" + observerCode + "'");
|
||||||
},
|
},
|
||||||
notify : function(event, arg) {
|
notify : function(event, arg) {
|
||||||
|
if(typeof(jQuery) != 'undefined' && typeof(jQuery.livequery) != 'undefined') jQuery(this).trigger(event, arg);
|
||||||
var i, returnVal = true;
|
var i, returnVal = true;
|
||||||
if(this.observers && this.observers[event]) {
|
if(this.observers && this.observers[event]) {
|
||||||
for(i=0;i<this.observers[event].length;i++) {
|
for(i=0;i<this.observers[event].length;i++) {
|
||||||
|
Loading…
Reference in New Issue
Block a user