From d2d7e5860fb30ea989599e6c8714246de4190dd0 Mon Sep 17 00:00:00 2001 From: "ji.ji" Date: Tue, 30 Apr 2013 10:20:48 +0900 Subject: [PATCH] [SelfCamera]update SelfCamera(tizen_2.1) Change-Id: Ie8722293e3f228fae5f02a4bcfb3c53a8ec50f27 --- LICENSE.Flora | 26 +++++++++++++------------- NOTICE | 6 +++--- js/WACversion.js | 2 +- js/debug.js | 2 +- js/fileSave.js | 2 +- js/main.js | 11 +++++++---- 6 files changed, 26 insertions(+), 23 deletions(-) diff --git a/LICENSE.Flora b/LICENSE.Flora index fd90a36..4a0af40 100644 --- a/LICENSE.Flora +++ b/LICENSE.Flora @@ -1,6 +1,6 @@ Flora License -Version 1.0, April, 2013 +Version 1.1, April, 2013 http://floralicense.org/license/ @@ -119,17 +119,17 @@ Object form, provided that You meet the following conditions: Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only - and do not modify the License. - -You may add Your own attribution notices within Derivative Works -that You distribute, alongside or as an addendum to the NOTICE text -from the Work, provided that such additional attribution notices -cannot be construed as modifying the License. You may add Your own -copyright statement to Your modifications and may provide additional or -different license terms and conditions for use, reproduction, or -distribution of Your modifications, or for any such Derivative Works -as a whole, provided Your use, reproduction, and distribution of -the Work otherwise complies with the conditions stated in this License. + and do not modify the License. You may add Your own attribution notices + within Derivative Works that You distribute, alongside or as an addendum + to the NOTICE text from the Work, provided that such additional attribution + notices cannot be construed as modifying the License. You may add Your own + copyright statement to Your modifications and may provide additional or + different license terms and conditions for use, reproduction, or + distribution of Your modifications, or for any such Derivative Works + as a whole, provided Your use, reproduction, and distribution of + the Work otherwise complies with the conditions stated in this License + and your own copyright statement or terms and conditions do not conflict + the conditions stated in the License including section 3. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work @@ -192,7 +192,7 @@ identification within third-party archives. Copyright [yyyy] [name of copyright owner] - Licensed under the Flora License, Version 1.0 (the "License"); + Licensed under the Flora License, Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/NOTICE b/NOTICE index 85044e4..092bc04 100644 --- a/NOTICE +++ 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.Flora file for Flora License terms and conditions. +Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved. +Except as noted, this software is licensed under Flora License, Version 1.1 +Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions. diff --git a/js/WACversion.js b/js/WACversion.js index 5fd73ad..f7f7839 100644 --- a/js/WACversion.js +++ b/js/WACversion.js @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * - * Licensed under the Flora License, Version 1.0 (the "License"); + * Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/js/debug.js b/js/debug.js index 78abe97..e6f1933 100644 --- a/js/debug.js +++ b/js/debug.js @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * - * Licensed under the Flora License, Version 1.0 (the "License"); + * Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/js/fileSave.js b/js/fileSave.js index 0027d50..77ff2e1 100644 --- a/js/fileSave.js +++ b/js/fileSave.js @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * - * Licensed under the Flora License, Version 1.0 (the "License"); + * Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/js/main.js b/js/main.js index f97c40b..0f4ea91 100644 --- a/js/main.js +++ b/js/main.js @@ -1,7 +1,7 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 Samsung Electronics Co., Ltd * - * Licensed under the Flora License, Version 1.0 (the "License"); + * Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * @@ -287,12 +287,12 @@ function SelfCamera() { } }; - SelfCamera.prototype.startCountdown = function startCountdown() { + SelfCamera.prototype.startCountdown = function startCountdown(ev, startValue) { if (this.countdownIntervalID > 0) { clearInterval(this.countdownIntervalID); this.countdownIntervalID = -1; } - this.countdown = this.timer; + this.countdown = startValue || this.timer; this.countdownIntervalID = setInterval(this.onCountdownInterval.bind(this), 1000); $('#countdown').show().text(this.countdown); this.countSound.play(); @@ -307,6 +307,9 @@ function SelfCamera() { if (document.webkitVisibilityState === 'visible') { setTimeout(function () { $('#background').get(0).play(); }, 200); self.systemIO.fileExists(self.filename, self.onFileExistsCheck.bind(self)); + if (self.countdown > 0) { + self.startCountdown(event, self.countdown); + } } }); -- 2.7.4