From d9bc3b0c9176fe486df4eaa768db522b0c06d6b0 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 6 Feb 2020 13:15:26 +0800 Subject: [PATCH] Changed examples/form/combocheck.htmlroojs-all.jsroojs-core-debug.jsroojs-core.jsroojs-debug.js --- examples/form/combocheck.html | 4 ++-- roojs-all.js | 2 +- roojs-core-debug.js | 4 ++-- roojs-core.js | 2 +- roojs-debug.js | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/form/combocheck.html b/examples/form/combocheck.html index 7a7c3e05f5..122c3db3fb 100644 --- a/examples/form/combocheck.html +++ b/examples/form/combocheck.html @@ -28,8 +28,8 @@

The js is not minified so it is readable. See - and - + and + .

diff --git a/roojs-all.js b/roojs-all.js index 0eb4c2a68e..0bfe98bd4b 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -816,7 +816,7 @@ Roo.fly(this.getDragEl()).setSize(el.offsetWidth,el.offsetHeight);}},b4MouseDown },endDrag:function(e){var A=this.getEl();var B=this.getDragEl();B.style.visibility="";this.beforeMove();A.style.visibility="hidden";Roo.dd.DDM.moveToEl(A,B);B.style.visibility="hidden";A.style.visibility="";this.afterDrag();},beforeMove:function(){},afterDrag:function(){} ,toString:function(){return ("DDProxy "+this.id);}}); // Roo/dd/DDTarget.js -Roo.dd.DDTarget=function(id,A,B){if(id){this.initTarget(id,A,B);}if(B.listeners||B.events){Roo.dd.DragDrop.superclass.constructor.call(this,{listeners:B.listeners||{},events:B.events||{}});}};Roo.extend(Roo.dd.DDTarget,Roo.dd.DragDrop,{toString:function(){return ("DDTarget "+this.id); +Roo.dd.DDTarget=function(id,A,B){if(id){this.initTarget(id,A,B);}if(B&&(B.listeners||B.events)){Roo.dd.DragDrop.superclass.constructor.call(this,{listeners:B.listeners||{},events:B.events||{}});}};Roo.extend(Roo.dd.DDTarget,Roo.dd.DragDrop,{toString:function(){return ("DDTarget "+this.id); }}); // Roo/dd/ScrollManager.js Roo.dd.ScrollManager=function(){var A=Roo.dd.DragDropMgr;var B={};var C=null;var D={};var E=function(e){C=null;H();};var F=function(){if(A.dragCurrent){A.refreshCache(A.dragCurrent.groups);}};var G=function(){if(A.dragCurrent){var K=Roo.dd.ScrollManager;if(!K.animate){if(D.el.scroll(D.dir,K.increment)){F(); diff --git a/roojs-core-debug.js b/roojs-core-debug.js index 5ab13f3721..a67c9268f6 100644 --- a/roojs-core-debug.js +++ b/roojs-core-debug.js @@ -21097,8 +21097,8 @@ Roo.dd.DDTarget = function(id, sGroup, config) { if (id) { this.initTarget(id, sGroup, config); } - if (config.listeners || config.events) { - Roo.dd.DragDrop.superclass.constructor.call(this, { + if (config && (config.listeners || config.events)) { + Roo.dd.DragDrop.superclass.constructor.call(this, { listeners : config.listeners || {}, events : config.events || {} }); diff --git a/roojs-core.js b/roojs-core.js index 26dd48afa9..be23561bb4 100644 --- a/roojs-core.js +++ b/roojs-core.js @@ -816,7 +816,7 @@ Roo.fly(this.getDragEl()).setSize(el.offsetWidth,el.offsetHeight);}},b4MouseDown },endDrag:function(e){var A=this.getEl();var B=this.getDragEl();B.style.visibility="";this.beforeMove();A.style.visibility="hidden";Roo.dd.DDM.moveToEl(A,B);B.style.visibility="hidden";A.style.visibility="";this.afterDrag();},beforeMove:function(){},afterDrag:function(){} ,toString:function(){return ("DDProxy "+this.id);}}); // Roo/dd/DDTarget.js -Roo.dd.DDTarget=function(id,A,B){if(id){this.initTarget(id,A,B);}if(B.listeners||B.events){Roo.dd.DragDrop.superclass.constructor.call(this,{listeners:B.listeners||{},events:B.events||{}});}};Roo.extend(Roo.dd.DDTarget,Roo.dd.DragDrop,{toString:function(){return ("DDTarget "+this.id); +Roo.dd.DDTarget=function(id,A,B){if(id){this.initTarget(id,A,B);}if(B&&(B.listeners||B.events)){Roo.dd.DragDrop.superclass.constructor.call(this,{listeners:B.listeners||{},events:B.events||{}});}};Roo.extend(Roo.dd.DDTarget,Roo.dd.DragDrop,{toString:function(){return ("DDTarget "+this.id); }}); // Roo/dd/ScrollManager.js Roo.dd.ScrollManager=function(){var A=Roo.dd.DragDropMgr;var B={};var C=null;var D={};var E=function(e){C=null;H();};var F=function(){if(A.dragCurrent){A.refreshCache(A.dragCurrent.groups);}};var G=function(){if(A.dragCurrent){var K=Roo.dd.ScrollManager;if(!K.animate){if(D.el.scroll(D.dir,K.increment)){F(); diff --git a/roojs-debug.js b/roojs-debug.js index 92d9e7691d..6fc55bd11a 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -21097,8 +21097,8 @@ Roo.dd.DDTarget = function(id, sGroup, config) { if (id) { this.initTarget(id, sGroup, config); } - if (config.listeners || config.events) { - Roo.dd.DragDrop.superclass.constructor.call(this, { + if (config && (config.listeners || config.events)) { + Roo.dd.DragDrop.superclass.constructor.call(this, { listeners : config.listeners || {}, events : config.events || {} }); -- 2.39.2