From d797845e735978362e7b3c2a0e7c3b3c3d10aced Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Thu, 24 Jan 2013 19:02:16 +0900 Subject: [PATCH] progress: set the position explicitly Since the position of circle type progress is fixed to right of list, user can't set the position of progress. This patch support that user can set the position explicitly. Change-Id: I46be3aaeac0f87500f0a81d5c23a5139b5397231 --- demos/tizen-winsets/widgets/progressbar.html | 2 +- .../tizen/common/jquery.mobile.tizen.progress.less | 6 ++++-- .../progress/js/jquery.mobile.tizen.progress.js | 18 +++++++----------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/demos/tizen-winsets/widgets/progressbar.html b/demos/tizen-winsets/widgets/progressbar.html index fdb04d1..8b8777f 100644 --- a/demos/tizen-winsets/widgets/progressbar.html +++ b/demos/tizen-winsets/widgets/progressbar.html @@ -13,7 +13,7 @@
  • Progress ~ing
  • -
    +
    Loading..
  • diff --git a/src/themes/tizen/common/jquery.mobile.tizen.progress.less b/src/themes/tizen/common/jquery.mobile.tizen.progress.less index f68c42b..a63129a 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.progress.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.progress.less @@ -14,8 +14,10 @@ .ui-progress-container-circle { position: absolute; - right: 13 * @unit_base; - top: 25%; +} + +.ui-li .ui-progress-container-circle { + top: 22%; } .ui-progress-circle { diff --git a/src/widgets/progress/js/jquery.mobile.tizen.progress.js b/src/widgets/progress/js/jquery.mobile.tizen.progress.js index 36889ea..f9d52d2 100755 --- a/src/widgets/progress/js/jquery.mobile.tizen.progress.js +++ b/src/widgets/progress/js/jquery.mobile.tizen.progress.js @@ -166,23 +166,19 @@ } if ( style == "circle" ) { - _html = '
    ' + - '
    ' + - '
    '; + $( this.element ).addClass("ui-progress-container-circle"); + + _html = '
    '; } else if ( style === "pending" ) { - _html = '
    ' + - '
    ' + - '
    ' + - '' + + $( this.element ).addClass("ui-progressbar"); + + _html = '
    ' + + '
    ' + '
    '; } this.html = $( _html ); - if ( style === "pending" ) { - this.html.wrap('
    '); - } - runningClass = "ui-progress-" + style + "-running"; $.extend( this, { -- 2.7.4