wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit 44d95b1f783b041dbaee47b60b3a7d27aea60581 2 parents 17251c79 cf88b88e

code review by zhifeng.liang : do feature v3.2.5

Inline Side-by-side
Showing 2 changed files with 16 additions and 8 deletions
... ... @@ -5537,7 +5537,9 @@ function disableNumEdit() {
function show(html, cb) {
var scrollPosition = [
var $html = $('html, body');
/*var scrollPosition = [
document.documentElement.scrollLeft || document.body.scrollLeft,
document.documentElement.scrollTop || document.body.scrollTop
],
... ... @@ -5547,7 +5549,7 @@ function show(html, cb) {
$html.data('previous-overflow', $html.css('overflow'));
$html.css('overflow', 'hidden');
$html.css('height', '100%');
window.scrollTo(scrollPosition[0], scrollPosition[1]);
window.scrollTo(scrollPosition[0], scrollPosition[1]);*/
if (html) {
$chosePanel.html(html);
... ... @@ -5563,13 +5565,15 @@ function show(html, cb) {
//隐藏当前Panel
function hide() {
var $html = $('html, body'),
$html = $('html, body');
/*var $html = $('html, body'),
scrollPosition = $html.data('scroll-position');
// un-lock scroll position
$html.css('overflow', $html.data('previous-overflow'));
$html.css('height', 'auto');
window.scrollTo(scrollPosition[0], scrollPosition[1]);
window.scrollTo(scrollPosition[0], scrollPosition[1]);*/
$('.chose-panel').hide();
}
... ...
... ... @@ -112,7 +112,9 @@ function disableNumEdit() {
function show(html, cb) {
var scrollPosition = [
var $html = $('html, body');
/*var scrollPosition = [
document.documentElement.scrollLeft || document.body.scrollLeft,
document.documentElement.scrollTop || document.body.scrollTop
],
... ... @@ -122,7 +124,7 @@ function show(html, cb) {
$html.data('previous-overflow', $html.css('overflow'));
$html.css('overflow', 'hidden');
$html.css('height', '100%');
window.scrollTo(scrollPosition[0], scrollPosition[1]);
window.scrollTo(scrollPosition[0], scrollPosition[1]);*/
if (html) {
$chosePanel.html(html);
... ... @@ -138,13 +140,15 @@ function show(html, cb) {
//隐藏当前Panel
function hide() {
var $html = $('html, body'),
$html = $('html, body');
/*var $html = $('html, body'),
scrollPosition = $html.data('scroll-position');
// un-lock scroll position
$html.css('overflow', $html.data('previous-overflow'));
$html.css('height', 'auto');
window.scrollTo(scrollPosition[0], scrollPosition[1]);
window.scrollTo(scrollPosition[0], scrollPosition[1]);*/
$('.chose-panel').hide();
}
... ...