Upped the version number to 0.8.1.

Reviewed by me.
One additional fix for IE not loading in certain occasions.
2026-09-10 12:47:13 +00:00 · 2010-04-09 22:21:37 -07:00 · 2010-04-08 23:54:20 -07:00 · 2010-04-07 19:50:35 -07:00 · 2010-04-01 23:49:23 -07:00 · 2010-04-01 23:39:14 -07:00
11 changed files with 61 additions and 29 deletions
@@ -71,11 +71,12 @@ var _CPToolbarViewBackgroundColor = nil;
        [self addSubview:_toolbarBackgroundView positioned:CPWindowBelow relativeTo:nil];
    }
            
-    var frame = CGRectMakeZero();
-    
-    frame.origin = CGPointMakeCopy([self toolbarOffset]);
+    var frame = CGRectMakeZero(),
+        toolbarOffset = [self toolbarOffset];
+
+    frame.origin = CGPointMake(toolbarOffset.width, toolbarOffset.height);
    frame.size = [_toolbarView frame].size;
-    
+
    [_toolbarBackgroundView setFrame:frame];
 }

@@ -36,6 +36,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
    CGSize      _resizeIndicatorOffset;
    
    CPView      _toolbarView;
+    CGSize      _toolbarOffset;
 //    BOOL        _isAnimatingToolbar;

    
@@ -80,8 +81,8 @@ var _CPWindowViewResizeIndicatorImage = nil;
    if (self)
    {
        _styleMask = aStyleMask;
-        _resizeIndicatorOffset = CGSizeMake(0.0, 0.0);
-        _toolbarOffset = CGSizeMake(0.0, 0.0);
+        _resizeIndicatorOffset = CGSizeMakeZero();
+        _toolbarOffset = CGSizeMakeZero();
    }
    
    return self;
@@ -269,7 +270,7 @@ var _CPWindowViewResizeIndicatorImage = nil;

 - (CGSize)toolbarOffset
 {
-    return CGSizeMakeZero();
+    return _toolbarOffset;
 }

 - (CPColor)toolbarLabelColor
@@ -44,6 +44,11 @@ parser.option("-s", "--split", "number", "split")
    .def(0)
    .help("Split into multiple files");

+parser.option("-c", "--compressor", "compressor")
+    .def("shrinksafe")
+    .set()
+    .help("Select a compressor to use (closure-compiler, yuicompressor, shrinksafe), or \"none\" (default: shrinksafe)");
+
 parser.option("-v", "--verbose", "verbose")
   .def(false)
   .set(true)
@@ -110,7 +115,14 @@ function main(args)
    FILE.copyTree(rootPath, outputPath);

    applicationJSs.forEach(function(applicationJS, n) {
-        outputPath.join("Application"+(n||"")+".js").write(applicationJS);
+        var name = "Application"+(n||"")+".js";
+        if (options.compressor === "none") {
+            print("skipping compression: " + name);
+        } else {
+            print("compressing: " + name);
+            applicationJS = require("minify/"+options.compressor).compress(applicationJS, { charset : "UTF-8", useServer : true });
+        }
+        outputPath.join(name).write(applicationJS, { charset : "UTF-8" });
    });

    rewriteMainHTML(outputPath.join(options.index));
@@ -133,11 +145,14 @@ ObjectiveJFlattener.prototype.buildApplicationJS = function() {
    this.serializeFunctions();
    this.serializeFileCache();

+    var additions = FILE.read(FILE.join(FILE.dirname(module.path), "..", "..", "cappuccino", "lib", "cappuccino", "objj-flatten-additions.js"), { charset:"UTF-8" });
+
    var applicationJSs = [];

    if (this.options.split === 0) {
        var buffer = [];
        buffer.push("var baseURL = new CFURL(\".\", ObjectiveJ.pageURL);");
+        buffer.push(additions);
        buffer.push(this.fileCacheBuffer.join("\n"));
        buffer.push(this.functionsBuffer.join("\n"));
        buffer.push("ObjectiveJ.bootstrap();");
@@ -160,11 +175,13 @@ ObjectiveJFlattener.prototype.buildApplicationJS = function() {
        }

        buffers[0].push("var baseURL = new CFURL(\".\", ObjectiveJ.pageURL);");
+        buffers[0].push(additions);

        buffers[0].push("var appFilesCount = " + appFilesCount +";");
        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("}");
@@ -237,7 +254,6 @@ ObjectiveJFlattener.prototype.serializeFunctions = function() {
 }

 ObjectiveJFlattener.prototype.serializeFileCache = function() {
-    this.fileCacheBuffer.push(FILE.read(FILE.join(FILE.dirname(module.path), "..", "..", "cappuccino", "lib", "cappuccino", "objj-flatten-additions.js"), { charset:"UTF-8" }));
    for (var relative in this.filesToCache) {
        var contents = this.filesToCache[relative];
        print("caching: " + relative + " => " + (contents == null ? 404 : 200));
@@ -282,21 +298,30 @@ ObjectiveJFlattener.prototype.setupFileCache = function() {
 }

 // "$1" is the matching indentation
-var scriptTagsBefore = '$1<script type = "text/javascript">\n$1    OBJJ_AUTO_BOOTSTRAP = false;\n$1</script>';
-var scriptTagsAfter  = '$1<script type = "text/javascript" src = "Application.js"></script>';
+var scriptTagsBefore =
+    '$1<script type = "text/javascript">\n'+
+    '$1    OBJJ_AUTO_BOOTSTRAP = false;\n'+
+    '$1</script>';
+
+var scriptTagsAfter =
+    '$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()) {
-        var indexHTML = indexHTMLPath.read();
+        var indexHTML = indexHTMLPath.read({ charset : "UTF-8" });

        // inline the Application.js if it's smallish
        var applicationJSPath = indexHTMLPath.dirname().join("Application.js");
        if (applicationJSPath.size() < 10*1024) {
-            var applicationJS = applicationJSPath.read().split("\n").join("\n$1    ");
-            scriptTagsAfter = '$1<script type = "text/javascript">\n$1    '+applicationJS+'\n$1</script>'
+            // escape any dollar signs by replacing them with two
+            // then indent by splitting/joining on newlines
+            scriptTagsAfter =
+                '$1<script type="text/javascript">\n'+
+                '$1    ' + applicationJSPath.read({ charset : "UTF-8" }).replace(/\$/g, "$$$$").split("\n").join("\n$1    ")+'\n'+
+                '$1</script>';
        }

        // attempt to find Objective-J script tag and add ours
@@ -305,7 +330,7 @@ function rewriteMainHTML(indexHTMLPath) {

        if (newIndexHTML !== indexHTML) {
            stream.print("\0green(Modified: "+indexHTMLPath+".\0)");
-            indexHTMLPath.write(newIndexHTML);
+            indexHTMLPath.write(newIndexHTML, { charset : "UTF-8" });
            return;
        }
    } else {
@@ -31,6 +31,11 @@ ObjectiveJRuntimeAnalyzer = function(rootPath)
        return url ? url.absoluteURL().path() : null;
    }

+    this.require("cappuccino/objj-flatten-additions");
+
+    if (!this.context.global.CFHTTPRequest._lookupCachedRequest)
+        print("Warning: CFHTTPRequest._lookupCachedRequest. Need to import objj-flatten-additions module.");
+
    var requestedURLs = this.requestedURLs = {};
    var _lookupCachedRequest = this.context.global.CFHTTPRequest._lookupCachedRequest;
    this.context.global.CFHTTPRequest._lookupCachedRequest = function(aURL) {
@@ -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>");
@@ -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>");
@@ -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>");
@@ -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>");
@@ -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>");
@@ -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>");
@@ -1,3 +1,3 @@
 {
-    "version": "0.8.0"
+    "version": "0.8.1"
 }
Author	SHA1	Message	Date
Francisco Ryan Tolmasky I	b2fdc89e1d	Upped the version number to 0.8.1. Reviewed by me.	2010-04-09 22:21:37 -07:00
Francisco Ryan Tolmasky I	70ea654c60	One additional fix for IE not loading in certain occasions. Reviewed by me.	2010-04-08 23:54:20 -07:00
Francisco Ryan Tolmasky I	1e0c3b73a8	Fix for IE not loading bug. Reviewed by me.	2010-04-07 19:50:35 -07:00
Tom Robinson	e719978079	Re-enable flatten compression by default.	2010-04-01 23:49:23 -07:00
Tom Robinson	fe3e7795b2	Add charset attributes to all external script tags, including flatten. Fixes unicode bugs in flatten.	2010-04-01 23:39:14 -07:00
Tom Robinson	8f1972799d	Add some charset options, and disable compressor by default.	2010-04-01 23:16:25 -07:00
Tom Robinson	5858360b4c	Add comrpessor support to flatten.	2010-04-01 12:01:45 -07:00
Tom Robinson	a9d71ca6dd	Fixes flatten, splitting mode. Also escape dollar signs before replacing.	2010-04-01 11:08:47 -07:00
Tom Robinson	f2be5b49d0	Fixes flatten, non-splitting mode.	2010-04-01 10:57:17 -07:00