Skip to content
Permalink
Browse files
Merge branch 'ffos_privileged_compatible'
Conflicts:
	battery/index.html
  • Loading branch information
zalun committed Jun 10, 2014
2 parents 9a8914f + 46c0918 commit 4322b9c7f7b7b4672104a847bfc2a9ee99e2971a
Showing 75 changed files with 2,687 additions and 2,764 deletions.
@@ -27,118 +27,10 @@
<title>Cordova Mobile Spec</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script type="text/javascript" charset="utf-8" src="../cordova-incl.js"></script>


<script type="text/javascript" charset="utf-8">

var deviceReady = false;

function roundNumber(num) {
var dec = 3;
var result = Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);
return result;
}

//-------------------------------------------------------------------------
// Acceleration
//-------------------------------------------------------------------------
var watchAccelId = null;

/**
* Start watching acceleration
*/
var watchAccel = function() {
console.log("watchAccel()");

// Success callback
var success = function(a){
document.getElementById('x').innerHTML = roundNumber(a.x);
document.getElementById('y').innerHTML = roundNumber(a.y);
document.getElementById('z').innerHTML = roundNumber(a.z);
console.log("watchAccel success callback");
};

// Fail callback
var fail = function(e){
console.log("watchAccel fail callback with error code "+e);
stopAccel();
setAccelStatus(Accelerometer.ERROR_MSG[e]);
};

// Update acceleration every 1 sec
var opt = {};
opt.frequency = 1000;
watchAccelId = navigator.accelerometer.watchAcceleration(success, fail, opt);

setAccelStatus("Running");
};

/**
* Stop watching the acceleration
*/
var stopAccel = function() {
console.log("stopAccel()");
setAccelStatus("Stopped");
if (watchAccelId) {
navigator.accelerometer.clearWatch(watchAccelId);
watchAccelId = null;
}
};

/**
* Get current acceleration
*/
var getAccel = function() {
console.log("getAccel()");

// Stop accel if running
stopAccel();

// Success callback
var success = function(a){
document.getElementById('x').innerHTML = roundNumber(a.x);
document.getElementById('y').innerHTML = roundNumber(a.y);
document.getElementById('z').innerHTML = roundNumber(a.z);
};

// Fail callback
var fail = function(e){
console.log("getAccel fail callback with error code "+e);
setAccelStatus(Accelerometer.ERROR_MSG[e]);
};

// Make call
var opt = {};
navigator.accelerometer.getCurrentAcceleration(success, fail, opt);
};

/**
* Set accelerometer status
*/
var setAccelStatus = function(status) {
document.getElementById('accel_status').innerHTML = status;
};

/**
* Function called when page has finished loading.
*/
function init() {
console.log("accelerometer.init()");
document.addEventListener("deviceready", function() {
deviceReady = true;
console.log("Device="+device.platform+" "+device.version);
}, false);
window.setTimeout(function() {
if (!deviceReady) {
alert("Error: Apache Cordova did not initialize. Demo will not run correctly.");
}
},1000);
}

</script>
<script type="text/javascript" charset="utf-8" src="./index.js"></script>

</head>
<body onload="init();" id="stage" class="theme">
<body id="stage" class="theme">

<h1>Acceleration</h1>
<div id="info">
@@ -151,9 +43,9 @@ <h1>Acceleration</h1>
</div>

<h2>Action</h2>
<div class="btn large" onclick="getAccel();">Get Acceleration</div>
<div class="btn large" onclick="watchAccel();">Start Watch</div>
<div class="btn large" onclick="stopAccel();">Clear Watch</div>
<h2> </h2><div class="backBtn" onclick="backHome();">Back</div>
<div class="btn large getAccel">Get Acceleration</div>
<div class="btn large watchAccel">Start Watch</div>
<div class="btn large stopAccel">Clear Watch</div>
<h2> </h2><div class="backBtn">Back</div>
</body>
</html>
@@ -0,0 +1,111 @@
var deviceReady = false;

function roundNumber(num) {
var dec = 3;
var result = Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);
return result;
}

//-------------------------------------------------------------------------
// Acceleration
//-------------------------------------------------------------------------
var watchAccelId = null;

/**
* Start watching acceleration
*/
var watchAccel = function() {
console.log("watchAccel()");

// Success callback
var success = function(a){
document.getElementById('x').innerHTML = roundNumber(a.x);
document.getElementById('y').innerHTML = roundNumber(a.y);
document.getElementById('z').innerHTML = roundNumber(a.z);
console.log("watchAccel success callback");
};

// Fail callback
var fail = function(e){
console.log("watchAccel fail callback with error code "+e);
stopAccel();
setAccelStatus(Accelerometer.ERROR_MSG[e]);
};

// Update acceleration every 1 sec
var opt = {};
opt.frequency = 1000;
watchAccelId = navigator.accelerometer.watchAcceleration(success, fail, opt);

setAccelStatus("Running");
};

/**
* Stop watching the acceleration
*/
var stopAccel = function() {
console.log("stopAccel()");
setAccelStatus("Stopped");
if (watchAccelId) {
navigator.accelerometer.clearWatch(watchAccelId);
watchAccelId = null;
}
};

/**
* Get current acceleration
*/
var getAccel = function() {
console.log("getAccel()");

// Stop accel if running
stopAccel();

// Success callback
var success = function(a){
document.getElementById('x').innerHTML = roundNumber(a.x);
document.getElementById('y').innerHTML = roundNumber(a.y);
document.getElementById('z').innerHTML = roundNumber(a.z);
};

// Fail callback
var fail = function(e){
console.log("getAccel fail callback with error code "+e);
setAccelStatus(Accelerometer.ERROR_MSG[e]);
};

// Make call
var opt = {};
navigator.accelerometer.getCurrentAcceleration(success, fail, opt);
};

/**
* Set accelerometer status
*/
var setAccelStatus = function(status) {
document.getElementById('accel_status').innerHTML = status;
};

/**
* Function called when page has finished loading.
*/
function init() {
console.log("accelerometer.init()");
document.addEventListener("deviceready", function() {
deviceReady = true;
console.log("Device="+device.platform+" "+device.version);
}, false);
window.setTimeout(function() {
if (!deviceReady) {
alert("Error: Apache Cordova did not initialize. Demo will not run correctly.");
}
},1000);
}

window.onload = function() {
addListenerToClass('getAccel', getAccel);
addListenerToClass('watchAccel', watchAccel);
addListenerToClass('stopAccel', stopAccel);
addListenerToClass('backBtn', backHome);
init();
}

0 comments on commit 4322b9c

Please sign in to comment.