diff --git a/control/HTTPResponse.php b/control/HTTPResponse.php index d0fae6104..ced034f38 100644 --- a/control/HTTPResponse.php +++ b/control/HTTPResponse.php @@ -244,7 +244,7 @@ class SS_HTTPResponse { echo <<Redirecting to {$title}

-"; EOT diff --git a/dev/JSTestRunner.php b/dev/JSTestRunner.php index cf92c9f56..ac92a1216 100644 --- a/dev/JSTestRunner.php +++ b/dev/JSTestRunner.php @@ -12,9 +12,9 @@ * jQuery - Validation Test Suite * - * - * * - + + diff --git a/javascript/tree/README.md b/javascript/tree/README.md index ecadea00e..be06ed195 100644 --- a/javascript/tree/README.md +++ b/javascript/tree/README.md @@ -16,7 +16,7 @@ The first thing to do is include the appropriate JavaScript and CSS files: - + 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"`. diff --git a/security/CMSMemberLoginForm.php b/security/CMSMemberLoginForm.php index 86c77f30a..379239421 100644 --- a/security/CMSMemberLoginForm.php +++ b/security/CMSMemberLoginForm.php @@ -137,7 +137,7 @@ class CMSMemberLoginForm extends LoginForm { $message - diff --git a/security/CMSSecurity.php b/security/CMSSecurity.php index c4720c238..64e1da26e 100644 --- a/security/CMSSecurity.php +++ b/security/CMSSecurity.php @@ -115,7 +115,7 @@ class CMSSecurity extends Security { $message - diff --git a/tests/core/ConvertTest.php b/tests/core/ConvertTest.php index d30e4efdc..d0f25548d 100644 --- a/tests/core/ConvertTest.php +++ b/tests/core/ConvertTest.php @@ -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 = ''; + $val3 = ''; $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 = ''; $this->assertEquals('', Convert::html2raw($val5), 'Multiline script tags are completely removed'); diff --git a/tests/forms/RequirementsTest.php b/tests/forms/RequirementsTest.php index 2b1505f75..6bc08d362 100644 --- a/tests/forms/RequirementsTest.php +++ b/tests/forms/RequirementsTest.php @@ -457,7 +457,7 @@ class RequirementsTest extends SapphireTest { $backend->javascript($src); $html = $backend->includeInHTML(false, $template); $this->assertEquals('' - . '

more content

', $html); + . '

more content

', $html); } public function testForceJsToBottom() { @@ -470,12 +470,12 @@ class RequirementsTest extends SapphireTest { $template = '
My header

Body

'; // The expected outputs - $JsInHead = "\n
My header

Body

"; - $JsInBody = "
My header

Body

"; $JsAtEnd = "
My header

Body

"; + . "type=\"application/javascript\" src=\"http://www.mydomain.com/test.js\">"; // Test if the script is before the head tag, not before the body. diff --git a/tests/javascript/TreeDropDownField/TreeDropdownField.html b/tests/javascript/TreeDropDownField/TreeDropdownField.html index bc54c0404..8083c0332 100644 --- a/tests/javascript/TreeDropDownField/TreeDropdownField.html +++ b/tests/javascript/TreeDropDownField/TreeDropdownField.html @@ -4,25 +4,25 @@ Jasmine Test Runner - - - - - - + + + + + + - - - - + + + + - + - diff --git a/tests/javascript/bananas/bananas.html b/tests/javascript/bananas/bananas.html index 72aff9523..16f2256b2 100644 --- a/tests/javascript/bananas/bananas.html +++ b/tests/javascript/bananas/bananas.html @@ -5,10 +5,10 @@ - - + + - - diff --git a/tests/javascript/i18nTest.html b/tests/javascript/i18nTest.html index 581abc2cc..a53c8b631 100644 --- a/tests/javascript/i18nTest.html +++ b/tests/javascript/i18nTest.html @@ -54,7 +54,7 @@ - +

i18nTest

diff --git a/view/Requirements.php b/view/Requirements.php index 1acbb27e0..dfeba17bd 100644 --- a/view/Requirements.php +++ b/view/Requirements.php @@ -1121,13 +1121,13 @@ class Requirements_Backend foreach($this->getJavascript() as $file) { $path = Convert::raw2xml($this->pathForFile($file)); if($path) { - $jsRequirements .= "\n"; + $jsRequirements .= "\n"; } } // Add all inline JavaScript *after* including external files they might rely on foreach($this->getCustomScripts() as $script) { - $jsRequirements .= "\n"; }