[Jifty-commit] r5237 - in jifty/branches/jquery: . lib/Jifty lib/Jifty/Web/Form share/web/static/js share/web/templates/__jifty/webservices t/Mapper t/TestApp t/TestApp-JiftyJS t/TestApp-JiftyJS/doc t/TestApp-JiftyJS/log t/TestApp-JiftyJS/share/po t/TestApp-JiftyJS/share/web/templates t/TestApp-JiftyJS/var t/TestApp-Plugin-AppPluginHasModels t/TestApp-Plugin-AppPluginHasModels/doc t/TestApp-Plugin-AppPluginHasModels/log t/TestApp-Plugin-AppPluginHasModels/share t/TestApp-Plugin-AppPluginHasModels/var t/TestApp-Plugin-Attributes t/TestApp-Plugin-Attributes/doc t/TestApp-Plugin-Attributes/share t/TestApp-Plugin-Chart t/TestApp-Plugin-Chart/doc t/TestApp-Plugin-Chart/log t/TestApp-Plugin-Chart/share t/TestApp-Plugin-Chart/var t/TestApp-Plugin-Comments t/TestApp-Plugin-Comments/doc t/TestApp-Plugin-Comments/log t/TestApp-Plugin-Comments/share t/TestApp-Plugin-Comments/var t/TestApp-Plugin-CompressedCSSandJS t/TestApp-Plugin-CompressedCSSandJS/doc t/TestApp-Plugin-CompressedCSSandJS/lib t/TestApp-Plugin-CompressedCSSandJS/log t/TestApp-Plugin-CompressedCSSandJS/share t/TestApp-Plugin-CompressedCSSandJS/var t/TestApp-Plugin-News t/TestApp-Plugin-News/doc t/TestApp-Plugin-News/log t/TestApp-Plugin-News/share t/TestApp-Plugin-News/var t/TestApp-Plugin-OAuth t/TestApp-Plugin-OAuth/doc t/TestApp-Plugin-OAuth/log t/TestApp-Plugin-OAuth/share t/TestApp-Plugin-OAuth/var t/TestApp-Plugin-OnClick t/TestApp-Plugin-OnClick/doc t/TestApp-Plugin-OnClick/log t/TestApp-Plugin-OnClick/share/po t/TestApp-Plugin-OnClick/share/web/static t/TestApp-Plugin-OnClick/var t/TestApp-Plugin-PasswordAuth t/TestApp-Plugin-PasswordAuth/doc t/TestApp-Plugin-PasswordAuth/log t/TestApp-Plugin-PasswordAuth/share t/TestApp-Plugin-PasswordAuth/var t/TestApp-Plugin-REST t/TestApp-Plugin-REST/share t/TestApp-Plugin-REST/var t/TestApp-Plugin-SinglePage t/TestApp-Plugin-SinglePage/doc t/TestApp-Plugin-SinglePage/share t/TestApp-Plugin-SinglePage/var
Jifty commits
jifty-commit at lists.jifty.org
Wed Mar 26 18:57:00 EDT 2008
Author: sartak
Date: Wed Mar 26 18:56:59 2008
New Revision: 5237
Removed:
jifty/branches/jquery/t/TestApp-JiftyJS/doc/
jifty/branches/jquery/t/TestApp-JiftyJS/log/
jifty/branches/jquery/t/TestApp-JiftyJS/share/po/
jifty/branches/jquery/t/TestApp-JiftyJS/share/web/templates/
jifty/branches/jquery/t/TestApp-JiftyJS/var/
jifty/branches/jquery/t/TestApp-Plugin-AppPluginHasModels/doc/
jifty/branches/jquery/t/TestApp-Plugin-AppPluginHasModels/log/
jifty/branches/jquery/t/TestApp-Plugin-AppPluginHasModels/share/
jifty/branches/jquery/t/TestApp-Plugin-AppPluginHasModels/var/
jifty/branches/jquery/t/TestApp-Plugin-Attributes/doc/
jifty/branches/jquery/t/TestApp-Plugin-Attributes/share/
jifty/branches/jquery/t/TestApp-Plugin-Chart/doc/
jifty/branches/jquery/t/TestApp-Plugin-Chart/log/
jifty/branches/jquery/t/TestApp-Plugin-Chart/share/
jifty/branches/jquery/t/TestApp-Plugin-Chart/var/
jifty/branches/jquery/t/TestApp-Plugin-Comments/doc/
jifty/branches/jquery/t/TestApp-Plugin-Comments/log/
jifty/branches/jquery/t/TestApp-Plugin-Comments/share/
jifty/branches/jquery/t/TestApp-Plugin-Comments/var/
jifty/branches/jquery/t/TestApp-Plugin-CompressedCSSandJS/doc/
jifty/branches/jquery/t/TestApp-Plugin-CompressedCSSandJS/lib/
jifty/branches/jquery/t/TestApp-Plugin-CompressedCSSandJS/log/
jifty/branches/jquery/t/TestApp-Plugin-CompressedCSSandJS/share/
jifty/branches/jquery/t/TestApp-Plugin-CompressedCSSandJS/var/
jifty/branches/jquery/t/TestApp-Plugin-News/doc/
jifty/branches/jquery/t/TestApp-Plugin-News/log/
jifty/branches/jquery/t/TestApp-Plugin-News/share/
jifty/branches/jquery/t/TestApp-Plugin-News/var/
jifty/branches/jquery/t/TestApp-Plugin-OAuth/doc/
jifty/branches/jquery/t/TestApp-Plugin-OAuth/log/
jifty/branches/jquery/t/TestApp-Plugin-OAuth/share/
jifty/branches/jquery/t/TestApp-Plugin-OAuth/var/
jifty/branches/jquery/t/TestApp-Plugin-OnClick/doc/
jifty/branches/jquery/t/TestApp-Plugin-OnClick/log/
jifty/branches/jquery/t/TestApp-Plugin-OnClick/share/po/
jifty/branches/jquery/t/TestApp-Plugin-OnClick/share/web/static/
jifty/branches/jquery/t/TestApp-Plugin-OnClick/var/
jifty/branches/jquery/t/TestApp-Plugin-PasswordAuth/doc/
jifty/branches/jquery/t/TestApp-Plugin-PasswordAuth/log/
jifty/branches/jquery/t/TestApp-Plugin-PasswordAuth/share/
jifty/branches/jquery/t/TestApp-Plugin-PasswordAuth/var/
jifty/branches/jquery/t/TestApp-Plugin-REST/share/
jifty/branches/jquery/t/TestApp-Plugin-REST/var/
jifty/branches/jquery/t/TestApp-Plugin-SinglePage/doc/
jifty/branches/jquery/t/TestApp-Plugin-SinglePage/log/
jifty/branches/jquery/t/TestApp-Plugin-SinglePage/share/
jifty/branches/jquery/t/TestApp-Plugin-SinglePage/var/
Modified:
jifty/branches/jquery/ (props changed)
jifty/branches/jquery/lib/Jifty/Action.pm
jifty/branches/jquery/lib/Jifty/Web/Form/Field.pm
jifty/branches/jquery/share/web/static/js/jifty.js
jifty/branches/jquery/share/web/templates/__jifty/webservices/xml
jifty/branches/jquery/t/Mapper/ (props changed)
jifty/branches/jquery/t/TestApp/ (props changed)
jifty/branches/jquery/t/TestApp-JiftyJS/ (props changed)
jifty/branches/jquery/t/TestApp-Plugin-AppPluginHasModels/ (props changed)
jifty/branches/jquery/t/TestApp-Plugin-Attributes/ (props changed)
jifty/branches/jquery/t/TestApp-Plugin-Chart/ (props changed)
jifty/branches/jquery/t/TestApp-Plugin-Comments/ (props changed)
jifty/branches/jquery/t/TestApp-Plugin-CompressedCSSandJS/ (props changed)
jifty/branches/jquery/t/TestApp-Plugin-News/ (props changed)
jifty/branches/jquery/t/TestApp-Plugin-OAuth/ (props changed)
jifty/branches/jquery/t/TestApp-Plugin-OnClick/ (props changed)
jifty/branches/jquery/t/TestApp-Plugin-PasswordAuth/ (props changed)
jifty/branches/jquery/t/TestApp-Plugin-REST/ (props changed)
jifty/branches/jquery/t/TestApp-Plugin-SinglePage/ (props changed)
Log:
Bring jquery branch up to trunk
Modified: jifty/branches/jquery/lib/Jifty/Action.pm
==============================================================================
--- jifty/branches/jquery/lib/Jifty/Action.pm (original)
+++ jifty/branches/jquery/lib/Jifty/Action.pm Wed Mar 26 18:56:59 2008
@@ -944,7 +944,7 @@
# When it isn't even given, check if it's mandatory and whine about it
if ( !defined $value || !length $value ) {
- if ( $field_info->{mandatory} ) {
+ if ( $field_info->{mandatory} and ($self->has_argument($field) or not defined $field_info->{default_value})) {
return $self->validation_error( $field => _("You need to fill in this field") );
}
}
Modified: jifty/branches/jquery/lib/Jifty/Web/Form/Field.pm
==============================================================================
--- jifty/branches/jquery/lib/Jifty/Web/Form/Field.pm (original)
+++ jifty/branches/jquery/lib/Jifty/Web/Form/Field.pm Wed Mar 26 18:56:59 2008
@@ -88,7 +88,7 @@
}
# now that the form field has been instantiated, register the action with the form.
- if ($self->action and Jifty->web->form->is_open and not (Jifty->web->form->has_action($self->action))) {
+ if ($self->action and Jifty->web->form->is_open and not (Jifty->web->form->printed_actions->{$self->action->moniker})) {
Jifty->web->form->register_action( $self->action);
Jifty->web->form->print_action_registration($self->action->moniker);
}
Modified: jifty/branches/jquery/share/web/static/js/jifty.js
==============================================================================
--- jifty/branches/jquery/share/web/static/js/jifty.js (original)
+++ jifty/branches/jquery/share/web/static/js/jifty.js Wed Mar 26 18:56:59 2008
@@ -933,7 +933,7 @@
}
// Make the region (for now)
- new Region(name, f['args'], f['path'], f['parent'], f['parent'] ? f['parent'].in_form : null);
+ new Region(name, f['args'], f['path'], f['parent'], f['parent'] ? fragments.get(f['parent']).in_form : null);
} else if ((f['path'] != null) && f['toggle'] && (f['path'] == fragments[name].path)) {
// If they set the 'toggle' flag, and clicking wouldn't change the path
jQuery(element).empty();
Modified: jifty/branches/jquery/share/web/templates/__jifty/webservices/xml
==============================================================================
--- jifty/branches/jquery/share/web/templates/__jifty/webservices/xml (original)
+++ jifty/branches/jquery/share/web/templates/__jifty/webservices/xml Wed Mar 26 18:56:59 2008
@@ -14,9 +14,11 @@
FRAGMENT:
for my $f ( Jifty->web->request->fragments ) {
- # Set up the region stack
+ # Set up the form if need be
+ Jifty->web->form->_init;
Jifty->web->form->is_open(1) if $f->in_form;
+ # Set up the region stack
local Jifty->web->{'region_stack'} = [];
my @regions;
do {
@@ -60,8 +62,8 @@
$writer->cdataElement( "content", Jifty->web->current_region->as_string );
$writer->endTag();
+ # Clean up region stack and form
Jifty->web->current_region->exit while Jifty->web->current_region;
-
Jifty->web->form->is_open(0);
}
More information about the Jifty-commit
mailing list