From 400f6efde15978f2755c8bc84bd0dc87a811e4d2 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 12 Apr 2016 15:00:46 +0200
Subject: [PATCH] json-ot.js : jshint compliance

---
 www/common/json-ot.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/www/common/json-ot.js b/www/common/json-ot.js
index 98e1af4ec..d8d75b7b6 100644
--- a/www/common/json-ot.js
+++ b/www/common/json-ot.js
@@ -5,15 +5,16 @@ define([
     var JsonOT = {};
 
     var validate = JsonOT.validate = function (text, toTransform, transformBy) {
+        var resultOp, text2, text3;
         try {
             // text = O (mutual common ancestor)
             // toTransform = A (the first incoming operation)
             // transformBy = B (the second incoming operation)
             // threeway merge (0, A, B)
 
-            var resultOp = ChainPad.Operation.transform0(text, toTransform, transformBy);
-            var text2 = ChainPad.Operation.apply(transformBy, text);
-            var text3 = ChainPad.Operation.apply(resultOp, text2);
+            resultOp = ChainPad.Operation.transform0(text, toTransform, transformBy);
+            text2 = ChainPad.Operation.apply(transformBy, text);
+            text3 = ChainPad.Operation.apply(resultOp, text2);
             try {
                 JSON.parse(text3);
                 return resultOp;
@@ -35,8 +36,7 @@ define([
             }
         } catch (x) {
             console.error(x);
-            console.error(e);
-            var info = window.REALTIME_MODULE.ot_applyError = {
+            window.REALTIME_MODULE.ot_applyError = {
                 type: 'resultParseError',
                 resultOp: resultOp,
 
@@ -46,7 +46,7 @@ define([
                 text1: text,
                 text2: text2,
                 text3: text3,
-                error: e
+                error: x
             };
             console.log('Debugging info available at `window.REALTIME_MODULE.ot_applyError`');
         }