@@ -25,18 +25,18 @@ class AckInProject::Search
def section_start(file)
self.current_file = file
- reset_stripe
- puts %Q|<table class="file" width="100%" cellspacing="0">|
+ reset_stripe()
+ puts %Q|<table id="file#{files_matched}" class="file" width="100%" cellspacing="0">|
puts %Q|<thead class="filename"><tr><th colspan="2">#{current_file}<script>f();</script></th></tr></thead>|
puts %Q|<tbody class="matches">|
- file_matched()
end
def section_end
if current_file
- puts %Q|<tr><td> </td><td> </td></tr>|
puts %Q|</tbody>|
puts %Q|</table>|
+ puts %Q|<script type="text/javascript">searchResultAdded('file#{files_matched}');</script>|
+ file_matched()
end
self.current_file = nil
end
@@ -56,7 +56,7 @@ class AckInProject::Search
end
def context_break()
- reset_stripe
+ reset_stripe()
puts %Q|<tr class="context break"><td>...</td><td> </td></tr>|
end
@@ -121,7 +121,7 @@ class AckInProject::Search
when /^(\d+)-(.*)$/
context_line($1, $2)
when /^--$/
- context_break
+ context_break()
end
$stdout.flush
end
Support/lib/search.rb
@@ -25,8 +25,8 @@ class AckInProject::SearchResults
puts <<-HTML
<h2>Searching for “#{ h search_string }” in #{ searched_in }#{note}</h2>
<div id="counters"><span id="linecount">0 lines</span> matched in <span id="filecount">0 files</span></div>
- <script type="text/javascript">searchStarted();</script>
<div id="fold" style="display:none"><input type="checkbox" id="fold-toggle" /><span id="fold-lbl">Fold Results</span></div>
+ <script type="text/javascript">searchStarted();</script>
HTML
AckInProject::Search.new(plist).search
Support/lib/search_results.rb
@@ -1,5 +1,6 @@
var foundFiles = 0;
var foundLines = 0;
+var folds;
function $(el) {
return document.getElementById(el);
@@ -17,73 +18,76 @@ function l() {
function searchStarted() {
$('teaser').style.display = 'none';
+ folds = new FoldSupport();
+}
+
+function searchResultAdded(id) {
+ folds.setupFoldingIn($(id));
}
function searchCompleted() {
$('teaser').style.display = 'block';
- new FoldSupport();
- // $('fold').style.display = 'block';
- // $('fold-toggle').addEventListener('change', function() {
- // $('fold-lbl').innerHTML = "Unfold results";
- // }, false);
+ folds.searchComplete();
}
function FoldSupport() {
this.container = $('fold');
this.checkbox = $('fold-toggle');
this.label = $('fold-lbl');
- this.results = document.querySelectorAll('.file');
- console.log(this.results.length);
- this.toggle();
- this.setupObservers();
}
FoldSupport.prototype = {
+ searchComplete: function() {
+ this.results = document.querySelectorAll('.file');
+ this.toggle();
+ this.setupObservers();
+ },
+
toggle: function() {
- if(this.container.style.display == 'none')
+ if(this.container.style.display == 'none') {
this.container.style.display = 'block';
- else
+ } else {
this.container.style.display = 'none';
+ }
+ },
+
+ foldAll: function(fold) {
+ var display = 'none';
+ if(fold) { display = 'block'; }
+ for (var i=0; i < this.results.length; i++) {
+ var file = this.results[i];
+ var matches = file.getElementsByTagName('tbody')[0];
+ matches.style.display = display;
+ };
},
setupObservers: function() {
this.setupMainFolding();
- this.setupTableFolding();
},
-
setupMainFolding: function() {
var self = this;
this.checkbox.addEventListener('change', function() {
- var lbl = self.label.innerHTML, display;
+ var lbl = self.label.innerHTML;
if(lbl.indexOf('Unfold') == -1) {
- display = 'none';
self.label.innerHTML = 'Unfold Results';
} else {
- display = 'block';
self.label.innerHTML = 'Fold results';
}
-
- for (var i=0; i < self.results.length; i++) {
- var file = self.results[i];
- var matches = file.getElementsByTagName('tbody')[0];
- matches.style.display = display;
- };
+
+ self.foldAll(lbl.indexOf('Unfold') != -1);
}, false);
},
- setupTableFolding: function() {
+ setupFoldingIn: function(node) {
var self = this;
- for (var i=0; i < this.results.length; i++) {
- var file = this.results[i];
- var hdr = file.getElementsByTagName('thead')[0];
- hdr.addEventListener('click', function() {
- var node = this.parentNode;
- if(node.tagName.toLowerCase() == 'table') {
- self.toggleMatchesIn(node);
- }
- }, false);
- }
+ var hdr = node.getElementsByTagName('thead')[0];
+ hdr.addEventListener('click', function() {
+ var parent = this.parentNode;
+ if(parent.tagName.toLowerCase() == 'table') {
+ self.toggleMatchesIn(parent);
+ }
+ }, false);
},
toggleMatchesIn: function(table) {
@@ -93,4 +97,4 @@ FoldSupport.prototype = {
else
matches.style.display = 'none';
}
-}
\ No newline at end of file
+}
Support/search.js
c5a19c848c8dd46d6cc7a1270f4d8493dce1fc8a
David Lynch
kemayo@gmail.com
http://github.com/adinardi/ack-tmbundle/commit/152ebde12aa0557abc9529f728310ff48bb51c69
152ebde12aa0557abc9529f728310ff48bb51c69
2009-11-05T04:54:22-08:00
2009-03-10T12:12:51-07:00
Rework folding so it works before the search ends
(I work on a very big project. A search for a common word can
take a long time, and have some very long individual results.)
c8e161b844684b7bed045eb8d935d272d5ea33eb
Angelo DiNardi
adinardi@fragtop.local