Toggle navigation
Toggle navigation
This project
Loading...
Sign in
arcs
/
arcs.js
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
3
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
Jean-Yves Didier
2016-12-02 11:40:24 +0100
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
3dea8e8e1dfc9a508cb875c68586efe67346f8b6
3dea8e8e
1 parent
07d1f3f4
Update of .gitignore
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
.gitignore
build/arcs.js
build/arcs.min.js
.gitignore
View file @
3dea8e8
bower_components/
nodes_modules/
node_modules/
!deps/{pose,surf,three.js}/
*~
...
...
build/arcs.js
View file @
3dea8e8
...
...
@@ -352,16 +352,18 @@ ARCS.Context = function( ctx ) {
var
p
,
promises
=
[];
for
(
p
in
components
)
{
if
(
components
.
hasOwnProperty
(
p
))
{
if
(
components
.
hasOwnProperty
(
p
))
{
if
(
factories
[
components
[
p
].
type
]
===
undefined
)
{
console
.
error
(
"[ARCS] Factory "
+
components
[
p
].
type
+
" not found."
);
console
.
error
(
"[ARCS] Context dump follows: "
,
libraries
,
components
,
constants
);
return
;
}
factory
=
factories
[
components
[
p
].
type
];
try
{
if
(
components
[
p
].
value
!==
undefined
||
components
[
p
].
url
!==
undefined
||
components
[
p
].
ref
!==
undefined
)
{
if
(
components
[
p
].
value
!==
undefined
)
{
console
.
log
(
"instanciating "
,
p
);
components
[
p
].
instance
=
new
factory
(
components
[
p
].
value
);
}
if
(
components
[
p
].
url
!==
undefined
)
{
...
...
@@ -379,6 +381,7 @@ ARCS.Context = function( ctx ) {
}
else
{
components
[
p
].
instance
=
new
factory
();
}
}
catch
(
e
)
{
console
.
error
(
"[ARCS] Component of type "
,
p
,
" not instanciated."
,
e
);}
}
}
return
Promise
.
all
(
promises
);
...
...
@@ -2296,7 +2299,7 @@ arcs_module = function(moduleDefinition, deps) {
// shim performed
require
([
dep
],
function
(
d
)
{
resolve
(
d
);
},
function
(
err
)
{
reject
(
dep
,
err
);
}
function
(
err
)
{
console
.
log
(
"[ARCS] Trouble with module "
,
dep
);
reject
(
dep
,
err
);
}
);
}
});
...
...
build/arcs.min.js
View file @
3dea8e8
This diff is collapsed. Click to expand it.
Please
register
or
login
to post a comment