From 2fcddcc0c1c9d567e7a0cbd032d7cc3a94b3ec96 Mon Sep 17 00:00:00 2001 From: droplet Date: Tue, 17 Jan 2012 04:02:13 +0800 Subject: [PATCH] remove type=text/javascript --- core/includes/common.inc | 3 --- core/modules/filter/filter.test | 16 ++++++++-------- core/modules/openid/openid.inc | 2 +- core/modules/simpletest/tests/common.test | 16 ++++++++-------- core/modules/simpletest/tests/mail.test | 2 +- core/modules/system/system.test | 4 ++-- 6 files changed, 20 insertions(+), 23 deletions(-) diff --git a/core/includes/common.inc b/core/includes/common.inc index 2f14740..eda5430 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -4210,9 +4210,6 @@ function drupal_pre_render_scripts($elements) { '#type' => 'html_tag', '#tag' => 'script', '#value' => '', - '#attributes' => array( - 'type' => 'text/javascript', - ), ); // Loop through each group. diff --git a/core/modules/filter/filter.test b/core/modules/filter/filter.test index 2bafd47..dd15147 100644 --- a/core/modules/filter/filter.test +++ b/core/modules/filter/filter.test @@ -1617,15 +1617,15 @@ www.example.com with a newline in comments --> $f = _filter_htmlcorrector('

دروبال'); $this->assertEqual($f, '

دروبال

', t('HTML corrector -- Encoding is correctly kept.')); - $f = _filter_htmlcorrector(''); - $this->assertEqual($f, ''); + $this->assertEqual($f, '', t('HTML corrector -- CDATA added to script element')); - $f = _filter_htmlcorrector('

'); - $this->assertEqual($f, '

'); + $this->assertEqual($f, '

'); - $this->assertEqual($filtered_data, '

' . "\n"; + $expected_1 = ""; + $expected_2 = "\n" . '' . "\n"; $this->assertTrue(strpos($javascript, $expected_1) > 0, t('Rendered JavaScript within downlevel-hidden conditional comments.')); $this->assertTrue(strpos($javascript, $expected_2) > 0, t('Rendered JavaScript within downlevel-revealed conditional comments.')); @@ -1367,10 +1367,10 @@ class JavaScriptTestCase extends DrupalWebTestCase { drupal_add_js('core/misc/batch.js', array('every_page' => TRUE)); $javascript = drupal_get_js(); $expected = implode("\n", array( - '', - '', - '', - '', + '', + '', + '', + '', )); $this->assertTrue(strpos($javascript, $expected) > 0, t('Unaggregated JavaScript is added in the expected group order.')); @@ -1385,8 +1385,8 @@ class JavaScriptTestCase extends DrupalWebTestCase { $js_items = drupal_add_js(); $javascript = drupal_get_js(); $expected = implode("\n", array( - '', - '', + '', + '', )); $this->assertTrue(strpos($javascript, $expected) > 0, t('JavaScript is aggregated in the expected groups and order.')); } diff --git a/core/modules/simpletest/tests/mail.test b/core/modules/simpletest/tests/mail.test index d970b27..18d0eec 100644 --- a/core/modules/simpletest/tests/mail.test +++ b/core/modules/simpletest/tests/mail.test @@ -226,7 +226,7 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase { // Tests some unsupported HTML tags. 'Drupal' => "Drupal\n", // @todo Perhaps the contents of ' => "Drupal\n", + '' => "Drupal\n", // A couple of tests for Unicode characters. 'I will be back…' => "I /will/ be back…\n", 'FrançAIS is ÜBER-åwesome' => "FrançAIS is ÜBER-åwesome\n", diff --git a/core/modules/system/system.test b/core/modules/system/system.test index 36b7f0c..8340c93 100644 --- a/core/modules/system/system.test +++ b/core/modules/system/system.test @@ -1355,10 +1355,10 @@ class PageTitleFiltering extends DrupalWebTestCase { */ function testTitleXSS() { // Set some title with JavaScript and HTML chars to escape. - $title = ' & < > " \' '; + $title = ' & < > " \' '; $title_filtered = check_plain($title); - $slogan = ''; + $slogan = ''; $slogan_filtered = filter_xss_admin($slogan); // Activate needed appearance settings. -- 1.7.8.2