merge

Author: perigee

devtools/test_dashboard/server.js

@@ -19,11 +19,11 @@ switch(process.argv[2]) {
     case 'geo':
         testFile = 'test_geo';
     break;
-    case 'gl2d':
-        testFile = 'test_gl2d';
+    case 'gl3d':
+        testFile = 'test_gl3d';
     break;
     default:
-        testFile = 'test_gl3d';
+        testFile = 'test_gl2d';
 }
 
 console.log('Using ' + testFile);

package.json

@@ -46,7 +46,7 @@
     "postinstall": "npm run preprocess",
     "bundle": "node tasks/bundle.js",
     "build": "npm run preprocess && npm run bundle",
-    "cibuild": "npm run preprocess && node tasks/cibundle.js",
+    "cibuild": "node tasks/cibundle.js",
     "watch": "node tasks/watch_plotly.js",
     "lint": "cd src && jshint . || true",
     "test-jasmine": "karma start test/jasmine/karma.conf.js",