[Jifty-commit] jifty branch, master, updated. cb063d64f3cc3d2941e970d0798c9d12c521cd5a

[Jifty commits]

The branch, master has been updated
       via  cb063d64f3cc3d2941e970d0798c9d12c521cd5a (commit)
      from  15f32fdfd89b01e2395885a1e5f59364d25ea5ea (commit)

Summary of changes:
 lib/Jifty/Plugin/Halo.pm         |    5 ++++-
 share/web/templates/__jifty/halo |    3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit cb063d64f3cc3d2941e970d0798c9d12c521cd5a
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sat Jan 30 00:19:04 2010 +0800

    fix halo values, it may be glob

diff --git a/lib/Jifty/Plugin/Halo.pm b/lib/Jifty/Plugin/Halo.pm
index d183b4e..c2bb3bf 100644
--- a/lib/Jifty/Plugin/Halo.pm
+++ b/lib/Jifty/Plugin/Halo.pm
@@ -194,7 +194,10 @@ sub new_frame {
 
                 if ($ref) {
                     my $expanded = Jifty->web->serial;
-                    my $yaml = Jifty->web->escape(Jifty::YAML::Dump($value));
+                    my $yaml =
+                      eval { defined $value && fileno($value) }
+                      ? '*GLOB*' : Jifty->web->escape( Jifty::YAML::Dump($value) );
+
                     $out .= qq{<a href="#" onclick="jQuery(Jifty.\$('$expanded')).toggle(); return false">$ref</a><div id="$expanded" class="halo-argument" style="display: none"><pre>$yaml</pre></div>};
                 }
                 elsif (defined $value) {
diff --git a/share/web/templates/__jifty/halo b/share/web/templates/__jifty/halo
index 6442387..497566c 100644
--- a/share/web/templates/__jifty/halo
+++ b/share/web/templates/__jifty/halo
@@ -98,9 +98,10 @@ my $depth = 0;
 % for my $e (@args) {
 <li><b><% $e->[0] %></b>:
 % if ($e->[1]) {
+% my $yaml = eval { defined $e->[2] && fileno($e->[2]) } ? '*GLOB*' : Jifty::YAML::Dump($e->[2]);
 % my $expanded = Jifty->web->serial;
 <a href="#" onclick="jQuery(Jifty.$('<% $expanded %>')).toggle(); return false"><% $e->[1] %></a>
-<div id="<% $expanded %>" style="display: none; position: absolute; left: 200px; border: 1px solid black; background: #ccc; padding: 1em; padding-top: 0; width: 300px; height: 500px; overflow: auto"><pre><% Jifty::YAML::Dump($e->[2]) %></pre></div>
+<div id="<% $expanded %>" style="display: none; position: absolute; left: 200px; border: 1px solid black; background: #ccc; padding: 1em; padding-top: 0; width: 300px; height: 500px; overflow: auto"><pre><% $yaml %></pre></div>
 % } elsif (defined $e->[2]) {
 <% $e->[2] %>
 % } else {

-----------------------------------------------------------------------