From 86466f072ba0affac218ae34dedbe1f4272a2099 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sun, 17 May 2015 16:31:15 +0200
Subject: [PATCH] Fix preview label issue.

---
 src/_h5ai/public/js/inc/ext/preview-img.js | 2 +-
 src/_h5ai/public/js/inc/ext/preview-txt.js | 2 +-
 src/_h5ai/public/js/inc/ext/preview.js     | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/_h5ai/public/js/inc/ext/preview-img.js b/src/_h5ai/public/js/inc/ext/preview-img.js
index a07f91f4..34029050 100644
--- a/src/_h5ai/public/js/inc/ext/preview-img.js
+++ b/src/_h5ai/public/js/inc/ext/preview-img.js
@@ -111,10 +111,10 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/event', 'core/server', 'core
 
         currentItems = items;
         currentIdx = idx;
-        onIdxChange(0);
         preview.setOnIndexChange(onIdxChange);
         preview.setOnAdjustSize(onAdjustSize);
         preview.enter();
+        onIdxChange(0);
     }
 
     function initItem(item) {
diff --git a/src/_h5ai/public/js/inc/ext/preview-txt.js b/src/_h5ai/public/js/inc/ext/preview-txt.js
index a2fe5837..06390066 100644
--- a/src/_h5ai/public/js/inc/ext/preview-txt.js
+++ b/src/_h5ai/public/js/inc/ext/preview-txt.js
@@ -108,10 +108,10 @@ modulejs.define('ext/preview-txt', ['_', '$', 'marked', 'prism', 'core/event', '
         currentItems = items;
         currentIdx = idx;
         currentItem = items[idx];
-        onIdxChange(0);
         preview.setOnIndexChange(onIdxChange);
         preview.setOnAdjustSize(onAdjustSize);
         preview.enter();
+        onIdxChange(0);
     }
 
     function initItem(item) {
diff --git a/src/_h5ai/public/js/inc/ext/preview.js b/src/_h5ai/public/js/inc/ext/preview.js
index af217e37..0fe90958 100644
--- a/src/_h5ai/public/js/inc/ext/preview.js
+++ b/src/_h5ai/public/js/inc/ext/preview.js
@@ -65,6 +65,8 @@ modulejs.define('ext/preview', ['_', '$', 'core/resource', 'core/settings', 'cor
 
     function onEnter() {
 
+        setLabels([]);
+        $('#pv-content').empty();
         $('#pv-overlay').stop(true, true).fadeIn(200);
         $window.on('keydown', onKeydown);
         adjustSize();