Authored by hf

Merge remote-tracking branch 'origin/develop'

@@ -117,7 +117,8 @@ $('.info-list .title, .one-good .reco-name').each(function() { @@ -117,7 +117,8 @@ $('.info-list .title, .one-good .reco-name').each(function() {
117 }); 117 });
118 118
119 //offset.left约等于marginLeft的值则表示介绍被换行,则清除intro的paddingTop让其更靠近头像和作者名 119 //offset.left约等于marginLeft的值则表示介绍被换行,则清除intro的paddingTop让其更靠近头像和作者名
120 -if ($authorIntro && (parseInt($authorIntro.offset().left, 10) === parseInt($authorIntro.css('margin-left'), 10))) { 120 +if ($authorIntro.offset() && (parseInt($authorIntro.offset().left, 10) ===
  121 + parseInt($authorIntro.css('margin-left'), 10))) {
121 $authorIntro.css('padding-top', 0); 122 $authorIntro.css('padding-top', 0);
122 } 123 }
123 124
@@ -18,7 +18,7 @@ function init($container) { @@ -18,7 +18,7 @@ function init($container) {
18 var html = '<div class="loading-mask hide"><div class="loading"></div></div>'; 18 var html = '<div class="loading-mask hide"><div class="loading"></div></div>';
19 19
20 hasInit = true; 20 hasInit = true;
21 - if ($container === undefined) { 21 + if (typeof $container === 'undefined') {
22 $container = $page; 22 $container = $page;
23 } 23 }
24 24