From: ji.ji <ji.ji@samsung.com>
Date: Tue, 30 Apr 2013 01:19:59 +0000 (+0900)
Subject: [BluetoothChat]update BluetoothChat(tizen_2.1)
X-Git-Tag: 2.2_release~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c272d81006133584545ed5bdb278132277c3c431;p=samples%2Fweb%2FBluetoothChat.git

[BluetoothChat]update BluetoothChat(tizen_2.1)

Change-Id: Iddaa1db62f66edb6d3f8d1a43d27de2b4a6ad1a0
---

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/app.js b/js/app.js
index e2ee7c2..114c13d 100644
--- a/js/app.js
+++ b/js/app.js
@@ -77,9 +77,6 @@ var App = null;
 		 * Initialisation function
 		 */
 		init: function App_init() {
-			var contentHeight = screen.availHeight - $('div[data-role="header"]').outerHeight() - $('div[data-role="footer"]').outerHeight();
-			$('div[data-role="content"]').css('height',contentHeight);
-
 			this.config = new Config();
 			this.helpers = new Helpers();
 			this.model = new Model();
diff --git a/js/app.ui.js b/js/app.ui.js
index 6fe669f..3addf9c 100644
--- a/js/app.ui.js
+++ b/js/app.ui.js
@@ -59,7 +59,7 @@ function Ui(callback) {
 			body.append(pages.join(''));
 
 			this.uiEvents.init();
-
+			this.fixContentHeight();
 			callback();
 		},
 
@@ -214,11 +214,16 @@ function Ui(callback) {
 			ul = content.find('ul');
 			ul.append(listElement);
 			ul.listview('refresh');
-			setTimeout(function () { self.moveMessagesListDown(content, ul.height()) }, 200);
+			setTimeout(function () { self.moveMessagesListDown(content, ul.height()); }, 200);
 		},
 
 		setDiscoveringProgress: function Ui_setDiscoveringProgress(boolean) {
 			$('#discovering').progress('hide', !boolean).progress('running', boolean);
+		},
+
+		fixContentHeight: function Ui_fixContentHeight() {
+			var contentHeight = screen.availHeight - $('div[data-role="header"]').outerHeight() - $('div[data-role="footer"]').outerHeight();
+			$('div[data-role="content"]').css('height', contentHeight);
 		}
 
 	};
diff --git a/js/main.js b/js/main.js
index 48be204..0bc2390 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
  *