Fixed a bug where the id was not set without a schema

peerigon · Jan 8, 2014 · 73125c6 · 73125c6
1 parent 7122696
commit 73125c6
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/lib/shared/Model.class.js b/lib/shared/Model.class.js
@@ -337,11 +337,6 @@ var Model = EventEmitter.extend("Model", Junction, {
             customSetters,
             i;
 
-        // Check if there is a schema
-        if (!this._types) {
-            return newValue;
-        }
-
         if (key === "id") {
             this.setId(newValue);
             return newValue;
@@ -350,6 +345,11 @@ var Model = EventEmitter.extend("Model", Junction, {
             return newValue;
         }
 
+        // Check if there is a schema
+        if (!this._types) {
+            return newValue;
+        }
+
         expectedType = this._types[key];
 
         if (expectedType === undefined) {