Merge pull request #19 from alanjames1987/master

Adds AMD support.
molnarg · Nov 9, 2014 · f4d8132 · f4d8132
2 parents f73b4e2 + 7085591
commit f4d8132
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/js-schema.debug.js b/js-schema.debug.js
@@ -910,7 +910,7 @@ var OrSchema = module.exports = Schema.patterns.OrSchema = Schema.extend({
         }
       })
       if (errors.length > 0) {
-        return errors.join('   OR   ')
+        return errors.join(' AND ')
       }
     }
     return false
@@ -1117,4 +1117,10 @@ schema.fromJSON = function(sch) {
   return Schema.fromJSON(sch).wrap()
 }
 
+// define js-schema using AMD
+if (typeof define === 'function' && define.amd) {
+  define([], function(){
+    return schema;
+  });
+}
 },{"./BaseSchema":2}]},{},[1]);