projects / samples / web / Piano.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 30b1b61)
[Piano]update Piano(tizen_2.1)
authorgs86.lee <gs86.lee@samsung.com>
Fri, 12 Apr 2013 06:30:06 +0000 (15:30 +0900)
committergs86.lee <gs86.lee@samsung.com>
Fri, 12 Apr 2013 06:30:06 +0000 (15:30 +0900)
Change-Id: I31978790b696fe9afda2e46c5dc791acb611d433

NOTICE [new file with mode: 0644] patch | blob
config.xml patch | blob | history
css/style.css patch | blob | history
index.html patch | blob | history
js/main.js patch | blob | history

diff --git a/NOTICE b/NOTICE
new file mode 100644 (file)
index 0000000..85044e4
--- /dev/null
+++ b/NOTICE
@@ -0,0 +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.
+
diff --git a/config.xml b/config.xml
index fb5eed8..d3e1db8 100755 (executable)
--- a/config.xml
+++ b/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns:tizen="http://tizen.org/ns/widgets" xmlns="http://www.w3.org/ns/widgets" id="http://sample-web-application.tizen.org/piano" version="2.0.0" viewmodes="fullscreen">
-       <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/piano" version="2.1.0" viewmodes="fullscreen">
+       <tizen:application id="YBsua5GDkL.Piano" package="YBsua5GDkL" required_version="2.1"/>
        <content src="index.html"/>
-       <tizen:privilege name="http://tizen.org/privilege/application.read"/>
-       <tizen:privilege name="http://tizen.org/privilege/tizen"/>
+       <icon src="icon.png"/>
        <name>Piano</name>
-       <tizen:setting screen-orientation="landscape"/>
-       <tizen:application id="19teowyrew" required_version="1.0"/>
+       <tizen:privilege name="http://tizen.org/privilege/application.read"/>
+       <tizen:setting screen-orientation="landscape" context-menu="disable" background-support="enable" encryption="disable" install-location="auto"/>
 </widget>
diff --git a/css/style.css b/css/style.css
index 7691169..ff512bb 100755 (executable)
--- a/css/style.css
+++ b/css/style.css
@@ -4,13 +4,23 @@ body {
        overflow: hidden;
 }
 
+.ui-page {
+       height: 100%;
+}
+
 .white_btn {
-       float: left;
-       background-image: url('../white.png');
-       width: 100px;
-       height: 480px;
+       background: url('../white.png') bottom center no-repeat transparent;
+       height: 100%;
+       display: inline-block;
        background-size: 100%;
-       background-position: top center;
+       width: 12.5%;
+       height: 100%;
+       position: relative;
+       float: left;
+       margin: 0;
+       padding: 0;
+       display: block;
+       margin: 0;
 }
 
 .white_btn.pressed {
@@ -19,15 +29,16 @@ body {
 
 .black_btn {
        float: left;
-       background-image: url('../black.png');
-       width: 50px;
-       height: 265px;
+       background: url('../black.png')  bottom center no-repeat transparent;
+       width: 7.6%;
+       height: 73.8%;
        background-size: 100%;
        background-position: top center;
        position: absolute;
        top: 0px;
 }
 
+
 .black_btn.pressed {
        background-image: url('../black_pressed.png');
 }
diff --git a/index.html b/index.html
index 03d410f..2d728be 100755 (executable)
--- a/index.html
+++ b/index.html
@@ -1,11 +1,10 @@
 <html>
 <head>
-       <meta name="viewport" content="width=800;height=480;user-scalable=no">
-       <link rel="stylesheet" href="./css/jquery.mobile-1.0.min.css" />
+       <meta name="viewport" content="width=800, user-scalable=no">
        <link rel="stylesheet" href="./css/style.css" />
-       <script type="text/javascript" src="./js/jquery-1.6.4.min.js"></script>
-       <script type="text/javascript" src="./js/jquery.mobile-1.0.min.js"></script>
-       <script type="text/javascript" src="./js/main.js"></script>
+       <script type="text/javascript" src="./js/jquery-1.6.4.min.js" defer="defer"></script>
+       <script type="text/javascript" src="./js/jquery.mobile-1.0.min.js" defer="defer"></script>
+       <script type="text/javascript" src="./js/main.js" defer="defer"></script>
 </head>
 
 <body ondragstart="return false" onselectstart="return false">
@@ -18,12 +17,12 @@
        <div class="white_btn" id="play11"></div>
        <div class="white_btn" id="play12"></div>
 
-       <div class="black_btn" style="left: 70px" id="play1"></div>
-       <div class="black_btn" style="left: 170px" id="play3"></div>
-       <div class="black_btn" style="left: 370px" id="play6"></div>
-       <div class="black_btn" style="left: 470px" id="play8"></div>
-       <div class="black_btn" style="left: 570px" id="play10"></div>
-       <div class="black_btn" style="left: 770px" id="play13"></div>
+       <div class="black_btn" style="left: 8.6%" id="play1"></div>
+       <div class="black_btn" style="left: 21.2%" id="play3"></div>
+       <div class="black_btn" style="left: 45.8%" id="play6"></div>
+       <div class="black_btn" style="left: 58.4%" id="play8"></div>
+       <div class="black_btn" style="left: 70.9%" id="play10"></div>
+       <div class="black_btn" style="left: 95%" id="play13"></div>
 
        <div class="header">
                <div id="back"></div>
diff --git a/js/main.js b/js/main.js
index 6f4da4f..18bc14a 100755 (executable)
--- a/js/main.js
+++ b/js/main.js
@@ -14,7 +14,7 @@
  *      limitations under the License.
  */
 
-/*jslint devel: true */
+/*jslint devel: true*/
 /*global tizen, $, app: true */
 
 var App = null, app = null;
@@ -46,7 +46,6 @@ var App = null, app = null;
                 * Initialization
                 */
                init: function App_init() {
-                       console.log('init');
                        this.bindEvents();
                        this.audioInit();
                },
@@ -55,7 +54,6 @@ var App = null, app = null;
                 * binds application events
                 */
                bindEvents: function bindEvents() {
-                       console.log('bindEvents');
                        $(document).bind('touchstart touchmove', this.onPianoKeyTouchDown.bind(this));
                        $(document).bind('touchend', this.onPianoKeyTouchUp.bind(this));
 
@@ -97,11 +95,10 @@ var App = null, app = null;
                },
 
                audioInit: function audioInit() {
-                       console.log('audioInit');
                        var i;
                        for (i = 0; i <= 13; i += 1) {
                                this.audio[i] = document.createElement('audio');
-                               this.audio[i].src = i + '.wav';
+                               this.audio[i].name = i;
                        }
                },
 
@@ -115,8 +112,12 @@ var App = null, app = null;
                        $(element).addClass('pressed');
                        this.touchPianoKey[touchId] = element.id;
                        if (this.audio[nrAudio]) {
-                               this.audio[nrAudio].pause();
-                               this.audio[nrAudio].currentTime = 0;
+                               if (this.audio[nrAudio].src) {
+                                       this.audio[nrAudio].pause();
+                                       this.audio[nrAudio].currentTime = 0;
+                               } else {
+                                       this.audio[nrAudio].src = this.audio[nrAudio].name + ".wav";
+                               }
                                this.audio[nrAudio].play();
                        }
                }
Domain: Applications / Web Sample;