diff options
| author | Shin'ya Ueoka <ueokande@i-beam.org> | 2017-09-17 12:52:24 +0900 |
|---|---|---|
| committer | Shin'ya Ueoka <ueokande@i-beam.org> | 2017-09-17 12:52:24 +0900 |
| commit | e9863299abf9498c67660e8a97c70ddb090baffe (patch) | |
| tree | da322c6d1cac671da59b34dac884905718503516 /src | |
| parent | 0be9776cb3d9033bcd3ae569bec71b300f2d4073 (diff) | |
implement go-parent command
Diffstat (limited to 'src')
| -rw-r--r-- | src/background/keys.js | 1 | ||||
| -rw-r--r-- | src/content/index.js | 2 | ||||
| -rw-r--r-- | src/content/navigates.js | 21 | ||||
| -rw-r--r-- | src/operations/index.js | 1 |
4 files changed, 24 insertions, 1 deletions
diff --git a/src/background/keys.js b/src/background/keys.js index 2549c8d..992b42d 100644 --- a/src/background/keys.js +++ b/src/background/keys.js @@ -32,6 +32,7 @@ const defaultKeymap = { 'L': { type: operations.NAVIGATE_HISTORY_NEXT }, '[[': { type: operations.NAVIGATE_LINK_PREV }, ']]': { type: operations.NAVIGATE_LINK_NEXT }, + 'gu': { type: operations.NAVIGATE_PARENT }, }; const asKeymapChars = (keys) => { diff --git a/src/content/index.js b/src/content/index.js index 9fd46be..4751cde 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -43,6 +43,8 @@ const execOperation = (operation) => { return navigates.linkPrev(window); case operations.NAVIGATE_LINK_NEXT: return navigates.linkNext(window); + case operations.NAVIGATE_PARENT: + return navigates.parent(window); } }; diff --git a/src/content/navigates.js b/src/content/navigates.js index b68052d..692b7be 100644 --- a/src/content/navigates.js +++ b/src/content/navigates.js @@ -44,4 +44,23 @@ const linkNext = (win) => { } }; -export { historyPrev, historyNext, linkPrev, linkNext }; +const parent = (win) => { + let loc = win.location; + if (loc.hash !== '') { + loc.hash = ''; + return; + } else if (loc.search !== '') { + loc.search = ''; + return; + } + + const basenamePattern = /\/[^/]+$/; + const lastDirPattern = /\/[^/]+\/$/; + if (basenamePattern.test(loc.pathname)) { + loc.pathname = loc.pathname.replace(basenamePattern, '/'); + } else if (lastDirPattern.test(loc.pathname)) { + loc.pathname = loc.pathname.replace(lastDirPattern, '/'); + } +}; + +export { historyPrev, historyNext, linkPrev, linkNext, parent }; diff --git a/src/operations/index.js b/src/operations/index.js index bb19df8..493e866 100644 --- a/src/operations/index.js +++ b/src/operations/index.js @@ -15,6 +15,7 @@ export default { NAVIGATE_HISTORY_NEXT: 'navigate.history.next', NAVIGATE_LINK_PREV: 'navigate.link.prev', NAVIGATE_LINK_NEXT: 'navigate.link.next', + NAVIGATE_PARENT: 'navigate.parent', // Background TABS_CLOSE: 'tabs.close', |