Bug fixes:

* Fixes #14 * Fixes #13 * Fixes #11
doughsay · Feb 21, 2013 · d5eb2a5 · d5eb2a5
1 parent 3b7ce4d
commit d5eb2a5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/assets/css/app.less b/assets/css/app.less
@@ -21,9 +21,7 @@ body {
 }
 
 .command {
-  border-width: 2px 0 0 0;
-  border-style: solid;
-  border-color: gray;
+  border-top: 2px solid @gray;
   form {
     margin: 0;
     .prompt {

diff --git a/assets/js/view_models/client.coffee b/assets/js/view_models/client.coffee
@@ -87,7 +87,7 @@ class ClientView
   setSizes: ->
     inputWidthDiff = @input.outerWidth() - @input.width()
     @input.width($('.ui-layout-center').width() - inputWidthDiff - $('.prompt').outerWidth())
-    @screen.height($('.ui-layout-center').height() - @input.outerHeight())
+    @screen.height($('.ui-layout-center').height() - @input.outerHeight() - 2)
 
     # if an ace editor is present, call it's resize function
     # and set sizes for all the form elements to make them look prettier

diff --git a/lib/context.coffee b/lib/context.coffee
@@ -50,6 +50,11 @@ class Context
         x
 
   serialize: (x) =>
+    try
+      JSON.stringify x
+    catch error
+      throw new Error 'Unserializable property'
+
     switch typeof x
       when 'object'
         if x == null

diff --git a/lib/object.coffee b/lib/object.coffee
@@ -72,6 +72,8 @@ exports.RoomJsObject = class
       true
     else
       object = @db.findById id
+      if object.inheritsFrom @id
+        throw new Error 'Cannot create circular inheritance'
       if not object?
         throw new Error "Invalid object"
       @parent_id = id