diff --git a/.gitignore b/.gitignore
index 88d77033d..8c816f537 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,12 @@ node_modules/
tmp-crx/
tmp-userjs/
tmp-userscript/
+<<<<<<< HEAD
builds/4chan-X.zip
Gruntfile.js
builds/4chan-*
+=======
+builds/4chan-X-Chrome.zip
+builds/4chan-X-Opera.nex
+Gruntfile.js
+>>>>>>> v3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d91908ca..c7254966a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+**seaweedchan**:
+- Small bug fixes
+
### v2.0.6
*2013-05-29*
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 601ae1f06..bad37ab0f 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -82,6 +82,9 @@ module.exports = (grunt) ->
dest: 'builds/crx/'
expand: true
flatten: true
+ opera:
+ files:
+ 'builds/<%= pkg.name %>.nex': 'builds/<%= pkg.name %>.zip'
coffee:
script:
@@ -200,6 +203,7 @@ module.exports = (grunt) ->
grunt.registerTask 'release', [
'default'
'compress:crx'
+ 'copy:opera'
'shell:commit'
'shell:push'
]
diff --git a/builds/appchan-x.js b/builds/appchan-x.js
index c7bd79517..f8f7d8a9f 100644
--- a/builds/appchan-x.js
+++ b/builds/appchan-x.js
@@ -5278,6 +5278,9 @@
if (g.VIEW === 'catalog' || !Conf['Reply Hiding Buttons'] && !Conf['Reply Hiding Link']) {
return;
}
+ if (Conf['Reply Hiding Buttons']) {
+ $.addClass(doc, "reply-hide");
+ }
this.db = new DataBoard('hiddenPosts');
return Post.prototype.callbacks.push({
name: 'Reply Hiding',
diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index f85044701..53d6777b8 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -5274,6 +5274,9 @@
if (g.VIEW === 'catalog' || !Conf['Reply Hiding Buttons'] && !Conf['Reply Hiding Link']) {
return;
}
+ if (Conf['Reply Hiding Buttons']) {
+ $.addClass(doc, "reply-hide");
+ }
this.db = new DataBoard('hiddenPosts');
return Post.prototype.callbacks.push({
name: 'Reply Hiding',
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 83d166a47..1f97a7518 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -117,7 +117,6 @@
'Thread Expansion': [true, 'Add buttons to expand threads.'],
'Index Navigation': [false, 'Add buttons to navigate between threads.'],
'Reply Navigation': [false, 'Add buttons to navigate to top / bottom of thread.'],
- 'Check for Updates': [true, 'Check for updated versions of appchan x.'],
'Color User IDs': [false, 'Assign unique colors to user IDs on boards that use them'],
'Remove Spoilers': [false, 'Remove all spoilers in text.'],
'Indicate Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled.']
@@ -5276,6 +5275,9 @@
if (g.VIEW === 'catalog' || !Conf['Reply Hiding Buttons'] && !Conf['Reply Hiding Link']) {
return;
}
+ if (Conf['Reply Hiding Buttons']) {
+ $.addClass(doc, "reply-hide");
+ }
this.db = new DataBoard('hiddenPosts');
return Post.prototype.callbacks.push({
name: 'Reply Hiding',
@@ -14736,8 +14738,7 @@
}
Main.callbackNodes(Thread, threads);
Main.callbackNodesDB(Post, posts, function() {
- $.event('4chanXInitFinished');
- return Main.checkUpdate();
+ return $.event('4chanXInitFinished');
});
if (styleSelector = $.id('styleSelector')) {
passLink = $.el('a', {
@@ -14757,8 +14758,7 @@
err = _error;
new Notification('warning', 'Cookies need to be enabled on 4chan for appchan x to properly function.', 30);
}
- $.event('4chanXInitFinished');
- return Main.checkUpdate();
+ return $.event('4chanXInitFinished');
},
callbackNodes: function(klass, nodes) {
var callback, err, errors, i, len, node, _i, _len, _ref;
@@ -14865,40 +14865,6 @@
obj.callback.isAddon = true;
return Klass.prototype.callbacks.push(obj.callback);
},
- message: function(e) {
- var el, version;
-
- version = e.data.version;
- if (version && version !== g.VERSION) {
- el = $.el('span', {
- innerHTML: "Update: appchan x v" + version + " is out, get it here."
- });
- return new Notification('info', el, 120);
- }
- },
- checkUpdate: function() {
- var now;
-
- if (!(Conf['Check for Updates'] && Main.isThisPageLegit())) {
- return;
- }
- now = Date.now();
- return $.get('lastchecked', 0, function(_arg) {
- var lastchecked;
-
- lastchecked = _arg.lastchecked;
- if (lastchecked > now - $.DAY) {
- return;
- }
- return $.ready(function() {
- $.on(window, 'message', Main.message);
- $.set('lastchecked', now);
- return $.add(d.head, $.el('script', {
- src: 'https://github.com/zixaphir/appchan-x/raw/master/latest.js'
- }));
- });
- });
- },
handleErrors: function(errors) {
var div, error, logs, _i, _len;
diff --git a/src/Filtering/PostHiding.coffee b/src/Filtering/PostHiding.coffee
index 7fc8cd0a0..b02e8544b 100644
--- a/src/Filtering/PostHiding.coffee
+++ b/src/Filtering/PostHiding.coffee
@@ -2,6 +2,9 @@ PostHiding =
init: ->
return if g.VIEW is 'catalog' or !Conf['Reply Hiding Buttons'] and !Conf['Reply Hiding Link']
+ if Conf['Reply Hiding Buttons']
+ $.addClass doc, "reply-hide"
+
@db = new DataBoard 'hiddenPosts'
Post::callbacks.push
name: 'Reply Hiding'
diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index 2ba5b277a..77d9a0fd8 100644
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -49,10 +49,12 @@ Config =
false
'Add buttons to navigate to top / bottom of thread.'
]
+ <% if (type !== 'crx') { %>
'Check for Updates': [
true
'Check for updated versions of <%= meta.name %>.'
]
+ <% } %>
'Color User IDs': [
false
'Assign unique colors to user IDs on boards that use them'
diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index 6e149f5b9..91d445ad8 100644
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -194,7 +194,9 @@ Main =
Main.callbackNodes Thread, threads
Main.callbackNodesDB Post, posts, ->
$.event '4chanXInitFinished'
+ <% if (type !== 'crx') { %>
Main.checkUpdate()
+ <% } %>
if styleSelector = $.id 'styleSelector'
passLink = $.el 'a',
@@ -214,7 +216,9 @@ Main =
new Notification 'warning', 'Cookies need to be enabled on 4chan for <%= meta.name %> to properly function.', 30
$.event '4chanXInitFinished'
+ <% if (type !== 'crx') { %>
Main.checkUpdate()
+ <% } %>
callbackNodes: (klass, nodes) ->
# get the nodes' length only once
@@ -288,6 +292,7 @@ Main =
obj.callback.isAddon = true
Klass::callbacks.push obj.callback
+ <% if (type !== 'crx') { %>
message: (e) ->
{version} = e.data
if version and version isnt g.VERSION
@@ -306,6 +311,7 @@ Main =
$.set 'lastchecked', now
$.add d.head, $.el 'script',
src: '<%= meta.repo %>raw/<%= meta.mainBranch %>/latest.js'
+ <% } %>
handleErrors: (errors) ->
unless errors instanceof Array
diff --git a/src/General/css/tomorrow.css b/src/General/css/tomorrow.css
deleted file mode 100644
index 6f8d64b49..000000000
--- a/src/General/css/tomorrow.css
+++ /dev/null
@@ -1,64 +0,0 @@
-/* General */
-:root.tomorrow .dialog {
- background-color: #282A2E;
- border-color: #111;
-}
-
-/* Header */
-:root.tomorrow #header-bar, :root.tomorrow #notifications {
- font-size: 9pt;
- color: #C5C8C6;
-}
-:root.tomorrow #header-bar a, :root.tomorrow #notifications a {
- color: #81A2BE;
-}
-
-/* Settings */
-:root.tomorrow #fourchanx-settings fieldset {
- border-color: #111;
-}
-
-/* Quote */
-:root.tomorrow .backlink.deadlink {
- color: #81A2BE !important;
-}
-:root.tomorrow .inline {
- border-color: #111;
- background-color: rgba(0, 0, 0, .14);
-}
-
-/* QR */
-.tomorrow #dump-list::-webkit-scrollbar-thumb {
- background-color: #282A2E;
- border-color: #111;
-}
-:root.tomorrow .qr-preview {
- background-color: rgba(255, 255, 255, .15);
-}
-:root.tomorrow #qr .field {
- background-color: rgb(26, 27, 29);
- color: rgb(197,200,198);
- border-color: rgb(40, 41, 42);
-}
-:root.tomorrow #qr .field:focus {
- border-color: rgb(129, 162, 190) !important;
- background-color: rgb(30,32,36);
-}
-
-/* Menu */
-:root.tomorrow #menu {
- color: #C5C8C6;
-}
-:root.tomorrow .entry {
- border-bottom: 1px solid #111;
- font-size: 10pt;
-}
-:root.tomorrow .focused.entry {
- background: rgba(0, 0, 0, .33);
-}
-
-/* Watcher Favicon */
-:root.tomorrow .watch-thread-link
-{
- background-image: url("data:image/svg+xml,");
-}