From 72c7b32a941a7a52da70cf8e2b0eec89267f475d Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Wed, 21 Aug 2013 23:00:33 +0200
Subject: [PATCH] Preview updates.

---
 src/_h5ai/client/css/inc/preview-img.less  |  4 +-
 src/_h5ai/client/css/inc/preview-txt.less  |  6 +--
 src/_h5ai/client/css/inc/preview.less      |  1 -
 src/_h5ai/client/js/inc/ext/preview-txt.js | 44 ++++++++--------------
 src/_h5ai/client/js/inc/ext/preview.js     |  2 +-
 5 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/src/_h5ai/client/css/inc/preview-img.less b/src/_h5ai/client/css/inc/preview-img.less
index 7ca5b28a..4a1fe130 100644
--- a/src/_h5ai/client/css/inc/preview-img.less
+++ b/src/_h5ai/client/css/inc/preview-img.less
@@ -12,5 +12,7 @@
 		-webkit-linear-gradient(45deg, @check-black 25%, transparent 25%, transparent 75%, @check-black 75%, @check-black),
 		-webkit-linear-gradient(45deg, @check-black 25%, transparent 25%, transparent 75%, @check-black 75%, @check-black);
 	background-size: 60px 60px;
-	background-position: 0 0, 30px 30px
+	background-position: 0 0, 30px 30px;
+
+	box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.3);
 }
diff --git a/src/_h5ai/client/css/inc/preview-txt.less b/src/_h5ai/client/css/inc/preview-txt.less
index 0d3fcce4..68bff18e 100644
--- a/src/_h5ai/client/css/inc/preview-txt.less
+++ b/src/_h5ai/client/css/inc/preview-txt.less
@@ -1,14 +1,14 @@
 
 #pv-txt-text {
-	max-width: 800px;
-	max-height: 100%;
-	height: 100%;
+	max-width: 960px;
 	text-align: left;
 	background-color: #fff;
 	margin: 0 auto;
 	padding: 8px;
 	overflow: auto;
 
+	box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.3);
+
 	&.highlighted {
 		word-break: break-all;
 
diff --git a/src/_h5ai/client/css/inc/preview.less b/src/_h5ai/client/css/inc/preview.less
index 3ca1895f..b3c29289 100644
--- a/src/_h5ai/client/css/inc/preview.less
+++ b/src/_h5ai/client/css/inc/preview.less
@@ -20,7 +20,6 @@
 
 #pv-content {
 	position: absolute;
-	overflow: hidden;
 }
 
 #pv-spinner {
diff --git a/src/_h5ai/client/js/inc/ext/preview-txt.js b/src/_h5ai/client/js/inc/ext/preview-txt.js
index adc2b7ce..ef5fcf12 100644
--- a/src/_h5ai/client/js/inc/ext/preview-txt.js
+++ b/src/_h5ai/client/js/inc/ext/preview-txt.js
@@ -92,32 +92,6 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/event', 'ex
 			loadScript(allsettings.h5aiAbsHref + 'client/js/markdown.js', 'markdown', callback);
 		},
 
-		adjustSize = function () {
-
-			var $window = $(window),
-				$container = $('#pv-txt-content'),
-				$spinner = $('#pv-txt-spinner'),
-				$spinnerimg = $spinner.find('img').width(100).height(100),
-				margin = 20,
-				barheight = 31;
-
-			$container.css({
-				height: $window.height() - 2 * margin - barheight - 32,
-				top: margin
-			});
-
-			$spinner.css({
-				width: $window.width() - 2 * margin,
-				height: $window.height() - 2 * margin - barheight,
-				left: margin,
-				top: margin
-			});
-
-			$spinnerimg.css({
-				margin: '' + (($spinner.height() - $spinnerimg.height()) / 2) + 'px ' + (($spinner.width() - $spinnerimg.height()) / 2) + 'px'
-			});
-		},
-
 		preloadText = function (absHref, callback) {
 
 			$.ajax({
@@ -141,6 +115,17 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/event', 'ex
 				currentIdx = idx,
 				currentItem = items[idx],
 
+				onAdjustSize = function () {
+
+					var $content = $('#pv-content'),
+						$text = $('#pv-txt-text');
+
+					if ($text.length) {
+
+						$text.height($content.height() - 16);
+					}
+				},
+
 				onIdxChange = function (rel) {
 
 					currentIdx = (currentIdx + rel + currentItems.length) % currentItems.length;
@@ -158,8 +143,8 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/event', 'ex
 							var $text;
 
 							if (currentItem.type === 'markdown') {
+
 								$text = $(templateMarkdown).text(textContent);
-								$text.replaceWith($text);
 
 								loadMarkdown(function (md) {
 
@@ -168,8 +153,8 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/event', 'ex
 									}
 								});
 							} else {
+
 								$text = $(templateText).text(textContent);
-								$text.replaceWith($text);
 
 								loadSyntaxhighlighter(function (sh) {
 
@@ -187,8 +172,8 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/event', 'ex
 									}
 								});
 							}
-
 							$('#pv-content').empty().append($text).fadeIn(200);
+							onAdjustSize();
 
 							preview.setIndex(currentIdx + 1, currentItems.length);
 							preview.setLabels([
@@ -202,6 +187,7 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/event', 'ex
 
 			onIdxChange(0);
 			preview.setOnIndexChange(onIdxChange);
+			preview.setOnAdjustSize(onAdjustSize);
 			preview.enter();
 		},
 
diff --git a/src/_h5ai/client/js/inc/ext/preview.js b/src/_h5ai/client/js/inc/ext/preview.js
index 7e2e4016..ec864176 100644
--- a/src/_h5ai/client/js/inc/ext/preview.js
+++ b/src/_h5ai/client/js/inc/ext/preview.js
@@ -244,7 +244,7 @@ modulejs.define('ext/preview', ['_', '$', 'core/settings', 'core/resource', 'cor
 			var fsTimer = null;
 			$('#pv-overlay')
 				.on('keydown', onKeydown)
-				.on('mousemove', onMouseMove)
+				.on('mousemove click mousedown', onMouseMove)
 				.on('click mousedown mousemove keydown keypress', function (event) {
 
 					event.stopImmediatePropagation();