view: Show loading image in two column mode

yona-projects · Apr 7, 2017 · dfd5d69 · dfd5d69
1 parent d8190be
commit dfd5d69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/assets/stylesheets/less/_page.less b/app/assets/stylesheets/less/_page.less
@@ -6850,10 +6850,10 @@ div.diff-body[data-outdated="true"] tr:hover .icon-comment {
     padding: 0;
 
     /* These styles are optional, and describe how the pageslide will look */
-    background-color: #333;
     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;
     box-shadow: 2px 2px 8px #000;
+    background: #FFF url('/assets/images/loading-gif-2.gif') no-repeat center;
 }
diff --git a/public/javascripts/service/yona.twoColumnMode.js b/public/javascripts/service/yona.twoColumnMode.js
@@ -27,6 +27,7 @@ function _initTwoColumnMode(){
             localStorage.setItem('useTwoColumnMode', true);
             attachPageSlideEvent($twoColumnMode, $title);
             bindFrameLoading();
+            $('#pageslide').html("<div>Loading...</div>");
         } else {
             localStorage.setItem('useTwoColumnMode', false);
             $('.post-item').css("cursor", "");
@@ -53,12 +54,15 @@ function _initTwoColumnMode(){
                 if($('#pageslide').is(":visible")){
                     $(".left-menu").hide(0);
                 }
+                NProgress.done();
                 return;
             } else {
                 lastClicked = this;
             }
 
-            $(".left-menu").hide(0);
+            if($('#pageslide').is(":visible")){
+                $(".left-menu").hide(0);
+            }
             setTimeout(function () {
                 $('#pageslide > iframe').ready(function () {
                     NProgress.done();