lxm_front/eruda
1
0
Fork 0
mirror of https://github.com/liriliri/eruda.git synced 2026-04-01 10:18:35 +08:00
Code Issues Projects Releases Wiki Activity

Fix: Elements select error

Browse Source
This commit is contained in:
surunzi
2016-06-06 15:44:18 +08:00
parent dd86036a96
commit 2cde71e74d
4 changed files with 40 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
eustia/isErudaEl.js Normal file
View File

@@ -0,0 +1,14 @@
function exports(el)
{
var parentNode = el.parentNode;
if (!parentNode) return false;
while (parentNode)
{
parentNode = parentNode.parentNode;
if (parentNode && parentNode.id === 'eruda') return true;
}
return false;
}

17
src/Elements/Elements.es6
View File

@@ -161,8 +161,6 @@ export default class Elements extends Tool
}
_setEl(el)
{
if (isErudaEl(el)) return;
this._curEl = el;
this._curCssStore = new CssStore(el);
this._highlight.setEl(el);
@@ -406,18 +404,3 @@ function rmEvent(el, type, listener, useCapture = false)
}
var getWinEventProto = () => (window.EventTarget && window.EventTarget.prototype) || window.Node.prototype;
function isErudaEl(el)
{
let parentNode = el.parentNode;
if (!parentNode) return false;
while (parentNode)
{
parentNode = parentNode.parentNode;
if (parentNode && parentNode.id === 'eruda') return true;
}
return false;
}

4
src/Elements/Select.es6
View File

@@ -10,6 +10,8 @@ export default class Select extends util.Emitter
this._startListener = function (e)
{
if (util.isErudaEl(e.target)) return;
self._timer = setTimeout(function ()
{
self.emit('select', e.target);
@@ -25,6 +27,8 @@ export default class Select extends util.Emitter
this._clickListener = function (e)
{
if (util.isErudaEl(e.target)) return;
e.preventDefault();
e.stopImmediatePropagation();
};

58
src/lib/util.js
View File

@@ -1080,6 +1080,28 @@ module.exports = (function ()
return exports;
})({});
/* ------------------------------ isErudaEl ------------------------------ */
var isErudaEl = _.isErudaEl = (function (exports)
{
function exports(el)
{
var parentNode = el.parentNode;
if (!parentNode) return false;
while (parentNode)
{
parentNode = parentNode.parentNode;
if (parentNode && parentNode.id === 'eruda') return true;
}
return false;
}
return exports;
})({});
/* ------------------------------ isFn ------------------------------ */
var isFn = _.isFn = (function (exports)
@@ -1475,42 +1497,6 @@ module.exports = (function ()
* |methods|object |Public methods |
* |statics|object |Static methods |
* |return |function|Function used to create instances|
*
* ```javascript
* var People = Class({
* initialize: function (name, age)
* {
* this.name = name;
* this.age = age;
* },
* introduce: function ()
* {
* return 'I am ' + this.name + ', ' + this.age + ' years old.'.
* }
* });
*
* var Student = People.extend({
* initialize: function (name, age, school)
* {
* this.callSuper('initialize', name, age);
*
* this.school = school.
* },
* introduce: function ()
* {
* return this.callSuper('introduce') + '\n I study at ' + this.school + '.'.
* }
* }, {
* is: function (obj)
* {
* return obj instanceof Student;
* }
* });
*
* var a = new Student('allen', 17, 'Hogwarts');
* a.introduce(); // -> 'I am allen, 17 years old. \n I study at Hogwarts.'
* Student.is(a); // -> true
* ```
*/
var regCallSuper = /callSuper/;