view: Make more natural loading effect in two column mode

yona-projects · Apr 7, 2017 · 5fe1253 · 5fe1253
1 parent a5d9000
commit 5fe1253
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/app/assets/stylesheets/less/_page.less b/app/assets/stylesheets/less/_page.less
@@ -6843,7 +6843,6 @@ div.diff-body[data-outdated="true"] tr:hover .icon-comment {
 #pageslide {
     /* These styles MUST be included. Do not change. */
     display: none;
-    position: absolute;
     position: fixed;
     top: 0;
     height: 100%;
@@ -6854,7 +6853,6 @@ div.diff-body[data-outdated="true"] tr:hover .icon-comment {
     padding: 0;
 
     /* These styles are optional, and describe how the pageslide will look */
-    color: #FFF;
     -webkit-box-shadow: inset 0 0 5px 5px #222;
     -moz-shadow: inset 0 0 5px 5px #222;
     //box-shadow: inset 0 0 5px 5px #222;

diff --git a/public/images/Loading.png b/public/images/Loading.png
diff --git a/public/javascripts/lib/jquery.pageslide.js b/public/javascripts/lib/jquery.pageslide.js
@@ -51,7 +51,7 @@
         } else {
             // Load a URL. Into an iframe?
             if( useIframe ) {
-                var iframe = $("<iframe />").attr({
+                var iframe = $("<iframe allowtransparency='true' />").attr({
                     src: url,
                     frameborder: 0,
                     hspace: 0
@@ -157,7 +157,10 @@
                 _start( settings.direction, settings.speed );
             });
         } else {
-            _load( settings.href, settings.iframe );
+            setTimeout(function () {
+                _load(settings.href, settings.iframe);
+            }, 300);
+            $("#pageslide > iframe").remove();
             if( $pageslide.is(':hidden') ) {
                 _start( settings.direction, settings.speed );
             }

diff --git a/public/javascripts/service/yona.twoColumnMode.js b/public/javascripts/service/yona.twoColumnMode.js
@@ -32,7 +32,6 @@ function _initTwoColumnMode(){
             localStorage.setItem('useTwoColumnMode', true);
             attachPageSlideEvent($twoColumnMode, $title);
             bindFrameLoading();
-            $('#pageslide').html("<div>Loading...</div>");
         } else {
             localStorage.setItem('useTwoColumnMode', false);
             $('.post-item').removeClass('highlightBg').css("cursor", "");