Permalink
Browse files

renamed files. Added bookmarklet example

  • Loading branch information...
1 parent ee74adc commit 13a59a083a21b08b781417fb8260c6323f0e1b76 @jbasdf jbasdf committed Dec 22, 2011
Showing with 31 additions and 7 deletions.
  1. +6 −2 app.rb
  2. +20 −0 bookmarklet.html
  3. +1 −2 index_dev.html → dev.html
  4. +1 −2 index.html
  5. 0 index_jquery.html → jquery.html
  6. +3 −1 public/js/app.build.js
View
8 app.rb
@@ -6,9 +6,13 @@
end
get '/dev' do
- File.read('index_dev.html')
+ File.read('dev.html')
end
get '/jquery' do
- File.read('index_jquery.html')
+ File.read('jquery.html')
+end
+
+get '/bookmarklet' do
+ File.read('bookmarklet.html')
end
View
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+ <title></title>
+ <meta http-equiv="content-type" content="text/xhtml; charset=utf-8" />
+ <meta http-equiv="imagetoolbar" content="no" />
+ <meta name="distribution" content="all" />
+ <meta name="robots" content="all" />
+ <meta name="resource-type" content="document" />
+ <meta name="MSSmartTagsPreventParsing" content="true" />
+ <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.js"></script>
+</head>
+<body>
+ <div id="bookmarklet">
+ <h1>Bookmarklet</h1>
+ <h2>Drag this bookmarklet to your toolbar:</h2>
+ <a id="bookmarklet" href="javascript:(function(){var%20s=document.createElement('script');s.setAttribute('type','text/javascript');s.setAttribute('src','http://localhost:4567/js/min-main.js');document.body.appendChild(s);})();">bookmarklet</a>
+ </div>
+</body>
+</html>
@@ -10,8 +10,7 @@
<meta name="MSSmartTagsPreventParsing" content="true" />
</head>
<body>
- <div id="container"></div>
- <div id="content" style="width:100%;height:90%;background-color:transparent;"></div>
+ <div id="container">This file doesn't attempt to compress or merge the javascript</div>
<script src="js/libs/require/require.js" data-main="js/main"></script>
</body>
</html>
View
@@ -10,8 +10,7 @@
<meta name="MSSmartTagsPreventParsing" content="true" />
</head>
<body>
- <div id="container"></div>
- <div id="content" style="width:100%;height:90%;background-color:transparent;"></div>
+ <div id="container">This shows all files built with almond</div>
<script src="/js/min-main.js"></script>
</body>
</html>
File renamed without changes.
View
@@ -56,7 +56,9 @@ var runner = configs.reduceRight(function(prev, currentConfig) {
return function (buildReportText) {
requirejs.optimize(mix(currentConfig), prev);
};
-}, function(buildReportText) {} );
+}, function(buildReportText){
+ console.log(buildReportText);
+});
//Run the builds
runner();

0 comments on commit 13a59a0

Please sign in to comment.