[Jifty-commit] r4373 - 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 14:56:02 EST 2007
Author: sunnavy
Date: Mon Nov 5 14:56:02 2007
New Revision: 4373
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:
we don't want 'extend' in loops, also let out the Element.Methods
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 14:56:02 2007
@@ -1633,6 +1633,7 @@
var content, t, range;
for (position in insertions) {
+ if ( position == 'extend' ) continue;
content = insertions[position];
position = position.toLowerCase();
t = Element._insertionTranslations[position];
@@ -2648,10 +2649,10 @@
return window[klass];
}
-// if (F.ElementExtensions) {
-// copy(Element.Methods, HTMLElement.prototype);
-// copy(Element.Methods.Simulated, HTMLElement.prototype, true);
-// }
+ if (F.ElementExtensions) {
+ copy(Element.Methods, HTMLElement.prototype);
+ copy(Element.Methods.Simulated, HTMLElement.prototype, true);
+ }
if (F.SpecificElementExtensions) {
for (var tag in Element.Methods.ByTag) {
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 14:56:02 2007
@@ -2,7 +2,7 @@
use warnings;
use lib 't/lib';
use Jifty::SubTest;
-use Jifty::Test tests => 10;
+use Jifty::Test tests => 6;
use Jifty::Test::WWW::Selenium;
use utf8;
@@ -18,14 +18,15 @@
like( $html, qr/yatta/, 'replace content correctly' );
unlike( $html, qr{args:/content1\.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' );
+# 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->stop;
More information about the Jifty-commit
mailing list