[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[43882] branches/10.x/lib/jquery_tiki/tiki-jquery.js

[<lph...@us...>]

Revision: 43882
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43882&view=rev
Author:   lphuberdeau
Date:     2012-11-10 15:09:26 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
[FIX] Re-enable side-by-side diff

Modified Paths:
--------------
    branches/10.x/lib/jquery_tiki/tiki-jquery.js

Modified: branches/10.x/lib/jquery_tiki/tiki-jquery.js
===================================================================
--- branches/10.x/lib/jquery_tiki/tiki-jquery.js	2012-11-10 14:33:49 UTC (rev 43881)
+++ branches/10.x/lib/jquery_tiki/tiki-jquery.js	2012-11-10 15:09:26 UTC (rev 43882)
@@ -860,6 +860,24 @@
 	}
 });
 
+function sideBySideDiff() {
+	var $diff = $('#diff_outer'), $zone = $('.edit-zone');
+	if ($diff.size()) {
+		$diff.css({
+			position: 'absolute',
+			top: $zone.css('top'),
+			bottom: $zone.css('bottom'),
+			right: 0,
+			'background-color': 'white',
+			'z-index': 500000,
+			opacity: 1
+		});
+		$diff.height($zone.height());
+		$diff.width($zone.width() / 2);
+		$zone.width($zone.width() / 2);
+	}
+}
+
 function toggleFullScreen(area_id) {
 	var textarea = $("#" + area_id);
 	
@@ -867,6 +885,7 @@
 	var textareaEditor = syntaxHighlighter.get(textarea);
 	if (textareaEditor) {
 		syntaxHighlighter.fullscreen(textarea);
+		sideBySideDiff();
 		return;
 	}
 
@@ -900,6 +919,8 @@
 	} else {
 		$window.removeData('cm-resize');
 	}
+
+	sideBySideDiff();
 }
 
 /* Simple tiki plugin for jQuery

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.