From: Alan Knowles Date: Mon, 27 Jun 2016 04:42:17 +0000 (+0800) Subject: roojs-ui.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=057f9e1610bf6d9ca2422a4bd683099673dd05d3 roojs-ui.js roojs-ui-debug.js --- diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index ff4aae9b94..afc443b8eb 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -15580,7 +15580,7 @@ Roo.QuickTips = function(){ t.removeAttribute("title"); e.preventDefault(); }else{ - ttp = t.qtip || et.getAttributeNS(ns, cfg.attribute); + ttp = t.qtip || et.getAttributeNS(ns, cfg.attribute) || et.getAttributeNS(cfg.alt_namespace, cfg.attribute) ; } if(ttp){ showProc = show.defer(tm.showDelay, tm, [{ @@ -15921,7 +15921,8 @@ target Element/String/Array An Element, id or array of ids that this quic // private tagConfig : { - namespace : "ext", + namespace : "roo", // was ext?? this may break.. + alt_namespace : "ext", attribute : "qtip", width : "width", target : "target", @@ -37118,7 +37119,7 @@ Roo.extend(Roo.grid.GridView, Roo.grid.AbstractGridView, { if(!tpls.hcell){ tpls.hcell = new Roo.Template( - '
', + '
', '
{value}
', "
" ); diff --git a/roojs-ui.js b/roojs-ui.js index 9c0b3d7b41..c89494b689 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -600,7 +600,7 @@ d.mask=B.modal!==false?C:false;if(!d.isVisible()){document.body.appendChild(A.el Roo.Msg=Roo.MessageBox; // Roo/QuickTips.js Roo.QuickTips=function(){var el,A,B,C,tm,D,E,F={},G,H=null,I,J;var ce,bd,xy,dd;var K=false,L=true,M=false;var N=1,O=1,P=1,Q=[];var R=function(e){if(L){return;}var t=e.getTarget();if(!t||t.nodeType!==1||t==document||t==document.body){return;}if(ce&&t==ce.el){clearTimeout(O); -return;}if(t&&F[t.id]){F[t.id].el=t;N=W.defer(tm.showDelay,tm,[F[t.id]]);return;}var a,et=Roo.fly(t);var ns=D.namespace;if(tm.interceptTitles&&t.title){a=t.title;t.qtip=a;t.removeAttribute("title");e.preventDefault();}else{a=t.qtip||et.getAttributeNS(ns,D.attribute); +return;}if(t&&F[t.id]){F[t.id].el=t;N=W.defer(tm.showDelay,tm,[F[t.id]]);return;}var a,et=Roo.fly(t);var ns=D.namespace;if(tm.interceptTitles&&t.title){a=t.title;t.qtip=a;t.removeAttribute("title");e.preventDefault();}else{a=t.qtip||et.getAttributeNS(ns,D.attribute)||et.getAttributeNS(D.alt_namespace,D.attribute); }if(a){N=W.defer(tm.showDelay,tm,[{el:t,text:a,width:et.getAttributeNS(ns,D.width),autoHide:et.getAttributeNS(ns,D.hide)!="user",title:et.getAttributeNS(ns,D.title),cls:et.getAttributeNS(ns,D.cls)}]);}};var S=function(e){clearTimeout(N);var t=e.getTarget(); if(t&&ce&&ce.el==t&&(tm.autoHide&&ce.autoHide!==false)){O=setTimeout(Y,tm.hideDelay);}};var T=function(e){if(L){return;}xy=e.getXY();xy[1]+=18;if(tm.trackMouse&&ce){el.setXY(xy);}};var U=function(e){clearTimeout(N);clearTimeout(O);if(!e.within(el)){if(tm.hideOnClick){Y(); tm.disable();tm.enable.defer(100,tm);}}};var V=function(){return 2;};var W=function(o){if(L){return;}clearTimeout(P);ce=o;if(H){el.removeClass(H);H=null;}if(ce.cls){el.addClass(ce.cls);H=ce.cls;}if(ce.title){C.update(ce.title);C.show();}else{C.update(''); @@ -612,8 +612,8 @@ D=tm.tagConfig;if(!M){if(!Roo.isReady){Roo.onReady(Roo.QuickTips.init,Roo.QuickT C=el.child('h3');C.enableDisplayMode("block");A=el.child('div.x-tip-bd');B=el.child('div.x-tip-bd-inner');E=el.child('div.x-tip-close');E.enableDisplayMode("block");E.on("click",Y);var d=Roo.get(document);d.on("mousedown",U);d.on("mouseover",R);d.on("mouseout",S); d.on("mousemove",T);G=d.addKeyListener(27,Y);G.disable();if(Roo.dd.DD){dd=el.initDD("default",null,{onDrag:function(){el.sync();}});dd.setHandleElId(C.id);dd.lock();}M=true;}this.enable();},register:function(a){var cs=a instanceof Array?a:arguments;for(var i=0,b=cs.length; i','','
','
','
','
{lockedHeader}
','
{lockedBody}
',"
",'
','
{header}
','
{body}
',"
",'
','
 
',"
"); -B.master.disableformats=true;}if(!B.header){B.header=new Roo.Template('','{cells}',"
{splits}");B.header.disableformats=true;}B.header.compile();if(!B.hcell){B.hcell=new Roo.Template('
','
{value}
',"
"); +B.master.disableformats=true;}if(!B.header){B.header=new Roo.Template('','{cells}',"
{splits}");B.header.disableformats=true;}B.header.compile();if(!B.hcell){B.hcell=new Roo.Template('
','
{value}
',"
"); B.hcell.disableFormats=true;}B.hcell.compile();if(!B.hsplit){B.hsplit=new Roo.Template('
 
');B.hsplit.disableFormats=true;}B.hsplit.compile(); if(!B.body){B.body=new Roo.Template('',"{rows}","
");B.body.disableFormats=true;}B.body.compile();if(!B.row){B.row=new Roo.Template('{cells}');B.row.disableFormats=true; }B.row.compile();if(!B.cell){B.cell=new Roo.Template('','
{value}
',"");