diff --git a/CMakeLists.txt b/CMakeLists.txt index fe849be..eac8285 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -236,8 +236,7 @@ file (GLOB datafiles share/jquery.js share/manifest share/pdf2htmlEX.js - share/pdf2htmlEX-plain-62x62.png - share/pdf2htmlEX-shadow-64x64.png + share/pdf2htmlEX-64x64.png ) install (FILES ${datafiles} DESTINATION share/pdf2htmlEX) install (FILES pdf2htmlEX.1 DESTINATION share/man/man1) diff --git a/share/fancy.css.in b/share/fancy.css.in index ec00571..462484c 100644 --- a/share/fancy.css.in +++ b/share/fancy.css.in @@ -61,7 +61,6 @@ 90% { transform: rotate(720deg); } 100%{ transform: rotate(720deg); } } - @-webkit-keyframes swing { 0% { -webkit-transform: rotate(0deg); } 10% { -webkit-transform: rotate(0deg); } diff --git a/share/manifest b/share/manifest index 2a917b1..6b21367 100644 --- a/share/manifest +++ b/share/manifest @@ -39,7 +39,7 @@ pdf2htmlEX.defaultViewer = new pdf2htmlEX.Viewer({ container_id : 'page-container', sidebar_id : 'sidebar', outline_id : 'outline', - indicator_id : 'loading-indicator', + loading_indicator_id : 'loading-indicator', }); """ diff --git a/share/pdf2htmlEX-64x64.png b/share/pdf2htmlEX-64x64.png new file mode 100644 index 0000000..2238961 Binary files /dev/null and b/share/pdf2htmlEX-64x64.png differ diff --git a/share/pdf2htmlEX.js.in b/share/pdf2htmlEX.js.in index 7c9245b..b0601ec 100644 --- a/share/pdf2htmlEX.js.in +++ b/share/pdf2htmlEX.js.in @@ -128,6 +128,7 @@ var pdf2htmlEX = (function(){ this.container_id = config['container_id']; this.sidebar_id = config['sidebar_id']; this.outline_id = config['outline_id']; + this.loading_indicator_id = config['loading_indicator_id']; this.pages_to_preload = config['pages_to_preload'] || DEFAULT_PAGES_TO_PRELOAD; this.pages_loading = {}; this.init_before_loading_content(); @@ -150,6 +151,7 @@ var pdf2htmlEX = (function(){ this.$sidebar = $('#'+this.sidebar_id); this.$outline = $('#'+this.outline_id); this.$container = $('#'+this.container_id); + this.$loading_indicator = $('#'+this.loading_indicator_id); // Open the outline if nonempty if(this.$outline.children().length > 0) { @@ -196,6 +198,9 @@ var pdf2htmlEX = (function(){ if($pf.length == 0) return; // Page does not exist + $pf.append(this.$loading_indicator); + this.$loading_indicator.show(); + var _ = this; var url = $pf.data('page-url'); diff --git a/share/textured_paper.png b/share/textured_paper.png new file mode 100644 index 0000000..cc90981 Binary files /dev/null and b/share/textured_paper.png differ