[Jifty-commit] r4973 - in jifty/trunk: lib/Jifty/Web/Form lib/Jifty/Web/Form/Field

Jifty commits jifty-commit at lists.jifty.org
Fri Feb 1 13:23:47 EST 2008


Author: sterling
Date: Fri Feb  1 13:23:45 2008
New Revision: 4973

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

Log:
 r15102 at riddle:  andrew | 2008-02-01 12:18:28 -0600
 Removing <!-- and --> from scripts because when evalScript() is called during Ajax loads, IE7 complains about syntax errors.


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:23:45 2008
@@ -571,11 +571,11 @@
     my $self = shift;
     return unless $self->key_binding;
     Jifty->web->out(
-        '<script type="text/javascript"><!--' .
+        '<script type="text/javascript">' .
         "\n" .
         Jifty->web->escape($self->key_binding_javascript).
         "\n" .
-        "--></script>");
+        "</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:23:45 2008
@@ -392,9 +392,9 @@
     );
     
     if($javascript =~ /\S/) {
-        Jifty->web->out(qq{<script type="text/javascript"><!--
+        Jifty->web->out(qq{<script type="text/javascript">
     $javascript
---></script>
+</script>
 });
     }
 }

Modified: jifty/trunk/lib/Jifty/Web/Form/Field/Combobox.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Field/Combobox.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Form/Field/Combobox.pm	Fri Feb  1 13:23:45 2008
@@ -59,9 +59,9 @@
 
 $field .= <<"EOF";
 </select>
-<script language="javascript"><!--
+<script language="javascript">
 ComboBox_InitWith('@{[ $self->element_id ]}');
-//--></script>
+</script>
 </nobr>
 EOF
 

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:23:45 2008
@@ -117,11 +117,11 @@
     $output .= (qq(>$label</a>));
 
     $output .= (
-        '<script type="text/javascript"><!--' .
+        '<script type="text/javascript">' .
         "\n" .
         Jifty->web->escape($self->key_binding_javascript).
         "\n" .
-        "--></script>") if $self->key_binding;
+        "/script>") if $self->key_binding;
 
     return $output;
 }


More information about the Jifty-commit mailing list