[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[39275] trunk

[<rob...@us...>]

Revision: 39275
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=39275&view=rev
Author:   robertplummer
Date:     2011-12-22 22:30:54 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
[FIX] Make sure that the close event is handled correctly.

Modified Paths:
--------------
    trunk/lib/core/Services/Draw/Controller.php
    trunk/templates/fgal_context_menu.tpl
    trunk/templates/tiki-edit_draw.tpl

Modified: trunk/lib/core/Services/Draw/Controller.php
===================================================================
--- trunk/lib/core/Services/Draw/Controller.php	2011-12-22 22:15:20 UTC (rev 39274)
+++ trunk/lib/core/Services/Draw/Controller.php	2011-12-22 22:30:54 UTC (rev 39275)
@@ -30,5 +30,10 @@
 		
 		include_once 'tiki-edit_draw.php';
 	}
+	
+	function action_replace($input)
+	{
+		//just a dummy for now, filegallery handles it all
+	}
 }
 

Modified: trunk/templates/fgal_context_menu.tpl
===================================================================
--- trunk/templates/fgal_context_menu.tpl	2011-12-22 22:15:20 UTC (rev 39274)
+++ trunk/templates/fgal_context_menu.tpl	2011-12-22 22:30:54 UTC (rev 39275)
@@ -221,7 +221,8 @@
 						controller: 'draw',
 						action: 'edit',
 						fileId: me.data('fileid'),
-						galleryId: me.data('galleryid')
+						galleryId: me.data('galleryid'),
+						modal: true
 					},
 					load: function () {
 						var draw = $('#tiki_draw').loadDraw({
@@ -229,18 +230,10 @@
 							galleryId: me.data('galleryid'),
 							name: me.data('name'),
 							data: $('#fileData').val()
+						}).bind('savedDraw', function() {
+							draw.parent().dialog('close');
 						});
 						
-						var drawFrame = draw.find('iframe').andSelf();
-						var drawParent = draw.parent().css('padding', '0px');
-						var drawDialog = draw.parent().parent();
-						
-						drawDialog
-							.resize(function(){
-								drawFrame.height(drawParent.height() - 5);
-							})
-							.resize();
-						
 					}
 				});
 				

Modified: trunk/templates/tiki-edit_draw.tpl
===================================================================
--- trunk/templates/tiki-edit_draw.tpl	2011-12-22 22:15:20 UTC (rev 39274)
+++ trunk/templates/tiki-edit_draw.tpl	2011-12-22 22:30:54 UTC (rev 39275)
@@ -3,7 +3,7 @@
 	{title help="Draw"}{$name}{/title}
 {/if}
 
-<form id="tiki_draw" style="text-align: center;" onsubmit="$('#tiki_draw').saveDraw();return false;">
+<form id="tiki_draw" class="submit" style="text-align: center;" onsubmit="$('#tiki_draw').saveDraw();return false;">
 	<span style="display: none;">
 		<textarea id="fileData">{$data}</textarea>
 	</span>
@@ -14,6 +14,7 @@
 	<input type="hidden" id="fileWidth" value="{$width}" />
 	<input type="hidden" id="fileHeight" value="{$hight}" />
 	<input type="hidden" id="archive" value="{$archive}" />
+	<input type="hidden" name="action" value="replace" />
 	
 	<div id="drawEditor">
 		<div id="drawMenu">
@@ -23,7 +24,7 @@
 				<button id="drawBack">{tr}Back{/tr}</button>
 				<button id="drawFullscreen">{tr}Toggle Fullscreen{/tr}</button>
 			{else}
-				<input type="submit" value="{tr}Save{/tr}" />
+				<input type="submit" style="display: none;" value="{tr}Save{/tr}" />
 			{/if}
 		</div>
 	</div>

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