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

don't use event for adding to menu internally

Browse Source
This commit is contained in:
ccd0 2014-06-17 21:12:07 -07:00
parent 3d28405268
commit efc852464f
19 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Filtering/Filter.coffee
View File

@ -198,7 +198,7 @@ Filter =
# Add a sub entry for each filter type. # Add a sub entry for each filter type.
entry.subEntries.push Filter.menu.createSubEntry type[0], type[1] entry.subEntries.push Filter.menu.createSubEntry type[0], type[1]
$.event 'AddMenuEntry', entry UI.addMenuEntry entry
createSubEntry: (text, type) -> createSubEntry: (text, type) ->
el = $.el 'a', el = $.el 'a',

6
src/Filtering/PostHiding.coffee
View File

@ -39,7 +39,7 @@ PostHiding =
replies = UI.checkbox 'replies', ' Hide replies', Conf['Recursive Hiding'] replies = UI.checkbox 'replies', ' Hide replies', Conf['Recursive Hiding']
makeStub = UI.checkbox 'makeStub', ' Make stub', Conf['Stubs'] makeStub = UI.checkbox 'makeStub', ' Make stub', Conf['Stubs']
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'post' type: 'post'
el: div el: div
order: 20 order: 20
@ -75,7 +75,7 @@ PostHiding =
href: 'javascript:;' href: 'javascript:;'
$.on hideStubLink, 'click', PostHiding.menu.hideStub $.on hideStubLink, 'click', PostHiding.menu.hideStub
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'post' type: 'post'
el: div el: div
order: 20 order: 20
@ -96,7 +96,7 @@ PostHiding =
el: replies el: replies
] ]
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'post' type: 'post'
el: hideStubLink el: hideStubLink
order: 15 order: 15

6
src/Filtering/ThreadHiding.coffee
View File

@ -80,7 +80,7 @@ ThreadHiding =
makeStub = UI.checkbox 'Stubs', ' Make stub' makeStub = UI.checkbox 'Stubs', ' Make stub'
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'post' type: 'post'
el: div el: div
order: 20 order: 20
@ -97,7 +97,7 @@ ThreadHiding =
href: 'javascript:;' href: 'javascript:;'
$.on div, 'click', ThreadHiding.menu.show $.on div, 'click', ThreadHiding.menu.show
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'post' type: 'post'
el: div el: div
order: 20 order: 20
@ -112,7 +112,7 @@ ThreadHiding =
href: 'javascript:;' href: 'javascript:;'
$.on hideStubLink, 'click', ThreadHiding.menu.hideStub $.on hideStubLink, 'click', ThreadHiding.menu.hideStub
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'post' type: 'post'
el: hideStubLink el: hideStubLink
order: 15 order: 15

2
src/General/Header.coffee
View File

@ -54,7 +54,7 @@ Header =
@addShortcut menuButton @addShortcut menuButton
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'header' type: 'header'
el: $.el 'span', el: $.el 'span',
textContent: 'Header' textContent: 'Header'

2
src/General/Index.coffee
View File

@ -55,7 +55,7 @@ Index =
when 'Anchor Hidden Threads' when 'Anchor Hidden Threads'
$.on input, 'change', @cb.sort $.on input, 'change', @cb.sort
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'header' type: 'header'
el: $.el 'span', el: $.el 'span',
textContent: 'Index Navigation' textContent: 'Index Navigation'

9
src/General/UI.coffee
View File

@ -17,6 +17,12 @@ UI = do ->
el el
menus = {}
addMenuEntry = (entry) ->
menus[entry.type].addEntry {detail: entry}
rmMenuEntry = (entry) ->
menus[entry.type].addEntry {detail: entry}
class Menu class Menu
currentMenu = null currentMenu = null
lastToggledButton = null lastToggledButton = null
@ -26,6 +32,7 @@ UI = do ->
$.on d, 'AddMenuEntry', @addEntry $.on d, 'AddMenuEntry', @addEntry
$.on d, 'rmMenuEntry', @rmEntry $.on d, 'rmMenuEntry', @rmEntry
@entries = [] @entries = []
menus[@type] = @
makeMenu: -> makeMenu: ->
menu = $.el 'div', menu = $.el 'div',
@ -386,4 +393,6 @@ UI = do ->
Menu: Menu Menu: Menu
hover: hoverstart hover: hoverstart
checkbox: checkbox checkbox: checkbox
addMenuEntry: addMenuEntry
rmMenuEntry: rmMenuEntry
} }

2
src/Images/FappeTyme.coffee
View File

@ -10,7 +10,7 @@ FappeTyme =
FappeTyme[lc] = input = el.firstElementChild FappeTyme[lc] = input = el.firstElementChild
$.on input, 'change', FappeTyme.cb.toggle.bind input $.on input, 'change', FappeTyme.cb.toggle.bind input
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'header' type: 'header'
el: el el: el
order: 97 order: 97

4
src/Images/Gallery.coffee
View File

@ -61,7 +61,7 @@ Gallery =
for name of Config.gallery for name of Config.gallery
{el} = createSubEntry name {el} = createSubEntry name
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'gallery' type: 'gallery'
el: el el: el
order: 0 order: 0
@ -235,7 +235,7 @@ Gallery =
for name of Config.gallery for name of Config.gallery
subEntries.push createSubEntry name subEntries.push createSubEntry name
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'header' type: 'header'
el: el el: el
order: 105 order: 105

2
src/Images/ImageExpand.coffee
View File

@ -249,7 +249,7 @@ ImageExpand =
for name, conf of Config.imageExpansion for name, conf of Config.imageExpansion
subEntries.push createSubEntry name, conf[1] subEntries.push createSubEntry name, conf[1]
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'header' type: 'header'
el: el el: el
order: 105 order: 105

2
src/Images/ImageLoader.coffee
View File

@ -19,7 +19,7 @@ ImageLoader =
@el = prefetch.firstElementChild @el = prefetch.firstElementChild
$.on @el, 'change', @toggle $.on @el, 'change', @toggle
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'header' type: 'header'
el: prefetch el: prefetch
order: 104 order: 104

2
src/Menu/ArchiveLink.coffee
View File

@ -25,7 +25,7 @@ ArchiveLink =
# Add a sub entry for each type. # Add a sub entry for each type.
entry.subEntries.push @createSubEntry type[0], type[1] entry.subEntries.push @createSubEntry type[0], type[1]
$.event 'AddMenuEntry', entry UI.addMenuEntry entry
createSubEntry: (text, type) -> createSubEntry: (text, type) ->
el = $.el 'a', el = $.el 'a',

2
src/Menu/DeleteLink.coffee
View File

@ -26,7 +26,7 @@ DeleteLink =
$.on fileEl, 'click', DeleteLink.delete $.on fileEl, 'click', DeleteLink.delete
true true
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'post' type: 'post'
el: div el: div
order: 40 order: 40

2
src/Menu/DownloadLink.coffee
View File

@ -17,7 +17,7 @@ DownloadLink =
else else
new Notice 'error', "Could not download #{file.URL}", 30 new Notice 'error', "Could not download #{file.URL}", 30
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'post' type: 'post'
el: a el: a
order: 100 order: 100

2
src/Menu/ReportLink.coffee
View File

@ -7,7 +7,7 @@ ReportLink =
href: 'javascript:;' href: 'javascript:;'
textContent: 'Report this post' textContent: 'Report this post'
$.on a, 'click', ReportLink.report $.on a, 'click', ReportLink.report
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'post' type: 'post'
el: a el: a
order: 10 order: 10

2
src/Miscellaneous/AnnouncementHiding.coffee
View File

@ -19,7 +19,7 @@ PSAHiding =
href: 'javascript:;' href: 'javascript:;'
order: 50 order: 50
open: -> psa.hidden open: -> psa.hidden
$.event 'AddMenuEntry', entry UI.addMenuEntry entry
$.on entry.el, 'click', PSAHiding.toggle $.on entry.el, 'click', PSAHiding.toggle
PSAHiding.btn = btn = $.el 'span', PSAHiding.btn = btn = $.el 'span',

2
src/Miscellaneous/CatalogLinks.coffee
View File

@ -8,7 +8,7 @@ CatalogLinks =
$.on input, 'change', @toggle $.on input, 'change', @toggle
$.sync 'Header catalog links', CatalogLinks.set $.sync 'Header catalog links', CatalogLinks.set
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'header' type: 'header'
el: el el: el
order: 95 order: 95

4
src/Monitoring/ThreadUpdater.coffee
View File

@ -52,7 +52,7 @@ ThreadUpdater =
subEntries.push el: @settings subEntries.push el: @settings
$.event 'AddMenuEntry', @entry = UI.addMenuEntry @entry =
type: 'header' type: 'header'
el: $.el 'span', el: $.el 'span',
textContent: 'Updater' textContent: 'Updater'
@ -85,7 +85,7 @@ ThreadUpdater =
@set 'timer', null @set 'timer', null
@set 'status', 'Offline' @set 'status', 'Offline'
$.event 'rmMenuEntry', @entry UI.rmMenuEntry @entry
if Conf['Updater and Stats in Header'] if Conf['Updater and Stats in Header']
Header.rmShortcut @dialog Header.rmShortcut @dialog

4
src/Monitoring/ThreadWatcher.coffee
View File

@ -238,7 +238,7 @@ ThreadWatcher =
return if g.VIEW isnt 'thread' return if g.VIEW isnt 'thread'
entryEl = $.el 'a', entryEl = $.el 'a',
href: 'javascript:;' href: 'javascript:;'
$.event 'AddMenuEntry', UI.addMenuEntry
type: 'header' type: 'header'
el: entryEl el: entryEl
order: 60 order: 60
@ -297,7 +297,7 @@ ThreadWatcher =
entry.el.href = 'javascript:;' if entry.el.nodeName is 'A' entry.el.href = 'javascript:;' if entry.el.nodeName is 'A'
$.on entry.el, 'click', cb if cb $.on entry.el, 'click', cb if cb
@refreshers.push refresh.bind entry if refresh @refreshers.push refresh.bind entry if refresh
$.event 'AddMenuEntry', entry UI.addMenuEntry entry
return return
createSubEntry: (name, desc) -> createSubEntry: (name, desc) ->
entry = entry =

4
src/Quotelinks/QuoteThreading.coffee
View File

@ -13,7 +13,7 @@ QuoteThreading =
input = $ 'input', @controls input = $ 'input', @controls
$.on input, 'change', @toggle $.on input, 'change', @toggle
$.event 'AddMenuEntry', @entry = UI.addMenuEntry @entry =
type: 'header' type: 'header'
el: @controls el: @controls
order: 98 order: 98
@ -29,7 +29,7 @@ QuoteThreading =
input = $ 'input', @controls input = $ 'input', @controls
$.off input, 'change', @toggle $.off input, 'change', @toggle
$.event 'rmMenuEntry', @entry UI.rmMenuEntry @entry
delete @enabled delete @enabled
delete @controls delete @controls