makes controller accept strings

jupiterjs · Dec 19, 2011 · 3528bf9 · 3528bf9
1 parent 808c624
commit 3528bf9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/controller/controller_core.js b/controller/controller_core.js
@@ -559,7 +559,8 @@ steal('jquery/class/class_core.js', 'jquery/lang/string', 'jquery/event/destroye
 			var funcName, ready, cls = this.constructor;
 
 			//want the raw element here
-			element = element.jquery ? element[0] : element;
+			element = (typeof element == 'string' ? $(element) :
+				(element.jquery ? element : [element]) )[0];
 
 			//set element and className on element
 			var pluginname = cls.pluginName || cls._fullName;
@@ -672,7 +673,7 @@ steal('jquery/class/class_core.js', 'jquery/lang/string', 'jquery/event/destroye
 			 *       }
 			 *     }
 			 */
-			return this.element;
+			return [this.element, this.options];
 		},
 		/**
 		 * Bind attaches event handlers that will be 

diff --git a/mvc/mvc_test.js b/mvc/mvc_test.js
@@ -83,7 +83,7 @@ test("Controller Basics",3,function(){
 	});
 
 
-	var tasks = new Tasks( $('#qunit-test-area') , {
+	var tasks = new Tasks( '#qunit-test-area' , {
 		Task : Task
 	})
 	$('#qunit-test-area').click();