scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-20 22:39:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove references to this in DomElement os we can call method references directly, and always check el for null.

Browse source
This commit is contained in:
Jürg Lehni 2014-10-02 17:00:40 +02:00
parent 7194d4bcf0
commit f4c4522c18
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/dom/DomElement.js
View file

@ -95,7 +95,7 @@ var DomElement = new function() {
if (typeof key !== 'string') { if (typeof key !== 'string') {
for (var name in key) for (var name in key)
if (key.hasOwnProperty(name)) if (key.hasOwnProperty(name))
this.set(el, name, key[name]); DomElement.set(el, name, key[name]);
} else if (!el || value === undefined) { } else if (!el || value === undefined) {
return el; return el;
} else if (special.test(key)) { } else if (special.test(key)) {
@ -103,7 +103,7 @@ var DomElement = new function() {
} else if (key in translated) { } else if (key in translated) {
el[translated[key]] = value; el[translated[key]] = value;
} else if (key === 'style') { } else if (key === 'style') {
this.setStyle(el, value); DomElement.setStyle(el, value);
} else if (key === 'events') { } else if (key === 'events') {
DomEvent.add(el, value); DomEvent.add(el, value);
} else { } else {
@ -120,14 +120,14 @@ var DomElement = new function() {
}, },
getStyle: function(el, key) { getStyle: function(el, key) {
return el && el.style[key] || this.getStyles(el)[key] || null; return el && el.style[key] || DomElement.getStyles(el)[key] || null;
}, },
setStyle: function(el, key, value) { setStyle: function(el, key, value) {
if (typeof key !== 'string') { if (typeof key !== 'string') {
for (var name in key) for (var name in key)
if (key.hasOwnProperty(name)) if (key.hasOwnProperty(name))
this.setStyle(el, name, key[name]); DomElement.setStyle(el, name, key[name]);
} else { } else {
if (/^-?[\d\.]+$/.test(value) && !(key in unitless)) if (/^-?[\d\.]+$/.test(value) && !(key in unitless))
value += 'px'; value += 'px';
@ -137,21 +137,25 @@ var DomElement = new function() {
}, },
hasClass: function(el, cls) { hasClass: function(el, cls) {
return new RegExp('\\s*' + cls + '\\s*').test(el.className); return el && new RegExp('\\s*' + cls + '\\s*').test(el.className);
}, },
addClass: function(el, cls) { addClass: function(el, cls) {
el.className = (el.className + ' ' + cls).trim(); if (el) {
el.className = (el.className + ' ' + cls).trim();
}
}, },
removeClass: function(el, cls) { removeClass: function(el, cls) {
el.className = el.className.replace( if (el) {
new RegExp('\\s*' + cls + '\\s*'), ' ').trim(); el.className = el.className.replace(
new RegExp('\\s*' + cls + '\\s*'), ' ').trim();
}
}, },
toggleClass: function(el, cls, state) { toggleClass: function(el, cls, state) {
this[state === undefined ? !this.hasClass(el, cls) : state DomElement[(state === undefined ? !DomElement.hasClass(el, cls)
? 'addClass' : 'removeClass'](el, cls); : state) ? 'addClass' : 'removeClass'](el, cls);
}, },
remove: function(el) { remove: function(el) {
@ -203,18 +207,18 @@ var DomElement = new function() {
}, },
getOffset: function(el, viewport) { getOffset: function(el, viewport) {
return this.getBounds(el, viewport).getPoint(); return DomElement.getBounds(el, viewport).getPoint();
}, },
getSize: function(el) { getSize: function(el) {
return this.getBounds(el, true).getSize(); return DomElement.getBounds(el, true).getSize();
}, },
/** /**
* Checks if element is invisibile (display: none, ...) * Checks if element is invisibile (display: none, ...)
*/ */
isInvisible: function(el) { isInvisible: function(el) {
return this.getSize(el).equals(new Size(0, 0)); return DomElement.getSize(el).equals(new Size(0, 0));
}, },
/** /**
@ -223,8 +227,9 @@ var DomElement = new function() {
isInView: function(el) { isInView: function(el) {
// See if the viewport bounds intersect with the windows rectangle // See if the viewport bounds intersect with the windows rectangle
// which always starts at 0, 0 // which always starts at 0, 0
return !this.isInvisible(el) && this.getViewportBounds(el).intersects( return !DomElement.isInvisible(el)
this.getBounds(el, true)); && DomElement.getViewportBounds(el).intersects(
DomElement.getBounds(el, true));
}, },
/** /**