[Fusionforge-commits] FusionForge branch master updated. ad93d988fc4396f37b676ce86779ad7b9f9c5b3f

[Franck VILLAUME]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  ad93d988fc4396f37b676ce86779ad7b9f9c5b3f (commit)
      from  9bfc6a4d2cc6346b573504b2bb9ab6f025344d7d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ad93d988fc4396f37b676ce86779ad7b9f9c5b3f
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Oct 19 19:58:15 2013 +0200

    docman: workaround for correct height calculation

diff --git a/src/www/docman/scripts/DocManController.js b/src/www/docman/scripts/DocManController.js
index b40d74e..83d1b96 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -63,12 +63,16 @@ DocManListFileController.prototype =
 	resizableDiv: function() {
 		var splitterPosition = '30%';
 		var mainwidth = jQuery('#maindiv').width();
+		var fixheight = 40;
+		if (this.params.divEditFile !== undefined) {
+			fixheight = this.params.divEditFile.height() - 40;
+		}
 		if (jQuery.Storage.get('splitterStyle') !== undefined) {
 			storedSplitterPosition = jQuery.Storage.get('splitterStyle').replace(/px;/g, '').replace(/left: /g, '');
 			splitterPosition = Math.round(storedSplitterPosition * 100 / mainwidth )+'%';
 		}
 		(jQuery(this.params.divLeft).height() > jQuery(this.params.divRight).height()) ? mainheight = jQuery(this.params.divLeft).height() : mainheight = jQuery(this.params.divRight).height();
-		jQuery('#views').height(mainheight)
+		jQuery('#views').height(mainheight - fixheight)
 				.split({orientation:'vertical', limit:100, position: splitterPosition});
 		jQuery('.vsplitter').mouseup(function(){
 			jQuery.Storage.set('splitterStyle',''+jQuery('.vsplitter').attr('style'));

-----------------------------------------------------------------------

Summary of changes:
 src/www/docman/scripts/DocManController.js |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge