Skip to content

Commit 926fffe

Browse files
lehnilehni
committed
Rename Event -> DomEvent and Element -> DomElement, to be more specific and not clash with other classes, e.g. a future base class for ToolEvent and KeyEvent.
1 parent 0e37f86 commit 926fffe

12 files changed

Lines changed: 32 additions & 33 deletions

File tree

‎examples/Animated/AnimatedStar.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
}
4545

4646
// Reposition the paths whenever the window is resized:
47-
Event.add(window, {
47+
DomEvent.add(window, {
4848
resize: function(event) {
4949
document.activeLayer.position = document.bounds.center;
5050
}

‎examples/Animated/Flock.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// http://processing.org/learning/topics/flocking.html
1212

1313
// Reposition the heart path whenever the window is resized:
14-
Event.add(window, {
14+
DomEvent.add(window, {
1515
resize: function(event) {
1616
size = document.size;
1717
heartPath.position = document.bounds.center;

‎examples/Animated/RadialRainbows.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
gradientColor.hilite = mouseDown ? point : point + vector;
6565
}
6666

67-
Event.add(window, {
67+
DomEvent.add(window, {
6868
resize: function(event) {
6969
point = new Point(document.size) / 2;
7070
path.bounds = document.bounds;

‎examples/Animated/Smoothing.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
}
6060

6161
// Reposition the path whenever the window is resized:
62-
Event.add(window, {
62+
DomEvent.add(window, {
6363
resize: function(event) {
6464
initializePath();
6565
onFrame();

src/browser/Element.js renamed to src/browser/DomElement.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* All rights reserved.
1515
*/
1616

17-
var Element = new function() {
17+
var DomElement = new function() {
1818
function cumulate(el, name, parent) {
1919
var left = name + 'Left',
2020
top = name + 'Top',
@@ -41,8 +41,8 @@ var Element = new function() {
4141
},
4242

4343
getBounds: function(el, scroll) {
44-
return new Rectangle(Element.getOffset(el, scroll),
45-
Element.getSize(el));
44+
return new Rectangle(DomElement.getOffset(el, scroll),
45+
DomElement.getSize(el));
4646
},
4747

4848
getWindowSize: function() {
@@ -58,8 +58,8 @@ var Element = new function() {
5858
isVisible: function(el) {
5959
// See if the scrolled bounds intersect with the windows rectangle
6060
// which always starts at 0, 0
61-
return new Rectangle([0, 0], Element.getWindowSize())
62-
.intersects(Element.getBounds(el, true));
61+
return new Rectangle([0, 0], DomElement.getWindowSize())
62+
.intersects(DomElement.getBounds(el, true));
6363
}
6464
};
6565
};

src/browser/Event.js renamed to src/browser/DomEvent.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* All rights reserved.
1515
*/
1616

17-
var Event = {
17+
var DomEvent = {
1818
add: function(el, events) {
1919
for (var type in events) {
2020
var func = events[type];
@@ -60,12 +60,12 @@ var Event = {
6060

6161
getOffset: function(event) {
6262
// Remove target offsets from page coordinates
63-
return Event.getPoint(event).subtract(
64-
Element.getOffset(Event.getElement(event), true));
63+
return DomEvent.getPoint(event).subtract(
64+
DomElement.getOffset(DomEvent.getElement(event), true));
6565
}
6666
};
6767

68-
Event.requestAnimationFrame = new function() {
68+
DomEvent.requestAnimationFrame = new function() {
6969
var part = 'equestAnimationFrame',
7070
request = window['r' + part] || window['webkitR' + part]
7171
|| window['mozR' + part] || window['oR' + part]
@@ -100,7 +100,7 @@ Event.requestAnimationFrame = new function() {
100100
var entry = callbacks[i],
101101
func = entry[0],
102102
element = entry[1];
103-
if (!element || Element.isVisible(element)) {
103+
if (!element || DomElement.isVisible(element)) {
104104
// Handle callback and remove it from callbacks list.
105105
callbacks.splice(i, 1);
106106
func(+new Date);
@@ -110,7 +110,7 @@ Event.requestAnimationFrame = new function() {
110110
}
111111

112112
if (!paper.debug) {
113-
Event.add(window, {
113+
DomEvent.add(window, {
114114
focus: function() {
115115
focused = true;
116116
// Switch to falst checkCallback calls while window is focused.

‎src/document/Document.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ var Document = this.Document = Base.extend({
3030
// margin: 0;
3131
// overflow: hidden;
3232
// }
33-
this._size = Element.getWindowSize()
34-
.subtract(Element.getOffset(this.canvas));
33+
this._size = DomElement.getWindowSize()
34+
.subtract(DomElement.getOffset(this.canvas));
3535
this.canvas.width = this._size.width;
3636
this.canvas.height = this._size.height;
3737
var that = this;
38-
Event.add(window, {
38+
DomEvent.add(window, {
3939
resize: function(event) {
40-
that.setSize(Element.getWindowSize()
41-
.subtract(Element.getOffset(that.canvas)));
40+
that.setSize(DomElement.getWindowSize()
41+
.subtract(DomElement.getOffset(that.canvas)));
4242
that.redraw();
4343
}
4444
});
@@ -72,7 +72,7 @@ var Document = this.Document = Base.extend({
7272
// Align top-left to the canvas
7373
var element = this.stats.domElement,
7474
style = element.style,
75-
offset = Element.getOffset(this.canvas);
75+
offset = DomElement.getOffset(this.canvas);
7676
style.position = 'absolute';
7777
style.left = offset.x + 'px';
7878
style.top = offset.y + 'px';

‎src/load.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ var sources = [
6666
'src/tool/ToolHandler.js',
6767
'src/tool/Tool.js',
6868

69-
'src/browser/Element.js',
70-
'src/browser/Event.js',
69+
'src/browser/DomElement.js',
70+
'src/browser/DomEvent.js',
7171

7272
'src/util/CanvasProvider.js',
7373
'src/util/Numerical.js',

‎src/paper.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ Base.inject({
163163
//#include "tool/Tool.js"
164164

165165
//#ifdef BROWSER
166-
//#include "browser/Element.js"
167-
//#include "browser/Event.js"
166+
//#include "browser/DomElement.js"
167+
//#include "browser/DomEvent.js"
168168
//#endif // BROWSER
169169

170170
//#include "util/CanvasProvider.js"

‎src/tool/Tool.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616

1717
var Tool = this.Tool = ToolHandler.extend(new function() {
1818
function viewToArtwork(event, document) {
19-
var point = Event.getOffset(event);
2019
// TODO: always the active view?
21-
return document.activeView.viewToArtwork(point);
20+
return document.activeView.viewToArtwork(DomEvent.getOffset(event));
2221
};
2322

2423
return {
@@ -91,9 +90,9 @@ var Tool = this.Tool = ToolHandler.extend(new function() {
9190

9291
// Remove old events first.
9392
if (this._document)
94-
Event.remove(this._document.canvas, this.events);
93+
DomEvent.remove(this._document.canvas, this.events);
9594
this._document = doc;
96-
Event.add(doc.canvas, this.events);
95+
DomEvent.add(doc.canvas, this.events);
9796
},
9897

9998
getDocument: function() {

0 commit comments

Comments
 (0)