Merge branch 'master' of git://github.com/jupiterjs/jquerymx

moschel · moschel · commit 2c00f86a7478 · 2011-01-20T06:03:48.000-06:00
diff --git a/buildAll.js b/buildAll.js
@@ -90,7 +90,8 @@ steal.plugins('steal/build/pluginify','steal/build/apps','steal/build/scripts').
 		} else {
 			content = "("+s.build.pluginify.getFunction(content)+")(jQuery);";
 		}
-		var out = path.replace(/\/\w+\.js/,"").replace(/\//g,".")
+		var out = path.replace(/\/\w+\.js/,"").replace(/\//g,".");
+		content = steal.build.builders.scripts.clean(content);
 		print("  "+out+"");
 		content = steal.build.builders.scripts.clean(content);
 		s.File("jquery/dist/standalone/"+out+".js").save(content);
diff --git a/controller/history/history.js b/controller/history/history.js
@@ -2,12 +2,27 @@ steal.plugins('jquery/controller/subscribe',
 	'jquery/event/hashchange').then(function($){
 
 /**
- * @class
- * The controller history plugin adds browser hash (#) based history support.
- * This class itself helps break up parts of the hash of the url
- * @constructor 
- * Takes a url and extracts information out of it.
- * @param {Object} path
+ * @page jquery.controller.history History Events
+ * @parent jQuery.Controller
+ * @plugin jquery/controller/history
+ * The jquery/controller/history plugin adds 
+ * browser hash (#) based history support.
+ * 
+ * Typically you subscribe to a history event in your controllers:
+ * 
+ *     $.Controller("MyHistory",{
+ *       "history.pagename subscribe" : function(called, data){
+ *         //called when hash = #pagename
+ *       }
+ *     })
+ * 
+ * The following shows hash values and 
+ * the corresponding published message and data.
+ * 
+ *     "#foo=bar" -> "history.index" {foo: bar}
+ *     "#foo/bar" -> "history.foo.bar" {}
+ *     "#foo&bar=baz" -> "history.foo" {bar: baz}
+ *     
  */
 
 var keyBreaker = /([^\[\]]+)|(\[\])/g;
diff --git a/download/download.css b/download/download.css
@@ -52,7 +52,7 @@ body {
 
 #plugins .plugin{
 	float: right;
-	padding: 0px 0px 18px 0px;
+	padding: 0px;
 	overflow: auto;
 	width: 422px;
 	
diff --git a/download/download.html b/download/download.html
@@ -399,8 +399,9 @@ <h3>Tie</h3>
 				
 				
 			</div>
-			
-			<input class="dl_btn_container" type="submit" value="Download">
+			<div class="download-builder">
+        		<input type="submit" class="dl_btn_container" value="Download">
+            </div>
 			
 		</form>
 		<script type='text/javascript' src='../jquery.js'></script>
diff --git a/download/download.js b/download/download.js
@@ -9,6 +9,29 @@
 				});
 			$('#pluginForm').delegate("input[type=checkbox]", "change", 
 				$.proxy($.Downloader.changeHandler, $.Downloader));
+				
+			// append css if necessary
+			if(location.search && /csspath/.test(location.search)){
+				var path = location.search.split("=")[1];
+				var headID = document.getElementsByTagName("head")[0],
+					cssNode = document.createElement('link');
+				cssNode.type = 'text/css';
+				cssNode.rel = 'stylesheet';
+				cssNode.href = path;
+				cssNode.media = 'screen';
+				headID.appendChild(cssNode);
+			}
+			
+			$.Downloader.setupWordbreaks();
+		},
+		// inject <wbr> characters in labels
+		setupWordbreaks: function(){
+			var text, newText;
+			$(".plugin label").each(function(i){
+				text = $(this).text();
+				newText = text.replace(/\//g, "<wbr>/")
+				$(this).html(newText);
+			})
 		},
 		changeHandler: function(ev){
 			var $target = $(ev.target);
@@ -36,8 +59,7 @@
 		 	var dep, i, index;
 		 	for(i=0; i<dependencies.length; i++){
 				dep = dependencies[i];
-				index = this.dependencies.indexOf(dep);
-				if(index != -1) {
+				if(!$.inArray(dep, this.dependencies)) {
 					this.dependencies.splice(index, 1);
 				}
 				this.dependencies.push(dep);
diff --git a/download/test/controllerpage.html b/download/test/controllerpage.html
@@ -0,0 +1,15 @@
+<html>
+    <head>
+        <title>Test</title>
+    </head>
+    <body>
+		<script type='text/javascript' src='jquery-1.4.3.js'></script>
+		<script type='text/javascript' src='../../dist/standalone/jquery.lang.js'></script>
+		<script type='text/javascript' src='../../dist/standalone/jquery.class.js'></script>
+		<script type='text/javascript' src='../../dist/standalone/jquery.event.destroyed.js'></script>
+		<script type='text/javascript' src='../../dist/standalone/jquery.controller.js'></script>
+		<script type='text/javascript'>
+			$.Controller.extend('MyController', {}, {});
+		</script>
+    </body>
+</html>
diff --git a/download/test/jquery-1.4.3.js b/download/test/jquery-1.4.3.js
diff --git a/download/test/run.js b/download/test/run.js
diff --git a/test/run.js b/test/run.js

-Original file line number
+Diff line change
 +// load('steal/compress/test/run.js')
 +/**
 + * Tests compressing a very basic page and one that is using steal
 + */
 +load('steal/rhino/steal.js')
 +steal('//steal/test/test', function( s ) {
 +	STEALPRINT = false;
 +	s.test.module("jquery/download")
++
 +	s.test.test("controller", function(){
 +		load('steal/rhino/steal.js')
 +		s.test.open('jquery/download/test/controllerpage.html')
 +		s.test.ok(MyController, "Controller was loaded")
 +		s.test.clear();
 +	});
 +});
-Original file line number
+Diff line change
 // loads all of jquerymx's command line tests
 +load("jquery/download/test/run.js");
++
 load('jquery/view/test/compression/run.js');
 load("jquery/generate/test/run.js");