From 7ac42caec137d773ec74857cce192de542209c53 Mon Sep 17 00:00:00 2001
From: Chris <chris@roojs.com>
Date: Tue, 26 Nov 2013 16:52:06 +0800
Subject: [PATCH] roojs-ui-debug.js roojs-ui.js roojs-all.js roojs-debug.js

---
 roojs-all.js   | 2 +-
 roojs-debug.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roojs-all.js b/roojs-all.js
index 8d6c8f2da6..84c50ff5fb 100644
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -1,7 +1,7 @@
 //Roo.js
 window["undefined"]=window["undefined"];var Roo={};Roo.apply=function(o,c,A){if(A){Roo.apply(o,A);}if(o&&c&&typeof c=='object'){for(var p in c){o[p]=c[p];}}return o;};(function(){var A=0;var ua=navigator.userAgent.toLowerCase();var B=document.compatMode=="CSS1Compat",C=ua.indexOf("opera")>-1,D=(/webkit|khtml/).test(ua),E=ua.indexOf("msie")>-1,F=ua.indexOf("msie 7")>-1,G=!D&&ua.indexOf("gecko")>-1,H=E&&!B,I=(ua.indexOf("windows")!=-1||ua.indexOf("win32")!=-1),J=(ua.indexOf("macintosh")!=-1||ua.indexOf("mac os x")!=-1),K=(ua.indexOf("linux")!=-1),L=window.location.href.toLowerCase().indexOf("https")===0;if(E&&!F){try{document.execCommand("BackgroundImageCache",false,true);}catch(e){}}
 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(){},clone:function(o,M,f,c,N,O){var o2,P,Q;P=O||{};switch(this.type(o)){case 'date':return new Date(o);case 'regexp':return o;case 'function':return o;case 'array':o2=[];break;default:if(o['_~roo~_']){return P[o['_~roo~_']];}
-Q=Y.guid();o2=(M)?{}:Y.Object(o);o['_~roo~_']=Q;P[Q]=o;}
+Q=Roo.id();o2=(M)?{}:Roo.Object(o);o['_~roo~_']=Q;P[Q]=o;}
 Roo.each(o,function(v,k){if((k||k===0)&&(!f||(f.call(c||this,v,k,this,o)!==false))){if(k!=='_~roo~_'){if(k=='prototype'){}else {this[k]=Roo.clone(v,M,f,c,N||o,P);}}}},o2);if(!O){Roo.Object.each(P,function(v,k){if(v['_~roo~_']){try{delete v['_~roo~_'];}catch(e){v['_~roo~_']=null;}}},this);P=null;}return o2;},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 M={};for(var b in o){var N=b.split('@');if(N[1]){var s=N[0];if(!M[s]){M[s]=Roo.select(s);}
 M[s].on(N[1],o[b]);}}
 M=null;},id:function(el,M){M=M||"roo-gen";el=Roo.getDom(el);var id=M+(++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,M){if(typeof sp=='object'){M=sp;sp=sb;sb=function(){sp.apply(this,arguments);};}var F=function(){},N,O=sp.prototype;F.prototype=O;N=sb.prototype=new F();N.constructor=sb;sb.superclass=O;if(O.constructor==Object.prototype.constructor){O.constructor=sp;}
diff --git a/roojs-debug.js b/roojs-debug.js
index e0be2c9596..15d41bff13 100644
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -203,9 +203,9 @@ Roo.apply = function(o, c, defaults){
                         return marked[o['_~roo~_']];
                     }
 
-                    stamp = Y.guid();
+                    stamp = Roo.id();
 
-                    o2 = (safe) ? {} : Y.Object(o);
+                    o2 = (safe) ? {} : Roo.Object(o);
 
                     o['_~roo~_'] = stamp;
                     marked[stamp] = o;
-- 
2.39.2