Merge branch 'master' of git://github.com/wiecklabs/harbor into do_se…

…ssion
fgrehm · Jul 20, 2010 · 19ab7bc · 19ab7bc
2 parents 964d042 + e94e202
commit 19ab7bc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/lib/harbor/cache.rb b/lib/harbor/cache.rb
@@ -74,7 +74,7 @@ def delete(key)
     end
 
     def delete_matching(key)
-      logger.debug "DELETE MATCHING: #{key.inspect} (#{@store.keys.select{|k| k =~ key}.inspect})" if logger
+      logger.debug "DELETE MATCHING: #{key.inspect}" if logger
       @semaphore.synchronize do
         @store.delete_matching(key)
       end

diff --git a/lib/harbor/contrib/debug.rb b/lib/harbor/contrib/debug.rb
@@ -196,34 +196,34 @@ def write(event)
 </div>
 <script type="text/javascript" charset="utf-8">
   var _body = document.body;
-  var _html = $("html").get(0);
-  $(window).keyup(function(event) {
+  var _html = jQuery("html").get(0);
+  jQuery(window).keyup(function(event) {
     if ( event.which == 76 && (event.target == _body || event.target == _html) ) {
-      $("#logger").slideToggle();
+      jQuery("#logger").slideToggle();
     }
   });
-  $("#logger li a").click(function() {
-    var info = $("#logger div." + $(this).parent().attr("class"));
+  jQuery("#logger li a").click(function() {
+    var info = jQuery("#logger div." + jQuery(this).parent().attr("class"));
     if ( info.get(0) ) {
       if ( (siblings = info.siblings("div:visible")).get(0) ) {
         siblings.hide();          
         info.toggle();
       }
       else {
         if ( info.css("display") == "block" ) {
-          $("#logger > div").slideToggle(function() {
+          jQuery("#logger > div").slideToggle(function() {
             info.hide();
           });
         }
         else {
           info.show();
-          $("#logger > div").slideToggle();
+          jQuery("#logger > div").slideToggle();
         }
       }
     }
     else {
-      $("#logger > div:visible").slideToggle(function() {
-        $("#logger > div div").hide();
+      jQuery("#logger > div:visible").slideToggle(function() {
+        jQuery("#logger > div div").hide();
       });
     }
     return false;
@@ -234,4 +234,4 @@ def write(event)
   end
 end
 
-Logging::Logger.root.add_appenders(Harbor::Contrib::Debug::LogAppender.new)
+Logging::Logger.root.add_appenders(Harbor::Contrib::Debug::LogAppender.new)
diff --git a/lib/harbor/version.rb b/lib/harbor/version.rb
@@ -1,3 +1,3 @@
 module Harbor
-  VERSION = "0.18.35"
+  VERSION = "0.18.37"
 end