@alicloud/console-os-browser-vm 1.4.25-alpha.0 → 1.4.25
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/es/Location.js +7 -2
- package/lib/Location.js +7 -2
- package/package.json +1 -1
package/es/Location.js
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
2
2
|
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
3
|
+
function isAboutBlank(loc) {
|
|
4
|
+
return loc && loc.href === 'about:blank';
|
|
5
|
+
}
|
|
3
6
|
var Location = /*#__PURE__*/_createClass(function Location(location) {
|
|
4
7
|
_classCallCheck(this, Location);
|
|
5
8
|
return new Proxy({}, {
|
|
@@ -23,9 +26,9 @@ var Location = /*#__PURE__*/_createClass(function Location(location) {
|
|
|
23
26
|
case 'toString':
|
|
24
27
|
return function () {
|
|
25
28
|
try {
|
|
26
|
-
return location.toString();
|
|
29
|
+
return isAboutBlank(location) ? window.location.toString() : location.toString();
|
|
27
30
|
} catch (e) {
|
|
28
|
-
return location.href;
|
|
31
|
+
return isAboutBlank(location) ? window.location.href : location.href;
|
|
29
32
|
}
|
|
30
33
|
};
|
|
31
34
|
default:
|
|
@@ -33,6 +36,8 @@ var Location = /*#__PURE__*/_createClass(function Location(location) {
|
|
|
33
36
|
}
|
|
34
37
|
if (typeof location[name] === 'function') {
|
|
35
38
|
return location[name].bind && location[name].bind(target);
|
|
39
|
+
} else if (isAboutBlank(location)) {
|
|
40
|
+
return window.location[name];
|
|
36
41
|
} else {
|
|
37
42
|
return location[name];
|
|
38
43
|
}
|
package/lib/Location.js
CHANGED
|
@@ -7,6 +7,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.default = void 0;
|
|
8
8
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
9
9
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
10
|
+
function isAboutBlank(loc) {
|
|
11
|
+
return loc && loc.href === 'about:blank';
|
|
12
|
+
}
|
|
10
13
|
var Location = /*#__PURE__*/(0, _createClass2.default)(function Location(location) {
|
|
11
14
|
(0, _classCallCheck2.default)(this, Location);
|
|
12
15
|
return new Proxy({}, {
|
|
@@ -30,9 +33,9 @@ var Location = /*#__PURE__*/(0, _createClass2.default)(function Location(locatio
|
|
|
30
33
|
case 'toString':
|
|
31
34
|
return function () {
|
|
32
35
|
try {
|
|
33
|
-
return location.toString();
|
|
36
|
+
return isAboutBlank(location) ? window.location.toString() : location.toString();
|
|
34
37
|
} catch (e) {
|
|
35
|
-
return location.href;
|
|
38
|
+
return isAboutBlank(location) ? window.location.href : location.href;
|
|
36
39
|
}
|
|
37
40
|
};
|
|
38
41
|
default:
|
|
@@ -40,6 +43,8 @@ var Location = /*#__PURE__*/(0, _createClass2.default)(function Location(locatio
|
|
|
40
43
|
}
|
|
41
44
|
if (typeof location[name] === 'function') {
|
|
42
45
|
return location[name].bind && location[name].bind(target);
|
|
46
|
+
} else if (isAboutBlank(location)) {
|
|
47
|
+
return window.location[name];
|
|
43
48
|
} else {
|
|
44
49
|
return location[name];
|
|
45
50
|
}
|