Init Merlin build of SLAcer.js with m3rlin.js jquery test file.

lautr3k · Apr 7, 2019 · d609f492ffe7b869a3698b415bd03b6e81743c3c · d609f49
1 parent be2a5ff
commit d609f492ffe7b869a3698b415bd03b6e81743c3c
Unified Split

Showing with 7 additions and 0 deletions.

+1 −0 index.html

+6 −0 js/m3rlin.js
diff --git a/index.html b/index.html
@@ -360,5 +360,6 @@ <h3 class="panel-title">Colors</h3>
         <script src="vendor/FileSaver.min.js" type="text/javascript"></script>
         <script src="vendor/jszip.min.js" type="text/javascript"></script>
         <script src="js/main.js" type="text/javascript"></script>
+        <script src="js/m3rlin.js" type="text/javascript"></script>
     </body>
 </html>
diff --git a/js/m3rlin.js b/js/m3rlin.js
@@ -0,0 +1,6 @@
+$(document).ready(function() {
+  alert('hi from m3rlin.js');
+  //   if ($slicerLayerHeight.val() > 100) {
+  //     alert('Wait - are you sure??');
+  //   }
+});