[Jifty-commit] jifty branch, jquery_with_ui, updated. d2b67f5c0f10ec6a6605240f7bd003f29863f566

Jifty commits jifty-commit at lists.jifty.org
Wed Feb 3 04:40:20 EST 2010


The branch, jquery_with_ui has been updated
       via  d2b67f5c0f10ec6a6605240f7bd003f29863f566 (commit)
       via  b11e735f9eb22513ff97801336e2bcbc288507e1 (commit)
      from  28ad2e04900f611be0298f6f96c18fa057d41584 (commit)

Summary of changes:
 .../share/web/static/js-test/01.behaviour.html     |    2 +-
 .../share/web/static/js-test/02.action.html        |    2 +-
 .../share/web/static/js-test/02.cssquery.html      |    2 +-
 .../share/web/static/js-test/03.simple.html        |    2 +-
 .../lib/TestApp/Uploads/Action/Uploads.pm          |    3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit b11e735f9eb22513ff97801336e2bcbc288507e1
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Feb 3 17:38:35 2010 +0800

    tiny tweak

diff --git a/t/TestApp-Uploads/lib/TestApp/Uploads/Action/Uploads.pm b/t/TestApp-Uploads/lib/TestApp/Uploads/Action/Uploads.pm
index d517b0d..81e7adc 100644
--- a/t/TestApp-Uploads/lib/TestApp/Uploads/Action/Uploads.pm
+++ b/t/TestApp-Uploads/lib/TestApp/Uploads/Action/Uploads.pm
@@ -2,7 +2,6 @@ package TestApp::Uploads::Action::Uploads;
 use strict;
 use warnings;
 use base 'Jifty::Action';
-use UNIVERSAL::isa;
 
 use Jifty::Param::Schema;
 use Jifty::Action schema {
@@ -17,7 +16,7 @@ sub take_action {
     my $attachments = $self->argument_value('content');
     $self->result->content(files => {});
     for my $att ( ref $attachments eq 'ARRAY' ? @$attachments : $attachments ) {
-        next unless $att && $att->isa('Jifty::Web::FileUpload');
+        next unless $att && UNIVERSAL::isa($att, 'Jifty::Web::FileUpload');
         $self->result->content('files')->{$att->filename} = $att->content;
     }
     return 1;

commit d2b67f5c0f10ec6a6605240f7bd003f29863f566
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Feb 3 17:39:42 2010 +0800

    fix jquery url in tests

diff --git a/t/TestApp-JiftyJS/share/web/static/js-test/01.behaviour.html b/t/TestApp-JiftyJS/share/web/static/js-test/01.behaviour.html
index 5bba3b8..7e20a4d 100644
--- a/t/TestApp-JiftyJS/share/web/static/js-test/01.behaviour.html
+++ b/t/TestApp-JiftyJS/share/web/static/js-test/01.behaviour.html
@@ -6,7 +6,7 @@
 <script type="text/javascript" src="lib/Test/Builder.js" charset="UTF-8"></script>
 <script type="text/javascript" src="lib/Test/More.js" charset="UTF-8"></script>
 
-<script type="text/javascript" src="/static/js/jquery-1.2.6.js" charset="UTF-8"></script>
+<script type="text/javascript" src="/static/js/jquery-1.4.1.js" charset="UTF-8"></script>
 <script type="text/javascript" src="/static/js/jquery_noconflict.js" charset="UTF-8"></script>
 <script type="text/javascript" src="/static/js/behaviour.js" charset="UTF-8"></script>
 <script type="text/javascript">
diff --git a/t/TestApp-JiftyJS/share/web/static/js-test/02.action.html b/t/TestApp-JiftyJS/share/web/static/js-test/02.action.html
index 379463c..43bc0b2 100644
--- a/t/TestApp-JiftyJS/share/web/static/js-test/02.action.html
+++ b/t/TestApp-JiftyJS/share/web/static/js-test/02.action.html
@@ -4,7 +4,7 @@
     <script type="text/javascript" src="/static/js-test/lib/JSAN.js" charset="UTF-8"></script>
     <script type="text/javascript" src="lib/Test/Builder.js" charset="UTF-8"></script>
     <script type="text/javascript" src="lib/Test/More.js" charset="UTF-8"></script>
-    <script type="text/javascript" src="/static/js/jquery-1.2.6.js" charset="UTF-8"></script>
+    <script type="text/javascript" src="/static/js/jquery-1.4.1.js" charset="UTF-8"></script>
     <script type="text/javascript" src="/static/js/jquery_noconflict.js" charset="UTF-8"></script>
     <script type="text/javascript" src="/static/js/behaviour.js" charset="UTF-8"></script>
     <script type="text/javascript" src="/static/js/jifty.js" charset="UTF-8"></script>
diff --git a/t/TestApp-JiftyJS/share/web/static/js-test/02.cssquery.html b/t/TestApp-JiftyJS/share/web/static/js-test/02.cssquery.html
index a462089..4672a75 100644
--- a/t/TestApp-JiftyJS/share/web/static/js-test/02.cssquery.html
+++ b/t/TestApp-JiftyJS/share/web/static/js-test/02.cssquery.html
@@ -28,7 +28,7 @@
       #test3-10 a[title*="is a"] {background-color: yellow;}
       #test3-11 a[title$="link"] {background-color: yellow;}
     </style>
-    <script type="text/javascript" src="/static/js/jquery-1.2.6.js" charset="UTF-8"></script>
+    <script type="text/javascript" src="/static/js/jquery-1.4.1.js" charset="UTF-8"></script>
     <script type="text/javascript" src="/static/js/jquery_noconflict.js" charset="UTF-8"></script>
     <script type="text/javascript" src="/static/js/cssQuery-jquery.js" charset="UTF-8"></script>
 
diff --git a/t/TestApp-JiftyJS/share/web/static/js-test/03.simple.html b/t/TestApp-JiftyJS/share/web/static/js-test/03.simple.html
index b58ea57..a9e3e66 100644
--- a/t/TestApp-JiftyJS/share/web/static/js-test/03.simple.html
+++ b/t/TestApp-JiftyJS/share/web/static/js-test/03.simple.html
@@ -4,7 +4,7 @@
     <script type="text/javascript" src="/static/js/jsan/JSAN.js" charset="UTF-8"></script>
     <script type="text/javascript" src="lib/Test/Builder.js" charset="UTF-8"></script>
     <script type="text/javascript" src="lib/Test/More.js" charset="UTF-8"></script>
-    <script type="text/javascript" src="/static/js/jquery-1.2.6.js" charset="UTF-8"></script>
+    <script type="text/javascript" src="/static/js/jquery-1.4.1.js" charset="UTF-8"></script>
     <script type="text/javascript" src="/static/js/jquery_noconflict.js" charset="UTF-8"></script>
     <script type="text/javascript" src="/static/js/behaviour.js" charset="UTF-8"></script>
     <script type="text/javascript" src="/static/js/bps_util.js" charset="UTF-8"></script>

-----------------------------------------------------------------------


More information about the Jifty-commit mailing list