Showing
2 changed files
with
8 additions
and
4 deletions
@@ -5537,7 +5537,9 @@ function disableNumEdit() { | @@ -5537,7 +5537,9 @@ function disableNumEdit() { | ||
5537 | 5537 | ||
5538 | 5538 | ||
5539 | function show(html, cb) { | 5539 | function show(html, cb) { |
5540 | - var scrollPosition = [ | 5540 | + var $html = $('html, body'); |
5541 | + | ||
5542 | + /*var scrollPosition = [ | ||
5541 | document.documentElement.scrollLeft || document.body.scrollLeft, | 5543 | document.documentElement.scrollLeft || document.body.scrollLeft, |
5542 | document.documentElement.scrollTop || document.body.scrollTop | 5544 | document.documentElement.scrollTop || document.body.scrollTop |
5543 | ], | 5545 | ], |
@@ -5547,7 +5549,7 @@ function show(html, cb) { | @@ -5547,7 +5549,7 @@ function show(html, cb) { | ||
5547 | $html.data('previous-overflow', $html.css('overflow')); | 5549 | $html.data('previous-overflow', $html.css('overflow')); |
5548 | $html.css('overflow', 'hidden'); | 5550 | $html.css('overflow', 'hidden'); |
5549 | $html.css('height', '100%'); | 5551 | $html.css('height', '100%'); |
5550 | - window.scrollTo(scrollPosition[0], scrollPosition[1]); | 5552 | + window.scrollTo(scrollPosition[0], scrollPosition[1]);*/ |
5551 | 5553 | ||
5552 | if (html) { | 5554 | if (html) { |
5553 | $chosePanel.html(html); | 5555 | $chosePanel.html(html); |
@@ -5563,13 +5565,15 @@ function show(html, cb) { | @@ -5563,13 +5565,15 @@ function show(html, cb) { | ||
5563 | 5565 | ||
5564 | //隐藏当前Panel | 5566 | //隐藏当前Panel |
5565 | function hide() { | 5567 | function hide() { |
5566 | - var $html = $('html, body'), | 5568 | + $html = $('html, body'); |
5569 | + | ||
5570 | + /*var $html = $('html, body'), | ||
5567 | scrollPosition = $html.data('scroll-position'); | 5571 | scrollPosition = $html.data('scroll-position'); |
5568 | 5572 | ||
5569 | // un-lock scroll position | 5573 | // un-lock scroll position |
5570 | $html.css('overflow', $html.data('previous-overflow')); | 5574 | $html.css('overflow', $html.data('previous-overflow')); |
5571 | $html.css('height', 'auto'); | 5575 | $html.css('height', 'auto'); |
5572 | - window.scrollTo(scrollPosition[0], scrollPosition[1]); | 5576 | + window.scrollTo(scrollPosition[0], scrollPosition[1]);*/ |
5573 | $('.chose-panel').hide(); | 5577 | $('.chose-panel').hide(); |
5574 | } | 5578 | } |
5575 | 5579 |
This diff could not be displayed because it is too large.
-
Please register or login to post a comment