mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1730 from deepak1556/webview_navigation_patch

Browse source 
navigation: adding clearHistory method
This commit is contained in:
Cheng Zhao 2015-05-21 14:56:30 +08:00
commit cde6b41a05
7 changed files with 52 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
atom/browser/api/lib/navigation-controller.coffee
View file

@ -4,6 +4,9 @@ ipc = require 'ipc'
ipc.on 'ATOM_SHELL_NAVIGATION_CONTROLLER', (event, method, args...) ->
event.sender[method] args...
ipc.on 'ATOM_SHELL_SYNC_NAVIGATION_CONTROLLER', (event, method, args...) ->
event.returnValue = event.sender[method] args...
# JavaScript implementation of Chromium's NavigationController.
# Instead of relying on Chromium for history control, we compeletely do history
# control on user land, and only rely on WebContents.loadUrl for navigation.
@ -11,10 +14,7 @@ ipc.on 'ATOM_SHELL_NAVIGATION_CONTROLLER', (event, method, args...) ->
# process is restarted everytime.
class NavigationController
constructor: (@webContents) ->
@history = []
@currentIndex = -1
@pendingIndex = -1
@inPageIndex = -1
@clearHistory()
@webContents.on 'navigation-entry-commited', (event, url, inPage, replaceEntry) =>
if @inPageIndex > -1 and not inPage
@ -71,6 +71,12 @@ class NavigationController
canGoToOffset: (offset) ->
@canGoToIndex @currentIndex + offset
clearHistory: ->
@history = []
@currentIndex = -1
@pendingIndex = -1
@inPageIndex = -1
goBack: ->
return unless @canGoBack()
@pendingIndex = @getActiveIndex() - 1
@ -104,4 +110,7 @@ class NavigationController
getActiveIndex: ->
if @pendingIndex is -1 then @currentIndex else @pendingIndex
length: ->
@history.length
module.exports = NavigationController

7
atom/renderer/lib/override.coffee
View file

@ -85,6 +85,13 @@ ipc.on 'ATOM_SHELL_GUEST_WINDOW_POSTMESSAGE', (message, targetOrigin) ->
# Forward history operations to browser.
sendHistoryOperation = (args...) ->
ipc.send 'ATOM_SHELL_NAVIGATION_CONTROLLER', args...
getHistoryOperation = (args...) ->
ipc.sendSync 'ATOM_SHELL_SYNC_NAVIGATION_CONTROLLER', args...
window.history.back = -> sendHistoryOperation 'goBack'
window.history.forward = -> sendHistoryOperation 'goForward'
window.history.go = (offset) -> sendHistoryOperation 'goToOffset', offset
Object.defineProperty window.history, 'length',
get: ->
getHistoryOperation 'length'

1
atom/renderer/lib/web-view/web-view.coffee
View file

@ -244,6 +244,7 @@ registerWebViewElement = ->
"canGoBack"
"canGoForward"
"canGoToOffset"
"clearHistory"
"goBack"
"goForward"
"goToIndex"

4
docs/api/browser-window.md
View file

@ -792,6 +792,10 @@ Returns whether the web page can go forward.
Returns whether the web page can go to `offset`.
### WebContents.clearHistory()
Clears the navigation history.
### WebContents.goBack()
Makes the web page go back.

4
docs/api/web-view-tag.md
View file

@ -173,6 +173,10 @@ Returns whether guest page can go forward.
Returns whether guest page can go to `offset`.
### `<webview>`.clearHistory()
Clears the navigation history.
### `<webview>`.goBack()
Makes guest page go back.

8
spec/fixtures/pages/history.html vendored Normal file
View file

@ -0,0 +1,8 @@
<html>
<body>
<script type="text/javascript" charset="utf-8">
window.history.pushState(window.history.state, "test page", "foo.html")
require('ipc').sendToHost('history', window.history.length);
</script>
</body>
</html>

15
spec/webview-spec.coffee
View file

@ -205,3 +205,18 @@ describe '<webview> tag', ->
webview.setAttribute 'nodeintegration', 'on'
webview.src = "file://#{fixtures}/pages/beforeunload-false.html"
document.body.appendChild webview
describe '<webview>.clearHistory()', ->
it 'should clear the navigation history', (done) ->
listener = (e) ->
assert.equal e.channel, 'history'
assert.equal e.args[0], 2
assert webview.canGoBack()
webview.clearHistory()
assert not webview.canGoBack()
webview.removeEventListener 'ipc-message', listener
done()
webview.addEventListener 'ipc-message', listener
webview.setAttribute 'nodeintegration', 'on'
webview.src = "file://#{fixtures}/pages/history.html"
document.body.appendChild webview