Remove scope by clicking on it or by backspacing into it
Showing the changes to assets/javascripts (2 of 3 files). Show all
Unified · Split
| @@ -30,6 +30,9 @@ class app.views.Search extends app.View · 29 unmodified lines | ||
| 30 | 30 | .on 'results', @onResults |
| 31 | 31 | .on 'end', @onEnd |
| 32 | 32 | |
| 33 | + @scope | |
| 34 | + .on 'change', @onScopeChange | |
| 35 | + | |
| 33 | 36 | app.on 'ready', @onReady |
| 34 | 37 | $.on window, 'hashchange', @searchUrl |
| 35 | 38 | $.on window, 'focus', @onWindowFocus |
| @@ -138,6 +141,11 @@ class app.views.Search extends app.View · 102 unmodified lines | ||
| 138 | 141 | $.stopEvent(event) |
| 139 | 142 | return |
| 140 | 143 | |
| 144 | + onScopeChange: => | |
| 145 | + @value = '' | |
| 146 | + @onInput() | |
| 147 | + return | |
| 148 | + | |
| 141 | 149 | afterRoute: (name, context) => |
| 142 | 150 | return if app.shortcuts.eventInProgress?.name is 'escape' |
| 143 | 151 | @reset(true) if not context.init and app.router.isIndex() |
| @@ -6,6 +6,7 @@ class app.views.SearchScope extends app.View · 5 unmodified lines | ||
| 6 | 6 | tag: '._search-tag' |
| 7 | 7 | |
| 8 | 8 | @events: |
| 9 | + click: 'onClick' | |
| 9 | 10 | keydown: 'onKeydown' |
| 10 | 11 | |
| 11 | 12 | @routes: |
| @@ -87,11 +88,17 @@ class app.views.SearchScope extends app.View · 75 unmodified lines | ||
| 87 | 88 | @trigger 'change', null, previousDoc |
| 88 | 89 | return |
| 89 | 90 | |
| 91 | + onClick: (event) => | |
| 92 | + if event.target is @tag | |
| 93 | + @reset() | |
| 94 | + $.stopEvent(event) | |
| 95 | + return | |
| 96 | + | |
| 90 | 97 | onKeydown: (event) => |
| 91 | 98 | if event.which is 8 # backspace |
| 92 | − if @doc and not @input.value | |
| 93 | − $.stopEvent(event) | |
| 99 | + if @doc and @input.selectionEnd is 0 | |
| 94 | 100 | @reset() |
| 101 | + $.stopEvent(event) | |
| 95 | 102 | else if not @doc and @input.value |
| 96 | 103 | return if event.ctrlKey or event.metaKey or event.altKey or event.shiftKey |
| 97 | 104 | if event.which is 9 or # tab |