Permalink
Browse files

Merge branch 'master' into topic-twiggy

  • Loading branch information...
yappo committed Apr 16, 2010
2 parents 171572d + 8a191db commit 2debbb1452729d5a73e817b49fa7ee86a853cdfb
Showing with 22 additions and 2 deletions.
  1. +2 −1 eg/jquery/01_basic.t
  2. +1 −1 eg/jquery/conf.pl
  3. +19 −0 eg/jslib/jquery-1.3.2.min.js
View
@@ -47,6 +47,7 @@ DONE
}
sub include_ex {
- 'http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js',
+# 'http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js',
+ '/jslib/jquery-1.3.2.min.js',
\'jquery-jstapd.js',
}
View
@@ -1,4 +1,4 @@
-return {
+my $config = {
jstapd_prefix => '____jstapd',
apiurl => qr{^/(?!____jstapd(?:__api)|jslib/)},
};

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit 2debbb1

Please sign in to comment.