From 51271ca8d6bdc05e1419f2d8861d806dcf524f85 Mon Sep 17 00:00:00 2001 From: Frank Dillon Date: Fri, 13 Jun 2008 20:34:28 +0000 Subject: [PATCH] Dashboard no longer uses AjaxRequest methods --- docs/changelog/7.x.x.txt | 1 + .../dashboard-default-view-template.wgpkg | Bin 0 -> 2199 bytes lib/WebGUI/Asset/Wobject/Dashboard.pm | 6 + www/extras/wobject/Dashboard/draggable.js | 214 +++++++++--------- 4 files changed, 113 insertions(+), 108 deletions(-) create mode 100644 docs/upgrades/packages-7.5.13/dashboard-default-view-template.wgpkg diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index c7f5c26dc..e6fc3ccac 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -7,6 +7,7 @@ - fixed: Asset Manager breaks when an asset is locked - fixed: Asset Manager is slow to load - fixed: project management application unable to add or edit tasks. + - fixed: dashboard not working due to using legacy ajax handlers 7.5.12 - skipping this release diff --git a/docs/upgrades/packages-7.5.13/dashboard-default-view-template.wgpkg b/docs/upgrades/packages-7.5.13/dashboard-default-view-template.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..2bf07565944e1375f0dc417c73bb12a4fde57ea4 GIT binary patch literal 2199 zcmV;I2x#{oiwFP!000001MOOSZyPrf_uu^#TLC@Ufc5lKvd=g>aTB4gpT5d^7vRdT3cV@_4EoHg&C3euFQV>aAa)$H#al~PDL_Y0pv z{;F>@8ujMx-rnxsZgV4OH1`|u0aKs+3(dGEt4mb7C7$j?mp!IX0rj#_Wi#P5^V%v&F6nTm;bBJFZxrg@Y^?# zge7gH3WvNDw1fBf0ABd;UQ`0QtqFgYXIx;LihiA=Rvxu%>YT)op=b=Znk z`JGYWYaX&*I9y2{YR!!!eHrReUxtePB>1d1PGiiDh9}8H#k2~`rdAjqgp=4*ra)6M z9H>ywqUJ((l{C`KQ>(wPo6xTXV?0@*_E5=5+F|ER7#eLfJ-+#3XzXJqrh#DpzAELS zy^x6knB(fI6lgP#ISlpz@{n!9Dv^w(YR^W(@T05J$(6cFj>8}c$2d>0V*{#OPeT}Kz617ssTf!AcRdrxD94XkW-%X_ zGkKQ{qtcmbOlYwEyq(B|A4L~9d5}hr zfo>58#ertgVC2Mn6oWqIMrSju=OP}* zX~>vJhSnVcKGA6yEuIv;Wv!b^EsT&!156qLTxg&zgkwAzgRz}M`;yJ`Nz2mYvoHo@ zDN}HyV@-da92;eqG=)GF3}O_9SiuTQ^H z7$nJwMgTKh_3W4nH>Q>aKoXKNOD{AKIDqI*j%zr6a_ljdDH;_#1aUf+6V2t6vIN7k zN+Mrk)|TD8zx&ZCgz=rPs&@kq8JYYts;=?<2i!0-kiz)4UbF> zBa`5`#)1EJ-z3$WbcorJ=e!NU3PFHPd>9O4)Dphbz?>occSwCgqIg=w~ol7X{bQ?OUZaObJN6ZQZheENh`F7 zGFIICimu5`>wpSXI%Q*#SaUdE<+Tg?SjkvB$KSBlpv6|B+FXdn^0S&2t+2tE(F7r zWJIKwDY!RFk5~=`Zap6_HlgA=xGHTUO2S+B3`L}$g85quN`|eY;3L_#M<~Dfqhw+* z56p-MFKyKu;096F0peo{m<>hK_5}~8{)FOiut^*P;KiZRu`;`STjUk)#Wsf}77hAE zR?5D_?b{mZaY=Lt2Do3SK<(?X?b#wAcp$^9lb5q>XXiUgGAx`QCk&LeD}>2P8?bop zt9*xjL6XAAO3?_BD5f0Nd9_mWpHVBVOQvg9aIceI6t!GP19932)xBw%P)eS8lHE)0G{nu?}78q-vpeOev3Zk zkK8qIuYr3F+};VrU+cH-v%vOOgzVj?h3wrmWUnE64cTkR{#!ye9 zjt5xx4ukT;JO)Sh(2=Q%M3_vKB?8OHYm%SBr0^EbJ2SM}&%FQYU8mhX#fEdc-CNZub`4)_KNHP?$Bzyd>3QB6 z$sygtN+Sj$3bD0BQ~b6xG&U!63i{Xu(S8$Zv6sRWE)h(Z z`uo&HehUp0VtBCM^sfg%_XLg-Y3u<@wcD?IKVGb~8~!Lci)D06^vCo&Fu;C0o`J%l zZ7tH+-wggE#&~@p_@iDE1sU3{3PjkpI0~RChwXD4a$m+gYiT{ioX&y&v>&#R@rFe7 zbiIMYczd3ViCME>t?b`cD(|7W*E#?2$GRX)Kw4ID9SQ<`@Eg8e8Eh&JVmYhawQc$z z;qy=U=Gp1n_Z)Z(K2$2SmKVuFUx2f+JX^j+Qp`khXsdP5YV92~{RmZjDl`P|%j{lB zquJQmIcznWhf9lf;nG8vxl4%v-GfeotxFrZ{wUssfUZ+yLpD!3k2_ByHBU`9I@<;x^Kn Z$JzpG3#=`$w!qi2!0*(Ck8A)g003HRIynFU literal 0 HcmV?d00001 diff --git a/lib/WebGUI/Asset/Wobject/Dashboard.pm b/lib/WebGUI/Asset/Wobject/Dashboard.pm index 64658a415..6b17a2256 100644 --- a/lib/WebGUI/Asset/Wobject/Dashboard.pm +++ b/lib/WebGUI/Asset/Wobject/Dashboard.pm @@ -224,6 +224,12 @@ sub purge { sub view { my $self = shift; my %vars = %{$self->get()}; + + $self->session->style->setScript( + $self->session->url->extras('yui/build/utilities/utilities.js'), + { type=>'text/javascript' } + ); + my $templateId = $self->get("templateId"); my $children = $self->getLineage( ["children"], { returnObjects=>1, excludeClasses=>["WebGUI::Asset::Wobject::Layout","WebGUI::Asset::Wobject::Dashboard"] }); # I'm sure there's a more efficient way to do this. We'll figure it out someday. diff --git a/www/extras/wobject/Dashboard/draggable.js b/www/extras/wobject/Dashboard/draggable.js index 54cdeef33..f202e1572 100644 --- a/www/extras/wobject/Dashboard/draggable.js +++ b/www/extras/wobject/Dashboard/draggable.js @@ -322,88 +322,81 @@ function dragable_dragOver(obj,position) { //called on mouse up, If an element is being dragged, this method does the right thing. function dragable_dragStop(e) { - dragging=false; - if (z) { - - if (endTD !=null && startTD!=null) { - fObj2 = dragable_getObjectByClass(startTD,"availableDashlet"); + dragging=false; + if (z) { + if (endTD !=null && startTD!=null) { + fObj2 = dragable_getObjectByClass(startTD,"availableDashlet"); + dragable_moveContent(startTD,endTD,endTDPos); + if (fObj2) { + var replId = startTD.id; + replId = replId.replace(/^td/gi,''); + //alert(replId); + var replUrl = available_dashlets[replId]; + //alert(replUrl); + contentDiv = document.getElementById("ct" + replId + "_div"); + + var callback = { + success : function(req) { + var myArr528 = req.responseText.split(/beginDebug/mg,1); + contentDiv.innerHTML = myArr528[0]; + }, + failure : function(req) { + alert("Toggle Edit Form failed. Problem with connection. Please refresh the page and try again."); + } + } + + var url = replUrl + "?func=ajaxInlineView"; + var status = YAHOO.util.Connect.asyncRequest('GET',url,callback); + } + startTD=null; + + if (dragable_isBlank(endTD)) { + divName = endTD.id; + } + else { + divName=endTD.id + "_div"; + document.getElementById(divName).className="dragable"; + } + dragable_postNewContentMap(); + } - dragable_moveContent(startTD,endTD,endTDPos); - - if (fObj2) { - var replId = startTD.id; - replId = replId.replace(/^td/gi,''); - // alert(replId); - var replUrl = available_dashlets[replId]; - // alert(replUrl); - contentDiv = document.getElementById("ct" + replId + "_div"); - var hoopla = AjaxRequest.get( - { - 'url':replUrl - ,'parameters':{ - 'func':"ajaxInlineView" - } - ,'onSuccess':function(req){ - var myArr528 = req.responseText.split(/beginDebug/mg,1); - contentDiv.innerHTML = myArr528[0]; - } - } - ); - - // tdn6p_3ZAFRtB9WiyKnrwryg - // ctn6p_3ZAFRtB9WiyKnrwryg_div + for(i=0;i/mg)[1]; + if (myScript) { + myScript = myScript.split(/\<\/script\>/mg)[0]; + eval(myScript); } - ,'onSuccess':function(req){ - var myHtml = req.responseText.split(/beginDebug/mg,1)[0]; - var myScript = myHtml.split(/\/mg)[1]; - if (myScript) { - myScript = myScript.split(/\<\/script\>/mg)[0]; - eval(myScript); - } - formDiv.innerHTML = myHtml; - } - } - ); + formDiv.innerHTML = myHtml; + }, + failure : function(req) { + alert("Toggle Edit Form failed. Problem with connection. Please refresh the page and try again."); + } + } + + var url = shortcutUrl + "?func=getUserPrefsForm"; + var status = YAHOO.util.Connect.asyncRequest('GET',url,callback); + } function dashboard_reloadDashlet(event,shortcutId,shortcutUrl) { // Reload the content div. contentDiv = document.getElementById("ct" + shortcutId + "_div"); - var hooha = AjaxRequest.get( - { - 'url':shortcutUrl - ,'parameters':{ - 'func':"ajaxInlineView" + + var callback = { + success : function(req) { + var myHtml = req.responseText.split(/beginDebug/mg,1)[0]; + var myScript = myHtml.split(/\/mg)[1]; + if (myScript) { + myScript = myScript.split(/\<\/script\>/mg)[0]; + eval(myScript); } - ,'onSuccess':function(req){ - var myHtml = req.responseText.split(/beginDebug/mg,1)[0]; - var myScript = myHtml.split(/\/mg)[1]; - if (myScript) { - myScript = myScript.split(/\<\/script\>/mg)[0]; - eval(myScript); - } - contentDiv.innerHTML = myHtml; - } - } - ); + contentDiv.innerHTML = myHtml; + }, + failure : function(req) { + alert("Reload Dashlet failed. Problem with connection. Please refresh the page and try again."); + } + } + + var url = shortcutUrl + "?func=ajaxInlineView"; + var status = YAHOO.util.Connect.asyncRequest('GET',url,callback); } +function makeActive(o) { o.style.display = "inline"; } + +function makeInactive(o) { o.style.display = "none"; } +