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

merge master

Browse Source
This commit is contained in:
James Campos 2011-09-20 19:40:07 -07:00
commit fd2e50fe84
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
4chan_x.user.js
View File

@ -1111,7 +1111,7 @@
var arr, checked, description, dialog, hiddenNum, hiddenThreads, html, input, key, li, main, obj, overlay, ul, _i, _len, _ref, _ref2; var arr, checked, description, dialog, hiddenNum, hiddenThreads, html, input, key, li, main, obj, overlay, ul, _i, _len, _ref, _ref2;
hiddenThreads = $.get("hiddenThreads/" + g.BOARD + "/", {}); hiddenThreads = $.get("hiddenThreads/" + g.BOARD + "/", {});
hiddenNum = Object.keys(g.hiddenReplies).length + Object.keys(hiddenThreads).length; hiddenNum = Object.keys(g.hiddenReplies).length + Object.keys(hiddenThreads).length;
html = " <div class='reply dialog'> <div id=optionsbar> <div id=floaty> <label for=main_tab>main</label> | <label for=flavors_tab>sauce</label> | <label for=rice_tab>rice</label> | <label for=keybinds_tab>keybinds</label> </div> <div id=credits> <a href=http://aeosynth.github.com/4chan-x/>4chan X</a> | <a href=http://chat.now.im/x/aeos>support throd</a> | <a href=https://github.com/aeosynth/4chan-x/issues>github</a> | <a href=https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2DBVZBUAM4DHC&lc=US&item_name=Aeosynth&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted>donate</a> </div> </div> <hr> <div id=content> <input type=radio name=tab hidden id=main_tab checked> <div id=main></div> <input type=radio name=tab hidden id=flavors_tab> <textarea name=flavors id=flavors>" + conf['flavors'] + "</textarea> <input type=radio name=tab hidden id=rice_tab> <div id=rice> <ul> Backlink formatting <li><input type=text name=backlink value='" + conf['backlink'] + "'> : <span id=backlinkPreview></span></li> </ul> <ul> Time formatting <li><input type=text name=time value='" + conf['time'] + "'> : <span id=timePreview></span></li> <li>Supported <a href=http://en.wikipedia.org/wiki/Date_%28Unix%29#Formatting>format specifiers</a>:</li> <li>Day: %a, %A, %d, %e</li> <li>Month: %m, %b, %B</li> <li>Year: %y</li> <li>Hour: %k, %H, %l (lowercase L), %I (uppercase i), %p, %P</li> <li>Minutes: %M</li> </ul> </div> <input type=radio name=tab hidden id=keybinds_tab> <div id=keybinds> <table> <tbody> <tr><th>Actions</th><th>Keybinds</th></tr> <tr><td>Close Options or QR</td><td><input type=text name=close></td></tr> <tr><td>Quick spoiler</td><td><input type=text name=spoiler></td></tr> <tr><td>Open QR with post number inserted</td><td><input type=text name=openQR></td></tr> <tr><td>Open QR without post number inserted</td><td><input type=text name=openEmptyQR></td></tr> <tr><td>Submit post</td><td><input type=text name=submit></td></tr> <tr><td>Select next reply</td><td><input type=text name=nextReply ></td></tr> <tr><td>Select previous reply</td><td><input type=text name=previousReply></td></tr> <tr><td>See next thread</td><td><input type=text name=nextThread></td></tr> <tr><td>See previous thread</td><td><input type=text name=previousThread></td></tr> <tr><td>Jump to the next page</td><td><input type=text name=nextPage></td></tr> <tr><td>Jump to the previous page</td><td><input type=text name=previousPage></td></tr> <tr><td>Jump to page 0</td><td><input type=text name=zero></td></tr> <tr><td>Open thread in current tab</td><td><input type=text name=openThread></td></tr> <tr><td>Open thread in new tab</td><td><input type=text name=openThreadTab></td></tr> <tr><td>Expand thread</td><td><input type=text name=expandThread></td></tr> <tr><td>Watch thread</td><td><input type=text name=watch></td></tr> <tr><td>Hide thread</td><td><input type=text name=hide></td></tr> <tr><td>Expand selected image</td><td><input type=text name=expandImages></td></tr> <tr><td>Expand all images</td><td><input type=text name=expandAllImages></td></tr> <tr><td>Update now</td><td><input type=text name=update></td></tr> <tr><td>Reset the unread count to 0</td><td><input type=text name=unreadCountTo0></td></tr> </tbody> </table> </div> </div> </div> "; html = " <div class='reply dialog'> <div id=optionsbar> <div id=floaty> <label for=main_tab>Main</label> | <label for=flavors_tab>Sauce</label> | <label for=rice_tab>Rice</label> | <label for=keybinds_tab>Keybinds</label> </div> <div id=credits> <a href=http://aeosynth.github.com/4chan-x/>4chan X</a> | <a href=http://chat.now.im/x/aeos>Support Throd</a> | <a href=https://github.com/aeosynth/4chan-x/issues>GitHub</a> | <a href=https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2DBVZBUAM4DHC&lc=US&item_name=Aeosynth&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted>Donate</a> </div> </div> <hr> <div id=content> <input type=radio name=tab hidden id=main_tab checked> <div id=main></div> <input type=radio name=tab hidden id=flavors_tab> <textarea name=flavors id=flavors>" + conf['flavors'] + "</textarea> <input type=radio name=tab hidden id=rice_tab> <div id=rice> <ul> Backlink formatting <li><input type=text name=backlink value='" + conf['backlink'] + "'> : <span id=backlinkPreview></span></li> </ul> <ul> Time formatting <li><input type=text name=time value='" + conf['time'] + "'> : <span id=timePreview></span></li> <li>Supported <a href=http://en.wikipedia.org/wiki/Date_%28Unix%29#Formatting>format specifiers</a>:</li> <li>Day: %a, %A, %d, %e</li> <li>Month: %m, %b, %B</li> <li>Year: %y</li> <li>Hour: %k, %H, %l (lowercase L), %I (uppercase i), %p, %P</li> <li>Minutes: %M</li> </ul> </div> <input type=radio name=tab hidden id=keybinds_tab> <div id=keybinds> <table> <tbody> <tr><th>Actions</th><th>Keybinds</th></tr> <tr><td>Close Options or QR</td><td><input type=text name=close></td></tr> <tr><td>Quick spoiler</td><td><input type=text name=spoiler></td></tr> <tr><td>Open QR with post number inserted</td><td><input type=text name=openQR></td></tr> <tr><td>Open QR without post number inserted</td><td><input type=text name=openEmptyQR></td></tr> <tr><td>Submit post</td><td><input type=text name=submit></td></tr> <tr><td>Select next reply</td><td><input type=text name=nextReply ></td></tr> <tr><td>Select previous reply</td><td><input type=text name=previousReply></td></tr> <tr><td>See next thread</td><td><input type=text name=nextThread></td></tr> <tr><td>See previous thread</td><td><input type=text name=previousThread></td></tr> <tr><td>Jump to the next page</td><td><input type=text name=nextPage></td></tr> <tr><td>Jump to the previous page</td><td><input type=text name=previousPage></td></tr> <tr><td>Jump to page 0</td><td><input type=text name=zero></td></tr> <tr><td>Open thread in current tab</td><td><input type=text name=openThread></td></tr> <tr><td>Open thread in new tab</td><td><input type=text name=openThreadTab></td></tr> <tr><td>Expand thread</td><td><input type=text name=expandThread></td></tr> <tr><td>Watch thread</td><td><input type=text name=watch></td></tr> <tr><td>Hide thread</td><td><input type=text name=hide></td></tr> <tr><td>Expand selected image</td><td><input type=text name=expandImages></td></tr> <tr><td>Expand all images</td><td><input type=text name=expandAllImages></td></tr> <tr><td>Update now</td><td><input type=text name=update></td></tr> <tr><td>Reset the unread count to 0</td><td><input type=text name=unreadCountTo0></td></tr> </tbody> </table> </div> </div> </div> ";
dialog = $.el('div', { dialog = $.el('div', {
id: 'options', id: 'options',
innerHTML: html innerHTML: html

6
changelog
View File

@ -1,6 +1,10 @@
master master
2.19.4 2.20.1
- mayhem
fix regression: qr not preventing errors
2.20.0
- mayhem - mayhem
do not display inlined quotes within the quote preview do not display inlined quotes within the quote preview
fix cross threads quotes in expanded threads or inlined cross quotes fix cross threads quotes in expanded threads or inlined cross quotes

8
script.coffee
View File

@ -794,13 +794,13 @@ options =
<div class='reply dialog'> <div class='reply dialog'>
<div id=optionsbar> <div id=optionsbar>
<div id=floaty> <div id=floaty>
<label for=main_tab>main</label> | <label for=flavors_tab>sauce</label> | <label for=rice_tab>rice</label> | <label for=keybinds_tab>keybinds</label> <label for=main_tab>Main</label> | <label for=flavors_tab>Sauce</label> | <label for=rice_tab>Rice</label> | <label for=keybinds_tab>Keybinds</label>
</div> </div>
<div id=credits> <div id=credits>
<a href=http://aeosynth.github.com/4chan-x/>4chan X</a> | <a href=http://aeosynth.github.com/4chan-x/>4chan X</a> |
<a href=http://chat.now.im/x/aeos>support throd</a> | <a href=http://chat.now.im/x/aeos>Support Throd</a> |
<a href=https://github.com/aeosynth/4chan-x/issues>github</a> | <a href=https://github.com/aeosynth/4chan-x/issues>GitHub</a> |
<a href=https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2DBVZBUAM4DHC&lc=US&item_name=Aeosynth&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted>donate</a> <a href=https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2DBVZBUAM4DHC&lc=US&item_name=Aeosynth&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted>Donate</a>
</div> </div>
</div> </div>
<hr> <hr>