Merge branch 'master' of github.com:aeosynth/4chan-x

2011-07-24 07:16:01 +02:00 · 2011-07-24 07:16:01 +02:00 · 018eddcfba
commit 018eddcfba
parent 1c69ae5c93 d04be89ce7
4 changed files with 6 additions and 4 deletions
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@ -2,7 +2,7 @@
 // @name           4chan x
 // @namespace      aeosynth
 // @description    Adds various features.
-// @version        2.16.0
+// @version        2.16.1
 // @copyright      2009-2011 James Campos <james.r.campos@gmail.com>
 // @license        MIT; http://en.wikipedia.org/wiki/Mit_license
 // @include        http://boards.4chan.org/*
@ -137,8 +137,8 @@
    },
    updater: {
      checkbox: {
+        'Scrolling': [false, 'Scroll updated posts into view. Only enabled at bottom of page.'],
        'Verbose': [true, 'Show countdown timer, new post count'],
-        'Scrolling': [false, 'Scroll updated posts into view'],
        'Auto Update': [true, 'Automatically fetch new posts']
      },
      'Interval': 30
--- a/2
+++ b/2
@ -1,4 +1,6 @@
 github
+
+2.16.1
 - mayhem:
  - Make updater's settings dynamic

--- a/2
+++ b/2
@ -2,7 +2,7 @@
 // @name           4chan x
 // @namespace      aeosynth
 // @description    Adds various features.
-// @version        2.16.0
+// @version        2.16.1
 // @copyright      2009-2011 James Campos <james.r.campos@gmail.com>
 // @license        MIT; http://en.wikipedia.org/wiki/Mit_license
 // @include        http://boards.4chan.org/*
--- a/script.coffee
+++ b/script.coffee
@ -72,8 +72,8 @@ config =
    update:          'u'
  updater:
    checkbox:
+      'Scrolling':    [false, 'Scroll updated posts into view. Only enabled at bottom of page.']
      'Verbose':      [true,  'Show countdown timer, new post count']
-      'Scrolling':    [false, 'Scroll updated posts into view']
      'Auto Update':  [true,  'Automatically fetch new posts']
    'Interval': 30