Skip to content

Commit

Permalink
Revert "debugging"
Browse files Browse the repository at this point in the history
This reverts commit b939100.
  • Loading branch information
rcarlsen committed Dec 12, 2012
1 parent b939100 commit 4a9748d
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions Resources/main_windows/dashboardView.js
Expand Up @@ -579,20 +579,16 @@ var compassTransformation = Ti.UI.create2DMatrix();
function rotateCompass(degrees) {
// don't interrupt the current animation
// TODO: figure out why this seems to be ignored.
Ti.API.info("in rotateCompass, compass animating: "+compass.getAnimating());

if(compass.getAnimating() === false) {
if(compass.getAnimating() == false) {
var t = compassTransformation;
t = t.rotate(360-degrees);

var a = Titanium.UI.createAnimation({
transform: t,
duration: 500
duration: 300
});

compass.animate(a, function(e){
Ti.API.info("compass animation complete");
});
compass.animate(a);
}
}

Expand Down Expand Up @@ -1006,7 +1002,7 @@ function checkAudioLevels() {
// animate audio image
// use a callback at the end to scale back
// using 90 as a threshhold - busy street for dB (not dBFS)
if(dbspl >= 90 && audioLevelImage.getAnimating() == false) {
if(dbspl >= 90 && audioLevelImage.animating == false) {
var t = Titanium.UI.create2DMatrix();
t = t.scale(1.1 + ((dbspl-90)/20)); // scale relative to dbspl
audioLevelImage.animate({transform:t, duration:100},function() {
Expand Down Expand Up @@ -1220,7 +1216,7 @@ Titanium.Accelerometer.addEventListener('update',function(e)
if(mag == null) { mag = 0; }

// Let the label lock to the triggered value during animation
if(forceImage.getAnimating() == false) {
if(!forceImage.animating) {
updateForceLabel(mag);
}
// animate force image
Expand Down

0 comments on commit 4a9748d

Please sign in to comment.