projects / platform / framework / web / web-ui-fw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5457737)
Tokentextarea: Fix issues
authorMinkyeong Kim <minkyeong.kim@samsung.com>
Tue, 15 Jan 2013 07:24:24 +0000 (16:24 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Tue, 15 Jan 2013 07:24:24 +0000 (16:24 +0900)
Remove 'data-add-back-btn' in #addressbook.
Add scroll-to-top at 'Remove all.'

demos/tizen-winsets/index.html patch | blob | history
demos/tizen-winsets/index.html.orig patch | blob | history
demos/tizen-winsets/widgets/tokentextarea-demo.js patch | blob | history
src/themes/tizen/common/jquery.mobile.tizen.tokentextarea.less patch | blob | history
src/widgets/tokentextarea/js/jquery.mobile.tizen.tokentextarea.js patch | blob | history

diff --git a/demos/tizen-winsets/index.html b/demos/tizen-winsets/index.html
index e1e100b..f668a1d 100755 (executable)
--- a/demos/tizen-winsets/index.html
+++ b/demos/tizen-winsets/index.html
@@ -236,8 +236,8 @@
                <div data-role="footer">
                </div>
        </div>
-       <div data-role="page" id="addressbook" data-add-back-btn="false">
-               <div data-role="header"  data-position="fixed">
+       <div data-role="page" id="addressbook">
+               <div data-role="header" data-position="fixed">
                        <h1>Address Book</h1>
                </div>
                <div data-role="content" id="contentList">
diff --git a/demos/tizen-winsets/index.html.orig b/demos/tizen-winsets/index.html.orig
index bc8f22c..e1e100b 100755 (executable)
--- a/demos/tizen-winsets/index.html.orig
+++ b/demos/tizen-winsets/index.html.orig
@@ -7,7 +7,8 @@
        <script src="tizen-web-ui-fw/latest/js/tizen-web-ui-fw-libs.js"></script>
        <script src="tizen-web-ui-fw/latest/js/tizen-web-ui-fw.js"
                data-framework-theme="tizen-white"
-               data-framework-viewport-scale=false>
+               data-framework-viewport-width="device-width">
+
        </script>
        <script src="main.js"></script>
        <link rel="stylesheet" href="custom.css" />
@@ -22,7 +23,7 @@
 </head>
 
 <body>
-       <div data-role="page">
+       <div data-role="page" data-add-back-btn="true">
                <div data-role="header" data-position="fixed">
                        <h1>Tizen Web UI</h1>
                </div>
@@ -56,10 +57,8 @@
                                <li><a href="widgets/datefield.html">Time picker</a></li>
                                <li><a href="widgets/progressbar.html">Progressbar</a></li>
                                <li><a href="#slider-demo">Slider</a></li>
-                               <li><a href="widgets/gallery.html">Gallery</a></li>
                                <li><a href="widgets/segmentctrl.html">Segment Control</a></li>
                                <li><a href="widgets/buttonGrouping.html">Group Control(new segment)</a></li>
-                               <li><a href="widgets/selectioninfo.html">SelectionInfo</a></li>
                                <li><a href="#tokentextarea">Token Text Area</a></li>
 
                                <li data-role="list-divider">PageLayout</li>
@@ -93,12 +92,16 @@
                                <li><a href="widgets/small-popup.html">Small Popup</a></li>
                                <li><a href="widgets/small-popup-interval.html">Small Popup Interval</a></li>
 
+                               <li data-role="list-divider">Gallery</li>
+                               <li><a href="widgets/gallery.html">Gallery</a></li>
+
                                <li data-role="list-divider">Grid view</li>
                                <li><a href="widgets/grid/virtualgrid.html">Virtual Grid</a></li>
                                <li><a href="widgets/grid/virtualgrid-rotation.html">Virtual Grid - Rotation</a></li>
                                <li><a href="widgets/grid/virtualgrid-list.html">Virtual Grid - List</a></li>
                                <li><a href="widgets/grid/virtualgrid-x.html">Virtual Grid - X</a></li>
                                <li><a href="widgets/grid/virtualgrid-size.html">Virtual Grid - Size</a></li>
+
                                <li data-role="list-divider">Multimedia view</li>
                                <li><a href="widgets/multimediaview/multimediaview.html">Multimedia view</a></li>
 
@@ -117,7 +120,7 @@
                </div>
        </div>
 
-<div data-role="page" id="tabbar_persist_a">
+<div data-role="page" id="tabbar_persist_a" data-add-back-btn="true">
        <div data-role="header" data-position="fixed">
                <div data-role="tabbar" data-id="persist_header" >
                        <ul>
@@ -131,9 +134,12 @@
        <div data-role="content">
                <p>page a</p>
        </div>
+
+       <div data-role="footer">
+       </div>
 </div>
 
-<div data-role="page" id="tabbar_persist_b">
+<div data-role="page" id="tabbar_persist_b" data-add-back-btn="true">
        <div data-role="header" data-position="fixed">
                <div data-role="tabbar" data-id="persist_header" >
                        <ul>
@@ -147,9 +153,12 @@
        <div data-role="content">
                <p>page b</p>
        </div>
+
+       <div data-role="footer">
+       </div>
 </div>
 
-<div data-role="page" id="tabbar_persist_c">
+<div data-role="page" id="tabbar_persist_c" data-add-back-btn="true">
        <div data-role="header" data-position="fixed">
                <div data-role="tabbar" data-id="persist_header" >
                        <ul>
@@ -163,16 +172,21 @@
        <div data-role="content">
                <p>page c</p>
        </div>
+
+       <div data-role="footer">
+       </div>
 </div>
 
 
-       <div data-role="page" id="notImplemented">
+       <div data-role="page" id="notImplemented" data-add-back-btn="true">
                <div data-role="header" data-position="fixed">
                        <h1>Not Implemented</h1>
                </div>
                <div data-role="content">
                        <p> Not Implemented </p>
                </div>
+               <div data-role="footer">
+               </div>
        </div>
 
        <div data-role="page" id="slider-demo" data-add-back-btn="true">
@@ -191,11 +205,15 @@
                                <li data-role="list-divider">Text Slider</li>
                                <li><input id="mySlider5" name="mySlider5" data-popup='false' type="range" name="slider" value="50" min="0" max="99" data-icon='text' data-text-left='0' data-text-right='99'/></li>
                                <li><input id="mySlider5" name="mySlider5" data-popup='false' type="range" name="slider" value="5" min="0" max="10" data-icon='text' data-text-left='Min' data-text-right='Max'/></li>
+                               <li data-role="list-divider">data-highlight="false"</li>
+                               <li><input id="mySlider" name="mySlider" data-popup='false' type="range" name="slider" value="5" min="0" max="10" data-highlight="false" /></li>
                        </ul>
                </div><!-- /content -->
+               <div data-role="footer">
+               </div>
        </div> <!-- /page -->
 
-       <div data-role="page" id="tokentextarea">
+       <div data-role="page" id="tokentextarea" data-add-back-btn="true">
                <div data-role="header" data-position="fixed">
                        <h1>Token Text Area</h1>
                </div>
@@ -215,8 +233,10 @@
                                <li><a id='MBTremoveAllItemTest'>Remove All Item</a></li>
                        </ul>
                </div>
+               <div data-role="footer">
+               </div>
        </div>
-       <div data-role="page" id="addressbook" data-add-back-btn="none">
+       <div data-role="page" id="addressbook" data-add-back-btn="false">
                <div data-role="header"  data-position="fixed">
                        <h1>Address Book</h1>
                </div>
@@ -281,5 +301,6 @@
        <script src="widgets/list/list-edit.js"></script>
 
        <link rel="stylesheet" href="./widgets/tabbar/tabbar.css" />
+       <link rel="stylesheet" href="./widgets/switch/toggleswitch.css" />
 </body>
 </html>
diff --git a/demos/tizen-winsets/widgets/tokentextarea-demo.js b/demos/tizen-winsets/widgets/tokentextarea-demo.js
index 2f580e0..191351c 100755 (executable)
--- a/demos/tizen-winsets/widgets/tokentextarea-demo.js
+++ b/demos/tizen-winsets/widgets/tokentextarea-demo.js
@@ -19,6 +19,7 @@
 \r
                $( "#MBTremoveAllItemTest" ).click( function () {\r
                        $( ":jqmData(role='tokentextarea')" ).tokentextarea( "remove" );\r
+                       $( ":jqmData(role='tokentextarea')" ).parents( ".ui-scrollview-view" ).parent().scrollview( "scrollTo", 0, 0 );\r
                });\r
 \r
                $( "#MBTgetSelectedItemTest" ).click( function () {\r
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.tokentextarea.less b/src/themes/tizen/common/jquery.mobile.tizen.tokentextarea.less
index c2f7238..2674f50 100755 (executable)
--- a/src/themes/tizen/common/jquery.mobile.tizen.tokentextarea.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.tokentextarea.less
@@ -19,7 +19,7 @@
 }\r
 \r
 .ui-tokentextarea-input {\r
-       display : inline-block;\r
+       display : inline-block !important;\r
        outline : none;\r
        position : relative;\r
        border : 0 !important;\r
@@ -56,14 +56,17 @@
 \r
 div.ui-tokentextarea-block {\r
        background-color : @color_tokentextarea_block_bg;\r
-       background-image: url(./images/00_contacts_button_header.png);\r
-       background-size: contain;\r
-       background-repeat: no-repeat;\r
+       background-image : url(./images/00_contacts_button_header.png);\r
+       background-size : contain;\r
+       background-repeat : no-repeat;\r
        padding-left : .7em;\r
 }\r
 \r
 div.ui-tokentextarea-sblock {\r
-       background : @color_tokentextarea_press_bg;\r
+       background-color : @color_tokentextarea_press_bg;\r
+       background-image : url(./images/00_contacts_button_header_press.png);\r
+       background-size : contain;\r
+       background-repeat : no-repeat;\r
        padding-left : .7em;\r
 }\r
 \r
diff --git a/src/widgets/tokentextarea/js/jquery.mobile.tizen.tokentextarea.js b/src/widgets/tokentextarea/js/jquery.mobile.tizen.tokentextarea.js
index a649852..b6884d8 100755 (executable)
--- a/src/widgets/tokentextarea/js/jquery.mobile.tizen.tokentextarea.js
+++ b/src/widgets/tokentextarea/js/jquery.mobile.tizen.tokentextarea.js
@@ -481,7 +481,7 @@
                _unlockTextBlock : function () {
                        var $view = this.element,
                                lockBlock = $view.find( "div.ui-tokentextarea-sblock" );
-                       if ( !lockBlock ) {
+                       if ( lockBlock ) {
                                lockBlock.removeClass( "ui-tokentextarea-sblock" ).addClass( "ui-tokentextarea-block" );
                        }
                },
Domain: Web Framework / Uncategorized;