diff options
| author | Jinhyuk Jun <jinhyuk.jun@samsung.com> | 2013-05-06 22:19:02 +0900 |
|---|---|---|
| committer | hjnim.kim <hjnim.kim@samsung.com> | 2013-05-07 11:48:06 +0900 |
| commit | 04f9fd18d7d5436ebd03c74428ff5b4a3b02590e (patch) | |
| tree | 27380f673b0b811c73e00a1f6a998a88d0670f3b | |
| parent | cab890c3fcf175d5981ec57c069946d026813800 (diff) | |
| download | web-ui-fw-04f9fd18d7d5436ebd03c74428ff5b4a3b02590e.tar.gz web-ui-fw-04f9fd18d7d5436ebd03c74428ff5b4a3b02590e.tar.bz2 web-ui-fw-04f9fd18d7d5436ebd03c74428ff5b4a3b02590e.zip | |
ToggleSwitch : divide jQM and Tizen slider on dragging outside of toggle area(N_SE-37574)
Change-Id: Ib0665254ec116d0842ebe4a33f3b5de6516564d4
| -rw-r--r-- | libs/patch/0045-JQM-divide-jQM-and-Tizen-slider-on-dragging-outside-.patch | 29 |
1 files changed, 29 insertions, 0 deletions
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 new file mode 100644 index 00000000..9769a5e7 --- /dev/null +++ b/libs/patch/0045-JQM-divide-jQM-and-Tizen-slider-on-dragging-outside-.patch @@ -0,0 +1,29 @@ +From 7bc858f22f86693de110b1b8186fc0e26f5cccff Mon Sep 17 00:00:00 2001 +From: Jinhyuk Jun <jinhyuk.jun@samsung.com> +Date: Mon, 6 May 2013 22:17:30 +0900 +Subject: [PATCH] JQM divide jQM and Tizen slider on dragging outside of slide + area + +Change-Id: Ib691ec0f2ae7edacc6f0b98d43231e48933b2afc +--- + .../jquery-mobile-1.2.0/js/widgets/forms/slider.js | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +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 b189714..dae5dce 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 +@@ -160,8 +160,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 ) { ++ 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"))) ) { + ++ // 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; + +-- +1.7.9.5 + |