From: gs86.lee <gs86.lee@samsung.com>
Date: Tue, 23 Apr 2013 08:47:50 +0000 (+0900)
Subject: [FileManager]update FileManager(tizen_2.1)
X-Git-Tag: 2.1b_release^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=17d5711e35b572dad88ea54bb4031e9ca647e334;p=samples%2Fweb%2FFileManager.git

[FileManager]update FileManager(tizen_2.1)

Change-Id: I5546eb273b4efb4d444af80de72e150ea2383500
---

diff --git a/LICENSE.Flora b/LICENSE.Flora
index 9c95663..fd90a36 100644
--- a/LICENSE.Flora
+++ b/LICENSE.Flora
@@ -1,6 +1,6 @@
 Flora License
 
-Version 1.0, May, 2012
+Version 1.0, April, 2013
 
 http://floralicense.org/license/
 
@@ -67,8 +67,8 @@ on behalf of whom a Contribution has been received by Licensor and
 subsequently incorporated within the Work.
 
 "Tizen Certified Platform" shall mean a software platform that complies
-with the standards set forth in the Compatibility Definition Document
-and passes the Compatibility Test Suite as defined from time to time
+with the standards set forth in the Tizen Compliance Specification
+and passes the Tizen Compliance Tests as defined from time to time
 by the Tizen Technical Steering Group and certified by the Tizen
 Association or its designated agent.
 
diff --git a/NOTICE.Flora b/NOTICE.Flora
deleted file mode 100644
index fdb699a..0000000
--- a/NOTICE.Flora
+++ /dev/null
@@ -1,4 +0,0 @@
-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.
-
diff --git a/config.xml b/config.xml
index f18a5d3..f8b4411 100644
--- a/config.xml
+++ b/config.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" id="http://sample-web-application.tizen.org/file-manager" version="2.1.0" viewmodes="maximized">
-	<tizen:application id="km8AETYhee.FileManager" package="km8AETYhee" required_version="2.1"/>
-	<icon src="icon.png"/>
+<widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets"
+	id="http://sample-web-application.tizen.org/file-manager" version="2.1.0"
+	viewmodes="maximized">
+	<tizen:application id="km8AETYhee.FileManager"
+		package="km8AETYhee" required_version="2.1" />
+	<icon src="icon.png" />
 	<name>FileManager</name>
-	<tizen:privilege name="http://tizen.org/privilege/content.read"/>
-	<tizen:privilege name="http://tizen.org/privilege/content.write"/>
-	<tizen:privilege name="http://tizen.org/privilege/systeminfo"/>
-	<tizen:privilege name="http://tizen.org/privilege/application.launch"/>
-	<tizen:privilege name="http://tizen.org/privilege/application.read"/>
-	<tizen:privilege name="http://tizen.org/privilege/filesystem.read"/>
-	<tizen:privilege name="http://tizen.org/privilege/filesystem.write"/>
-	<tizen:setting screen-orientation="portrait" context-menu="disable" background-support="enable" encryption="disable" install-location="auto"/>
+	<tizen:privilege name="http://tizen.org/privilege/content.read" />
+	<tizen:privilege name="http://tizen.org/privilege/content.write" />
+	<tizen:privilege name="http://tizen.org/privilege/systeminfo" />
+	<tizen:privilege name="http://tizen.org/privilege/application.launch" />
+	<tizen:privilege name="http://tizen.org/privilege/application.read" />
+	<tizen:privilege name="http://tizen.org/privilege/filesystem.read" />
+	<tizen:privilege name="http://tizen.org/privilege/filesystem.write" />
+	<tizen:setting screen-orientation="portrait"
+		context-menu="disable" background-support="enable" encryption="disable"
+		install-location="auto" />
 </widget>
diff --git a/icon.png b/icon.png
old mode 100755
new mode 100644
index 983c883..33fbb63
Binary files a/icon.png and b/icon.png differ
diff --git a/js/app.helpers.js b/js/app.helpers.js
index 5cc3311..f8208d4 100644
--- a/js/app.helpers.js
+++ b/js/app.helpers.js
@@ -107,7 +107,7 @@ function Helpers() {
 			} else if (ext === '.mp3') {
 				mime = 'audio/mp3';
 			} else if (ext === '.txt' || ext === '.doc' || ext === '.html' || ext === '.ppt' || ext === '.xls' || ext === '.pdf') {
-				mime = 'text/*';
+				//mime = 'text/*';
 			}
 
 			return mime;
diff --git a/js/app.model.js b/js/app.model.js
index 7983b0f..31f267c 100644
--- a/js/app.model.js
+++ b/js/app.model.js
@@ -114,7 +114,7 @@ function Model() {
 						},
 						function (e) {
 							self.openFileUnLocked = true;
-							alert('launch sevice failed. reason :' + e.message);
+							console.error('launch sevice failed. reason :' + e.message);
 						},
 						serviceReplyCB
 						);