Commit e4382e02 authored by Jérome Perrin's avatar Jérome Perrin

jslint

parent 868e01fc
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
// XXX node_id is added like a property so that one can change the node // XXX node_id is added like a property so that one can change the node
// id // id
var gadget = this, var gadget = this,
queue, queue;
property;
gadget.props.key = options.key; // used for recursive fieldsets gadget.props.key = options.key; // used for recursive fieldsets
gadget.props.field_gadget_list = []; gadget.props.field_gadget_list = [];
......
...@@ -416,7 +416,7 @@ ...@@ -416,7 +416,7 @@
function expandSchema(class_definition, full_schema) { function expandSchema(class_definition, full_schema) {
// minimal expanding of json schema, supports merging allOf and $ref // minimal expanding of json schema, supports merging allOf and $ref
// references // references
var name, property, referenced, i, var property, referenced, i,
expanded_class_definition = {properties: expanded_class_definition = {properties:
class_definition.properties || {}}; class_definition.properties || {}};
if (class_definition.allOf) { if (class_definition.allOf) {
...@@ -429,7 +429,9 @@ ...@@ -429,7 +429,9 @@
], ],
full_schema); full_schema);
} }
for (property in (referenced.properties || [])) { if (referenced.properties) {
for (property in referenced.properties) {
if (referenced.properties.hasOwnProperty(property)) {
if (referenced.properties[property].type) { if (referenced.properties[property].type) {
expanded_class_definition.properties[property] expanded_class_definition.properties[property]
= referenced.properties[property]; = referenced.properties[property];
...@@ -437,6 +439,8 @@ ...@@ -437,6 +439,8 @@
} }
} }
} }
}
}
return expanded_class_definition; return expanded_class_definition;
} }
...@@ -551,7 +555,7 @@ ...@@ -551,7 +555,7 @@
gadget.props.data.graph.node[node_id] = node_data; gadget.props.data.graph.node[node_id] = node_data;
if (coordinate === undefined) { if (coordinate === undefined) {
coordinate = {top: 0, left: 0} coordinate = {top: 0, left: 0};
} }
node_data.coordinate = updateElementCoordinate( node_data.coordinate = updateElementCoordinate(
...@@ -621,7 +625,6 @@ ...@@ -621,7 +625,6 @@
reject(e); reject(e);
} }
}; };
gadget.props.main.addEventListener('drop', callback, false); gadget.props.main.addEventListener('drop', callback, false);
} }
...@@ -664,7 +667,6 @@ ...@@ -664,7 +667,6 @@
this.props.main = this.props.element.querySelector('#main'); this.props.main = this.props.element.querySelector('#main');
initJsPlumb(this); initJsPlumb(this);
this.props.nodes_click_monitor = RSVP.Monitor(); this.props.nodes_click_monitor = RSVP.Monitor();
$.each(this.props.data.graph.node, function (key, value) { $.each(this.props.data.graph.node, function (key, value) {
addNode(gadget, key, value); addNode(gadget, key, value);
}); });
......
/*global rJS, JSON, QUnit, jQuery*/ /*global rJS, JSON, QUnit, jQuery, RSVP, console*/
(function (rJS, JSON, QUnit, $) { (function (rJS, JSON, QUnit, RSVP) {
"use strict"; "use strict";
var start = QUnit.start, var start = QUnit.start,
stop = QUnit.stop, stop = QUnit.stop,
...@@ -185,4 +185,4 @@ ...@@ -185,4 +185,4 @@
}); });
}(rJS, JSON, QUnit, jQuery)); }(rJS, JSON, QUnit, RSVP));
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"use strict"; "use strict";
var gadget_klass = rJS(window); var gadget_klass = rJS(window);
function saveGraph(evt) { function saveGraph(evt) {
var gadget = this, graph_data; var gadget = this;
return new RSVP.Queue().push(function() { return new RSVP.Queue().push(function() {
// Prevent double click // Prevent double click
if (evt) { if (evt) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment