From 011efbdb6a389a3b739fe178b034850e92fff1d2 Mon Sep 17 00:00:00 2001 From: zero Date: Mon, 27 Apr 2009 07:26:31 +0000 Subject: [PATCH] =?UTF-8?q?=EC=9C=84=ED=82=A4=20=EB=A7=81=ED=81=AC=20?= =?UTF-8?q?=EC=95=A0=EB=93=9C=EC=98=A8=EC=9D=98=20=EB=B0=B0=EA=B2=BD=20?= =?UTF-8?q?=ED=88=AC=EB=AA=85=EC=9D=84=20=EC=97=86=EC=95=A0=EA=B3=A0=20UI?= =?UTF-8?q?=20=EC=82=B4=EC=A7=9D=20=EB=B3=80=EA=B2=BD.=20=EA=B0=80?= =?UTF-8?q?=EC=83=81=EC=82=AC=EC=9D=B4=ED=8A=B8=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=9C=84=ED=82=A4=20=EB=AC=B8=EC=84=9C=20=EC=97=B0=EA=B2=B0?= =?UTF-8?q?=EC=8B=9C=20=EC=9D=B4=EC=83=81=EC=97=86=EC=9D=B4=20=EB=8F=99?= =?UTF-8?q?=EC=9E=91=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6201 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/wiki_link/wiki_link.addon.php | 6 ++--- addons/wiki_link/wikilink.css | 9 +++---- addons/wiki_link/wikilink.js | 35 +++++++++++++++------------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/addons/wiki_link/wiki_link.addon.php b/addons/wiki_link/wiki_link.addon.php index 99687c200..501a36711 100644 --- a/addons/wiki_link/wiki_link.addon.php +++ b/addons/wiki_link/wiki_link.addon.php @@ -6,9 +6,7 @@ if(!$module_info->module) return; if($module_info->module != 'wiki') return; Context::loadJavascriptPlugin('hotkeys'); - Context::addJsFile('./addons/wiki_link/wikilink.js'); - Context::addCssFile('./addons/wiki_link/wikilink.css'); - $footer = ""; - Context::addHtmlFooter($footer); + Context::addJsFile('./addons/wiki_link/wikilink.js',false); + Context::addCssFile('./addons/wiki_link/wikilink.css',false); } ?> diff --git a/addons/wiki_link/wikilink.css b/addons/wiki_link/wikilink.css index 6738acecd..c473c440d 100644 --- a/addons/wiki_link/wikilink.css +++ b/addons/wiki_link/wikilink.css @@ -1,4 +1,5 @@ -#link { display: none; } -#link .linkForm { margin-left: 10px; margin-top: 10px; } -.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 5px; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } - +.ui-dialog { background-color:#fff; z-index:999; padding:10px;} +.ui-dialog-title { font-weight:bold; margin-bottom:3px; } +.ui-dialog-titlebar-close { display:none; } +.ui-dialog-buttonpane { text-align:right; bottom:5px !important; } +.ui-dialog-buttonpane button { font-size:11px; font-family:tahoma; } diff --git a/addons/wiki_link/wikilink.js b/addons/wiki_link/wikilink.js index d962a287c..2cbe5beef 100644 --- a/addons/wiki_link/wikilink.js +++ b/addons/wiki_link/wikilink.js @@ -1,15 +1,20 @@ function openWikiLinkDialog() { - var link = jQuery("#link"); - link.css('display', 'block'); - var target = xGetElementById('linktarget'); - target.value = ""; - try{ - link.dialog({height:100}); - } - catch(e) - { - link.dialog("open"); + var wikiLink = jQuery('#wikiLink'); + if ( wikiLink.length < 1 ) { + try{ + jQuery('') + .appendTo('body') + .dialog({ + title:'wiki Link', width:300, height:60, resizable:false, + modal: false, overlay: { opacity: 1, background: "#fff" }, + buttons: { "add link": function() { setText(); jQuery(this).dialog("close"); }, "cancel": function() { jQuery(this).dialog("close"); } }, + show: 'drop' /* , hide: 'explode' */ + }); + } catch(e){ + } + } else { + wikiLink.dialog('open'); } } @@ -19,6 +24,7 @@ function setText() { var text = target.value; text.replace(/&/ig,'&').replace(//ig,'>'); var url = request_uri.setQuery('mid',current_mid).setQuery('entry',text); + if(typeof(xeVid)!='undefined') url.setQuery('vid', xeVid); var link = ""; @@ -31,16 +37,13 @@ function addShortCutForWiki() { var iframe_obj = editorGetIFrame(1); jQuery(iframe_obj.contentWindow.document).bind('keydown', "CTRL+SHIFT+SPACE", function(evt) { openWikiLinkDialog(); }); - if(jQuery.os.Mac) - { + if(jQuery.os.Mac) { jQuery(iframe_obj.contentWindow.document).bind('keydown', "ALT+SPACE", function(evt) { openWikiLinkDialog(); }); - } - else - { + } else { jQuery(iframe_obj.contentWindow.document).bind('keydown', "CTRL+SPACE", function(evt) { openWikiLinkDialog(); }); } jQuery(document).bind('keydown',"CTRL+SHIFT+SPACE", function(evt) {} ); } -xAddEventListener(window, 'load', addShortCutForWiki); +jQuery(window).load( function() { addShortCutForWiki() } );