[TizenWinset]update TizenWinset

Change-Id: I65ba79a00c808f69703a92418b3672b6ef13fc05

diff --git a/config.xml b/config.xml
index 8aff4d1..48288b8 100644 (file)
--- a/config.xml
+++ b/config.xml
@@ -2,7 +2,6 @@
 <widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" id="http://www.samsung.com/app/Winset" version="0.1.0" viewmodes="maximized">
     <access origin="*" />
     <tizen:application id="samplewins.TizenWinset" package="samplewins" required_version="2.1"/>
-    <tizen:privilege name="http://tizen.org/privilege/application.read" />
     <icon src="icon.png"/>
     <name>TizenWinset</name>
     <tizen:setting screen-orientation="portrait" context-menu="enable" background-support="enable" encryption="disable" nodisplay="false"/>

diff --git a/widgets/grid/namecard.css b/widgets/grid/namecard.css
index e8f7be7..d417eca 100644 (file)
--- a/widgets/grid/namecard.css
+++ b/widgets/grid/namecard.css
@@ -57,6 +57,7 @@
 .ui-demo-namecard-span-x {
        color : gray;
        font-size : 0.6rem;
+       text-align: center;
        width: 5rem;
        display: block;
        white-space : nowrap;
@@ -69,6 +70,7 @@
 .ui-demo-namecard-contents span.name {
        color : gray;
        font-size : 0.6rem;
+       text-align: center;
        width: 4rem;
        display: inline-block;
        white-space : nowrap;

diff --git a/widgets/popupwindow/popupwindow.js b/widgets/popupwindow/popupwindow.js
index f62f272..f505747 100644 (file)
--- a/widgets/popupwindow/popupwindow.js
+++ b/widgets/popupwindow/popupwindow.js
@@ -15,14 +15,17 @@ $( document ).one( "pageinit", "#popupwindow-demo", function () {
 
 function onSuccessPopupCallback ( ori ) {
         if ( ori.status === "PORTRAIT_PRIMARY" || ori.status === "PORTRAIT_SECONDARY" ) {
-               $("#textbox_popup_landscape").popup("close");
-               $("#go_textbox_popup a").attr("href", "#textbox_popup");
+                if( $( "#textbox_popup_landscape" ).parents( ".ui-popup-container" ).is( ".ui-popup-active" ) ) {
+                        $( "#textbox_popup_landscape" ).popup( "close" );
+                }
+               $( "#go_textbox_popup a" ).attr( "href", "#textbox_popup" );
         }
         else if ( ori.status === "LANDSCAPE_PRIMARY" || ori.status === "LANDSCAPE_SECONDARY" ) {
-               $("#textbox_popup").popup("close");
-               $("#go_textbox_popup a").attr("href", "#textbox_popup_landscape");
+                if( $( "#textbox_popup" ).parents( ".ui-popup-container" ).is( ".ui-popup-active" ) ) {
+                        $( "#textbox_popup" ).popup( "close" );
+                }
+                $( "#go_textbox_popup a" ).attr( "href", "#textbox_popup_landscape" );
         }
-
 }
 
 function onErrorPopupCallback ( error ) {

diff --git a/widgets/radio/radio.html b/widgets/radio/radio.html
index 21042ff..64754af 100644 (file)
--- a/widgets/radio/radio.html
+++ b/widgets/radio/radio.html
@@ -47,10 +47,11 @@
                                        </p>
 
                                        <input type="radio" name="radio-1" id="radio-1" checked="checked" disabled="disabled" />
-                                       <label for="radio-2">Checked, Disabled</label>
+                                       <label for="radio-1">Checked, Disabled</label>
                                        <input type="radio" name="radio-2" id="radio-2" disabled="disabled"/>
-                                       <label for="radio-3">Disabled</label>
+                                       <label for="radio-2">Disabled</label>
                                        <input type="radio" name="radio-3" id="radio-3"/>
+                                       <label for="radio-3">Unchecked</label>
 
                                </div><!--/content-primary -->
                        </div>

diff --git a/widgets/splitview.html b/widgets/splitview.html
index b1e763c..a1bbdef 100644 (file)
--- a/widgets/splitview.html
+++ b/widgets/splitview.html
@@ -8,11 +8,11 @@
                        <div class="ui-pane" id="menu" data-scroll="y">
                                <ul data-role="listview">
                                        <li><a id="testSetRatio"><h2>Ratio setting</h2></a></li>
-                                       <li><a id="testGetRatio"><h2>Current ratio</h2></a></li>
-                                       <li><a id="testSetConents"><h2>Set contents of "Up"</h2></a></li>
-                                       <li><a id="testGetConents"><h2>Get contents</h2></a></li>
+                                       <li><a id="testGetRatio" href="#splitview_popup" data-rel="popup" data-position-to="window"><h2>Current ratio</h2></a></li>
+                                       <li><a id="testSetContents"><h2>Set contents of "Up"</h2></a></li>
+                                       <li><a id="testGetContents" href="#splitview_popup" data-rel="popup" data-position-to="window"><h2>Get contents</h2></a></li>
                                        <li><a id="testFixed"><h2>Fixed / Flexible</h2></a></li>
-                                       <li><a id="testDirection"><h2>divider: Vertical / Horizontal</h2></a></li>
+                                       <li><a id="testDirection"><h2>Divider: Vertical / Horizontal</h2></a></li>
                                        <li><a id="testMaximize"><h2>Maximize "Up" / Restore</h2></a></li>
                                </ul>
                        </div>
@@ -26,6 +26,11 @@
                                        </div>
                                </div>
                        </div>
+
+                       <div id="splitview_popup" data-role="popup" class="splitview-popup">
+                               <div class="ui-popup-text">
+                               </div>
+                       </div>
                </div>
        </div>
        <div data-role="footer">
@@ -46,15 +51,15 @@
 
                $( "#testGetRatio" ).bind( "vclick", function () {
                        var ratio = testSplitview.splitview( "option", "ratio" );
-                       window.alert( "Up : Down = \n" + ratio[ 0 ].toFixed( 2 ) + " : " + ratio[ 1 ].toFixed( 2 ) );
+                       $( ".splitview-popup" ).text( "Up : Down = \n" + ratio[ 0 ].toFixed( 2 ) + " : " + ratio[ 1 ].toFixed( 2 ) );
                });
 
-               $( "#testSetConents" ).bind( "vclick", function () {
+               $( "#testSetContents" ).bind( "vclick", function () {
                        var element = $( "<div><h4>Changed \"Up\" pane</h4> Contents changed!!</div>" );
                        testSplitview.splitview( "pane", "#up", element );
                });
 
-               $( "#testGetConents" ).bind( "vclick", function () {
+               $( "#testGetContents" ).bind( "vclick", function () {
                        var contents = "",
                                upContents = testSplitview.splitview( "pane", "#up" ),
                                downContents = testSplitview.splitview( "pane", "#down" );
@@ -65,7 +70,7 @@
                                                ( ( typeof downContents === "undefined" || !downContents ) ? "" : downContents[ 0 ].outerHTML );
 
                        contents = contents.substring(0, 120) + "..." ;
-                       window.alert( contents );
+                       $( ".splitview-popup" ).text( contents );
 
                });
 

diff --git a/widgets/tabbar/tabbar.css b/widgets/tabbar/tabbar.css
index 10b092b..012a9d6 100644 (file)
--- a/widgets/tabbar/tabbar.css
+++ b/widgets/tabbar/tabbar.css
@@ -1,9 +1,7 @@
-.ui-btn-up-s .ui-icon-tabedit {
+.ui-icon-tabedit {
        background-image: url(00_tab_edit.png);
 }
 
-.ui-btn-hover-s .ui-icon-tabedit,
-.ui-btn-active.ui-btn-up-s .ui-icon-tabedit,
-.ui-btn-down-s .ui-icon-tabedit {
+.ui-btn-active .ui-icon-tabedit {
        background-image: url(00_tab_edit_press.png);
 }

diff --git a/widgets/tokentextarea/tokentextarea-demo.js b/widgets/tokentextarea/tokentextarea-demo.js
index 4f5e994..52720f1 100644 (file)
--- a/widgets/tokentextarea/tokentextarea-demo.js
+++ b/widgets/tokentextarea/tokentextarea-demo.js
@@ -14,7 +14,7 @@
 
                $( "#MBTgetInputTextTest" ).on( "click", function () {
                        var input = $( ":jqmData(role='tokentextarea')" ).tokentextarea( "inputText" );
-                       window.alert( "input String : " + input );
+                       $( ".tta-popup .ui-popup-text" ).text( "Input string : " + input );
                });
 
                $( "#MBTremoveAllItemTest" ).on( "click", function () {
@@ -24,7 +24,7 @@
 
                $( "#MBTgetSelectedItemTest" ).on( "click", function () {
                        var content = $( ":jqmData(role='tokentextarea')" ).tokentextarea( "select" );
-                       window.alert( "Select content : " + content );
+                       $( ".tta-popup .ui-popup-text" ).text( "Select content : " + content );
                });
 
                $( "#MBTselectItemTest" ).on( "click", function () {
@@ -33,7 +33,7 @@
 
                $( "#MBTlengthTest" ).on( "click", function () {
                        var length = $( ":jqmData(role='tokentextarea')" ).tokentextarea( "length" );
-                       window.alert( "length : " + length );
+                       $( ".tta-popup .ui-popup-text" ).text( "Length : " + length );
                });
 
                $( "#MBTfocusInTest" ).on( "click", function () {

diff --git a/widgets/tokentextarea/tokentextarea.html b/widgets/tokentextarea/tokentextarea.html
index 39cc1b9..492c1d8 100644 (file)
--- a/widgets/tokentextarea/tokentextarea.html
+++ b/widgets/tokentextarea/tokentextarea.html
@@ -29,14 +29,22 @@
                                        <li><a id='MBTaddItemTest'>Append Item</a></li>
                                        <li><a id='MBTremoveItemTest'>Remove first Item</a></li>
                                        <li><a id='MBTinputTextTest'>Input 'Hello'</a></li>
-                                       <li><a id='MBTgetInputTextTest'>Get input text</a></li>
+                                       <li><a id='MBTgetInputTextTest' href='#tta_popup' data-rel='popup' data-position-to='window'>Get input text</a></li>
                                        <li><a id='MBTselectItemTest'>Select 1</a></li>
-                                       <li><a id='MBTgetSelectedItemTest'>Selected item</a></li>
-                                       <li><a id='MBTlengthTest'>Length</a></li>
+                                       <li><a id='MBTgetSelectedItemTest' href='#tta_popup' data-rel='popup' data-position-to='window'>Selected item</a></li>
+                                       <li><a id='MBTlengthTest' href='#tta_popup' data-rel='popup' data-position-to='window'>Length</a></li>
                                        <li><a id='MBTfocusOutTest'>Grouping On</a></li>
                                        <li><a id='MBTfocusInTest'>Grouping Off</a></li>
                                        <li><a id='MBTremoveAllItemTest'>Remove All Item</a></li>
                                </ul>
+
+                               <div id="tta_popup" data-role="popup" class="tta-popup">
+                                       <div class="ui-popup-text">
+                                       </div>
+                                       <div class="ui-popup-button-bg">
+                                               <a data-role="button" data-rel="back" data-inline="true">OK</a>
+                                       </div>
+                               </div>
                        </div>
                        <div data-role="footer">
                        </div>