From 3841b28ad1f7bb6be9a06462f3e28bd9cab85a0f Mon Sep 17 00:00:00 2001
From: James Campos <james.r.campos@gmail.com>
Date: Tue, 28 Dec 2010 11:42:24 -0800
Subject: [PATCH] naming conflict

---
 4chan_x.coffee | 4 ++--
 4chan_x.js     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/4chan_x.coffee b/4chan_x.coffee
index 0be951ac7..9ae2e2b84 100644
--- a/4chan_x.coffee
+++ b/4chan_x.coffee
@@ -550,7 +550,7 @@ keyModeNormal = (e) ->
                 imageToggle image
         when "N"
             sign = if e.shiftKey then -1 else 1
-            scroll sign * count
+            scrollThread sign * count
         when "O"
             href = $("#{hash} ~ span[id] a:last-of-type").href
             if e.shiftKey
@@ -740,7 +740,7 @@ report = ->
     $('input[value="Report"]').click()
     input.click()
 
-scroll = (count) ->
+scrollThread = (count) ->
     [thread, idx] = getThread()
     top = thread.getBoundingClientRect().top
     if idx is 0 and top > 1
diff --git a/4chan_x.js b/4chan_x.js
index 69684c8b3..ab408db7e 100644
--- a/4chan_x.js
+++ b/4chan_x.js
@@ -1,5 +1,5 @@
 (function() {
-  var $, $$, AEOS, DAY, a, addTo, arr, as, autoWatch, autohide, b, board, callback, clearHidden, closeQR, config, cooldown, cutoff, d, delform, down, editSauce, el, expand, expandComment, expandThread, formSubmit, g, getConfig, getThread, getTime, hide, hideReply, hideThread, href, html, i, id, iframe, iframeLoad, imageClick, imageExpandClick, imageFull, imageThumb, imageToggle, img, inAfter, inBefore, input, inputs, keyModeInsert, keyModeNormal, keydown, keypress, l1, lastChecked, m, n, navbotr, navtopr, nodeInserted, now, omitted, onloadComment, onloadThread, options, optionsClose, parseResponse, pathname, qrListener, qrText, quickReply, recaptcha, recaptchaListener, recaptchaReload, redirect, remove, replace, replyNav, report, request, scroll, show, showReply, showThread, slice, span, src, start, stopPropagation, temp, text, textContent, thread, threadF, threads, tn, tzOffset, up, updateAuto, updateCallback, updateInterval, updateNow, updateTime, updaterMake, watch, watchX, watcher, watcherUpdate, x, zeroPad, _, _base, _i, _j, _k, _l, _len, _len2, _len3, _len4, _len5, _len6, _m, _ref, _ref2, _ref3, _ref4;
+  var $, $$, AEOS, DAY, a, addTo, arr, as, autoWatch, autohide, b, board, callback, clearHidden, closeQR, config, cooldown, cutoff, d, delform, down, editSauce, el, expand, expandComment, expandThread, formSubmit, g, getConfig, getThread, getTime, hide, hideReply, hideThread, href, html, i, id, iframe, iframeLoad, imageClick, imageExpandClick, imageFull, imageThumb, imageToggle, img, inAfter, inBefore, input, inputs, keyModeInsert, keyModeNormal, keydown, keypress, l1, lastChecked, m, n, navbotr, navtopr, nodeInserted, now, omitted, onloadComment, onloadThread, options, optionsClose, parseResponse, pathname, qrListener, qrText, quickReply, recaptcha, recaptchaListener, recaptchaReload, redirect, remove, replace, replyNav, report, request, scroll, scrollThread, show, showReply, showThread, slice, span, src, start, stopPropagation, temp, text, textContent, thread, threadF, threads, tn, tzOffset, up, updateAuto, updateCallback, updateInterval, updateNow, updateTime, updaterMake, watch, watchX, watcher, watcherUpdate, x, zeroPad, _, _base, _i, _j, _k, _l, _len, _len2, _len3, _len4, _len5, _len6, _m, _ref, _ref2, _ref3, _ref4;
   var __slice = Array.prototype.slice, __indexOf = Array.prototype.indexOf || function(item) {
     for (var i = 0, l = this.length; i < l; i++) {
       if (this[i] === item) return i;
@@ -713,7 +713,7 @@
         }
       case "N":
         sign = e.shiftKey ? -1 : 1;
-        return scroll(sign * count);
+        return scrollThread(sign * count);
       case "O":
         href = $("" + hash + " ~ span[id] a:last-of-type").href;
         if (e.shiftKey) {
@@ -986,7 +986,7 @@
     $('input[value="Report"]').click();
     return input.click();
   };
-  scroll = function(count) {
+  scrollThread = function(count) {
     var hash, idx, temp, thread, top, _ref;
     _ref = getThread(), thread = _ref[0], idx = _ref[1];
     top = thread.getBoundingClientRect().top;