Rename bundle.js to maxwell.bundle.js and update .gitignore

Aerlinger · Feb 16, 2017 · 7908b2f · 7908b2f
1 parent baaf5a0
commit 7908b2f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ test/fixtures/circuitRenders/**/*.png
 test/fixtures/componentRenders/**/*.png
 test/fixtures/**/*.json
 circuits/v2/
+maxwell.bundle.js
 .env
 **/*.map
 *.graffle

diff --git a/app/layout.jade b/app/layout.jade
@@ -7,7 +7,6 @@ html
 
     link(rel='stylesheet', href='/bower_components/rickshaw/rickshaw.css')
     //link(rel='stylesheet', href='bower_components/bootstrap/dist/css/bootstrap.css')
-    //link(rel="stylesheet", href="/bower_components/semantic/dist/semantic.min.css")
     link(rel="stylesheet", href="/bower_components/jquery-ui/themes/base/all.css")
 
     script(type="text/javascript", src="/bower_components/jquery/dist/jquery.js")
@@ -17,14 +16,11 @@ html
     //script(type="text/javascript", src="/bower_components/jquery-ui/ui/widget.js")
     //script(type="text/javascript", src="/bower_components/jquery-ui/ui/widgets/mouse.js")
     //script(type="text/javascript", src="/bower_components/jquery-ui/ui/widgets/draggable.js")
-    script(type="text/javascript", src="/bower_components/sketch.js/js/sketch.js")
-    script(type="text/javascript", src="/bower_components/lodash/lodash.js")
-    script(type="text/javascript", src="/bower_components/d3/d3.js")
-    script(type="text/javascript", src="/bower_components/rickshaw/rickshaw.js")
+    //script(type="text/javascript", src="/bower_components/d3/d3.js")
+    //script(type="text/javascript", src="/bower_components/rickshaw/rickshaw.js")
     //script(type='text/javascript', src='bower_components/bootstrap/dist/js/bootstrap.js')
-    script(type="text/javascript", src="/bower_components/semantic/dist/semantic.min.js")
 
-    script(type="text/javascript", src="/dist/bundle.js")
+    script(type="text/javascript", src="/dist/maxwell.js")
     script(type="text/javascript", src="/plot.js")
     script(type="text/javascript", src="/ui-helpers.js")
 

diff --git a/dist/bundle.js → dist/maxwell.js b/dist/bundle.js → dist/maxwell.js
@@ -29036,7 +29036,7 @@
 	    this.context = this.Canvas.getContext("2d");
 
 	    if (environment.isBrowser) {
-	      // this.setupScopes();
+	      this.setupScopes();
 	      this.renderPerformance();
 	      window.CircuitUI = this.circuitUI;
 
@@ -29103,8 +29103,8 @@
 	    this.context.save();
 	    this.context.translate(this.xMargin, this.yMargin);
 
-	    this.drawText("Time elapsed: " + Util.getUnitText(this.Circuit.time, "s"), 10, 5, Settings.TEXT_COLOR, 1.2 * Settings.TEXT_SIZE);
-	    this.drawText("Frame Time: " + Math.floor(this.Circuit.lastFrameTime) + "ms", 600, 8, Settings.TEXT_COLOR, 1.1 * Settings.TEXT_SIZE);
+	    this.drawText("Time elapsed: " + Util.getUnitText(this.Circuit.time, "s"), 10, 5, "#bf4f00", 1.2 * Settings.TEXT_SIZE);
+	    this.drawText("Frame Time: " + Math.floor(this.Circuit.lastFrameTime) + "ms", 600, 8, "#000968", 1.1 * Settings.TEXT_SIZE);
 
 	    if (this.performanceMeter) {
 	      this.performanceMeter.append(new Date().getTime(), this.Circuit.lastFrameTime);
@@ -93000,4 +93000,4 @@
 
 /***/ }
 /******/ ]);
-//# sourceMappingURL=bundle.js.map
+//# sourceMappingURL=maxwell.bundle.js.map
diff --git a/src/CircuitCanvas.js b/src/CircuitCanvas.js
@@ -37,7 +37,7 @@ class CircuitCanvas extends Observer {
     this.context = this.Canvas.getContext("2d");
 
     if (environment.isBrowser) {
-      // this.setupScopes();
+      this.setupScopes();
       this.renderPerformance();
       window.CircuitUI = this.circuitUI;
 
@@ -104,8 +104,8 @@ class CircuitCanvas extends Observer {
     this.context.save();
     this.context.translate(this.xMargin, this.yMargin);
 
-    this.drawText("Time elapsed: " + Util.getUnitText(this.Circuit.time, "s"), 10, 5, Settings.TEXT_COLOR, 1.2 * Settings.TEXT_SIZE);
-    this.drawText("Frame Time: " + Math.floor(this.Circuit.lastFrameTime) + "ms", 600, 8, Settings.TEXT_COLOR, 1.1 * Settings.TEXT_SIZE);
+    this.drawText("Time elapsed: " + Util.getUnitText(this.Circuit.time, "s"), 10, 5, "#bf4f00", 1.2 * Settings.TEXT_SIZE);
+    this.drawText("Frame Time: " + Math.floor(this.Circuit.lastFrameTime) + "ms", 600, 8, "#000968", 1.1 * Settings.TEXT_SIZE);
 
     if (this.performanceMeter) {
       this.performanceMeter.append(new Date().getTime(), this.Circuit.lastFrameTime);

diff --git a/webpack.config.js b/webpack.config.js
@@ -6,7 +6,7 @@ module.exports = {
   // debug: true,
   output: {
     path: __dirname + "/dist",
-    filename: "bundle.js"
+    filename: "maxwell.bundle.js"
   },
   module: {
     loaders: [