Include cdn three for build

milcktoast · Sep 29, 2014 · 2819ae1 · 2819ae1
1 parent a8bd162
commit 2819ae1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/grunt/config/copy.js b/grunt/config/copy.js
@@ -20,7 +20,10 @@ module.exports = function (config) {
     },
     develop: {
       expand: true,
-      src: [config.source + 'scss/**/*.scss'],
+      src: [
+        config.source + 'scss/**/*.scss',
+        config.source + 'lib/**/*.js'
+      ],
       dest: config.deploy
     }
   };

diff --git a/pages/_base.html b/pages/_base.html
@@ -20,6 +20,7 @@
   <body>
     <div id="container"></div>
     {% if TEMPLATE_DEBUG %}
+      <script src="{{ STATIC_URL }}lib/three/three.js"></script>
       <script src="{{ STATIC_URL }}js/libs.develop.js"></script>
       <script src="{{ STATIC_URL }}js/app.develop.js"></script>
       {# Run tests by appending ?test=true to the url #}
@@ -30,6 +31,7 @@
         }
       </script>
     {% else %}
+      <script src="//cdnjs.cloudflare.com/ajax/libs/three.js/r67/three.min.js"></script>
       <script src="{{ STATIC_URL }}js/libs.min.js"></script>
       <script src="{{ STATIC_URL }}js/app.min.js"></script>
     {% endif %}

diff --git a/static/js/libs.js b/static/js/libs.js
@@ -1,3 +1,2 @@
-require('lib/three/three');
 require('lib/three/examples/js/controls/TrackballControls');
 require('lib/particulate/dist/particulate');