roojs-core.js

roojs-core-debug.js

diff --git a/roojs-core-debug.js b/roojs-core-debug.js
index 519fc49..ba2ddd2 100644 (file)
--- a/roojs-core-debug.js
+++ b/roojs-core-debug.js
@@ -294,18 +294,17 @@ Roo.factory(conf, Roo.data);
          
         factory : function(c, ns)
         {
+            Roo.log('factory');
+            Roo.log(c);
             // no xtype, no ns or c.xns - or forced off by c.xns
             if (!c.xtype   || (!ns && !c.xns) ||  (c.xns === false)) { // not enough info...
                 return c;
             }
             ns = c.xns ? c.xns : ns; // if c.xns is set, then use that..
-            Roo.log('ns');
-            Roo.log(ns);
             if (c.constructor == ns[c.xtype]) {// already created...
                 return c;
             }
             if (ns[c.xtype]) {
-                Roo.log("Roo.Factory(" + c.xtype + ")");
                 if (Roo.debug) Roo.log("Roo.Factory(" + c.xtype + ")");
                 var ret = new ns[c.xtype](c);
                 ret.xns = false;

diff --git a/roojs-core.js b/roojs-core.js
index d3a2076..2044aa8 100644 (file)
--- a/roojs-core.js
+++ b/roojs-core.js
@@ -3,8 +3,8 @@ window["undefined"]=window["undefined"];var Roo={};Roo.apply=function(o,c,A){if(
 Roo.apply(Roo,{isStrict:B,isSecure:L,isReady:false,debug:false,enableGarbageCollector:true,enableListenerCollection:false,SSL_SECURE_URL:"javascript:false",BLANK_IMAGE_URL:"http:/"+"/localhost/s.gif",emptyFn:function(){},applyIf:function(o,c){if(o&&c){for(var p in c){if(typeof o[p]=="undefined"){o[p]=c[p];}}}return o;},addBehaviors:function(o){if(!Roo.isReady){Roo.onReady(function(){Roo.addBehaviors(o);});return;}var N={};for(var b in o){var O=b.split('@');if(O[1]){var s=O[0];if(!N[s]){N[s]=Roo.select(s);}
 N[s].on(O[1],o[b]);}}
 N=null;},id:function(el,N){N=N||"roo-gen";el=Roo.getDom(el);var id=N+(++A);return el?(el.id?el.id:(el.id=id)):id;},extend:function(){var io=function(o){for(var m in o){this[m]=o[m];}};return function(sb,sp,N){if(typeof sp=='object'){N=sp;sp=sb;sb=function(){sp.apply(this,arguments);};}var F=function(){},O,P=sp.prototype;F.prototype=P;O=sb.prototype=new F();O.constructor=sb;sb.superclass=P;if(P.constructor==Object.prototype.constructor){P.constructor=sp;}
-sb.override=function(o){Roo.override(sb,o);};O.override=io;Roo.override(sb,N);return sb;};}(),override:function(N,O){if(O){var p=N.prototype;for(var P in O){p[P]=O[P];}}},namespace:function(){var a=arguments,o=null,i,j,d,rt;for(i=0;i<a.length;++i){d=a[i].split(".");rt=d[0];eval('if (typeof '+rt+' == "undefined"){'+rt+' = {};} o = '+rt+';');for(j=1;j<d.length;++j){o[d[j]]=o[d[j]]||{};o=o[d[j]];}}},factory:function(c,ns){if(!c.xtype||(!ns&&!c.xns)||(c.xns===false)){return c;}
-ns=c.xns?c.xns:ns;Roo.log('ns');Roo.log(ns);if(c.constructor==ns[c.xtype]){return c;}if(ns[c.xtype]){Roo.log("Roo.Factory("+c.xtype+")");if(Roo.debug)Roo.log("Roo.Factory("+c.xtype+")");var N=new ns[c.xtype](c);N.xns=false;return N;}
+sb.override=function(o){Roo.override(sb,o);};O.override=io;Roo.override(sb,N);return sb;};}(),override:function(N,O){if(O){var p=N.prototype;for(var P in O){p[P]=O[P];}}},namespace:function(){var a=arguments,o=null,i,j,d,rt;for(i=0;i<a.length;++i){d=a[i].split(".");rt=d[0];eval('if (typeof '+rt+' == "undefined"){'+rt+' = {};} o = '+rt+';');for(j=1;j<d.length;++j){o[d[j]]=o[d[j]]||{};o=o[d[j]];}}},factory:function(c,ns){Roo.log('factory');Roo.log(c);if(!c.xtype||(!ns&&!c.xns)||(c.xns===false)){return c;}
+ns=c.xns?c.xns:ns;if(c.constructor==ns[c.xtype]){return c;}if(ns[c.xtype]){if(Roo.debug)Roo.log("Roo.Factory("+c.xtype+")");var N=new ns[c.xtype](c);N.xns=false;return N;}
 c.xns=false;return c;},log:function(s){if((typeof(console)=='undefined')||(typeof(console.log)=='undefined')){return;}
 console.log(s);},urlEncode:function(o){if(!o){return "";}var N=[];for(var O in o){var ov=o[O],k=Roo.encodeURIComponent(O);var P=typeof ov;if(P=='undefined'){N.push(k,"=&");}else if(P!="function"&&P!="object"){N.push(k,"=",Roo.encodeURIComponent(ov),"&");}else if(ov instanceof Array){if(ov.length){for(var i=0,Q=ov.length;i<Q;i++){N.push(k,"=",Roo.encodeURIComponent(ov[i]===undefined?'':ov[i]),"&");}}else {N.push(k,"=&");}}}
 N.pop();return N.join("");},encodeURIComponent:function(N){try{return encodeURIComponent(N);}catch(e){}if(N==''||N==null){return '';}function nibble_to_hex(Q){var R='0123456789ABCDEF';return R.charAt(Q);}