Skip to content

Commit 629189d

Browse files
committed
fixed problem when callback functions werent defined
1 parent b1333c6 commit 629189d

File tree

5 files changed

+69
-26
lines changed

5 files changed

+69
-26
lines changed

build/forms.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ var generateField = React.createClass({displayName: 'generateField',
289289

290290
var genericField = React.createClass({displayName: 'genericField',
291291
render: function(){
292+
console.log(this.props.minimum);
292293
return(
293294
React.DOM.div( {className:"element inputfield"},
294295
React.DOM.p( {dangerouslySetInnerHTML:{__html: this.props.description}} ),
@@ -380,8 +381,14 @@ var selectField = React.createClass({displayName: 'selectField',
380381
});
381382

382383
var forms = [];
384+
if(!formjsSubmit) var formjsSubmit = null;
385+
if(!formjsFilesOnSubmit) var formjsFilesOnSubmit = null;
386+
if(!formjsFilesOnSelect) var formjsFilesOnSelect = null;
387+
if(!formjsCurrent) var formjsCurrent = null;
388+
if(!formjsFilesOnSelect) var formjsFilesOnSelect = null;
389+
383390
for (var i = 0; i < schema.length; i++) {
384-
forms.push(formjs( {data:schema[i], iteration:i, submitState:formjsSubmit, filesOnSubmit:formjsFilesOnSubmit, filesOnSelect:formjsFilesOnSelect, currentState:formjsCurrent} ));
391+
forms.push(formjs( {data:schema[i], iteration:i, submitState:formjsSubmit, filesOnSubmit:formjsFilesOnSubmit, filesOnSelect:formjsFilesOnSelect, currentState:formjsCurrent} ));
385392
}
386393
React.renderComponent(
387394
React.DOM.div(null, forms),

index.html

+18-20
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,23 @@
55
<script src="underscore-min.js"></script>
66
<script type="text/javascript">
77

8-
function formjsCurrent(data){
9-
console.log(data);
10-
}
11-
function formjsSubmit(data){
12-
//console.log(data);
13-
}
14-
function formjsFilesOnSubmit(data){
15-
console.log(data);
16-
}
17-
function formjsFilesOnSelect(data){
18-
console.log(data);
19-
}
8+
// function formjsCurrent(data){
9+
// console.log('current state');
10+
// console.log(data);
11+
// }
12+
// function formjsSubmit(data){
13+
// console.log('form submit');
14+
// console.log(data);
15+
16+
// }
17+
// function formjsFilesOnSubmit(data){
18+
// console.log('files array on submit');
19+
// console.log(data);
20+
// }
21+
// function formjsFilesOnSelect(data){
22+
// console.log('files array on selecte');
23+
// console.log(data);
24+
// }
2025
var values = [{
2126
"title": "Hello world",
2227
"bullets": [
@@ -58,11 +63,6 @@
5863
"type": "number",
5964
"title": "score",
6065
"enum": [1.5, 5.5, 9.5]
61-
},
62-
"score2": {
63-
"type": "number",
64-
"title": "score2",
65-
"enum": [1.5, 5.5, 9.5]
6666
}
6767

6868
}
@@ -82,8 +82,7 @@
8282
"age": {
8383
"type": "integer",
8484
"minimum": 0,
85-
"maximum": 150,
86-
"step": 21
85+
"maximum": 150
8786
},
8887
"birthday": {
8988
"type": "string",
@@ -92,7 +91,6 @@
9291
"email": {
9392
"type": "string",
9493
"format": "email",
95-
"ux-widget": "textarea"
9694
}
9795
}
9896
}

jquery-1.11.0.min.js

-4
This file was deleted.

package.json

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"name": "formjs",
3+
"preferGlobal": true,
4+
"version": "0.9.0",
5+
"author": "Zach Silveira <[email protected]>",
6+
"description": "form generating from json schema data using Reactjs",
7+
"contributors": [
8+
{
9+
"name": "Jason Kraus",
10+
"email": "[email protected]"
11+
}
12+
],
13+
"main": "./lib/http-server",
14+
"repository": {
15+
"type": "git",
16+
"url": "https://github.com/nodejitsu/http-server.git"
17+
},
18+
"keywords": [
19+
"react",
20+
"form",
21+
"alpachajs"
22+
],
23+
"dependencies" : {
24+
"underscore" : "1.6.0",
25+
"react" : "0.9.0"
26+
},
27+
"bundledDependencies": [
28+
"union",
29+
"ecstatic"
30+
],
31+
"license": "MIT",
32+
"engines": {
33+
"node": ">=0.6"
34+
}
35+
}

src/forms.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ var generateField = React.createClass({
289289

290290
var genericField = React.createClass({
291291
render: function(){
292+
console.log(this.props.minimum);
292293
return(
293294
<div className="element inputfield">
294295
<p dangerouslySetInnerHTML={{__html: this.props.description}} />
@@ -380,8 +381,14 @@ var selectField = React.createClass({
380381
});
381382

382383
var forms = [];
384+
if(!formjsSubmit) var formjsSubmit = null;
385+
if(!formjsFilesOnSubmit) var formjsFilesOnSubmit = null;
386+
if(!formjsFilesOnSelect) var formjsFilesOnSelect = null;
387+
if(!formjsCurrent) var formjsCurrent = null;
388+
if(!formjsFilesOnSelect) var formjsFilesOnSelect = null;
389+
383390
for (var i = 0; i < schema.length; i++) {
384-
forms.push(<formjs data={schema[i]} iteration={i} submitState={formjsSubmit} filesOnSubmit={formjsFilesOnSubmit} filesOnSelect={formjsFilesOnSelect} currentState={formjsCurrent} />);
391+
forms.push(<formjs data={schema[i]} iteration={i} submitState={formjsSubmit} filesOnSubmit={formjsFilesOnSubmit} filesOnSelect={formjsFilesOnSelect} currentState={formjsCurrent} />);
385392
}
386393
React.renderComponent(
387394
<div>{forms}</div>,

0 commit comments

Comments
 (0)