Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Amanda Ghassaei
OrigamiSimulator
Commits
49c95132
Commit
49c95132
authored
May 10, 2017
by
amandaghassaei
Browse files
allow same file to be imported twice
parent
ba1072d7
Changes
2
Hide whitespace changes
Inline
Side-by-side
js/importer.js
View file @
49c95132
...
...
@@ -36,6 +36,7 @@ function initImporter(globals){
var
name
=
extension
[
0
];
extension
=
extension
[
extension
.
length
-
1
];
var
reader
=
new
FileReader
();
$
(
e
.
target
).
val
(
""
);
if
(
extension
==
"
txt
"
)
{
reader
.
onload
=
function
()
{
...
...
js/pattern.js
View file @
49c95132
...
...
@@ -436,7 +436,7 @@ function initPattern(globals){
if
(
_weededVertices
.
length
>
0
){
console
.
log
(
_weededVertices
);
globals
.
warn
(
"
Some vertices are not fully connected, try increasing vertex merge tolerance
"
);
//
return;
return
;
}
removeCombinedFromSet
(
combined
,
outlines
);
...
...
Write
Preview
Supports
Markdown
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