From fe3917c0f11cff6655c31edc6dbe1b9fbe88d114 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 12 Feb 2016 16:20:55 +0100
Subject: [PATCH] fix jshint complaints in codemirror directory

---
 www/code/realtime-wysiwyg.js | 24 +++++++++----------
 www/code/rtwiki.js           | 46 ++++++++++++++++++++----------------
 www/code/sharejs_textarea.js | 11 +++++----
 3 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/www/code/realtime-wysiwyg.js b/www/code/realtime-wysiwyg.js
index c1b88d7a3..8a1178ebf 100644
--- a/www/code/realtime-wysiwyg.js
+++ b/www/code/realtime-wysiwyg.js
@@ -281,20 +281,20 @@ console.log(new Error().stack);
                 var newCursor;
                 var newSelection;
                 if(oldCursorCMStart !== oldCursorCMEnd) { // Selection
-                  if (op.toRemove > 0) {
-                    var newSelection = [transformCursorCMRemove(oldValue, oldCursorCMStart, op.offset, op.toRemove), transformCursorCMRemove(oldValue, oldCursorCMEnd, op.offset, op.toRemove)];
-                  }
-                  if (op.toInsert.length > 0) {
-                    var newSelection = [transformCursorCMInsert(oldValue, oldCursorCMStart, op.offset, op.toInsert), transformCursorCMInsert(oldValue, oldCursorCMEnd, op.offset, op.toInsert)];
-                  }
+                    if (op.toRemove > 0) {
+                        newSelection = [transformCursorCMRemove(oldValue, oldCursorCMStart, op.offset, op.toRemove), transformCursorCMRemove(oldValue, oldCursorCMEnd, op.offset, op.toRemove)];
+                    }
+                    if (op.toInsert.length > 0) {
+                        newSelection = [transformCursorCMInsert(oldValue, oldCursorCMStart, op.offset, op.toInsert), transformCursorCMInsert(oldValue, oldCursorCMEnd, op.offset, op.toInsert)];
+                    }
                 }
                 else { // Cursor
-                  if (op.toRemove > 0) {
-                    var newCursor = transformCursorCMRemove(oldValue, oldCursor, op.offset, op.toRemove);
-                  }
-                  if (op.toInsert.length > 0) {
-                    var newCursor = transformCursorCMInsert(oldValue, oldCursor, op.offset, op.toInsert);
-                  }
+                    if (op.toRemove > 0) {
+                        newCursor = transformCursorCMRemove(oldValue, oldCursor, op.offset, op.toRemove);
+                    }
+                    if (op.toInsert.length > 0) {
+                        newCursor = transformCursorCMInsert(oldValue, oldCursor, op.offset, op.toInsert);
+                    }
                 }
                 $(doc).val(newValue);
                 cmEditor.setValue(newValue);
diff --git a/www/code/rtwiki.js b/www/code/rtwiki.js
index a6a209d69..4f668ced3 100644
--- a/www/code/rtwiki.js
+++ b/www/code/rtwiki.js
@@ -33,7 +33,7 @@ define([
     var warn = function (x) { };
     var debug = function (x) { };
     //debug = function (x) { console.log(x) };
-    warn = function (x) { console.log(x) };
+    warn = function (x) { console.log(x); };
     var setStyle = function () {
         $('head').append([
             '<style>',
@@ -70,6 +70,11 @@ define([
         return 'rtwiki-uid-' + String(Math.random()).substring(2);
     };
 
+    // only used within updateUserList so far
+    var decodeUser = function (all, one) {
+        return decodeURIComponent(one);
+    };
+
     var updateUserList = function (myUserName, listElement, userList, messages) {
         var meIdx = userList.indexOf(myUserName);
         if (meIdx === -1) {
@@ -79,6 +84,7 @@ define([
         var userMap = {};
         userMap[messages.myself] = 1;
         userList.splice(meIdx, 1);
+
         for (var i = 0; i < userList.length; i++) {
             var user;
             if (userList[i].indexOf('xwiki:XWiki.XWikiGuest') === 0) {
@@ -88,9 +94,7 @@ define([
                     user = messages.guest;
                 }
             } else {
-                user = userList[i].replace(/^.*-([^-]*)%2d[0-9]*$/, function(all, one) {
-                    return decodeURIComponent(one);
-                });
+                user = userList[i].replace(/^.*-([^-]*)%2d[0-9]*$/, decodeUser);
             }
             userMap[user] = userMap[user] || 0;
             if (user === messages.guest && userMap[user] > 0) {
@@ -232,7 +236,7 @@ define([
                 $(textArea).scrollTop(heightOne - heightTwo);
             }
             andThen();
-        })
+        });
     };
 
     var saveDocument = function (textArea, language, andThen) {
@@ -771,20 +775,20 @@ define([
                 var newCursor;
                 var newSelection;
                 if(oldCursorCMStart !== oldCursorCMEnd) { // Selection
-                  if (op.toRemove > 0) {
-                    var newSelection = [transformCursorCMRemove(oldValue, oldCursorCMStart, op.offset, op.toRemove), transformCursorCMRemove(oldValue, oldCursorCMEnd, op.offset, op.toRemove)];
-                  }
-                  if (op.toInsert.length > 0) {
-                    var newSelection = [transformCursorCMInsert(oldValue, oldCursorCMStart, op.offset, op.toInsert), transformCursorCMInsert(oldValue, oldCursorCMEnd, op.offset, op.toInsert)];
-                  }
+                    if (op.toRemove > 0) {
+                        newSelection = [transformCursorCMRemove(oldValue, oldCursorCMStart, op.offset, op.toRemove), transformCursorCMRemove(oldValue, oldCursorCMEnd, op.offset, op.toRemove)];
+                    }
+                    if (op.toInsert.length > 0) {
+                        newSelection = [transformCursorCMInsert(oldValue, oldCursorCMStart, op.offset, op.toInsert), transformCursorCMInsert(oldValue, oldCursorCMEnd, op.offset, op.toInsert)];
+                    }
                 }
                 else { // Cursor
-                  if (op.toRemove > 0) {
-                    var newCursor = transformCursorCMRemove(oldValue, oldCursor, op.offset, op.toRemove);
-                  }
-                  if (op.toInsert.length > 0) {
-                    var newCursor = transformCursorCMInsert(oldValue, oldCursor, op.offset, op.toInsert);
-                  }
+                    if (op.toRemove > 0) {
+                        newCursor = transformCursorCMRemove(oldValue, oldCursor, op.offset, op.toRemove);
+                    }
+                    if (op.toInsert.length > 0) {
+                        newCursor = transformCursorCMInsert(oldValue, oldCursor, op.offset, op.toInsert);
+                    }
                 }
                 $(textArea).val(newValue);
                 cmEditor.setValue(newValue);
@@ -861,10 +865,10 @@ define([
                                 messages,
                                 cryptkey);
         return {
-        onEvent: function() {
-          socket.onEvent();
-        }
-      }
+            onEvent: function() {
+              socket.onEvent();
+            }
+        };
     };
   
     var start = module.exports.start = function (window, websocketUrl,
diff --git a/www/code/sharejs_textarea.js b/www/code/sharejs_textarea.js
index 4fda3c609..73abe857e 100644
--- a/www/code/sharejs_textarea.js
+++ b/www/code/sharejs_textarea.js
@@ -93,23 +93,24 @@ var attachTextarea = function(elem, ctx, cmElem) {
   // Replace the content of the text area with newText, and transform the
   // current cursor by the specified function.
   var replaceText = function(newText, transformCursor, transformCursorCM) {
+      var newCursor;
+      var newSelection;
+
     if(cmElem) {
       // Fix cursor here?
       var cursorCM = cmElem.getCursor();
       var cursorCMStart = cmElem.getCursor('from');
       var cursorCMEnd = cmElem.getCursor('to');
-      var newCursor;
-      var newSelection;
       if(cursorCMStart !== cursorCMEnd) {
-        newSelection = [transformCursorCM(elem.value, cursorCMStart), transformCursorCM(elem.value, cursorCMEnd)];
+          newSelection = [transformCursorCM(elem.value, cursorCMStart), transformCursorCM(elem.value, cursorCMEnd)];
       }
       else {
-        newCursor = transformCursorCM(elem.value, cursorCM);
+          newCursor = transformCursorCM(elem.value, cursorCM);
       }
     }
     
     if (transformCursor && !cmElem) {
-      var newSelection = [transformCursor(elem.selectionStart), transformCursor(elem.selectionEnd)];
+        newSelection = [transformCursor(elem.selectionStart), transformCursor(elem.selectionEnd)];
     }
 
     // Fixate the window's scroll while we set the element's value. Otherwise