Skip to content

Commit 8a16f0d

Browse files
author
Sebastien Pereira
committed
makes samples compliant with the build system
1 parent 40b502a commit 8a16f0d

File tree

5 files changed

+52
-33
lines changed

5 files changed

+52
-33
lines changed

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dpointer",
3-
"version": "0.3.0",
3+
"version": "0.3.1",
44
"dependencies": {
55
"requirejs-dplugins": "0.2.x"
66
},

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dpointer",
3-
"version": "0.3.0",
3+
"version": "0.3.1",
44
"dependencies": {
55
"requirejs-dplugins": "0.2.x"
66
},

‎samples/capture.html

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,35 +70,43 @@
7070
}
7171
</style>
7272

73-
<script>var require = {baseUrl: "../.."}</script>
7473
<script type="text/javascript" src="../../requirejs/require.js"></script>
74+
7575
<script type="text/javascript">
76-
requirejs([
76+
require.config({
77+
baseUrl: "../.."
78+
});
79+
</script>
80+
81+
<script type="text/javascript">
82+
require([
7783
"dpointer/events",
7884
"requirejs-domready/domReady!"
79-
], function(pointer){
85+
], function (pointer) {
8086
var msgArea = document.getElementById("msgArea");
8187

82-
document.getElementById("capturedBtn").addEventListener("pointerdown", function(event){
88+
document.getElementById("capturedBtn").addEventListener("pointerdown", function (event) {
8389
msgArea.innerHTML = "";
8490
pointer.setPointerCapture(capturedBtn, event.pointerId);
8591
});
86-
document.getElementById("Btn").addEventListener("pointerdown", function(event){
92+
93+
document.getElementById("Btn").addEventListener("pointerdown", function (event) {
8794
msgArea.innerHTML = "";
8895
});
8996

90-
document.body.addEventListener("gotpointercapture", function(event){
97+
document.body.addEventListener("gotpointercapture", function (event) {
9198
logit(event.target.id + ":gotpointercapture ");
9299
});
93-
document.body.addEventListener("lostpointercapture", function(event){
100+
101+
document.body.addEventListener("lostpointercapture", function (event) {
94102
logit(event.target.id + ":lostpointercapture !");
95103
});
96104

97-
document.body.addEventListener("click", function(event){
105+
document.body.addEventListener("click", function (event) {
98106
logit(event.target.id + ":CAPTURE:CLICK !");
99107
});
100108

101-
document.body.addEventListener("pointermove", function(event){
109+
document.body.addEventListener("pointermove", function (event) {
102110
logit(event.target.id + ":pointermove (" + event.clientX + "/" + event.clientY + ")");
103111
});
104112

@@ -108,11 +116,11 @@
108116
}, false);
109117

110118
// clear log on double click
111-
msgArea.addEventListener("dblclick", function(event){
119+
msgArea.addEventListener("dblclick", function (event) {
112120
msgArea.innerHTML = "";
113121
});
114122

115-
function logit(msg){
123+
function logit(msg) {
116124
msgArea.innerHTML = msg + "</br>" + msgArea.innerHTML;
117125
}
118126
});

‎samples/paint-with-capture.html

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,19 @@
4848
}
4949
</style>
5050

51-
<script>var require = {baseUrl: "../.."}</script>
5251
<script type="text/javascript" src="../../requirejs/require.js"></script>
52+
53+
<script type="text/javascript">
54+
require.config({
55+
baseUrl: "../.."
56+
});
57+
</script>
58+
5359
<script type="text/javascript">
54-
requirejs([
60+
require([
5561
"dpointer/events",
5662
"requirejs-domready/domReady!"
57-
], function(pointer){
63+
], function (pointer) {
5864
var canvas = document.getElementById("drawingArea");
5965
var context = canvas.getContext("2d");
6066
canvas.height = window.innerHeight;
@@ -63,23 +69,23 @@
6369
var captured = {};
6470

6571
// catch Pointer Down events and set capture on canvas
66-
canvas.addEventListener("pointerdown", function(event){
72+
canvas.addEventListener("pointerdown", function (event) {
6773
pointer.setPointerCapture(canvas, event.pointerId);
6874
});
6975

7076
// catch "got" pointer capture event and remember the pointerId as active
71-
canvas.addEventListener("gotpointercapture", function(event){
77+
canvas.addEventListener("gotpointercapture", function (event) {
7278
captured[event.pointerId] = true;
7379
});
7480

7581
// catch "lost" pointer capture event and set the pointerId as inactive
76-
canvas.addEventListener("lostpointercapture", function(event){
82+
canvas.addEventListener("lostpointercapture", function (event) {
7783
captured[event.pointerId] = false;
7884
});
7985

8086
// catch Pointer Move events and draw according to Pointer position
81-
canvas.addEventListener("pointermove", function(event){
82-
if(captured[event.pointerId]){
87+
canvas.addEventListener("pointermove", function (event) {
88+
if (captured[event.pointerId]) {
8389
// as pointer capture is enabled for this pointerId,
8490
// we do not have to check if the button is pressed:
8591
// Pointer capture is enabled until pointer is released.
@@ -88,18 +94,18 @@
8894
}
8995
});
9096
// reset canvas on double tap/click
91-
canvas.addEventListener("dblclick", function(){
97+
canvas.addEventListener("dblclick", function () {
9298
canvas.height = window.innerHeight;
9399
canvas.width = window.innerWidth;
94100
});
95101

96102
var PointerColor = {
97103
index: -1,
98104
colors: ["#FFFF00", "#0000FF", "#FF0000", "#00FF00", "#FFFFFF"], // yellow, blue, red, green, white
99-
get: function(pointerId){
105+
get: function (pointerId) {
100106
return ( (this[pointerId]) || ((this[pointerId]) = this.next()));
101107
},
102-
next: function(){
108+
next: function () {
103109
this.index = ((this.colors.length - this.index) == 1) ? 0 : (this.index + 1);
104110
return (this.colors[this.index]);
105111
}

‎samples/paint.html

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,40 +43,46 @@
4343
}
4444
</style>
4545

46-
<script>var require = {baseUrl: "../.."}</script>
4746
<script type="text/javascript" src="../../requirejs/require.js"></script>
47+
48+
<script type="text/javascript">
49+
require.config({
50+
baseUrl: "../.."
51+
});
52+
</script>
53+
4854
<script type="text/javascript">
49-
requirejs([
55+
require([
5056
"dpointer/events",
5157
"requirejs-domready/domReady!"
52-
], function(pointer){
58+
], function (pointer) {
5359
try {
5460
var canvas = document.getElementById("drawingArea");
5561
var context = context = canvas.getContext("2d");
5662
canvas.height = window.innerHeight;
5763
canvas.width = window.innerWidth;
5864

5965
// catch Pointer Move events and draw according to Pointer position
60-
canvas.addEventListener("pointermove", function(event){
61-
if(event.buttons > 0){
66+
canvas.addEventListener("pointermove", function (event) {
67+
if (event.buttons > 0) {
6268
context.fillStyle = PointerColor.get(event.pointerId);
6369
context.fillRect(event.clientX, event.clientY, 5, 5);
6470
}
6571
});
6672

6773
// reset canvas on double tap/click
68-
canvas.addEventListener("dblclick", function(){
74+
canvas.addEventListener("dblclick", function () {
6975
canvas.height = window.innerHeight;
7076
canvas.width = window.innerWidth;
7177
});
7278

7379
var PointerColor = {
7480
index: -1,
7581
colors: ["#FFFF00", "#0000FF", "#FF0000", "#00FF00", "#FFFFFF"], // yellow, blue, red, green, white
76-
get: function(pointerId){
82+
get: function (pointerId) {
7783
return ( (this[pointerId]) || ((this[pointerId]) = this.next()));
7884
},
79-
next: function(){
85+
next: function () {
8086
this.index = ((this.colors.length - this.index) == 1) ? 0 : (this.index + 1);
8187
return (this.colors[this.index]);
8288
}
@@ -85,7 +91,6 @@
8591
alert(error);
8692
}
8793
});
88-
8994
</script>
9095

9196
</head>

0 commit comments

Comments
 (0)