From 028c931b741f2a5782c6e354b1099754d548d6dd Mon Sep 17 00:00:00 2001 From: Youmin Ha Date: Sat, 29 Jun 2013 20:25:26 +0900 Subject: [PATCH] 0.2.44 sync for JQM patches Change-Id: I883ee08094480ae1d0205ea6057ede58b420cdbb --- libs/patch/0049-JQM-Remove-scrollTo-method.patch | 26 +++++++ libs/patch/0049-JQM-cancle-0021-0045-patch.patch | 91 ++++++++++++++++++++++++ libs/patch/0050-JQM-change-toggleswitch-ux.patch | 59 +++++++++++++++ 3 files changed, 176 insertions(+) create mode 100644 libs/patch/0049-JQM-Remove-scrollTo-method.patch create mode 100644 libs/patch/0049-JQM-cancle-0021-0045-patch.patch create mode 100644 libs/patch/0050-JQM-change-toggleswitch-ux.patch diff --git a/libs/patch/0049-JQM-Remove-scrollTo-method.patch b/libs/patch/0049-JQM-Remove-scrollTo-method.patch new file mode 100644 index 0000000..acdb41f --- /dev/null +++ b/libs/patch/0049-JQM-Remove-scrollTo-method.patch @@ -0,0 +1,26 @@ +From bef92c34a367fdeb6ffb043232645207984e177d Mon Sep 17 00:00:00 2001 +From: "kangsik81.kim" +Date: Fri, 28 Jun 2013 13:24:59 +0900 +Subject: [PATCH] JQM: Remove scrollTo method. + +This patch is made to prevent a symptoms that is showing browser's scrollbar when webapp launched. +--- + .../jquery-mobile-1.2.0/js/jquery.mobile.init.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.init.js b/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.init.js +index d31ddf0..5426059 100644 +--- a/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.init.js ++++ b/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.init.js +@@ -122,7 +122,7 @@ define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.support", "./jquery + // then check what the scroll top is. Android will report 0... others 1 + // note that this initial scroll won't hide the address bar. It's just for the check. + $(function() { +- window.scrollTo( 0, 1 ); ++ // window.scrollTo( 0, 1 ); + + // if defaultHomeScroll hasn't been set yet, see if scrollTop is 1 + // it should be 1 in most browsers, but android treats 1 as 0 (for hiding addr bar) +-- +1.7.9.5 + diff --git a/libs/patch/0049-JQM-cancle-0021-0045-patch.patch b/libs/patch/0049-JQM-cancle-0021-0045-patch.patch new file mode 100644 index 0000000..5f22e33 --- /dev/null +++ b/libs/patch/0049-JQM-cancle-0021-0045-patch.patch @@ -0,0 +1,91 @@ +From e4de6ef9867ec773f2741f42532c364063ce6c2a Mon Sep 17 00:00:00 2001 +From: "hc7.choi" +Date: Mon, 17 Jun 2013 20:56:18 +0900 +Subject: [PATCH] JQM cancle 0021,0045 patch + +--- + .../jquery-mobile-1.2.0/js/widgets/forms/slider.js | 46 ++++---------------- + 1 file changed, 9 insertions(+), 37 deletions(-) + +diff --git a/libs/js/jquery-mobile-1.2.0/js/widgets/forms/slider.js b/libs/js/jquery-mobile-1.2.0/js/widgets/forms/slider.js +index a56ac51..7a519b9 100644 +--- a/libs/js/jquery-mobile-1.2.0/js/widgets/forms/slider.js ++++ b/libs/js/jquery-mobile-1.2.0/js/widgets/forms/slider.js +@@ -81,10 +81,6 @@ $.widget( "mobile.slider", $.mobile.widget, { + domHandle.className = 'ui-slider-handle'; + domSlider.appendChild( domHandle ); + +- if ( $( control ).find( "option" ).length && $( control ).find( "option" ).text() === "" ) { +- $( domSlider ).addClass( "ui-toggle-switch" ); +- } +- + handle.buttonMarkup({ corners: true, theme: theme, shadow: true }) + .attr({ + "role": "slider", +@@ -160,7 +156,7 @@ $.widget( "mobile.slider", $.mobile.widget, { + this._preventDocumentDrag = function( event ) { + // 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 && (!$(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"))) ) { ++ if ( self.dragging && !self.options.disabled ) { + + // 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 +@@ -330,12 +326,6 @@ $.widget( "mobile.slider", $.mobile.widget, { + }, + + refresh: function( val, isfromControl, preventInputUpdate ) { +- var imgToggle = false, +- appHandle; +- +- if ( $( this.handle ).parents().is( ".ui-toggle-switch" ) ) { +- imgToggle = true; +- } + // NOTE: we don't return here because we want to support programmatic + // alteration of the input value, which should still update the slider + if ( this.options.disabled || this.element.attr('disabled')) { +@@ -408,33 +398,15 @@ $.widget( "mobile.slider", $.mobile.widget, { + title: cType === "input" ? newval : control.find( "option" ).eq( newval ).getEncodedText() + }); + +- if ( !imgToggle ) { +- if ( this.valuebg ) { +- this.valuebg.css( "width", percent + "%" ); +- } +- } ++ if ( this._labels ) { ++ var handlePercent = this.handle.width() / this.slider.width() * 100, ++ aPercent = percent && handlePercent + ( 100 - handlePercent ) * percent / 100, ++ bPercent = percent === 100 ? 0 : Math.min( handlePercent + 100 - aPercent, 100 ); + +- // drag the label widths +- if ( imgToggle ) { +- appHandle = $( this.handle ).parents( ".ui-slider" ); +- if ( $( this.handle ).attr("aria-valuenow") === "on" || $( this.handle ).attr("aria-valuenow") === $( this.element ).children( "option:last" ).attr( "value" ) ) { +- appHandle.children( "span.ui-slider-label-a" ).show(); +- appHandle.children( "span.ui-slider-label-b" ).hide(); +- } else { +- appHandle.children( "span.ui-slider-label-b" ).show(); +- appHandle.children( "span.ui-slider-label-a" ).hide(); +- } +- } else { +- if ( this._labels ) { +- var handlePercent = this.handle.width() / this.slider.width() * 100, +- aPercent = percent && handlePercent + ( 100 - handlePercent ) * percent / 100, +- bPercent = percent === 100 ? 0 : Math.min( handlePercent + 100 - aPercent, 100 ); +- +- this._labels.each(function() { +- var ab = $( this ).is( ".ui-slider-label-a" ); +- $( this ).width( ( ab ? aPercent : bPercent ) + "%" ); +- }); +- } ++ this._labels.each(function() { ++ var ab = $( this ).is( ".ui-slider-label-a" ); ++ $( this ).width( ( ab ? aPercent : bPercent ) + "%" ); ++ }); + } + + if ( !preventInputUpdate ) { +-- +1.7.9.5 + diff --git a/libs/patch/0050-JQM-change-toggleswitch-ux.patch b/libs/patch/0050-JQM-change-toggleswitch-ux.patch new file mode 100644 index 0000000..9d29da0 --- /dev/null +++ b/libs/patch/0050-JQM-change-toggleswitch-ux.patch @@ -0,0 +1,59 @@ +From 011bc8a62357881585373870e5d9ab5441bfeb46 Mon Sep 17 00:00:00 2001 +From: "hc7.choi" +Date: Tue, 18 Jun 2013 11:16:33 +0900 +Subject: [PATCH] JQM change toggleswitch ux + +--- + .../jquery-mobile-1.2.0/js/widgets/forms/slider.js | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/libs/js/jquery-mobile-1.2.0/js/widgets/forms/slider.js b/libs/js/jquery-mobile-1.2.0/js/widgets/forms/slider.js +index 7a519b9..313f3a7 100644 +--- a/libs/js/jquery-mobile-1.2.0/js/widgets/forms/slider.js ++++ b/libs/js/jquery-mobile-1.2.0/js/widgets/forms/slider.js +@@ -80,7 +80,9 @@ $.widget( "mobile.slider", $.mobile.widget, { + domSlider.className = ['ui-slider ',selectClass," ui-btn-down-",trackTheme,' ui-btn-corner-all', inlineClass, miniClass].join( "" ); + domHandle.className = 'ui-slider-handle'; + domSlider.appendChild( domHandle ); +- ++ if ( $( control ).find( "option" ).length && $( control ).find( "option" ).text() === "" ) { ++ $( domSlider ).addClass( "ui-toggle-switch" ); ++ } + handle.buttonMarkup({ corners: true, theme: theme, shadow: true }) + .attr({ + "role": "slider", +@@ -156,9 +158,9 @@ $.widget( "mobile.slider", $.mobile.widget, { + this._preventDocumentDrag = function( event ) { + // 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 ) { ++ var et = $(event.target); ++ if ( self.dragging && !self.options.disabled && ( ( et.parents( ".ui-slider" ).is( ".ui-toggle-switch" ) && et.parents( ".ui-slider-handle" ).is( ".ui-btn-hover-s" ) ) || ( !$( self.element ).siblings( ".ui-slider" ).is( ".ui-toggle-switch"))) ) { + +- // 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 + self.mouseMoved = true; + +@@ -326,6 +328,7 @@ $.widget( "mobile.slider", $.mobile.widget, { + }, + + refresh: function( val, isfromControl, preventInputUpdate ) { ++ + // NOTE: we don't return here because we want to support programmatic + // alteration of the input value, which should still update the slider + if ( this.options.disabled || this.element.attr('disabled')) { +@@ -398,6 +401,11 @@ $.widget( "mobile.slider", $.mobile.widget, { + title: cType === "input" ? newval : control.find( "option" ).eq( newval ).getEncodedText() + }); + ++ if ( this.valuebg ) { ++ this.valuebg.css( "width", percent + "%" ); ++ } ++ ++ // drag the label widths + if ( this._labels ) { + var handlePercent = this.handle.width() / this.slider.width() * 100, + aPercent = percent && handlePercent + ( 100 - handlePercent ) * percent / 100, +-- +1.7.9.5 + -- 2.7.4