Merge pull request #117 from openeyes/release/v3.0

Release/v3.0

.gitattributes

@@ -0,0 +1,40 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text eol=lf
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.c text
+*.h text
+*.css text
+*.html text
+*.xml text
+*.js text
+*.conf text
+*.sass text
+*.scss text
+*.md text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.bat text eol=crlf
+*.cmd text eol=crlf
+
+# Declare files that will always have LF line endings on checkout.
+*.sh text eol=lf
+*.php text eol=lf
+
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
+*.bmp binary
+*.gif binary
+*.tiff binary
+*.dcm binary
+*.pdf binary
+*.otf binary
+*.eot binary
+*.ttf binary
+*.woff binary
+*.woff2 binary
+*.odt binary
+*.zip binary

DoodleInfo.php

@@ -81,6 +81,7 @@ class DoodleInfo
         'CottonWoolSpot' => 'Cotton wool spot',
         'Cryo' => 'Cryotherapy scar',
         'CutterPI' => 'Cutter iridectomy',
+        'Cypass' => 'Cypass Stent Insertion',
         'CystoidMacularOedema' => 'Cystoid macular oedema',
         'DendriticUlcer' => 'Dendritic ulcer',
         'DiabeticNV' => 'Diabetic new vessels',
@@ -230,5 +231,6 @@ class DoodleInfo
         'Pterygium' => 'Pterygium',
         'Drusen' => 'Drusen',
         'MaculaPostPole' => 'Macula (posterior pole)',
+        'PCV' => 'Polypoidal choroidal vasculopathy',
     );
 }

assets/components/blanket/src/adapters/mocha-blanket.js

@@ -1,66 +1,66 @@
-(function() {
-
-    if(!mocha) {
-        throw new Exception("mocha library does not exist in global namespace!");
-    }
-
-
-    /*
-     * Mocha Events:
-     *
-     *   - `start`  execution started
-     *   - `end`  execution complete
-     *   - `suite`  (suite) test suite execution started
-     *   - `suite end`  (suite) all tests (and sub-suites) have finished
-     *   - `test`  (test) test execution started
-     *   - `test end`  (test) test completed
-     *   - `hook`  (hook) hook execution started
-     *   - `hook end`  (hook) hook complete
-     *   - `pass`  (test) test passed
-     *   - `fail`  (test, err) test failed
-     *
-     */
-
-    var originalReporter = mocha._reporter;
-
-    var blanketReporter = function(runner) {
-            runner.on('start', function() {
-                blanket.setupCoverage();
-            });
-
-            runner.on('end', function() {
-                blanket.onTestsDone();
-            });
-
-            runner.on('suite', function() {
-                blanket.onModuleStart();
-            });
-
-            runner.on('test', function() {
-                blanket.onTestStart();
-            });
-
-            runner.on('test end', function(test) {
-                blanket.onTestDone(test.parent.tests.length, test.state === 'passed');
-            });
-
-            //I dont know why these became global leaks
-            runner.globals(['stats', 'failures', 'runner']);
-
-            originalReporter(runner);
-        };
-
-    mocha.reporter(blanketReporter);
-    var oldRun = mocha.run;
-    var oldCallback = null;
-    mocha.run = function (finishCallback) {
-      oldCallback = finishCallback;
-      console.log("waiting for blanket...");
-    };
-    blanket.beforeStartTestRunner({
-        callback: function(){
-            oldRun(oldCallback);
-            mocha.run = oldRun;
-        }
-    });
-})();
+(function() {
+
+    if(!mocha) {
+        throw new Exception("mocha library does not exist in global namespace!");
+    }
+
+
+    /*
+     * Mocha Events:
+     *
+     *   - `start`  execution started
+     *   - `end`  execution complete
+     *   - `suite`  (suite) test suite execution started
+     *   - `suite end`  (suite) all tests (and sub-suites) have finished
+     *   - `test`  (test) test execution started
+     *   - `test end`  (test) test completed
+     *   - `hook`  (hook) hook execution started
+     *   - `hook end`  (hook) hook complete
+     *   - `pass`  (test) test passed
+     *   - `fail`  (test, err) test failed
+     *
+     */
+
+    var originalReporter = mocha._reporter;
+
+    var blanketReporter = function(runner) {
+            runner.on('start', function() {
+                blanket.setupCoverage();
+            });
+
+            runner.on('end', function() {
+                blanket.onTestsDone();
+            });
+
+            runner.on('suite', function() {
+                blanket.onModuleStart();
+            });
+
+            runner.on('test', function() {
+                blanket.onTestStart();
+            });
+
+            runner.on('test end', function(test) {
+                blanket.onTestDone(test.parent.tests.length, test.state === 'passed');
+            });
+
+            //I dont know why these became global leaks
+            runner.globals(['stats', 'failures', 'runner']);
+
+            originalReporter(runner);
+        };
+
+    mocha.reporter(blanketReporter);
+    var oldRun = mocha.run;
+    var oldCallback = null;
+    mocha.run = function (finishCallback) {
+      oldCallback = finishCallback;
+      console.log("waiting for blanket...");
+    };
+    blanket.beforeStartTestRunner({
+        callback: function(){
+            oldRun(oldCallback);
+            mocha.run = oldRun;
+        }
+    });
+})();