Merge branch 'v3'

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-03-27 13:54:27 -07:00
commit df2a5f3fc0
10 changed files with 1132 additions and 18 deletions

View File

@ -1,3 +1,6 @@
**MayhemYDG**:
- Fix captcha not refreshing.
### v2.9.8
*2014-03-26*

View File

@ -1,5 +1,5 @@
/*
* appchan x - Version 2.9.8 - 2014-03-26
* appchan x - Version 2.9.8 - 2014-03-27
*
* Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE

View File

@ -25,7 +25,7 @@
// ==/UserScript==
/*
* appchan x - Version 2.9.8 - 2014-03-26
* appchan x - Version 2.9.8 - 2014-03-27
*
* Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -9594,7 +9594,9 @@
$.sync('captchas', QR.captcha.sync);
QR.captcha.nodes.challenge = challenge;
new MutationObserver(QR.captcha.load.bind(QR.captcha)).observe(challenge, {
childList: true
childList: true,
subtree: true,
attributes: true
});
return QR.captcha.load();
},
@ -11489,7 +11491,7 @@
})(),
toggle: function(e) {
var fullID;
fullID = $.x('ancestor::*[@data-full-i-d]', this).dataset.fullID;
fullID = $.x('ancestor::*[@data-full-i-d][1]', this).dataset.fullID;
return Menu.menu.toggle(e, this, g.posts[fullID]);
}
};
@ -12946,14 +12948,24 @@
}
}, {
name: "4plebs",
boards: ["adv", "hr", "o", "pol", "s4s", "tg", "tv", "x"],
files: ["adv", "hr", "o", "pol", "s4s", "tg", "tv", "x"],
boards: ["adv", "hr", "o", "pol", "s4s", "tg", "trv", "tv", "x"],
files: ["adv", "hr", "o", "pol", "s4s", "tg", "trv", "tv", "x"],
data: {
domain: "archive.4plebs.org",
http: true,
https: true,
software: "foolfuuka"
}
}, {
name: "4plebs Flash Archive",
boards: ["f"],
files: ["f"],
data: {
domain: "flash.4plebs.org",
http: true,
https: true,
software: "foolfuuka"
}
}, {
name: "Nyafuu",
boards: ["c", "e", "w", "wg"],

View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript
/*
* appchan x - Version 2.9.8 - 2014-03-26
* appchan x - Version 2.9.8 - 2014-03-27
*
* Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -9638,7 +9638,9 @@
$.sync('captchas', QR.captcha.sync);
QR.captcha.nodes.challenge = challenge;
new MutationObserver(QR.captcha.load.bind(QR.captcha)).observe(challenge, {
childList: true
childList: true,
subtree: true,
attributes: true
});
return QR.captcha.load();
},
@ -11505,7 +11507,7 @@
})(),
toggle: function(e) {
var fullID;
fullID = $.x('ancestor::*[@data-full-i-d]', this).dataset.fullID;
fullID = $.x('ancestor::*[@data-full-i-d][1]', this).dataset.fullID;
return Menu.menu.toggle(e, this, g.posts[fullID]);
}
};
@ -12961,14 +12963,24 @@
}
}, {
name: "4plebs",
boards: ["adv", "hr", "o", "pol", "s4s", "tg", "tv", "x"],
files: ["adv", "hr", "o", "pol", "s4s", "tg", "tv", "x"],
boards: ["adv", "hr", "o", "pol", "s4s", "tg", "trv", "tv", "x"],
files: ["adv", "hr", "o", "pol", "s4s", "tg", "trv", "tv", "x"],
data: {
domain: "archive.4plebs.org",
http: true,
https: true,
software: "foolfuuka"
}
}, {
name: "4plebs Flash Archive",
boards: ["f"],
files: ["f"],
data: {
domain: "flash.4plebs.org",
http: true,
https: true,
software: "foolfuuka"
}
}, {
name: "Nyafuu",
boards: ["c", "e", "w", "wg"],

1068
css/style.css Normal file

File diff suppressed because it is too large Load Diff

View File

@ -27,13 +27,22 @@
"files": ["c", "po"]
}, {
"uid": 3,
"name": "4plebs",
"name": "4plebs Archive",
"domain": "archive.4plebs.org",
"http": true,
"https": true,
"software": "foolfuuka",
"boards": ["adv", "hr", "o", "pol", "s4s", "tg", "tv", "x"],
"files": ["adv", "hr", "o", "pol", "s4s", "tg", "tv", "x"]
"boards": ["adv", "hr", "o", "pol", "s4s", "tg", "trv", "tv", "x"],
"files": ["adv", "hr", "o", "pol", "s4s", "tg", "trv", "tv", "x"]
}, {
"uid": 18,
"name": "4plebs Flash Archive",
"domain": "flash.4plebs.org",
"http": true,
"https": true,
"software": "foolfuuka",
"boards": ["f"],
"files": ["f"]
}, {
"uid": 4,
"name": "Nyafuu",

View File

@ -51,13 +51,22 @@ Redirect =
software: "foolfuuka"
,
name: "4plebs"
boards: ["adv", "hr", "o", "pol", "s4s", "tg", "tv", "x"]
files: ["adv", "hr", "o", "pol", "s4s", "tg", "tv", "x"]
boards: ["adv", "hr", "o", "pol", "s4s", "tg", "trv", "tv", "x"]
files: ["adv", "hr", "o", "pol", "s4s", "tg", "trv", "tv", "x"]
data:
domain: "archive.4plebs.org"
http: true
https: true
software: "foolfuuka"
,
name: "4plebs Flash Archive",
boards: ["f"]
files: ["f"]
data:
domain: "flash.4plebs.org"
http: true
https: true
software: "foolfuuka"
,
name: "Nyafuu"
boards: ["c", "e", "w", "wg"]

View File

@ -1,6 +1,5 @@
Header =
init: ->
@menu = new UI.Menu 'header'
menuButton = $.el 'span',

View File

@ -35,5 +35,5 @@ Menu =
clone
toggle: (e) ->
fullID = $.x('ancestor::*[@data-full-i-d]', @).dataset.fullID
fullID = $.x('ancestor::*[@data-full-i-d][1]', @).dataset.fullID
Menu.menu.toggle e, @, g.posts[fullID]

View File

@ -62,6 +62,8 @@ QR.captcha =
QR.captcha.nodes.challenge = challenge
new MutationObserver(QR.captcha.load.bind QR.captcha).observe challenge,
childList: true
subtree: true
attributes: true
QR.captcha.load()
sync: (captchas) ->