From 3d4f524dcb7bc8c3fb10daaf49d1dd8504967706 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 20 Dec 2011 08:59:14 +0200 Subject: [PATCH] play with tree view --- app/assets/images/ajax-loader-tree.gif | Bin 0 -> 2608 bytes app/assets/javascripts/tree.js | 12 +++++++++--- app/assets/stylesheets/projects.css.scss | 7 +++++++ app/views/refs/tree.js.haml | 4 ++-- 4 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 app/assets/images/ajax-loader-tree.gif diff --git a/app/assets/images/ajax-loader-tree.gif b/app/assets/images/ajax-loader-tree.gif new file mode 100644 index 0000000000000000000000000000000000000000..c69e937232b24ea30f01c68bbd2ebc798dcecfcb GIT binary patch literal 2608 zcmZ?wbhEHblxL7<_{zZW|Nnmm28I_eUR=6#Y0sWL>(;GXv}nM*fDF?tS3*N z+_-UL)v8qs7A)AXVZ)g-XTE*=wqnJKD_5>Od-lxC%uG#9Eg&G^$dMxj1qG8PO$rMO z`}ONrMn;C4o7=Ht$A0|y;o;$7WMsrZGobjN+s`#5*x50_)kx2PnUR5kLGhoIb5Uwy zNotBhd1gt5LSj~8MNWQVie6@3T0Vo~PZmxt1_lNlkdr`xz`*w3p`pM-golHbxgqJG zirkSEB^3@T>%tvUcR#hT3trjOpqsrjrbpc-#^6+%iPVtGJ%r48WWOoWn6%;OW78Wev zm|VGVo3l`*TLItxK)wR^f`DVr`~@BbYtF7N@GO{gg+ZXe>(*Je8~5*|vaw#e&vk8X z#F;DSmop!^etwTM-Qo9sw?XzGwzfQ3W}dq!dm;p)4W6im6j2LP>qPBFIR-kW=Niafk| zFZ#hvfn=ZSPq~tP&p+i)_B;M`QndfRn?h*;Nr^M3<~Xg;VkmnZcv? zv_jT%(~^_IR*nqR4WQCu7u4`c<;ir0g-&|}OGx9?tjx4H21v*V&x__@U`m_4&RHnU zEtzje;KXS6Wd8jw{K+24OOA0RdnWfBa}r4Qx_p`K;*Bk$_wI?Xp1vb~|DM?Nh@&?o zpNUE^@4X={^^S9E^7j2~??jKTiir68>B2!-c13o#onDvEPoGfIZc_M(<$z2Zzcbg~ zgOf4>7rP(aRKfgE(M#STIlznS;Dc^i3$2ZB0uQsP$yjnLCK)v!i59 zlhpiQurLmpAnLuwdiu_}Xx}4uPDK0dy>l?af7|6<$pNb(*6iPqyqST0@jAJN@Bqdg zU)(NF=Vh}BVGzmkSZE$0q`Rn8vAK;)LOgDv$Wnd>Pf6z_kuOL2WEhm3+ZG&tmg3c; zAhCn%FcVTAEmSIJ;I-JD<@o84(JjM!9v%k^>lbOj+v0 z&MdvJ-%>lFDS^ke(IwF$?4yVd;W zF|9I14X|=3wC8B!0SC%j*^F2Eg;h$#bDQ(8qHC0zoP2;d>ns@_q z!-Gc7DGx*$3{!+Em{ec+uguMLON_koB2cAXN!K-U!*f1YBVG>Ajm*!VPPNUtaivB1 zc$kE+x&B3u)k-TCy5_n~&`5lwa%Z{%&Ty(xF%aWA0IAtReiRmHMd&CTe5%BEc_sT~ z-Td9LO-eQ?4X4sfW^GJhcKWbm&utFQq`Ne=+DIy z69g7JCra(mdAf;zHfuM>#y3vKA082%Tzy5w+F%3sY5gZvrnk2(IVo)I$iQF?Y9E0y E0FxD@KmY&$ literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/tree.js b/app/assets/javascripts/tree.js index 6edd7e49c5a..bde543f0b86 100644 --- a/app/assets/javascripts/tree.js +++ b/app/assets/javascripts/tree.js @@ -5,17 +5,23 @@ var Tree = { init: function() { + (new Image).src = "/assets/ajax-loader-tree.gif"; + $('#tree-slider td.tree-item-file-name a, #tree-breadcrumbs a').live("click", function() { history.pushState({ path: this.path }, '', this.href) + $("#tree-content-holder").hide("slide", { direction: "left" }, 150) }) $("#tree-slider tr.tree-item").live('click', function(e){ if(e.target.nodeName != "A") { - e.stopPropagation(); link = $(this).find("td.tree-item-file-name a"); - link.click(); - return false; + link.trigger("click"); } }); + + $('#tree-slider td.tree-item-file-name a, #tree-breadcrumbs a').live({ + "ajax:beforeSend": function() { $('h2.icon').addClass("loading") }, + "ajax:complete": function() { $('h2.icon').removeClass("loading")} + }); } } diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index 366a0d84a40..828b227a7f0 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -647,3 +647,10 @@ h4.middle-panel { border-radius:3px; float:left; } + +body.project-page h2.icon.loading { + span { + background-position: 0px 0px; + background: url("ajax-loader-tree.gif") no-repeat; + } +} diff --git a/app/views/refs/tree.js.haml b/app/views/refs/tree.js.haml index ef078caa7b2..97bc0b81350 100644 --- a/app/views/refs/tree.js.haml +++ b/app/views/refs/tree.js.haml @@ -1,5 +1,5 @@ :plain - $("#tree-content-holder").hide("slide", { direction: "left" }, 150, function(){ + //$("#tree-content-holder").hide("slide", { direction: "left" }, 150, function(){ $("#tree-holder").html("#{escape_javascript(render(:partial => "tree", :locals => {:repo => @repo, :commit => @commit, :tree => @tree}))}"); $("#tree-content-holder").show("slide", { direction: "right" }, 150); - }); + //}); -- GitLab