From 4ca3d1dc9487be2dadd1722823f75f7146bd7a60 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Tue, 2 Aug 2016 18:48:56 +1200
Subject: [PATCH] API Allow custom 'type' option for scripts Fixes #5829

---
 tests/forms/RequirementsTest.php | 22 ++++++++++++++++++++++
 view/Requirements.php            | 14 +++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/tests/forms/RequirementsTest.php b/tests/forms/RequirementsTest.php
index f9f62a4f9..d39ece8f2 100644
--- a/tests/forms/RequirementsTest.php
+++ b/tests/forms/RequirementsTest.php
@@ -141,6 +141,28 @@ class RequirementsTest extends SapphireTest {
         );
     }
 
+    public function testCustomType() {
+		/** @var Requirements_Backend $backend */
+		$backend = Injector::inst()->create('Requirements_Backend');
+		$basePath = $this->getCurrentRelativePath();
+		$this->setupRequirements($backend);
+
+		// require files normally (e.g. called from a FormField instance)
+		$backend->javascript($basePath . '/RequirementsTest_a.js', [
+			'type' => 'application/json'
+		]);
+		$backend->javascript($basePath . '/RequirementsTest_b.js');
+		$result = $backend->includeInHTML(self::$html_template);
+		$this->assertContains(
+			'<script type="application/json" src="/framework/tests/forms/RequirementsTest_a.js',
+			$result
+		);
+		$this->assertContains(
+			'<script type="application/javascript" src="/framework/tests/forms/RequirementsTest_b.js',
+			$result
+		);
+	}
+
 	public function testCombinedJavascript() {
 		/** @var Requirements_Backend $backend */
 		$backend = Injector::inst()->create('Requirements_Backend');
diff --git a/view/Requirements.php b/view/Requirements.php
index a1e55c971..5635ddc48 100644
--- a/view/Requirements.php
+++ b/view/Requirements.php
@@ -828,8 +828,18 @@ class Requirements_Backend
 	 * - 'provides' : List of scripts files included in this file
 	 * - 'async' : Boolean value to set async attribute to script tag
 	 * - 'defer' : Boolean value to set defer attribute to script tag
+	 * - 'type' : Override script type= value.
 	 */
 	public function javascript($file, $options = array()) {
+		// Get type
+		$type = null;
+		if (isset($this->javascript[$file]['type'])) {
+			$type = $this->javascript[$file]['type'];
+		}
+		if (isset($options['type'])) {
+			$type = $options['type'];
+		}
+
 	    // make sure that async/defer is set if it is set once even if file is included multiple times
         $async = (
             isset($options['async']) && isset($options['async']) == true
@@ -850,6 +860,7 @@ class Requirements_Backend
         $this->javascript[$file] = array(
             'async' => $async,
             'defer' => $defer,
+			'type' => $type,
         );
 
 		// Record scripts included in this file
@@ -1179,9 +1190,10 @@ class Requirements_Backend
 		foreach($this->getJavascript() as $file => $attributes) {
 		    $async = (isset($attributes['async']) && $attributes['async'] == true) ? " async" : "";
 		    $defer = (isset($attributes['defer']) && $attributes['defer'] == true) ? " defer" : "";
+			$type = Convert::raw2att(isset($attributes['type']) ? $attributes['type'] : "application/javascript");
 			$path = Convert::raw2att($this->pathForFile($file));
 			if($path) {
-				$jsRequirements .= "<script type=\"application/javascript\" src=\"$path\"{$async}{$defer}></script>";
+				$jsRequirements .= "<script type=\"{$type}\" src=\"{$path}\"{$async}{$defer}></script>";
 			}
 		}