THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

view: Make more natural loading effect in two column mode

tags/v1.5.0
Suwon Chae 2 years ago
parent
commit
5fe12536a3
4 changed files with 5 additions and 5 deletions
  1. +0
    -2
      app/assets/stylesheets/less/_page.less
  2. BIN
      public/images/Loading.png
  3. +5
    -2
      public/javascripts/lib/jquery.pageslide.js
  4. +0
    -1
      public/javascripts/service/yona.twoColumnMode.js

+ 0
- 2
app/assets/stylesheets/less/_page.less View File

@@ -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;


BIN
public/images/Loading.png View File

Before After
Width: 92  |  Height: 19  |  Size: 1.5 KiB

+ 5
- 2
public/javascripts/lib/jquery.pageslide.js View File

@@ -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 );
}


+ 0
- 1
public/javascripts/service/yona.twoColumnMode.js View File

@@ -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", "");


Loading…
Cancel
Save