[Jifty-commit] r5817 - in jifty/trunk: lib/Jifty/Plugin lib/Jifty/Plugin/OpenID lib/Jifty/Script lib/Jifty/Test/WWW plugins/Multipage share/plugins/Jifty/Plugin/SinglePage/web/static/js/singlepage t/TestApp-JiftyJS/lib/TestApp/JiftyJS
Jifty commits
jifty-commit at lists.jifty.org
Tue Sep 9 11:01:50 EDT 2008
Author: clkao
Date: Tue Sep 9 11:01:35 2008
New Revision: 5817
Modified:
jifty/trunk/lib/Jifty/Plugin/IEFixes.pm
jifty/trunk/lib/Jifty/Plugin/OpenID/Dispatcher.pm
jifty/trunk/lib/Jifty/Script/Help.pm
jifty/trunk/lib/Jifty/Test/WWW/Selenium.pm
jifty/trunk/lib/Jifty/TestServer.pm
jifty/trunk/plugins/Multipage/META.yml
jifty/trunk/share/plugins/Jifty/Plugin/SinglePage/web/static/js/singlepage/spa.js
jifty/trunk/t/TestApp-JiftyJS/lib/TestApp/JiftyJS/View.pm
Log:
Fix Jifty::Script::Help.
Modified: jifty/trunk/lib/Jifty/Plugin/IEFixes.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/IEFixes.pm (original)
+++ jifty/trunk/lib/Jifty/Plugin/IEFixes.pm Tue Sep 9 11:01:35 2008
@@ -46,7 +46,7 @@
my @base_js = @{ $opt{ js } || ['IE7'] };
Jifty::Web->add_trigger(
- name => 'after_include_javascript',
+ name => 'include_javascript',
callback => sub {
Jifty->web->out(qq{<!--[if lt IE 7]>\n});
if ($self->use_external_ie7js) {
Modified: jifty/trunk/lib/Jifty/Plugin/OpenID/Dispatcher.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OpenID/Dispatcher.pm (original)
+++ jifty/trunk/lib/Jifty/Plugin/OpenID/Dispatcher.pm Tue Sep 9 11:01:35 2008
@@ -14,6 +14,14 @@
=cut
+sub _continuation_or_redirect {
+ if(Jifty->web->request->continuation) {
+ Jifty->web->request->continuation->call;
+ } else {
+ redirect @_;
+ }
+}
+
before qr'^/(?:openid/link)' => run {
tangent('/openid/login') unless (Jifty->web->current_user->id)
};
@@ -43,14 +51,13 @@
if ( not $ret ) {
$result->error(_("It looks like someone is already using that OpenID."));
- redirect '/openid/link';
}
else {
$user->user_object->link_to_openid( $openid );
$result->message(_("The OpenID '$openid' has been linked to your account."));
}
}
- redirect '/';
+ _continuation_or_redirect('/openid/link');
};
on 'openid/verify_and_login' => run {
@@ -70,11 +77,7 @@
Jifty->web->session->expires( undef );
Jifty->web->session->set_cookie;
- if(Jifty->web->request->continuation) {
- Jifty->web->request->continuation->call;
- } else {
- redirect '/';
- }
+ _continuation_or_redirect('/');
}
else {
# User needs to create account still
@@ -90,11 +93,7 @@
}
}
else {
- if(Jifty->web->request->continuation) {
- Jifty->web->request->continuation->call;
- } else {
- redirect '/openid/login';
- }
+ _continuation_or_redirect('/openid/login');
}
};
Modified: jifty/trunk/lib/Jifty/Script/Help.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/Help.pm (original)
+++ jifty/trunk/lib/Jifty/Script/Help.pm Tue Sep 9 11:01:35 2008
@@ -1,6 +1,6 @@
package Jifty::Script::Help;
use strict;
-use base qw( Jifty::Script::Help );
+use base qw( App::CLI::Command::Help Jifty::Script );
use File::Find qw(find);
sub help_base {
Modified: jifty/trunk/lib/Jifty/Test/WWW/Selenium.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Test/WWW/Selenium.pm (original)
+++ jifty/trunk/lib/Jifty/Test/WWW/Selenium.pm Tue Sep 9 11:01:35 2008
@@ -103,6 +103,7 @@
die if $pid == -1;
if ($pid) {
push @cleanup, $pid;
+ warn "==> $pid for cleanup";
return ('localhost', 4444);
}
else {
@@ -126,6 +127,7 @@
}
END {
+ warn "to kill $_" for @cleanup;
kill(15, -$_) for @cleanup;
}
Modified: jifty/trunk/lib/Jifty/TestServer.pm
==============================================================================
--- jifty/trunk/lib/Jifty/TestServer.pm (original)
+++ jifty/trunk/lib/Jifty/TestServer.pm Tue Sep 9 11:01:35 2008
@@ -79,7 +79,7 @@
my @extra;
if (my $profile_file = $ENV{JIFTY_TESTSERVER_PROFILE}) {
- push @extra, '-d:DProf';
+ push @extra, '-d:NYTProf';
$ENV{"PERL_DPROF_OUT_FILE_NAME"} = $profile_file;
}
if ($ENV{JIFTY_TESTSERVER_NAMED_ACCESSOR}) {
Modified: jifty/trunk/plugins/Multipage/META.yml
==============================================================================
--- jifty/trunk/plugins/Multipage/META.yml (original)
+++ jifty/trunk/plugins/Multipage/META.yml Tue Sep 9 11:01:35 2008
@@ -1,7 +1,7 @@
---
author: ~
distribution_type: module
-generated_by: Module::Install version 0.68
+generated_by: Module::Install version 0.70
license: unknown
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.3.html
Modified: jifty/trunk/share/plugins/Jifty/Plugin/SinglePage/web/static/js/singlepage/spa.js
==============================================================================
--- jifty/trunk/share/plugins/Jifty/Plugin/SinglePage/web/static/js/singlepage/spa.js (original)
+++ jifty/trunk/share/plugins/Jifty/Plugin/SinglePage/web/static/js/singlepage/spa.js Tue Sep 9 11:01:35 2008
@@ -63,7 +63,13 @@
var args = $.extend({}, hiddens, buttons, inputs);
- return Jifty.update( {'continuation':{},'actions':null,'fragments':[{'mode':'Replace','args':args,'region':'__page','path': submit_to}]}, elt );
+ var ret;
+ try { ret = Jifty.update( {'continuation':{},'actions':null,'fragments':[{'mode':'Replace','args':args,'region':'__page','path': submit_to}]}, elt ); }
+ catch (e) {
+ alert(e);
+ }
+
+ return ret;
}
};
Modified: jifty/trunk/t/TestApp-JiftyJS/lib/TestApp/JiftyJS/View.pm
==============================================================================
--- jifty/trunk/t/TestApp-JiftyJS/lib/TestApp/JiftyJS/View.pm (original)
+++ jifty/trunk/t/TestApp-JiftyJS/lib/TestApp/JiftyJS/View.pm Tue Sep 9 11:01:35 2008
@@ -84,6 +84,24 @@
p { "Region Two" }
};
+template 'region_many' => sub {
+
+ p { 'many regions' };
+
+ hyperlink(
+ id => 'region_many',
+ label => "replace me",
+ onclick => {
+ replace_with => 'region_many'
+ }
+ );
+
+ render_region( name => "content$_", path => "/region$_" )
+ for 1..2;
+
+};
+
+
template '/region/multiupdate' => page {
hyperlink(
id => 'update',
More information about the Jifty-commit
mailing list