From: <rob...@us...> - 2011-09-26 19:06:40
|
Revision: 37701 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37701&view=rev Author: robertplummer Date: 2011-09-26 19:06:33 +0000 (Mon, 26 Sep 2011) Log Message: ----------- [NEW] Added new method to draw.js [NEW] Added some testing script to play around with in tiki-edit_draw.php, add the request var "map" and watch the magic. Modified Paths: -------------- trunk/lib/svg-edit_tiki/draw.js trunk/tiki-edit_draw.php Modified: trunk/lib/svg-edit_tiki/draw.js =================================================================== --- trunk/lib/svg-edit_tiki/draw.js 2011-09-26 19:01:09 UTC (rev 37700) +++ trunk/lib/svg-edit_tiki/draw.js 2011-09-26 19:06:33 UTC (rev 37701) @@ -42,7 +42,6 @@ alert('error ' + o.error); } else { me.modal(tr("Saving...")); - alert(o.fileId); $.post('tiki-edit_draw.php', { galleryId: o.galleryId, fileId: o.fileId, @@ -125,17 +124,13 @@ me.data('fileId', o.fileId); me.data('galleryId', o.galleryId); me.data('name', o.name); + me.data('doc', $(me[0].contentDocument ? me[0].contentDocument : me[0].contentWindow.document)); $.svgCanvas[$.drawInstance] = new embedded_svg_edit(me[0]); $.svgWindow[$.drawInstance] = me[0].contentWindow; // Hide main button, as we will be controlling new/load/save etc from the host document - var mainButton = $( - me[0].contentDocument ? - me[0].contentDocument : - me[0].contentWindow.document - ) - .find('#main_button').hide(); + var mainButton = me.data('doc').find('#main_button').hide(); if (o.data) { $.svgCanvas[$.drawInstance].setSvgString(o.data); @@ -153,6 +148,31 @@ $.drawInstance++; + me.trigger('loadedDraw'); + return this; }); +}; + +$.fn.drawOver = function(o) { + var me = $(this); + $(o.draw) + .bind('loadedDraw', function() { + //we get the doc, because it is in an iframe, it is private and IT MUST be on the same domain + var doc = $(o.draw).data('doc'); + + var bg = doc.find('#canvasBackground') + .fadeTo(0.01, 0.01); + var root = doc.find('#svgroot'); + + me + .css('position', 'relative') + .css('z-index', 0) + //better size detection and positioning here + .css('left', (parseInt(1920 / 2) - 320) + 'px') + .css('top', (parseInt(1440 / 2) - 240) + 'px') + .insertBefore(root); + }); + + return this; }; \ No newline at end of file Modified: trunk/tiki-edit_draw.php =================================================================== --- trunk/tiki-edit_draw.php 2011-09-26 19:01:09 UTC (rev 37700) +++ trunk/tiki-edit_draw.php 2011-09-26 19:06:33 UTC (rev 37701) @@ -143,6 +143,19 @@ document.location = '$backLocation'; }); "); + +if (isset($_REQUEST['map'])) { + require_once("lib/wiki-plugins/wikiplugin_map.php"); + + echo wikiplugin_map(); + + $headerlib->add_jq_onready(" + $('#openlayers1').drawOver({ + draw: $('#svgedit'), + type: 'map' + }); + "); +} // Display the template $smarty->assign('mid', 'tiki-edit_draw.tpl'); // use tiki_full to include include CSS and JavaScript This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |