Adding url subscriber. Closes #22

readme.md

@@ -375,6 +375,14 @@ Generates:
 		<legend type="ui-dform-legend">Address</label>
 	</fieldset>
 
+**url** *{String|Object}*<br />
+The `url` subscriber issues a `$(element).dform('ajax', options)` request to load content from remote files.
+
+	{
+		"type" : "div",
+		"url": "form.json"
+	}
+
 **type** *{String}*<br />
 Besides looking up the correct Type Generator it also adds a dform specific class to the element using
 `$.dform.options.prefix` (*ui-dform-* by default) and the type name.

src/dform.core.js

@@ -195,10 +195,9 @@
 		 * @param options
 		 * @param type
 		 */
-		"url" : function (options, type) {
-			// TODO this.buildForm(options);
+		"url" : function (options) {
+			this.dform('ajax', options);
 		},
-
 		/**
 		 * Post processing function, that will run whenever all other subscribers are finished.
 		 *

src/dform.js

@@ -62,7 +62,7 @@
 		 * @return {Object} A new object with all properties of the given object, except
 		 * for the ones given in the list of keys
 		 */
-			withoutKeys = function (object, keys) {
+		withoutKeys = function (object, keys) {
 			var result = {};
 			each(object, function (index, value) {
 				if (!~$.inArray(index, keys)) {
@@ -278,18 +278,19 @@
 				 */
 				ajax : function (params, success, error) {
 					var options = {
-						success: function (data) {
-							self.dform(data);
-							if(success) {
-								success.call(self, data);
-							}
-						},
 						error : error,
 						url : params
 					}, self = this;
 					if (typeof params !== 'string') {
 						$.extend(options, params);
 					}
+					options.success = function (data) {
+						var callback = success || params.success;
+						self.dform(data);
+						if(callback) {
+							callback.call(self, data);
+						}
+					}
 					$.ajax(options);
 				},
 				/**

test/test.js

@@ -56,7 +56,7 @@ $(document).ready(function () {
 		equal(created.data('test'), 'Test data attribute', 'Added test data attribute');
 	});
 
-	test("Ajax", 2, function() {
+	test("Ajax", 3, function() {
 		stop();
 		$('<div>').dform('test.json', function(data) {
 			equal(data.html, 'The test', 'Data passed to success callback');

test/test_subscribers.js

@@ -70,9 +70,9 @@ $(document).ready(function () {
 
 	test("caption", function () {
 		var simple = $('<div>').dform({
-			type : 'text',
-			caption : 'The test'
-		}).find('label'),
+				type : 'text',
+				caption : 'The test'
+			}).find('label'),
 			asElement = $('<div>').dform({
 				type : 'text',
 				caption : {
@@ -89,9 +89,9 @@ $(document).ready(function () {
 
 	test("options", function () {
 		var options = {
-			test1 : 'Test 1',
-			test2 : 'Test 2'
-		},
+				test1 : 'Test 1',
+				test2 : 'Test 2'
+			},
 			select = $('<select>').dform({
 				type : 'select',
 				options : $.extend(true, { test3 : {
@@ -109,4 +109,18 @@ $(document).ready(function () {
 		ok(checkboxes.find('[type="checkbox"][value="test1"]').length);
 		equal(checkboxes.find('label:first').html(), 'Test 1', 'Set for and found label');
 	});
+
+	test("url", function() {
+		stop();
+		$('<div>').dform({
+			type: 'div',
+			url: {
+				url: 'test.json',
+				success: function() {
+					equal($(this).html(), 'The test', 'Subscriber ran, got text');
+					start();
+				}
+			}
+		});
+	});
 });