From fe3e7795b292a424e135574f8e2d581ebd9a65b9 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tom@280north.com>
Date: Thu, 1 Apr 2010 23:39:14 -0700
Subject: [PATCH] Add charset attributes to all external script tags, including
 flatten. Fixes unicode bugs in flatten.

---
 CommonJS/bin/flatten                                       | 7 ++++---
 .../capp/Resources/Templates/Application/index-debug.html  | 4 ++--
 Tools/capp/Resources/Templates/Application/index.html      | 4 ++--
 .../Resources/Templates/NibApplication/index-debug.html    | 4 ++--
 Tools/capp/Resources/Templates/NibApplication/index.html   | 4 ++--
 .../Resources/Templates/ThemeDescriptor/index-debug.html   | 4 ++--
 Tools/capp/Resources/Templates/ThemeDescriptor/index.html  | 4 ++--
 7 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/CommonJS/bin/flatten b/CommonJS/bin/flatten
index 0068fee00..20a0b2d65 100755
--- a/CommonJS/bin/flatten
+++ b/CommonJS/bin/flatten
@@ -181,6 +181,7 @@ ObjectiveJFlattener.prototype.buildApplicationJS = function() {
         buffers[0].push("for (var i = 1; i <= appFilesCount; i++) {");
         buffers[0].push("    var script = document.createElement(\"script\");");
         buffers[0].push("    script.src = \"Application\"+i+\".js\";");
+        buffers[0].push("    script.charset = \"UTF-8\";");
         buffers[0].push("    script.onload = function() { if (--appFilesCount === 0) ObjectiveJ.bootstrap(); };");
         buffers[0].push("    document.getElementsByTagName(\"head\")[0].appendChild(script);");
         buffers[0].push("}");
@@ -303,10 +304,10 @@ var scriptTagsBefore =
     '$1</script>';
 
 var scriptTagsAfter =
-    '$1<script type = "text/javascript" src = "Application.js"></script>';
+    '$1<script type="text/javascript" src="Application.js" charset="UTF-8"></script>';
 
 // enable CPLog:
-// scriptTagsAfter = '$1<script type = "text/javascript">\n$1    CPLogRegister(CPLogConsole);\n$1</script>\n' + scriptTagsAfter;
+// scriptTagsAfter = '$1<script type="text/javascript">\n$1    CPLogRegister(CPLogConsole);\n$1</script>\n' + scriptTagsAfter;
 
 function rewriteMainHTML(indexHTMLPath) {
     if (indexHTMLPath.isFile()) {
@@ -318,7 +319,7 @@ function rewriteMainHTML(indexHTMLPath) {
             // escape any dollar signs by replacing them with two
             // then indent by splitting/joining on newlines
             scriptTagsAfter =
-                '$1<script type = "text/javascript">\n'+
+                '$1<script type="text/javascript">\n'+
                 '$1    ' + applicationJSPath.read({ charset : "UTF-8" }).replace(/\$/g, "$$$$").split("\n").join("\n$1    ")+'\n'+
                 '$1</script>';
         }
diff --git a/Tools/capp/Resources/Templates/Application/index-debug.html b/Tools/capp/Resources/Templates/Application/index-debug.html
index a0e57f42c..d1a146427 100644
--- a/Tools/capp/Resources/Templates/Application/index-debug.html
+++ b/Tools/capp/Resources/Templates/Application/index-debug.html
@@ -20,7 +20,7 @@
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
         
-        <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript"></script>
+        <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
         
         <script type="text/javascript">
             objj_msgSend_reset();
@@ -64,7 +64,7 @@
     <body style="">
         <div id="cappuccino-body">
             <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type = "text/javascript">
+                <script type="text/javascript">
                     document.write("<div id='container'><p id='content'>" +
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading __project.name__...</p></div>");
diff --git a/Tools/capp/Resources/Templates/Application/index.html b/Tools/capp/Resources/Templates/Application/index.html
index c085e19b3..26448e108 100644
--- a/Tools/capp/Resources/Templates/Application/index.html
+++ b/Tools/capp/Resources/Templates/Application/index.html
@@ -19,7 +19,7 @@
             OBJJ_MAIN_FILE = "main.j";
         </script>
         
-        <script src="Frameworks/Objective-J/Objective-J.js" type="text/javascript"></script>
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
             body{margin:0; padding:0;}
@@ -41,7 +41,7 @@
     <body style="">
         <div id="cappuccino-body">
             <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type = "text/javascript">
+                <script type="text/javascript">
                     document.write("<div id='container'><p id='content'>" +
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading __project.name__...</p></div>");
diff --git a/Tools/capp/Resources/Templates/NibApplication/index-debug.html b/Tools/capp/Resources/Templates/NibApplication/index-debug.html
index a40c42872..c37cde236 100644
--- a/Tools/capp/Resources/Templates/NibApplication/index-debug.html
+++ b/Tools/capp/Resources/Templates/NibApplication/index-debug.html
@@ -20,7 +20,7 @@
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
         
-        <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript"></script>
+        <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <script type="text/javascript">
             objj_msgSend_reset();
@@ -64,7 +64,7 @@
     <body style="">
         <div id="cappuccino-body">
             <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type = "text/javascript">
+                <script type="text/javascript">
                     document.write("<div id='container'><p id='content'>" +
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading __project.name__...</p></div>");
diff --git a/Tools/capp/Resources/Templates/NibApplication/index.html b/Tools/capp/Resources/Templates/NibApplication/index.html
index bfd3c8436..9ec74d6b6 100644
--- a/Tools/capp/Resources/Templates/NibApplication/index.html
+++ b/Tools/capp/Resources/Templates/NibApplication/index.html
@@ -19,7 +19,7 @@
             OBJJ_MAIN_FILE = "main.j";
         </script>
         
-        <script src="Frameworks/Objective-J/Objective-J.js" type="text/javascript"></script>
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
             body{margin:0; padding:0;}
@@ -41,7 +41,7 @@
     <body style="">
         <div id="cappuccino-body">
             <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type = "text/javascript">
+                <script type="text/javascript">
                     document.write("<div id='container'><p id='content'>" +
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading __project.name__...</p></div>");
diff --git a/Tools/capp/Resources/Templates/ThemeDescriptor/index-debug.html b/Tools/capp/Resources/Templates/ThemeDescriptor/index-debug.html
index 4ae38bc63..982e5b19d 100644
--- a/Tools/capp/Resources/Templates/ThemeDescriptor/index-debug.html
+++ b/Tools/capp/Resources/Templates/ThemeDescriptor/index-debug.html
@@ -20,7 +20,7 @@
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
         
-        <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript"></script>
+        <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
             body{margin:0; padding:0;}
@@ -42,7 +42,7 @@
     <body style="">
         <div id="cappuccino-body">
             <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type = "text/javascript">
+                <script type="text/javascript">
                     document.write("<div id='container'><p id='content'>" +
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading __project.name__...</p></div>");
diff --git a/Tools/capp/Resources/Templates/ThemeDescriptor/index.html b/Tools/capp/Resources/Templates/ThemeDescriptor/index.html
index bfd3c8436..9ec74d6b6 100644
--- a/Tools/capp/Resources/Templates/ThemeDescriptor/index.html
+++ b/Tools/capp/Resources/Templates/ThemeDescriptor/index.html
@@ -19,7 +19,7 @@
             OBJJ_MAIN_FILE = "main.j";
         </script>
         
-        <script src="Frameworks/Objective-J/Objective-J.js" type="text/javascript"></script>
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
             body{margin:0; padding:0;}
@@ -41,7 +41,7 @@
     <body style="">
         <div id="cappuccino-body">
             <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type = "text/javascript">
+                <script type="text/javascript">
                     document.write("<div id='container'><p id='content'>" +
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading __project.name__...</p></div>");