Got vibrate working

paisible · Feb 17, 2009 · 914e0e2 · 914e0e2
1 parent 8910e75
commit 914e0e2
Show file tree

Hide file tree

Showing 27 changed files with 1,309 additions and 731 deletions.
diff --git a/Rakefile b/Rakefile
@@ -29,6 +29,11 @@ def build
   puts 'writing the full JS file to lib/phonegap.js'
   final = "#{ LIBPATH }lib#{ File::SEPARATOR }phonegap.js"
   js = ""
+
+  interfaces_to_build.each do |interface|
+    js << import("#{ LIBPATH }javascripts#{ File::SEPARATOR }#{ interface }.js")
+  end
+
   platforms_to_build.each do |platform|
     interfaces_to_build.each do |interface|
       begin
@@ -37,9 +42,7 @@ def build
       end
     end
   end
-  interfaces_to_build.each do |interface|
-    js << import("#{ LIBPATH }javascripts#{ File::SEPARATOR }#{ interface }.js")
-  end
+
   FileUtils.mkdir_p "#{ LIBPATH }lib"
   open(final,'w'){|f| f.puts( js )} 
 

diff --git a/iphone/Classes/GlassViewController.m b/iphone/Classes/GlassViewController.m
@@ -37,8 +37,8 @@ - (void)willRotateToInterfaceOrientation: (UIInterfaceOrientation)toInterfaceOri
 			i = -90;
 			break;
 	}
-//	GlassAppDelegate *appDelegate = (GlassAppDelegate*)[[UIApplication sharedApplication] delegate];
-	jsCallBack = [[NSString alloc] initWithFormat:@"setOrientation(%f);", i];
+
+	jsCallBack = [[NSString alloc] initWithFormat:@"var _orientation=%f;", i];
 	[webView stringByEvaluatingJavaScriptFromString:jsCallBack];
 
 	[jsCallBack release];

diff --git a/iphone/PhoneGap.xcodeproj/nitobi.mode1v3 b/iphone/PhoneGap.xcodeproj/nitobi.mode1v3
diff --git a/iphone/www/index.html b/iphone/www/index.html
@@ -18,48 +18,51 @@
     </style>
 	<script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
     <script type="text/javascript" charset="utf-8"> 
-
-
-	Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) {
-		if (typeof successCallback == "function") {
-			var accel = new Acceleration(_accel.x,_accel.y,_accel.z);
-			Accelerometer.lastAcceleration = accel;
-			successCallback(accel);
-		} 
+
+	var getLocation = function() {
+		var suc = function(p){
+			alert(p.latitude + " " + p.longitude);
+		};
 
-	}	
-
-
-	Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallback, options) {
-		this.getCurrentAccelerometer(successCallback, errorCallback, options);
-		// TODO: add the interval id to a list so we can clear all watches
-		return setInterval(function() {
-			navigator.accelerometer.getCurrentAcceleration(successCallback, errorCallback, options);
-		}, 10000);
+		var fail = function(){};
+		navigator.geolocation.getCurrentPosition(suc,fail);
 	}
-
 
-
-	var init = function() {
-		var g = new Accelerometer();
+	var getAccel = function() {
 		var suc = function(p){
-			alert(p.x);
+			alert(a.x + " " + a.y + " " + a.z);
 		};
 
-		var fail = function(er){console.log(er.message);};		
-		g.watchAcceleration(suc, fail);
-	//	var interval = g.watchPosition(suc,fail);
-
+		var fail = function(){};
+		navigator.accelerometer.getCurrentAcceleration(suc,fail);
+	}
+
+	var watchAccel = function() {
+		var suc = function(a){
+			document.getElementById('t').innerHTML = a.x + " " + a.y + " " + a.z;
+		};
 
+		var fail = function(){};
+
+		var opt = {};
+		opt.frequency = 100;
+		timer = navigator.accelerometer.watchAcceleration(suc,fail,opt);
+	}
+
+	var vibrate = function() {
+		navigator.notification.vibrate(0);
 	}
 
     </script>
 
   </head>
   <body >
-    Welcome
-		<button onclick="init();">Get Geolocation</button>
+	<button onclick="getLocation();">Get Geolocation</button><br />
+	<button onclick="getAccel();">Get Accelerometer</button><br />
+	<button onclick="watchAccel();">Watch Accelerometer</button><br />		
+	<button onclick="vibrate();">Vibrate</button><br />				
 	<div id="t"></div>
+	<div id="p"></div>	
 
 
   </body>

diff --git a/iphone/www/phonegap.js b/iphone/www/phonegap.js
@@ -1,105 +1,4 @@
 
-
-
-
-    File.prototype.read = function(fileName, successCallback, errorCallback) {
-    	document.cookie = 'bb_command={command:8,args:{name:"'+fileName+'"}}';
-    	navigator.file.successCallback = successCallback;
-    	navigator.file.errorCallback = errorCallback;
-    	navigator.file.readTimeout = window.setInterval('navigator.file._readReady()', 1000);
-    }
-
-    File.prototype._readReady = function() {
-    	var cookies = document.cookie.split(';');
-    	for (var i=0; i<cookies.length; i++) {
-    		var cookie = cookies[i].split('=');
-    		if (cookie[0] == 'bb_response') {
-    			var obj = eval('('+cookie[1]+')');
-
-    			// TODO: This needs to be in ONE cookie reading loop I think so that it can find 
-    			// various different data coming back from the phone at any time (poll piggy-backing)
-    			var file = obj.readfile;
-    			if (file != null)
-    			{
-    				window.clearTimeout(navigator.file.readTimeout);
-    				if (file.length > 0)
-    				{
-    					successCallback(file);
-    				}
-    			}
-    		}
-    	}
-    }
-
-    File.prototype.write = function(fileName, data) {
-    	document.cookie = 'bb_command={command:9,args:{name:"'+fileName+'",data:"'+data+'"}}';
-    }
-
-
-
-    Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) {
-    	document.cookie = 'bb_command={command:'+phonegap.LOCATION+'}';
-    	// Blackberry 4.5 does not let you use function pointers in setInterval. idiots.
-    	geoSuccessCallback = successCallback;
-    	geoErrorCallback = errorCallback;
-    	geoOptions = options;
-    	locationTimeout = window.setInterval('navigator.geolocation._getCurrentPosition()', 1000);
-    }
-
-    Geolocation.prototype._getCurrentPosition = function(successCallback, errorCallback, options) {
-    	var cookies = document.cookie.split(';');
-    	for (var i=0; i<cookies.length; i++) {
-    		var cookie = cookies[i].split('=');
-    		if (cookie[0] == 'bb_response') {
-    			var obj = eval('('+cookie[1]+')');
-    			var geo = obj.geolocation;
-    			if (geo != null)
-    			{
-    				window.clearTimeout(locationTimeout);
-    				if (geo.error != null) {
-    					if (typeof geoErrorCallback == "function") {
-    						geoErrorCallback(new PositionError(geo.error));
-    					}
-    				} else if (typeof geoSuccessCallback == "function") {
-    					geoSuccessCallback(new Position(geo.lat, geo.lng));
-    				}
-    				break;
-    			}
-    		}
-    	}
-    }
-
-    Geolocation.prototype.showMap = function(lat, lng) {
-    	document.cookie = 'bb_command={command:1,args:{points:[{lat:'+lat+',lng:'+lng+',label:\'Nitobi\'}]}}';
-    }
-
-
-    Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) {
-    	geoSuccessCallback = successCallback;
-    	geoErrorCallback = errorCallback;
-    	geoOptions = options;
-    //	locationTimeout = window.setInterval("navigator.geolocation._getCurrentPosition();", 1000); // Works in Webkit
-    	locationTimeout = window.setInterval("Geolocation.prototype._getCurrentPosition();", 1000); // Works in FireFox
-    }
-
-    Geolocation.prototype._getCurrentPosition = function() {
-    	document.location = "gap://getloc/null";		
-
-    	if (geo.lng != 0) {
-    		window.clearTimeout(locationTimeout);
-    		if (geo.error != null) {
-    			if (typeof geoErrorCallback == "function") {
-    				geoErrorCallback(new PositionError(geo.error));
-    			} 		
-    		} else if (typeof geoSuccessCallback == "function") {
-    			var position = new Position(geo.lat, geo.lng);
-    			Geolocation.lastPosition = position;
-    			geoSuccessCallback(position);
-    		} 
-    	}			
-    }
-
-
     /**
      * This class contains acceleration information
      * @constructor
@@ -162,6 +61,13 @@
     Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) {
     	// If the acceleration is available then call success
     	// If the acceleration is not available then call error
+
+    	// Created for iPhone, Iphone passes back _accel obj litteral
+    	if (typeof successCallback == "function") {
+    		var accel = new Acceleration(_accel.x,_accel.y,_accel.z);
+    		Accelerometer.lastAcceleration = accel;
+    		successCallback(accel);
+    	}
     }
 
     /**
@@ -173,12 +79,14 @@
      * @param {AccelerationOptions} options The options for getting the accelerometer data
      * such as timeout.
      */
+
     Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallback, options) {
-    	this.getCurrentAccelerometer(successCallback, errorCallback, options);
+    	this.getCurrentAcceleration(successCallback, errorCallback, options);
     	// TODO: add the interval id to a list so we can clear all watches
+     	var frequency = (options != undefined)? options.frequency : 10000;
     	return setInterval(function() {
     		navigator.accelerometer.getCurrentAcceleration(successCallback, errorCallback, options);
-    	}, 10000);
+    	}, frequency);
     }
 
     /**
@@ -292,10 +200,10 @@
      * @param {PositionOptions} options The options for getting the position data
      * such as timeout.
      */
-    //Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) {
+    Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) {
     	// If the position is available then call success
     	// If the position is not available then call error
-    //}
+    }
 
     /**
      * Asynchronously aquires the position repeatedly at a given interval.
@@ -557,3 +465,119 @@
 
     if (typeof navigator.telephony == "undefined") navigator.telephony = new Telephony();
 
+
+
+
+
+    File.prototype.read = function(fileName, successCallback, errorCallback) {
+    	document.cookie = 'bb_command={command:8,args:{name:"'+fileName+'"}}';
+    	navigator.file.successCallback = successCallback;
+    	navigator.file.errorCallback = errorCallback;
+    	navigator.file.readTimeout = window.setInterval('navigator.file._readReady()', 1000);
+    }
+
+    File.prototype._readReady = function() {
+    	var cookies = document.cookie.split(';');
+    	for (var i=0; i<cookies.length; i++) {
+    		var cookie = cookies[i].split('=');
+    		if (cookie[0] == 'bb_response') {
+    			var obj = eval('('+cookie[1]+')');
+
+    			// TODO: This needs to be in ONE cookie reading loop I think so that it can find 
+    			// various different data coming back from the phone at any time (poll piggy-backing)
+    			var file = obj.readfile;
+    			if (file != null)
+    			{
+    				window.clearTimeout(navigator.file.readTimeout);
+    				if (file.length > 0)
+    				{
+    					successCallback(file);
+    				}
+    			}
+    		}
+    	}
+    }
+
+    File.prototype.write = function(fileName, data) {
+    	document.cookie = 'bb_command={command:9,args:{name:"'+fileName+'",data:"'+data+'"}}';
+    }
+
+
+
+    Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) {
+    	document.cookie = 'bb_command={command:'+phonegap.LOCATION+'}';
+    	// Blackberry 4.5 does not let you use function pointers in setInterval. idiots.
+    	geoSuccessCallback = successCallback;
+    	geoErrorCallback = errorCallback;
+    	geoOptions = options;
+    	locationTimeout = window.setInterval('navigator.geolocation._getCurrentPosition()', 1000);
+    }
+
+    Geolocation.prototype._getCurrentPosition = function(successCallback, errorCallback, options) {
+    	var cookies = document.cookie.split(';');
+    	for (var i=0; i<cookies.length; i++) {
+    		var cookie = cookies[i].split('=');
+    		if (cookie[0] == 'bb_response') {
+    			var obj = eval('('+cookie[1]+')');
+    			var geo = obj.geolocation;
+    			if (geo != null)
+    			{
+    				window.clearTimeout(locationTimeout);
+    				if (geo.error != null) {
+    					if (typeof geoErrorCallback == "function") {
+    						geoErrorCallback(new PositionError(geo.error));
+    					}
+    				} else if (typeof geoSuccessCallback == "function") {
+    					geoSuccessCallback(new Position(geo.lat, geo.lng));
+    				}
+    				break;
+    			}
+    		}
+    	}
+    }
+
+    Geolocation.prototype.showMap = function(lat, lng) {
+    	document.cookie = 'bb_command={command:1,args:{points:[{lat:'+lat+',lng:'+lng+',label:\'Nitobi\'}]}}';
+    }
+
+
+    Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) {
+    	if (typeof successCallback == "function") {
+    		var accel = new Acceleration(_accel.x,_accel.y,_accel.z);
+    		Accelerometer.lastAcceleration = accel;
+    		successCallback(accel);
+    	} 	
+    }	
+
+
+
+    Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) {
+    	geoSuccessCallback = successCallback;
+    	geoErrorCallback = errorCallback;
+    	geoOptions = options;
+    //	locationTimeout = window.setInterval("navigator.geolocation._getCurrentPosition();", 1000); // Works in Webkit
+    	locationTimeout = window.setInterval("Geolocation.prototype._getCurrentPosition();", 1000); // Works in FireFox
+    }
+
+    Geolocation.prototype._getCurrentPosition = function() {
+    	document.location = "gap://getloc/null";		
+
+    	if (geo.lng != 0) {
+    		window.clearTimeout(locationTimeout);
+    		if (geo.error != null) {
+    			if (typeof geoErrorCallback == "function") {
+    				geoErrorCallback(new PositionError(geo.error));
+    			} 		
+    		} else if (typeof geoSuccessCallback == "function") {
+    			var position = new Position(geo.lat, geo.lng);
+    			Geolocation.lastPosition = position;
+    			geoSuccessCallback(position);
+    		} 
+    	}
+    }
+
+
+    Notification.prototype.vibrate = function(mills) {
+    	document.location = "gap://vibrate/null";
+    }
+