Skip to content

Commit 85d3f15

Browse files
committed
Merge pull request #3256 from VisualSJ/develop_webview
Fixed a bug about webview goback
2 parents e1700a8 + 53f4739 commit 85d3f15

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

Diff for: extensions/ccui/uiwidgets/UIWebView.js

+10-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,11 @@ ccui.WebView = ccui.Widget.extend(/** @lends ccui.WebView# */{
101101
if(iframe){
102102
var win = iframe.contentWindow;
103103
if(win && win.location)
104-
win.history.back.call(win);
104+
try {
105+
win.history.back.call(win);
106+
} catch (error) {
107+
win.history.back();
108+
}
105109
}
106110
}catch(err){
107111
cc.log(err);
@@ -119,7 +123,11 @@ ccui.WebView = ccui.Widget.extend(/** @lends ccui.WebView# */{
119123
if(iframe){
120124
var win = iframe.contentWindow;
121125
if(win && win.location)
122-
win.history.forward.call(win);
126+
try {
127+
win.history.forward.call(win);
128+
} catch (error) {
129+
win.history.forward();
130+
}
123131
}
124132
}catch(err){
125133
cc.log(err);

0 commit comments

Comments
 (0)