FIX #70: Warning if attempt to save beofre app init, and fix type error.

sarajs · Mar 3, 2014 · f8f0979 · f8f0979
1 parent 6d9d03c
commit f8f0979
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/examples/mustache-example/app.js b/examples/mustache-example/app.js
@@ -11,5 +11,4 @@ App.storage('todolist', require('../../lib/adapters/mongodb'))
     '/': TodoView.render
   , '/about': AboutView.render
   })
-  .init({ env: 'development' }, function () {
-  })
+  .init({ env: 'development' })
diff --git a/lib/sara.js b/lib/sara.js
@@ -213,12 +213,12 @@ Sara.prototype.init = function (options, fn) {
   _(this).extend(options)
   if (IS_SERVER) {
     this.root = _.filepathFromStackIndex(2)
-    setupServer(this)
-  } else if (IS_CLIENT) setupClient(this, callback)
+    setupServer(this, callback.bind(this))
+  } else if (IS_CLIENT) setupClient(this, callback.bind(this))
 
   function callback() {
     this.initialized = true
-    if (fn instanceof Function) fn.bind(this)()
+    if (fn instanceof Function && IS_CLIENT) fn.bind(this)()
   }
 
   return this

diff --git a/lib/sara/model.js b/lib/sara/model.js
@@ -205,7 +205,7 @@ function Model(name, schema, initialize) {
           })
         }
       }.bind(this))    
-    }
+    } else console.warn('Attempted to save model before app initialization.')
     return this
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -205,7 +205,7 @@ function Model(name, schema, initialize) { @@
               })
             }
           }.bind(this))
-        }
+        } else console.warn('Attempted to save model before app initialization.')
         return this
       }
@@ Expand Down @@