Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mayhem' into v3

Browse Source 
Conflicts:
	CHANGELOG.md
	src/General/lib/$.coffee
	src/Images/Sauce.coffee
This commit is contained in:
Zixaphir 2014-01-28 01:11:06 -07:00
commit 2ac2286ad5
8 changed files with 53 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,6 +3,9 @@
- More stability update.
- Stability update.
**ParrotParrot**:
- Added `Original filename` variable to Sauce panel.
**seaweedchan**:
- Fix Menu errors on older Firefox versions, such as the ESR

2
LICENSE
View File

@ -1,5 +1,5 @@
/*
* 4chan X - Version 1.3.2 - 2014-01-24
* 4chan X - Version 1.3.2 - 2014-01-28
*
* Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE

43
builds/4chan-X.user.js
View File

@ -23,7 +23,7 @@
// ==/UserScript==
/*
* 4chan X - Version 1.3.2 - 2014-01-24
* 4chan X - Version 1.3.2 - 2014-01-28
*
* Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
@ -561,21 +561,12 @@
return __indexOf.call(el.classList, className) >= 0;
};
$.rm = (function() {
if ('remove' in Element.prototype) {
return function(el) {
return el.remove();
};
} else {
return function(el) {
var _ref;
return (_ref = el.parentNode) != null ? _ref.removeChild(el) : void 0;
};
}
})();
$.rm = function(el) {
return el.remove();
};
$.rmAll = function(root) {
return root.textContent = '';
return root.textContent = null;
};
$.tn = function(s) {
@ -7972,19 +7963,15 @@
},
createSauceLink: function(link) {
var m, text;
link = link.replace(/%(T?URL|MD5|board)/ig, function(parameter) {
switch (parameter) {
case '%TURL':
return "' + encodeURIComponent(post.file.thumbURL) + '";
case '%URL':
return "' + encodeURIComponent(post.file.URL) + '";
case '%MD5':
return "' + encodeURIComponent(post.file.MD5) + '";
case '%board':
return "' + encodeURIComponent(post.board) + '";
default:
return parameter;
}
link = link.replace(/%(T?URL|MD5|board|name)/g, function(parameter) {
var type;
return ((type = {
'%TURL': 'post.file.thumbURL',
'%URL': 'post.file.URL',
'%MD5': 'post.file.MD5',
'%board': 'post.board',
'%name': 'post.file.name'
}[parameter]) ? "' + encodeURIComponent(" + type + ") + '" : parameter);
});
text = (m = link.match(/;text:(.+)$/)) ? m[1] : link.match(/(\w+)\.\w+\//)[1];
link = link.replace(/;text:.+$/, '');
@ -12845,7 +12832,7 @@
},
sauce: function(section) {
var ta;
section.innerHTML = "<div class=warning " + (Conf['Sauce'] ? 'hidden' : '') + "><code>Sauce</code> is disabled.</div><div>Lines starting with a <code>#</code> will be ignored.</div><div>You can specify a display text by appending <code>;text:[text]</code> to the URL.</div><ul>These parameters will be replaced by their corresponding values:<li><code>%TURL</code>: Thumbnail URL.</li><li><code>%URL</code>: Full image URL.</li><li><code>%MD5</code>: MD5 hash.</li><li><code>%board</code>: Current board.</li></ul><textarea name=sauces class=field spellcheck=false></textarea>";
section.innerHTML = "<div class=warning " + (Conf['Sauce'] ? 'hidden' : '') + "><code>Sauce</code> is disabled.</div><div>Lines starting with a <code>#</code> will be ignored.</div><div>You can specify a display text by appending <code>;text:[text]</code> to the URL.</div><ul>These parameters will be replaced by their corresponding values:<li><code>%TURL</code>: Thumbnail URL.</li><li><code>%URL</code>: Full image URL.</li><li><code>%MD5</code>: MD5 hash.</li><li><code>%name</code>: Original file name.</li><li><code>%board</code>: Current board.</li></ul><textarea name=sauces class=field spellcheck=false></textarea>";
ta = $('textarea', section);
$.get('sauces', Conf['sauces'], function(item) {
return ta.value = item['sauces'];

43
builds/crx/script.js
View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript
/*
* 4chan X - Version 1.3.2 - 2014-01-24
* 4chan X - Version 1.3.2 - 2014-01-28
*
* Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
@ -538,21 +538,12 @@
return __indexOf.call(el.classList, className) >= 0;
};
$.rm = (function() {
if ('remove' in Element.prototype) {
return function(el) {
return el.remove();
};
} else {
return function(el) {
var _ref;
return (_ref = el.parentNode) != null ? _ref.removeChild(el) : void 0;
};
}
})();
$.rm = function(el) {
return el.remove();
};
$.rmAll = function(root) {
return root.textContent = '';
return root.textContent = null;
};
$.tn = function(s) {
@ -7965,19 +7956,15 @@
},
createSauceLink: function(link) {
var m, text;
link = link.replace(/%(T?URL|MD5|board)/ig, function(parameter) {
switch (parameter) {
case '%TURL':
return "' + encodeURIComponent(post.file.thumbURL) + '";
case '%URL':
return "' + encodeURIComponent(post.file.URL) + '";
case '%MD5':
return "' + encodeURIComponent(post.file.MD5) + '";
case '%board':
return "' + encodeURIComponent(post.board) + '";
default:
return parameter;
}
link = link.replace(/%(T?URL|MD5|board|name)/g, function(parameter) {
var type;
return ((type = {
'%TURL': 'post.file.thumbURL',
'%URL': 'post.file.URL',
'%MD5': 'post.file.MD5',
'%board': 'post.board',
'%name': 'post.file.name'
}[parameter]) ? "' + encodeURIComponent(" + type + ") + '" : parameter);
});
text = (m = link.match(/;text:(.+)$/)) ? m[1] : link.match(/(\w+)\.\w+\//)[1];
link = link.replace(/;text:.+$/, '');
@ -12841,7 +12828,7 @@
},
sauce: function(section) {
var ta;
section.innerHTML = "<div class=warning " + (Conf['Sauce'] ? 'hidden' : '') + "><code>Sauce</code> is disabled.</div><div>Lines starting with a <code>#</code> will be ignored.</div><div>You can specify a display text by appending <code>;text:[text]</code> to the URL.</div><ul>These parameters will be replaced by their corresponding values:<li><code>%TURL</code>: Thumbnail URL.</li><li><code>%URL</code>: Full image URL.</li><li><code>%MD5</code>: MD5 hash.</li><li><code>%board</code>: Current board.</li></ul><textarea name=sauces class=field spellcheck=false></textarea>";
section.innerHTML = "<div class=warning " + (Conf['Sauce'] ? 'hidden' : '') + "><code>Sauce</code> is disabled.</div><div>Lines starting with a <code>#</code> will be ignored.</div><div>You can specify a display text by appending <code>;text:[text]</code> to the URL.</div><ul>These parameters will be replaced by their corresponding values:<li><code>%TURL</code>: Thumbnail URL.</li><li><code>%URL</code>: Full image URL.</li><li><code>%MD5</code>: MD5 hash.</li><li><code>%name</code>: Original file name.</li><li><code>%board</code>: Current board.</li></ul><textarea name=sauces class=field spellcheck=false></textarea>";
ta = $('textarea', section);
$.get('sauces', Conf['sauces'], function(item) {
return ta.value = item['sauces'];

2
package.json
View File

@ -35,7 +35,7 @@
"grunt-contrib-concat": "~0.3.0",
"grunt-contrib-copy": "~0.5.0",
"grunt-contrib-watch": "~0.5.3",
"grunt-shell": "~0.6.3",
"grunt-shell": "~0.6.4",
"load-grunt-tasks": "~0.2.1"
},
"repository": {

3
src/General/html/Settings/Sauce.html
View File

@ -5,6 +5,7 @@
<li><code>%TURL</code>: Thumbnail URL.</li>
<li><code>%URL</code>: Full image URL.</li>
<li><code>%MD5</code>: MD5 hash.</li>
<li><code>%name</code>: Original file name.</li>
<li><code>%board</code>: Current board.</li>
</ul>
<textarea name=sauces class=field spellcheck=false></textarea>
<textarea name=sauces class=field spellcheck=false></textarea>

12
src/General/lib/$.coffee
View File

@ -127,14 +127,12 @@ $.toggleClass = (el, className) ->
$.hasClass = (el, className) ->
className in el.classList
$.rm = do ->
if 'remove' of Element::
(el) -> el.remove()
else
(el) -> el.parentNode?.removeChild el
$.rm = (el) ->
el.remove()
# jsperf.com/emptify-element/9
$.rmAll = (root) -> root.textContent = ''
$.rmAll = (root) ->
# https://gist.github.com/MayhemYDG/8646194
root.textContent = null
$.tn = (s) ->
d.createTextNode s

24
src/Images/Sauce.coffee
View File

@ -15,19 +15,17 @@ Sauce =
name: 'Sauce'
cb: @node
createSauceLink: (link) ->
link = link.replace /%(T?URL|MD5|board)/ig, (parameter) ->
switch parameter
when '%TURL'
"' + encodeURIComponent(post.file.thumbURL) + '"
when '%URL'
"' + encodeURIComponent(post.file.URL) + '"
when '%MD5'
"' + encodeURIComponent(post.file.MD5) + '"
when '%board'
"' + encodeURIComponent(post.board) + '"
else
parameter
link = link.replace /%(T?URL|MD5|board|name)/g, (parameter) ->
return (if type = {
'%TURL': 'post.file.thumbURL'
'%URL': 'post.file.URL'
'%MD5': 'post.file.MD5'
'%board': 'post.board'
'%name': 'post.file.name'
}[parameter]
"' + encodeURIComponent(#{type}) + '"
else
parameter)
text = if m = link.match(/;text:(.+)$/) then m[1] else link.match(/(\w+)\.\w+\//)[1]
link = link.replace /;text:.+$/, ''
Function 'post', 'a', """