Skip to content

Instantly share code, notes, and snippets.

View hoorayimhelping's full-sized avatar

Bucky Schwarz hoorayimhelping

View GitHub Profile
diff --git a/gulpfile.js b/gulpfile.js
index 6e14dc3..8c99d76 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -60,7 +60,7 @@ gulp.task('build', function() {
.pipe(gulp.dest(paths.js_dist));
});
-gulp.task('default', ['env-dev', 'lint', 'test', 'transform', 'build']);
+gulp.task('development', ['env-dev', 'lint', 'test', 'transform', 'build']);
diff --git a/js/app.js b/js/app.js
index 91742b4..95b4f7f 100644
--- a/js/app.js
+++ b/js/app.js
@@ -93,6 +93,8 @@ window.addEventListener('resize', function(event) {
draw();
}, false);
+window.react = react;
+
diff --git a/gulpfile.js b/gulpfile.js
index ce9c54e..221e6ac 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -11,7 +11,7 @@ var shell = require('gulp-shell');
var react = require('gulp-react');
var paths = {
- 'js_source': 'js/graph/',
+ 'js_source': 'js/**/',
diff --git a/js/app.js b/js/app.js
index 95b4f7f..2834e45 100644
--- a/js/app.js
+++ b/js/app.js
@@ -47,14 +47,21 @@ Renderer.prototype = {
scaleCanvas: function($container, width, height) {
var border_width = parseInt(getComputedStyle($container)['border-left-width'], 10) + parseInt(getComputedStyle($container)['border-right-width'], 10);
+ var border_height = parseInt(getComputedStyle($container)['border-top-width'], 10) + parseInt(getComputedStyle($container)['border-bottom-width'], 10);
+
diff --git a/js/app.js b/js/app.js
index 7698e14..205ef5b 100644
--- a/js/app.js
+++ b/js/app.js
@@ -5,6 +5,7 @@ var Renderer = function(canvas) {
this.$canvas.height = 1200;
this.$canvas.style.width = "100%";
this.$canvas.style.height = "100%";
+ this.pixel_ratio = 2;
};
diff --git a/gulpfile.js b/gulpfile.js
index 9fd2c25..80503bd 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -14,7 +14,7 @@ var paths = {
'js_source': {
graph: 'js/graph/',
maps: 'js/maps',
- rendering: '/js/rendering'
+ canvas: '/js/canvas'
diff --git a/access.yml b/access.yml
index 6f988e5..9a15c37 100644
--- a/access.yml
+++ b/access.yml
@@ -19,11 +19,11 @@
service: name=apache2 state=stopped
ignore_errors: yes
roles:
- - { sudo: yes, role: cmprescott.jre }
+ - { sudo: yes, role: malk.java8-oracle }
diff --git a/access.yml b/access.yml
index 6f988e5..9a15c37 100644
--- a/access.yml
+++ b/access.yml
@@ -19,11 +19,11 @@
service: name=apache2 state=stopped
ignore_errors: yes
roles:
- - { sudo: yes, role: cmprescott.jre }
+ - { sudo: yes, role: malk.java8-oracle }
diff --git a/access.yml b/access.yml
index 6f988e5..9a15c37 100644
--- a/access.yml
+++ b/access.yml
@@ -19,7 +19,7 @@
service: name=apache2 state=stopped
ignore_errors: yes
roles:
- - { sudo: yes, role: cmprescott.jre }
+ - { sudo: yes, role: malk.java8-oracle }
diff --git a/client/app/components/commonstyles.js b/client/app/components/commonstyles.js
index 0d0e3a0..f1d0f72 100644
--- a/client/app/components/commonstyles.js
+++ b/client/app/components/commonstyles.js
@@ -13,7 +13,7 @@ class Style
this.styles = styles;
}
- cascade(...args) //takes any number of style objects or
+ cascade(...args) //takes any number of style objects or