From 4138f7ead6f3e58c237eaab760631df126330bf1 Mon Sep 17 00:00:00 2001 From: Youmin Ha Date: Mon, 15 Oct 2012 14:37:45 +0900 Subject: [PATCH] Export 0.1.56 --- demos/tizen-winsets/index.html | 9 ++++- demos/tizen-winsets/widgets/scrollview_x.html | 38 ++++++++++++++++++++++ demos/tizen-winsets/widgets/scrollview_y.html | 22 +++++++++++++ .../widgets/small-popup-interval.html | 12 +++++++ demos/tizen-winsets/widgets/switch/switch.js | 4 +-- .../tizen-winsets/widgets/tickernoti-interval.html | 14 ++++++++ packaging/web-ui-fw.spec | 7 +++- .../common/js/jquery.mobile.tizen.scrollview.js | 15 ++++++--- .../js/jquery.mobile.tizen.notification.js | 26 +++++++++++++-- .../js/jquery.mobile.tizen.toggleswitch.js | 4 +-- 10 files changed, 138 insertions(+), 13 deletions(-) create mode 100644 demos/tizen-winsets/widgets/scrollview_x.html create mode 100644 demos/tizen-winsets/widgets/scrollview_y.html create mode 100644 demos/tizen-winsets/widgets/small-popup-interval.html create mode 100644 demos/tizen-winsets/widgets/tickernoti-interval.html diff --git a/demos/tizen-winsets/index.html b/demos/tizen-winsets/index.html index 85506cf..a0d0cae 100755 --- a/demos/tizen-winsets/index.html +++ b/demos/tizen-winsets/index.html @@ -68,9 +68,14 @@
  • ImageSlider
  • PageControl
  • SelectionInfo
    • +
  • Multi-Button Entry
    • + +
  • Scrollview
    • +
  • Horizontal Scroll
    • +
  • Vertical Scroll
  • Handler
  • Scroll Jump
    • -
  • Multi-Button Entry
    • +
  • ControlBar
  • ControlBar
    • @@ -89,7 +94,9 @@
  • Notification (ticker)
  • TickerNoti
    • +
  • TickerNoti Interval
  • Small Popup
    • +
  • Small Popup Interval
  • No Contents
  • No Contents - Text
    • diff --git a/demos/tizen-winsets/widgets/scrollview_x.html b/demos/tizen-winsets/widgets/scrollview_x.html new file mode 100644 index 0000000..1f34101 --- /dev/null +++ b/demos/tizen-winsets/widgets/scrollview_x.html @@ -0,0 +1,38 @@ + +
    +
    +

    Scrollview

    +
    +
    +

    Horizontal Scroll #1: inline block

    +
    +
    + + + + + + + + + + +
    +
    +

    Horizontal Scroll #2: set the width of view

    +
    +
    + + + + + + + + + + +
    +
    +
    +
    diff --git a/demos/tizen-winsets/widgets/scrollview_y.html b/demos/tizen-winsets/widgets/scrollview_y.html new file mode 100644 index 0000000..0c970f7 --- /dev/null +++ b/demos/tizen-winsets/widgets/scrollview_y.html @@ -0,0 +1,22 @@ + +
    +
    +

    Scrollview

    +
    +
    +

    Vertical Scroll

    +
    + + + + + + + + + + + +
    +
    +
    diff --git a/demos/tizen-winsets/widgets/small-popup-interval.html b/demos/tizen-winsets/widgets/small-popup-interval.html new file mode 100644 index 0000000..20e83f6 --- /dev/null +++ b/demos/tizen-winsets/widgets/small-popup-interval.html @@ -0,0 +1,12 @@ + +
    +
    +

    Notification Demo

    +
    +
    +

    Notification

    +
    +
    +
    Show Smallpopup
    +
    +
    diff --git a/demos/tizen-winsets/widgets/switch/switch.js b/demos/tizen-winsets/widgets/switch/switch.js index 8b2d855..da0a776 100644 --- a/demos/tizen-winsets/widgets/switch/switch.js +++ b/demos/tizen-winsets/widgets/switch/switch.js @@ -1,8 +1,8 @@ $("#switch-demo").live("pageshow", function(e) { - $("#switch-1-coord").bind("changed", function(e) { + $("#switch-1-coord").bind("change", function(e) { $("#switch-2-coord").toggleswitch("option", "checked", $("#switch-1-coord").toggleswitch("option", "checked")); }); - $("#switch-2-coord").bind("changed", function(e) { + $("#switch-2-coord").bind("change", function(e) { $("#switch-1-coord").toggleswitch("option", "checked", $("#switch-2-coord").toggleswitch("option", "checked")); }); }); diff --git a/demos/tizen-winsets/widgets/tickernoti-interval.html b/demos/tizen-winsets/widgets/tickernoti-interval.html new file mode 100644 index 0000000..53a9200 --- /dev/null +++ b/demos/tizen-winsets/widgets/tickernoti-interval.html @@ -0,0 +1,14 @@ + +
    +
    + +

    Hello World

    +

    Dennis

    +
    +
    +

    Notification

    +
    +
    +
    Show TickerNoti
    +
    +
    diff --git a/packaging/web-ui-fw.spec b/packaging/web-ui-fw.spec index 09b719e..ce47ba1 100644 --- a/packaging/web-ui-fw.spec +++ b/packaging/web-ui-fw.spec @@ -1,5 +1,5 @@ Name: web-ui-fw -Version: 0.1.55 +Version: 0.1.56 Release: 0 Summary: Tizen Web UI Framework Library Group: Development/Other @@ -91,6 +91,11 @@ Summary: Tizen Web UI Framework Demo Application: tizen winset demo ############################### %changelog +* Mon Oct 15 2012 Youmin Ha 0.1.56 +- FIX: + - Toggleswitch: Change event name from 'changed' to 'change' + - Notification: Revert interval feature + * Tue Oct 09 2012 Youmin Ha 0.1.55 - FIX: - Fix SMACK manifest bug (S1-9098) diff --git a/src/widgets/common/js/jquery.mobile.tizen.scrollview.js b/src/widgets/common/js/jquery.mobile.tizen.scrollview.js index 2a023e7..b3cc125 100644 --- a/src/widgets/common/js/jquery.mobile.tizen.scrollview.js +++ b/src/widgets/common/js/jquery.mobile.tizen.scrollview.js @@ -78,8 +78,13 @@ self = this; this._$clip = $( this.element ).addClass("ui-scrollview-clip"); - this._$view = this._$clip.wrapInner("
    ").children() + + if ( this._$clip.children(".ui-scrollview-view").length ) { + this._$view = this._$clip.children(".ui-scrollview-view"); + } else { + this._$view = this._$clip.wrapInner("
    ").children() .addClass("ui-scrollview-view"); + } if ( this.options.scrollMethod === "translate" ) { if ( this._$view.css("transform") === undefined ) { @@ -553,10 +558,6 @@ newY, dirLock; - if ( Math.abs( this._startY - ey ) < mt && !this._didDrag ) { - return; - } - this._lastMove = getCurrentTime(); if ( !this._directionLock ) { @@ -618,6 +619,10 @@ } if ( dirLock !== "x" && this._vTracker ) { + if ( Math.abs( this._startY - ey ) < mt ) { + return; + } + y = this._sy; this._speedY = dy; newY = y + dy; diff --git a/src/widgets/notification/js/jquery.mobile.tizen.notification.js b/src/widgets/notification/js/jquery.mobile.tizen.notification.js index 28db3a4..1843aac 100644 --- a/src/widgets/notification/js/jquery.mobile.tizen.notification.js +++ b/src/widgets/notification/js/jquery.mobile.tizen.notification.js @@ -30,6 +30,7 @@ * * data-role: set to 'notification'. * data-type: 'ticker' or 'popup'. + * data-interval: time to showing. If don't set, will show infinitely. * * APIs * @@ -45,14 +46,14 @@ * Examples * * // tickernoti - *
    + *
    * *

    Hello World

    *

    Denis

    *
    * * // smallpopup - *
    + *
    *

    Hello World

    *
    * @@ -63,6 +64,8 @@ btn: null, text_bg: [], icon_img: [], + interval: null, + seconds: null, running: false, _get_text: function () { @@ -118,6 +121,8 @@ $( container ).addClass("fix") .removeClass("show") .removeClass("hide"); + + this._set_interval(); }, open: function () { @@ -137,6 +142,8 @@ if ( this.type === 'popup' ) { this._set_position(); } + + this._set_interval(); }, close: function () { @@ -151,6 +158,7 @@ .removeClass("fix"); this.running = false; + clearInterval( this.interval ); }, destroy: function () { @@ -173,6 +181,18 @@ return $( this.element ).find(".ui-smallpopup"); }, + _set_interval: function () { + var self = this; + + clearInterval( this.interval ); + + if ( this.seconds !== undefined && this.second !== 0 ) { + this.interval = setInterval( function () { + self.close(); + }, this.seconds ); + } + }, + _add_event: function () { var self = this, container = this._get_container(); @@ -197,6 +217,7 @@ this.btn.unbind("vmouseup"); } container.unbind('vmouseup'); + clearInterval( this.interval ); }, _set_position: function () { @@ -222,6 +243,7 @@ shadow: true }); + this.seconds = elem.jqmData('interval'); this.type = elem.jqmData('type') || 'popup'; if ( this.type === 'ticker' ) { diff --git a/src/widgets/toggleswitch/js/jquery.mobile.tizen.toggleswitch.js b/src/widgets/toggleswitch/js/jquery.mobile.tizen.toggleswitch.js index 8fd4774..ce32d28 100644 --- a/src/widgets/toggleswitch/js/jquery.mobile.tizen.toggleswitch.js +++ b/src/widgets/toggleswitch/js/jquery.mobile.tizen.toggleswitch.js @@ -47,7 +47,7 @@ // textoff: String; "Off"; // // Events: -// changed: Emitted when the switch is changed +// change: Emitted when the switch is changed. (function ( $, undefined ) { @@ -76,7 +76,7 @@ _value: { attr: "data-" + ($.mobile.ns || "") + "checked", - signal: "changed" + signal: "change" }, _setTexton: function ( text ) { -- 2.7.4