askbot-dragon 1.5.95-beta → 1.5.97-beta

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "askbot-dragon",
3
- "version": "1.5.95-beta",
3
+ "version": "1.5.97-beta",
4
4
  "scripts": {
5
5
  "serve": "vue-cli-service serve",
6
6
  "build": "vue-cli-service build",
@@ -95,15 +95,18 @@ export default {
95
95
  console.log(95, 'addEventListener window.onpopstate');
96
96
  if (window.history && window.history.pushState) {
97
97
  console.log(97, 'window.history && window.history.pushState');
98
- window.onpopstate = function () {
99
- console.log(99, 'window.onpopstate innner');
100
- window.history.pushState('forward', null, '');
101
- window.history.forward(1);
98
+ window.onpopstate = function (e) {
99
+ console.log(99, 'window.onpopstate innner', e);
100
+ window.history.go(1);
101
+ // window.history.pushState('forward', null, '');
102
+ // window.history.forward(1);
102
103
  _that.showAskFullScreen = false;
104
+ if ( e && e.stopPropagation ) {
105
+ console.log(105, 'e.stopPropagation');
106
+ e.stopPropagation();
107
+ }
103
108
  };
104
109
  }
105
- window.history.pushState('forward', null, ''); //在IE中必须得有这两行
106
- window.history.forward(1);
107
110
  })();
108
111
  },
109
112
  };