|
From: Garvin H. <gar...@us...> - 2005-01-11 15:01:43
|
Update of /cvsroot/php-blog/serendipity/htmlarea In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12393/htmlarea Modified Files: dialog.js htmlarea.css htmlarea.js index.html license.txt popupdiv.js popupwin.js release-notes.html Log Message: * Upgraded htmlarea WYSIWYG editor to latest version. Entering links now properly works, as finally does Copy+Paste from Mozilla! (garvinhicking) Index: htmlarea.css =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/htmlarea.css,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- htmlarea.css 23 Mar 2004 15:41:04 -0000 1.2 +++ htmlarea.css 11 Jan 2005 15:00:34 -0000 1.3 @@ -3,7 +3,7 @@ .htmlarea .toolbar { cursor: default; background: ButtonFace; - padding: 1px 1px 2px 1px; + padding: 3px; border: 1px solid; border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight; } @@ -42,7 +42,7 @@ } .htmlarea .toolbar .buttonDisabled img { - filter: alpha(opacity = 25); + filter: gray() alpha(opacity = 25); -moz-opacity: 0.25; } Index: index.html =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html 23 Mar 2004 15:41:04 -0000 1.1 +++ index.html 11 Jan 2005 15:00:35 -0000 1.2 @@ -14,13 +14,13 @@ <div style="float: right; border: 1px solid #aaa; background-color: #eee; padding: 3px; margin-left: 10px; margin-bottom: 10px;"> <table cellspacing="0" cellpadding="0" border="0"> <tr> - <td class="label">Version:</td><td>3.0</td> + <td class="label">Version:</td><td><% $version %></td> </tr> <tr> - <td class="label">Release:</td><td>rc1 (<a href="release-notes.html">release notes</a>)</td> + <td class="label">Release:</td><td><% $release %> (<a href="release-notes.html">release notes</a>)</td> </tr> <tr> - <td class="label bline">Compiled at:</td><td class="bline">Mar 1, 2004 [19:37] GMT</td> + <td class="label bline">Compiled at:</td><td class="bline"><% $time %></td> </tr> <tr> <td class="label">SourceForge page:</td><td><a href="http://sf.net/projects/itools-htmlarea/">http://sf.net/projects/itools-htmlarea/</a></td> @@ -46,7 +46,7 @@ Please see our About Box for details about who sponsored what plugins. </p> - <h2>Online demos</h2> + <h2><a href="examples/">Online demos</a></h2> <ul> @@ -89,14 +89,15 @@ <pre style="margin-left: 2em" > cd /var/www/html -unzip /path/to/archive/HTMLArea-3.0-rc1.zip -mv HTMLArea-3.0-rc1 htmlarea +unzip /path/to/archive/<% $basename %>.zip +mv <% $basename %> htmlarea find htmlarea/ -type f -exec chmod 644 {} \; find htmlarea/ -type d -exec chmod 755 {} \; find htmlarea/ -name "*.cgi" -exec chmod 755 {} \;</pre> <p> - <strong>Notes.</strong> You may chose to symlink "htmlarea" to "HTMLArea-3.0-rc1", in which case your server needs to be configured to + <strong>Notes.</strong> You may chose to symlink "htmlarea" to "<% + $basename %>", in which case your server needs to be configured to "<tt>FollowSymLinks</tt>". You need to make sure that *.cgi files are interpreted as CGI scripts. If you want to use the SpellChecker plugin you need to have a recent version of Perl installed (I @@ -183,7 +184,7 @@ </ul> - <p>You can <a href="mailto:mi...@in...">contact me directly</a> + <p>You can <a href="mailto:mih...@ya...">contact me directly</a> <em>only</em> if you want to pay me for implementing custom features to HTMLArea. If you want to sponsor these features (that is, allow them to get back into the public HTMLArea distribution) I'll be cheaper. ;-)</p> @@ -191,9 +192,19 @@ <hr /> <address><a href="http://dynarch.com/mishoo/">Mihai Bazon</a></address> <!-- Created: Sun Aug 3 14:11:26 EEST 2003 --> -<!-- hhmts start --> Last modified: Wed Jan 28 11:54:47 EET 2004 <!-- hhmts end --> +<!-- hhmts start --> Last modified: Wed Jul 14 13:20:53 CEST 2004 <!-- hhmts end --> <!-- doc-lang: English --> </body> </html> +<%ARGS> + $project => 'HTMLArea' + $version => '3.0' + $release => 'rc1' + $basename => 'HTMLArea-3.0-rc1' +</%ARGS> +<%INIT>; +use POSIX qw(strftime); +my $time = strftime '%b %e, %Y [%H:%M] GMT', gmtime; +</%INIT> Index: popupwin.js =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/popupwin.js,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- popupwin.js 23 Mar 2004 15:41:04 -0000 1.1 +++ popupwin.js 11 Jan 2005 15:00:35 -0000 1.2 @@ -16,7 +16,7 @@ if (base && base.match(/(.*)\/([^\/]+)/)) { base = RegExp.$1 + "/"; } - if (typeof _editor_url != "undefined" && !/^\//.test(_editor_url)) { + if (typeof _editor_url != "undefined" && !/^\//.test(_editor_url) && !/http:\/\//.test(_editor_url)) { // _editor_url doesn't start with '/' which means it's relative // FIXME: there's a problem here, it could be http:// which // doesn't start with slash but it's not relative either. @@ -61,7 +61,7 @@ PopupWin.prototype.callHandler = function() { var tags = ["input", "textarea", "select"]; var params = new Object(); - for (var ti in tags) { + for (var ti = tags.length; --ti >= 0;) { var tag = tags[ti]; var els = this.content.getElementsByTagName(tag); for (var j = 0; j < els.length; ++j) { Index: htmlarea.js =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/htmlarea.js,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- htmlarea.js 7 Jun 2004 10:39:25 -0000 1.6 +++ htmlarea.js 11 Jan 2005 15:00:34 -0000 1.7 @@ -1,13 +1,12 @@ -// htmlArea v3.0 - Copyright (c) 2002-2004 interactivetools.com, inc. +// htmlArea v3.0 - Copyright (c) 2003-2004 dynarch.com +// 2002-2003 interactivetools.com, inc. // This copyright notice MUST stay intact for use (see license.txt). // -// Portions (c) dynarch.com, 2003-2004 -// // A free WYSIWYG editor replacement for <textarea> fields. // For full source code and docs, visit http://www.interactivetools.com/ // // Version 3.0 developed by Mihai Bazon. [...1234 lines suppressed...] + html = /^script|style$/i.test(root.parentNode.tagName) ? root.data : HTMLArea.htmlEncode(root.data); + break; + case 4: // Node.CDATA_SECTION_NODE + // FIXME: it seems we never get here, but I believe we should.. + // maybe a browser problem?--CDATA sections are converted to plain text nodes and normalized + // CDATA sections should go "as is" without further encoding + html = "<![CDATA[" + root.data + "]]>"; break; case 8: // Node.COMMENT_NODE html = "<!--" + root.data + "-->"; @@ -2069,8 +2419,7 @@ }; String.prototype.trim = function() { - a = this.replace(/^\s+/, ''); - return a.replace(/\s+$/, ''); + return this.replace(/^\s+/, '').replace(/\s+$/, ''); }; // creates a rgb-style color from a number Index: release-notes.html =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/release-notes.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- release-notes.html 23 Mar 2004 15:41:04 -0000 1.1 +++ release-notes.html 11 Jan 2005 15:00:35 -0000 1.2 @@ -1,7 +1,8 @@ <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.2//EN"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>HTMLArea-3.0-rc1 release notes</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title><% $basename %> release notes</title> <style> .fixme { color: red; } </style> @@ -9,9 +10,9 @@ <body> - <h1>HTMLArea-3.0-rc1 release notes</h1> + <h1><% $basename %> release notes</h1> - <p>This release was compiled on Mar 1, 2004 [19:37] GMT.</p> + <p>This release was compiled on <% $time %>.</p> <h2>3.0-rc1</h2> @@ -154,12 +155,55 @@ <li>Cut, copy, paste, undo, redo buttons.</li> </ul> +<%doc> + <h2>Rationale for Beta</h2> + + <p>Why was this released as "Beta"? The code is quite stable and it + didn't deserve a "Beta" qualification. However, there are some things + left to do for the real 3.0 version. These things will not affect the + API to work with HTMLArea, in other words, you can install the Beta + right now and then install the final release without modifying your + code. That's if you don't modify HTMLArea itself. ;-)</p> + + <h2>To-Do before 3.0 final</h2> + + <ol> + + <li>We should use a single popup interface. Currently there are two: + dialog.js and popupwin.js; dialog.js emulates modal dialogs, which + sucks when you want to open "select-color" from another popup and not + from the editor itself. Very buggy in IE. We should probably use only + modeless dialogs (that is, popupwin.js).</li> + + <li>Internationalization for the SpellChecker plugin.</li> + + <li>Internationalization for the TableOperations plugin.</li> + + <li>People who sent translations are invited to re-iterate through + their work and make it up-to-date with lang/en.js which is the main + lang file for HTMLArea-3.0. Some things have changed but not all + translations are updated.</li> + + <li><strong>Documentation</strong>.</li> + + </ol> +</%doc> <hr /> <address><a href="http://dynarch.com/mishoo/">Mihai Bazon</a></address> <!-- Created: Sun Aug 3 16:55:08 EEST 2003 --> -<!-- hhmts start --> Last modified: Sun Feb 1 13:16:10 EET 2004 <!-- hhmts end --> +<!-- hhmts start --> Last modified: Wed Mar 31 19:18:26 EEST 2004 <!-- hhmts end --> <!-- doc-lang: English --> </body> </html> +<%ARGS> + $project => 'HTMLArea' + $version => '3.0' + $release => 'rc1' + $basename => 'HTMLArea-3.0-rc1' +</%ARGS> +<%INIT>; +use POSIX qw(strftime); +my $time = strftime '%b %e, %Y [%H:%M] GMT', gmtime; +</%INIT> Index: popupdiv.js =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/popupdiv.js,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- popupdiv.js 23 Mar 2004 15:41:04 -0000 1.1 +++ popupdiv.js 11 Jan 2005 15:00:35 -0000 1.2 @@ -191,7 +191,7 @@ PopupDiv.prototype.callHandler = function() { var tags = ["input", "textarea", "select"]; var params = new Object(); - for (var ti in tags) { + for (var ti = tags.length; --ti >= 0;) { var tag = tags[ti]; var els = this.content.getElementsByTagName(tag); for (var j = 0; j < els.length; ++j) { Index: license.txt =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/license.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- license.txt 3 Apr 2004 17:36:16 -0000 1.3 +++ license.txt 11 Jan 2005 15:00:35 -0000 1.4 @@ -1,30 +1,30 @@ -htmlArea License (based on BSD license) -Copyright (c) 2002-2004, interactivetools.com, inc. -Copyright (c) 2003-2004 dynarch.com -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1) Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - -2) Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -3) Neither the name of interactivetools.com, inc. nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. +htmlArea License (based on BSD license) +Copyright (c) 2002-2004, interactivetools.com, inc. +Copyright (c) 2003-2004 dynarch.com +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1) Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +2) Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3) Neither the name of interactivetools.com, inc. nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. Index: dialog.js =================================================================== RCS file: /cvsroot/php-blog/serendipity/htmlarea/dialog.js,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- dialog.js 23 Mar 2004 15:41:04 -0000 1.2 +++ dialog.js 11 Jan 2005 15:00:34 -0000 1.3 @@ -22,12 +22,13 @@ }; Dialog._parentEvent = function(ev) { + setTimeout( function() { if (Dialog._modal && !Dialog._modal.closed) { Dialog._modal.focus() } }, 50); if (Dialog._modal && !Dialog._modal.closed) { - Dialog._modal.focus(); HTMLArea._stopEvent(ev); } }; + // should be a function, the return handler of the currently opened dialog. Dialog._return = null; @@ -40,7 +41,7 @@ Dialog._geckoOpenModal = function(url, action, init) { var dlg = window.open(url, "hadialog", "toolbar=no,menubar=no,personalbar=no,width=10,height=10," + - "scrollbars=no,resizable=yes"); + "scrollbars=no,resizable=yes,modal=yes,dependable=yes"); Dialog._modal = dlg; Dialog._arguments = init; |
