Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
dream
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
dream
Commits
9e339eec
Commit
9e339eec
authored
Nov 25, 2014
by
Jérome Perrin
Committed by
Ioannis Papagiannopoulos
Dec 18, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jslint
parent
58b4395b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
94 additions
and
93 deletions
+94
-93
dream/platform/src/fieldset/fieldset.js
dream/platform/src/fieldset/fieldset.js
+2
-3
dream/platform/src/jsplumb/jsplumb.js
dream/platform/src/jsplumb/jsplumb.js
+10
-8
dream/platform/src/jsplumb/test.js
dream/platform/src/jsplumb/test.js
+81
-81
dream/platform/static/dream/Input_viewProductionLine.js
dream/platform/static/dream/Input_viewProductionLine.js
+1
-1
No files found.
dream/platform/src/fieldset/fieldset.js
View file @
9e339eec
...
...
@@ -21,8 +21,7 @@
// XXX node_id is added like a property so that one can change the node
// id
var
gadget
=
this
,
queue
,
property
;
queue
;
gadget
.
props
.
key
=
options
.
key
;
// used for recursive fieldsets
gadget
.
props
.
field_gadget_list
=
[];
...
...
@@ -78,7 +77,7 @@
).
forEach
(
function
(
property_name
)
{
var
property_definition
=
options
.
property_definition
.
properties
[
property_name
],
value
=
(
options
.
value
||
{})[
property_name
]
===
undefined
value
=
(
options
.
value
||
{})[
property_name
]
===
undefined
?
property_definition
.
_default
:
options
.
value
[
property_name
];
// XXX some properties are not editable
if
(
property_name
!==
'
coordinate
'
&&
property_name
!==
'
_class
'
)
{
...
...
dream/platform/src/jsplumb/jsplumb.js
View file @
9e339eec
...
...
@@ -416,7 +416,7 @@
function
expandSchema
(
class_definition
,
full_schema
)
{
// minimal expanding of json schema, supports merging allOf and $ref
// references
var
name
,
property
,
referenced
,
i
,
var
property
,
referenced
,
i
,
expanded_class_definition
=
{
properties
:
class_definition
.
properties
||
{}};
if
(
class_definition
.
allOf
)
{
...
...
@@ -429,10 +429,14 @@
],
full_schema
);
}
for
(
property
in
(
referenced
.
properties
||
[]))
{
if
(
referenced
.
properties
[
property
].
type
)
{
expanded_class_definition
.
properties
[
property
]
=
referenced
.
properties
[
property
];
if
(
referenced
.
properties
)
{
for
(
property
in
referenced
.
properties
)
{
if
(
referenced
.
properties
.
hasOwnProperty
(
property
))
{
if
(
referenced
.
properties
[
property
].
type
)
{
expanded_class_definition
.
properties
[
property
]
=
referenced
.
properties
[
property
];
}
}
}
}
}
...
...
@@ -551,7 +555,7 @@
gadget
.
props
.
data
.
graph
.
node
[
node_id
]
=
node_data
;
if
(
coordinate
===
undefined
)
{
coordinate
=
{
top
:
0
,
left
:
0
}
coordinate
=
{
top
:
0
,
left
:
0
}
;
}
node_data
.
coordinate
=
updateElementCoordinate
(
...
...
@@ -621,7 +625,6 @@
reject
(
e
);
}
};
gadget
.
props
.
main
.
addEventListener
(
'
drop
'
,
callback
,
false
);
}
...
...
@@ -664,7 +667,6 @@
this
.
props
.
main
=
this
.
props
.
element
.
querySelector
(
'
#main
'
);
initJsPlumb
(
this
);
this
.
props
.
nodes_click_monitor
=
RSVP
.
Monitor
();
$
.
each
(
this
.
props
.
data
.
graph
.
node
,
function
(
key
,
value
)
{
addNode
(
gadget
,
key
,
value
);
});
...
...
dream/platform/src/jsplumb/test.js
View file @
9e339eec
/*global rJS, JSON, QUnit, jQuery*/
/*global rJS, JSON, QUnit, jQuery
, RSVP, console
*/
(
function
(
rJS
,
JSON
,
QUnit
,
$
)
{
(
function
(
rJS
,
JSON
,
QUnit
,
RSVP
)
{
"
use strict
"
;
var
start
=
QUnit
.
start
,
stop
=
QUnit
.
stop
,
test
=
QUnit
.
test
,
equal
=
QUnit
.
equal
,
sample_class_definition
=
{
"
edge
"
:
{
"
description
"
:
"
Base definition for edge
"
,
"
properties
"
:
{
"
_class
"
:
{
"
type
"
:
"
string
"
},
"
destination
"
:
{
"
type
"
:
"
string
"
},
"
name
"
:
{
"
type
"
:
"
string
"
},
"
required
"
:
[
"
name
"
,
"
_class
"
,
"
source
"
,
"
destination
"
],
"
source
"
:
{
"
type
"
:
"
string
"
}
},
"
type
"
:
"
object
"
},
"
Example.Edge
"
:
{
"
_class
"
:
"
edge
"
,
"
allOf
"
:
[
{
"
$ref
"
:
"
#edge
"
},
{
"
properties
"
:
{
"
color
"
:
{
"
enum
"
:
[
"
red
"
,
"
green
"
,
"
blue
"
]
}
}
}
],
"
description
"
:
"
An example edge with a color property
"
},
"
Example.Node
"
:
{
"
_class
"
:
"
node
"
,
"
allOf
"
:
[
{
"
$ref
"
:
"
#node
"
},
{
"
properties
"
:
{
"
shape
"
:
{
"
type
"
:
"
string
"
}
}
}
],
"
description
"
:
"
An example node with a shape property
"
"
edge
"
:
{
"
description
"
:
"
Base definition for edge
"
,
"
properties
"
:
{
"
_class
"
:
{
"
type
"
:
"
string
"
},
"
destination
"
:
{
"
type
"
:
"
string
"
},
"
name
"
:
{
"
type
"
:
"
string
"
},
"
required
"
:
[
"
name
"
,
"
_class
"
,
"
source
"
,
"
destination
"
],
"
source
"
:
{
"
type
"
:
"
string
"
}
},
"
node
"
:
{
"
description
"
:
"
Base definition for node
"
,
"
type
"
:
"
object
"
},
"
Example.Edge
"
:
{
"
_class
"
:
"
edge
"
,
"
allOf
"
:
[
{
"
$ref
"
:
"
#edge
"
},
{
"
properties
"
:
{
"
_class
"
:
{
"
type
"
:
"
string
"
},
"
coordinate
"
:
{
"
properties
"
:
{
"
left
"
:
"
number
"
,
"
top
"
:
"
number
"
},
"
type
"
:
"
object
"
},
"
name
"
:
{
"
type
"
:
"
string
"
},
"
required
"
:
[
"
name
"
,
"
_class
"
"
color
"
:
{
"
enum
"
:
[
"
red
"
,
"
green
"
,
"
blue
"
]
}
}
}
],
"
description
"
:
"
An example edge with a color property
"
},
"
Example.Node
"
:
{
"
_class
"
:
"
node
"
,
"
allOf
"
:
[
{
"
$ref
"
:
"
#node
"
},
{
"
properties
"
:
{
"
shape
"
:
{
"
type
"
:
"
string
"
}
}
}
],
"
description
"
:
"
An example node with a shape property
"
},
"
node
"
:
{
"
description
"
:
"
Base definition for node
"
,
"
properties
"
:
{
"
_class
"
:
{
"
type
"
:
"
string
"
},
"
coordinate
"
:
{
"
properties
"
:
{
"
left
"
:
"
number
"
,
"
top
"
:
"
number
"
},
"
type
"
:
"
object
"
}
},
"
name
"
:
{
"
type
"
:
"
string
"
},
"
required
"
:
[
"
name
"
,
"
_class
"
]
},
"
type
"
:
"
object
"
}
},
sample_graph
=
{
"
edge
"
:
{
...
...
@@ -185,4 +185,4 @@
});
}(
rJS
,
JSON
,
QUnit
,
jQuery
));
}(
rJS
,
JSON
,
QUnit
,
RSVP
));
dream/platform/static/dream/Input_viewProductionLine.js
View file @
9e339eec
...
...
@@ -3,7 +3,7 @@
"
use strict
"
;
var
gadget_klass
=
rJS
(
window
);
function
saveGraph
(
evt
)
{
var
gadget
=
this
,
graph_data
;
var
gadget
=
this
;
return
new
RSVP
.
Queue
().
push
(
function
()
{
// Prevent double click
if
(
evt
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment