Mergely 3.0 that works with CodeMirror 3.0 beta.

2012-11-03 18:17:49 +00:00
parent b5e669d330
commit 5b390c6737
27 changed files with 9340 additions and 1630 deletions
--- a/test/main.js
+++ b/test/main.js
@@ -0,0 +1,25 @@
+require.config({
+    paths: {
+        'codemirror':           '../lib/codemirror',
+        'mergely':              '../lib/mergely',
+        'jsunit':               'lib/jsunit/jsunit'
+    }
+});
+
+var OPTIONS = {debug:false};
+
+require([
+    'codemirror',
+    'mergely',
+    'jsunit',
+    //test modules
+    'tests',
+], function(
+    mergely,
+    codemirror,
+    JsUnit,
+    tests
+){
+    tests();
+    JsUnit.start();
+});