Merge remote-tracking branch 'refs/remotes/origin/dev' into gh-pages

lautr3k · lautr3k · lautr3k · lautr3k · lautr3k · lautr3k
diff --git a/.gitignore b/.gitignore
@@ -1 +0,0 @@
-_*.*
diff --git a/Docker/docker-compose.yml b/Docker/docker-compose.yml
@@ -0,0 +1,14 @@
+static-web:
+
+  image: nginx
+  environment:
+  - VIRTUAL_HOST=${FQDN}
+
+  volumes:
+  - ../src:/usr/share/nginx/html:ro
+  expose:
+  - 80
+  restart: unless-stopped
+# uncomment if you don't have another proxy
+#  port:
+#  - 80:80
diff --git a/src/.bowerrc b/src/.bowerrc
@@ -0,0 +1,3 @@
+{
+  "directory" : "vendors"
+}
diff --git a/src/.gitignore b/src/.gitignore
@@ -0,0 +1,2 @@
+_*.*
+/vendors/
diff --git a/css/main.css → src/css/main.css b/css/main.css → src/css/main.css
diff --git a/index.html → src/index.html b/index.html → src/index.html
diff --git a/js/loader/stl.js → src/js/loader/stl.js b/js/loader/stl.js → src/js/loader/stl.js
diff --git a/js/main.js → src/js/main.js b/js/main.js → src/js/main.js
@@ -681,7 +681,7 @@ function updateBuildVolumeSettings() {
     });
 
     viewer3d.setBuildVolume(settings.get('buildVolume'));
-    viewer3d.dropObject(slicer.mesh);
+    slicer.mesh && viewer3d.dropObject(slicer.mesh);
     viewer3d.render();
 
     size && updateMeshInfoUI();
@@ -1064,8 +1064,8 @@ var stl = 'stl/StressTest.stl';
 //var stl = 'stl/SLAcer.stl';
 
 // File url
-var url = 'http://' + window.location.hostname + window.location.pathname + stl;
-
+// var url = 'http://' + window.location.hostname + window.location.pathname + stl;
+var url = window.location.href + stl;
 // Create http request object
 var xmlhttp = new XMLHttpRequest();
 
diff --git a/js/slacer/mesh.js → src/js/slacer/mesh.js b/js/slacer/mesh.js → src/js/slacer/mesh.js
diff --git a/js/slacer/settings.js → src/js/slacer/settings.js b/js/slacer/settings.js → src/js/slacer/settings.js
diff --git a/js/slacer/slicer.js → src/js/slacer/slicer.js b/js/slacer/slicer.js → src/js/slacer/slicer.js
diff --git a/js/slacer/viewcontrols.js → src/js/slacer/viewcontrols.js b/js/slacer/viewcontrols.js → src/js/slacer/viewcontrols.js
diff --git a/js/slacer/viewer.js → src/js/slacer/viewer.js b/js/slacer/viewer.js → src/js/slacer/viewer.js
diff --git a/js/slacer/viewer2d.js → src/js/slacer/viewer2d.js b/js/slacer/viewer2d.js → src/js/slacer/viewer2d.js
diff --git a/js/slacer/viewer3d.js → src/js/slacer/viewer3d.js b/js/slacer/viewer3d.js → src/js/slacer/viewer3d.js
diff --git a/screenshot.png → src/screenshot.png b/screenshot.png → src/screenshot.png
diff --git a/stl/Octocat-v2.stl → src/stl/Octocat-v2.stl b/stl/Octocat-v2.stl → src/stl/Octocat-v2.stl
diff --git a/stl/SLAcer.stl → src/stl/SLAcer.stl b/stl/SLAcer.stl → src/stl/SLAcer.stl
diff --git a/stl/StressTest.stl → src/stl/StressTest.stl b/stl/StressTest.stl → src/stl/StressTest.stl
diff --git a/stl/cube.center.stl → src/stl/cube.center.stl b/stl/cube.center.stl → src/stl/cube.center.stl
diff --git a/stl/cube_hole.stl → src/stl/cube_hole.stl b/stl/cube_hole.stl → src/stl/cube_hole.stl
diff --git a/vendor/FileSaver.min.js → src/vendor/FileSaver.min.js b/vendor/FileSaver.min.js → src/vendor/FileSaver.min.js
diff --git a/vendor/OrbitControls.js → src/vendor/OrbitControls.js b/vendor/OrbitControls.js → src/vendor/OrbitControls.js
diff --git a/...colorpicker/css/bootstrap-colorpicker.css → ...colorpicker/css/bootstrap-colorpicker.css b/...colorpicker/css/bootstrap-colorpicker.css → ...colorpicker/css/bootstrap-colorpicker.css
diff --git a/...rpicker/css/bootstrap-colorpicker.min.css → ...rpicker/css/bootstrap-colorpicker.min.css b/...rpicker/css/bootstrap-colorpicker.min.css → ...rpicker/css/bootstrap-colorpicker.min.css
diff --git a/...ootstrap-colorpicker/alpha-horizontal.png → ...ootstrap-colorpicker/alpha-horizontal.png b/...ootstrap-colorpicker/alpha-horizontal.png → ...ootstrap-colorpicker/alpha-horizontal.png
diff --git a/...icker/img/bootstrap-colorpicker/alpha.png → ...icker/img/bootstrap-colorpicker/alpha.png b/...icker/img/bootstrap-colorpicker/alpha.png → ...icker/img/bootstrap-colorpicker/alpha.png
diff --git a/.../bootstrap-colorpicker/hue-horizontal.png → .../bootstrap-colorpicker/hue-horizontal.png b/.../bootstrap-colorpicker/hue-horizontal.png → .../bootstrap-colorpicker/hue-horizontal.png
diff --git a/...rpicker/img/bootstrap-colorpicker/hue.png → ...rpicker/img/bootstrap-colorpicker/hue.png b/...rpicker/img/bootstrap-colorpicker/hue.png → ...rpicker/img/bootstrap-colorpicker/hue.png
diff --git a/.../img/bootstrap-colorpicker/saturation.png → .../img/bootstrap-colorpicker/saturation.png b/.../img/bootstrap-colorpicker/saturation.png → .../img/bootstrap-colorpicker/saturation.png
diff --git a/...p-colorpicker/js/bootstrap-colorpicker.js → ...p-colorpicker/js/bootstrap-colorpicker.js b/...p-colorpicker/js/bootstrap-colorpicker.js → ...p-colorpicker/js/bootstrap-colorpicker.js
diff --git a/...lorpicker/js/bootstrap-colorpicker.min.js → ...lorpicker/js/bootstrap-colorpicker.min.js b/...lorpicker/js/bootstrap-colorpicker.min.js → ...lorpicker/js/bootstrap-colorpicker.min.js
diff --git a/vendor/bootstrap-slider/bootstrap-slider.js → ...ndor/bootstrap-slider/bootstrap-slider.js b/vendor/bootstrap-slider/bootstrap-slider.js → ...ndor/bootstrap-slider/bootstrap-slider.js
diff --git a/.../bootstrap-slider/bootstrap-slider.min.js → .../bootstrap-slider/bootstrap-slider.min.js b/.../bootstrap-slider/bootstrap-slider.min.js → .../bootstrap-slider/bootstrap-slider.min.js
diff --git a/...bootstrap-slider/css/bootstrap-slider.css → ...bootstrap-slider/css/bootstrap-slider.css b/...bootstrap-slider/css/bootstrap-slider.css → ...bootstrap-slider/css/bootstrap-slider.css
diff --git a/...strap-slider/css/bootstrap-slider.min.css → ...strap-slider/css/bootstrap-slider.min.css b/...strap-slider/css/bootstrap-slider.min.css → ...strap-slider/css/bootstrap-slider.min.css
diff --git a/vendor/bootstrap/css/bootstrap-theme.css → src/vendor/bootstrap/css/bootstrap-theme.css b/vendor/bootstrap/css/bootstrap-theme.css → src/vendor/bootstrap/css/bootstrap-theme.css
diff --git a/vendor/bootstrap/css/bootstrap-theme.css.map → ...dor/bootstrap/css/bootstrap-theme.css.map b/vendor/bootstrap/css/bootstrap-theme.css.map → ...dor/bootstrap/css/bootstrap-theme.css.map
diff --git a/vendor/bootstrap/css/bootstrap-theme.min.css → ...dor/bootstrap/css/bootstrap-theme.min.css b/vendor/bootstrap/css/bootstrap-theme.min.css → ...dor/bootstrap/css/bootstrap-theme.min.css
diff --git a/vendor/bootstrap/css/bootstrap.css → src/vendor/bootstrap/css/bootstrap.css b/vendor/bootstrap/css/bootstrap.css → src/vendor/bootstrap/css/bootstrap.css
diff --git a/vendor/bootstrap/css/bootstrap.css.map → src/vendor/bootstrap/css/bootstrap.css.map b/vendor/bootstrap/css/bootstrap.css.map → src/vendor/bootstrap/css/bootstrap.css.map
diff --git a/vendor/bootstrap/css/bootstrap.min.css → src/vendor/bootstrap/css/bootstrap.min.css b/vendor/bootstrap/css/bootstrap.min.css → src/vendor/bootstrap/css/bootstrap.min.css
diff --git a/...ap/fonts/glyphicons-halflings-regular.eot → ...ap/fonts/glyphicons-halflings-regular.eot b/...ap/fonts/glyphicons-halflings-regular.eot → ...ap/fonts/glyphicons-halflings-regular.eot
diff --git a/...ap/fonts/glyphicons-halflings-regular.svg → ...ap/fonts/glyphicons-halflings-regular.svg b/...ap/fonts/glyphicons-halflings-regular.svg → ...ap/fonts/glyphicons-halflings-regular.svg
diff --git a/...ap/fonts/glyphicons-halflings-regular.ttf → ...ap/fonts/glyphicons-halflings-regular.ttf b/...ap/fonts/glyphicons-halflings-regular.ttf → ...ap/fonts/glyphicons-halflings-regular.ttf
diff --git a/...p/fonts/glyphicons-halflings-regular.woff → ...p/fonts/glyphicons-halflings-regular.woff b/...p/fonts/glyphicons-halflings-regular.woff → ...p/fonts/glyphicons-halflings-regular.woff
diff --git a/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2 b/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2
diff --git a/vendor/bootstrap/js/bootstrap.js → src/vendor/bootstrap/js/bootstrap.js b/vendor/bootstrap/js/bootstrap.js → src/vendor/bootstrap/js/bootstrap.js
diff --git a/vendor/bootstrap/js/bootstrap.min.js → src/vendor/bootstrap/js/bootstrap.min.js b/vendor/bootstrap/js/bootstrap.min.js → src/vendor/bootstrap/js/bootstrap.min.js
diff --git a/vendor/bootstrap/js/npm.js → src/vendor/bootstrap/js/npm.js b/vendor/bootstrap/js/npm.js → src/vendor/bootstrap/js/npm.js
diff --git a/vendor/earcut.js → src/vendor/earcut.js b/vendor/earcut.js → src/vendor/earcut.js
diff --git a/vendor/jquery-2.1.4.min.js → src/vendor/jquery-2.1.4.min.js b/vendor/jquery-2.1.4.min.js → src/vendor/jquery-2.1.4.min.js
diff --git a/vendor/jquery-ui/jquery-ui.min.css → src/vendor/jquery-ui/jquery-ui.min.css b/vendor/jquery-ui/jquery-ui.min.css → src/vendor/jquery-ui/jquery-ui.min.css
diff --git a/vendor/jquery-ui/jquery-ui.min.js → src/vendor/jquery-ui/jquery-ui.min.js b/vendor/jquery-ui/jquery-ui.min.js → src/vendor/jquery-ui/jquery-ui.min.js
diff --git a/vendor/jszip.min.js → src/vendor/jszip.min.js b/vendor/jszip.min.js → src/vendor/jszip.min.js
diff --git a/vendor/libtess.min.js → src/vendor/libtess.min.js b/vendor/libtess.min.js → src/vendor/libtess.min.js
diff --git a/vendor/lodash.min.js → src/vendor/lodash.min.js b/vendor/lodash.min.js → src/vendor/lodash.min.js
diff --git a/vendor/poly2tri.min.js → src/vendor/poly2tri.min.js b/vendor/poly2tri.min.js → src/vendor/poly2tri.min.js
diff --git a/vendor/tessy.js → src/vendor/tessy.js b/vendor/tessy.js → src/vendor/tessy.js
diff --git a/vendor/three.min.js → src/vendor/three.min.js b/vendor/three.min.js → src/vendor/three.min.js
diff --git a/vendor/triangulation.js → src/vendor/triangulation.js b/vendor/triangulation.js → src/vendor/triangulation.js
diff --git a/vendor/triangulation/.gitignore → src/vendor/triangulation/.gitignore b/vendor/triangulation/.gitignore → src/vendor/triangulation/.gitignore
diff --git a/vendor/triangulation/README.md → src/vendor/triangulation/README.md b/vendor/triangulation/README.md → src/vendor/triangulation/README.md
diff --git a/vendor/triangulation/tessy.js → src/vendor/triangulation/tessy.js b/vendor/triangulation/tessy.js → src/vendor/triangulation/tessy.js
diff --git a/vendor/triangulation/triangulation.js → src/vendor/triangulation/triangulation.js b/vendor/triangulation/triangulation.js → src/vendor/triangulation/triangulation.js
diff --git a/viewer2d.html → src/viewer2d.html b/viewer2d.html → src/viewer2d.html