commit 213a3e597e04abcb15747d65509ae0d6ecdbeb4d
author Vladimir Kotikov <v-vlkoti@microsoft.com> Tue Dec 02 17:43:16 2014 +0300
committer Vladimir Kotikov <v-vlkoti@microsoft.com> Tue Dec 02 17:43:16 2014 +0300
tree 3b5e28e244f9fe46af54e3eae1e3b46ea6b3cba3
parent 80225da9beef00cbf96c5eeaf944737b722e76b4

Removes duplicate medic loading (should be already loaded in main.init())

* small compatibility fixes

www/jasmine_helpers.js

diff --git a/www/jasmine_helpers.js b/www/jasmine_helpers.js
index c556b00..7e0864d 100644
--- a/www/jasmine_helpers.js
+++ b/www/jasmine_helpers.js
@@ -81,17 +81,16 @@
     jasmineEnv.addReporter(jasmineInterface.htmlReporter);
 
     var medic = require('org.apache.cordova.test-framework.medic');
-    medic.load(function () {
-        if (medic.enabled) {
-            jasmineRequire.medic(jasmineInterface.jasmine);
-            jasmineInterface.MedicReporter = new jasmineInterface.jasmine.MedicReporter({
-                env: jasmineEnv,
-                log: { logurl: medic.logurl },
-                sha: medic.sha
-            });
-            jasmineInterface.MedicReporter.initialize();
-            jasmineEnv.addReporter(jasmineInterface.MedicReporter);
-        }
-    });
+
+    if (medic.enabled) {
+        jasmineRequire.medic(jasmineInterface.jasmine);
+        jasmineInterface.MedicReporter = new jasmineInterface.jasmine.MedicReporter({
+            env: jasmineEnv,
+            log: { logurl: medic.logurl },
+            sha: medic.sha
+        });
+        jasmineInterface.MedicReporter.initialize();
+        jasmineEnv.addReporter(jasmineInterface.MedicReporter);
+    }
     
 }

www/medic.js

diff --git a/www/medic.js b/www/medic.js
index 8e1ec4c..a0a4f17 100644
--- a/www/medic.js
+++ b/www/medic.js
@@ -36,11 +36,11 @@
 
 exports.load = function (callback) {
   var xhr = new XMLHttpRequest();
-  xhr.open("GET", "medic.json", true);
+  xhr.open("GET", "../medic.json", true);
   xhr.onload = function() {
     if (xhr.readyState == 4 && xhr.status == 200) {
       var cfg = JSON.parse(xhr.responseText);
-      exports.logurl = cfg.couchdb;
+      exports.logurl = cfg.couchdb || cfg.logurl;
       exports.enabled = true;
       exports.sha = cfg.sha;
       console.log('Loaded Medic Config: logurl=' + exports.logurl);