bundle main file and thread file into one file

fixes #175
mapbox · Nov 25, 2013 · 1fe81bd · 1fe81bd
1 parent e090980
commit 1fe81bd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -11,15 +11,6 @@ module.exports = function(grunt) {
                     standalone: 'llmr'
                 }
             },
-            worker: {
-                files: {
-                    'dist/llmr-worker.js': ['js/worker.js']
-                },
-                entry: 'js/worker.js',
-                options: {
-                    debug: true
-                }
-            },
             editor: {
                 files: {
                     'editor/dist/editor.js': ['editor/js/editor.js']
@@ -34,7 +25,7 @@ module.exports = function(grunt) {
         watch: {
             llmr: {
               files: ['js/*.js'],
-              tasks: ['browserify:llmr', 'browserify:worker']
+              tasks: ['browserify:llmr']
             },
             editor: {
               files: ['editor/js/*.js'],

diff --git a/js/dispatcher.js b/js/dispatcher.js
@@ -3,7 +3,7 @@
 var Actor = require('./actor.js');
 
 var scripts = document.getElementsByTagName("script");
-var workerFile = scripts[scripts.length - 1].getAttribute('src').replace(/.js$/, '-worker.js');
+var workerFile = scripts[scripts.length - 1].getAttribute('src');
 
 
 

diff --git a/js/llmr.js b/js/llmr.js
@@ -1,8 +1,12 @@
 'use strict';
 
-exports.Map = require('./map.js');
-exports.Style = require('./style.js');
-exports.StyleLayer = require('./stylelayer.js');
-exports.evented = require('./evented.js');
-exports.chroma = require('./lib/chroma.js');
-exports.util = require('./util.js');
+if (typeof window === 'undefined') {
+    require('./worker.js');
+} else {
+    exports.Map = require('./map.js');
+    exports.Style = require('./style.js');
+    exports.StyleLayer = require('./stylelayer.js');
+    exports.evented = require('./evented.js');
+    exports.chroma = require('./lib/chroma.js');
+    exports.util = require('./util.js');
+}