diff options
| -rw-r--r-- | COPYING | 1 | ||||
| -rw-r--r-- | demos/tizen-winsets/widgets/1 | 18 | ||||
| -rw-r--r-- | demos/tizen-winsets/widgets/radio/radio.html | 5 | ||||
| -rw-r--r-- | libs/patch/0045-JQM-divide-jQM-and-Tizen-slider-on-dragging-outside-.patch | 2 | ||||
| -rw-r--r-- | packaging/web-ui-fw.spec | 9 | ||||
| -rw-r--r-- | src/js/jquery.mobile.tizen.loader.js | 4 |
6 files changed, 15 insertions, 24 deletions
@@ -2,6 +2,7 @@ This software is licensed under the MIT license (as defined by the OSI at http://www.opensource.org/licenses/mit-license.php), except for following files: * src/js/jquery.mobile.tizen.pinch.js. + * src/js/widgets/jquery.mobile.tizen.gallery3d.js **************************************************************************** Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. diff --git a/demos/tizen-winsets/widgets/1 b/demos/tizen-winsets/widgets/1 deleted file mode 100644 index 71b376d9..00000000 --- a/demos/tizen-winsets/widgets/1 +++ /dev/null @@ -1,18 +0,0 @@ -<!DOCTYPE html> -<div data-role="page" id="gallery-demo" data-add-back-btn="true"> - <div data-role="header" data-position="fixed"> - <h1>GALLERY</h1> - </div> - <div data-role="content" data-scroll="none"> - <div data-role="gallery" id="gallery" data-vertical-align="middle"> - </div> - </div> <!-- /content --> - <div data-role="footer"data-position ="fixed"> - <div data-role="tabbar"> - <ul> - <li id="gallery-add"><a href="#">Add</a></li> - <li id="gallery-del"><a href="#">Delete</a></li> - </ul> - </div><!-- /navbar --> - </div> -</div> <!-- /page --> diff --git a/demos/tizen-winsets/widgets/radio/radio.html b/demos/tizen-winsets/widgets/radio/radio.html index 21042ffc..64754af1 100644 --- a/demos/tizen-winsets/widgets/radio/radio.html +++ b/demos/tizen-winsets/widgets/radio/radio.html @@ -47,10 +47,11 @@ </p> <input type="radio" name="radio-1" id="radio-1" checked="checked" disabled="disabled" /> - <label for="radio-2">Checked, Disabled</label> + <label for="radio-1">Checked, Disabled</label> <input type="radio" name="radio-2" id="radio-2" disabled="disabled"/> - <label for="radio-3">Disabled</label> + <label for="radio-2">Disabled</label> <input type="radio" name="radio-3" id="radio-3"/> + <label for="radio-3">Unchecked</label> </div><!--/content-primary --> </div> diff --git a/libs/patch/0045-JQM-divide-jQM-and-Tizen-slider-on-dragging-outside-.patch b/libs/patch/0045-JQM-divide-jQM-and-Tizen-slider-on-dragging-outside-.patch index 9769a5e7..d71dd54f 100644 --- a/libs/patch/0045-JQM-divide-jQM-and-Tizen-slider-on-dragging-outside-.patch +++ b/libs/patch/0045-JQM-divide-jQM-and-Tizen-slider-on-dragging-outside-.patch @@ -18,7 +18,7 @@ index b189714..dae5dce 100644 // NOTE: we don't do this in refresh because we still want to // support programmatic alteration of disabled inputs - if ( self.dragging && !self.options.disabled ) { -+ if ( self.dragging && !self.options.disabled && (!slider.is(".ui-toggle-switch") || (slider.is(".ui-toggle-switch") && slider.find(".ui-slider-handle").is(".ui-btn-hover-s"))) ) { ++ if ( self.dragging && !self.options.disabled && (!$(self.element).siblings(".ui-slider").is(".ui-toggle-switch") || (( $(event.target).find(".ui-slider-switch") === $(self.element) ) && slider.is(".ui-toggle-switch") && $(self.element).siblings(".ui-slider").find(".ui-slider-handle").is(".ui-btn-hover-s"))) ) { + // divide jQM and Tizen slider on dragging outside of toggle area // self.mouseMoved must be updated before refresh() because it will be used in the control "change" event diff --git a/packaging/web-ui-fw.spec b/packaging/web-ui-fw.spec index 98d2e4a8..f1ec45e8 100644 --- a/packaging/web-ui-fw.spec +++ b/packaging/web-ui-fw.spec @@ -1,5 +1,5 @@ Name: web-ui-fw -Version: 0.2.28 +Version: 0.2.29 Release: 0 Summary: Tizen Web UI Framework Library Group: Development/Other @@ -97,6 +97,13 @@ Summary: Tizen Web UI Framework Demo Application: tizen winset demo ############################### %changelog +* Fri May 10 2013 Hyunjung Kim <hjnim.kim@samsung.com> 0.2.29 + - loader: change a warn msg to debug msg + - Radio: Radio issue has been fixed ( N_SE-38015 ) + - Add gallery3D source to the flora license list + - Slider: JQM patch fixed ( event.target match ) + - Tizen-winset: remove unnecessary file + * Tue May 07 2013 Hyunjung kim <hjnim.kim@samsung.com> 0.2.28 - Orientation : add landscape UX - ToggleSwitch : divide jQM and Tizen slider on dragging outside of toggle area diff --git a/src/js/jquery.mobile.tizen.loader.js b/src/js/jquery.mobile.tizen.loader.js index dc14f898..995d2bac 100644 --- a/src/js/jquery.mobile.tizen.loader.js +++ b/src/js/jquery.mobile.tizen.loader.js @@ -146,7 +146,7 @@ If developers do not give a viewport meta tag, Tizen Web UI Framework automatica } if ( l ) { // Found the link element! if ( l.getAttribute( 'href' ) == path ) { - tizen.log.warn( "Theme is already loaded. Skip theme loading in the framework." ); + tizen.log.debug( "Theme is already loaded. Skip theme loading in the framework." ); } else { l.setAttribute( 'href', path ); } @@ -401,7 +401,7 @@ If developers do not give a viewport meta tag, Tizen Web UI Framework automatica if ( meta ) { // Found custom viewport! content = $( meta ).prop( "content" ); viewportWidth = content.replace( /.*width=(device-width|\d+)\s*,?.*$/gi, "$1" ); - tizen.log.warn( "Viewport is set to '" + viewportWidth + "' in a meta tag. Framework skips viewport setting." ); + tizen.log.debug( "Viewport is set to '" + viewportWidth + "' in a meta tag. Framework skips viewport setting." ); } else { // Create a meta tag meta = document.createElement( "meta" ); |