From a8414a0ecb21a4fb3190a3988992a86140dbea6c Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Tue, 2 Dec 2014 18:22:46 -0800
Subject: [PATCH] Remove unneeded HTML attributes (Google style guide).

---
 blockly_uncompressed.js         | 14 +++---
 build.py                        |  6 +--
 demos/blockfactory/index.html   | 14 +++---
 demos/blockfactory/preview.html |  6 +--
 demos/code/code.js              | 12 ++---
 demos/code/index.html           | 16 +++----
 demos/fixed/index.html          |  6 +--
 demos/generator/index.html      |  8 ++--
 demos/graph/index.html          | 10 ++--
 demos/iframe/frame.html         |  6 +--
 demos/interpreter/index.html    | 10 ++--
 demos/maxBlocks/index.html      |  6 +--
 demos/plane/index.html          |  8 ++--
 demos/plane/plane.js            |  6 +--
 demos/plane/template.soy        | 12 ++---
 demos/realtime/index.html       |  8 ++--
 demos/rtl/index.html            |  6 +--
 demos/storage/index.html        |  8 ++--
 demos/toolbox/index.html        |  6 +--
 tests/generators/index.html     | 84 ++++++++++++++++-----------------
 tests/jsunit/index.html         | 12 ++---
 tests/playground.html           | 80 +++++++++++++++----------------
 22 files changed, 170 insertions(+), 174 deletions(-)

diff --git a/blockly_uncompressed.js b/blockly_uncompressed.js
index f4927cfaa..09d7e6ee8 100644
--- a/blockly_uncompressed.js
+++ b/blockly_uncompressed.js
@@ -528,6 +528,8 @@ goog.addDependency("history/history.js", ['goog.History', 'goog.History.Event',
 goog.addDependency("history/history_test.js", ['goog.HistoryTest'], ['goog.History', 'goog.dispose', 'goog.dom', 'goog.testing.jsunit', 'goog.userAgent']);
 goog.addDependency("history/html5history.js", ['goog.history.Html5History', 'goog.history.Html5History.TokenTransformer'], ['goog.asserts', 'goog.events', 'goog.events.EventTarget', 'goog.events.EventType', 'goog.history.Event']);
 goog.addDependency("history/html5history_test.js", ['goog.history.Html5HistoryTest'], ['goog.history.Html5History', 'goog.testing.MockControl', 'goog.testing.jsunit', 'goog.testing.mockmatchers']);
+goog.addDependency("html/flash.js", ['goog.html.flash'], ['goog.asserts', 'goog.html.SafeHtml']);
+goog.addDependency("html/flash_test.js", ['goog.html.flashTest'], ['goog.html.SafeHtml', 'goog.html.TrustedResourceUrl', 'goog.html.flash', 'goog.string.Const', 'goog.testing.jsunit']);
 goog.addDependency("html/legacyconversions.js", ['goog.html.legacyconversions'], ['goog.html.SafeHtml', 'goog.html.SafeUrl', 'goog.html.TrustedResourceUrl']);
 goog.addDependency("html/legacyconversions_test.js", ['goog.html.legacyconversionsTest'], ['goog.html.SafeHtml', 'goog.html.SafeUrl', 'goog.html.TrustedResourceUrl', 'goog.html.legacyconversions', 'goog.testing.PropertyReplacer', 'goog.testing.jsunit']);
 goog.addDependency("html/safehtml.js", ['goog.html.SafeHtml'], ['goog.array', 'goog.asserts', 'goog.dom.tags', 'goog.html.SafeStyle', 'goog.html.SafeUrl', 'goog.html.TrustedResourceUrl', 'goog.i18n.bidi.Dir', 'goog.i18n.bidi.DirectionalString', 'goog.object', 'goog.string', 'goog.string.Const', 'goog.string.TypedString']);
@@ -1091,8 +1093,8 @@ goog.addDependency("testing/stacktrace.js", ['goog.testing.stacktrace', 'goog.te
 goog.addDependency("testing/stacktrace_test.js", ['goog.testing.stacktraceTest'], ['goog.functions', 'goog.string', 'goog.testing.ExpectedFailures', 'goog.testing.PropertyReplacer', 'goog.testing.StrictMock', 'goog.testing.asserts', 'goog.testing.jsunit', 'goog.testing.stacktrace', 'goog.testing.stacktrace.Frame', 'goog.userAgent']);
 goog.addDependency("testing/strictmock.js", ['goog.testing.StrictMock'], ['goog.array', 'goog.testing.Mock']);
 goog.addDependency("testing/strictmock_test.js", ['goog.testing.StrictMockTest'], ['goog.testing.StrictMock', 'goog.testing.jsunit']);
-goog.addDependency("testing/testcase.js", ['goog.testing.TestCase', 'goog.testing.TestCase.Error', 'goog.testing.TestCase.Order', 'goog.testing.TestCase.Result', 'goog.testing.TestCase.Test'], ['goog.object', 'goog.testing.asserts', 'goog.testing.stacktrace']);
-goog.addDependency("testing/testcase_test.js", ['goog.testing.TestCaseTest'], ['goog.testing.TestCase', 'goog.testing.jsunit']);
+goog.addDependency("testing/testcase.js", ['goog.testing.TestCase', 'goog.testing.TestCase.Error', 'goog.testing.TestCase.Order', 'goog.testing.TestCase.Result', 'goog.testing.TestCase.Test'], ['goog.Promise', 'goog.Thenable', 'goog.object', 'goog.testing.asserts', 'goog.testing.stacktrace']);
+goog.addDependency("testing/testcase_test.js", ['goog.testing.TestCaseTest'], ['goog.Promise', 'goog.testing.TestCase', 'goog.testing.jsunit']);
 goog.addDependency("testing/testqueue.js", ['goog.testing.TestQueue'], []);
 goog.addDependency("testing/testrunner.js", ['goog.testing.TestRunner'], ['goog.testing.TestCase']);
 goog.addDependency("testing/watchers.js", ['goog.testing.watchers'], []);
@@ -1475,7 +1477,7 @@ goog.addDependency("useragent/product_isversion.js", ['goog.userAgent.product.is
 goog.addDependency("useragent/product_test.js", ['goog.userAgent.productTest'], ['goog.array', 'goog.labs.userAgent.util', 'goog.testing.MockUserAgent', 'goog.testing.PropertyReplacer', 'goog.testing.jsunit', 'goog.userAgent', 'goog.userAgent.product', 'goog.userAgent.product.isVersion', 'goog.userAgentTestUtil']);
 goog.addDependency("useragent/useragent.js", ['goog.userAgent'], ['goog.labs.userAgent.browser', 'goog.labs.userAgent.engine', 'goog.labs.userAgent.platform', 'goog.labs.userAgent.util', 'goog.string']);
 goog.addDependency("useragent/useragent_quirks_test.js", ['goog.userAgentQuirksTest'], ['goog.testing.jsunit', 'goog.userAgent']);
-goog.addDependency("useragent/useragent_test.js", ['goog.userAgentTest'], ['goog.array', 'goog.labs.userAgent.testAgents', 'goog.labs.userAgent.util', 'goog.testing.PropertyReplacer', 'goog.testing.jsunit', 'goog.userAgent', 'goog.userAgentTestUtil']);
+goog.addDependency("useragent/useragent_test.js", ['goog.userAgentTest'], ['goog.array', 'goog.labs.userAgent.platform', 'goog.labs.userAgent.testAgents', 'goog.labs.userAgent.util', 'goog.testing.PropertyReplacer', 'goog.testing.jsunit', 'goog.userAgent', 'goog.userAgentTestUtil']);
 goog.addDependency("useragent/useragenttestutil.js", ['goog.userAgentTestUtil', 'goog.userAgentTestUtil.UserAgents'], ['goog.labs.userAgent.browser', 'goog.labs.userAgent.engine', 'goog.labs.userAgent.platform', 'goog.userAgent', 'goog.userAgent.keyboard', 'goog.userAgent.platform', 'goog.userAgent.product', 'goog.userAgent.product.isVersion']);
 goog.addDependency("vec/float32array.js", ['goog.vec.Float32Array'], []);
 goog.addDependency("vec/float64array.js", ['goog.vec.Float64Array'], []);
@@ -1563,8 +1565,8 @@ delete window.BLOCKLY_BOOT;
 };
 
 // Delete any existing Closure (e.g. Soy's nogoog_shim).
-document.write('<script type="text/javascript">var goog = undefined;</script>');
+document.write('<script>var goog = undefined;</script>');
 // Load fresh Closure Library.
-document.write('<script type="text/javascript" src="' + window.BLOCKLY_DIR +
+document.write('<script src="' + window.BLOCKLY_DIR +
     '/../closure-library/closure/goog/base.js"></script>');
-document.write('<script type="text/javascript">window.BLOCKLY_BOOT()</script>');
+document.write('<script>window.BLOCKLY_BOOT()</script>');
diff --git a/build.py b/build.py
index 7856cf588..8f57b2bb7 100755
--- a/build.py
+++ b/build.py
@@ -127,11 +127,11 @@ delete window.BLOCKLY_BOOT;
 };
 
 // Delete any existing Closure (e.g. Soy's nogoog_shim).
-document.write('<script type="text/javascript">var goog = undefined;</script>');
+document.write('<script>var goog = undefined;</script>');
 // Load fresh Closure Library.
-document.write('<script type="text/javascript" src="' + window.BLOCKLY_DIR +
+document.write('<script src="' + window.BLOCKLY_DIR +
     '/../closure-library/closure/goog/base.js"></script>');
-document.write('<script type="text/javascript">window.BLOCKLY_BOOT()</script>');
+document.write('<script>window.BLOCKLY_BOOT()</script>');
 """)
     f.close()
     print('SUCCESS: ' + target_filename)
diff --git a/demos/blockfactory/index.html b/demos/blockfactory/index.html
index 9690d4e07..82f92729a 100644
--- a/demos/blockfactory/index.html
+++ b/demos/blockfactory/index.html
@@ -4,11 +4,11 @@
   <meta charset="utf-8">
   <meta name="viewport" content="target-densitydpi=device-dpi, height=660, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
   <title>Blockly Demo: Block Factory</title>
-  <script type="text/javascript" src="/storage.js"></script>
-  <script type="text/javascript" src="factory.js"></script>
-  <script type="text/javascript" src="../../blockly_compressed.js"></script>
-  <script type="text/javascript" src="../../msg/messages.js"></script>
-  <script type="text/javascript" src="blocks.js"></script>
+  <script src="/storage.js"></script>
+  <script src="factory.js"></script>
+  <script src="../../blockly_compressed.js"></script>
+  <script src="../../msg/messages.js"></script>
+  <script src="blocks.js"></script>
   <style>
     html, body {
       height: 100%;
@@ -74,8 +74,8 @@
       display: none;
     }
   </style>
-  <link rel="stylesheet" type="text/css" href="../prettify.css">
-  <script type="text/javascript" src="../prettify.js"></script>
+  <link rel="stylesheet" href="../prettify.css">
+  <script src="../prettify.js"></script>
 </head>
 <body>
   <table>
diff --git a/demos/blockfactory/preview.html b/demos/blockfactory/preview.html
index b92ee8edb..57e821d56 100644
--- a/demos/blockfactory/preview.html
+++ b/demos/blockfactory/preview.html
@@ -4,9 +4,9 @@
   <meta charset="utf-8">
   <meta name="google" value="notranslate">
   <title>Block Factory Preview</title>
-  <script type="text/javascript" src="../../blockly_compressed.js"></script>
-  <script type="text/javascript" src="../../msg/messages.js"></script>
-  <script type="text/javascript" src="preview.js"></script>
+  <script src="../../blockly_compressed.js"></script>
+  <script src="../../msg/messages.js"></script>
+  <script src="preview.js"></script>
   <style>
     html, body {
       background-color: #fff;
diff --git a/demos/code/code.js b/demos/code/code.js
index a8c27400a..4f94a3d55 100644
--- a/demos/code/code.js
+++ b/demos/code/code.js
@@ -192,15 +192,13 @@ Code.bindClick = function(el, func) {
  * Load the Prettify CSS and JavaScript.
  */
 Code.importPrettify = function() {
-  //<link rel="stylesheet" type="text/css" href="../prettify.css">
-  //<script type="text/javascript" src="../prettify.js"></script>
+  //<link rel="stylesheet" href="../prettify.css">
+  //<script src="../prettify.js"></script>
   var link = document.createElement('link');
   link.setAttribute('rel', 'stylesheet');
-  link.setAttribute('type', 'text/css');
   link.setAttribute('href', '../prettify.css');
   document.head.appendChild(link);
   var script = document.createElement('script');
-  script.setAttribute('type', 'text/javascript');
   script.setAttribute('src', '../prettify.js');
   document.head.appendChild(script);
 };
@@ -496,10 +494,8 @@ Code.discard = function() {
 };
 
 // Load the Code demo's language strings.
-document.write('<script type="text/javascript" src="msg/' +
-               Code.LANG + '.js"></script>\n');
+document.write('<script src="msg/' + Code.LANG + '.js"></script>\n');
 // Load Blockly's language strings.
-document.write('<script type="text/javascript" src="../../msg/js/' +
-               Code.LANG + '.js"></script>\n');
+document.write('<script src="../../msg/js/' + Code.LANG + '.js"></script>\n');
 
 window.addEventListener('load', Code.init);
diff --git a/demos/code/index.html b/demos/code/index.html
index 221c3e6ce..b108232e3 100644
--- a/demos/code/index.html
+++ b/demos/code/index.html
@@ -4,14 +4,14 @@
   <meta charset="utf-8">
   <meta name="google" value="notranslate">
   <title>Blockly Demo:</title>
-  <link rel="stylesheet" type="text/css" href="style.css">
-  <script type="text/javascript" src="/storage.js"></script>
-  <script type="text/javascript" src="../../blockly_compressed.js"></script>
-  <script type="text/javascript" src="../../blocks_compressed.js"></script>
-  <script type="text/javascript" src="../../javascript_compressed.js"></script>
-  <script type="text/javascript" src="../../python_compressed.js"></script>
-  <script type="text/javascript" src="../../dart_compressed.js"></script>
-  <script type="text/javascript" src="code.js"></script>
+  <link rel="stylesheet" href="style.css">
+  <script src="/storage.js"></script>
+  <script src="../../blockly_compressed.js"></script>
+  <script src="../../blocks_compressed.js"></script>
+  <script src="../../javascript_compressed.js"></script>
+  <script src="../../python_compressed.js"></script>
+  <script src="../../dart_compressed.js"></script>
+  <script src="code.js"></script>
 </head>
 <body>
   <table width="100%" height="100%">
diff --git a/demos/fixed/index.html b/demos/fixed/index.html
index e78bdd559..baa3a510d 100644
--- a/demos/fixed/index.html
+++ b/demos/fixed/index.html
@@ -3,9 +3,9 @@
 <head>
   <meta charset="utf-8">
   <title>Blockly Demo: Fixed Blockly</title>
-  <script type="text/javascript" src="../../blockly_compressed.js"></script>
-  <script type="text/javascript" src="../../blocks_compressed.js"></script>
-  <script type="text/javascript" src="../../msg/js/en.js"></script>
+  <script src="../../blockly_compressed.js"></script>
+  <script src="../../blocks_compressed.js"></script>
+  <script src="../../msg/js/en.js"></script>
   <style>
     body {
       background-color: #fff;
diff --git a/demos/generator/index.html b/demos/generator/index.html
index e808d8c33..dbdf107e4 100644
--- a/demos/generator/index.html
+++ b/demos/generator/index.html
@@ -3,10 +3,10 @@
 <head>
   <meta charset="utf-8">
   <title>Blockly Demo: Generating JavaScript</title>
-  <script type="text/javascript" src="../../blockly_compressed.js"></script>
-  <script type="text/javascript" src="../../blocks_compressed.js"></script>
-  <script type="text/javascript" src="../../javascript_compressed.js"></script>
-  <script type="text/javascript" src="../../msg/js/en.js"></script>
+  <script src="../../blockly_compressed.js"></script>
+  <script src="../../blocks_compressed.js"></script>
+  <script src="../../javascript_compressed.js"></script>
+  <script src="../../msg/js/en.js"></script>
   <style>
     body {
       background-color: #fff;
diff --git a/demos/graph/index.html b/demos/graph/index.html
index c93f6a148..76747d378 100644
--- a/demos/graph/index.html
+++ b/demos/graph/index.html
@@ -3,11 +3,11 @@
 <head>
   <meta charset="utf-8">
   <title>Blockly Demo: Graph</title>
-  <script type="text/javascript" src="https://www.google.com/jsapi"></script>
-  <script type="text/javascript" src="../../blockly_compressed.js"></script>
-  <script type="text/javascript" src="../../blocks_compressed.js"></script>
-  <script type="text/javascript" src="../../javascript_compressed.js"></script>
-  <script type="text/javascript" src="../../msg/js/en.js"></script>
+  <script src="https://www.google.com/jsapi"></script>
+  <script src="../../blockly_compressed.js"></script>
+  <script src="../../blocks_compressed.js"></script>
+  <script src="../../javascript_compressed.js"></script>
+  <script src="../../msg/js/en.js"></script>
   <style>
     body {
       background-color: #fff;
diff --git a/demos/iframe/frame.html b/demos/iframe/frame.html
index 1b1a81356..5c37836a5 100644
--- a/demos/iframe/frame.html
+++ b/demos/iframe/frame.html
@@ -2,9 +2,9 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <script type="text/javascript" src="../../blockly_compressed.js"></script>
-    <script type="text/javascript" src="../../blocks_compressed.js"></script>
-    <script type="text/javascript" src="../../msg/js/en.js"></script>
+    <script src="../../blockly_compressed.js"></script>
+    <script src="../../blocks_compressed.js"></script>
+    <script src="../../msg/js/en.js"></script>
     <style>
       html, body {
         background-color: #fff;
diff --git a/demos/interpreter/index.html b/demos/interpreter/index.html
index c482b8e41..7baa66532 100644
--- a/demos/interpreter/index.html
+++ b/demos/interpreter/index.html
@@ -3,11 +3,11 @@
 <head>
   <meta charset="utf-8">
   <title>Blockly Demo: JS Interpreter</title>
-  <script type="text/javascript" src="acorn_interpreter.js"></script>
-  <script type="text/javascript" src="../../blockly_compressed.js"></script>
-  <script type="text/javascript" src="../../blocks_compressed.js"></script>
-  <script type="text/javascript" src="../../javascript_compressed.js"></script>
-  <script type="text/javascript" src="../../msg/js/en.js"></script>
+  <script src="acorn_interpreter.js"></script>
+  <script src="../../blockly_compressed.js"></script>
+  <script src="../../blocks_compressed.js"></script>
+  <script src="../../javascript_compressed.js"></script>
+  <script src="../../msg/js/en.js"></script>
   <style>
     body {
       background-color: #fff;
diff --git a/demos/maxBlocks/index.html b/demos/maxBlocks/index.html
index 189e8537a..180b7bdb3 100644
--- a/demos/maxBlocks/index.html
+++ b/demos/maxBlocks/index.html
@@ -3,9 +3,9 @@
 <head>
   <meta charset="utf-8">
   <title>Blockly Demo: Maximum Block Limit</title>
-  <script type="text/javascript" src="../../blockly_compressed.js"></script>
-  <script type="text/javascript" src="../../blocks_compressed.js"></script>
-  <script type="text/javascript" src="../../msg/js/en.js"></script>
+  <script src="../../blockly_compressed.js"></script>
+  <script src="../../blocks_compressed.js"></script>
+  <script src="../../msg/js/en.js"></script>
   <style>
     body {
       background-color: #fff;
diff --git a/demos/plane/index.html b/demos/plane/index.html
index a389ddf87..dec1cd3cd 100644
--- a/demos/plane/index.html
+++ b/demos/plane/index.html
@@ -4,12 +4,12 @@
   <meta charset="utf-8">
   <meta name="google" value="notranslate">
   <title>Blockly Demo:</title>
-  <link rel="stylesheet" type="text/css" href="style.css">
-  <script type="text/javascript" src="soy/soyutils.js"></script>
-  <script type="text/javascript" src="plane.js"></script>
+  <link rel="stylesheet" href="style.css">
+  <script src="soy/soyutils.js"></script>
+  <script src="plane.js"></script>
 </head>
 <body>
-  <script type="text/javascript">
+  <script>
     document.write(planepage.start({}, null,
         {lang: Plane.LANG,
          level: Plane.LEVEL,
diff --git a/demos/plane/plane.js b/demos/plane/plane.js
index 89581dc02..52f9e773d 100644
--- a/demos/plane/plane.js
+++ b/demos/plane/plane.js
@@ -387,8 +387,7 @@ Plane.redraw = function(newRows) {
     }
     while (newRows > rows1st) {
       rows1st++;
-      var row = document.createElementNS('http://www.w3.org/2000/svg',
-                                                  'use');
+      var row = document.createElementNS('http://www.w3.org/2000/svg', 'use');
       row.setAttribute('id', 'row1st' + rows1st);
       // Row of 4 seats.
       row.setAttribute('x', (rows1st - 1) * 20);
@@ -435,5 +434,4 @@ Plane.redraw = function(newRows) {
 window.addEventListener('load', Plane.init);
 
 // Load the user's language pack.
-document.write('<script type="text/javascript" src="generated/' +
-               Plane.LANG + '.js"></script>\n');
+document.write('<script src="generated/' + Plane.LANG + '.js"></script>\n');
diff --git a/demos/plane/template.soy b/demos/plane/template.soy
index 33cb541ee..fd302390b 100644
--- a/demos/plane/template.soy
+++ b/demos/plane/template.soy
@@ -61,7 +61,7 @@
     </tr>
   </table>
 
-  <script type="text/javascript" src="slider.js"></script>
+  <script src="slider.js"></script>
   <svg
      id="plane"
      xmlns="http://www.w3.org/2000/svg"
@@ -175,11 +175,11 @@
     {msg meaning="Plane.instructions" desc="page text - This text appears below the airplane graphic and above the space for the user to create the formula.  The number of rows an the graphic may be changed by the user with a slider.  See [http://blockly-share.appspot.com/static/apps/plane/plane.html?lang=en&level=1] for a picture."}Build a formula (below) that calculates the total number of seats on the airplane as the rows are changed (above).{/msg}
   </p>
 
-  <script type="text/javascript" src="../../blockly_compressed.js"></script>
-  <script type="text/javascript" src="../../blocks_compressed.js"></script>
-  <script type="text/javascript" src="../../javascript_compressed.js"></script>
-  <script type="text/javascript" src="../../msg/js/{$ij.lang}.js"></script>
-  <script type="text/javascript" src="blocks.js"></script>
+  <script src="../../blockly_compressed.js"></script>
+  <script src="../../blocks_compressed.js"></script>
+  <script src="../../javascript_compressed.js"></script>
+  <script src="../../msg/js/{$ij.lang}.js"></script>
+  <script src="blocks.js"></script>
   {call .toolbox /}
   <div id="blockly"></div>
 {/template}
diff --git a/demos/realtime/index.html b/demos/realtime/index.html
index 879374928..55cd13bba 100644
--- a/demos/realtime/index.html
+++ b/demos/realtime/index.html
@@ -3,10 +3,10 @@
 <head>
   <meta charset="utf-8">
   <title>Blockly Demo: Realtime Collaboration</title>
-  <script type="text/javascript" src="../../blockly_compressed.js"></script>
-  <script type="text/javascript" src="../../blocks_compressed.js"></script>
-  <script type="text/javascript" src="../../msg/js/en.js"></script>
-  <script type="text/javascript" src="https://apis.google.com/js/api.js"></script>
+  <script src="../../blockly_compressed.js"></script>
+  <script src="../../blocks_compressed.js"></script>
+  <script src="../../msg/js/en.js"></script>
+  <script src="https://apis.google.com/js/api.js"></script>
   <style>
     body {
       background-color: #fff;
diff --git a/demos/rtl/index.html b/demos/rtl/index.html
index 35e6c2250..00fd45daf 100644
--- a/demos/rtl/index.html
+++ b/demos/rtl/index.html
@@ -4,9 +4,9 @@
   <meta charset="utf-8">
   <meta name="google" value="notranslate">
   <title>Blockly Demo: RTL</title>
-  <script type="text/javascript" src="../../blockly_compressed.js"></script>
-  <script type="text/javascript" src="../../blocks_compressed.js"></script>
-  <script type="text/javascript" src="../../msg/js/ar.js"></script>
+  <script src="../../blockly_compressed.js"></script>
+  <script src="../../blocks_compressed.js"></script>
+  <script src="../../msg/js/ar.js"></script>
   <style>
     body {
       background-color: #fff;
diff --git a/demos/storage/index.html b/demos/storage/index.html
index a07530c1b..ca3a5176b 100644
--- a/demos/storage/index.html
+++ b/demos/storage/index.html
@@ -3,10 +3,10 @@
 <head>
   <meta charset="utf-8">
   <title>Blockly Demo: Cloud Storage</title>
-  <script type="text/javascript" src="/storage.js"></script>
-  <script type="text/javascript" src="../../blockly_compressed.js"></script>
-  <script type="text/javascript" src="../../blocks_compressed.js"></script>
-  <script type="text/javascript" src="../../msg/js/en.js"></script>
+  <script src="/storage.js"></script>
+  <script src="../../blockly_compressed.js"></script>
+  <script src="../../blocks_compressed.js"></script>
+  <script src="../../msg/js/en.js"></script>
   <style>
     body {
       background-color: #fff;
diff --git a/demos/toolbox/index.html b/demos/toolbox/index.html
index a2c9108fd..2284619c0 100644
--- a/demos/toolbox/index.html
+++ b/demos/toolbox/index.html
@@ -3,9 +3,9 @@
 <head>
   <meta charset="utf-8">
   <title>Blockly Demo: Toolbox</title>
-  <script type="text/javascript" src="../../blockly_compressed.js"></script>
-  <script type="text/javascript" src="../../blocks_compressed.js"></script>
-  <script type="text/javascript" src="../../msg/js/en.js"></script>
+  <script src="../../blockly_compressed.js"></script>
+  <script src="../../blocks_compressed.js"></script>
+  <script src="../../msg/js/en.js"></script>
   <style>
     body {
       background-color: #fff;
diff --git a/tests/generators/index.html b/tests/generators/index.html
index 7df2e7f7f..026ca35ae 100644
--- a/tests/generators/index.html
+++ b/tests/generators/index.html
@@ -3,48 +3,48 @@
 <head>
 <meta charset="utf-8">
 <title>Blockly Generator Tests</title>
-<script type="text/javascript" src="../../blockly_uncompressed.js"></script>
-<script type="text/javascript" src="../../generators/javascript.js"></script>
-<script type="text/javascript" src="unittest_javascript.js"></script>
-<script type="text/javascript" src="../../generators/javascript/logic.js"></script>
-<script type="text/javascript" src="../../generators/javascript/loops.js"></script>
-<script type="text/javascript" src="../../generators/javascript/math.js"></script>
-<script type="text/javascript" src="../../generators/javascript/text.js"></script>
-<script type="text/javascript" src="../../generators/javascript/lists.js"></script>
-<script type="text/javascript" src="../../generators/javascript/colour.js"></script>
-<script type="text/javascript" src="../../generators/javascript/variables.js"></script>
-<script type="text/javascript" src="../../generators/javascript/procedures.js"></script>
-<script type="text/javascript" src="../../generators/python.js"></script>
-<script type="text/javascript" src="unittest_python.js"></script>
-<script type="text/javascript" src="../../generators/python/logic.js"></script>
-<script type="text/javascript" src="../../generators/python/loops.js"></script>
-<script type="text/javascript" src="../../generators/python/math.js"></script>
-<script type="text/javascript" src="../../generators/python/text.js"></script>
-<script type="text/javascript" src="../../generators/python/lists.js"></script>
-<script type="text/javascript" src="../../generators/python/colour.js"></script>
-<script type="text/javascript" src="../../generators/python/variables.js"></script>
-<script type="text/javascript" src="../../generators/python/procedures.js"></script>
-<script type="text/javascript" src="../../generators/dart.js"></script>
-<script type="text/javascript" src="unittest_dart.js"></script>
-<script type="text/javascript" src="../../generators/dart/logic.js"></script>
-<script type="text/javascript" src="../../generators/dart/loops.js"></script>
-<script type="text/javascript" src="../../generators/dart/math.js"></script>
-<script type="text/javascript" src="../../generators/dart/text.js"></script>
-<script type="text/javascript" src="../../generators/dart/lists.js"></script>
-<script type="text/javascript" src="../../generators/dart/colour.js"></script>
-<script type="text/javascript" src="../../generators/dart/variables.js"></script>
-<script type="text/javascript" src="../../generators/dart/procedures.js"></script>
-<script type="text/javascript" src="unittest.js"></script>
-<script type="text/javascript" src="../../msg/messages.js"></script>
-<script type="text/javascript" src="../../blocks/logic.js"></script>
-<script type="text/javascript" src="../../blocks/loops.js"></script>
-<script type="text/javascript" src="../../blocks/math.js"></script>
-<script type="text/javascript" src="../../blocks/text.js"></script>
-<script type="text/javascript" src="../../blocks/lists.js"></script>
-<script type="text/javascript" src="../../blocks/colour.js"></script>
-<script type="text/javascript" src="../../blocks/variables.js"></script>
-<script type="text/javascript" src="../../blocks/procedures.js"></script>
-<script type="text/javascript">
+<script src="../../blockly_uncompressed.js"></script>
+<script src="../../generators/javascript.js"></script>
+<script src="unittest_javascript.js"></script>
+<script src="../../generators/javascript/logic.js"></script>
+<script src="../../generators/javascript/loops.js"></script>
+<script src="../../generators/javascript/math.js"></script>
+<script src="../../generators/javascript/text.js"></script>
+<script src="../../generators/javascript/lists.js"></script>
+<script src="../../generators/javascript/colour.js"></script>
+<script src="../../generators/javascript/variables.js"></script>
+<script src="../../generators/javascript/procedures.js"></script>
+<script src="../../generators/python.js"></script>
+<script src="unittest_python.js"></script>
+<script src="../../generators/python/logic.js"></script>
+<script src="../../generators/python/loops.js"></script>
+<script src="../../generators/python/math.js"></script>
+<script src="../../generators/python/text.js"></script>
+<script src="../../generators/python/lists.js"></script>
+<script src="../../generators/python/colour.js"></script>
+<script src="../../generators/python/variables.js"></script>
+<script src="../../generators/python/procedures.js"></script>
+<script src="../../generators/dart.js"></script>
+<script src="unittest_dart.js"></script>
+<script src="../../generators/dart/logic.js"></script>
+<script src="../../generators/dart/loops.js"></script>
+<script src="../../generators/dart/math.js"></script>
+<script src="../../generators/dart/text.js"></script>
+<script src="../../generators/dart/lists.js"></script>
+<script src="../../generators/dart/colour.js"></script>
+<script src="../../generators/dart/variables.js"></script>
+<script src="../../generators/dart/procedures.js"></script>
+<script src="unittest.js"></script>
+<script src="../../msg/messages.js"></script>
+<script src="../../blocks/logic.js"></script>
+<script src="../../blocks/loops.js"></script>
+<script src="../../blocks/math.js"></script>
+<script src="../../blocks/text.js"></script>
+<script src="../../blocks/lists.js"></script>
+<script src="../../blocks/colour.js"></script>
+<script src="../../blocks/variables.js"></script>
+<script src="../../blocks/procedures.js"></script>
+<script>
 'use strict';
 
 function start() {
diff --git a/tests/jsunit/index.html b/tests/jsunit/index.html
index 710f092d0..4c445b930 100644
--- a/tests/jsunit/index.html
+++ b/tests/jsunit/index.html
@@ -3,13 +3,13 @@
   <head>
     <meta charset="utf-8">
     <title>Unit Tests for Blockly</title>
-    <script type="text/javascript" src="../../blockly_uncompressed.js"></script>
-    <script type="text/javascript">goog.require('goog.testing.jsunit');</script>
+    <script src="../../blockly_uncompressed.js"></script>
+    <script>goog.require('goog.testing.jsunit');</script>
   </head>
   <body>
-    <script type="text/javascript" src="blockly_test.js"></script>
-    <script type="text/javascript" src="generator_test.js"></script>
-    <script type="text/javascript" src="names_test.js"></script>
-    <script type="text/javascript" src="xml_test.js"></script>
+    <script src="blockly_test.js"></script>
+    <script src="generator_test.js"></script>
+    <script src="names_test.js"></script>
+    <script src="xml_test.js"></script>
   </body>
 </html>
diff --git a/tests/playground.html b/tests/playground.html
index b97e93427..22355275c 100644
--- a/tests/playground.html
+++ b/tests/playground.html
@@ -3,46 +3,46 @@
 <head>
 <meta charset="utf-8">
 <title>Blockly Playground</title>
-<script type="text/javascript" src="../blockly_uncompressed.js"></script>
-<script type="text/javascript" src="../generators/javascript.js"></script>
-<script type="text/javascript" src="../generators/javascript/logic.js"></script>
-<script type="text/javascript" src="../generators/javascript/loops.js"></script>
-<script type="text/javascript" src="../generators/javascript/math.js"></script>
-<script type="text/javascript" src="../generators/javascript/text.js"></script>
-<script type="text/javascript" src="../generators/javascript/lists.js"></script>
-<script type="text/javascript" src="../generators/javascript/colour.js"></script>
-<script type="text/javascript" src="../generators/javascript/variables.js"></script>
-<script type="text/javascript" src="../generators/javascript/procedures.js"></script>
-<script type="text/javascript" src="../generators/python.js"></script>
-<script type="text/javascript" src="../generators/python/logic.js"></script>
-<script type="text/javascript" src="../generators/python/loops.js"></script>
-<script type="text/javascript" src="../generators/python/math.js"></script>
-<script type="text/javascript" src="../generators/python/text.js"></script>
-<script type="text/javascript" src="../generators/python/lists.js"></script>
-<script type="text/javascript" src="../generators/python/colour.js"></script>
-<script type="text/javascript" src="../generators/python/variables.js"></script>
-<script type="text/javascript" src="../generators/python/procedures.js"></script>
-<script type="text/javascript" src="../generators/dart.js"></script>
-<script type="text/javascript" src="../generators/dart/logic.js"></script>
-<script type="text/javascript" src="../generators/dart/loops.js"></script>
-<script type="text/javascript" src="../generators/dart/math.js"></script>
-<script type="text/javascript" src="../generators/dart/text.js"></script>
-<script type="text/javascript" src="../generators/dart/lists.js"></script>
-<script type="text/javascript" src="../generators/dart/colour.js"></script>
-<script type="text/javascript" src="../generators/dart/variables.js"></script>
-<script type="text/javascript" src="../generators/dart/procedures.js"></script>
-<script type="text/javascript" src="../msg/messages.js"></script>
-<script type="text/javascript" src="../blocks/logic.js"></script>
-<script type="text/javascript" src="../blocks/loops.js"></script>
-<script type="text/javascript" src="../blocks/math.js"></script>
-<script type="text/javascript" src="../blocks/text.js"></script>
-<script type="text/javascript" src="../blocks/lists.js"></script>
-<script type="text/javascript" src="../blocks/colour.js"></script>
-<script type="text/javascript" src="../blocks/variables.js"></script>
-<script type="text/javascript" src="../blocks/procedures.js"></script>
+<script src="../blockly_uncompressed.js"></script>
+<script src="../generators/javascript.js"></script>
+<script src="../generators/javascript/logic.js"></script>
+<script src="../generators/javascript/loops.js"></script>
+<script src="../generators/javascript/math.js"></script>
+<script src="../generators/javascript/text.js"></script>
+<script src="../generators/javascript/lists.js"></script>
+<script src="../generators/javascript/colour.js"></script>
+<script src="../generators/javascript/variables.js"></script>
+<script src="../generators/javascript/procedures.js"></script>
+<script src="../generators/python.js"></script>
+<script src="../generators/python/logic.js"></script>
+<script src="../generators/python/loops.js"></script>
+<script src="../generators/python/math.js"></script>
+<script src="../generators/python/text.js"></script>
+<script src="../generators/python/lists.js"></script>
+<script src="../generators/python/colour.js"></script>
+<script src="../generators/python/variables.js"></script>
+<script src="../generators/python/procedures.js"></script>
+<script src="../generators/dart.js"></script>
+<script src="../generators/dart/logic.js"></script>
+<script src="../generators/dart/loops.js"></script>
+<script src="../generators/dart/math.js"></script>
+<script src="../generators/dart/text.js"></script>
+<script src="../generators/dart/lists.js"></script>
+<script src="../generators/dart/colour.js"></script>
+<script src="../generators/dart/variables.js"></script>
+<script src="../generators/dart/procedures.js"></script>
+<script src="../msg/messages.js"></script>
+<script src="../blocks/logic.js"></script>
+<script src="../blocks/loops.js"></script>
+<script src="../blocks/math.js"></script>
+<script src="../blocks/text.js"></script>
+<script src="../blocks/lists.js"></script>
+<script src="../blocks/colour.js"></script>
+<script src="../blocks/variables.js"></script>
+<script src="../blocks/procedures.js"></script>
 <!-- Load the Google Drive SDK Realtime libraries. -->
-<script type="text/javascript" src="https://apis.google.com/js/api.js"></script>
-<script type="text/javascript">
+<script src="https://apis.google.com/js/api.js"></script>
+<script>
 'use strict';
 // Depending on the URL argument, render as LTR or RTL.
 var rtl = (document.location.search == '?rtl');
@@ -362,7 +362,7 @@ h1 {
   <p><a href="javascript:void([document.getElementById('blocklyDiv').style.display = 'block', Blockly.mainWorkspace.render()])">Show</a>
    - <a href="javascript:void(document.getElementById('blocklyDiv').style.display = 'none')">Hide</a></p>
 
-  <script type="text/javascript">
+  <script>
     if (rtl) {
       document.write('[ &larr; RTL. Switch to <A HREF="?ltr">LTR</A>. ]');
     } else {