[Jifty-commit] r4975 - in jifty/trunk: lib/Jifty/Plugin/SkeletonApp lib/Jifty/Web/Form

[Jifty commits]

Author: alexmv
Date: Fri Feb  1 13:52:25 2008
New Revision: 4975

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Plugin/SkeletonApp/View.pm
   jifty/trunk/lib/Jifty/Web/Form/Element.pm
   jifty/trunk/lib/Jifty/Web/Form/Field.pm
   jifty/trunk/lib/Jifty/Web/Form/Link.pm

Log:
 r27421 at zoq-fot-pik:  chmrr | 2008-02-01 13:51:51 -0500
  * Finish pulling out html comments, and the now-unnecessary newlines
    as well


Modified: jifty/trunk/lib/Jifty/Plugin/SkeletonApp/View.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/SkeletonApp/View.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/SkeletonApp/View.pm	Fri Feb  1 13:52:25 2008
@@ -69,7 +69,7 @@
 
 private template 'keybindings' => sub {
     div { id is "keybindings";
-      outs_raw('<script type="text/javascript"><!-- Jifty.KeyBindings.reset() --></script>') };
+      outs_raw('<script type="text/javascript">Jifty.KeyBindings.reset()</script>') };
 };
 
 #template 'index.html' => page { { title is _('Welcome to your new Jifty application') } img { src is "/static/images/pony.jpg", alt is _( 'You said you wanted a pony. (Source %1)', 'http://hdl.loc.gov/loc.pnp/cph.3c13461'); }; };

Modified: jifty/trunk/lib/Jifty/Web/Form/Element.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Element.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Form/Element.pm	Fri Feb  1 13:52:25 2008
@@ -572,9 +572,7 @@
     return unless $self->key_binding;
     Jifty->web->out(
         '<script type="text/javascript">' .
-        "\n" .
         Jifty->web->escape($self->key_binding_javascript).
-        "\n" .
         "</script>");
     return '';
 }

Modified: jifty/trunk/lib/Jifty/Web/Form/Field.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Field.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Form/Field.pm	Fri Feb  1 13:52:25 2008
@@ -392,9 +392,7 @@
     );
     
     if($javascript =~ /\S/) {
-        Jifty->web->out(qq{<script type="text/javascript">
-    $javascript
-</script>
+        Jifty->web->out(qq{<script type="text/javascript">$javascript</script>
 });
     }
 }
@@ -608,9 +606,7 @@
     my $self = shift;
     return unless $self->autocompleter;
     $self->render_autocomplete_div;
-    Jifty->web->out(qq{<script type="text/javascript"><!--
-    @{[$self->autocomplete_javascript]}
---></script>});
+    Jifty->web->out(qq{<script type="text/javascript">@{[$self->autocomplete_javascript]}</script>});
     return '';
 }
 

Modified: jifty/trunk/lib/Jifty/Web/Form/Link.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Link.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Form/Link.pm	Fri Feb  1 13:52:25 2008
@@ -118,9 +118,7 @@
 
     $output .= (
         '<script type="text/javascript">' .
-        "\n" .
         Jifty->web->escape($self->key_binding_javascript).
-        "\n" .
         "</script>") if $self->key_binding;
 
     return $output;