|
From: Garvin H. <gar...@us...> - 2005-01-11 15:01:30
|
Update of /cvsroot/php-blog/serendipity/htmlarea/popups In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12393/htmlarea/popups Modified Files: about.html blank.html custom2.html editor_help.html fullscreen.html insert_table.html link.html old-fullscreen.html old_insert_image.html popup.js Log Message: * Upgraded htmlarea WYSIWYG editor to latest version. Entering links now properly works, as finally does Copy+Paste from Mozilla! (garvinhicking) Index: popup.js =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/popup.js,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- popup.js 23 Mar 2004 15:41:10 -0000 1.2 +++ popup.js 11 Jan 2005 15:01:01 -0000 1.3 @@ -53,12 +53,12 @@ // only if we call it twice we get the // correct size. window.addEventListener("unload", __dlg_onclose, true); + window.innerWidth = body.offsetWidth + 5; + window.innerHeight = body_height + 2; // center on parent var x = opener.screenX + (opener.outerWidth - window.outerWidth) / 2; var y = opener.screenY + (opener.outerHeight - window.outerHeight) / 2; window.moveTo(x, y); - window.innerWidth = body.offsetWidth + 5; - window.innerHeight = body_height + 2; } else { // window.dialogHeight = body.offsetHeight + 50 + "px"; // window.dialogWidth = body.offsetWidth + "px"; @@ -76,8 +76,8 @@ }; function __dlg_translate(i18n) { - var types = ["span", "option", "td", "button", "div"]; - for (var type in types) { + var types = ["input", "select", "legend", "span", "option", "td", "button", "div"]; + for (var type = 0; type < types.length; ++type) { var spans = document.getElementsByTagName(types[type]); for (var i = spans.length; --i >= 0;) { var span = spans[i]; @@ -86,6 +86,11 @@ if (txt) span.firstChild.data = txt; } + if (span.title) { + var txt = i18n[span.title]; + if (txt) + span.title = txt; + } } } var txt = i18n[document.title]; Index: old-fullscreen.html =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/old-fullscreen.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- old-fullscreen.html 2 Dec 2004 10:54:54 -0000 1.2 +++ old-fullscreen.html 11 Jan 2005 15:01:01 -0000 1.3 @@ -128,4 +128,4 @@ <textarea name="editor" style="width:100%; height:300px"></textarea><br> -</body></html> +</body></html> \ No newline at end of file Index: link.html =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/link.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- link.html 2 Apr 2004 09:58:27 -0000 1.2 +++ link.html 11 Jan 2005 15:01:01 -0000 1.3 @@ -5,7 +5,8 @@ <script type="text/javascript" src="popup.js"></script> <script type="text/javascript"> window.resizeTo(400, 200); - I18N = window.opener.HTMLArea.I18N.msg; + +I18N = window.opener.HTMLArea.I18N.dialogs; function i18n(str) { return (I18N[str] || str); @@ -25,7 +26,12 @@ __dlg_init(); var param = window.dialogArguments; var target_select = document.getElementById("f_target"); + var use_target = true; if (param) { + if ( typeof param["f_usetarget"] != "undefined" ) { + use_target = param["f_usetarget"]; + } + if ( typeof param["f_href"] != "undefined" ) { document.getElementById("f_href").value = param["f_href"]; document.getElementById("f_title").value = param["f_title"]; comboSelectValue(target_select, param["f_target"]); @@ -36,6 +42,12 @@ target_select.appendChild(opt); opt.selected = true; } + } + } + if (! use_target) { + document.getElementById("f_target_label").style.visibility = "hidden"; + document.getElementById("f_target").style.visibility = "hidden"; + document.getElementById("f_target_other").style.visibility = "hidden"; } var opt = document.createElement("option"); opt.value = "_other"; @@ -48,7 +60,9 @@ function onOK() { var required = { - "f_href": i18n("You must enter the URL where this link points to") + // f_href shouldn't be required or otherwise removing the link by entering an empty + // url isn't possible anymore. + // "f_href": i18n("You must enter the URL where this link points to") }; for (var i in required) { var el = document.getElementById(i); @@ -109,7 +123,7 @@ <body onload="Init()"> <div class="title">Insert/Modify Link</div> - +<form> <table border="0" style="width: 100%;"> <tr> <td class="label">URL:</td> @@ -120,7 +134,7 @@ <td><input type="text" id="f_title" style="width: 100%" /></td> </tr> <tr> - <td class="label">Target:</td> + <td class="label"><span id="f_target_label">Target:</span></td> <td><select id="f_target"> <option value="">None (use implicit)</option> <option value="_blank">New window (_blank)</option> @@ -133,9 +147,9 @@ </table> <div id="buttons"> - <button type="button" name="ok" onclick="return onOK();">OK</button> + <button type="submit" name="ok" onclick="return onOK();">OK</button> <button type="button" name="cancel" onclick="return onCancel();">Cancel</button> </div> - +</form> </body> </html> Index: old_insert_image.html =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/old_insert_image.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- old_insert_image.html 2 Dec 2004 10:54:54 -0000 1.2 +++ old_insert_image.html 11 Jan 2005 15:01:01 -0000 1.3 @@ -203,4 +203,4 @@ <BUTTON ID=btnCancel style="left: 31.36em; top: 3.6504em; width: 7em; height: 2.2em; " type=reset tabIndex=45 onClick="window.close();">Cancel</BUTTON> </BODY> -</HTML> +</HTML> \ No newline at end of file Index: insert_table.html =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/insert_table.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- insert_table.html 23 Mar 2004 15:41:10 -0000 1.2 +++ insert_table.html 11 Jan 2005 15:01:01 -0000 1.3 @@ -10,6 +10,8 @@ window.resizeTo(400, 100); function Init() { + i18n = window.opener.HTMLArea.I18N.dialogs; // load the HTMLArea plugin and lang file + __dlg_translate(i18n); __dlg_init(); document.getElementById("f_rows").focus(); }; @@ -27,13 +29,13 @@ return false; } } - var fields = ["f_rows", "f_cols", "f_width", "f_unit", + var fields = ["f_rows", "f_cols", "f_width", "f_unit", "f_fixed", "f_align", "f_border", "f_spacing", "f_padding"]; var param = new Object(); for (var i in fields) { var id = fields[i]; var el = document.getElementById(id); - param[id] = el.value; + param[id] = (el.type == "checkbox") ? el.checked : el.value; } __dlg_close(param); return false; @@ -88,13 +90,6 @@ <tr> <td style="width: 4em; text-align: right">Rows:</td> <td><input type="text" name="rows" id="f_rows" size="5" title="Number of rows" value="2" /></td> - <td></td> - <td></td> - <td></td> - </tr> - <tr> - <td style="width: 4em; text-align: right">Cols:</td> - <td><input type="text" name="cols" id="f_cols" size="5" title="Number of columns" value="4" /></td> <td style="width: 4em; text-align: right">Width:</td> <td><input type="text" name="width" id="f_width" size="5" title="Width of the table" value="100" /></td> <td><select size="1" name="unit" id="f_unit" title="Width unit"> @@ -103,7 +98,13 @@ <option value="em" >Em</option> </select></td> </tr> - + <tr> + <td style="width: 4em; text-align: right">Cols:</td> + <td><input type="text" name="cols" id="f_cols" size="5" title="Number of columns" value="4" /></td> + <td style="text-align: right"><input type="checkbox" checked="checked" name="fixed" id="f_fixed" /></td> + <td colspan="2"><label for="f_fixed" + >Fixed width columns</label></td> + </tr> </tbody> </table> @@ -116,7 +117,7 @@ <div class="fl">Alignment:</div> <select size="1" name="align" id="f_align" - title="Positioning of this image"> + title="Positioning of this table"> <option value="" selected="1" >Not set</option> <option value="left" >Left</option> <option value="right" >Right</option> Index: blank.html =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/blank.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- blank.html 2 Dec 2004 10:54:54 -0000 1.2 +++ blank.html 11 Jan 2005 15:01:01 -0000 1.3 @@ -1,2 +1,2 @@ <html> -</html> +</html> \ No newline at end of file Index: about.html =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/about.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- about.html 23 Mar 2004 15:41:10 -0000 1.2 +++ about.html 11 Jan 2005 15:01:01 -0000 1.3 @@ -226,8 +226,8 @@ class="letter letter2">T</span><span class="letter letter3">M</span><span class="letter letter4">L</span>Area <span class="letter">/></span> -<span class="version">3.0 <span style="position: relative; top: -0.6em; font-size: 50%; font-weight: normal">[ rev. rc1 ]</span></span></div> -<div class="release">Compiled on Mar 1, 2004 19:37 GMT</div> +<span class="version"><% $version.$release %></span></div> +<div class="release">Compiled on <% $time %></div> <div class="visit">Go to http://dynarch.com/htmlarea/ [latest milestone release]</div> </div> @@ -285,9 +285,10 @@ </p> <ul> - <li><a href="http://www.neomedia.ro">Neomedia</a> (Romania)</li> + <li><a href="http://www.computerlove.co.uk" target="_blank">Code Computer Love Ltd.</a> (UK)</li> + <li><a href="http://www.neomedia.ro" target="_blank">Neomedia</a> (Romania)</li> <li><a href="http://www.os3.it" target="_blank">OS3</a> (Italy)</li> - <li><a href="http://www.softwerk.net">SoftWerk</a> (Italy)</li> + <li><a href="http://www.softwerk.net" target="_blank">SoftWerk</a> (Italy)</li> </ul> <p>Also many thanks to all people at InteractiveTools.com @@ -375,4 +376,17 @@ </body></html> +<%ARGS> + $version => '3.0' + $release => 'beta+' + $basename => 'HTMLArea-3.0-beta' +</%ARGS> + +<%INIT>; +if ($release =~ /\S/) { + $release = ' <span style="position: relative; top: -0.6em; font-size: 50%; font-weight: normal">[ rev. '.$release.' ]</span>'; +} +use POSIX qw(strftime); +my $time = strftime '%b %e, %Y %H:%M GMT', gmtime; +</%INIT> Index: fullscreen.html =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/fullscreen.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- fullscreen.html 23 Mar 2004 15:41:10 -0000 1.2 +++ fullscreen.html 11 Jan 2005 15:01:01 -0000 1.3 @@ -3,8 +3,9 @@ <head> <title>Fullscreen HTMLArea</title> <script type="text/javascript"> - _editor_url = window.opener._editor_url; + _editor_url = window.opener._editor_url || '../'; _editor_lang = window.opener._editor_lang; + _editor_css = window.opener._editor_css; var BASE = window.opener.document.baseURI || window.opener.document.URL; var head = document.getElementsByTagName("head")[0]; var base = document.createElement("base"); @@ -12,13 +13,15 @@ head.appendChild(base); </script> - <script type="text/javascript" src="../htmlarea.js"></script> - + <script type="text/javascript"> + document.write('<scr' + 'ipt type="text/javascript" src="' + _editor_url + 'htmlarea.js"></scr' + 'ipt>'); + </script> <script type="text/javascript"> // load HTMLArea scripts that are present in the opener frame var scripts = window.opener.HTMLArea._scripts; - for (var i = 4; i < scripts.length; ++i) { - document.write("<scr" + "ipt type='text/javascript' src='" + scripts[i] + "'></scr" + "ipt>"); + for (var i = 3; i < scripts.length; ++i) { + //document.write("<scr" + "ipt type='text/javascript' src='" + scripts[i] + "'></scr" + "ipt>"); + HTMLArea.loadScript(scripts[i]); } </script> @@ -33,7 +36,7 @@ \* ---------------------------------------------------------------------- */ function _CloseOnEsc(ev) { - ev || (ev = window.event); + ev || (ev = window.event) || (ev = editor._iframe.contentWindow.event); if (ev.keyCode == 27) { // update_parent(); window.close(); @@ -59,7 +62,7 @@ if (editor.config.statusBar) { newHeight -= editor._statusBar.offsetHeight; } - editor._textArea.style.height = editor._iframe.style.height = newHeight + "px"; + editor._textArea.style.height = editor._iframe.style.height = newHeight - (HTMLArea.is_gecko ? 8 : 0) + "px"; } /* ---------------------------------------------------------------------- *\ @@ -83,7 +86,10 @@ // register the plugins, if any for (var i in parent_object.plugins) { var plugin = parent_object.plugins[i]; - editor.registerPlugin2(plugin.name, plugin.args); + try { + eval(plugin.name); + editor.registerPlugin2(plugin.name, plugin.args); + } catch(e) {}; } // and restore the original toolbar config.toolbar = parent_object.config.toolbar; @@ -125,7 +131,7 @@ </script> <style type="text/css"> html, body { height: 100%; margin: 0px; border: 0px; background-color: buttonface; } </style> </head> - <body scroll="no" onload="setTimeout(function(){init();}, 500)" onunload="update_parent()"> + <body scroll="no" onload="HTMLArea.onload = init; HTMLArea.init();" onunload="update_parent()"> <form style="margin: 0px; border: 1px solid; border-color: threedshadow threedhighlight threedhighlight threedshadow;"> <textarea name="editor" id="editor" style="width:100%; height:300px"> </textarea> </form> Index: custom2.html =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/custom2.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- custom2.html 2 Dec 2004 10:54:54 -0000 1.2 +++ custom2.html 11 Jan 2005 15:01:01 -0000 1.3 @@ -32,4 +32,4 @@ </div> </form> -</body></html> +</body></html> \ No newline at end of file Index: editor_help.html =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/editor_help.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- editor_help.html 2 Dec 2004 10:54:54 -0000 1.2 +++ editor_help.html 11 Jan 2005 15:01:01 -0000 1.3 @@ -13,4 +13,4 @@ </body> -</html> +</html> \ No newline at end of file |
