lxm_front/eruda
1
0
Fork 0
mirror of synced 2025-12-09 07:08:17 +08:00
Code Issues Projects Releases Wiki Activity

Fix: Safari Dom exception 12

Browse Source
This commit is contained in:
surunzi
2016-03-15 23:37:04 +08:00
parent a3d8d6ef32
commit 6250f8b6ea
6 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
dist/eruda.js vendored
View File

@@ -105,7 +105,7 @@ var eruda =
var $container;
var isDebugMode = /eruda=true/.test(window.location.search);
var isDebugMode = /eruda=true/.test(window.location);
if (isDebugMode) {
initFaskClick();
@@ -119,7 +119,7 @@ var eruda =
return devTools.toggle();
});
devTools.add(new _Console2.default()).add(new _Network2.default()).add(new _Elements2.default()).add(new _Snippets2.default()).add(new _Resources2.default()).add(new _Info2.default()).add(new _Features2.default()).add(new _Settings2.default()).showTool('settings').show();
devTools.add(new _Console2.default()).add(new _Network2.default()).add(new _Elements2.default()).add(new _Snippets2.default()).add(new _Resources2.default()).add(new _Info2.default()).add(new _Features2.default()).add(new _Settings2.default()).showTool('console');
}
function appendContainer() {
@@ -6080,7 +6080,7 @@ var eruda =
// module
exports.push([module.id, ".eruda-dev-tools .eruda-tools .eruda-console {\n padding-bottom: 40px; }\n .eruda-dev-tools .eruda-tools .eruda-console .eruda-js-input {\n position: absolute;\n left: 0;\n bottom: 0;\n width: 100%;\n height: 40px;\n padding: 10px;\n border: none;\n background: #fff;\n outline: none;\n overflow: hidden; }\n", ""]);
exports.push([module.id, ".eruda-dev-tools .eruda-tools .eruda-console {\n padding-bottom: 40px; }\n .eruda-dev-tools .eruda-tools .eruda-console .eruda-js-input {\n position: absolute;\n left: 0;\n bottom: 0;\n width: 100%;\n height: 40px;\n padding: 10px;\n border: none;\n font-size: 13px;\n background: #fff;\n outline: none;\n overflow: hidden; }\n", ""]);
// exports
@@ -6459,13 +6459,6 @@ var eruda =
this._htmlEl = document.getElementsByTagName('html')[0];
this._setEl(this._htmlEl, 0);
}
}, {
key: 'show',
value: function show() {
_get(Object.getPrototypeOf(Elements.prototype), 'show', this).call(this);
this._render();
}
}, {
key: '_back',
value: function _back() {
@@ -10698,6 +10691,22 @@ var eruda =
return ret;
}
var elProto = Element.prototype;
var matchesSel = function matchesSel(el, selText) {
return false;
};
if (elProto.webkitMatchesSelector) {
matchesSel = function matchesSel(el, selText) {
return el.webkitMatchesSelector(selText);
};
} else if (elProto.mozMatchesSelector) {
matchesSel = function matchesSel(el, selText) {
return el.mozMatchesSelector(selText);
};
}
var CssStore = function () {
function CssStore(el) {
_classCallCheck(this, CssStore);
@@ -10721,7 +10730,13 @@ var eruda =
_util2.default.each(document.styleSheets, function (styleSheet) {
_util2.default.each(styleSheet.cssRules, function (cssRule) {
if (!_this._elMatchesSel(cssRule.selectorText)) return;
var matchesEl = false;
try {
matchesEl = _this._elMatchesSel(cssRule.selectorText);
} catch (e) {}
if (!matchesEl) return;
ret.push({
selectorText: cssRule.selectorText,
@@ -10735,7 +10750,7 @@ var eruda =
}, {
key: '_elMatchesSel',
value: function _elMatchesSel(selText) {
return this._el.webkitMatchesSelector(selText);
return matchesSel(this._el, selText);
}
}]);

1
src/Console/Console.scss
View File

@@ -11,6 +11,7 @@
height: 40px;
padding: 10px;
border: none;
font-size: 13px;
background: #fff;
outline: none;
overflow: hidden;

22
src/Elements/CssStore.es6
View File

@@ -16,6 +16,18 @@ function formatStyle(style)
return ret;
}
var elProto = Element.prototype;
var matchesSel = function (el, selText) { return false };
if (elProto.webkitMatchesSelector)
{
matchesSel = (el, selText) => el.webkitMatchesSelector(selText);
} else if (elProto.mozMatchesSelector)
{
matchesSel = (el, selText) => el.mozMatchesSelector(selText);
}
export default class CssStore
{
constructor(el)
@@ -36,7 +48,13 @@ export default class CssStore
{
util.each(styleSheet.cssRules, (cssRule) =>
{
if (!this._elMatchesSel(cssRule.selectorText)) return;
var matchesEl = false;
try {
matchesEl = this._elMatchesSel(cssRule.selectorText);
} catch (e) {}
if (!matchesEl) return;
ret.push({
selectorText: cssRule.selectorText,
@@ -49,6 +67,6 @@ export default class CssStore
}
_elMatchesSel(selText)
{
return this._el.webkitMatchesSelector(selText);
return matchesSel(this._el, selText);
}
};

6
src/Elements/Elements.es6
View File

@@ -119,12 +119,6 @@ export default class Elements extends Tool
this._htmlEl = document.getElementsByTagName('html')[0];
this._setEl(this._htmlEl, 0);
}
show()
{
super.show();
this._render();
}
_back()
{
if (this._curEl === this._htmlEl) return;

5
src/index.es6
View File

@@ -15,7 +15,7 @@ require('./style.scss');
var $container;
var isDebugMode = /eruda=true/.test(window.location.search);
var isDebugMode = /eruda=true/.test(window.location);
if (isDebugMode)
{
@@ -36,8 +36,7 @@ if (isDebugMode)
.add(new Info())
.add(new Features())
.add(new Settings())
.showTool('settings')
.show();
.showTool('console');
}
function appendContainer()

8
test/index.html
View File

@@ -11,6 +11,12 @@
<div class="child-one">One</div>
<div class="child-two">Two</div>
</div>
<script src="../dist/eruda.js"></script>
<script>
(function () {
var src = '../dist/eruda.js';
if (!/eruda=true/.test(window.location) && localStorage.getItem('keep-eruda') != 'true') return;
document.write('<scr' + 'ipt src="' + src + '"></scr' + 'ipt>');
})();
</script>
</body>
</html>