rel 0.3.1

cerebralkungfu · cerebralkungfu · commit c97fc206a979 · 2015-04-04T08:35:33.000-06:00
diff --git a/.jsbeautifyrc b/.jsbeautifyrc
@@ -0,0 +1,6 @@
+{
+	"js": {
+		"indent_char": " ",
+		"indent_size": 2
+	}
+}
diff --git a/.jshintignore b/.jshintignore
@@ -0,0 +1 @@
+node_modules/**
diff --git a/.jshintrc b/.jshintrc
@@ -0,0 +1,8 @@
+{
+  "node": true,
+  "mocha":  true,
+	"strict": true,
+	"laxcomma": true,
+	"nomen": false,
+	"indent": 2
+}
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ all: deps min
 min:
 	$(UGLIFY)	index.js \
 		-o $(OUTPUT) \
-		-r '$,require,exports,window,global' -m \
+		-r '$,require,exports,module,window,global' -m \
 		--comments '/^!/'
 
 deps:
diff --git a/releases/deep-diff-0.3.1.min.js b/releases/deep-diff-0.3.1.min.js
diff --git a/test/tests.html b/test/tests.html
@@ -21,8 +21,8 @@
     };
     DeepDiffConflict = DeepDiff;
     </script>
-    <!--script src="../releases/deep-diff-0.3.1.min.js"></script-->
-    <script src="../index.js"></script>
+    <script src="../releases/deep-diff-0.3.1.min.js"></script>
+    <!--script src="../index.js"></script-->
     <script>
     mocha.setup('bdd');
     </script>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +{
 +	"js": {
 +		"indent_char": " ",
 +		"indent_size": 2
 +	}
 +}