[Jifty-commit] r4374 - in jifty/branches/prototype-1.6:
share/web/static/js
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Mon Nov 5 15:18:23 EST 2007
Author: sunnavy
Date: Mon Nov 5 15:18:17 2007
New Revision: 4374
Modified:
jifty/branches/prototype-1.6/share/web/static/js/prototype.js
jifty/branches/prototype-1.6/t/TestApp-Plugin-OnClick/t/onclick.t
Log:
keep our update definition for a while
Modified: jifty/branches/prototype-1.6/share/web/static/js/prototype.js
==============================================================================
--- jifty/branches/prototype-1.6/share/web/static/js/prototype.js (original)
+++ jifty/branches/prototype-1.6/share/web/static/js/prototype.js Mon Nov 5 15:18:17 2007
@@ -2618,7 +2618,8 @@
onlyIfAbsent = onlyIfAbsent || false;
for (var property in methods) {
var value = methods[property];
- if (!Object.isFunction(value)) continue;
+ // don't copy update, temporarily
+ if (!Object.isFunction(value) || property == 'update') continue;
if (!onlyIfAbsent || !(property in destination))
destination[property] = value.methodize();
}
Modified: jifty/branches/prototype-1.6/t/TestApp-Plugin-OnClick/t/onclick.t
==============================================================================
--- jifty/branches/prototype-1.6/t/TestApp-Plugin-OnClick/t/onclick.t (original)
+++ jifty/branches/prototype-1.6/t/TestApp-Plugin-OnClick/t/onclick.t Mon Nov 5 15:18:17 2007
@@ -2,7 +2,7 @@
use warnings;
use lib 't/lib';
use Jifty::SubTest;
-use Jifty::Test tests => 6;
+use Jifty::Test tests => 10;
use Jifty::Test::WWW::Selenium;
use utf8;
@@ -18,15 +18,14 @@
like( $html, qr/yatta/, 'replace content correctly' );
unlike( $html, qr{args:/content1\.html}, 'replaced by javascript' );
-# no alert any more
-#$sel->click_ok("//a[\@id='original_content']");
-#is( $sel->get_alert,
-# 'please use Jifty.update instead of update.',
-# 'bare update is deprecated'
-#);
-#$html = $sel->get_html_source;
-#like( $html, qr/original content/, 'replace content correctly' );
-#unlike( $html, qr{args:/content\.html}, 'replaced by javascript' );
+$sel->click_ok("//a[\@id='original_content']");
+is( $sel->get_alert,
+ 'please use Jifty.update instead of update.',
+ 'bare update is deprecated'
+);
+$html = $sel->get_html_source;
+like( $html, qr/original content/, 'replace content correctly' );
+unlike( $html, qr{args:/content\.html}, 'replaced by javascript' );
$sel->stop;
More information about the Jifty-commit
mailing list