From b71005d0a3a0845071bf30d498c5f5d1d9bd3a8a Mon Sep 17 00:00:00 2001 From: "gs86.lee" Date: Thu, 14 Feb 2013 15:41:52 +0900 Subject: [PATCH] [SensorBall]update SensorBall Change-Id: I0fa29c2d5ea30066a1f84a56a21c738932066f6a --- NOTICE.Flora => NOTICE | 2 +- config.xml | 1 - index.html | 4 ++-- js/main.js | 8 ++------ 4 files changed, 5 insertions(+), 10 deletions(-) rename NOTICE.Flora => NOTICE (66%) diff --git a/NOTICE.Flora b/NOTICE similarity index 66% rename from NOTICE.Flora rename to NOTICE index fdb699a..85044e4 100644 --- a/NOTICE.Flora +++ b/NOTICE @@ -1,4 +1,4 @@ Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved. Except as noted, this software is licensed under Flora License, Version 1. -Please, see the LICENSE file for Flora License terms and conditions. +Please, see the LICENSE.Flora file for Flora License terms and conditions. diff --git a/config.xml b/config.xml index 649d866..7effe0b 100644 --- a/config.xml +++ b/config.xml @@ -5,7 +5,6 @@ - SensorBall diff --git a/index.html b/index.html index fdd1808..8d4e8b4 100644 --- a/index.html +++ b/index.html @@ -21,7 +21,7 @@

SensorBall

-
+
@@ -37,4 +37,4 @@
- + \ No newline at end of file diff --git a/js/main.js b/js/main.js index 588c49d..7c46e59 100644 --- a/js/main.js +++ b/js/main.js @@ -14,7 +14,6 @@ * limitations under the License. */ -/*jslint devel: true */ /*global $: false, tizen: false, navigator: false, app: true*/ var app = { @@ -165,9 +164,7 @@ var app = { this.ballX += this.dX; this.ballY += this.dY; - // Waht do it when the earth leaves gravitation of the Sun?; - //if ( Math.abs(ballX) > 1000) { dX = 2; ballX = 0 }; - //if ( Math.abs(ballY) > 1000) { dY = 2; ballY = 0 }; + // What do it when the earth leaves gravitation of the Sun?; if (this.ballX > (this.gameWidth + borderTolerance)) { this.ballX = -borderTolerance; this.deceleration(); } if (this.ballY > (this.gameHeight + borderTolerance)) { this.ballY = -borderTolerance; this.deceleration(); } if (this.ballX < -borderTolerance) { this.ballX = this.gameWidth + borderTolerance; this.deceleration(); } @@ -334,6 +331,7 @@ var app = { startBall: function startBall() { "use strict"; + $('.ui-content').removeClass('background1 background2 background3').addClass('background1'); $(':jqmData(role="controlbar")').find('.ui-btn').removeClass('ui-btn-hover-s ui-btn-down-s'); this.gameHeight = $('.background').outerHeight(); @@ -440,7 +438,6 @@ $(document).ready(function () { "use strict"; var img; app.gameWidth = window.innerWidth; - //gameHeight = window.innerHeight - 142; app.ballWidth = parseInt($('.ball').css('width'), 10); app.ballHeight = parseInt($('.ball').css('height'), 10); @@ -465,7 +462,6 @@ $(document).ready(function () { }); $('#mainPage').live('pageshow', function () { - console.log('pageshow'); setTimeout(app.startBall.bind(app), 100); }); -- 2.7.4