changesproduction

3 files changed, 155 insertions, 155 deletions

diff --git a/Gruntfile.js b/Gruntfile.js
index 988d040..777f1f9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -8,175 +8,175 @@ module.exports = function(grunt) {
 			},
 			js: {
 				src: [
-          "/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"
-          "/assets/javascripts/vendor/bower_components/lodash/lodash.min.js",
-          "/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js",
-          "/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js",
-          "/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js",
-          "/assets/javascripts/vendor/bower_components/marked/lib/marked.js",
-          "/assets/javascripts/vendor/tube.js",
-          "/assets/javascripts/vendor/loader.js",
-          "/assets/javascripts/vendor/polyfill.js",
-          "/assets/javascripts/vendor/sha1.js",
-          "/assets/javascripts/vendor/dataUriToBlob.js",
-          "/assets/javascripts/vendor/froogaloop.js",
-          "/assets/javascripts/util.js",
+          "public/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js",
+          "public/assets/javascripts/vendor/bower_components/lodash/dist/lodash.min.js",
+          "public/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js",
+          "public/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js",
+          "public/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js",
+          "public/assets/javascripts/vendor/bower_components/marked/lib/marked.js",
+          "public/assets/javascripts/vendor/tube.js",
+          "public/assets/javascripts/vendor/loader.js",
+          "public/assets/javascripts/vendor/polyfill.js",
+          "public/assets/javascripts/vendor/sha1.js",
+          "public/assets/javascripts/vendor/dataUriToBlob.js",
+          "public/assets/javascripts/vendor/froogaloop.js",
+          "public/assets/javascripts/util.js",
 
-          "/assets/javascripts/mx/mx.js",
+          "public/assets/javascripts/mx/mx.js",
 
-          "/assets/javascripts/mx/extensions/mx.scene.js",
-          "/assets/javascripts/mx/extensions/mx.movements.js",
-          "/assets/javascripts/mx/extensions/mx.movementsMobile.js",
-          "/assets/javascripts/mx/extensions/mx.orbitCamera.js",
+          "public/assets/javascripts/mx/extensions/mx.scene.js",
+          "public/assets/javascripts/mx/extensions/mx.movements.js",
+          "public/assets/javascripts/mx/extensions/mx.movementsMobile.js",
+          "public/assets/javascripts/mx/extensions/mx.orbitCamera.js",
 
-          "/assets/javascripts/mx/primitives/mx.image.js",
-          "/assets/javascripts/mx/primitives/mx.text.js",
-          "/assets/javascripts/mx/primitives/mx.video.js",
-          "/assets/javascripts/mx/primitives/mx.youtube.js",
-          "/assets/javascripts/mx/primitives/mx.vimeo.js",
-          "/assets/javascripts/mx/primitives/mx.soundcloud.js",
-          "/assets/javascripts/mx/primitives/mx.grid.js",
-          "/assets/javascripts/mx/primitives/mx.point.js",
-          "/assets/javascripts/mx/primitives/mx.polyline.js",
+          "public/assets/javascripts/mx/primitives/mx.image.js",
+          "public/assets/javascripts/mx/primitives/mx.text.js",
+          "public/assets/javascripts/mx/primitives/mx.video.js",
+          "public/assets/javascripts/mx/primitives/mx.youtube.js",
+          "public/assets/javascripts/mx/primitives/mx.vimeo.js",
+          "public/assets/javascripts/mx/primitives/mx.soundcloud.js",
+          "public/assets/javascripts/mx/primitives/mx.grid.js",
+          "public/assets/javascripts/mx/primitives/mx.point.js",
+          "public/assets/javascripts/mx/primitives/mx.polyline.js",
 
-          "/assets/javascripts/rectangles/_env.js",
+          "public/assets/javascripts/rectangles/_env.js",
 
-          "/assets/javascripts/rectangles/util/constants.js",
-          "/assets/javascripts/rectangles/util/colors.js",
-          "/assets/javascripts/rectangles/util/coords.js",
-          "/assets/javascripts/rectangles/util/debug.js",
-          "/assets/javascripts/rectangles/util/keys.js",
-          "/assets/javascripts/rectangles/util/measurement.js",
-          "/assets/javascripts/rectangles/util/minotaur.js",
-          "/assets/javascripts/rectangles/util/mouse.js",
-          "/assets/javascripts/rectangles/util/permissions.js",
-          "/assets/javascripts/rectangles/util/sort.js",
-          "/assets/javascripts/rectangles/util/uid.js",
-          "/assets/javascripts/rectangles/util/undostack.js",
-          "/assets/javascripts/rectangles/util/wheel.js",
+          "public/assets/javascripts/rectangles/util/constants.js",
+          "public/assets/javascripts/rectangles/util/colors.js",
+          "public/assets/javascripts/rectangles/util/coords.js",
+          "public/assets/javascripts/rectangles/util/debug.js",
+          "public/assets/javascripts/rectangles/util/keys.js",
+          "public/assets/javascripts/rectangles/util/measurement.js",
+          "public/assets/javascripts/rectangles/util/minotaur.js",
+          "public/assets/javascripts/rectangles/util/mouse.js",
+          "public/assets/javascripts/rectangles/util/permissions.js",
+          "public/assets/javascripts/rectangles/util/sort.js",
+          "public/assets/javascripts/rectangles/util/uid.js",
+          "public/assets/javascripts/rectangles/util/undostack.js",
+          "public/assets/javascripts/rectangles/util/wheel.js",
 
-          "/assets/javascripts/rectangles/models/vec2.js",
-          "/assets/javascripts/rectangles/models/vec3.js",
-          "/assets/javascripts/rectangles/models/rect.js",
-          "/assets/javascripts/rectangles/models/surface.js",
-          "/assets/javascripts/rectangles/models/tree.js",
-          "/assets/javascripts/rectangles/models/room.js",
-          "/assets/javascripts/rectangles/models/wall.js",
-          "/assets/javascripts/rectangles/models/floor.js",
+          "public/assets/javascripts/rectangles/models/vec2.js",
+          "public/assets/javascripts/rectangles/models/vec3.js",
+          "public/assets/javascripts/rectangles/models/rect.js",
+          "public/assets/javascripts/rectangles/models/surface.js",
+          "public/assets/javascripts/rectangles/models/tree.js",
+          "public/assets/javascripts/rectangles/models/room.js",
+          "public/assets/javascripts/rectangles/models/wall.js",
+          "public/assets/javascripts/rectangles/models/floor.js",
 
-          "/assets/javascripts/rectangles/engine/rooms/_rooms.js",
-          "/assets/javascripts/rectangles/engine/rooms/_walls.js",
-          "/assets/javascripts/rectangles/engine/rooms/builder.js",
-          "/assets/javascripts/rectangles/engine/rooms/clipper.js",
-          "/assets/javascripts/rectangles/engine/rooms/grouper.js",
-          "/assets/javascripts/rectangles/engine/rooms/mover.js",
+          "public/assets/javascripts/rectangles/engine/rooms/_rooms.js",
+          "public/assets/javascripts/rectangles/engine/rooms/_walls.js",
+          "public/assets/javascripts/rectangles/engine/rooms/builder.js",
+          "public/assets/javascripts/rectangles/engine/rooms/clipper.js",
+          "public/assets/javascripts/rectangles/engine/rooms/grouper.js",
+          "public/assets/javascripts/rectangles/engine/rooms/mover.js",
 
-          "/assets/javascripts/rectangles/engine/scenery/_scenery.js",
-          "/assets/javascripts/rectangles/engine/scenery/move.js",
-          "/assets/javascripts/rectangles/engine/scenery/resize.js",
-          "/assets/javascripts/rectangles/engine/scenery/randomize.js",
-          "/assets/javascripts/rectangles/engine/scenery/sound.js",
-          "/assets/javascripts/rectangles/engine/scenery/undo.js",
-          "/assets/javascripts/rectangles/engine/scenery/types/_object.js",
-          "/assets/javascripts/rectangles/engine/scenery/types/audio.js",
-          "/assets/javascripts/rectangles/engine/scenery/types/image.js",
-          "/assets/javascripts/rectangles/engine/scenery/types/text.js",
-          "/assets/javascripts/rectangles/engine/scenery/types/video.js",
+          "public/assets/javascripts/rectangles/engine/scenery/_scenery.js",
+          "public/assets/javascripts/rectangles/engine/scenery/move.js",
+          "public/assets/javascripts/rectangles/engine/scenery/resize.js",
+          "public/assets/javascripts/rectangles/engine/scenery/randomize.js",
+          "public/assets/javascripts/rectangles/engine/scenery/sound.js",
+          "public/assets/javascripts/rectangles/engine/scenery/undo.js",
+          "public/assets/javascripts/rectangles/engine/scenery/types/_object.js",
+          "public/assets/javascripts/rectangles/engine/scenery/types/audio.js",
+          "public/assets/javascripts/rectangles/engine/scenery/types/image.js",
+          "public/assets/javascripts/rectangles/engine/scenery/types/text.js",
+          "public/assets/javascripts/rectangles/engine/scenery/types/video.js",
 
-          "/assets/javascripts/rectangles/engine/sculpture/_sculpture.js",
-          "/assets/javascripts/rectangles/engine/sculpture/move.js",
-          "/assets/javascripts/rectangles/engine/sculpture/resize.js",
-          "/assets/javascripts/rectangles/engine/sculpture/types/_object.js",
-          "/assets/javascripts/rectangles/engine/sculpture/types/image.js",
+          "public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js",
+          "public/assets/javascripts/rectangles/engine/sculpture/move.js",
+          "public/assets/javascripts/rectangles/engine/sculpture/resize.js",
+          "public/assets/javascripts/rectangles/engine/sculpture/types/_object.js",
+          "public/assets/javascripts/rectangles/engine/sculpture/types/image.js",
 
-          "/assets/javascripts/rectangles/engine/shapes/polyline.js",
-          "/assets/javascripts/rectangles/engine/shapes/ortho.js",
-          "/assets/javascripts/rectangles/engine/shapes/shapelist.js",
-          "/assets/javascripts/rectangles/engine/shapes/regionlist.js",
+          "public/assets/javascripts/rectangles/engine/shapes/polyline.js",
+          "public/assets/javascripts/rectangles/engine/shapes/ortho.js",
+          "public/assets/javascripts/rectangles/engine/shapes/shapelist.js",
+          "public/assets/javascripts/rectangles/engine/shapes/regionlist.js",
 
-          "/assets/javascripts/rectangles/engine/map/_map.js",
-          "/assets/javascripts/rectangles/engine/map/draw.js",
-          "/assets/javascripts/rectangles/engine/map/ui/editor.js",
-          "/assets/javascripts/rectangles/engine/map/ui/minimap.js",
-          "/assets/javascripts/rectangles/engine/map/ui/ortho.js",
-          "/assets/javascripts/rectangles/engine/map/tools/_base.js",
-          "/assets/javascripts/rectangles/engine/map/tools/arrow.js",
-          "/assets/javascripts/rectangles/engine/map/tools/line.js",
-          "/assets/javascripts/rectangles/engine/map/tools/eraser.js",
-          "/assets/javascripts/rectangles/engine/map/tools/ortho.js",
-          "/assets/javascripts/rectangles/engine/map/tools/polyline.js",
-          "/assets/javascripts/rectangles/engine/map/tools/position.js",
-          "/assets/javascripts/rectangles/engine/map/tools/start.js",
+          "public/assets/javascripts/rectangles/engine/map/_map.js",
+          "public/assets/javascripts/rectangles/engine/map/draw.js",
+          "public/assets/javascripts/rectangles/engine/map/ui/editor.js",
+          "public/assets/javascripts/rectangles/engine/map/ui/minimap.js",
+          "public/assets/javascripts/rectangles/engine/map/ui/ortho.js",
+          "public/assets/javascripts/rectangles/engine/map/tools/_base.js",
+          "public/assets/javascripts/rectangles/engine/map/tools/arrow.js",
+          "public/assets/javascripts/rectangles/engine/map/tools/line.js",
+          "public/assets/javascripts/rectangles/engine/map/tools/eraser.js",
+          "public/assets/javascripts/rectangles/engine/map/tools/ortho.js",
+          "public/assets/javascripts/rectangles/engine/map/tools/polyline.js",
+          "public/assets/javascripts/rectangles/engine/map/tools/position.js",
+          "public/assets/javascripts/rectangles/engine/map/tools/start.js",
 
-          "/assets/javascripts/ui/lib/View.js",
-          "/assets/javascripts/ui/lib/Router.js",
-          "/assets/javascripts/ui/lib/ModalView.js",
-          "/assets/javascripts/ui/lib/FormView.js",
-          "/assets/javascripts/ui/lib/UploadView.js",
-          "/assets/javascripts/ui/lib/AnimatedView.js",
-          "/assets/javascripts/ui/lib/ToggleableView.js",
-          "/assets/javascripts/ui/lib/AlertModal.js",
-          "/assets/javascripts/ui/lib/ConfirmModal.js",
-          "/assets/javascripts/ui/lib/ErrorModal.js",
-          "/assets/javascripts/ui/lib/Parser.js",
-          "/assets/javascripts/ui/lib/LabColorPicker.js",
+          "public/assets/javascripts/ui/lib/View.js",
+          "public/assets/javascripts/ui/lib/Router.js",
+          "public/assets/javascripts/ui/lib/ModalView.js",
+          "public/assets/javascripts/ui/lib/FormView.js",
+          "public/assets/javascripts/ui/lib/UploadView.js",
+          "public/assets/javascripts/ui/lib/AnimatedView.js",
+          "public/assets/javascripts/ui/lib/ToggleableView.js",
+          "public/assets/javascripts/ui/lib/AlertModal.js",
+          "public/assets/javascripts/ui/lib/ConfirmModal.js",
+          "public/assets/javascripts/ui/lib/ErrorModal.js",
+          "public/assets/javascripts/ui/lib/Parser.js",
+          "public/assets/javascripts/ui/lib/LabColorPicker.js",
 
-          "/assets/javascripts/ui/site/SignInModal.js",
-          "/assets/javascripts/ui/site/SignUpModal.js",
-          "/assets/javascripts/ui/site/UsernameTaken.js",
-          "/assets/javascripts/ui/site/PasswordForgot.js",
-          "/assets/javascripts/ui/site/PasswordReset.js",
-          "/assets/javascripts/ui/site/LayoutsIndex.js",
-          "/assets/javascripts/ui/site/LayoutsModal.js",
-          "/assets/javascripts/ui/site/NewProjectModal.js",
-          "/assets/javascripts/ui/site/EditProjectModal.js",
-          "/assets/javascripts/ui/site/EditProfileModal.js",
-          "/assets/javascripts/ui/site/EditSubscriptionModal.js",
-          "/assets/javascripts/ui/site/DocumentModal.js",
+          "public/assets/javascripts/ui/site/SignInModal.js",
+          "public/assets/javascripts/ui/site/SignUpModal.js",
+          "public/assets/javascripts/ui/site/UsernameTaken.js",
+          "public/assets/javascripts/ui/site/PasswordForgot.js",
+          "public/assets/javascripts/ui/site/PasswordReset.js",
+          "public/assets/javascripts/ui/site/LayoutsIndex.js",
+          "public/assets/javascripts/ui/site/LayoutsModal.js",
+          "public/assets/javascripts/ui/site/NewProjectModal.js",
+          "public/assets/javascripts/ui/site/EditProjectModal.js",
+          "public/assets/javascripts/ui/site/EditProfileModal.js",
+          "public/assets/javascripts/ui/site/EditSubscriptionModal.js",
+          "public/assets/javascripts/ui/site/DocumentModal.js",
 
-          "/assets/javascripts/ui/site/HomeView.js",
-          "/assets/javascripts/ui/site/ProfileView.js",
-          "/assets/javascripts/ui/site/ProjectList.js",
+          "public/assets/javascripts/ui/site/HomeView.js",
+          "public/assets/javascripts/ui/site/ProfileView.js",
+          "public/assets/javascripts/ui/site/ProjectList.js",
 
-          "/assets/javascripts/ui/builder/BuilderView.js",
-          "/assets/javascripts/ui/builder/BuilderSettings.js",
-          "/assets/javascripts/ui/builder/BuilderToolbar.js",
-          "/assets/javascripts/ui/builder/BuilderInfo.js",
+          "public/assets/javascripts/ui/builder/BuilderView.js",
+          "public/assets/javascripts/ui/builder/BuilderSettings.js",
+          "public/assets/javascripts/ui/builder/BuilderToolbar.js",
+          "public/assets/javascripts/ui/builder/BuilderInfo.js",
 
-          "/assets/javascripts/ui/blueprint/BlueprintView.js",
-          "/assets/javascripts/ui/blueprint/BlueprintInfo.js",
-          "/assets/javascripts/ui/blueprint/BlueprintSettings.js",
-          "/assets/javascripts/ui/blueprint/BlueprintEditor.js",
-          "/assets/javascripts/ui/blueprint/BlueprintScaler.js",
-          "/assets/javascripts/ui/blueprint/BlueprintToolbar.js",
-          "/assets/javascripts/ui/blueprint/BlueprintUploader.js",
-          "/assets/javascripts/ui/blueprint/BlueprintNotice.js",
+          "public/assets/javascripts/ui/blueprint/BlueprintView.js",
+          "public/assets/javascripts/ui/blueprint/BlueprintInfo.js",
+          "public/assets/javascripts/ui/blueprint/BlueprintSettings.js",
+          "public/assets/javascripts/ui/blueprint/BlueprintEditor.js",
+          "public/assets/javascripts/ui/blueprint/BlueprintScaler.js",
+          "public/assets/javascripts/ui/blueprint/BlueprintToolbar.js",
+          "public/assets/javascripts/ui/blueprint/BlueprintUploader.js",
+          "public/assets/javascripts/ui/blueprint/BlueprintNotice.js",
 
-          "/assets/javascripts/ui/editor/EditorView.js",
-          "/assets/javascripts/ui/editor/EditorSettings.js",
-          "/assets/javascripts/ui/editor/EditorToolbar.js",
-          "/assets/javascripts/ui/editor/HelpCursor.js",
-          "/assets/javascripts/ui/editor/ColorControl.js",
-          "/assets/javascripts/ui/editor/Collaborators.js",
-          "/assets/javascripts/ui/editor/MediaEditor.js",
-          "/assets/javascripts/ui/editor/MediaTumblr.js",
-          "/assets/javascripts/ui/editor/MediaUpload.js",
-          "/assets/javascripts/ui/editor/MediaViewer.js",
-          "/assets/javascripts/ui/editor/Presets.js",
-          "/assets/javascripts/ui/editor/SculptureEditor.js",
-          "/assets/javascripts/ui/editor/TextEditor.js",
-          "/assets/javascripts/ui/editor/WallpaperPicker.js",
+          "public/assets/javascripts/ui/editor/EditorView.js",
+          "public/assets/javascripts/ui/editor/EditorSettings.js",
+          "public/assets/javascripts/ui/editor/EditorToolbar.js",
+          "public/assets/javascripts/ui/editor/HelpCursor.js",
+          "public/assets/javascripts/ui/editor/ColorControl.js",
+          "public/assets/javascripts/ui/editor/Collaborators.js",
+          "public/assets/javascripts/ui/editor/MediaEditor.js",
+          "public/assets/javascripts/ui/editor/MediaTumblr.js",
+          "public/assets/javascripts/ui/editor/MediaUpload.js",
+          "public/assets/javascripts/ui/editor/MediaViewer.js",
+          "public/assets/javascripts/ui/editor/Presets.js",
+          "public/assets/javascripts/ui/editor/SculptureEditor.js",
+          "public/assets/javascripts/ui/editor/TextEditor.js",
+          "public/assets/javascripts/ui/editor/WallpaperPicker.js",
 
-          "/assets/javascripts/ui/reader/ReaderView.js",
-          "/assets/javascripts/ui/reader/ShareView.js",
-          "/assets/javascripts/ui/reader/EmbedView.js",
-          "/assets/javascripts/ui/reader/MediaPlayer.js",
-          "/assets/javascripts/ui/reader/Tracker.js",
+          "public/assets/javascripts/ui/reader/ReaderView.js",
+          "public/assets/javascripts/ui/reader/ShareView.js",
+          "public/assets/javascripts/ui/reader/EmbedView.js",
+          "public/assets/javascripts/ui/reader/MediaPlayer.js",
+          "public/assets/javascripts/ui/reader/Tracker.js",
 
-          "/assets/javascripts/ui/_router.js",
+          "public/assets/javascripts/ui/_router.js",
 
-          "/assets/javascripts/app.js",
-          "/assets/javascripts/defaults.js",
+          "public/assets/javascripts/app.js",
+          "public/assets/javascripts/defaults.js",
 				],
 				dest: 'public/assets/javascripts/app.concat.js',
 			},
diff --git a/public/assets/javascripts/mx/primitives/mx.text.js b/public/assets/javascripts/mx/primitives/mx.text.js
index 3095b67..a0f9283 100644
--- a/public/assets/javascripts/mx/primitives/mx.text.js
+++ b/public/assets/javascripts/mx/primitives/mx.text.js
@@ -47,7 +47,7 @@ MX.Text = MX.Object3D.extend({
     if (! font.color || font.color[0] == "#") { font.color = [0,0,0] }
 
     this.inner.style.fontFamily = "'" + font.family + "',sans-serif"
-    this.el.style.fontSize = (font.size / devicePixelRatio) + "pt"
+    this.el.style.fontSize = (2 * font.size) + "pt"
     this.el.style.textAlign = font.align
     this.el.style.color = rgb_string(font.color)
   },
diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index 50d3b49..f7cfbe4 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -43,9 +43,9 @@ var projects = {
 		else {
       data.rooms = JSON.parse(data.rooms)
 		}
-		data.walls = JSON.parse(data.walls)
-		data.media = JSON.parse(data.media)
-		data.sculpture = JSON.parse(data.sculpture)
+		data.walls = JSON.parse(data.walls || "[]")
+		data.media = JSON.parse(data.media || "[]")
+		data.sculpture = JSON.parse(data.sculpture || "[]")
 		data.colors = JSON.parse(data.colors)
 		data.startPosition = JSON.parse(data.startPosition)
 		data.lastPosition = JSON.parse(data.lastPosition)
@@ -115,8 +115,8 @@ var projects = {
         }
 				doc.walls = JSON.parse(data.walls)
 				doc.colors = JSON.parse(data.colors)
-				doc.media = JSON.parse(data.media)
-				doc.sculpture = JSON.parse(data.sculpture)
+				doc.media = JSON.parse(data.media || "[]")
+				doc.sculpture = JSON.parse(data.sculpture || "[]")
         doc.startPosition = JSON.parse(data.startPosition)
         doc.lastPosition = JSON.parse(data.lastPosition)