tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replaced obsolete mime types

This commit is contained in:
assertchris 2016-01-24 18:12:45 +13:00
parent 612772728e
commit c66f973fce
12 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
control/HTTPResponse.php
View File

@ -244,7 +244,7 @@ class SS_HTTPResponse {
echo <<<EOT
<p>Redirecting to <a href="{$urlATT}" title="Click this link if your browser does not redirect you">{$title}</a></p>
<meta http-equiv="refresh" content="1; url={$urlATT}" />
<script type="text/javascript">setTimeout(function(){
<script type="application/javascript">setTimeout(function(){
window.location.href = "{$urlJS}";
}, 50);</script>";
EOT

4
dev/JSTestRunner.php
View File

@ -12,9 +12,9 @@
* <title>jQuery - Validation Test Suite</title>
* <link rel="Stylesheet" media="screen"
* href="thirdparty/jquery-validate/test/qunit/qunit.css" />
* <script type="text/javascript"
* <script type="application/javascript"
* src="thirdparty/jquery-validate/lib/jquery.js"></script>
* <script type="text/javascript"
* <script type="application/javascript"
* src="thirdparty/jquery-validate/test/qunit/qunit.js"></script>
* <script>
* $(document).ready(function(){

4
dev/install/config-form.html
View File

@ -6,8 +6,8 @@
<head>
<title>SilverStripe CMS / Framework Installation</title>
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<script type="text/javascript" src="<?php echo FRAMEWORK_NAME; ?>/thirdparty/jquery/jquery.js"></script>
<script type="text/javascript" src="<?php echo FRAMEWORK_NAME; ?>/dev/install/install.js"></script>
<script type="application/javascript" src="<?php echo FRAMEWORK_NAME; ?>/thirdparty/jquery/jquery.js"></script>
<script type="application/javascript" src="<?php echo FRAMEWORK_NAME; ?>/dev/install/install.js"></script>
<link rel="stylesheet" type="text/css" href="<?php echo FRAMEWORK_NAME; ?>/dev/install/css/install.css">
<link rel="shortcut icon" href="favicon.ico">
</head>

2
javascript/tree/README.md
View File

@ -16,7 +16,7 @@ The first thing to do is include the appropriate JavaScript and CSS files:
<code html>
<link rel="stylesheet" type="text/css" media="all" href="tree.css" />
<script type="text/javascript" src="tree.js"></script>
<script type="application/javascript" src="tree.js"></script>
</code>
Then, create the HTML for you tree. This is basically a nested set of bullet pointed links. The "tree" class at the top is what the script will look for. Note that you can make a tree node closed to begin with by adding `class="closed"`.

2
security/CMSMemberLoginForm.php
View File

@ -137,7 +137,7 @@ class CMSMemberLoginForm extends LoginForm {
<!DOCTYPE html>
<html><body>
$message
<script type="text/javascript">
<script type="application/javascript">
setTimeout(function(){top.location.href = "$changePasswordURLJS";}, 0);
</script>
</body></html>

2
security/CMSSecurity.php
View File

@ -115,7 +115,7 @@ class CMSSecurity extends Security {
<!DOCTYPE html>
<html><body>
$message
<script type="text/javascript">
<script type="application/javascript">
setTimeout(function(){top.location.href = "$loginURLJS";}, 0);
</script>
</body></html>

4
tests/core/ConvertTest.php
View File

@ -52,7 +52,7 @@ class ConvertTest extends SapphireTest {
$this->assertEquals('This has a *strong tag with attributes*.', Convert::html2raw($val2),
'Strong tags with attributes are replaced with asterisks');
$val3 = '<script type="text/javascript">Some really nasty javascript here</script>';
$val3 = '<script type="application/javascript">Some really nasty javascript here</script>';
$this->assertEquals('', Convert::html2raw($val3),
'Script tags are completely removed');
@ -60,7 +60,7 @@ class ConvertTest extends SapphireTest {
$this->assertEquals('', Convert::html2raw($val4),
'Style tags are completely removed');
$val5 = '<script type="text/javascript">Some really nasty
$val5 = '<script type="application/javascript">Some really nasty
multiline javascript here</script>';
$this->assertEquals('', Convert::html2raw($val5),
'Multiline script tags are completely removed');

8
tests/forms/RequirementsTest.php
View File

@ -457,7 +457,7 @@ class RequirementsTest extends SapphireTest {
$backend->javascript($src);
$html = $backend->includeInHTML(false, $template);
$this->assertEquals('<html><head></head><body><!--<script>alert("commented out");</script>-->'
. '<h1>more content</h1><script type="text/javascript" src="' . $urlSrc . '"></script></body></html>', $html);
. '<h1>more content</h1><script type="application/javascript" src="' . $urlSrc . '"></script></body></html>', $html);
}
public function testForceJsToBottom() {
@ -470,12 +470,12 @@ class RequirementsTest extends SapphireTest {
$template = '<html><head></head><body><header>My header</header><p>Body<script></script></p></body></html>';
// The expected outputs
$JsInHead = "<html><head><script type=\"text/javascript\" src=\"http://www.mydomain.com/test.js\">"
$JsInHead = "<html><head><script type=\"application/javascript\" src=\"http://www.mydomain.com/test.js\">"
. "</script>\n</head><body><header>My header</header><p>Body<script></script></p></body></html>";
$JsInBody = "<html><head></head><body><header>My header</header><p>Body<script type=\"text/javascript\""
$JsInBody = "<html><head></head><body><header>My header</header><p>Body<script type=\"application/javascript\""
. " src=\"http://www.mydomain.com/test.js\"></script><script></script></p></body></html>";
$JsAtEnd = "<html><head></head><body><header>My header</header><p>Body<script></script></p><script "
. "type=\"text/javascript\" src=\"http://www.mydomain.com/test.js\"></script></body></html>";
. "type=\"application/javascript\" src=\"http://www.mydomain.com/test.js\"></script></body></html>";
// Test if the script is before the head tag, not before the body.

24
tests/javascript/TreeDropDownField/TreeDropdownField.html
View File

@ -4,25 +4,25 @@
<head>
<title>Jasmine Test Runner</title>
<link rel="stylesheet" type="text/css" href="../../../thirdparty/jasmine/lib/jasmine.css">
<script type="text/javascript" src="../../../thirdparty/jasmine/lib/jasmine.js"></script>
<script type="text/javascript" src="../../../thirdparty/jasmine/lib/jasmine-html.js"></script>
<script type="text/javascript" src="../../../thirdparty/jasmine-jquery/lib/jasmine-jquery.js"></script>
<script type="text/javascript" src="../../../thirdparty/jasmine-dom/lib/jasmine-dom-fixtures.js"></script>
<script type="text/javascript" src="../../../thirdparty/jasmine-ajax/lib/mock-ajax.js"></script>
<script type="text/javascript" src="../../../thirdparty/jasmine-ajax/lib/spec-helper.js"></script>
<script type="application/javascript" src="../../../thirdparty/jasmine/lib/jasmine.js"></script>
<script type="application/javascript" src="../../../thirdparty/jasmine/lib/jasmine-html.js"></script>
<script type="application/javascript" src="../../../thirdparty/jasmine-jquery/lib/jasmine-jquery.js"></script>
<script type="application/javascript" src="../../../thirdparty/jasmine-dom/lib/jasmine-dom-fixtures.js"></script>
<script type="application/javascript" src="../../../thirdparty/jasmine-ajax/lib/mock-ajax.js"></script>
<script type="application/javascript" src="../../../thirdparty/jasmine-ajax/lib/spec-helper.js"></script>
<style type="text/css" href="../../../thirdparty/jstree/themes/default/style.css"></style>
<style type="text/css" href="../../../css/TreeDropdownField.css"></style>
<script type="text/javascript" src="../../../thirdparty/jquery/jquery.js"></script>
<script type="text/javascript" src="../../../thirdparty/jquery-entwine/dist/jquery.entwine-dist.js"></script>
<script type="text/javascript" src="../../../thirdparty/jstree/jquery.jstree.js"></script>
<script type="text/javascript" src="../../../javascript/TreeDropdownField.js"></script>
<script type="application/javascript" src="../../../thirdparty/jquery/jquery.js"></script>
<script type="application/javascript" src="../../../thirdparty/jquery-entwine/dist/jquery.entwine-dist.js"></script>
<script type="application/javascript" src="../../../thirdparty/jstree/jquery.jstree.js"></script>
<script type="application/javascript" src="../../../javascript/TreeDropdownField.js"></script>
<script type="text/javascript" src="TreeDropdownField.js"></script>
<script type="application/javascript" src="TreeDropdownField.js"></script>
</head>
<body>
<script type="text/javascript">
<script type="application/javascript">
jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
jasmine.getEnv().execute();
</script>

8
tests/javascript/bananas/bananas.html
View File

@ -5,10 +5,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<!-- This is the minimal jasmin libraries needed -->
<link rel="stylesheet" type="text/css" href="../../../thirdparty/jasmine/lib/jasmine.css">
<script type="text/javascript" src="../../../thirdparty/jasmine/lib/jasmine.js"></script>
<script type="text/javascript" src="../../../thirdparty/jasmine/lib/jasmine-html.js"></script>
<script type="application/javascript" src="../../../thirdparty/jasmine/lib/jasmine.js"></script>
<script type="application/javascript" src="../../../thirdparty/jasmine/lib/jasmine-html.js"></script>
<script type="text/javascript" >
<script type="application/javascript" >
/**
* This is the javascript under test
*/
@ -36,7 +36,7 @@
</script>
</head>
<body>
<script type="text/javascript">
<script type="application/javascript">
jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
jasmine.getEnv().execute();
</script>

2
tests/javascript/i18nTest.html
View File

@ -54,7 +54,7 @@
</head>
<body>
<script type="text/javascript" src="http://jqueryjs.googlecode.com/svn/trunk/qunit/testrunner.js"></script>
<script type="application/javascript" src="http://jqueryjs.googlecode.com/svn/trunk/qunit/testrunner.js"></script>
<h1>i18nTest</h1>
<h2 id="banner"></h2>
<h2 id="userAgent"></h2>

4
view/Requirements.php
View File

@ -1121,13 +1121,13 @@ class Requirements_Backend
foreach($this->getJavascript() as $file) {
$path = Convert::raw2xml($this->pathForFile($file));
if($path) {
$jsRequirements .= "<script type=\"text/javascript\" src=\"$path\"></script>\n";
$jsRequirements .= "<script type=\"application/javascript\" src=\"$path\"></script>\n";
}
}
// Add all inline JavaScript *after* including external files they might rely on
foreach($this->getCustomScripts() as $script) {
$jsRequirements .= "<script type=\"text/javascript\">\n//<![CDATA[\n";
$jsRequirements .= "<script type=\"application/javascript\">\n//<![CDATA[\n";
$jsRequirements .= "$script\n";
$jsRequirements .= "\n//]]>\n</script>\n";
}