jro_apps/redmine Commit - r850:33003e5b2d88

SCM browser: directories can now be collapsed and re-expanded with no additional request....

Jean-Philippe Lang -

r850:33003e5b2d88

parent child

Context file:

r850:33003e5b2d88

Collapse all files

app/views/repositories/_dir_list.rhtml +1 -1

-            <table class="list">
+            <table class="list" id="browser">
             <thead>
             <tr id="root">
             <th><%= l(:field_name) %></th>
             <th><%= l(:field_filesize) %></th>
             <th><%= l(:label_revision) %></th>
             <th><%= l(:label_date) %></th>
             <th><%= l(:field_author) %></th>
             <th><%= l(:field_comments) %></th>
             </tr>
             </thead>
             <tbody>
             <%= render :partial => 'dir_list_content' %>
             </tbody>
             </table>

app/views/repositories/_dir_list_content.rhtml +4 -4

             <% @entries.each do |entry| %>
             <% tr_id = Digest::MD5.hexdigest(entry.path)
                depth = params[:depth].to_i %>
-            <tr id="<%= tr_id %>">
+            <tr id="<%= tr_id %>" class="<%= params[:parent_id] %>">
             <td>
             <%= if entry.is_dir?
               link_to_remote h(entry.name),
-                             {:url => {:action => 'browse', :id => @project, :path => entry.path, :rev => @rev, :depth => (depth + 1)},
+                             {:url => {:action => 'browse', :id => @project, :path => entry.path, :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
                               :update => tr_id,
                               :position => :after,
-                              :success => "Element.addClassName('#{tr_id}', 'open');",
+                              :success => "scmEntryLoaded('#{tr_id}')",
-                              :condition => "!Element.hasClassName('#{tr_id}', 'open')"
+                              :condition => "scmEntryClick('#{tr_id}')"
                              },
                              {:href => url_for({:action => 'browse', :id => @project, :path => entry.path, :rev => @rev}),
                               :class => ('icon icon-folder'),
                               :style => "margin-left: #{18 * depth}px;"
                              }
             else
               link_to h(entry.name),
                       {:action => (entry.is_dir? ? 'browse' : 'changes'), :id => @project, :path => entry.path, :rev => @rev},
                       :class => 'icon icon-file',
                       :style => "margin-left: #{18 * depth}px;"
             end %>
             </td>
             <td align="right"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
             <td align="right"><%= link_to(entry.lastrev.name, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
             <td align="center"><%= format_time(entry.lastrev.time) if entry.lastrev %></td>
             <td align="center"><em><%=h(entry.lastrev.author) if entry.lastrev %></em></td>
             <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %>
             <td><%=h truncate(changeset.comments, 50) unless changeset.nil? %></td>
             </tr>
             <% end %>

public/javascripts/application.js +34 0

             function checkAll (id, checked) {
             	var el = document.getElementById(id);
             	for (var i = 0; i < el.elements.length; i++) {
                 if (el.elements[i].disabled==false) {
                   el.elements[i].checked = checked;
                 }
             	}
             }
             function addFileField() {
                 var f = document.createElement("input");
                 f.type = "file";
                 f.name = "attachments[]";
                 f.size = 30;
                 p = document.getElementById("attachments_p");
                 p.appendChild(document.createElement("br"));
                 p.appendChild(f);
             }
             function showTab(name) {
                 var f = $$('div#content .tab-content');
             	for(var i=0; i<f.length; i++){
             		Element.hide(f[i]);
             	}
                 var f = $$('div.tabs a');
             	for(var i=0; i<f.length; i++){
             		Element.removeClassName(f[i], "selected");
             	}
             	Element.show('tab-content-' + name);
             	Element.addClassName('tab-' + name, "selected");
             	return false;
             }
             function setPredecessorFieldsVisibility() {
                 relationType = $('relation_relation_type');
                 if (relationType && relationType.value == "precedes") {
                     Element.show('predecessor_fields');
                 } else {
                     Element.hide('predecessor_fields');
                 }
             }
             function promptToRemote(text, param, url) {
                 value = prompt(text + ':');
                 if (value) {
                     new Ajax.Request(url + '?' + param + '=' + value, {asynchronous:true, evalScripts:true});
                     return false;
                 }
             }
             /* checks that at least one checkbox is checked (used when submitting bulk edit form) */
             function checkBulkEdit(form) {
             	for (var i = 0; i < form.elements.length; i++) {
                     if (form.elements[i].checked) {
                         return true;
                     }
                 }
                 return false;
             }
+            function collapseScmEntry(id) {
+                var els = document.getElementsByClassName(id, 'browser');
+            	for (var i = 0; i < els.length; i++) {
+            	   collapseScmEntry(els[i].id);
+                   Element.hide(els[i]);
+                }
+                $(id).removeClassName('open');
+            }
+            function expandScmEntry(id) {
+                var els = document.getElementsByClassName(id, 'browser');
+            	for (var i = 0; i < els.length; i++) {
+                   Element.show(els[i]);
+                }
+                $(id).addClassName('open');
+            }
+            function scmEntryClick(id) {
+                el = $(id);
+                if (el.hasClassName('open')) {
+                    collapseScmEntry(id);
+                    return false;
+                } else if (el.hasClassName('loaded')) {
+                    expandScmEntry(id);
+                    return false;
+                }
+                return true;
+            }
+            function scmEntryLoaded(id) {
+                Element.addClassName(id, 'open');
+                Element.addClassName(id, 'loaded');
+            }
             /* shows and hides ajax indicator */
             Ajax.Responders.register({
                 onCreate: function(){
                     if ($('ajax-indicator') && Ajax.activeRequestCount > 0) {
                         Element.show('ajax-indicator');
                     }
                 },
                 onComplete: function(){
                     if ($('ajax-indicator') && Ajax.activeRequestCount == 0) {
                         Element.hide('ajax-indicator');
                     }
                 }
             });

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages