makes samples compliant with the build system

ibm-js · Sep 15, 2014 · 8a16f0d · 8a16f0d
1 parent 40b502a
commit 8a16f0d
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 33 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "dpointer",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"dependencies": {
 		"requirejs-dplugins": "0.2.x"
 	},

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "dpointer",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"dependencies": {
 		"requirejs-dplugins": "0.2.x"
 	},

diff --git a/samples/capture.html b/samples/capture.html
@@ -70,35 +70,43 @@
 		}
 	</style>
 
-	<script>var require = {baseUrl: "../.."}</script>
 	<script type="text/javascript" src="../../requirejs/require.js"></script>
+
 	<script type="text/javascript">
-		requirejs([
+		require.config({
+			baseUrl: "../.."
+		});
+	</script>
+
+	<script type="text/javascript">
+		require([
 			"dpointer/events",
 			"requirejs-domready/domReady!"
-		], function(pointer){
+		], function (pointer) {
 			var msgArea = document.getElementById("msgArea");
 
-			document.getElementById("capturedBtn").addEventListener("pointerdown", function(event){
+			document.getElementById("capturedBtn").addEventListener("pointerdown", function (event) {
 				msgArea.innerHTML = "";
 				pointer.setPointerCapture(capturedBtn, event.pointerId);
 			});
-			document.getElementById("Btn").addEventListener("pointerdown", function(event){
+
+			document.getElementById("Btn").addEventListener("pointerdown", function (event) {
 				msgArea.innerHTML = "";
 			});
 
-			document.body.addEventListener("gotpointercapture", function(event){
+			document.body.addEventListener("gotpointercapture", function (event) {
 				logit(event.target.id + ":gotpointercapture ");
 			});
-			document.body.addEventListener("lostpointercapture", function(event){
+
+			document.body.addEventListener("lostpointercapture", function (event) {
 				logit(event.target.id + ":lostpointercapture !");
 			});
 
-			document.body.addEventListener("click", function(event){
+			document.body.addEventListener("click", function (event) {
 				logit(event.target.id + ":CAPTURE:CLICK !");
 			});
 
-			document.body.addEventListener("pointermove", function(event){
+			document.body.addEventListener("pointermove", function (event) {
 				logit(event.target.id + ":pointermove (" + event.clientX + "/" + event.clientY + ")");
 			});
 
@@ -108,11 +116,11 @@
 			}, false);
 
 			// clear log on double click
-			msgArea.addEventListener("dblclick", function(event){
+			msgArea.addEventListener("dblclick", function (event) {
 				msgArea.innerHTML = "";
 			});
 
-			function logit(msg){
+			function logit(msg) {
 				msgArea.innerHTML = msg + "</br>" + msgArea.innerHTML;
 			}
 		});

diff --git a/samples/paint-with-capture.html b/samples/paint-with-capture.html
@@ -48,13 +48,19 @@
 		}
 	</style>
 
-	<script>var require = {baseUrl: "../.."}</script>
 	<script type="text/javascript" src="../../requirejs/require.js"></script>
+
+	<script type="text/javascript">
+		require.config({
+			baseUrl: "../.."
+		});
+	</script>
+
 	<script type="text/javascript">
-		requirejs([
+		require([
 			"dpointer/events",
 			"requirejs-domready/domReady!"
-		], function(pointer){
+		], function (pointer) {
 			var canvas = document.getElementById("drawingArea");
 			var context = canvas.getContext("2d");
 			canvas.height = window.innerHeight;
@@ -63,23 +69,23 @@
 			var captured = {};
 
 			// catch Pointer Down events and set capture on canvas
-			canvas.addEventListener("pointerdown", function(event){
+			canvas.addEventListener("pointerdown", function (event) {
 				pointer.setPointerCapture(canvas, event.pointerId);
 			});
 
 			// catch "got" pointer capture event and remember the pointerId as active
-			canvas.addEventListener("gotpointercapture", function(event){
+			canvas.addEventListener("gotpointercapture", function (event) {
 				captured[event.pointerId] = true;
 			});
 
 			// catch "lost" pointer capture event and set the pointerId as inactive
-			canvas.addEventListener("lostpointercapture", function(event){
+			canvas.addEventListener("lostpointercapture", function (event) {
 				captured[event.pointerId] = false;
 			});
 
 			// catch Pointer Move events and draw according to Pointer position
-			canvas.addEventListener("pointermove", function(event){
-				if(captured[event.pointerId]){
+			canvas.addEventListener("pointermove", function (event) {
+				if (captured[event.pointerId]) {
 					// as pointer capture is enabled for this pointerId,
 					// we do not have to check if the button is pressed:
 					// Pointer capture is enabled  until pointer is released.
@@ -88,18 +94,18 @@
 				}
 			});
 			// reset canvas on double tap/click
-			canvas.addEventListener("dblclick", function(){
+			canvas.addEventListener("dblclick", function () {
 				canvas.height = window.innerHeight;
 				canvas.width = window.innerWidth;
 			});
 
 			var PointerColor = {
 				index: -1,
 				colors: ["#FFFF00", "#0000FF", "#FF0000", "#00FF00", "#FFFFFF"], // yellow, blue, red, green, white
-				get: function(pointerId){
+				get: function (pointerId) {
 					return ( (this[pointerId]) || ((this[pointerId]) = this.next()));
 				},
-				next: function(){
+				next: function () {
 					this.index = ((this.colors.length - this.index) == 1) ? 0 : (this.index + 1);
 					return (this.colors[this.index]);
 				}

diff --git a/samples/paint.html b/samples/paint.html
@@ -43,40 +43,46 @@
 		}
 	</style>
 
-	<script>var require = {baseUrl: "../.."}</script>
 	<script type="text/javascript" src="../../requirejs/require.js"></script>
+
+	<script type="text/javascript">
+		require.config({
+			baseUrl: "../.."
+		});
+	</script>
+
 	<script type="text/javascript">
-		requirejs([
+		require([
 			"dpointer/events",
 			"requirejs-domready/domReady!"
-		], function(pointer){
+		], function (pointer) {
 			try {
 				var canvas = document.getElementById("drawingArea");
 				var context = context = canvas.getContext("2d");
 				canvas.height = window.innerHeight;
 				canvas.width = window.innerWidth;
 
 				// catch Pointer Move events and draw according to Pointer position
-				canvas.addEventListener("pointermove", function(event){
-					if(event.buttons > 0){
+				canvas.addEventListener("pointermove", function (event) {
+					if (event.buttons > 0) {
 						context.fillStyle = PointerColor.get(event.pointerId);
 						context.fillRect(event.clientX, event.clientY, 5, 5);
 					}
 				});
 
 				// reset canvas on double tap/click
-				canvas.addEventListener("dblclick", function(){
+				canvas.addEventListener("dblclick", function () {
 					canvas.height = window.innerHeight;
 					canvas.width = window.innerWidth;
 				});
 
 				var PointerColor = {
 					index: -1,
 					colors: ["#FFFF00", "#0000FF", "#FF0000", "#00FF00", "#FFFFFF"], // yellow, blue, red, green, white
-					get: function(pointerId){
+					get: function (pointerId) {
 						return ( (this[pointerId]) || ((this[pointerId]) = this.next()));
 					},
-					next: function(){
+					next: function () {
 						this.index = ((this.colors.length - this.index) == 1) ? 0 : (this.index + 1);
 						return (this.colors[this.index]);
 					}
@@ -85,7 +91,6 @@
 				alert(error);
 			}
 		});
-
 	</script>
 
 </head>