merlin field var change

Tyler Madsen · Tyler Madsen · commit be266c3d5ed4 · 2012-04-18T10:41:37.000-04:00
diff --git a/lib/tc.merlin.js b/lib/tc.merlin.js
@@ -136,12 +136,12 @@
 						
 						for(k in o.steps[i].fields){
 							
-							if (o.steps[i].fields[j].options && o.steps[i].fields[j].options.extensions && o.steps[i].fields[j].options.extensions.Validator) {
-								o.steps[i].fields[j].options.extensions.Validator.manager = o.steps[i].validationManager;
+							if (o.steps[i].fields[k].options && o.steps[i].fields[k].options.extensions && o.steps[i].fields[k].options.extensions.Validator) {
+								o.steps[i].fields[k].options.extensions.Validator.manager = o.steps[i].validationManager;
 							}
-							o.steps[i].fields[j].component = NI.field.new_instance({
-								element: o.steps[i].$e.find(o.steps[i].fields[j].selector),
-								preprocess: $.isFunction(o.steps[i].fields[j].preprocess) ? o.steps[i].fields[j].preprocess : null,
+							o.steps[i].fields[k].component = NI.field.new_instance({
+								element: o.steps[i].$e.find(o.steps[i].fields[k].selector),
+								preprocess: $.isFunction(o.steps[i].fields[k].preprocess) ? o.steps[i].fields[k].preprocess : null,
 								options: $.extend({
 									handlers: {
 										focus: step_input_handlers.focus,
@@ -154,11 +154,11 @@
 									event_data:{
 										merlin:me
 									}
-								}, o.steps[i].fields[j].options)
+								}, o.steps[i].fields[k].options)
 							});
 
-							if(o.steps[i].fields[j].value || (o.steps[i].fields[j].value === '')){
-								o.steps[i].fields[j].component.set_val(o.steps[i].fields[j].value);
+							if(o.steps[i].fields[k].value || (o.steps[i].fields[k].value === '')){
+								o.steps[i].fields[k].component.set_val(o.steps[i].fields[k].value);
 							}
 						}
 					}

Original file line number	Diff line number	Diff line change
`@@ -136,12 +136,12 @@`
`136`	`136`
`137`	`137`	`for(k in o.steps[i].fields){`
`138`	`138`
`139`		`- if (o.steps[i].fields[j].options && o.steps[i].fields[j].options.extensions && o.steps[i].fields[j].options.extensions.Validator) {`
`140`		`- o.steps[i].fields[j].options.extensions.Validator.manager = o.steps[i].validationManager;`
	`139`	`+ if (o.steps[i].fields[k].options && o.steps[i].fields[k].options.extensions && o.steps[i].fields[k].options.extensions.Validator) {`
	`140`	`+ o.steps[i].fields[k].options.extensions.Validator.manager = o.steps[i].validationManager;`
`141`	`141`	`}`
`142`		`- o.steps[i].fields[j].component = NI.field.new_instance({`
`143`		`- element: o.steps[i].$e.find(o.steps[i].fields[j].selector),`
`144`		`- preprocess: $.isFunction(o.steps[i].fields[j].preprocess) ? o.steps[i].fields[j].preprocess : null,`
	`142`	`+ o.steps[i].fields[k].component = NI.field.new_instance({`
	`143`	`+ element: o.steps[i].$e.find(o.steps[i].fields[k].selector),`
	`144`	`+ preprocess: $.isFunction(o.steps[i].fields[k].preprocess) ? o.steps[i].fields[k].preprocess : null,`
`145`	`145`	`options: $.extend({`
`146`	`146`	`handlers: {`
`147`	`147`	`focus: step_input_handlers.focus,`
`@@ -154,11 +154,11 @@`
`154`	`154`	`event_data:{`
`155`	`155`	`merlin:me`
`156`	`156`	`}`
`157`		`- }, o.steps[i].fields[j].options)`
	`157`	`+ }, o.steps[i].fields[k].options)`
`158`	`158`	`});`
`159`	`159`
`160`		`- if(o.steps[i].fields[j].value \|\| (o.steps[i].fields[j].value === '')){`
`161`		`- o.steps[i].fields[j].component.set_val(o.steps[i].fields[j].value);`
	`160`	`+ if(o.steps[i].fields[k].value \|\| (o.steps[i].fields[k].value === '')){`
	`161`	`+ o.steps[i].fields[k].component.set_val(o.steps[i].fields[k].value);`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`	`}`