Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
BlocksCAD
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
BlocksCAD
Commits
90f1a488
Commit
90f1a488
authored
Aug 29, 2016
by
Jennie Yoder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lost the stl button! Argh.
parent
b721e6d1
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
16 deletions
+17
-16
blockscad/blockscad.js
blockscad/blockscad.js
+1
-1
blockscad/viewer.js
blockscad/viewer.js
+4
-4
blockscad/viewer_compressed.js
blockscad/viewer_compressed.js
+12
-11
No files found.
blockscad/blockscad.js
View file @
90f1a488
...
@@ -411,7 +411,7 @@ Blockscad.init = function() {
...
@@ -411,7 +411,7 @@ Blockscad.init = function() {
root
.
find
(
'
.sub-menu:visible
'
).
hide
();
root
.
find
(
'
.sub-menu:visible
'
).
hide
();
});
});
});
});
$
(
'
#stl_buttons
'
).
addClass
(
'
hidden
'
);
$
(
'
#stl_buttons
'
).
hide
(
);
if
(
!
Blockscad
.
standalone
)
{
if
(
!
Blockscad
.
standalone
)
{
BSUtils
.
loadBlocks
(
''
);
BSUtils
.
loadBlocks
(
''
);
...
...
blockscad/viewer.js
View file @
90f1a488
...
@@ -1142,14 +1142,14 @@ Blockscad.Processor.prototype = {
...
@@ -1142,14 +1142,14 @@ Blockscad.Processor.prototype = {
}
catch
(
e
)
{
}
catch
(
e
)
{
this
.
picdiv
.
innerHTML
=
"
<b><br><br>Error:
"
+
e
.
toString
()
+
"
</b><br><br>BlocksCAD currently requires Google Chrome or Firefox with WebGL enabled
"
;
this
.
picdiv
.
innerHTML
=
"
<b><br><br>Error:
"
+
e
.
toString
()
+
"
</b><br><br>BlocksCAD currently requires Google Chrome or Firefox with WebGL enabled
"
;
}
}
$
(
"
#picdiv
"
).
hide
(
);
$
(
"
#picdiv
"
).
addClass
(
'
hidden
'
);
try
{
try
{
this
.
rpicviewer
=
new
Blockscad
.
Viewer
(
this
.
rpicdiv
,
rpicdiv
.
offsetWidth
,
rpicdiv
.
offsetHeight
,
this
.
initialViewerDistance
);
this
.
rpicviewer
=
new
Blockscad
.
Viewer
(
this
.
rpicdiv
,
rpicdiv
.
offsetWidth
,
rpicdiv
.
offsetHeight
,
this
.
initialViewerDistance
);
}
catch
(
e
)
{
}
catch
(
e
)
{
this
.
rpicdiv
.
innerHTML
=
"
<b><br><br>Error:
"
+
e
.
toString
()
+
"
</b><br><br>BlocksCAD currently requires Google Chrome or Firefox with WebGL enabled
"
;
this
.
rpicdiv
.
innerHTML
=
"
<b><br><br>Error:
"
+
e
.
toString
()
+
"
</b><br><br>BlocksCAD currently requires Google Chrome or Firefox with WebGL enabled
"
;
}
}
$
(
"
#rpicdiv
"
).
hide
(
);
$
(
"
#rpicdiv
"
).
addClass
(
'
hidden
'
);
try
{
try
{
this
.
viewer
=
new
Blockscad
.
Viewer
(
this
.
viewerdiv
,
viewerdiv
.
offsetWidth
,
viewerdiv
.
offsetHeight
,
this
.
initialViewerDistance
);
this
.
viewer
=
new
Blockscad
.
Viewer
(
this
.
viewerdiv
,
viewerdiv
.
offsetWidth
,
viewerdiv
.
offsetHeight
,
this
.
initialViewerDistance
);
...
@@ -1223,7 +1223,7 @@ Blockscad.Processor.prototype = {
...
@@ -1223,7 +1223,7 @@ Blockscad.Processor.prototype = {
}
}
// console.log("trying to turn on stl_buttons");
// console.log("trying to turn on stl_buttons");
$
(
'
#stl_buttons
'
).
show
(
);
$
(
'
#stl_buttons
'
).
removeClass
(
'
hidden
'
);
while
(
this
.
formatDropdown
.
options
.
length
>
0
)
while
(
this
.
formatDropdown
.
options
.
length
>
0
)
this
.
formatDropdown
.
options
.
remove
(
0
);
this
.
formatDropdown
.
options
.
remove
(
0
);
...
@@ -1260,7 +1260,7 @@ Blockscad.Processor.prototype = {
...
@@ -1260,7 +1260,7 @@ Blockscad.Processor.prototype = {
this
.
imgStrip
=
"
none
"
;
this
.
imgStrip
=
"
none
"
;
this
.
img
=
"
none
"
;
this
.
img
=
"
none
"
;
// console.log('trying to hid stl_buttons');
// console.log('trying to hid stl_buttons');
$
(
'
#stl_buttons
'
).
hide
(
);
$
(
'
#stl_buttons
'
).
addClass
(
'
hidden
'
);
this
.
enableItems
();
this
.
enableItems
();
},
},
...
...
blockscad/viewer_compressed.js
View file @
90f1a488
This diff is collapsed.
Click to expand it.
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