From 7a8438aa177aa06569def371b889e5fea1163fea Mon Sep 17 00:00:00 2001 From: "ji.ji" Date: Wed, 26 Jun 2013 19:09:09 +0900 Subject: [PATCH] Updated Private -> RSA Change-Id: I68682711b405e41abf70289b413c68d02b9884b5 --- .project | 50 +++++++++++++++++++++++++++++++++++++++++++ config.xml | 17 ++++++++------- css/style.css | 2 +- index.html | 22 +++++++------------ js/main.js | 68 +++++++++++++++++++++++++++++++++++++++++++++++------------ 5 files changed, 123 insertions(+), 36 deletions(-) create mode 100644 .project diff --git a/.project b/.project new file mode 100644 index 0000000..210a14d --- /dev/null +++ b/.project @@ -0,0 +1,50 @@ + + + MediaContent + + + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + json.validation.builder + + + + + org.tizen.web.jslint.nature.JSLintBuilder + + + + + org.tizen.web.editor.css.nature.CSSBuilder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.tizen.web.project.builder.WebBuilder + + + usedLibraryType + WebUIFramework + + + + + + json.validation.nature + org.tizen.web.jslint.nature.JSLintNature + org.tizen.web.editor.css.nature.CSSNature + org.eclipse.wst.jsdt.core.jsNature + org.tizen.web.project.builder.WebNature + + diff --git a/config.xml b/config.xml index 427947f..a7c4e71 100755 --- a/config.xml +++ b/config.xml @@ -1,10 +1,11 @@ - - - - - - - - Mediacontent + + + + + MediaContent + + + + diff --git a/css/style.css b/css/style.css index d3f5a12..8b13789 100755 --- a/css/style.css +++ b/css/style.css @@ -1 +1 @@ - + diff --git a/index.html b/index.html index 434a246..043072d 100755 --- a/index.html +++ b/index.html @@ -5,18 +5,18 @@ Mediacontent - - - + + + -
+
-

MEDIA CONTENT

+

Media content

@@ -34,12 +34,9 @@
  • Folders
  • - -
    -
    -
    +

    @@ -66,14 +63,11 @@
  • Items
  • - -
    -
    -
    +
    -

    DETAILS

    +

    Details

    diff --git a/js/main.js b/js/main.js index af0db0a..7b50875 100755 --- a/js/main.js +++ b/js/main.js @@ -1,25 +1,27 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2012 Samsung Electronics Co., Ltd * - * 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 + * 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 * - * http://floralicense.org/license + * http://floralicense.org/license * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ var gMediaSource, gMediaFolders, gMediaItems, gItemId, gFolderId, gMediaType = "ALL"; -var flagInit; +var gStorageType, flagInit; $(document).delegate("#main", "pageinit", function() { flagInit = false; + gStorageType = gMediaType; + $("#main .ui-btn-back").bind("vclick", function() { tizen.application.getCurrentApplication().exit(); return false; @@ -45,8 +47,9 @@ $(document).delegate("#main", "pageinit", function() { $("#folder-type-internal").css('color','black'); $("#folder-type-external").css('color','red'); }); -}); + onContentChange(); +}); $(document).delegate("#items", "pageinit", function() { $("#items").bind("pagebeforeshow", showItemList); @@ -72,6 +75,20 @@ $(document).delegate("#detail", "pageinit", function() { $("#detail").bind("pagebeforeshow", showMediaDetail); }); +document.addEventListener('tizenhwkey', function(e) { + if (e.keyName == "back") { + if ($.mobile.activePage.attr('id') === 'main') { + tizen.application.getCurrentApplication().exit(); + } else { + history.back(); + } + } +}); + +function setLastStorage(storageType) { + gStorageType = storageType; +} + function makeListItem(id, mainText, subText) { return '
  • li[data-id]").remove(); -- 2.7.4