From: hjnim.kim Date: Fri, 10 May 2013 05:50:45 +0000 (+0900) Subject: Merge branch 'merge' into tizen_2.1 X-Git-Tag: accepted/tizen/20130520.101609 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Faccepted%2Ftizen%2F20130520.101609;hp=ea8197757f1563e931913386d2904de99348c511;p=platform%2Fframework%2Fweb%2Fweb-ui-fw.git Merge branch 'merge' into tizen_2.1 --- diff --git a/COPYING b/COPYING index cb29a5f..3749438 100644 --- a/COPYING +++ b/COPYING @@ -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 71b376d..0000000 --- a/demos/tizen-winsets/widgets/1 +++ /dev/null @@ -1,18 +0,0 @@ - - diff --git a/demos/tizen-winsets/widgets/radio/radio.html b/demos/tizen-winsets/widgets/radio/radio.html index 21042ff..64754af 100644 --- a/demos/tizen-winsets/widgets/radio/radio.html +++ b/demos/tizen-winsets/widgets/radio/radio.html @@ -47,10 +47,11 @@

- + - + + 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 9769a5e..d71dd54 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 98d2e4a..f1ec45e 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 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 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 dc14f89..995d2ba 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" );