From: Youmin Ha Date: Mon, 27 Aug 2012 08:42:27 +0000 (+0900) Subject: Export 0.1.41 X-Git-Tag: 2.0_alpha~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be6beebae0ff9beefd2c43cfd5ee10419b4cda55;p=framework%2Fweb%2Fweb-ui-fw.git Export 0.1.41 --- diff --git a/demos/tizen-winsets/index.html b/demos/tizen-winsets/index.html index 9969ada..85506cf 100755 --- a/demos/tizen-winsets/index.html +++ b/demos/tizen-winsets/index.html @@ -69,6 +69,7 @@
  • PageControl
  • SelectionInfo
  • Handler
    • +
  • Scroll Jump
  • Multi-Button Entry
  • ControlBar
  • ControlBar
    • @@ -104,8 +105,6 @@
  • Virtual Grid - Auto
  • Multimedia view
  • Multimedia view
    • -
  • Map view
    • -
  • PageLayout
  • Header/Footer(fixed/non-fixed) Control
  • Back Button Control
    • @@ -117,6 +116,9 @@
  • Example for using listview
  • Example for using expandable list
  • Page transitions
    • + + + @@ -159,15 +161,15 @@
  • 1 line 2 buttons
  • 1 line 3 buttons
  • 1 line 4 buttons
    • -
  • 2 line 4 buttons
    • + +

    Option header

    TestBtn -

    Option header - 2 buttons

    TestBtn @@ -216,27 +218,6 @@
    -
    -
    -

    Option header - 4 buttons

    - -
    -
    -

    Some content would be here

    -
    -
    -

    ControlBar

    @@ -751,7 +732,7 @@

    Normal Title - 1Btn

    - default + text1
      @@ -771,8 +752,8 @@

      Normal Title - 2Btn

      - default1 - default2 + text1 + text2
        @@ -791,7 +772,7 @@
        -

        Normal Title+2Buttons Icon only - Not Implemented Yet

        +

        Normal Title+2Buttons Icon only

        @@ -813,10 +794,10 @@
        - default1

        Normal Title - 3Btn

        - default2 - default3 + text1 + text2 + text3
          @@ -837,7 +818,7 @@

          Icon Title

          - default + text1
            @@ -1039,7 +1020,7 @@

            Multi-button Entry

          -
          +

          • Append Item
            • diff --git a/demos/tizen-winsets/widgets/button/button.html b/demos/tizen-winsets/widgets/button/button.html index 1bb8240..fbc222e 100755 --- a/demos/tizen-winsets/widgets/button/button.html +++ b/demos/tizen-winsets/widgets/button/button.html @@ -18,13 +18,6 @@
            • Buttons Pages(not in list)
              • -
            • Custom
              T
              • -
            • Custom Width
              Test
              • -
            • Custom Width, Height
              Test
              • -
            • Custom Width, Height, Right
              Test
              • -
            • Circle-Custom
              • -
            • Custom Top
              tEST
              • -
            • Custom Bottom
              Test
            • List item 1
              Text Button TesT
            • List item 2
              Call Icon
            • List item 3
              Longer Call Icon
              • @@ -39,6 +32,13 @@ style="position: absolute; top: 0px; margin-top: 0px; left:70%">
          • List item 12
            Delete
            • +
          • Custom
            T
            • +
          • Custom Width
            Test
            • +
          • Custom Width, Height
            Test
            • +
          • Custom Width, Height, Right
            Test
            • +
          • Circle-Custom
            • +
          • Custom Top
            tEST
            • +
          • Custom Bottom
            Test
        diff --git a/demos/tizen-winsets/widgets/datefield.html b/demos/tizen-winsets/widgets/datefield.html index ae06846..090594f 100644 --- a/demos/tizen-winsets/widgets/datefield.html +++ b/demos/tizen-winsets/widgets/datefield.html @@ -4,38 +4,38 @@
          -
        • - +
        • +
          - - +
          +
          Date/Time Picker(Custom) - (select a date first) - +
          • -
        • - +
        • +
          - - +
          +
          Date/Time Picker - (select a date first) - +
          • -
        • - +
        • +
          - - +
          +
          Date Picker - (select a date first) - +
          • -
        • - +
        • +
          - - +
          +
          Time Picker - (select a date first) - +
        diff --git a/demos/tizen-winsets/widgets/list/list-divider_checkexpandable.html b/demos/tizen-winsets/widgets/list/list-divider_checkexpandable.html new file mode 100755 index 0000000..c624900 --- /dev/null +++ b/demos/tizen-winsets/widgets/list/list-divider_checkexpandable.html @@ -0,0 +1,22 @@ +
        +
        +

        Normal Divider

        +
        +
        + +
        +
        + diff --git a/demos/tizen-winsets/widgets/list/list-divider_expandable.html b/demos/tizen-winsets/widgets/list/list-divider_expandable.html new file mode 100755 index 0000000..debb032 --- /dev/null +++ b/demos/tizen-winsets/widgets/list/list-divider_expandable.html @@ -0,0 +1,22 @@ +
        +
        +

        Normal Divider

        +
        +
        + +
        +
        + diff --git a/demos/tizen-winsets/widgets/list/list.html b/demos/tizen-winsets/widgets/list/list.html index 3f80bf8..1907922 100755 --- a/demos/tizen-winsets/widgets/list/list.html +++ b/demos/tizen-winsets/widgets/list/list.html @@ -21,6 +21,8 @@
      • Normal divider
      • Groupped divider
      • Check divider
        • +
      • Expandable divider
        • +
      • CheckExpandable divider
      • Etc...
      • bubble
        • diff --git a/demos/tizen-winsets/widgets/multibuttonentry-demo.js b/demos/tizen-winsets/widgets/multibuttonentry-demo.js index 567d929..7e648b1 100755 --- a/demos/tizen-winsets/widgets/multibuttonentry-demo.js +++ b/demos/tizen-winsets/widgets/multibuttonentry-demo.js @@ -43,8 +43,8 @@ $( ":jqmData(role='multibuttonentry')" ).multibuttonentry( "focusOut", 0 ); }); - $( "#MBTdestoryTest" ).click( function () { - $( ":jqmData(role='multibuttonentry')" ).multibuttonentry( "destory" ); + $( "#MBTdestroyTest" ).click( function () { + $( ":jqmData(role='multibuttonentry')" ).multibuttonentry( "destroy" ); }); $( "#contentList a" ).click( function () { diff --git a/demos/tizen-winsets/widgets/scroll_jump.html b/demos/tizen-winsets/widgets/scroll_jump.html new file mode 100644 index 0000000..36df906 --- /dev/null +++ b/demos/tizen-winsets/widgets/scroll_jump.html @@ -0,0 +1,40 @@ + +
        +
        +

        Scroll Jump

        +
        +
        +
          +
        • item00
          • +
        • item01
          • +
        • item02
          • +
        • item03
          • +
        • item04
          • +
        • item05
          • +
        • item06
          • +
        • item07
          • +
        • item08
          • +
        • item09
          • +
        • item10
          • +
        • item11
          • +
        • item12
          • +
        • item13
          • +
        • item14
          • +
        • item15
          • +
        • item16
          • +
        • item17
          • +
        • item18
          • +
        • item19
          • +
        • item20
          • +
        • item21
          • +
        • item22
          • +
        • item23
          • +
        • item24
          • +
        • item25
          • +
        • item26
          • +
        • item27
          • +
        • item28
          • +
        • item29
          • +
        +
        +
        diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.support.orientation.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.support.orientation.js new file mode 100644 index 0000000..0991383 --- /dev/null +++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.support.orientation.js @@ -0,0 +1,15 @@ +//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude); +//>>description: Feature test for orientation +//>>label: Orientation support test +//>>group: Core + +define( [ "jquery" ], function( jQuery ) { +//>>excludeEnd("jqmBuildExclude"); + (function( $, undefined ) { + $.extend( $.support, { + orientation: "orientation" in window && "onorientationchange" in window + }); + }( jQuery )); +//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude); +}); +//>>excludeEnd("jqmBuildExclude"); diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.support.touch.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.support.touch.js new file mode 100644 index 0000000..9cba62a --- /dev/null +++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.support.touch.js @@ -0,0 +1,20 @@ +//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude); +//>>description: Touch feature test +//>>label: Touch support test +//>>group: Core + +define( [ "jquery" ], function( jQuery ) { +//>>excludeEnd("jqmBuildExclude"); + (function( $, undefined ) { + var support = { + touch: "ontouchend" in document + }; + + $.mobile = $.mobile || {}; + $.mobile.support = $.mobile.support || {}; + $.extend( $.support, support ); + $.extend( $.mobile.support, support ); + }( jQuery )); +//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude); +}); +//>>excludeEnd("jqmBuildExclude"); diff --git a/libs/js/jquery-mobile-1.1.0/tests/unit/support/support_core.js b/libs/js/jquery-mobile-1.1.0/tests/unit/support/support_core.js index e30f5f6..27b3e7c 100644 --- a/libs/js/jquery-mobile-1.1.0/tests/unit/support/support_core.js +++ b/libs/js/jquery-mobile-1.1.0/tests/unit/support/support_core.js @@ -19,34 +19,48 @@ $.testHelper.excludeFileProtocol(function(){ // TODO expose properties for less brittle tests $.extend(window, { WebKitTransitionEvent: true, - orientation: true, - onorientationchange: true }); - document.ontouchend = true; - window.history.pushState = function(){}; window.history.replaceState = function(){}; $.mobile.media = function(){ return true; }; $.testHelper.reloadModule( moduleName ).done( function() { - ok($.support.orientation); - ok($.support.touch); - ok($.support.cssTransitions); - ok($.support.pushState); - ok($.support.mediaquery); - start(); + ok($.support.cssTransitions, "css transitions are supported" ); + ok($.support.pushState, "push state is supported" ); + ok($.support.mediaquery, "media queries are supported" ); + start(); + }); + }); + + asyncTest( "detects orientation change", function() { + $.extend(window, { + orientation: true, + onorientationchange: true + }); + + $.testHelper.reloadModule( "jquery.mobile.support.orientation" ).done( function() { + ok($.support.orientation, "orientation is supported" ); + start(); + }); + }); + + asyncTest( "detects touch", function() { + document.ontouchend = true; + + $.testHelper.reloadModule( "jquery.mobile.support.touch" ).done( function() { + ok( $.mobile.support.touch, "touch is supported" ); + ok( $.support.touch, "touch is supported" ); + start(); }); }); asyncTest( "detects functionality from basic negative properties and attributes (where possible)", function(){ delete window["orientation"]; - delete document["ontouchend"]; - $.testHelper.reloadModule( moduleName ).done( function() { - ok(!$.support.orientation); - ok(!$.support.touch); + $.testHelper.reloadModule( "jquery.mobile.support.orientation" ).done( function() { + ok(!$.support.orientation, "orientation is not supported" ); start(); }); }); @@ -87,10 +101,10 @@ $.testHelper.excludeFileProtocol(function(){ jqmdetectedver = $.mobile.browser.ie; if( ie ){ - same(version, jqmdetectedver, "It's IE and the version is correct"); + deepEqual(version, jqmdetectedver, "It's IE and the version is correct"); } else{ - same(ie, jqmdetectedver, "It's not IE"); + deepEqual(ie, jqmdetectedver, "It's not IE"); } start(); }); diff --git a/libs/patch/0006-JQM-Apply-Tizen-button-style.patch b/libs/patch/0006-JQM-Apply-Tizen-button-style.patch index 27a8ffb..b244a82 100644 --- a/libs/patch/0006-JQM-Apply-Tizen-button-style.patch +++ b/libs/patch/0006-JQM-Apply-Tizen-button-style.patch @@ -62,9 +62,9 @@ index c5f32b4..d1b992b 100644 + + if ( o.icon ) { + if ( $(el).text().length > 0 ) { -+ o.iconpos == "right" ? ++ /* o.iconpos == "right" ? + textClass += " ui-btn-text-padding-right" : -+ textClass += " ui-btn-text-padding-left"; ++ textClass += " ui-btn-text-padding-left"; */ + + switch ( o.iconpos ) { + case "right" : diff --git a/packaging/web-ui-fw.spec b/packaging/web-ui-fw.spec index 0cb5ae8..0c92bc8 100644 --- a/packaging/web-ui-fw.spec +++ b/packaging/web-ui-fw.spec @@ -1,5 +1,5 @@ Name: web-ui-fw -Version: 0.1.38 +Version: 0.1.41 Release: 0 Summary: Tizen Web UI Framework Library Group: Development/Other @@ -37,8 +37,15 @@ BuildArch: noarch Summary: Tizen Web UI Framework Theme : tizen-gray %Description -n web-ui-fw-theme-tizen-gray Tizen Web UI Framework Theme : tizen-gray -%files -n web-ui-fw-theme-tizen-gray -/usr/share/tizen-web-ui-fw/*/themes/tizen-gray + +############################### +%package -n web-ui-fw-theme-tizen-black +BuildArch: noarch +Summary: Tizen Web UI Framework Theme : tizen-black +%Description -n web-ui-fw-theme-tizen-black + Tizen Web UI Framework Theme : tizen-black +%files -n web-ui-fw-theme-tizen-black +/usr/share/tizen-web-ui-fw/*/themes/tizen-black ############################### %package -n web-ui-fw-theme-tizen-white @@ -81,11 +88,30 @@ Summary: Tizen Web UI Framework Demo Application: tizen winset demo ############################### %changelog -* Mon Aug 20 2012 Minkyu Kang 0.1.38 +* Mon Aug 27 2012 Jinhyuk Jun 0.1.41 +- FIX: + - radio/check button : button size bug fix + +* Fri Aug 24 2012 Minkyu Kang 0.1.40 +- FIX: + - build error fixed + +* Fri Aug 24 2012 Minkyu Kang 0.1.39 +- FIX: + - listview: style fix, remove filter placeholder + - controlbar: divide styles + - scrollview: don't skip dragging when click button or inputbox + - slider: trim the text on text slider +- Spec changes: + - remove gray and blue theme + - add white and black theme + - support new GUI guide + +* Mon Aug 20 2012 Minkyu Kang 0.1.38 - FIX: - fix coment of version tag -* Fri Aug 17 2012 Minkyu Kang 0.1.37 +* Fri Aug 17 2012 Minkyu Kang 0.1.37 - FIX : - button: fix alignment - listview: adjust the main text width diff --git a/src/themes/tizen/common/jquery.mobile.button.less b/src/themes/tizen/common/jquery.mobile.button.less index 3a2f026..5f83a78 100755 --- a/src/themes/tizen/common/jquery.mobile.button.less +++ b/src/themes/tizen/common/jquery.mobile.button.less @@ -16,7 +16,7 @@ .ui-btn:focus, .ui-btn:active { outline: none; } .ui-header .ui-btn, .ui-footer .ui-btn, .ui-bar .ui-btn { display: inline-block; font-size: 13 * @unit_base; margin: 0; } .ui-btn-inline { display: inline-block; } -.ui-btn-inner { padding: .5em 32 * @unit_base; display: block; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; position: relative; zoom: 1; } +.ui-btn-inner { padding: .5em 36 * @unit_base; display: block; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; position: relative; zoom: 1; } .ui-header .ui-btn-inner, .ui-footer .ui-btn-inner, .ui-bar .ui-btn-inner { padding: 0.7em 0 0.7em; } /* wongi_1024 : Button text middle align */ .ui-header .ui-btn-inner.ui-btn-icon-only , .ui-footer .ui-btn-inner, .ui-bar .ui-btn-inner.ui-btn-icon-only { padding: .4em 8 * @unit_base .5em; } /* wongi_1024 : Button text middle align */ .ui-btn-icon-notext { width: 24 * @unit_base; height: 24 * @unit_base; } @@ -70,8 +70,9 @@ .ui-btn-text { /*padding-left : 80px;*/ //wongi_1017 - margin-left: auto; - margin-right: auto; + margin-left: auto; + margin-right: auto; + padding:0 1px; /* Webkit width(ellipsis) problem workaround */ } .ui-li .ui-btn.ui-btn-icon_only @@ -193,6 +194,38 @@ width: 48 * @unit_base; height: 38 * @unit_base; } + +.ui-icon-expandable-divider-opened { + width: 42 * @unit_base; + height: 42 * @unit_base; + + position : absolute; + right : 28 * @unit_base; + top : 0 * @unit_base; + + background-repeat: no-repeat; + background-size: 100% 100%; + + background-image: url(images/00_indexlist_icon_opened.png); + +} + +.ui-icon-expandable-divider-closed { + width: 42 * @unit_base; + height: 42 * @unit_base; + + position : absolute; + right : 28 * @unit_base; + top : 0 * @unit_base; + + background-repeat: no-repeat; + background-size: 100% 100%; + + background-image: url(images/00_indexlist_icon_closed.png); + +} + + /* Pressed images */ .ui-btn-down-s .ui-icon-bg, .ui-btn-down-s.ui-tizen-icon-bg {.tizen-icon-common; background-image: url(images/00_btn_circle_bg_press.png); z-index:0; } .ui-btn-down-s .ui-icon-reveal {.tizen-icon-common; background-image: url(images/00_button_reveal_press.png); } @@ -217,6 +250,12 @@ padding: 32 * @unit_base 32 * @unit_base; } +.ui-btn-icon-only .ui-btn-text +{ + left: -9999px; + display: none; +} + .ui-btn-edit .ui-btn-inner.ui-btn-icon-only { padding: @width_buttonEdit/2 @height_buttonEdit/2; diff --git a/src/themes/tizen/common/jquery.mobile.listview.less b/src/themes/tizen/common/jquery.mobile.listview.less index 9703d2f..69ff219 100755 --- a/src/themes/tizen/common/jquery.mobile.listview.less +++ b/src/themes/tizen/common/jquery.mobile.listview.less @@ -145,7 +145,6 @@ } .ui-btn-text { position: relative; - a.ui-link-inherit { text-overflow: ellipsis; overflow: hidden; @@ -297,6 +296,7 @@ li.ui-li-thumbnail-right { padding : 0px; .LESSdialogue-divider; + background : @color_bg; } &[data-style="check"] { @@ -316,9 +316,27 @@ li.ui-li-thumbnail-right { padding-left : 92 * @unit_base; line-height : 60 * @unit_base; } + + &[data-style="expandable"] { + height: 60 * @unit_base; + padding-top : 0px; + padding-bottom : 0px; + + line-height : 60 * @unit_base; + } } .ui-divider-expand-div { + position : absolute; + + width : 98 * @unit_base; + height : 42 * @unit_base; + top : 10 * @unit_base; + right : 0px; + + border-left-width : 1px; + border-left-style : solid; + border-left-color : rgba(42, 137, 194, 0.5); } diff --git a/src/themes/tizen/common/jquery.mobile.theme.less b/src/themes/tizen/common/jquery.mobile.theme.less index b5cd405..b62d8df 100755 --- a/src/themes/tizen/common/jquery.mobile.theme.less +++ b/src/themes/tizen/common/jquery.mobile.theme.less @@ -220,21 +220,61 @@ } > .ui-btn{ - top : 12 * @unit_base; + position : absolute; + top : 20 * @unit_base; margin-top : 0px; font-size : 28 * @unit_base; - height : 74 * @unit_base; + height : 60 * @unit_base; + + background: none; + color : @color_bar_title_text; + - background: @color_bar_title_btn_bg; - color : @color_bar_title_text; + border-left-style: solid; + border-left-width : 1px; + border-left-color : @color_bar_title_btn_border; + + font-weight : bold; + -webkit-border-radius : 0px; + + span.ui-btn-inner { + padding-top : 13 * @unit_base; + padding-bottom : 13 * @unit_base; + } + span.ui-btn-inner.ui-btn-icon-only { + padding-top : 0 * @unit_base; + padding-bottom : 0 * @unit_base; + } + } - .LESStitle-border; /* different title style */ + > .ui-btn.ui-btn-right:nth-child(2) { + right : 0px; + } + + > .ui-btn.ui-btn-right:nth-child(3) { + right : 118 * @unit_base; + } + + > .ui-btn.ui-btn-right:nth-child(4) { + right : 236 * @unit_base; } > .ui-btn.ui-btn-down-s { background : @color_bar_btn_press; color : @color_bar_title_text; } + + > img + h1 + a.ui-btn.ui-btn-right:nth-child(3) { + right : 0px; + } + + > img + h1 + a.ui-btn.ui-btn-right:nth-child(4) { + right : 118 * @unit_base; + } + + > img + h1 + a.ui-btn.ui-btn-right:nth-child(5) { + right : 236 * @unit_base; + } } .ui-header.ui-bar-s.ui-title-extended-height { @@ -592,6 +632,41 @@ a.ui-link-inherit { } } +.ui-landscape-controlbar.ui-controlbar-s.ui-navbar { + .ui-btn { + .ui-icon { + left : 20%; + top : 30 * @unit_base; + margin-left : -1.3em; + } + + .ui-btn-text { + padding-left : 35%; + } + + .ui-navbar-textonly .ui-btn-text { + padding-left : 0px; + } + } + + .ui-ctrlbar-icononly.ui-btn { + padding-top : 0px; + + .ui-icon { + left : 50%; + top : 30 * @unit_base; + margin-left : -29 * @unit_base; + } + } + + .ui-btn , .ui-btn-icon-top, .ui-btn-hover-s, .ui-btn-active, .ui-btn-up-s{ + .ui-btn-inner{ + padding-top : 40 * @unit_base; + padding-bottom : 39 * @unit_base; + } + } +} + .ui-tabbar-s { .ui-btn { background: @color_controlbar_tabbbar_bg; diff --git a/src/themes/tizen/common/jquery.mobile.tizen.datetimepicker.less b/src/themes/tizen/common/jquery.mobile.tizen.datetimepicker.less index eb75f4b..8e7abac 100755 --- a/src/themes/tizen/common/jquery.mobile.tizen.datetimepicker.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.datetimepicker.less @@ -7,10 +7,6 @@ text-align: center; } - .ui-datefield-selected { - color: @color_timepicker_selector_color; - } - .date,.time,.ui-datefield-tab { display: inline-block; } @@ -20,14 +16,34 @@ } } -.ui-li-text-main .ui-datefield-period.ui-btn { +.ui-datetime { + margin: 0; + height: 72 * @unit_base; +} + +.ui-datetime-text-main { + position: relative; + font-size: @font_size_list_main_text; + top: 28 * @unit_base; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + max-width: 90%; + padding-top: 0.3em; +} + +.ui-datetime-text-main .ui-datefield-period.ui-btn { margin-top: -0.3em; height: 56 * @unit_base; + right: auto; + position: relative; +} - .ui-btn-inner.ui-btn-hastxt { - padding-top: 0; - padding-bottom: 0; - } +.ui-datetime-text-sub { + position: absolute; + top: 10 * @unit_base; + color: @color_list_sub_text_default; + font-size: @font_size_list_sub_text; } .ui-datetimepicker-selector { @@ -80,4 +96,3 @@ } } } - diff --git a/src/themes/tizen/common/jquery.mobile.tizen.dayselector.less b/src/themes/tizen/common/jquery.mobile.tizen.dayselector.less index 9ae15e2..9d38574 100755 --- a/src/themes/tizen/common/jquery.mobile.tizen.dayselector.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.dayselector.less @@ -82,7 +82,7 @@ .ui-dayselector.ui-controlgroup-vertical { .ui-checkbox .ui-btn{ - width : 112 * @unit_base; + width : 128 * @unit_base; .ui-btn-text { margin-left : 16 * @unit_base; } diff --git a/src/themes/tizen/common/jquery.mobile.tizen.multibuttonentry.less b/src/themes/tizen/common/jquery.mobile.tizen.multibuttonentry.less index 418d4ce..4d466fa 100755 --- a/src/themes/tizen/common/jquery.mobile.tizen.multibuttonentry.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.multibuttonentry.less @@ -10,8 +10,9 @@ display : inline-block; text-align : center; position : relative; - margin : .3em; - padding : .2em 0em; + margin-left : .3em; + margin-right : .3em; + padding : .6em 0em; color : @color_multibuttonentry_input_text; font-weight : bold; text-align : center; @@ -37,7 +38,10 @@ text-align : center; cursor : pointer; position : relative; - margin : .3em; + margin-left : .3em; + margin-right : .3em; + margin-bottom : .3em; + margin-top : .3em; padding : .2em .5em; font-size : 1em; text-shadow : 0 .1em .1em rgba(0,0,0,.3); @@ -50,16 +54,24 @@ color : @color_multibuttonentry_block_text; } -a.ui-multibuttonentry-link { +a.ui-multibuttonentry-link-base { float : right; - color : @color_multibuttonentry_link !important; font-size : 1em; font-weight : bold; text-decoration : none; - border : solid 2px @color_multibuttonentry_link; background-color : @color_multibuttonentry_bg; } +a.ui-multibuttonentry-link { + color : @color_multibuttonentry_link !important; + border : solid 2px @color_multibuttonentry_link; +} + +a.ui-multibuttonentry-link-dim { + color : @color_multibuttonentry_dim !important; + border : solid 2px @color_multibuttonentry_dim; +} + div.ui-multibuttonentry-block { border : solid 2px @color_multibuttonentry_block_border; background-color : @color_multibuttonentry_block_bg; @@ -80,3 +92,7 @@ div.ui-multibuttonentry-sblock { font-size : 1em; background-color : @color_multibuttonentry_bg; } + +.ui-multibuttonentry-focus-button { + background-image : url(./images/00_button_expand_opened.png); + } \ No newline at end of file diff --git a/src/themes/tizen/common/jquery.mobile.tizen.multimediaview.less b/src/themes/tizen/common/jquery.mobile.tizen.multimediaview.less index c32518c..4fd7ed5 100755 --- a/src/themes/tizen/common/jquery.mobile.tizen.multimediaview.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.multimediaview.less @@ -26,19 +26,19 @@ } .ui-multimediaview-control span.ui-play-icon { - background-image : url(./images/controlbar/01_controlbar_icon_Play.png); + background-image : url(./images/00_button_play.png); } .ui-multimediaview-control span.ui-pause-icon { - background-image : url(./images/controlbar/01_controlbar_icon_pause.png); + background-image : url(./images/00_button_pause.png); } .ui-multimediaview-control span.ui-volume-icon { - background-image : url(./images/Volume/00_volume_icon.png); + background-image : url(./images/00_slider_btn_volume02.png); } .ui-multimediaview-control span.ui-mute-icon { - background-image : url(./images/Volume/00_volume_icon_Mute.png); + background-image : url(./images/00_slider_btn_volume01.png); } .ui-multimediaview-control span.ui-fullscreen-on { diff --git a/src/themes/tizen/common/jquery.mobile.tizen.optionheader.less b/src/themes/tizen/common/jquery.mobile.tizen.optionheader.less index f38677e..504da87 100755 --- a/src/themes/tizen/common/jquery.mobile.tizen.optionheader.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.optionheader.less @@ -141,15 +141,14 @@ } .ui-header { - .ui-btn{ + .ui-btn{ .ui-btn-icon-only { padding : 0 0 0 0; height : 100%; .ui-icon-optiontray { width: 56 * @unit_base; height : 56 * @unit_base; - - top : 10 * @unit_base; /* temporary center align */ + left : 30 * @unit_base; } } diff --git a/src/themes/tizen/common/jquery.mobile.tizen.pagecontrol.less b/src/themes/tizen/common/jquery.mobile.tizen.pagecontrol.less index ff50bf3..a453192 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.pagecontrol.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.pagecontrol.less @@ -40,15 +40,15 @@ div.pagecontrol { &> div.page_n_dot { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_001.png'); } - &> div.page_n_1 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_1.png'); } - &> div.page_n_2 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_2.png'); } - &> div.page_n_3 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_3.png'); } - &> div.page_n_4 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_4.png'); } - &> div.page_n_5 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_5.png'); } - &> div.page_n_6 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_6.png'); } - &> div.page_n_7 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_7.png'); } - &> div.page_n_8 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_8.png'); } - &> div.page_n_9 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_9.png'); } + &> div.page_n_1 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_01.png'); } + &> div.page_n_2 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_02.png'); } + &> div.page_n_3 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_03.png'); } + &> div.page_n_4 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_04.png'); } + &> div.page_n_5 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_05.png'); } + &> div.page_n_6 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_06.png'); } + &> div.page_n_7 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_07.png'); } + &> div.page_n_8 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_08.png'); } + &> div.page_n_9 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_09.png'); } &> div.page_n_10 { .LESSpagecontrolIconCommonProperties('images/00_mainmenu_page_bar_10.png'); } } diff --git a/src/themes/tizen/common/jquery.mobile.tizen.popupwindow.less b/src/themes/tizen/common/jquery.mobile.tizen.popupwindow.less index f9f7cac..031b020 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.popupwindow.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.popupwindow.less @@ -33,7 +33,7 @@ color: @color_popup_font; //FIXME : remove background & padding if there is no padding. - padding: 2*@unit_base 2*@unit_base; + .LESSpopup_padding_style; background: @color_popup_text_bg; // --------- common style in popup window ------------- // diff --git a/src/themes/tizen/common/jquery.mobile.tizen.scrollview.less b/src/themes/tizen/common/jquery.mobile.tizen.scrollview.less index 9e43a5b..7114498 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.scrollview.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.scrollview.less @@ -59,6 +59,42 @@ height: 10 * @unit_base; } +.ui-scroll-jump-top-bg { + position: absolute; + top: 16 * @unit_base; + right: 16 * @unit_base; + width: 76 * @unit_base; + height: 70 * @unit_base; + background: url(images/00_scroll_jump_bg.png) no-repeat; + .LESSbackground-size(76 * @unit_base, 70 * @unit_base); +} + +.ui-scroll-jump-left-bg { + position: absolute; + bottom: 16 * @unit_base; + left: 16 * @unit_base; + width: 76 * @unit_base; + height: 70 * @unit_base; + background: url(images/00_scroll_jump_bg.png) no-repeat; + .LESSbackground-size(76 * @unit_base, 70 * @unit_base); +} + +.ui-scroll-jump-top, +.ui-scroll-jump-left { + position: relative; + top: 14 * @unit_base; + left: 17 * @unit_base; + width: 42 * @unit_base; + height: 42 * @unit_base; + background: url(images/00_scroll_icon_jump.png) no-repeat; + .LESSbackground-size(42 * @unit_base, 42 * @unit_base); +} + +.ui-scroll-jump-left { + background: url(images/00_scroll_icon_jump_left.png) no-repeat; + .LESSbackground-size(42 * @unit_base, 42 * @unit_base); +} + /* * the values below are for the group index */ diff --git a/src/themes/tizen/common/jquery.mobile.tizen.swipelist.less b/src/themes/tizen/common/jquery.mobile.tizen.swipelist.less index c849799..2d2279c 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.swipelist.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.swipelist.less @@ -13,6 +13,11 @@ .ui-btn { margin-top: -0.3em !important; } + + .ui-dummy { + padding-top : 30 * @unit_base; + padding-bottom : 30 * @unit_base; + } } .ui-swipelist-item-cover { diff --git a/src/themes/tizen/common/jquery.mobile.tizen.toggleswitch.less b/src/themes/tizen/common/jquery.mobile.tizen.toggleswitch.less index 96e34d8..1a4943f 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.toggleswitch.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.toggleswitch.less @@ -4,10 +4,10 @@ height: 80 * @unit_base; width: 60 * @unit_base; overflow: hidden; - font-weight: bold; .ui-toggleswitch-mover { position: relative; - font-size: 20 * @unit_base; + font-size : 26 * @unit_base; + line-height : 40 * @unit_base; display: block; .ui-toggleswitch-off { @@ -73,7 +73,6 @@ .ui-toggleswitch-text { width: 100%; position: absolute; - padding-top: 10 * @unit_base; text-align: center; text-overflow: ellipsis; } diff --git a/src/themes/tizen/tizen-black/Makefile b/src/themes/tizen/tizen-black/Makefile index 89de14d..4fb146d 100755 --- a/src/themes/tizen/tizen-black/Makefile +++ b/src/themes/tizen/tizen-black/Makefile @@ -49,7 +49,6 @@ CSS_SRCS= ../common/jquery.mobile.theme.less.css \ ../common/jquery.mobile.tizen.scrollview.handler.less.css \ ../common/jquery.mobile.tizen.virtualgridview.less.css \ ../common/jquery.mobile.tizen.multimediaview.less.css \ - all: prepare css images js diff --git a/src/themes/tizen/tizen-black/images/00_button_fullscreen_off.png b/src/themes/tizen/tizen-black/images/00_button_fullscreen_off.png new file mode 100755 index 0000000..cafa0aa Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_button_fullscreen_off.png differ diff --git a/src/themes/tizen/tizen-black/images/00_button_fullscreen_on.png b/src/themes/tizen/tizen-black/images/00_button_fullscreen_on.png new file mode 100755 index 0000000..4bb212b Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_button_fullscreen_on.png differ diff --git a/src/themes/tizen/tizen-black/images/00_button_pause.png b/src/themes/tizen/tizen-black/images/00_button_pause.png new file mode 100755 index 0000000..0e0a7fb Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_button_pause.png differ diff --git a/src/themes/tizen/tizen-black/images/00_button_play.png b/src/themes/tizen/tizen-black/images/00_button_play.png new file mode 100755 index 0000000..81e88d3 Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_button_play.png differ diff --git a/src/themes/tizen/tizen-black/images/00_indexlist_icon_closed.png b/src/themes/tizen/tizen-black/images/00_indexlist_icon_closed.png new file mode 100755 index 0000000..481935c Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_indexlist_icon_closed.png differ diff --git a/src/themes/tizen/tizen-black/images/00_indexlist_icon_opened.png b/src/themes/tizen/tizen-black/images/00_indexlist_icon_opened.png new file mode 100755 index 0000000..27b7bab Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_indexlist_icon_opened.png differ diff --git a/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_001.png b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_001.png new file mode 100755 index 0000000..cf3d69c Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_001.png differ diff --git a/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_002.png b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_002.png new file mode 100755 index 0000000..e49b277 Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_002.png differ diff --git a/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_01.png b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_01.png new file mode 100755 index 0000000..901dac3 Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_01.png differ diff --git a/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_02.png b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_02.png new file mode 100755 index 0000000..b81cbf8 Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_02.png differ diff --git a/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_03.png b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_03.png new file mode 100755 index 0000000..f62e65b Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_03.png differ diff --git a/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_04.png b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_04.png new file mode 100755 index 0000000..86be281 Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_04.png differ diff --git a/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_05.png b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_05.png new file mode 100755 index 0000000..9255391 Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_05.png differ diff --git a/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_06.png b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_06.png new file mode 100755 index 0000000..1635f8a Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_06.png differ diff --git a/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_07.png b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_07.png new file mode 100755 index 0000000..cf91725 Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_07.png differ diff --git a/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_08.png b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_08.png new file mode 100755 index 0000000..df1adb7 Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_08.png differ diff --git a/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_09.png b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_09.png new file mode 100755 index 0000000..1264428 Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_09.png differ diff --git a/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_10.png b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_10.png new file mode 100755 index 0000000..e0a87f5 Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_mainmenu_page_bar_10.png differ diff --git a/demos/tizen-winsets/test.png~HEAD b/src/themes/tizen/tizen-black/images/00_scroll_bar_handler.png similarity index 86% rename from demos/tizen-winsets/test.png~HEAD rename to src/themes/tizen/tizen-black/images/00_scroll_bar_handler.png index 973b0ea..52ffbef 100755 Binary files a/demos/tizen-winsets/test.png~HEAD and b/src/themes/tizen/tizen-black/images/00_scroll_bar_handler.png differ diff --git a/demos/tizen-winsets/test.png~master b/src/themes/tizen/tizen-black/images/00_scroll_bar_handler_hor.png similarity index 86% rename from demos/tizen-winsets/test.png~master rename to src/themes/tizen/tizen-black/images/00_scroll_bar_handler_hor.png index 973b0ea..76a84a9 100755 Binary files a/demos/tizen-winsets/test.png~master and b/src/themes/tizen/tizen-black/images/00_scroll_bar_handler_hor.png differ diff --git a/src/themes/tizen/tizen-black/images/00_scroll_icon_jump.png b/src/themes/tizen/tizen-black/images/00_scroll_icon_jump.png new file mode 100644 index 0000000..bf3e7d3 Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_scroll_icon_jump.png differ diff --git a/src/themes/tizen/tizen-black/images/00_scroll_icon_jump_left.png b/src/themes/tizen/tizen-black/images/00_scroll_icon_jump_left.png new file mode 100644 index 0000000..5188da9 Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_scroll_icon_jump_left.png differ diff --git a/src/themes/tizen/tizen-black/images/00_scroll_jump_bg.png b/src/themes/tizen/tizen-black/images/00_scroll_jump_bg.png new file mode 100644 index 0000000..93845de Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_scroll_jump_bg.png differ diff --git a/src/themes/tizen/tizen-black/images/Volume/00_volume_icon.png b/src/themes/tizen/tizen-black/images/Volume/00_volume_icon.png new file mode 100644 index 0000000..d2a4094 Binary files /dev/null and b/src/themes/tizen/tizen-black/images/Volume/00_volume_icon.png differ diff --git a/src/themes/tizen/tizen-black/images/Volume/00_volume_icon_Mute.png b/src/themes/tizen/tizen-black/images/Volume/00_volume_icon_Mute.png new file mode 100644 index 0000000..42c3560 Binary files /dev/null and b/src/themes/tizen/tizen-black/images/Volume/00_volume_icon_Mute.png differ diff --git a/src/themes/tizen/tizen-black/style.less b/src/themes/tizen/tizen-black/style.less index 36622aa..90c79ea 100755 --- a/src/themes/tizen/tizen-black/style.less +++ b/src/themes/tizen/tizen-black/style.less @@ -1,13 +1,13 @@ // Basic color set -@color_bg: rgb(249, 249, 249); // 249 249 249 +@color_bg: rgb(0, 0, 0); @color_bg_sub: rgb(36, 36, 36); // 36 36 36 // TODO: used only in dialog group. Check more. @color_border: rgb(42, 42, 42); // 42 42 42 @color_header: rgb(68, 68, 74); // 68 68 74 -@color_scrollbar: rgb(218, 218, 218); +@color_scrollbar: rgb(63, 63, 63); -@color_text: rgb(0, 0, 0); // 0 0 0 +@color_text: rgb(249, 249, 249); @color_text_dim: rgb(108, 115, 118); // 108 115 118 @color_text_focus: @color_text; @color_text_sub: rgb(102, 102, 102); // 102 102 102 @@ -17,14 +17,15 @@ @color_text_segctrl: rgb(158, 195, 213); // 158 195 213 // TODO: used only in segctrl. Check more. //Dialogue color set -@color_dialogue_main_text: rgb(249,249,249); +@color_dialogue_main_text: rgba(249, 249, 249, 1); @color_dialogue_sub_text: rgb(146,146,146); +@color_list_dialogue_bg : rgba(0, 0, 0, 1); +@color_dialogue_border_right: rgba(68, 68, 68, 1); //Dialogue Editor color set @color_dialogue_editor_default_text: rgb(70, 70, 70); @color_dialogue_editor_bg: rgb(0, 0, 0); -@color_dialogue_editor_border: rgb(108, 168, 199); - +@color_dialogue_editor_border: rgb(37, 52, 78); /************************* Vars/Mixins for Widgets @@ -37,7 +38,7 @@ /*************************************************************************** List ***************************************************************************/ -@color_list_border_bottom: rgb(169, 169, 169); +@color_list_border_bottom: rgb(68, 68, 68); @color_list_main_text_read: rgba(158, 158, 158, 1); @color_list_main_text_unread: rgba(249, 249, 249, 1); @color_list_main_text_focus: rgba(249, 249, 249, 1); @@ -76,8 +77,8 @@ @color_list_bubble_name_text: rgb(57, 166, 215); @color_list_bubble_help_text: rgb(146, 146, 146); @color_list_divider_bg : -webkit-linear-gradient(top, rgb(73,73,73) 0%,rgb(22,22,22) 100%); -@color_list_divider_text : rgb(0, 94, 160); /* #005ea0 */ -@color_list_expandable_expanded_bg: rgb(215, 225, 232); +@color_list_divider_text : rgb(142, 174, 193); /* #005ea0 */ +@color_list_expandable_expanded_bg: rgb(26, 26, 26); @font_size_list_main_text: 44 * @unit_base; //1.375rem; /* 44 px */ @font_size_list_sub_text: 32 * @unit_base; //1.0rem; /* 32 px */ @@ -97,8 +98,6 @@ @style_list_li_dialogue_border_left_width: 10 * @unit_base; @style_list_bubble_date_height: 40 * @unit_base; @style_list_bubble_date_text_align: center; - -@color_list_dialogue_bg : rgba(236, 240, 242, 1); /*************************************************************************** Shortcut Scroll ***************************************************************************/ @@ -155,6 +154,10 @@ background: @color_popup_buttonbg_press_moz; } +.LESSpopup_padding_style{ + padding: 2 * @unit_base 2 * @unit_base; +} + /*************************************************************************** Button ***************************************************************************/ @@ -365,7 +368,7 @@ ***************************************************************************/ @color_bar_bg : -webkit-linear-gradient(top, rgb(156,181,179) 0%,rgb(79,116,141) 100%); @color_bar_back_btn_press : rgba(26, 82, 116, 0.3); /* #1A5274 */ -@color_bar_btn_press : -webkit-linear-gradient(top, rgb(74,164,218) 0%,rgb(43,138,195) 100%); +@color_bar_btn_press : rgba(0, 0, 0, 0.1); @color_bar_btn_bg : transparent; @color_bar_back_btn_bg : transparent; @@ -377,8 +380,7 @@ @color_bar_title_text : rgba(249, 249, 249, 1); /* #F9F9F9 */ @color_bar_title_bg : -webkit-linear-gradient(top, rgb(68,88,120) 0%,rgb(24,37,56) 100%); -@color_bar_title_btn_bg : -webkit-linear-gradient(top, rgb(56,80,119) 10%,rgb(39,58,88) 90%); -@color_bar_title_btn_border : rgba(0, 0, 0, 0.1); +@color_bar_title_btn_border : rgba(0, 0, 0, 0.4); @color_bar_footer_bg : -webkit-linear-gradient(top, rgb(43,54,71) 0%,rgb(17,24,35) 100%); @color_bar_footer_btn_bg : transparent; @@ -396,22 +398,22 @@ /*************************************************************************** Tickernoti ***************************************************************************/ -@color_ticker_bg: rgb(35, 90, 123); +@color_ticker_bg: rgb(60, 84, 123); @color_ticker_text1: rgb(249, 249, 249); -@color_ticker_text2: rgb(142, 170, 186); +@color_ticker_text2: rgb(211, 216, 224); /*************************************************************************** Smallpopup ***************************************************************************/ -@color_smallpopup_bg: rgb(215, 225, 232); -@color_smallpopup_text: rgb(77, 77, 77); +@color_smallpopup_bg: rgb(76, 81, 88); +@color_smallpopup_text: rgb(249, 249, 249); /*************************************************************************** No Contents ***************************************************************************/ -@color_nocontents_text: rgb(154, 145, 154); +@color_nocontents_text: rgb(102, 102, 102); /*************************************************************************** @@ -487,7 +489,10 @@ @color_multibuttonentry_press_border : rgb(93, 187, 244); @color_multibuttonentry_input_text : #222222; @color_multibuttonentry_link : rgb(100, 100, 100); +@color_multibuttonentry_dim : rgb(128, 128, 128); +/*************************************************************************** +***************************************************************************/ /*************************************************************************** **************************************************************************** @@ -518,21 +523,6 @@ margin: 19*@unit_base 135*@unit_base 19*@unit_base 16*@unit_base; } -.LESStitle-border { - border-style: solid; - border-width : 1px; - border-bottom-color: @color_border_bottom; - border-bottom-width: 2px; - border-top-color: @color_border_top; - - border-left-color : @color_bar_title_btn_border; - border-right-color : @color_bar_title_btn_border; - - font-weight : bold; - - -webkit-border-radius: 0px; -} - .LESSextended-controlgroup-border { border-style : solid; border-width : 1px; @@ -567,7 +557,7 @@ .LESSdialogue-border-style { border-right-style : solid; - border-right-color : black; + border-right-color : @color_dialogue_border_right; border-right-width : 1px; } @@ -579,8 +569,8 @@ margin-left : 16 * @unit_base; margin-right : 16 * @unit_base; - background : rgba(249, 249, 249, 1); + background : @color_list_dialogue_bg; font-size : 32 * @unit_base; font-weight : bold; - color : rgba(92, 151, 187, 1); + color : @color_dialogue_main_text; } diff --git a/src/themes/tizen/tizen-white/Makefile b/src/themes/tizen/tizen-white/Makefile index 78ff1e1..afefa51 100755 --- a/src/themes/tizen/tizen-white/Makefile +++ b/src/themes/tizen/tizen-white/Makefile @@ -49,7 +49,6 @@ CSS_SRCS= ../common/jquery.mobile.theme.less.css \ ../common/jquery.mobile.tizen.scrollview.handler.less.css \ ../common/jquery.mobile.tizen.virtualgridview.less.css \ ../common/jquery.mobile.tizen.multimediaview.less.css \ - all: prepare css images js diff --git a/src/themes/tizen/tizen-white/images/00_button_fullscreen_off.png b/src/themes/tizen/tizen-white/images/00_button_fullscreen_off.png new file mode 100755 index 0000000..1afb045 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_button_fullscreen_off.png differ diff --git a/src/themes/tizen/tizen-white/images/00_button_fullscreen_on.png b/src/themes/tizen/tizen-white/images/00_button_fullscreen_on.png new file mode 100755 index 0000000..fc1d516 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_button_fullscreen_on.png differ diff --git a/src/themes/tizen/tizen-white/images/00_button_pause.png b/src/themes/tizen/tizen-white/images/00_button_pause.png new file mode 100755 index 0000000..e32a1fb Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_button_pause.png differ diff --git a/src/themes/tizen/tizen-white/images/00_button_play.png b/src/themes/tizen/tizen-white/images/00_button_play.png new file mode 100755 index 0000000..be36511 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_button_play.png differ diff --git a/src/themes/tizen/tizen-white/images/00_indexlist_icon_closed.png b/src/themes/tizen/tizen-white/images/00_indexlist_icon_closed.png new file mode 100755 index 0000000..d2c6124 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_indexlist_icon_closed.png differ diff --git a/src/themes/tizen/tizen-white/images/00_indexlist_icon_opened.png b/src/themes/tizen/tizen-white/images/00_indexlist_icon_opened.png new file mode 100755 index 0000000..4a07f55 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_indexlist_icon_opened.png differ diff --git a/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_001.png b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_001.png new file mode 100755 index 0000000..cf3d69c Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_001.png differ diff --git a/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_002.png b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_002.png new file mode 100755 index 0000000..e49b277 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_002.png differ diff --git a/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_01.png b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_01.png new file mode 100755 index 0000000..901dac3 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_01.png differ diff --git a/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_02.png b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_02.png new file mode 100755 index 0000000..b81cbf8 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_02.png differ diff --git a/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_03.png b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_03.png new file mode 100755 index 0000000..f62e65b Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_03.png differ diff --git a/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_04.png b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_04.png new file mode 100755 index 0000000..86be281 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_04.png differ diff --git a/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_05.png b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_05.png new file mode 100755 index 0000000..9255391 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_05.png differ diff --git a/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_06.png b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_06.png new file mode 100755 index 0000000..1635f8a Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_06.png differ diff --git a/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_07.png b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_07.png new file mode 100755 index 0000000..cf91725 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_07.png differ diff --git a/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_08.png b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_08.png new file mode 100755 index 0000000..df1adb7 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_08.png differ diff --git a/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_09.png b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_09.png new file mode 100755 index 0000000..1264428 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_09.png differ diff --git a/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_10.png b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_10.png new file mode 100755 index 0000000..e0a87f5 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_mainmenu_page_bar_10.png differ diff --git a/src/themes/tizen/tizen-white/images/00_scroll_bar_handler.png b/src/themes/tizen/tizen-white/images/00_scroll_bar_handler.png new file mode 100755 index 0000000..52ffbef Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_scroll_bar_handler.png differ diff --git a/src/themes/tizen/tizen-white/images/00_scroll_bar_handler_hor.png b/src/themes/tizen/tizen-white/images/00_scroll_bar_handler_hor.png new file mode 100755 index 0000000..76a84a9 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_scroll_bar_handler_hor.png differ diff --git a/src/themes/tizen/tizen-white/images/00_scroll_icon_jump.png b/src/themes/tizen/tizen-white/images/00_scroll_icon_jump.png new file mode 100644 index 0000000..bf3e7d3 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_scroll_icon_jump.png differ diff --git a/src/themes/tizen/tizen-white/images/00_scroll_icon_jump_left.png b/src/themes/tizen/tizen-white/images/00_scroll_icon_jump_left.png new file mode 100644 index 0000000..5188da9 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_scroll_icon_jump_left.png differ diff --git a/src/themes/tizen/tizen-white/images/00_scroll_jump_bg.png b/src/themes/tizen/tizen-white/images/00_scroll_jump_bg.png new file mode 100644 index 0000000..0aa6dfc Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_scroll_jump_bg.png differ diff --git a/src/themes/tizen/tizen-white/images/Volume/00_volume_icon.png b/src/themes/tizen/tizen-white/images/Volume/00_volume_icon.png new file mode 100644 index 0000000..d9bdd9b Binary files /dev/null and b/src/themes/tizen/tizen-white/images/Volume/00_volume_icon.png differ diff --git a/src/themes/tizen/tizen-white/images/Volume/00_volume_icon_Mute.png b/src/themes/tizen/tizen-white/images/Volume/00_volume_icon_Mute.png new file mode 100644 index 0000000..bb970b9 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/Volume/00_volume_icon_Mute.png differ diff --git a/src/themes/tizen/tizen-white/style.less b/src/themes/tizen/tizen-white/style.less index 0705423..069b349 100755 --- a/src/themes/tizen/tizen-white/style.less +++ b/src/themes/tizen/tizen-white/style.less @@ -17,14 +17,15 @@ @color_text_segctrl: rgb(158, 195, 213); // 158 195 213 // TODO: used only in segctrl. Check more. //Dialogue color set -@color_dialogue_main_text: rgb(249,249,249); +@color_dialogue_main_text: rgba(92, 151, 187, 1); @color_dialogue_sub_text: rgb(146,146,146); +@color_list_dialogue_bg : rgba(236, 240, 242, 1); +@color_dialogue_border_right: rgba(142, 154, 163, 1); //Dialogue Editor color set @color_dialogue_editor_default_text: rgb(70, 70, 70); @color_dialogue_editor_bg: rgb(0, 0, 0); @color_dialogue_editor_border: rgb(108, 168, 199); - /************************* Vars/Mixins for Widgets @@ -76,7 +77,7 @@ @color_list_bubble_name_text: rgb(57, 166, 215); @color_list_bubble_help_text: rgb(146, 146, 146); @color_list_divider_bg : rgb(209, 227, 238); /* #d1e3ee */ -@color_list_divider_text : rgb(0, 94, 160); /* #005ea0 */ +@color_list_divider_text : rgb(29, 100, 149); @color_list_expandable_expanded_bg: rgb(215, 225, 232); @font_size_list_main_text: 44 * @unit_base; //1.375rem; /* 44 px */ @@ -98,7 +99,6 @@ @style_list_bubble_date_height: 40 * @unit_base; @style_list_bubble_date_text_align: center; -@color_list_dialogue_bg : rgba(236, 240, 242, 1); /*************************************************************************** Shortcut Scroll ***************************************************************************/ @@ -155,6 +155,9 @@ background: @color_popup_buttonbg_press_moz; } +.LESSpopup_padding_style{ +} + /*************************************************************************** Button ***************************************************************************/ @@ -365,7 +368,7 @@ ***************************************************************************/ @color_bar_bg : -webkit-linear-gradient(top, rgb(156,181,179) 0%,rgb(79,116,141) 100%); @color_bar_back_btn_press : rgba(26, 82, 116, 0.3); /* #1A5274 */ -@color_bar_btn_press : -webkit-linear-gradient(top, rgb(74,164,218) 0%,rgb(43,138,195) 100%); +@color_bar_btn_press : rgba(0, 0, 0, 0.1); @color_bar_btn_bg : transparent; @color_bar_back_btn_bg : transparent; @@ -377,8 +380,7 @@ @color_bar_title_text : rgba(249, 249, 249, 1); /* #F9F9F9 */ @color_bar_title_bg : -webkit-linear-gradient(top, rgb(90,153,186) 0%,rgb(32,84,115) 100%); -@color_bar_title_btn_bg : -webkit-linear-gradient(top, rgb(80,149,185) 10%,rgb(43,107,147) 90%); -@color_bar_title_btn_border : rgba(0, 0, 0, 0.1); +@color_bar_title_btn_border : rgba(0, 0, 0, 0.4); @color_bar_footer_bg : -webkit-linear-gradient(top, rgb(156,181,179) 0%,rgb(79,116,141) 100%); @color_bar_footer_btn_bg : transparent; @@ -396,9 +398,9 @@ /*************************************************************************** Tickernoti ***************************************************************************/ -@color_ticker_bg: rgb(35, 90, 123); +@color_ticker_bg: rgb(13, 60, 89); @color_ticker_text1: rgb(249, 249, 249); -@color_ticker_text2: rgb(142, 170, 186); +@color_ticker_text2: rgb(202, 211, 217); /*************************************************************************** @@ -487,7 +489,10 @@ @color_multibuttonentry_press_border : rgb(93, 187, 244); @color_multibuttonentry_input_text : #222222; @color_multibuttonentry_link : rgb(100, 100, 100); +@color_multibuttonentry_dim : rgb(128, 128, 128); +/*************************************************************************** +***************************************************************************/ /*************************************************************************** **************************************************************************** @@ -518,21 +523,6 @@ margin: 19*@unit_base 135*@unit_base 19*@unit_base 16*@unit_base; } -.LESStitle-border { - border-style: solid; - border-width : 1px; - border-bottom-color: @color_border_bottom; - border-bottom-width: 2px; - border-top-color: @color_border_top; - - border-left-color : @color_bar_title_btn_border; - border-right-color : @color_bar_title_btn_border; - - font-weight : bold; - - -webkit-border-radius: 0px; -} - .LESSextended-controlgroup-border { border-style : solid; border-width : 1px; @@ -567,7 +557,7 @@ .LESSdialogue-border-style { border-right-style : solid; - border-right-color : black; + border-right-color : @color_dialogue_border_right; border-right-width : 1px; } @@ -579,8 +569,8 @@ margin-left : 16 * @unit_base; margin-right : 16 * @unit_base; - background : rgba(249, 249, 249, 1); + background : @color_list_dialogue_bg; font-size : 32 * @unit_base; font-weight : bold; - color : rgba(92, 151, 187, 1); + color : @color_dialogue_main_text; } diff --git a/src/widgets/common/js/jquery.mobile.tizen.scrollview.js b/src/widgets/common/js/jquery.mobile.tizen.scrollview.js index 3e786a8..be2e815 100644 --- a/src/widgets/common/js/jquery.mobile.tizen.scrollview.js +++ b/src/widgets/common/js/jquery.mobile.tizen.scrollview.js @@ -59,6 +59,7 @@ showScrollBars: true, overshootEnable: false, + scrollJump: false, }, _makePositioned: function ( $ele ) { @@ -108,6 +109,7 @@ this._add_event(); this._add_scrollbar(); + this._add_scroll_jump(); }, _startMScroll: function ( speedX, speedY ) { @@ -340,7 +342,7 @@ return; } - if ( y >= 0 ) { + if ( y > 0 ) { sy = -y; } else if ( y < -scroll_height ) { sy = -y - scroll_height; @@ -448,41 +450,32 @@ this._stopMScroll(); this._didDrag = false; + this._skip_dragging = false; var target = $( e.target ), self = this, $c = this._$clip, svdir = this.options.direction; - /* should skip the dragging when click the button */ - this._skip_dragging = target.is( '.ui-btn-text' ) || + /* should prevent the default behavior when click the button */ + this._is_button = target.is( '.ui-btn-text' ) || target.is( '.ui-btn-inner' ) || target.is( '.ui-btn-inner .ui-icon' ); - if ( this._skip_dragging ) { - return; - } - /* * We need to prevent the default behavior to * suppress accidental selection of text, etc. */ - this._shouldBlockEvent = !( target.is(':input') || - target.parents(':input').length > 0 ); + this._is_inputbox = target.is(':input') || + target.parents(':input').length > 0; - if ( this._shouldBlockEvent ) { - if ( this.options.eventType === "mouse" ) { - e.preventDefault(); - } - } else { + if ( this._is_inputbox ) { target.one( "resize.scrollview", function () { if ( ey > $c.height() ) { self.scrollTo( -ex, self._sy - ey + $c.height(), self.options.snapbackDuration ); } }); - - return; } this._lastX = ex; @@ -517,7 +510,7 @@ return; } - if ( this._shouldBlockEvent ) { + if ( !this._is_inputbox && !this._is_button ) { e.preventDefault(); } @@ -846,6 +839,37 @@ this._scrollbar_showed = false; }, + _add_scroll_jump: function () { + var $c = this._$clip, + self = this, + top_btn, + left_btn; + + if ( !this.options.scrollJump ) { + return; + } + + if ( this._vTracker ) { + top_btn = $( '
        ' + + '
        ' ); + $c.append( top_btn ); + + top_btn.bind( "vclick", function () { + self.scrollTo( 0, 0, self.options.overshootDuration ); + } ); + } + + if ( this._hTracker ) { + left_btn = $( '
        ' + + '
        ' ); + $c.append( left_btn ); + + left_btn.bind( "vclick", function () { + self.scrollTo( 0, 0, self.options.overshootDuration ); + } ); + } + }, + _set_scrollbar_size: function () { var $c = this._$clip, $v = this._$view, @@ -1028,7 +1052,8 @@ opts = { direction: dir || undefined, - scrollMethod: $( this ).jqmData("scroll-method") || undefined + scrollMethod: $( this ).jqmData("scroll-method") || undefined, + scrollJump: $( this ).jqmData("scroll-jump") || undefined }; $( this ).scrollview( opts ); diff --git a/src/widgets/controlbar/js/jquery.mobile.tizen.controlbar.js b/src/widgets/controlbar/js/jquery.mobile.tizen.controlbar.js index 24fb0f8..94ea751 100755 --- a/src/widgets/controlbar/js/jquery.mobile.tizen.controlbar.js +++ b/src/widgets/controlbar/js/jquery.mobile.tizen.controlbar.js @@ -79,7 +79,18 @@ iconpos = $navbtns.filter( ":jqmData(icon)" ).length ? this.options.iconpos : undefined, theme = $.mobile.listview.prototype.options.theme, /* Get current theme */ - style = $controlbar.attr( "data-style" ); + style = $controlbar.attr( "data-style" ), + ww = window.innerWidth || $( window ).width(), + wh = window.innerHeight || $( window ).height(), + isLandscape; + + isLandscape = ww > wh && ( ww - wh ); + + if ( isLandscape ) { + $controlbar.removeClass( "ui-portrait-controlbar" ).addClass( "ui-landscape-controlbar" ); + } else { + $controlbar.removeClass( "ui-landscape-controlbar" ).addClass( "ui-portrait-controlbar" ); + } if ( style === "left" || style === "right" ) { $controlbar @@ -161,6 +172,26 @@ .css( "height", controlbar_filter.height() ); } }); + + this._bindControlbarEvents(); + }, + + _bindControlbarEvents: function () { + var $controlbar = this.element; + + $( window ).bind( "orientationchange", function ( e, ui ) { + ww = window.innerWidth || $( window ).width(); + wh = window.innerHeight || $( window ).height(); + + isLandscape = ww > wh && ( ww - wh ); + + if ( isLandscape ) { + $controlbar.removeClass( "ui-portrait-controlbar" ).addClass( "ui-landscape-controlbar" ); + } else { + $controlbar.removeClass( "ui-landscape-controlbar" ).addClass( "ui-portrait-controlbar" ); + } + }) + }, _setDisabled: function ( value, cnt ) { diff --git a/src/widgets/datetimepicker/js/jquery.mobile.tizen.datetimepicker.js b/src/widgets/datetimepicker/js/jquery.mobile.tizen.datetimepicker.js index fc58e17..da71b46 100644 --- a/src/widgets/datetimepicker/js/jquery.mobile.tizen.datetimepicker.js +++ b/src/widgets/datetimepicker/js/jquery.mobile.tizen.datetimepicker.js @@ -674,8 +674,9 @@ }; $(window).bind("resize", obj._reflow); } + // cause ctxpopup forced to subtract 10 $ctx.popupwindow( 'open', - target.offset().left + target.width() / 2 - window.pageXOffset, + target.offset().left + ( target.width() / 2 ) + 10 - window.pageXOffset , target.offset().top + target.height() - window.pageYOffset ); $div.bind('popupafterclose', function ( e ) { if ( obj._reflow ) { diff --git a/src/widgets/listdivider/js/jquery.mobile.tizen.listdivider.js b/src/widgets/listdivider/js/jquery.mobile.tizen.listdivider.js new file mode 100755 index 0000000..940e29e --- /dev/null +++ b/src/widgets/listdivider/js/jquery.mobile.tizen.listdivider.js @@ -0,0 +1,45 @@ +/* *************************************************************************** + +*/ + +(function ( $, undefined ) { + + $.widget( "tizen.listdivider", $.mobile.widget, { + options: { + initSelector: ":jqmData(role='list-divider')" + }, + + _create: function () { + + var $listdivider = this.element, + openStatus = true, + iconStatus, + expandSrc, + style = $listdivider.attr( "data-style" ); + + if ( style === "expandable" || style === "checkexpandable" ) { + openStatus ? iconStatus = "opened" : iconStatus = "closed"; + expandSrc = ""; + + $( expandSrc ).appendTo( $listdivider ); + } + + $listdivider.children( ".ui-divider-expand-div" ).bind( "vclick", function ( event, ui ) { + if ( openStatus ) { + $( this ).children( "span" ).removeClass( "ui-icon-expandable-divider-opened" ); + $( this ).children( "span" ).addClass( "ui-icon-expandable-divider-closed" ); + openStatus = false; + } else { + $( this ).children( "span" ).removeClass( "ui-icon-expandable-divider-closed" ); + $( this ).children( "span" ).addClass( "ui-icon-expandable-divider-opened" ); + openStatus = true; + } + }); + }, + }); + + //auto self-init widgets + $( document ).bind( "pagecreate create", function ( e ) { + $( $.tizen.listdivider.prototype.options.initSelector, e.target ).listdivider(); + }); +}( jQuery ) ); diff --git a/src/widgets/multibuttonentry/js/jquery.mobile.tizen.multibuttonentry.js b/src/widgets/multibuttonentry/js/jquery.mobile.tizen.multibuttonentry.js index fa744f7..202f5ac 100755 --- a/src/widgets/multibuttonentry/js/jquery.mobile.tizen.multibuttonentry.js +++ b/src/widgets/multibuttonentry/js/jquery.mobile.tizen.multibuttonentry.js @@ -32,11 +32,12 @@ * * HTML Attributes: * - * data-listUrl : Represents the page id. - * The page contains data for the user, for example, an address book.(Default : null) + * data-list-id : Represents the page id. + * The page contains data for the user, for example, an address book. + * If the value is null, anchor button doesn't work. (Default : null) * data-label: Provide a label for a user-guide. (Default : 'To : ') - * data-descMessage : This attribute is managing message format. - * This message is displayed when widget status was changed to 'focusout'. (Default : '{0} & {1} more') + * data-description : This attribute is managing message format. + * This message is displayed when widget status was changed to 'focusout'. (Default : '+ {0}') * * APIs: * @@ -68,7 +69,8 @@ * The status is not able to manage a widget. * All buttons that contained in the widget are removed and * summarized message is displayed. - * + * destroy ( void ) + * : Remove all of the new DOM elements for the current widget that you created. * * Events: * @@ -79,7 +81,7 @@ * * Examples: * - *
        + *
        *
        * */ @@ -97,14 +99,16 @@ _marginWidth : 0, options : { label : "To : ", - listUrl : "#addressbook", - descMessage : "{0} & {1} more..." + listId : null, + description : "+ {0}" }, + _create : function () { var self = this, $view = this.element, role = $view.jqmData( "role" ), option = this.options, + className = "ui-multibuttonentry-link", inputbox = $( document.createElement( "input" ) ), labeltag = $( document.createElement( "label" ) ), moreBlock = $( document.createElement( "a" ) ); @@ -112,7 +116,7 @@ $view.hide().empty().addClass( "ui-" + role ); // create a label tag. - $( labeltag ).text( this.options.label ).addClass( "ui-multibuttonentry-label" ); + $( labeltag ).text( option.label ).addClass( "ui-multibuttonentry-label" ); $view.append( labeltag ); // create a input tag @@ -120,7 +124,10 @@ $view.append( inputbox ); // create a anchor tag. - $( moreBlock ).text( "+" ).attr( "href", option.listUrl ).addClass( "ui-multibuttonentry-link" ); + if ( option.listId === null || $.trim(option.listId).length < 1 ) { + className += "-dim"; + } + $( moreBlock ).text( "+" ).attr( "href", $.trim(option.listId)).addClass( "ui-multibuttonentry-link-base" ).addClass( className ); // append default htmlelements to main widget. $view.append( moreBlock ); @@ -141,38 +148,57 @@ self._fontSize = parseInt( $( moreBlock ).css( "font-size" ), 10 ); self._currentWidth = self._reservedWidth; }, + // bind events _bindEvents : function () { var self = this, $view = self.element, option = self.options, inputbox = $view.find( ".ui-multibuttonentry-input" ), - moreBlock = $view.find( ".ui-multibuttonentry-link" ); + moreBlock = $view.find( ".ui-multibuttonentry-link-base" ), + isSeparator = false; - inputbox.bind( "keydown", function ( event ) { + inputbox.bind( "keyup", function ( event ) { // 8 : backspace // 13 : Enter + // 186 : semi-colon + // 188 : comma var keyValue = event.keyCode, - valueString = $( inputbox ).val(); + valueString = $( inputbox ).val(), + valueStrings = [], + index; - if ( keyValue == 8 ) { + if ( keyValue === 8 ) { if ( valueString.length === 0 ) { self._validateTargetBlock(); } - } else if ( keyValue == 13 ) { + } else if ( keyValue === 13 || keyValue === 186 || keyValue === 188 ) { if ( valueString.length !== 0 ) { - self._addTextBlock( valueString ); + // split content by separators(',', ';') + valueStrings = valueString.split ( /[,;]/ ); + for ( index = 0; index < valueStrings.length; index++ ) { + if ( valueStrings[index].length !== 0 && valueStrings[index].replace( /\s/g, "" ).length !== 0 ) { + self._addTextBlock( valueStrings[index] ); + } + } } inputbox.val( "" ); + isSeparator = true; } else { self._unlockTextBlock(); } + + return !isSeparator; }); moreBlock.click( function () { + if ( $( moreBlock ).hasClass( "ui-multibuttonentry-link-dim" ) ) { + return ; + } + $(inputbox).hide(); - $.mobile.changePage( option.listUrl, { + $.mobile.changePage( option.listId, { transition: "slide", reverse: false, changeHash: false @@ -186,7 +212,7 @@ var inputBox = $view.find( ".ui-multibuttonentry-input" ); if ( self._labelWidth === 0 ) { self._labelWidth = $view.find( ".ui-multibuttonentry-label" ).outerWidth( true ); - self._anchorWidth = $view.find( ".ui-multibuttonentry-link" ).outerWidth( true ); + self._anchorWidth = $view.find( ".ui-multibuttonentry-link-base" ).outerWidth( true ); self._marginWidth = parseInt( ( $( inputBox ).css( "margin-left" ) ), 10 ); self._marginWidth += parseInt( ( $( inputBox ).css( "margin-right" ) ), 10 ); self._viewWidth = $view.innerWidth(); @@ -194,12 +220,18 @@ self._modifyInputBoxWidth(); $(inputbox).show(); }); + + $view.bind( "click", function ( event ) { + if ( self._focusStatus === "focusOut" ) { + self.focusIn(); + } + }); }, // create a textbutton and append this button to parent layer. // @param arg1 : string // @param arg2 : index - _addTextBlock : function ( messages, blcokIndex ) { + _addTextBlock : function ( messages, blockIndex ) { if ( arguments.length === 0 ) { return; } @@ -211,7 +243,7 @@ var self = this, $view = self.element, content = messages, - index = blcokIndex, + index = blockIndex, blocks = null, dataBlock = null, displayText = null, @@ -220,6 +252,7 @@ if ( self._viewWidth === 0 ) { self._viewWidth = $view.innerWidth(); } + // save src data dataBlock = $( document.createElement( 'input' ) ); dataBlock.attr( "value", content ).addClass( "ui-multibuttonentry-data" ).hide(); @@ -229,13 +262,9 @@ displayText = self._ellipsisTextBlock( content ) ; textBlock.text( displayText ).addClass( "ui-multibuttonentry-block" ); textBlock.append( dataBlock ); + // bind a event to HTMLDivElement. textBlock.bind( "vclick", function ( event ) { - if ( self._focusStatus === "focusOut" ) { - self.focusInEvent(); - return; - } - if ( $( this ).hasClass( "ui-multibuttonentry-sblock" ) ) { // If block is selected, it will be removed. self._removeTextBlock(); @@ -282,6 +311,7 @@ blockWidth = $( block ).outerWidth( true ); return blockWidth; }, + _unlockTextBlock : function () { var $view = this.element, lockBlock = $view.find( "div.ui-multibuttonentry-sblock" ); @@ -324,6 +354,7 @@ } return ellipsisStr; }, + _modifyInputBoxWidth : function () { var self = this, $view = self.element, @@ -353,6 +384,7 @@ } $( inputBox ).width( inputBoxWidth - margin - 1 ); }, + _stringFormat : function ( expression ) { var pattern = null, message = expression, @@ -363,6 +395,7 @@ } return message; }, + _resizeBlock : function () { var self = this, $view = self.element, @@ -380,8 +413,8 @@ $view.show(); }, - //----------------------------------------------------// - // Public Method // + //---------------------------------------------------- // + // Public Method // //----------------------------------------------------// // // Focus In Event @@ -403,7 +436,9 @@ // change focus state. this._modifyInputBoxWidth(); this._focusStatus = "focusIn"; + $view.removeClass( "ui-multibuttonentry-focusout" ).addClass( "ui-multibuttonentry-focusin" ); }, + focusOut : function () { if ( this._focusStatus === "focusOut" ) { return; @@ -419,33 +454,38 @@ more = $view.find( "span" ), blocks = $view.find( "div" ), currentWidth = $view.outerWidth( true ) - more.outerWidth( true ) - label.outerWidth( true ), - textWidth = currentWidth; + blockWidth = 0; $view.find( ".ui-multibuttonentry-input" ).hide(); $view.find( "a" ).hide(); blocks.hide(); - // div button currentWidth = currentWidth - self._reservedWidth; - for ( index = 0; index < blocks.length; index += 1 ) { - currentWidth = currentWidth - $( blocks[index] ).outerWidth( true ); - statement += ", " + $( blocks[index] ).text(); - if ( currentWidth <= 0 ) { - statement = "," + $( blocks[0] ).text(); - statement = self._stringFormat( self.options.descMessage, statement, blocks.length - 1 ); + + for ( index = 0; index < blocks.length; index++ ) { + blockWidth = $( blocks[index] ).outerWidth( true ); + if ( currentWidth - blockWidth <= 0 ) { + lastIndex = index - 1; break; } - lastIndex = statement.length; + + $( blocks[index] ).show(); + currentWidth -= blockWidth; + } + + if ( lastIndex !== blocks.length ) { + statement = self._stringFormat( self.options.description, blocks.length - lastIndex - 1 ); + tempBlock = $( document.createElement( 'label' )); + tempBlock.text( statement ); + tempBlock.addClass( "ui-multibuttonentry-desclabel" ).addClass( "ui-multibuttonentry-desclabel" ); + $( blocks[lastIndex] ).after( tempBlock ); } - tempBlock = $( document.createElement( 'input' ) ); - tempBlock.val( statement.substr( 1, statement.length ) ); - tempBlock.addClass( "ui-multibuttonentry-desclabel" ).addClass( "ui-multibuttonentry-desclabel" ); - tempBlock.width( textWidth - ( self._reservedWidth ) ); - tempBlock.attr( "disabled", true ); - $view.find( "label" ).after( tempBlock ); + // update foucs state this._focusStatus = "focusOut"; + $view.removeClass( "ui-multibuttonentry-focusin" ).addClass( "ui-multibuttonentry-focusout" ); }, + inputText : function ( message ) { var $view = this.element; @@ -455,6 +495,7 @@ $view.find( ".ui-multibuttonentry-input" ).val( message ); return message; }, + select : function ( index ) { var $view = this.element, lockBlock = null, @@ -466,9 +507,9 @@ if ( arguments.length === 0 ) { // return a selected block. - lockBlock = $view.find( "div.ui-multibuttonentry-sblock" ); + lockBlock = $view.find( "div.ui-multibuttonentry-sblock" ).children( ".ui-multibuttonentry-data" ); if ( lockBlock) { - return lockBlock.text(); + return lockBlock.attr( "value" ); } return null; } @@ -482,6 +523,7 @@ } return null; }, + add : function ( message, position ) { if ( this._focusStatus === "focusOut" ) { return; @@ -489,6 +531,7 @@ this._addTextBlock( message, position ); }, + remove : function ( position ) { var self = this, $view = this.element, @@ -509,23 +552,26 @@ } self._modifyInputBoxWidth(); }, + length : function () { return this.element.find( "div" ).length; }, + refresh : function () { var self = this; self.element.hide(); self.element.show(); }, - destory : function () { + + destroy : function () { var $view = this.element; $view.find( "label" ).remove(); $view.find( "div" ).unbind( "vclick" ).remove(); $view.find( "a" ).remove(); - $view.find( ".ui-multibuttonentry-input" ).unbind( "keydown" ).remove(); + $view.find( ".ui-multibuttonentry-input" ).unbind( "keyup" ).remove(); - this._trigger( "destory" ); + this._trigger( "destroy" ); } }); diff --git a/src/widgets/popupwindow/js/jquery.mobile.tizen.popupwindow.js b/src/widgets/popupwindow/js/jquery.mobile.tizen.popupwindow.js index 3472220..9293c82 100755 --- a/src/widgets/popupwindow/js/jquery.mobile.tizen.popupwindow.js +++ b/src/widgets/popupwindow/js/jquery.mobile.tizen.popupwindow.js @@ -175,20 +175,19 @@ }, _placementCoords: function ( x, y, cw, ch ) { - var scrollTop = $( window ).scrollTop(), - screenHeight = $( window ).height(), + var screenHeight = $( window ).height(), screenWidth = $( window ).width(), halfheight = ch / 2, maxwidth = parseFloat( this._ui.container.css( "max-width" ) ), - roomtop = y - scrollTop, - roombot = scrollTop + screenHeight - y, + roomtop = y, + roombot = screenHeight - y, newtop, newleft; if ( roomtop > ch / 2 && roombot > ch / 2 ) { newtop = y - halfheight; } else { - newtop = roomtop > roombot ? scrollTop + screenHeight - ch - 30 : scrollTop + 30; + newtop = roomtop > roombot ? screenHeight - ch - 30 : 30; } if ( cw < maxwidth ) { @@ -214,7 +213,6 @@ popupWidth, menuHeight, menuWidth, - scrollTop, screenHeight, screenWidth, roomtop, @@ -239,14 +237,13 @@ menuHeight = this._ui.container.innerHeight(); menuWidth = this._ui.container.innerWidth(); - scrollTop = $( window ).scrollTop(); screenHeight = $( window ).height(); screenWidth = $( window ).width(); - roomtop = y - scrollTop; - roombot = scrollTop + screenHeight - y; + roomtop = y; + roombot = screenHeight - y; halfheight = menuHeight / 2; maxwidth = parseFloat( this._ui.container.css( "max-width" ) ); - newtop = ( screenHeight - menuHeight ) / 2 + scrollTop; + newtop = ( screenHeight - menuHeight ) / 2; if ( menuWidth < maxwidth ) { newleft = ( screenWidth - menuWidth ) / 2; diff --git a/src/widgets/slider/js/jquery.mobile.tizen.slider.js b/src/widgets/slider/js/jquery.mobile.tizen.slider.js index e4fc89f..6290fe4 100755 --- a/src/widgets/slider/js/jquery.mobile.tizen.slider.js +++ b/src/widgets/slider/js/jquery.mobile.tizen.slider.js @@ -142,11 +142,11 @@ case 'text': slider.before( $('
        ' + '' + - inputElement.attr('data-text-left') + + inputElement.attr('data-text-left').substring( 0, 3) + '
        ') ); slider.after( $('
        ' + '' + - inputElement.attr('data-text-right') + + inputElement.attr('data-text-right').substring( 0, 3) + '
        ') ); break; } diff --git a/src/widgets/swipelist/js/jquery.mobile.tizen.swipelist.js b/src/widgets/swipelist/js/jquery.mobile.tizen.swipelist.js index 0fab979..05c9957 100644 --- a/src/widgets/swipelist/js/jquery.mobile.tizen.swipelist.js +++ b/src/widgets/swipelist/js/jquery.mobile.tizen.swipelist.js @@ -126,6 +126,7 @@ coverTheme = defaultCoverTheme, // get the parent li element and add classes item = cover.closest('li'), + btn, itemHasThemeClass; // add swipelist CSS classes @@ -166,7 +167,13 @@ // any clicks on buttons inside the item also trigger // the cover to slide back to the left - item.find('.ui-btn').bind('vclick', cover.data('animateLeft')); + btn = item.find('.ui-btn'); + + if ( btn.length ) { + btn.bind('vclick', cover.data('animateLeft')); + } else { + item.append('
        '); + } }); }, diff --git a/tests/unit-tests/multibuttonentry/multibuttonentry-tests.js b/tests/unit-tests/multibuttonentry/multibuttonentry-tests.js index 4601fc1..e33f222 100755 --- a/tests/unit-tests/multibuttonentry/multibuttonentry-tests.js +++ b/tests/unit-tests/multibuttonentry/multibuttonentry-tests.js @@ -18,7 +18,7 @@ ok(multibuttonentry.length > 0, "Create"); /* length */ - equal( multibuttonentry.multibuttonentry("length"), 0 ,"API : length "); + equal( multibuttonentry.multibuttonentry("length"), 0, "API : length "); /* Add */ multibuttonentry.multibuttonentry("add", "string1"); @@ -31,17 +31,17 @@ /* Select */ multibuttonentry.multibuttonentry("select", 1); outputText = multibuttonentry.multibuttonentry("select"); - equal( outputText, "..." , "API : select ( 1 )"); + equal( outputText, "string2", "API : select ( 1 )"); /* Focus Out */ multibuttonentry.multibuttonentry("focusOut"); - status = multibuttonentry.find(".ui-multibuttonentry-desclabel").length === 1 ? true : false; - equal( status, true , "API : focusOut "); + status = multibuttonentry.hasClass("ui-multibuttonentry-focusout"); + equal( status, true, "API : focusOut "); /* Focus In */ multibuttonentry.multibuttonentry("focusIn"); - status = multibuttonentry.find(".ui-multibuttonentry-desclabel").length === 1 ? true : false; - equal(status, false, "API : focusIn "); + status = multibuttonentry.hasClass("ui-multibuttonentry-focusin"); + equal(status, true, "API : focusIn "); /* Remove */ multibuttonentry.multibuttonentry("remove", 0); @@ -49,7 +49,7 @@ /* Reamove all */ multibuttonentry.multibuttonentry("remove"); - equal( multibuttonentry.multibuttonentry("length"), 0 ,"API : remove"); + equal( multibuttonentry.multibuttonentry("length"), 0, "API : remove"); /* input */ inputText = "multibuttonentry"; diff --git a/tests/unit-tests/popupwindow_ctxpopup/ctxpopup-tests.js b/tests/unit-tests/popupwindow_ctxpopup/ctxpopup-tests.js index c7810c3..8fce173 100644 --- a/tests/unit-tests/popupwindow_ctxpopup/ctxpopup-tests.js +++ b/tests/unit-tests/popupwindow_ctxpopup/ctxpopup-tests.js @@ -40,8 +40,9 @@ $(document).ready( function () { x = 0, y = 0, parents = popup.parents(".ui-popupwindow"), - popPos, popDim, + popPosX = 0, + popPosY = 0, segment = 5, closed = 0, open = 0; @@ -59,14 +60,15 @@ $(document).ready( function () { while ( x <= width ) { popup.popupwindow( "open", x, y ); open++; - popPos = parents.position(); + popPosX = parseInt( parents.css("left") ); + popPosY = parseInt( parents.css("top") ); popDim = { width: parents.width(), height: parents.height() }; - if ( popPos.left < 0 || popPos.top < 0 || popPos.left > (width - popDim.width) || popPos.top > (height - popDim.height) ) { - throw "Pop up occured at wrong position: (" + parseInt(popPos.left, 10) + "," + parseInt(popPos.top, 10) + "," + popDim.width + "," + popDim.height + ")"; + if ( popPosX < 0 || popPosY < 0 || popPosX > (width - popDim.width) || popPosY > (height - popDim.height) ) { + throw "Pop up occured at wrong position: (" + popPosX + "," + popPosY + "," + popDim.width + "," + popDim.height + ")"; } popup.popupwindow( "close" ); diff --git a/tests/unit-tests/virtualgrid/index.html b/tests/unit-tests/virtualgrid/index.html index 533b5cb..0ae6fd9 100755 --- a/tests/unit-tests/virtualgrid/index.html +++ b/tests/unit-tests/virtualgrid/index.html @@ -39,7 +39,7 @@ - + Virtuallist