X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo.js;h=aa2de28039437f69c133de49528c5f1a21304f3c;hb=50931ceebf763513e8ae7bd9ffd26ec9993967a2;hp=08881e14bf83ec25a7cf86c3ba92263a20757583;hpb=dc0deb4ab24ebb1144a9c7c0cea2e5d6bedb54e1;p=roojs1

diff --git a/Roo.js b/Roo.js
index 08881e14bf..aa2de28039 100644
--- a/Roo.js
+++ b/Roo.js
@@ -505,15 +505,18 @@ Roo.factory(conf, Roo.data);
             return s.replace(/([.*+?^${}()|[\]\/\\])/g, "\\$1");
         },
 
-        // internal
-        callback : function(cb, scope, args, delay){
-            if(typeof cb == "function"){
-                if(delay){
-                    cb.defer(delay, scope, args || []);
-                }else{
-                    cb.apply(scope, args || []);
-                }
+        // internal (non-delayed, will get a return value..)
+        callback : function(cb, scope, args, delay)
+		{
+            if(typeof cb != "function"){
+				return false;
+			}
+			if(delay){
+				cb.defer(delay, scope, args || []);
+				return false
             }
+			return cb.apply(scope, args || []);
+
         },
 
         /**
@@ -691,7 +694,7 @@ Roo.factory(conf, Roo.data);
 					return 'xs'
 			}
 			
-		}
+		} 
         
     });
 
@@ -700,6 +703,5 @@ Roo.factory(conf, Roo.data);
 
 Roo.namespace("Roo", "Roo.util", "Roo.grid", "Roo.dd", "Roo.tree", "Roo.data",
                 "Roo.form", "Roo.menu", "Roo.state", "Roo.lib", "Roo.layout",
-                "Roo.app", "Roo.ux",
-                "Roo.bootstrap",
-                "Roo.bootstrap.dash");
+                "Roo.app", "Roo.ux" 
+               );