summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2016-06-10 15:25:05 -0400
committerJules Laplace <jules@okfoc.us>2016-06-10 15:25:05 -0400
commitd3c355ce07e0d8ec41fedd9cde970f4a7c03dec6 (patch)
treeefca6f958c57c622cd5021a9c5dee4562774f63f
parent9d3c9cb918d03a8a30eb325e1f7e4d55f1765dcc (diff)
fix odd bugs that have appeared
-rw-r--r--package.json29
-rw-r--r--public/assets/javascripts/rectangles/models/rect.js21
-rw-r--r--public/assets/javascripts/ui/blueprint/BlueprintView.js9
-rw-r--r--server/index.js5
-rwxr-xr-xviews/home.ejs2
5 files changed, 37 insertions, 29 deletions
diff --git a/package.json b/package.json
index ce81cde..b055b9e 100644
--- a/package.json
+++ b/package.json
@@ -17,18 +17,17 @@
"html-entities": "~1.0.10",
"inspect": "0.0.2",
"intro.js": "^0.9.0",
- "js2xml": "^1.0.0",
+ "js2xml": "",
"knox": "~0.8.10",
"lodash": "~2.4.1",
"marked": "~0.3.2",
+ "method-override": "^2.3.6",
"moment": "~2.6.0",
- "mongoose": "~3.8.8",
- "mongoose-lifecycle": "~1.0.0",
- "mongoose-unique-validator": "~0.3.0",
- "monk": "~0.7.1",
+ "mongoose": "^4.2.8",
+ "mongoose-lifecycle": "",
+ "mongoose-unique-validator": "",
"multer": "~0.1.0",
"node-recurly": "julescarbon/node-recurly",
- "node-restful": "~0.1.14",
"passport": "~0.2.0",
"passport-facebook": "~1.0.3",
"passport-local": "~1.0.0",
@@ -36,16 +35,16 @@
"passport.socketio": "~3.0.1",
"socket.io": "~0.9.16",
"useful-string": "0.0.1",
- "xml2js": "^0.4.4"
+ "xml2js": ""
},
"devDependencies": {
- "grunt": "~0.4.1",
- "grunt-contrib-concat": "~0.3.0",
- "grunt-contrib-uglify": "~0.2.5",
- "grunt-contrib-watch": "~0.5.3",
- "grunt-contrib-clean": "~0.5.0",
- "grunt-contrib-copy": "~0.5.0",
- "grunt-dentist": "~0.3.4",
- "mocha": "~1.20.1"
+ "grunt": "",
+ "grunt-contrib-concat": "",
+ "grunt-contrib-uglify": "",
+ "grunt-contrib-watch": "",
+ "grunt-contrib-clean": "",
+ "grunt-contrib-copy": "",
+ "grunt-dentist": "",
+ "mocha": ""
}
}
diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js
index a4756ed..4f73bec 100644
--- a/public/assets/javascripts/rectangles/models/rect.js
+++ b/public/assets/javascripts/rectangles/models/rect.js
@@ -1,4 +1,3 @@
-
(function(){
var vec2
if ('window' in this) {
@@ -8,17 +7,17 @@
vec2 = require('./vec2')
FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20
TOP = CEILING, BOTTOM = FLOOR
- function sidesToString(sides){
- var s = ""
- if (sides & FRONT) s += "front "
- if (sides & BACK) s += "back "
- if (sides & LEFT) s += "left "
- if (sides & RIGHT) s += "right "
- if (sides & TOP) s += "top "
- if (sides & BOTTOM) s += "bottom "
- return s
- }
}
+ function sidesToString(sides){
+ var s = ""
+ if (sides & FRONT) s += "front "
+ if (sides & BACK) s += "back "
+ if (sides & LEFT) s += "left "
+ if (sides & RIGHT) s += "right "
+ if (sides & TOP) s += "top "
+ if (sides & BOTTOM) s += "bottom "
+ return s
+ }
var Rect = function (x0,y0,x1,y1){
if (x0 instanceof vec2) {
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index e249c91..1858c3d 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -40,6 +40,15 @@ var BlueprintView = View.extend({
if (startPositionIsInARoom) {
return this.startPosition
}
+ else if (! regions.length) {
+ return {
+ x: 0,
+ y: viewHeight,
+ z: 0,
+ rotationX: 0,
+ rotationY: Math.PI/2,
+ }
+ }
else {
var center = regions[0].center()
return {
diff --git a/server/index.js b/server/index.js
index 224aa86..46f342e 100644
--- a/server/index.js
+++ b/server/index.js
@@ -16,7 +16,8 @@ var http = require('http'),
MongoStore = require('connect-mongo')(express),
passport = require('passport'),
path = require('path'),
- mongoose = require('mongoose');
+ mongoose = require('mongoose'),
+ methodOverride = require('method-override');
var app = express()
var server
@@ -58,7 +59,7 @@ site.setup = function(){
app.use(multer());
app.use(express.query());
app.use(express.csrf());
- app.use(express.methodOverride());
+ app.use(methodOverride('X-HTTP-Method-Override'))
app.use(passport.initialize());
app.use(passport.session());
app.use(app.router);
diff --git a/views/home.ejs b/views/home.ejs
index 14fc0e3..af43f0b 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -38,7 +38,7 @@
</span>
<span>
<h3>Defy The Status Quo</h3>
- <words>There is no platform on the internet quite like VValls. VValls opens up the possibilities of expression online. Go crazy, make otherworldly rooms.</words>
+ <words>There is no platform on the Internet quite like VValls. VValls opens up the possibilities of expression online. Go crazy, make otherworldly rooms.</words>
</span>
</div>
</div>