Return-Path: Delivered-To: apmail-tapestry-commits-archive@locus.apache.org Received: (qmail 91172 invoked from network); 22 Sep 2007 23:08:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Sep 2007 23:08:08 -0000 Received: (qmail 4922 invoked by uid 500); 22 Sep 2007 23:07:59 -0000 Delivered-To: apmail-tapestry-commits-archive@tapestry.apache.org Received: (qmail 4895 invoked by uid 500); 22 Sep 2007 23:07:58 -0000 Mailing-List: contact commits-help@tapestry.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tapestry.apache.org Delivered-To: mailing list commits@tapestry.apache.org Received: (qmail 4886 invoked by uid 99); 22 Sep 2007 23:07:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Sep 2007 16:07:58 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Sep 2007 23:10:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A98E71A9832; Sat, 22 Sep 2007 16:07:44 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r578522 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/java/org/apache/tapestry/internal/services/DocumentScriptBuilderImpl.java test/resources/org/apache/tapestry/internal/services/add_script.txt Date: Sat, 22 Sep 2007 23:07:44 -0000 To: commits@tapestry.apache.org From: hlship@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070922230744.A98E71A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hlship Date: Sat Sep 22 16:07:43 2007 New Revision: 578522 URL: http://svn.apache.org/viewvc?rev=578522&view=rev Log: TAPESTRY-1625: T5 Form Component Generates Script Tag With Deprecated Language Attribute Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DocumentScriptBuilderImpl.java tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/internal/services/add_script.txt Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DocumentScriptBuilderImpl.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DocumentScriptBuilderImpl.java?rev=578522&r1=578521&r2=578522&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DocumentScriptBuilderImpl.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DocumentScriptBuilderImpl.java Sat Sep 22 16:07:43 2007 @@ -30,16 +30,14 @@ public void addScriptLink(String scriptURL) { - if (_scripts.contains(scriptURL)) - return; + if (_scripts.contains(scriptURL)) return; _scripts.add(scriptURL); } public void addScript(String script) { - if (InternalUtils.isBlank(script)) - return; + if (InternalUtils.isBlank(script)) return; _scriptBlock.append(script); _scriptBlock.append("\n"); @@ -49,8 +47,7 @@ { Element body = document.find("html/body"); - if (body == null) - return; + if (body == null) return; for (int i = 0; i < _scripts.size(); i++) { @@ -61,17 +58,17 @@ if (_scriptBlock.length() > 0) { - Element e = body.element("script", "type", "text/javascript", "language", "javascript"); + Element e = body.element("script", "type", "text/javascript"); e.raw("\n\n"); } Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/internal/services/add_script.txt URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/internal/services/add_script.txt?rev=578522&r1=578521&r2=578522&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/internal/services/add_script.txt (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry/internal/services/add_script.txt Sat Sep 22 16:07:43 2007 @@ -1,4 +1,4 @@ -

Ready to be updated with scripts.