Hide loading indicator if not loading

rstudio · Mar 5, 2012 · d81e899 · d81e899
1 parent edc4f4d
commit d81e899
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/gwt/src/org/rstudio/studio/client/pdfviewer/pdfjs/PDFView.java b/src/gwt/src/org/rstudio/studio/client/pdfviewer/pdfjs/PDFView.java
@@ -14,6 +14,9 @@
 
 
 import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.dom.client.Document;
+import com.google.gwt.dom.client.Element;
+import com.google.gwt.dom.client.Style;
 import com.google.gwt.event.shared.HandlerManager;
 import com.google.gwt.event.shared.HandlerRegistration;
 import org.rstudio.studio.client.pdfviewer.pdfjs.events.PDFLoadEvent;
@@ -111,6 +114,15 @@ private static void firePDFLoadEvent()
       handlers_.fireEvent(new PDFLoadEvent());
    }
 
+   public static void setLoadingVisible(boolean visible)
+   {
+      Element el = Document.get().getElementById("loading");
+      if (visible)
+         el.removeAttribute("hidden");
+      else
+         el.setAttribute("hidden", "hidden");
+   }
+
    private static final HandlerManager handlers_ =
          new HandlerManager(PDFView.class);
 }
diff --git a/src/gwt/src/org/rstudio/studio/client/pdfviewer/ui/PDFViewerPanel.java b/src/gwt/src/org/rstudio/studio/client/pdfviewer/ui/PDFViewerPanel.java
@@ -26,6 +26,7 @@
 import org.rstudio.core.client.dom.WindowEx;
 import org.rstudio.studio.client.pdfviewer.PDFViewerPresenter;
 import org.rstudio.studio.client.pdfviewer.events.InitCompleteEvent;
+import org.rstudio.studio.client.pdfviewer.pdfjs.PDFView;
 import org.rstudio.studio.client.pdfviewer.pdfjs.PdfJs;
 
 public class PDFViewerPanel extends Composite
@@ -83,6 +84,8 @@ public void execute()
    @Override
    public void setURL(String url)
    {
+      PDFView.setLoadingVisible(true);
+
       if (loaded_)
          open(url);
       else

diff --git a/src/gwt/src/org/rstudio/studio/client/pdfviewer/ui/PDFViewerPanel.ui.xml b/src/gwt/src/org/rstudio/studio/client/pdfviewer/ui/PDFViewerPanel.ui.xml
@@ -128,7 +128,7 @@
         </div>
       </div>
 
-      <div id="loading">Loading... 0%</div>
+      <div id="loading" hidden="hidden">Loading... 0%</div>
       <div id="viewer"></div>
 
    </g:HTMLPanel>