Skip to content

[Feature] キャレットモード(モドキ)の追加 #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
u338steven wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Feature] キャレットモード(モドキ)の追加 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions coffee/command.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ class g.CommandExecuter
GoFMode : triggerInsideContent
GoExtFMode : triggerInsideContent
GoEmergencyMode : triggerInsideContent
GoCaretMode : triggerInsideContent
FocusOnFirstInput : triggerInsideContent
BackToPageMark : triggerInsideContent
RestoreTab : sendToBackground
Expand Down
42 changes: 40 additions & 2 deletions coffee/mode.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ class g.Mode
reqGoSearchModeBackward : -> g.model.enterSearchMode( true )
reqGoLinkTextSearchMode : -> g.model.enterSearchMode( false, new g.LinkTextSearcher )
reqGoEmergencyMode : -> g.model.enterEmergencyMode()
reqGoCaretMode : -> g.model.enterCaretMode()

reqBackToPageMark : ->
# TODO:enable to go any pagemark, not only unnamed.
Expand All @@ -146,6 +147,7 @@ class g.Mode
when "--yank" then opt.mode='yank'
when "--open" then opt.mode ='open'
when "--opentab" then opt.mode= 'opentab'
when "--caret" then opt.mode= 'caret'

if opt.mode?
g.model.enterFMode(opt)
Expand Down Expand Up @@ -375,6 +377,9 @@ class g.FMode extends g.Mode
if text?
(new g.CommandExecuter).set("Copy #{text}").parse().execute()
g.model.enterNormalMode()

caret: (target) ->
g.model.enterCaretMode(target)
}

getName : -> "FMode"
Expand Down Expand Up @@ -420,7 +425,7 @@ class g.FMode extends g.Mode
if @opt.continuous
@currentInput = ""
g.view.setStatusLineText(@statusLineHeader())
else
else if @opt.mode != 'caret'
g.view.hideStatusLine()

prePostKeyEvent : (key, ctrl, alt, meta) ->
Expand Down Expand Up @@ -509,7 +514,10 @@ class g.FMode extends g.Mode
@showFunc = $.fn.show
@hideFunc = $.fn.hide

links = $('a:_visible,*:input:_visible,.button:_visible')
if @opt.mode == 'caret'
links = $('*:_visible')
else
links = $('a:_visible,*:input:_visible,.button:_visible')
$('img[usemap^="#"]:_visible').each(->
offset = this._offset_
mapName = $(this).attr('usemap').slice(1)
Expand Down Expand Up @@ -549,6 +557,7 @@ class g.ExtFMode extends g.Mode
'O': 'opentab'
'y': 'yank'
'Y': 'yanktext'
'c': 'caret'
}
getName : -> "ExtFMode"
setOption : (@opt) -> this
Expand All @@ -573,6 +582,35 @@ class g.ExtFMode extends g.Mode
$('span#vichromehint').remove()
$('.vichrome-fModeTarget').removeClass('vichrome-fModeTarget')

class g.CaretMode extends g.Mode
getName : -> "CaretMode"
setTarget : (@target) -> this
getKeyMapping : -> g.model.getIMap()
prePostKeyEvent : (key, ctrl, alt, meta) -> true

blur : ->
g.model.enterNormalMode()

enter : ->
@origin = { spellcheck : document.body.spellcheck, contentEditable : document.body.contentEditable }
document.body.spellcheck = false
document.body.contentEditable = true
range = document.createRange()
if !@target
@target = document.body
range.setStart(@target, 0)
range.setEnd(@target, 0)
select = window.getSelection()
select.removeAllRanges()
select.addRange(range)
g.view.setStatusLineText 'caret mode'

exit : ->
document.body.contentEditable = @origin.contentEditable
document.body.spellcheck = @origin.spellcheck
select = window.getSelection()
select.removeAllRanges()
g.view.hideStatusLine()

$.extend( $.expr[':'],
_visible : (elem) ->
Expand Down
7 changes: 6 additions & 1 deletion coffee/model.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,17 @@ g.model =
g.logger.d "enterFMode"
@changeMode( (new g.ExtFMode).setOption( opt || {} ) )

enterCaretMode : (target) ->
g.logger.d "enterCaretMode"
@changeMode( (new g.CaretMode).setTarget( target ) )

isInNormalMode : -> @curMode.getName() == "NormalMode"
isInInsertMode : -> @curMode.getName() == "InsertMode"
isInSearchMode : -> @curMode.getName() == "SearchMode"
isInCommandMode : -> @curMode.getName() == "CommandMode"
isInFMode : -> @curMode.getName() == "FMode"
isInEmergencyMode : -> @curMode.getName() == "EmergencyMode"
isInCaretMode : -> @curMode.getName() == "CaretMode"

goNextSearchResult : (reverse) ->
unless @searcher? then return
Expand Down Expand Up @@ -254,7 +259,7 @@ g.model =
when "aliases" then @getAlias = getAliasFirst

onFocus : (target) ->
if @isInCommandMode() or @isInSearchMode() or @isInEmergencyMode()
if @isInCommandMode() or @isInSearchMode() or @isInEmergencyMode() or @isInCaretMode()
g.logger.d "onFocus:nothing should be done in the cur mode"
return

Expand Down