From c57c683283b6032cde5f058c28b8449a0f841f48 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Fri, 7 Feb 2020 12:18:12 +0800
Subject: [PATCH] roojs-core.js roojs-core-debug.js roojs-all.js roojs-debug.js
 Roo/util/Observable.js

---
 Roo/util/Observable.js | 4 ++--
 roojs-all.js           | 4 ++--
 roojs-core-debug.js    | 6 ++++--
 roojs-core.js          | 4 ++--
 roojs-debug.js         | 6 ++++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Roo/util/Observable.js b/Roo/util/Observable.js
index 62aac4be83..5343a4d34c 100644
--- a/Roo/util/Observable.js
+++ b/Roo/util/Observable.js
@@ -359,8 +359,8 @@ Roo.util.Observable.releaseCapture = function(o){
                 
                 for(var i = 0; i < len; i++){
 		    var args = Array.prototype.slice.call(arguments, 0);
-		    args.push(ls.options);
-                    var l = ls[i];
+		    var l = ls[i];
+		    args.push(l.options);
                     if(l.fireFn.apply(l.scope||this.obj||window, args) === false){
                         this.firing = false;
                         return false;
diff --git a/roojs-all.js b/roojs-all.js
index 010bdbb87b..5f824735b7 100644
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -270,8 +270,8 @@ Roo.util.Observable.prototype.un=Roo.util.Observable.prototype.removeListener;Ro
 setTimeout(function(){h.apply(D,E);},o.delay||10);};};Roo.util.Event=function(D,E){this.name=E;this.obj=D;this.listeners=[];};Roo.util.Event.prototype={addListener:function(fn,D,E){var o=E||{};D=D||this.obj;if(!this.isListening(fn,D)){var l={fn:fn,scope:D,options:o}
 ;var h=fn;if(o.delay){h=C(h,o,D);}if(o.single){h=B(h,this,fn,D);}if(o.buffer){h=A(h,o,D);}l.fireFn=h;if(!this.firing){this.listeners.push(l);}else{this.listeners=this.listeners.slice(0);this.listeners.push(l);}}},findListener:function(fn,D){D=D||this.obj;
 var ls=this.listeners;for(var i=0,E=ls.length;i<E;i++){var l=ls[i];if(l.fn==fn&&l.scope==D){return i;}}return -1;},isListening:function(fn,D){return this.findListener(fn,D)!=-1;},removeListener:function(fn,D){var E;if((E=this.findListener(fn,D))!=-1){if(!this.firing){this.listeners.splice(E,1);
-}else{this.listeners=this.listeners.slice(0);this.listeners.splice(E,1);}return true;}return false;},clearListeners:function(){this.listeners=[];},fire:function(){var ls=this.listeners,D,E=ls.length;if(E>0){this.firing=true;var F=Array.prototype.slice.call(arguments,0);
-for(var i=0;i<E;i++){var l=ls[i];if(l.fireFn.apply(l.scope||this.obj||window,arguments)===false){this.firing=false;return false;}}this.firing=false;}return true;}};})();
+}else{this.listeners=this.listeners.slice(0);this.listeners.splice(E,1);}return true;}return false;},clearListeners:function(){this.listeners=[];},fire:function(){var ls=this.listeners,D,E=ls.length;if(E>0){this.firing=true;for(var i=0;i<E;i++){var F=Array.prototype.slice.call(arguments,0);
+F.push(ls.options);var l=ls[i];if(l.fireFn.apply(l.scope||this.obj||window,F)===false){this.firing=false;return false;}}this.firing=false;}return true;}};})();
 // Roo/Document.js
 Roo.Document=function(A){this.addEvents({'ready':true});Roo.util.Observable.call(this,A);var B=this;Roo.onReady(function(){B.fireEvent('ready');},null,false);};Roo.extend(Roo.Document,Roo.util.Observable,{});
 // Roo/EventManager.js
diff --git a/roojs-core-debug.js b/roojs-core-debug.js
index 70b86ca7de..3bc7b3e0ac 100644
--- a/roojs-core-debug.js
+++ b/roojs-core-debug.js
@@ -6074,10 +6074,12 @@ Roo.util.Observable.releaseCapture = function(o){
             var ls = this.listeners, scope, len = ls.length;
             if(len > 0){
                 this.firing = true;
-                var args = Array.prototype.slice.call(arguments, 0);
+                
                 for(var i = 0; i < len; i++){
+		    var args = Array.prototype.slice.call(arguments, 0);
+		    args.push(ls.options);
                     var l = ls[i];
-                    if(l.fireFn.apply(l.scope||this.obj||window, arguments) === false){
+                    if(l.fireFn.apply(l.scope||this.obj||window, args) === false){
                         this.firing = false;
                         return false;
                     }
diff --git a/roojs-core.js b/roojs-core.js
index c513842e6c..f06e91e3ce 100644
--- a/roojs-core.js
+++ b/roojs-core.js
@@ -270,8 +270,8 @@ Roo.util.Observable.prototype.un=Roo.util.Observable.prototype.removeListener;Ro
 setTimeout(function(){h.apply(D,E);},o.delay||10);};};Roo.util.Event=function(D,E){this.name=E;this.obj=D;this.listeners=[];};Roo.util.Event.prototype={addListener:function(fn,D,E){var o=E||{};D=D||this.obj;if(!this.isListening(fn,D)){var l={fn:fn,scope:D,options:o}
 ;var h=fn;if(o.delay){h=C(h,o,D);}if(o.single){h=B(h,this,fn,D);}if(o.buffer){h=A(h,o,D);}l.fireFn=h;if(!this.firing){this.listeners.push(l);}else{this.listeners=this.listeners.slice(0);this.listeners.push(l);}}},findListener:function(fn,D){D=D||this.obj;
 var ls=this.listeners;for(var i=0,E=ls.length;i<E;i++){var l=ls[i];if(l.fn==fn&&l.scope==D){return i;}}return -1;},isListening:function(fn,D){return this.findListener(fn,D)!=-1;},removeListener:function(fn,D){var E;if((E=this.findListener(fn,D))!=-1){if(!this.firing){this.listeners.splice(E,1);
-}else{this.listeners=this.listeners.slice(0);this.listeners.splice(E,1);}return true;}return false;},clearListeners:function(){this.listeners=[];},fire:function(){var ls=this.listeners,D,E=ls.length;if(E>0){this.firing=true;var F=Array.prototype.slice.call(arguments,0);
-for(var i=0;i<E;i++){var l=ls[i];if(l.fireFn.apply(l.scope||this.obj||window,arguments)===false){this.firing=false;return false;}}this.firing=false;}return true;}};})();
+}else{this.listeners=this.listeners.slice(0);this.listeners.splice(E,1);}return true;}return false;},clearListeners:function(){this.listeners=[];},fire:function(){var ls=this.listeners,D,E=ls.length;if(E>0){this.firing=true;for(var i=0;i<E;i++){var F=Array.prototype.slice.call(arguments,0);
+F.push(ls.options);var l=ls[i];if(l.fireFn.apply(l.scope||this.obj||window,F)===false){this.firing=false;return false;}}this.firing=false;}return true;}};})();
 // Roo/Document.js
 Roo.Document=function(A){this.addEvents({'ready':true});Roo.util.Observable.call(this,A);var B=this;Roo.onReady(function(){B.fireEvent('ready');},null,false);};Roo.extend(Roo.Document,Roo.util.Observable,{});
 // Roo/EventManager.js
diff --git a/roojs-debug.js b/roojs-debug.js
index 627bd5ecd1..5fd10a955d 100644
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -6074,10 +6074,12 @@ Roo.util.Observable.releaseCapture = function(o){
             var ls = this.listeners, scope, len = ls.length;
             if(len > 0){
                 this.firing = true;
-                var args = Array.prototype.slice.call(arguments, 0);
+                
                 for(var i = 0; i < len; i++){
+		    var args = Array.prototype.slice.call(arguments, 0);
+		    args.push(ls.options);
                     var l = ls[i];
-                    if(l.fireFn.apply(l.scope||this.obj||window, arguments) === false){
+                    if(l.fireFn.apply(l.scope||this.obj||window, args) === false){
                         this.firing = false;
                         return false;
                     }
-- 
2.39.2