<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[17628] trunk/wp-includes/js/tinymce: Fix EOL for newly added files</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17628">17628</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-04-11 18:23:51 +0000 (Mon, 11 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix EOL for newly added files</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcelicensetxt">trunk/wp-includes/js/tinymce/license.txt</a></li>
<li><a href="#trunkwpincludesjstinymcepluginsmediacssmediacss">trunk/wp-includes/js/tinymce/plugins/media/css/media.css</a></li>
<li><a href="#trunkwpincludesjstinymcepluginsmediajsembedjs">trunk/wp-includes/js/tinymce/plugins/media/js/embed.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginsmediajsmediajs">trunk/wp-includes/js/tinymce/plugins/media/js/media.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginsmediamediahtm">trunk/wp-includes/js/tinymce/plugins/media/media.htm</a></li>
<li><a href="#trunkwpincludesjstinymcepluginsspellcheckerchangelogtxt">trunk/wp-includes/js/tinymce/plugins/spellchecker/changelog.txt</a></li>
<li><a href="#trunkwpincludesjstinymcethemesadvancedshortcutshtm">trunk/wp-includes/js/tinymce/themes/advanced/shortcuts.htm</a></li>
<li><a href="#trunkwpincludesjstinymcethemesadvancedskinshighcontrastcontentcss">trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/content.css</a></li>
<li><a href="#trunkwpincludesjstinymcethemesadvancedskinshighcontrastdialogcss">trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/dialog.css</a></li>
<li><a href="#trunkwpincludesjstinymcethemesadvancedskinshighcontrastuicss">trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/ui.css</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcelicensetxt">trunk/wp-includes/js/tinymce/license.txt</a></li>
<li><a href="#trunkwpincludesjstinymcepluginsmediacssmediacss">trunk/wp-includes/js/tinymce/plugins/media/css/media.css</a></li>
<li><a href="#trunkwpincludesjstinymcepluginsmediaeditor_pluginjs">trunk/wp-includes/js/tinymce/plugins/media/editor_plugin.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginsmediajsembedjs">trunk/wp-includes/js/tinymce/plugins/media/js/embed.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginsmediajsmediajs">trunk/wp-includes/js/tinymce/plugins/media/js/media.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginsmediamediahtm">trunk/wp-includes/js/tinymce/plugins/media/media.htm</a></li>
<li><a href="#trunkwpincludesjstinymcepluginsspellcheckerchangelogtxt">trunk/wp-includes/js/tinymce/plugins/spellchecker/changelog.txt</a></li>
<li><a href="#trunkwpincludesjstinymcethemesadvancedshortcutshtm">trunk/wp-includes/js/tinymce/themes/advanced/shortcuts.htm</a></li>
<li><a href="#trunkwpincludesjstinymcethemesadvancedskinshighcontrastcontentcss">trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/content.css</a></li>
<li><a href="#trunkwpincludesjstinymcethemesadvancedskinshighcontrastdialogcss">trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/dialog.css</a></li>
<li><a href="#trunkwpincludesjstinymcethemesadvancedskinshighcontrastuicss">trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/ui.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjstinymcelicensetxt"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/license.txt (17627 => 17628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/license.txt        2011-04-11 08:01:34 UTC (rev 17627)
+++ trunk/wp-includes/js/tinymce/license.txt        2011-04-11 18:23:51 UTC (rev 17628)
</span><span class="lines">@@ -1,504 +1,504 @@
</span><del>-                 GNU LESSER GENERAL PUBLIC LICENSE
-                 Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                         Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                 GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                         NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                 END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
</del><ins>+                 GNU LESSER GENERAL PUBLIC LICENSE
+                 Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                         Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                 GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                         NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                 END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
</ins><span class="cx">Property changes on: trunk/wp-includes/js/tinymce/license.txt
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> - CRLF
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginsmediacssmediacss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/media/css/media.css (17627 => 17628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/media/css/media.css        2011-04-11 08:01:34 UTC (rev 17627)
+++ trunk/wp-includes/js/tinymce/plugins/media/css/media.css        2011-04-11 18:23:51 UTC (rev 17628)
</span><span class="lines">@@ -1,17 +1,17 @@
</span><del>-#id, #name, #hspace, #vspace, #class_name, #align { width: 100px }
-#hspace, #vspace { width: 50px }
-#flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode { width: 100px }
-#flash_base, #flash_flashvars, #html5_altsource1, #html5_altsource2, #html5_poster { width: 240px }
-#width, #height { width: 40px }
-#src, #media_type { width: 250px }
-#class { width: 120px }
-#prev { margin: 0; border: 1px solid black; width: 380px; height: 260px; overflow: auto }
-.panel_wrapper div.current { height: 420px; overflow: auto }
-#flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options { display: none }
-.mceAddSelectValue { background-color: #DDDDDD }
-#qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume { width: 70px }
-#wmp_balance, #wmp_baseurl, #wmp_captioningid, #wmp_currentmarker, #wmp_currentposition, #wmp_defaultframe, #wmp_playcount, #wmp_rate, #wmp_uimode, #wmp_volume { width: 70px }
-#rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks { width: 70px }
-#shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle { width: 90px }
-#qt_qtsrc { width: 200px }
-iframe {border: 1px solid gray}
</del><ins>+#id, #name, #hspace, #vspace, #class_name, #align { width: 100px }
+#hspace, #vspace { width: 50px }
+#flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode { width: 100px }
+#flash_base, #flash_flashvars, #html5_altsource1, #html5_altsource2, #html5_poster { width: 240px }
+#width, #height { width: 40px }
+#src, #media_type { width: 250px }
+#class { width: 120px }
+#prev { margin: 0; border: 1px solid black; width: 380px; height: 260px; overflow: auto }
+.panel_wrapper div.current { height: 420px; overflow: auto }
+#flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options { display: none }
+.mceAddSelectValue { background-color: #DDDDDD }
+#qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume { width: 70px }
+#wmp_balance, #wmp_baseurl, #wmp_captioningid, #wmp_currentmarker, #wmp_currentposition, #wmp_defaultframe, #wmp_playcount, #wmp_rate, #wmp_uimode, #wmp_volume { width: 70px }
+#rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks { width: 70px }
+#shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle { width: 90px }
+#qt_qtsrc { width: 200px }
+iframe {border: 1px solid gray}
</ins><span class="cx">Property changes on: trunk/wp-includes/js/tinymce/plugins/media/css/media.css
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginsmediaeditor_pluginjs"></a>
<div class="propset"><h4>Property changes: trunk/wp-includes/js/tinymce/plugins/media/editor_plugin.js</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginsmediajsembedjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/media/js/embed.js (17627 => 17628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/media/js/embed.js        2011-04-11 08:01:34 UTC (rev 17627)
+++ trunk/wp-includes/js/tinymce/plugins/media/js/embed.js        2011-04-11 18:23:51 UTC (rev 17628)
</span><span class="lines">@@ -1,73 +1,73 @@
</span><del>-/**
- * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.
- */
-
-function writeFlash(p) {
-        writeEmbed(
-                'D27CDB6E-AE6D-11cf-96B8-444553540000',
-                'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
-                'application/x-shockwave-flash',
-                p
-        );
-}
-
-function writeShockWave(p) {
-        writeEmbed(
-        '166B1BCA-3F9C-11CF-8075-444553540000',
-        'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',
-        'application/x-director',
-                p
-        );
-}
-
-function writeQuickTime(p) {
-        writeEmbed(
-                '02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',
-                'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',
-                'video/quicktime',
-                p
-        );
-}
-
-function writeRealMedia(p) {
-        writeEmbed(
-                'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',
-                'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
-                'audio/x-pn-realaudio-plugin',
-                p
-        );
-}
-
-function writeWindowsMedia(p) {
-        p.url = p.src;
-        writeEmbed(
-                '6BF52A52-394A-11D3-B153-00C04F79FAA6',
-                'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',
-                'application/x-mplayer2',
-                p
-        );
-}
-
-function writeEmbed(cls, cb, mt, p) {
-        var h = '', n;
-
-        h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';
-        h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';
-        h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';
-        h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';
-        h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';
-        h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';
-        h += '>';
-
-        for (n in p)
-                h += '<param name="' + n + '" value="' + p[n] + '">';
-
-        h += '<embed type="' + mt + '"';
-
-        for (n in p)
-                h += n + '="' + p[n] + '" ';
-
-        h += '></embed></object>';
-
-        document.write(h);
-}
</del><ins>+/**
+ * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.
+ */
+
+function writeFlash(p) {
+        writeEmbed(
+                'D27CDB6E-AE6D-11cf-96B8-444553540000',
+                'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+                'application/x-shockwave-flash',
+                p
+        );
+}
+
+function writeShockWave(p) {
+        writeEmbed(
+        '166B1BCA-3F9C-11CF-8075-444553540000',
+        'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',
+        'application/x-director',
+                p
+        );
+}
+
+function writeQuickTime(p) {
+        writeEmbed(
+                '02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',
+                'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',
+                'video/quicktime',
+                p
+        );
+}
+
+function writeRealMedia(p) {
+        writeEmbed(
+                'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',
+                'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+                'audio/x-pn-realaudio-plugin',
+                p
+        );
+}
+
+function writeWindowsMedia(p) {
+        p.url = p.src;
+        writeEmbed(
+                '6BF52A52-394A-11D3-B153-00C04F79FAA6',
+                'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',
+                'application/x-mplayer2',
+                p
+        );
+}
+
+function writeEmbed(cls, cb, mt, p) {
+        var h = '', n;
+
+        h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';
+        h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';
+        h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';
+        h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';
+        h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';
+        h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';
+        h += '>';
+
+        for (n in p)
+                h += '<param name="' + n + '" value="' + p[n] + '">';
+
+        h += '<embed type="' + mt + '"';
+
+        for (n in p)
+                h += n + '="' + p[n] + '" ';
+
+        h += '></embed></object>';
+
+        document.write(h);
+}
</ins><span class="cx">Property changes on: trunk/wp-includes/js/tinymce/plugins/media/js/embed.js
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginsmediajsmediajs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/media/js/media.js (17627 => 17628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/media/js/media.js        2011-04-11 08:01:34 UTC (rev 17627)
+++ trunk/wp-includes/js/tinymce/plugins/media/js/media.js        2011-04-11 18:23:51 UTC (rev 17628)
</span><span class="lines">@@ -1,354 +1,354 @@
</span><del>-(function() {
-        var url;
-
-        if (url = tinyMCEPopup.getParam("media_external_list_url"))
-                document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
-
-        function get(id) {
-                return document.getElementById(id);
-        }
-
-        function getVal(id) {
-                var elm = get(id);
-
-                if (elm.nodeName == "SELECT")
-                        return elm.options[elm.selectedIndex].value;
-
-                if (elm.type == "checkbox")
-                        return elm.checked;
-
-                return elm.value;
-        }
-
-        function setVal(id, value) {
-                if (typeof(value) != 'undefined') {
-                        var elm = get(id);
-
-                        if (elm.nodeName == "SELECT")
-                                selectByValue(document.forms[0], id, value);
-                        else if (elm.type == "checkbox") {
-                                if (typeof(value) == 'string')
-                                        elm.checked = value.toLowerCase() === 'true' ? true : false;
-                                else
-                                        elm.checked = !!value;
-                        } else
-                                elm.value = value;
-                }
-        }
-
-        window.Media = {
-                init : function() {
-                        var html, editor;
-
-                        this.editor = editor = tinyMCEPopup.editor;
-
-                        // Setup file browsers and color pickers
-                        get('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');
-                        get('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','quicktime_qtsrc','media','media');
-                        get('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
-                        get('video_altsource1_filebrowser').innerHTML = getBrowserHTML('filebrowser_altsource1','video_altsource1','media','media');
-                        get('video_altsource2_filebrowser').innerHTML = getBrowserHTML('filebrowser_altsource2','video_altsource2','media','media');
-                        get('video_poster_filebrowser').innerHTML = getBrowserHTML('filebrowser_poster','video_poster','media','image');
-
-                        html = this.getMediaListHTML('medialist', 'src', 'media', 'media');
-                        if (html == "")
-                                get("linklistrow").style.display = 'none';
-                        else
-                                get("linklistcontainer").innerHTML = html;
-
-                        if (isVisible('filebrowser'))
-                                get('src').style.width = '230px';
-
-                        if (isVisible('filebrowser_altsource1'))
-                                get('video_altsource1').style.width = '220px';
-
-                        if (isVisible('filebrowser_altsource2'))
-                                get('video_altsource2').style.width = '220px';
-
-                        if (isVisible('filebrowser_poster'))
-                                get('video_poster').style.width = '220px';
-
-                        this.data = tinyMCEPopup.getWindowArg('data');
-                        this.dataToForm();
-                        this.preview();
-                },
-
-                insert : function() {
-                        var editor = tinyMCEPopup.editor;
-
-                        this.formToData();
-                        editor.execCommand('mceRepaint');
-                        tinyMCEPopup.restoreSelection();
-                        editor.selection.setNode(editor.plugins.media.dataToImg(this.data));
-                        tinyMCEPopup.close();
-                },
-
-                preview : function() {
-                        get('prev').innerHTML = this.editor.plugins.media.dataToHtml(this.data, true);
-                },
-
-                moveStates : function(to_form, field) {
-                        var data = this.data, editor = this.editor, data = this.data,
-                                mediaPlugin = editor.plugins.media, ext, src, typeInfo, defaultStates, src;
-
-                        defaultStates = {
-                                // QuickTime
-                                quicktime_autoplay : true,
-                                quicktime_controller : true,
-
-                                // Flash
-                                flash_play : true,
-                                flash_loop : true,
-                                flash_menu : true,
-
-                                // WindowsMedia
-                                windowsmedia_autostart : true,
-                                windowsmedia_enablecontextmenu : true,
-                                windowsmedia_invokeurls : true,
-
-                                // RealMedia
-                                realmedia_autogotourl : true,
-                                realmedia_imagestatus : true
-                        };
-
-                        function parseQueryParams(str) {
-                                var out = {};
-
-                                if (str) {
-                                        tinymce.each(str.split('&'), function(item) {
-                                                var parts = item.split('=');
-
-                                                out[unescape(parts[0])] = unescape(parts[1]);
-                                        });
-                                }
-
-                                return out;
-                        };
-
-                        function setOptions(type, names) {
-                                var i, name, formItemName, value, list;
-
-                                if (type == data.type || type == 'global') {
-                                        names = tinymce.explode(names);
-                                        for (i = 0; i < names.length; i++) {
-                                                name = names[i];
-                                                formItemName = type == 'global' ? name : type + '_' + name;
-
-                                                if (type == 'global')
-                                                        list = data;
-                                                else if (type == 'video') {
-                                                        list = data.video.attrs;
-
-                                                        if (!list && !to_form)
-                                                                data.video.attrs = list = {};
-                                                } else
-                                                        list = data.params;
-
-                                                if (list) {
-                                                        if (to_form) {
-                                                                setVal(formItemName, list[name]);
-                                                        } else {
-                                                                delete list[name];
-
-                                                                value = getVal(formItemName);
-                                                                if (type == 'video' && value === true)
-                                                                        value = name;
-
-                                                                if (defaultStates[formItemName]) {
-                                                                        if (value !== defaultStates[formItemName]) {
-                                                                                value = "" + value;
-                                                                                list[name] = value;
-                                                                        }
-                                                                } else if (value) {
-                                                                        value = "" + value;
-                                                                        list[name] = value;
-                                                                }
-                                                        }
-                                                }
-                                        }
-                                }
-                        }
-
-                        if (!to_form) {
-                                data.type = get('media_type').options[get('media_type').selectedIndex].value;
-                                data.width = getVal('width');
-                                data.height = getVal('height');
-
-                                // Switch type based on extension
-                                src = getVal('src');
-                                if (field == 'src') {
-                                        ext = src.replace(/^.*\.([^.]+)$/, '$1');
-                                        if (typeInfo = mediaPlugin.getType(ext))
-                                                data.type = typeInfo.name.toLowerCase();
-
-                                        setVal('media_type', data.type);
-                                }
-
-                                if (data.type == "video") {
-                                        if (!data.video.sources)
-                                                data.video.sources = [];
-
-                                        data.video.sources[0] = {src: getVal('src')};
-                                }
-                        }
-
-                        // Hide all fieldsets and show the one active
-                        get('video_options').style.display = 'none';
-                        get('flash_options').style.display = 'none';
-                        get('quicktime_options').style.display = 'none';
-                        get('shockwave_options').style.display = 'none';
-                        get('windowsmedia_options').style.display = 'none';
-                        get('realmedia_options').style.display = 'none';
-
-                        if (get(data.type + '_options'))
-                                get(data.type + '_options').style.display = 'block';
-
-                        setVal('media_type', data.type);
-
-                        setOptions('flash', 'play,loop,menu,swliveconnect,quality,scale,salign,wmode,base,flashvars');
-                        setOptions('quicktime', 'loop,autoplay,cache,controller,correction,enablejavascript,kioskmode,autohref,playeveryframe,targetcache,scale,starttime,endtime,target,qtsrcchokespeed,volume,qtsrc');
-                        setOptions('shockwave', 'sound,progress,autostart,swliveconnect,swvolume,swstretchstyle,swstretchhalign,swstretchvalign');
-                        setOptions('windowsmedia', 'autostart,enabled,enablecontextmenu,fullscreen,invokeurls,mute,stretchtofit,windowlessvideo,balance,baseurl,captioningid,currentmarker,currentposition,defaultframe,playcount,rate,uimode,volume');
-                        setOptions('realmedia', 'autostart,loop,autogotourl,center,imagestatus,maintainaspect,nojava,prefetch,shuffle,console,controls,numloop,scriptcallbacks');
-                        setOptions('video', 'poster,autoplay,loop,preload,controls');
-                        setOptions('global', 'id,name,vspace,hspace,bgcolor,align,width,height');
-
-                        if (to_form) {
-                                if (data.type == 'video') {
-                                        if (data.video.sources[0])
-                                                setVal('src', data.video.sources[0].src);
-
-                                        src = data.video.sources[1];
-                                        if (src)
-                                                setVal('video_altsource1', src.src);
-
-                                        src = data.video.sources[2];
-                                        if (src)
-                                                setVal('video_altsource2', src.src);
-                                } else {
-                                        // Check flash vars
-                                        if (data.type == 'flash') {
-                                                tinymce.each(editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'}), function(value, name) {
-                                                        if (value == '$url')
-                                                                data.params.src = parseQueryParams(data.params.flashvars)[name] || data.params.src;
-                                                });
-                                        }
-
-                                        setVal('src', data.params.src);
-                                }
-                        } else {
-                                src = getVal("src");
-        
-                                // YouTube
-                                if (src.match(/youtube.com(.+)v=([^&]+)/)) {
-                                        data.width = 425;
-                                        data.height = 350;
-                                        data.params.frameborder = '0';
-                                        data.type = 'iframe';
-                                        src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1];
-                                        setVal('src', src);
-                                        setVal('media_type', data.type);
-                                }
-
-                                // Google video
-                                if (src.match(/video.google.com(.+)docid=([^&]+)/)) {
-                                        data.width = 425;
-                                        data.height = 326;
-                                        data.type = 'flash';
-                                        src = 'http://video.google.com/googleplayer.swf?docId=' + src.match(/docid=([^&]+)/)[1] + '&hl=en';
-                                        setVal('src', src);
-                                        setVal('media_type', data.type);
-                                }
-
-                                if (data.type == 'video') {
-                                        if (!data.video.sources)
-                                                data.video.sources = [];
-
-                                        data.video.sources[0] = {src : src};
-
-                                        src = getVal("video_altsource1");
-                                        if (src)
-                                                data.video.sources[1] = {src : src};
-
-                                        src = getVal("video_altsource2");
-                                        if (src)
-                                                data.video.sources[2] = {src : src};
-                                } else
-                                        data.params.src = src;
-
-                                // Set default size
-                                setVal('width', data.width || 320);
-                                setVal('height', data.height || 240);
-                        }
-                },
-
-                dataToForm : function() {
-                        this.moveStates(true);
-                },
-
-                formToData : function(field) {
-                        if (field == "width" || field == "height")
-                                this.changeSize(field);
-
-                        if (field == 'source') {
-                                this.moveStates(false, field);
-                                setVal('source', this.editor.plugins.media.dataToHtml(this.data));
-                                this.panel = 'source';
-                        } else {
-                                if (this.panel == 'source') {
-                                        this.data = this.editor.plugins.media.htmlToData(getVal('source'));
-                                        this.dataToForm();
-                                        this.panel = '';
-                                }
-
-                                this.moveStates(false, field);
-                                this.preview();
-                        }
-                },
-
-                beforeResize : function() {
-                        this.width = parseInt(getVal('width') || "320", 10);
-                        this.height = parseInt(getVal('height') || "240", 10);
-                },
-
-                changeSize : function(type) {
-                        var width, height, scale, size;
-
-                        if (get('constrain').checked) {
-                                width = parseInt(getVal('width') || "320", 10);
-                                height = parseInt(getVal('height') || "240", 10);
-
-                                if (type == 'width') {
-                                        this.height = Math.round((width / this.width) * height);
-                                        setVal('height', this.height);
-                                } else {
-                                        this.width = Math.round((height / this.height) * width);
-                                        setVal('width', this.width);
-                                }
-                        }
-                },
-
-                getMediaListHTML : function() {
-                        if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {
-                                var html = "";
-
-                                html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;Media.formToData(\'src\');">';
-                                html += '<option value="">---</option>';
-
-                                for (var i=0; i<tinyMCEMediaList.length; i++)
-                                        html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
-
-                                html += '</select>';
-
-                                return html;
-                        }
-
-                        return "";
-                }
-        };
-
-        tinyMCEPopup.requireLangPack();
-        tinyMCEPopup.onInit.add(function() {
-                Media.init();
-        });
</del><ins>+(function() {
+        var url;
+
+        if (url = tinyMCEPopup.getParam("media_external_list_url"))
+                document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+
+        function get(id) {
+                return document.getElementById(id);
+        }
+
+        function getVal(id) {
+                var elm = get(id);
+
+                if (elm.nodeName == "SELECT")
+                        return elm.options[elm.selectedIndex].value;
+
+                if (elm.type == "checkbox")
+                        return elm.checked;
+
+                return elm.value;
+        }
+
+        function setVal(id, value) {
+                if (typeof(value) != 'undefined') {
+                        var elm = get(id);
+
+                        if (elm.nodeName == "SELECT")
+                                selectByValue(document.forms[0], id, value);
+                        else if (elm.type == "checkbox") {
+                                if (typeof(value) == 'string')
+                                        elm.checked = value.toLowerCase() === 'true' ? true : false;
+                                else
+                                        elm.checked = !!value;
+                        } else
+                                elm.value = value;
+                }
+        }
+
+        window.Media = {
+                init : function() {
+                        var html, editor;
+
+                        this.editor = editor = tinyMCEPopup.editor;
+
+                        // Setup file browsers and color pickers
+                        get('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');
+                        get('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','quicktime_qtsrc','media','media');
+                        get('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+                        get('video_altsource1_filebrowser').innerHTML = getBrowserHTML('filebrowser_altsource1','video_altsource1','media','media');
+                        get('video_altsource2_filebrowser').innerHTML = getBrowserHTML('filebrowser_altsource2','video_altsource2','media','media');
+                        get('video_poster_filebrowser').innerHTML = getBrowserHTML('filebrowser_poster','video_poster','media','image');
+
+                        html = this.getMediaListHTML('medialist', 'src', 'media', 'media');
+                        if (html == "")
+                                get("linklistrow").style.display = 'none';
+                        else
+                                get("linklistcontainer").innerHTML = html;
+
+                        if (isVisible('filebrowser'))
+                                get('src').style.width = '230px';
+
+                        if (isVisible('filebrowser_altsource1'))
+                                get('video_altsource1').style.width = '220px';
+
+                        if (isVisible('filebrowser_altsource2'))
+                                get('video_altsource2').style.width = '220px';
+
+                        if (isVisible('filebrowser_poster'))
+                                get('video_poster').style.width = '220px';
+
+                        this.data = tinyMCEPopup.getWindowArg('data');
+                        this.dataToForm();
+                        this.preview();
+                },
+
+                insert : function() {
+                        var editor = tinyMCEPopup.editor;
+
+                        this.formToData();
+                        editor.execCommand('mceRepaint');
+                        tinyMCEPopup.restoreSelection();
+                        editor.selection.setNode(editor.plugins.media.dataToImg(this.data));
+                        tinyMCEPopup.close();
+                },
+
+                preview : function() {
+                        get('prev').innerHTML = this.editor.plugins.media.dataToHtml(this.data, true);
+                },
+
+                moveStates : function(to_form, field) {
+                        var data = this.data, editor = this.editor, data = this.data,
+                                mediaPlugin = editor.plugins.media, ext, src, typeInfo, defaultStates, src;
+
+                        defaultStates = {
+                                // QuickTime
+                                quicktime_autoplay : true,
+                                quicktime_controller : true,
+
+                                // Flash
+                                flash_play : true,
+                                flash_loop : true,
+                                flash_menu : true,
+
+                                // WindowsMedia
+                                windowsmedia_autostart : true,
+                                windowsmedia_enablecontextmenu : true,
+                                windowsmedia_invokeurls : true,
+
+                                // RealMedia
+                                realmedia_autogotourl : true,
+                                realmedia_imagestatus : true
+                        };
+
+                        function parseQueryParams(str) {
+                                var out = {};
+
+                                if (str) {
+                                        tinymce.each(str.split('&'), function(item) {
+                                                var parts = item.split('=');
+
+                                                out[unescape(parts[0])] = unescape(parts[1]);
+                                        });
+                                }
+
+                                return out;
+                        };
+
+                        function setOptions(type, names) {
+                                var i, name, formItemName, value, list;
+
+                                if (type == data.type || type == 'global') {
+                                        names = tinymce.explode(names);
+                                        for (i = 0; i < names.length; i++) {
+                                                name = names[i];
+                                                formItemName = type == 'global' ? name : type + '_' + name;
+
+                                                if (type == 'global')
+                                                        list = data;
+                                                else if (type == 'video') {
+                                                        list = data.video.attrs;
+
+                                                        if (!list && !to_form)
+                                                                data.video.attrs = list = {};
+                                                } else
+                                                        list = data.params;
+
+                                                if (list) {
+                                                        if (to_form) {
+                                                                setVal(formItemName, list[name]);
+                                                        } else {
+                                                                delete list[name];
+
+                                                                value = getVal(formItemName);
+                                                                if (type == 'video' && value === true)
+                                                                        value = name;
+
+                                                                if (defaultStates[formItemName]) {
+                                                                        if (value !== defaultStates[formItemName]) {
+                                                                                value = "" + value;
+                                                                                list[name] = value;
+                                                                        }
+                                                                } else if (value) {
+                                                                        value = "" + value;
+                                                                        list[name] = value;
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+
+                        if (!to_form) {
+                                data.type = get('media_type').options[get('media_type').selectedIndex].value;
+                                data.width = getVal('width');
+                                data.height = getVal('height');
+
+                                // Switch type based on extension
+                                src = getVal('src');
+                                if (field == 'src') {
+                                        ext = src.replace(/^.*\.([^.]+)$/, '$1');
+                                        if (typeInfo = mediaPlugin.getType(ext))
+                                                data.type = typeInfo.name.toLowerCase();
+
+                                        setVal('media_type', data.type);
+                                }
+
+                                if (data.type == "video") {
+                                        if (!data.video.sources)
+                                                data.video.sources = [];
+
+                                        data.video.sources[0] = {src: getVal('src')};
+                                }
+                        }
+
+                        // Hide all fieldsets and show the one active
+                        get('video_options').style.display = 'none';
+                        get('flash_options').style.display = 'none';
+                        get('quicktime_options').style.display = 'none';
+                        get('shockwave_options').style.display = 'none';
+                        get('windowsmedia_options').style.display = 'none';
+                        get('realmedia_options').style.display = 'none';
+
+                        if (get(data.type + '_options'))
+                                get(data.type + '_options').style.display = 'block';
+
+                        setVal('media_type', data.type);
+
+                        setOptions('flash', 'play,loop,menu,swliveconnect,quality,scale,salign,wmode,base,flashvars');
+                        setOptions('quicktime', 'loop,autoplay,cache,controller,correction,enablejavascript,kioskmode,autohref,playeveryframe,targetcache,scale,starttime,endtime,target,qtsrcchokespeed,volume,qtsrc');
+                        setOptions('shockwave', 'sound,progress,autostart,swliveconnect,swvolume,swstretchstyle,swstretchhalign,swstretchvalign');
+                        setOptions('windowsmedia', 'autostart,enabled,enablecontextmenu,fullscreen,invokeurls,mute,stretchtofit,windowlessvideo,balance,baseurl,captioningid,currentmarker,currentposition,defaultframe,playcount,rate,uimode,volume');
+                        setOptions('realmedia', 'autostart,loop,autogotourl,center,imagestatus,maintainaspect,nojava,prefetch,shuffle,console,controls,numloop,scriptcallbacks');
+                        setOptions('video', 'poster,autoplay,loop,preload,controls');
+                        setOptions('global', 'id,name,vspace,hspace,bgcolor,align,width,height');
+
+                        if (to_form) {
+                                if (data.type == 'video') {
+                                        if (data.video.sources[0])
+                                                setVal('src', data.video.sources[0].src);
+
+                                        src = data.video.sources[1];
+                                        if (src)
+                                                setVal('video_altsource1', src.src);
+
+                                        src = data.video.sources[2];
+                                        if (src)
+                                                setVal('video_altsource2', src.src);
+                                } else {
+                                        // Check flash vars
+                                        if (data.type == 'flash') {
+                                                tinymce.each(editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'}), function(value, name) {
+                                                        if (value == '$url')
+                                                                data.params.src = parseQueryParams(data.params.flashvars)[name] || data.params.src;
+                                                });
+                                        }
+
+                                        setVal('src', data.params.src);
+                                }
+                        } else {
+                                src = getVal("src");
+        
+                                // YouTube
+                                if (src.match(/youtube.com(.+)v=([^&]+)/)) {
+                                        data.width = 425;
+                                        data.height = 350;
+                                        data.params.frameborder = '0';
+                                        data.type = 'iframe';
+                                        src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1];
+                                        setVal('src', src);
+                                        setVal('media_type', data.type);
+                                }
+
+                                // Google video
+                                if (src.match(/video.google.com(.+)docid=([^&]+)/)) {
+                                        data.width = 425;
+                                        data.height = 326;
+                                        data.type = 'flash';
+                                        src = 'http://video.google.com/googleplayer.swf?docId=' + src.match(/docid=([^&]+)/)[1] + '&hl=en';
+                                        setVal('src', src);
+                                        setVal('media_type', data.type);
+                                }
+
+                                if (data.type == 'video') {
+                                        if (!data.video.sources)
+                                                data.video.sources = [];
+
+                                        data.video.sources[0] = {src : src};
+
+                                        src = getVal("video_altsource1");
+                                        if (src)
+                                                data.video.sources[1] = {src : src};
+
+                                        src = getVal("video_altsource2");
+                                        if (src)
+                                                data.video.sources[2] = {src : src};
+                                } else
+                                        data.params.src = src;
+
+                                // Set default size
+                                setVal('width', data.width || 320);
+                                setVal('height', data.height || 240);
+                        }
+                },
+
+                dataToForm : function() {
+                        this.moveStates(true);
+                },
+
+                formToData : function(field) {
+                        if (field == "width" || field == "height")
+                                this.changeSize(field);
+
+                        if (field == 'source') {
+                                this.moveStates(false, field);
+                                setVal('source', this.editor.plugins.media.dataToHtml(this.data));
+                                this.panel = 'source';
+                        } else {
+                                if (this.panel == 'source') {
+                                        this.data = this.editor.plugins.media.htmlToData(getVal('source'));
+                                        this.dataToForm();
+                                        this.panel = '';
+                                }
+
+                                this.moveStates(false, field);
+                                this.preview();
+                        }
+                },
+
+                beforeResize : function() {
+                        this.width = parseInt(getVal('width') || "320", 10);
+                        this.height = parseInt(getVal('height') || "240", 10);
+                },
+
+                changeSize : function(type) {
+                        var width, height, scale, size;
+
+                        if (get('constrain').checked) {
+                                width = parseInt(getVal('width') || "320", 10);
+                                height = parseInt(getVal('height') || "240", 10);
+
+                                if (type == 'width') {
+                                        this.height = Math.round((width / this.width) * height);
+                                        setVal('height', this.height);
+                                } else {
+                                        this.width = Math.round((height / this.height) * width);
+                                        setVal('width', this.width);
+                                }
+                        }
+                },
+
+                getMediaListHTML : function() {
+                        if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {
+                                var html = "";
+
+                                html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;Media.formToData(\'src\');">';
+                                html += '<option value="">---</option>';
+
+                                for (var i=0; i<tinyMCEMediaList.length; i++)
+                                        html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
+
+                                html += '</select>';
+
+                                return html;
+                        }
+
+                        return "";
+                }
+        };
+
+        tinyMCEPopup.requireLangPack();
+        tinyMCEPopup.onInit.add(function() {
+                Media.init();
+        });
</ins><span class="cx"> })();
</span><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-includes/js/tinymce/plugins/media/js/media.js
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginsmediamediahtm"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/media/media.htm (17627 => 17628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/media/media.htm        2011-04-11 08:01:34 UTC (rev 17627)
+++ trunk/wp-includes/js/tinymce/plugins/media/media.htm        2011-04-11 18:23:51 UTC (rev 17628)
</span><span class="lines">@@ -1,812 +1,812 @@
</span><del>-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-        <title>{#media_dlg.title}</title>
-        <script type="text/javascript" src="../../tiny_mce_popup.js?ver=342-20110407"></script>
-        <script type="text/javascript" src="js/media.js?ver=342-20110407"></script>
-        <script type="text/javascript" src="../../utils/mctabs.js?ver=342-20110407"></script>
-        <script type="text/javascript" src="../../utils/validate.js?ver=342-20110407"></script>
-        <script type="text/javascript" src="../../utils/form_utils.js?ver=342-20110407"></script>
-        <script type="text/javascript" src="../../utils/editable_selects.js?ver=342-20110407"></script>
-        <link href="css/media.css?ver=342-20110407" rel="stylesheet" type="text/css" />
-</head>
-<body style="display: none" role="application">
-<form onsubmit="Media.insert();return false;" action="#">
-                <div class="tabs" role="presentation">
-                        <ul>
-                                <li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');Media.formToData();" onmousedown="return false;">{#media_dlg.general}</a></span></li>
-                                <li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');Media.formToData();" onmousedown="return false;">{#media_dlg.advanced}</a></span></li>
-                                <li id="source_tab" aria-controls="source_panel"><span><a href="javascript:mcTabs.displayTab('source_tab','source_panel');Media.formToData('source');" onmousedown="return false;">{#media_dlg.source}</a></span></li>
-                        </ul>
-                </div>
-
-                <div class="panel_wrapper">
-                        <div id="general_panel" class="panel current">
-                                <fieldset>
-                                        <legend>{#media_dlg.general}</legend>
-
-                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0">
-                                                        <tr>
-                                                                <td><label for="media_type">{#media_dlg.type}</label></td>
-                                                                <td>
-                                                                        <select id="media_type" name="media_type" onchange="Media.formToData('type');">
-                                                                                <option value="video">HTML5 Video</option>
-                                                                                <option value="flash">Flash</option>
-                                                                                <option value="quicktime">QuickTime</option>
-                                                                                <option value="shockwave">Shockwave</option>
-                                                                                <option value="windowsmedia">Windows Media</option>
-                                                                                <option value="realmedia">Real Media</option>
-                                                                                <option value="iframe">Iframe</option>
-                                                                        </select>
-                                                                </td>
-                                                        </tr>
-                                                        <tr>
-                                                        <td><label for="src">{#media_dlg.file}</label></td>
-                                                                <td>
-                                                                        <table role="presentation" border="0" cellspacing="0" cellpadding="0">
-                                                                        <tr>
-                                                                                <td><input id="src" name="src" type="text" value="" class="mceFocus" onchange="Media.formToData();" /></td>
-                                                                                <td id="filebrowsercontainer">&nbsp;</td>
-                                                                        </tr>
-                                                                        </table>
-                                                                </td>
-                                                        </tr>
-                                                        <tr id="linklistrow">
-                                                                <td><label for="linklist">{#media_dlg.list}</label></td>
-                                                                <td id="linklistcontainer"><select id="linklist"><option value=""></option></select></td>
-                                                        </tr>
-                                                        <tr>
-                                                                <td><label for="width">{#media_dlg.size}</label></td>
-                                                                <td>
-                                                                        <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                                <tr>
-                                                                                        <td><input type="text" id="width" name="width" value="" class="size" onchange="Media.formToData('width');" onfocus="Media.beforeResize();" /> x <input type="text" id="height" name="height" value="" class="size" onfocus="Media.beforeResize();" onchange="Media.formToData('height');" /></td>
-                                                                                        <td>&nbsp;&nbsp;<input id="constrain" type="checkbox" name="constrain" class="checkbox" checked="checked" /></td>
-                                                                                        <td><label id="constrainlabel" for="constrain">{#media_dlg.constrain_proportions}</label></td>
-                                                                                </tr>
-                                                                        </table>
-                                                                </td>
-                                                        </tr>
-                                        </table>
-                                </fieldset>
-
-                                <fieldset>
-                                        <legend>{#media_dlg.preview}</legend>
-                                        <div id="prev"></div>
-                                </fieldset>
-                        </div>
-
-                        <div id="advanced_panel" class="panel">
-                                <fieldset>
-                                        <legend>{#media_dlg.advanced}</legend>
-
-                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0" width="100%">
-                                                <tr>
-                                                        <td><label for="id">{#media_dlg.id}</label></td>
-                                                        <td><input type="text" id="id" name="id" onchange="Media.formToData();" /></td>
-                                                        <td><label for="name">{#media_dlg.name}</label></td>
-                                                        <td><input type="text" id="name" name="name" onchange="Media.formToData();" /></td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="align">{#media_dlg.align}</label></td>
-                                                        <td>
-                                                                <select id="align" name="align" onchange="Media.formToData();">
-                                                                        <option value="">{#not_set}</option>
-                                                                        <option value="top">{#media_dlg.align_top}</option>
-                                                                        <option value="right">{#media_dlg.align_right}</option>
-                                                                        <option value="bottom">{#media_dlg.align_bottom}</option>
-                                                                        <option value="left">{#media_dlg.align_left}</option>
-                                                                </select>
-                                                        </td>
-
-                                                        <td><label for="bgcolor">{#media_dlg.bgcolor}</label></td>
-                                                        <td>
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');Media.formToData();" /></td>
-                                                                                <td id="bgcolor_pickcontainer">&nbsp;</td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="vspace">{#media_dlg.vspace}</label></td>
-                                                        <td><input type="text" id="vspace" name="vspace" class="number" onchange="Media.formToData();" /></td>
-                                                        <td><label for="hspace">{#media_dlg.hspace}</label></td>
-                                                        <td><input type="text" id="hspace" name="hspace" class="number" onchange="Media.formToData();" /></td>
-                                                </tr>
-                                        </table>
-                                </fieldset>
-
-                                <fieldset id="video_options">
-                                        <legend>{#media_dlg.html5_video_options}</legend>
-
-                                        <table role="presentation">
-                                                <tr>
-                                                        <td><label for="video_altsource1">{#media_dlg.altsource1}</label></td>
-                                                        <td>
-                                                                <table role="presentation" border="0" cellspacing="0" cellpadding="0">
-                                                                        <tr>
-                                                                                <td><input type="text" id="video_altsource1" name="video_altsource1" onchange="Media.formToData();" style="width: 240px" /></td>
-                                                                                <td id="video_altsource1_filebrowser">&nbsp;</td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="video_altsource2">{#media_dlg.altsource2}</label></td>
-                                                        <td>
-                                                                <table role="presentation" border="0" cellspacing="0" cellpadding="0">
-                                                                        <tr>
-                                                                                <td><input type="text" id="video_altsource2" name="video_altsource2" onchange="Media.formToData();" style="width: 240px" /></td>
-                                                                                <td id="video_altsource2_filebrowser">&nbsp;</td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="video_poster">{#media_dlg.poster}</label></td>
-                                                        <td>
-                                                                <table role="presentation" border="0" cellspacing="0" cellpadding="0">
-                                                                        <tr>
-                                                                                <td><input type="text" id="video_poster" name="video_poster" onchange="Media.formToData();" style="width: 240px" /></td>
-                                                                                <td id="video_poster_filebrowser">&nbsp;</td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-                                        </table>
-
-                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0">
-                                                <tr>
-                                                        <td>
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="video_autoplay" name="video_autoplay" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="video_autoplay">{#media_dlg.play}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td>
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="video_loop" name="video_loop" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="video_loop">{#media_dlg.loop}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td>
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="video_preload" name="video_preload" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="video_preload">{#media_dlg.preload}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td>
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="video_controls" name="video_controls" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="video_controls">{#media_dlg.controls}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-                                        </table>
-                                </fieldset>
-
-                                <fieldset id="flash_options">
-                                        <legend>{#media_dlg.flash_options}</legend>
-
-                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0">
-                                                <tr>
-                                                        <td><label for="flash_quality">{#media_dlg.quality}</label></td>
-                                                        <td>
-                                                                <select id="flash_quality" name="flash_quality" onchange="Media.formToData();">
-                                                                        <option value="">{#not_set}</option>
-                                                                        <option value="high">high</option>
-                                                                        <option value="low">low</option>
-                                                                        <option value="autolow">autolow</option>
-                                                                        <option value="autohigh">autohigh</option>
-                                                                        <option value="best">best</option>
-                                                                </select>
-                                                        </td>
-
-                                                        <td><label for="flash_scale">{#media_dlg.scale}</label></td>
-                                                        <td>
-                                                                <select id="flash_scale" name="flash_scale" onchange="Media.formToData();">
-                                                                        <option value="">{#not_set}</option>
-                                                                        <option value="showall">showall</option>
-                                                                        <option value="noborder">noborder</option>
-                                                                        <option value="exactfit">exactfit</option>
-                                                                        <option value="noscale">noscale</option>
-                                                                </select>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="flash_wmode">{#media_dlg.wmode}</label></td>
-                                                        <td>
-                                                                <select id="flash_wmode" name="flash_wmode" onchange="Media.formToData();">
-                                                                        <option value="">{#not_set}</option>
-                                                                        <option value="window">window</option>
-                                                                        <option value="opaque">opaque</option>
-                                                                        <option value="transparent">transparent</option>
-                                                                </select>
-                                                        </td>
-
-                                                        <td><label for="flash_salign">{#media_dlg.salign}</label></td>
-                                                        <td>
-                                                                <select id="flash_salign" name="flash_salign" onchange="Media.formToData();">
-                                                                        <option value="">{#not_set}</option>
-                                                                        <option value="l">{#media_dlg.align_left}</option>
-                                                                        <option value="t">{#media_dlg.align_top}</option>
-                                                                        <option value="r">{#media_dlg.align_right}</option>
-                                                                        <option value="b">{#media_dlg.align_bottom}</option>
-                                                                        <option value="tl">{#media_dlg.align_top_left}</option>
-                                                                        <option value="tr">{#media_dlg.align_top_right}</option>
-                                                                        <option value="bl">{#media_dlg.align_bottom_left}</option>
-                                                                        <option value="br">{#media_dlg.align_bottom_right}</option>
-                                                                </select>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="flash_play" name="flash_play" checked="checked" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="flash_play">{#media_dlg.play}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="flash_loop" name="flash_loop" checked="checked" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="flash_loop">{#media_dlg.loop}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="flash_menu" name="flash_menu" checked="checked" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="flash_menu">{#media_dlg.menu}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="flash_swliveconnect" name="flash_swliveconnect" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="flash_swliveconnect">{#media_dlg.liveconnect}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-                                        </table>
-
-                                        <table role="presentation">
-                                                <tr>
-                                                        <td><label for="flash_base">{#media_dlg.base}</label></td>
-                                                        <td><input type="text" id="flash_base" name="flash_base" onchange="Media.formToData();" /></td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="flash_flashvars">{#media_dlg.flashvars}</label></td>
-                                                        <td><input type="text" id="flash_flashvars" name="flash_flashvars" onchange="Media.formToData();" /></td>
-                                                </tr>
-                                        </table>
-                                </fieldset>
-
-                                <fieldset id="quicktime_options">
-                                        <legend>{#media_dlg.qt_options}</legend>
-
-                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0">
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_loop" name="quicktime_loop" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="quicktime_loop">{#media_dlg.loop}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_autoplay" name="quicktime_autoplay" checked="checked" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="quicktime_autoplay">{#media_dlg.play}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_cache" name="quicktime_cache" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="quicktime_cache">{#media_dlg.cache}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_controller" name="quicktime_controller" checked="checked" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="quicktime_controller">{#media_dlg.controller}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_correction" name="quicktime_correction" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="quicktime_correction">{#media_dlg.correction}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_enablejavascript" name="quicktime_enablejavascript" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="quicktime_enablejavascript">{#media_dlg.enablejavascript}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_kioskmode" name="quicktime_kioskmode" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="quicktime_kioskmode">{#media_dlg.kioskmode}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_autohref" name="quicktime_autohref" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="quicktime_autohref">{#media_dlg.autohref}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_playeveryframe" name="quicktime_playeveryframe" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="quicktime_playeveryframe">{#media_dlg.playeveryframe}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_targetcache" name="quicktime_targetcache" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="quicktime_targetcache">{#media_dlg.targetcache}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="quicktime_scale">{#media_dlg.scale}</label></td>
-                                                        <td><select id="quicktime_scale" name="quicktime_scale" class="mceEditableSelect" onchange="Media.formToData();">
-                                                                        <option value="">{#not_set}</option>
-                                                                        <option value="tofit">tofit</option>
-                                                                        <option value="aspect">aspect</option>
-                                                                </select>
-                                                        </td>
-
-                                                        <td colspan="2">&nbsp;</td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="quicktime_starttime">{#media_dlg.starttime}</label></td>
-                                                        <td><input type="text" id="quicktime_starttime" name="quicktime_starttime" onchange="Media.formToData();" /></td>
-
-                                                        <td><label for="quicktime_endtime">{#media_dlg.endtime}</label></td>
-                                                        <td><input type="text" id="quicktime_endtime" name="quicktime_endtime" onchange="Media.formToData();" /></td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="quicktime_target">{#media_dlg.target}</label></td>
-                                                        <td><input type="text" id="quicktime_target" name="quicktime_target" onchange="Media.formToData();" /></td>
-
-                                                        <td><label for="quicktime_href">{#media_dlg.href}</label></td>
-                                                        <td><input type="text" id="quicktime_href" name="quicktime_href" onchange="Media.formToData();" /></td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="quicktime_qtsrcchokespeed">{#media_dlg.qtsrcchokespeed}</label></td>
-                                                        <td><input type="text" id="quicktime_qtsrcchokespeed" name="quicktime_qtsrcchokespeed" onchange="Media.formToData();" /></td>
-
-                                                        <td><label for="quicktime_volume">{#media_dlg.volume}</label></td>
-                                                        <td><input type="text" id="quicktime_volume" name="quicktime_volume" onchange="Media.formToData();" /></td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="quicktime_qtsrc">{#media_dlg.qtsrc}</label></td>
-                                                        <td colspan="4">
-                                                                <table role="presentation" border="0" cellspacing="0" cellpadding="0">
-                                                                        <tr>
-                                                                                <td><input type="text" id="quicktime_qtsrc" name="quicktime_qtsrc" onchange="Media.formToData();" /></td>
-                                                                                <td id="qtsrcfilebrowsercontainer">&nbsp;</td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-                                        </table>
-                                </fieldset>
-
-                                <fieldset id="windowsmedia_options">
-                                        <legend>{#media_dlg.wmp_options}</legend>
-
-                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0">
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_autostart" name="windowsmedia_autostart" checked="checked" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="windowsmedia_autostart">{#media_dlg.autostart}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_enabled" name="windowsmedia_enabled" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="windowsmedia_enabled">{#media_dlg.enabled}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_enablecontextmenu" name="windowsmedia_enablecontextmenu" checked="checked" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="windowsmedia_enablecontextmenu">{#media_dlg.menu}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_fullscreen" name="windowsmedia_fullscreen" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="windowsmedia_fullscreen">{#media_dlg.fullscreen}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_invokeurls" name="windowsmedia_invokeurls" checked="checked" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="windowsmedia_invokeurls">{#media_dlg.invokeurls}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_mute" name="windowsmedia_mute" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="windowsmedia_mute">{#media_dlg.mute}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_stretchtofit" name="windowsmedia_stretchtofit" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="windowsmedia_stretchtofit">{#media_dlg.stretchtofit}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_windowlessvideo" name="windowsmedia_windowlessvideo" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="windowsmedia_windowlessvideo">{#media_dlg.windowlessvideo}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="windowsmedia_balance">{#media_dlg.balance}</label></td>
-                                                        <td><input type="text" id="windowsmedia_balance" name="windowsmedia_balance" onchange="Media.formToData();" /></td>
-
-                                                        <td><label for="windowsmedia_baseurl">{#media_dlg.baseurl}</label></td>
-                                                        <td><input type="text" id="windowsmedia_baseurl" name="windowsmedia_baseurl" onchange="Media.formToData();" /></td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="windowsmedia_captioningid">{#media_dlg.captioningid}</label></td>
-                                                        <td><input type="text" id="windowsmedia_captioningid" name="windowsmedia_captioningid" onchange="Media.formToData();" /></td>
-
-                                                        <td><label for="windowsmedia_currentmarker">{#media_dlg.currentmarker}</label></td>
-                                                        <td><input type="text" id="windowsmedia_currentmarker" name="windowsmedia_currentmarker" onchange="Media.formToData();" /></td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="windowsmedia_currentposition">{#media_dlg.currentposition}</label></td>
-                                                        <td><input type="text" id="windowsmedia_currentposition" name="windowsmedia_currentposition" onchange="Media.formToData();" /></td>
-
-                                                        <td><label for="windowsmedia_defaultframe">{#media_dlg.defaultframe}</label></td>
-                                                        <td><input type="text" id="windowsmedia_defaultframe" name="windowsmedia_defaultframe" onchange="Media.formToData();" /></td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="windowsmedia_playcount">{#media_dlg.playcount}</label></td>
-                                                        <td><input type="text" id="windowsmedia_playcount" name="windowsmedia_playcount" onchange="Media.formToData();" /></td>
-
-                                                        <td><label for="windowsmedia_rate">{#media_dlg.rate}</label></td>
-                                                        <td><input type="text" id="windowsmedia_rate" name="windowsmedia_rate" onchange="Media.formToData();" /></td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="windowsmedia_uimode">{#media_dlg.uimode}</label></td>
-                                                        <td><input type="text" id="windowsmedia_uimode" name="windowsmedia_uimode" onchange="Media.formToData();" /></td>
-
-                                                        <td><label for="windowsmedia_volume">{#media_dlg.volume}</label></td>
-                                                        <td><input type="text" id="windowsmedia_volume" name="windowsmedia_volume" onchange="Media.formToData();" /></td>
-                                                </tr>
-
-                                        </table>
-                                </fieldset>
-
-                                <fieldset id="realmedia_options">
-                                        <legend>{#media_dlg.rmp_options}</legend>
-
-                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0">
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_autostart" name="realmedia_autostart" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="realmedia_autostart">{#media_dlg.autostart}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_loop" name="realmedia_loop" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="realmedia_loop">{#media_dlg.loop}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_autogotourl" name="realmedia_autogotourl" checked="checked" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="realmedia_autogotourl">{#media_dlg.autogotourl}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_center" name="realmedia_center" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="realmedia_center">{#media_dlg.center}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_imagestatus" name="realmedia_imagestatus" checked="checked" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="realmedia_imagestatus">{#media_dlg.imagestatus}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_maintainaspect" name="realmedia_maintainaspect" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="realmedia_maintainaspect">{#media_dlg.maintainaspect}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_nojava" name="realmedia_nojava" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="realmedia_nojava">{#media_dlg.nojava}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_prefetch" name="realmedia_prefetch" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="realmedia_prefetch">{#media_dlg.prefetch}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_shuffle" name="realmedia_shuffle" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="realmedia_shuffle">{#media_dlg.shuffle}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                &nbsp;
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="realmedia_console">{#media_dlg.console}</label></td>
-                                                        <td><input type="text" id="realmedia_console" name="realmedia_console" onchange="Media.formToData();" /></td>
-
-                                                        <td><label for="realmedia_controls">{#media_dlg.controls}</label></td>
-                                                        <td><input type="text" id="realmedia_controls" name="realmedia_controls" onchange="Media.formToData();" /></td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="realmedia_numloop">{#media_dlg.numloop}</label></td>
-                                                        <td><input type="text" id="realmedia_numloop" name="realmedia_numloop" onchange="Media.formToData();" /></td>
-
-                                                        <td><label for="realmedia_scriptcallbacks">{#media_dlg.scriptcallbacks}</label></td>
-                                                        <td><input type="text" id="realmedia_scriptcallbacks" name="realmedia_scriptcallbacks" onchange="Media.formToData();" /></td>
-                                                </tr>
-                                        </table>
-                                </fieldset>
-
-                                <fieldset id="shockwave_options">
-                                        <legend>{#media_dlg.shockwave_options}</legend>
-
-                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0">
-                                                <tr>
-                                                        <td><label for="shockwave_swstretchstyle">{#media_dlg.swstretchstyle}</label></td>
-                                                        <td>
-                                                                <select id="shockwave_swstretchstyle" name="shockwave_swstretchstyle" onchange="Media.formToData();">
-                                                                        <option value="none">{#not_set}</option>
-                                                                        <option value="meet">Meet</option>
-                                                                        <option value="fill">Fill</option>
-                                                                        <option value="stage">Stage</option>
-                                                                </select>
-                                                        </td>
-
-                                                        <td><label for="shockwave_swvolume">{#media_dlg.volume}</label></td>
-                                                        <td><input type="text" id="shockwave_swvolume" name="shockwave_swvolume" onchange="Media.formToData();" /></td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td><label for="shockwave_swstretchhalign">{#media_dlg.swstretchhalign}</label></td>
-                                                        <td>
-                                                                <select id="shockwave_swstretchhalign" name="shockwave_swstretchhalign" onchange="Media.formToData();">
-                                                                        <option value="none">{#not_set}</option>
-                                                                        <option value="left">{#media_dlg.align_left}</option>
-                                                                        <option value="center">{#media_dlg.align_center}</option>
-                                                                        <option value="right">{#media_dlg.align_right}</option>
-                                                                </select>
-                                                        </td>
-
-                                                        <td><label for="shockwave_swstretchvalign">{#media_dlg.swstretchvalign}</label></td>
-                                                        <td>
-                                                                <select id="shockwave_swstretchvalign" name="shockwave_swstretchvalign" onchange="Media.formToData();">
-                                                                        <option value="none">{#not_set}</option>
-                                                                        <option value="meet">Meet</option>
-                                                                        <option value="fill">Fill</option>
-                                                                        <option value="stage">Stage</option>
-                                                                </select>
-                                                        </td>
-                                                </tr>
-
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="shockwave_autostart" name="shockwave_autostart" onchange="Media.formToData();" checked="checked" /></td>
-                                                                                <td><label for="shockwave_autostart">{#media_dlg.autostart}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="shockwave_sound" name="shockwave_sound" onchange="Media.formToData();" checked="checked" /></td>
-                                                                                <td><label for="shockwave_sound">{#media_dlg.sound}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-
-
-                                                <tr>
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="shockwave_swliveconnect" name="shockwave_swliveconnect" onchange="Media.formToData();" /></td>
-                                                                                <td><label for="shockwave_swliveconnect">{#media_dlg.liveconnect}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-
-                                                        <td colspan="2">
-                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                                        <tr>
-                                                                                <td><input type="checkbox" class="checkbox" id="shockwave_progress" name="shockwave_progress" onchange="Media.formToData();" checked="checked" /></td>
-                                                                                <td><label for="shockwave_progress">{#media_dlg.progress}</label></td>
-                                                                        </tr>
-                                                                </table>
-                                                        </td>
-                                                </tr>
-                                        </table>
-                                </fieldset>
-                        </div>
-
-                        <div id="source_panel" class="panel">
-                                <fieldset>
-                                        <legend>{#media_dlg.source}</legend>
-                                        <textarea id="source" style="width: 100%; height: 390px"></textarea>
-                                </fieldset>
-                        </div>
-                </div>
-
-                <div class="mceActionPanel">
-                        <input type="submit" id="insert" name="insert" value="{#insert}" />
-                        <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-                </div>
-        </form>
-</body>
-</html>
</del><ins>+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+        <title>{#media_dlg.title}</title>
+        <script type="text/javascript" src="../../tiny_mce_popup.js?ver=342-20110407"></script>
+        <script type="text/javascript" src="js/media.js?ver=342-20110407"></script>
+        <script type="text/javascript" src="../../utils/mctabs.js?ver=342-20110407"></script>
+        <script type="text/javascript" src="../../utils/validate.js?ver=342-20110407"></script>
+        <script type="text/javascript" src="../../utils/form_utils.js?ver=342-20110407"></script>
+        <script type="text/javascript" src="../../utils/editable_selects.js?ver=342-20110407"></script>
+        <link href="css/media.css?ver=342-20110407" rel="stylesheet" type="text/css" />
+</head>
+<body style="display: none" role="application">
+<form onsubmit="Media.insert();return false;" action="#">
+                <div class="tabs" role="presentation">
+                        <ul>
+                                <li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');Media.formToData();" onmousedown="return false;">{#media_dlg.general}</a></span></li>
+                                <li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');Media.formToData();" onmousedown="return false;">{#media_dlg.advanced}</a></span></li>
+                                <li id="source_tab" aria-controls="source_panel"><span><a href="javascript:mcTabs.displayTab('source_tab','source_panel');Media.formToData('source');" onmousedown="return false;">{#media_dlg.source}</a></span></li>
+                        </ul>
+                </div>
+
+                <div class="panel_wrapper">
+                        <div id="general_panel" class="panel current">
+                                <fieldset>
+                                        <legend>{#media_dlg.general}</legend>
+
+                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0">
+                                                        <tr>
+                                                                <td><label for="media_type">{#media_dlg.type}</label></td>
+                                                                <td>
+                                                                        <select id="media_type" name="media_type" onchange="Media.formToData('type');">
+                                                                                <option value="video">HTML5 Video</option>
+                                                                                <option value="flash">Flash</option>
+                                                                                <option value="quicktime">QuickTime</option>
+                                                                                <option value="shockwave">Shockwave</option>
+                                                                                <option value="windowsmedia">Windows Media</option>
+                                                                                <option value="realmedia">Real Media</option>
+                                                                                <option value="iframe">Iframe</option>
+                                                                        </select>
+                                                                </td>
+                                                        </tr>
+                                                        <tr>
+                                                        <td><label for="src">{#media_dlg.file}</label></td>
+                                                                <td>
+                                                                        <table role="presentation" border="0" cellspacing="0" cellpadding="0">
+                                                                        <tr>
+                                                                                <td><input id="src" name="src" type="text" value="" class="mceFocus" onchange="Media.formToData();" /></td>
+                                                                                <td id="filebrowsercontainer">&nbsp;</td>
+                                                                        </tr>
+                                                                        </table>
+                                                                </td>
+                                                        </tr>
+                                                        <tr id="linklistrow">
+                                                                <td><label for="linklist">{#media_dlg.list}</label></td>
+                                                                <td id="linklistcontainer"><select id="linklist"><option value=""></option></select></td>
+                                                        </tr>
+                                                        <tr>
+                                                                <td><label for="width">{#media_dlg.size}</label></td>
+                                                                <td>
+                                                                        <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                                <tr>
+                                                                                        <td><input type="text" id="width" name="width" value="" class="size" onchange="Media.formToData('width');" onfocus="Media.beforeResize();" /> x <input type="text" id="height" name="height" value="" class="size" onfocus="Media.beforeResize();" onchange="Media.formToData('height');" /></td>
+                                                                                        <td>&nbsp;&nbsp;<input id="constrain" type="checkbox" name="constrain" class="checkbox" checked="checked" /></td>
+                                                                                        <td><label id="constrainlabel" for="constrain">{#media_dlg.constrain_proportions}</label></td>
+                                                                                </tr>
+                                                                        </table>
+                                                                </td>
+                                                        </tr>
+                                        </table>
+                                </fieldset>
+
+                                <fieldset>
+                                        <legend>{#media_dlg.preview}</legend>
+                                        <div id="prev"></div>
+                                </fieldset>
+                        </div>
+
+                        <div id="advanced_panel" class="panel">
+                                <fieldset>
+                                        <legend>{#media_dlg.advanced}</legend>
+
+                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0" width="100%">
+                                                <tr>
+                                                        <td><label for="id">{#media_dlg.id}</label></td>
+                                                        <td><input type="text" id="id" name="id" onchange="Media.formToData();" /></td>
+                                                        <td><label for="name">{#media_dlg.name}</label></td>
+                                                        <td><input type="text" id="name" name="name" onchange="Media.formToData();" /></td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="align">{#media_dlg.align}</label></td>
+                                                        <td>
+                                                                <select id="align" name="align" onchange="Media.formToData();">
+                                                                        <option value="">{#not_set}</option>
+                                                                        <option value="top">{#media_dlg.align_top}</option>
+                                                                        <option value="right">{#media_dlg.align_right}</option>
+                                                                        <option value="bottom">{#media_dlg.align_bottom}</option>
+                                                                        <option value="left">{#media_dlg.align_left}</option>
+                                                                </select>
+                                                        </td>
+
+                                                        <td><label for="bgcolor">{#media_dlg.bgcolor}</label></td>
+                                                        <td>
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');Media.formToData();" /></td>
+                                                                                <td id="bgcolor_pickcontainer">&nbsp;</td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="vspace">{#media_dlg.vspace}</label></td>
+                                                        <td><input type="text" id="vspace" name="vspace" class="number" onchange="Media.formToData();" /></td>
+                                                        <td><label for="hspace">{#media_dlg.hspace}</label></td>
+                                                        <td><input type="text" id="hspace" name="hspace" class="number" onchange="Media.formToData();" /></td>
+                                                </tr>
+                                        </table>
+                                </fieldset>
+
+                                <fieldset id="video_options">
+                                        <legend>{#media_dlg.html5_video_options}</legend>
+
+                                        <table role="presentation">
+                                                <tr>
+                                                        <td><label for="video_altsource1">{#media_dlg.altsource1}</label></td>
+                                                        <td>
+                                                                <table role="presentation" border="0" cellspacing="0" cellpadding="0">
+                                                                        <tr>
+                                                                                <td><input type="text" id="video_altsource1" name="video_altsource1" onchange="Media.formToData();" style="width: 240px" /></td>
+                                                                                <td id="video_altsource1_filebrowser">&nbsp;</td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="video_altsource2">{#media_dlg.altsource2}</label></td>
+                                                        <td>
+                                                                <table role="presentation" border="0" cellspacing="0" cellpadding="0">
+                                                                        <tr>
+                                                                                <td><input type="text" id="video_altsource2" name="video_altsource2" onchange="Media.formToData();" style="width: 240px" /></td>
+                                                                                <td id="video_altsource2_filebrowser">&nbsp;</td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="video_poster">{#media_dlg.poster}</label></td>
+                                                        <td>
+                                                                <table role="presentation" border="0" cellspacing="0" cellpadding="0">
+                                                                        <tr>
+                                                                                <td><input type="text" id="video_poster" name="video_poster" onchange="Media.formToData();" style="width: 240px" /></td>
+                                                                                <td id="video_poster_filebrowser">&nbsp;</td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+                                        </table>
+
+                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0">
+                                                <tr>
+                                                        <td>
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="video_autoplay" name="video_autoplay" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="video_autoplay">{#media_dlg.play}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td>
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="video_loop" name="video_loop" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="video_loop">{#media_dlg.loop}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td>
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="video_preload" name="video_preload" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="video_preload">{#media_dlg.preload}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td>
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="video_controls" name="video_controls" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="video_controls">{#media_dlg.controls}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+                                        </table>
+                                </fieldset>
+
+                                <fieldset id="flash_options">
+                                        <legend>{#media_dlg.flash_options}</legend>
+
+                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0">
+                                                <tr>
+                                                        <td><label for="flash_quality">{#media_dlg.quality}</label></td>
+                                                        <td>
+                                                                <select id="flash_quality" name="flash_quality" onchange="Media.formToData();">
+                                                                        <option value="">{#not_set}</option>
+                                                                        <option value="high">high</option>
+                                                                        <option value="low">low</option>
+                                                                        <option value="autolow">autolow</option>
+                                                                        <option value="autohigh">autohigh</option>
+                                                                        <option value="best">best</option>
+                                                                </select>
+                                                        </td>
+
+                                                        <td><label for="flash_scale">{#media_dlg.scale}</label></td>
+                                                        <td>
+                                                                <select id="flash_scale" name="flash_scale" onchange="Media.formToData();">
+                                                                        <option value="">{#not_set}</option>
+                                                                        <option value="showall">showall</option>
+                                                                        <option value="noborder">noborder</option>
+                                                                        <option value="exactfit">exactfit</option>
+                                                                        <option value="noscale">noscale</option>
+                                                                </select>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="flash_wmode">{#media_dlg.wmode}</label></td>
+                                                        <td>
+                                                                <select id="flash_wmode" name="flash_wmode" onchange="Media.formToData();">
+                                                                        <option value="">{#not_set}</option>
+                                                                        <option value="window">window</option>
+                                                                        <option value="opaque">opaque</option>
+                                                                        <option value="transparent">transparent</option>
+                                                                </select>
+                                                        </td>
+
+                                                        <td><label for="flash_salign">{#media_dlg.salign}</label></td>
+                                                        <td>
+                                                                <select id="flash_salign" name="flash_salign" onchange="Media.formToData();">
+                                                                        <option value="">{#not_set}</option>
+                                                                        <option value="l">{#media_dlg.align_left}</option>
+                                                                        <option value="t">{#media_dlg.align_top}</option>
+                                                                        <option value="r">{#media_dlg.align_right}</option>
+                                                                        <option value="b">{#media_dlg.align_bottom}</option>
+                                                                        <option value="tl">{#media_dlg.align_top_left}</option>
+                                                                        <option value="tr">{#media_dlg.align_top_right}</option>
+                                                                        <option value="bl">{#media_dlg.align_bottom_left}</option>
+                                                                        <option value="br">{#media_dlg.align_bottom_right}</option>
+                                                                </select>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="flash_play" name="flash_play" checked="checked" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="flash_play">{#media_dlg.play}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="flash_loop" name="flash_loop" checked="checked" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="flash_loop">{#media_dlg.loop}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="flash_menu" name="flash_menu" checked="checked" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="flash_menu">{#media_dlg.menu}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="flash_swliveconnect" name="flash_swliveconnect" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="flash_swliveconnect">{#media_dlg.liveconnect}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+                                        </table>
+
+                                        <table role="presentation">
+                                                <tr>
+                                                        <td><label for="flash_base">{#media_dlg.base}</label></td>
+                                                        <td><input type="text" id="flash_base" name="flash_base" onchange="Media.formToData();" /></td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="flash_flashvars">{#media_dlg.flashvars}</label></td>
+                                                        <td><input type="text" id="flash_flashvars" name="flash_flashvars" onchange="Media.formToData();" /></td>
+                                                </tr>
+                                        </table>
+                                </fieldset>
+
+                                <fieldset id="quicktime_options">
+                                        <legend>{#media_dlg.qt_options}</legend>
+
+                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0">
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_loop" name="quicktime_loop" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="quicktime_loop">{#media_dlg.loop}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_autoplay" name="quicktime_autoplay" checked="checked" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="quicktime_autoplay">{#media_dlg.play}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_cache" name="quicktime_cache" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="quicktime_cache">{#media_dlg.cache}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_controller" name="quicktime_controller" checked="checked" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="quicktime_controller">{#media_dlg.controller}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_correction" name="quicktime_correction" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="quicktime_correction">{#media_dlg.correction}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_enablejavascript" name="quicktime_enablejavascript" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="quicktime_enablejavascript">{#media_dlg.enablejavascript}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_kioskmode" name="quicktime_kioskmode" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="quicktime_kioskmode">{#media_dlg.kioskmode}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_autohref" name="quicktime_autohref" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="quicktime_autohref">{#media_dlg.autohref}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_playeveryframe" name="quicktime_playeveryframe" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="quicktime_playeveryframe">{#media_dlg.playeveryframe}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="quicktime_targetcache" name="quicktime_targetcache" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="quicktime_targetcache">{#media_dlg.targetcache}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="quicktime_scale">{#media_dlg.scale}</label></td>
+                                                        <td><select id="quicktime_scale" name="quicktime_scale" class="mceEditableSelect" onchange="Media.formToData();">
+                                                                        <option value="">{#not_set}</option>
+                                                                        <option value="tofit">tofit</option>
+                                                                        <option value="aspect">aspect</option>
+                                                                </select>
+                                                        </td>
+
+                                                        <td colspan="2">&nbsp;</td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="quicktime_starttime">{#media_dlg.starttime}</label></td>
+                                                        <td><input type="text" id="quicktime_starttime" name="quicktime_starttime" onchange="Media.formToData();" /></td>
+
+                                                        <td><label for="quicktime_endtime">{#media_dlg.endtime}</label></td>
+                                                        <td><input type="text" id="quicktime_endtime" name="quicktime_endtime" onchange="Media.formToData();" /></td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="quicktime_target">{#media_dlg.target}</label></td>
+                                                        <td><input type="text" id="quicktime_target" name="quicktime_target" onchange="Media.formToData();" /></td>
+
+                                                        <td><label for="quicktime_href">{#media_dlg.href}</label></td>
+                                                        <td><input type="text" id="quicktime_href" name="quicktime_href" onchange="Media.formToData();" /></td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="quicktime_qtsrcchokespeed">{#media_dlg.qtsrcchokespeed}</label></td>
+                                                        <td><input type="text" id="quicktime_qtsrcchokespeed" name="quicktime_qtsrcchokespeed" onchange="Media.formToData();" /></td>
+
+                                                        <td><label for="quicktime_volume">{#media_dlg.volume}</label></td>
+                                                        <td><input type="text" id="quicktime_volume" name="quicktime_volume" onchange="Media.formToData();" /></td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="quicktime_qtsrc">{#media_dlg.qtsrc}</label></td>
+                                                        <td colspan="4">
+                                                                <table role="presentation" border="0" cellspacing="0" cellpadding="0">
+                                                                        <tr>
+                                                                                <td><input type="text" id="quicktime_qtsrc" name="quicktime_qtsrc" onchange="Media.formToData();" /></td>
+                                                                                <td id="qtsrcfilebrowsercontainer">&nbsp;</td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+                                        </table>
+                                </fieldset>
+
+                                <fieldset id="windowsmedia_options">
+                                        <legend>{#media_dlg.wmp_options}</legend>
+
+                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0">
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_autostart" name="windowsmedia_autostart" checked="checked" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="windowsmedia_autostart">{#media_dlg.autostart}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_enabled" name="windowsmedia_enabled" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="windowsmedia_enabled">{#media_dlg.enabled}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_enablecontextmenu" name="windowsmedia_enablecontextmenu" checked="checked" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="windowsmedia_enablecontextmenu">{#media_dlg.menu}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_fullscreen" name="windowsmedia_fullscreen" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="windowsmedia_fullscreen">{#media_dlg.fullscreen}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_invokeurls" name="windowsmedia_invokeurls" checked="checked" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="windowsmedia_invokeurls">{#media_dlg.invokeurls}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_mute" name="windowsmedia_mute" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="windowsmedia_mute">{#media_dlg.mute}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_stretchtofit" name="windowsmedia_stretchtofit" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="windowsmedia_stretchtofit">{#media_dlg.stretchtofit}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="windowsmedia_windowlessvideo" name="windowsmedia_windowlessvideo" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="windowsmedia_windowlessvideo">{#media_dlg.windowlessvideo}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="windowsmedia_balance">{#media_dlg.balance}</label></td>
+                                                        <td><input type="text" id="windowsmedia_balance" name="windowsmedia_balance" onchange="Media.formToData();" /></td>
+
+                                                        <td><label for="windowsmedia_baseurl">{#media_dlg.baseurl}</label></td>
+                                                        <td><input type="text" id="windowsmedia_baseurl" name="windowsmedia_baseurl" onchange="Media.formToData();" /></td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="windowsmedia_captioningid">{#media_dlg.captioningid}</label></td>
+                                                        <td><input type="text" id="windowsmedia_captioningid" name="windowsmedia_captioningid" onchange="Media.formToData();" /></td>
+
+                                                        <td><label for="windowsmedia_currentmarker">{#media_dlg.currentmarker}</label></td>
+                                                        <td><input type="text" id="windowsmedia_currentmarker" name="windowsmedia_currentmarker" onchange="Media.formToData();" /></td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="windowsmedia_currentposition">{#media_dlg.currentposition}</label></td>
+                                                        <td><input type="text" id="windowsmedia_currentposition" name="windowsmedia_currentposition" onchange="Media.formToData();" /></td>
+
+                                                        <td><label for="windowsmedia_defaultframe">{#media_dlg.defaultframe}</label></td>
+                                                        <td><input type="text" id="windowsmedia_defaultframe" name="windowsmedia_defaultframe" onchange="Media.formToData();" /></td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="windowsmedia_playcount">{#media_dlg.playcount}</label></td>
+                                                        <td><input type="text" id="windowsmedia_playcount" name="windowsmedia_playcount" onchange="Media.formToData();" /></td>
+
+                                                        <td><label for="windowsmedia_rate">{#media_dlg.rate}</label></td>
+                                                        <td><input type="text" id="windowsmedia_rate" name="windowsmedia_rate" onchange="Media.formToData();" /></td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="windowsmedia_uimode">{#media_dlg.uimode}</label></td>
+                                                        <td><input type="text" id="windowsmedia_uimode" name="windowsmedia_uimode" onchange="Media.formToData();" /></td>
+
+                                                        <td><label for="windowsmedia_volume">{#media_dlg.volume}</label></td>
+                                                        <td><input type="text" id="windowsmedia_volume" name="windowsmedia_volume" onchange="Media.formToData();" /></td>
+                                                </tr>
+
+                                        </table>
+                                </fieldset>
+
+                                <fieldset id="realmedia_options">
+                                        <legend>{#media_dlg.rmp_options}</legend>
+
+                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0">
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_autostart" name="realmedia_autostart" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="realmedia_autostart">{#media_dlg.autostart}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_loop" name="realmedia_loop" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="realmedia_loop">{#media_dlg.loop}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_autogotourl" name="realmedia_autogotourl" checked="checked" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="realmedia_autogotourl">{#media_dlg.autogotourl}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_center" name="realmedia_center" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="realmedia_center">{#media_dlg.center}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_imagestatus" name="realmedia_imagestatus" checked="checked" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="realmedia_imagestatus">{#media_dlg.imagestatus}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_maintainaspect" name="realmedia_maintainaspect" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="realmedia_maintainaspect">{#media_dlg.maintainaspect}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_nojava" name="realmedia_nojava" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="realmedia_nojava">{#media_dlg.nojava}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_prefetch" name="realmedia_prefetch" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="realmedia_prefetch">{#media_dlg.prefetch}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="realmedia_shuffle" name="realmedia_shuffle" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="realmedia_shuffle">{#media_dlg.shuffle}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                &nbsp;
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="realmedia_console">{#media_dlg.console}</label></td>
+                                                        <td><input type="text" id="realmedia_console" name="realmedia_console" onchange="Media.formToData();" /></td>
+
+                                                        <td><label for="realmedia_controls">{#media_dlg.controls}</label></td>
+                                                        <td><input type="text" id="realmedia_controls" name="realmedia_controls" onchange="Media.formToData();" /></td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="realmedia_numloop">{#media_dlg.numloop}</label></td>
+                                                        <td><input type="text" id="realmedia_numloop" name="realmedia_numloop" onchange="Media.formToData();" /></td>
+
+                                                        <td><label for="realmedia_scriptcallbacks">{#media_dlg.scriptcallbacks}</label></td>
+                                                        <td><input type="text" id="realmedia_scriptcallbacks" name="realmedia_scriptcallbacks" onchange="Media.formToData();" /></td>
+                                                </tr>
+                                        </table>
+                                </fieldset>
+
+                                <fieldset id="shockwave_options">
+                                        <legend>{#media_dlg.shockwave_options}</legend>
+
+                                        <table role="presentation" border="0" cellpadding="4" cellspacing="0">
+                                                <tr>
+                                                        <td><label for="shockwave_swstretchstyle">{#media_dlg.swstretchstyle}</label></td>
+                                                        <td>
+                                                                <select id="shockwave_swstretchstyle" name="shockwave_swstretchstyle" onchange="Media.formToData();">
+                                                                        <option value="none">{#not_set}</option>
+                                                                        <option value="meet">Meet</option>
+                                                                        <option value="fill">Fill</option>
+                                                                        <option value="stage">Stage</option>
+                                                                </select>
+                                                        </td>
+
+                                                        <td><label for="shockwave_swvolume">{#media_dlg.volume}</label></td>
+                                                        <td><input type="text" id="shockwave_swvolume" name="shockwave_swvolume" onchange="Media.formToData();" /></td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td><label for="shockwave_swstretchhalign">{#media_dlg.swstretchhalign}</label></td>
+                                                        <td>
+                                                                <select id="shockwave_swstretchhalign" name="shockwave_swstretchhalign" onchange="Media.formToData();">
+                                                                        <option value="none">{#not_set}</option>
+                                                                        <option value="left">{#media_dlg.align_left}</option>
+                                                                        <option value="center">{#media_dlg.align_center}</option>
+                                                                        <option value="right">{#media_dlg.align_right}</option>
+                                                                </select>
+                                                        </td>
+
+                                                        <td><label for="shockwave_swstretchvalign">{#media_dlg.swstretchvalign}</label></td>
+                                                        <td>
+                                                                <select id="shockwave_swstretchvalign" name="shockwave_swstretchvalign" onchange="Media.formToData();">
+                                                                        <option value="none">{#not_set}</option>
+                                                                        <option value="meet">Meet</option>
+                                                                        <option value="fill">Fill</option>
+                                                                        <option value="stage">Stage</option>
+                                                                </select>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="shockwave_autostart" name="shockwave_autostart" onchange="Media.formToData();" checked="checked" /></td>
+                                                                                <td><label for="shockwave_autostart">{#media_dlg.autostart}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="shockwave_sound" name="shockwave_sound" onchange="Media.formToData();" checked="checked" /></td>
+                                                                                <td><label for="shockwave_sound">{#media_dlg.sound}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+
+
+                                                <tr>
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="shockwave_swliveconnect" name="shockwave_swliveconnect" onchange="Media.formToData();" /></td>
+                                                                                <td><label for="shockwave_swliveconnect">{#media_dlg.liveconnect}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+
+                                                        <td colspan="2">
+                                                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                                                                        <tr>
+                                                                                <td><input type="checkbox" class="checkbox" id="shockwave_progress" name="shockwave_progress" onchange="Media.formToData();" checked="checked" /></td>
+                                                                                <td><label for="shockwave_progress">{#media_dlg.progress}</label></td>
+                                                                        </tr>
+                                                                </table>
+                                                        </td>
+                                                </tr>
+                                        </table>
+                                </fieldset>
+                        </div>
+
+                        <div id="source_panel" class="panel">
+                                <fieldset>
+                                        <legend>{#media_dlg.source}</legend>
+                                        <textarea id="source" style="width: 100%; height: 390px"></textarea>
+                                </fieldset>
+                        </div>
+                </div>
+
+                <div class="mceActionPanel">
+                        <input type="submit" id="insert" name="insert" value="{#insert}" />
+                        <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+                </div>
+        </form>
+</body>
+</html>
</ins><span class="cx">Property changes on: trunk/wp-includes/js/tinymce/plugins/media/media.htm
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginsspellcheckerchangelogtxt"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/spellchecker/changelog.txt (17627 => 17628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/spellchecker/changelog.txt        2011-04-11 08:01:34 UTC (rev 17627)
+++ trunk/wp-includes/js/tinymce/plugins/spellchecker/changelog.txt        2011-04-11 18:23:51 UTC (rev 17628)
</span><span class="lines">@@ -1,28 +1,28 @@
</span><del>-Version 2.0.5 (2011-03-24)
-        Merged with the latest TinyMCE spellchecker version.
-Version 2.0.4 (2010-12-20)
-        Fixed issue with the JSON class not having the correct number of parameters to ord calls.
-Version 2.0.3 (2010-04-19)
-        Added standalone support. Will use native spellchecker for supported browsers.
-        Added @package phpdoc comments. Patch contributed by Jacob Santos.
-        Fixed some PHP missing function issue.
-Version 2.0.2 (2008-04-30)
-        Added new EnchantSpell engine class contributed by Michel Weimerskirch.
-        Added new general.remote_rpc_url option, enables you to proxy requests to another server.
-        Fixed security hole in PSpellShell.php file if PSpellShell engine was used.
-Version 2.0.1 (2008-03-07)
-        Fixed bug where spellchecker was auto focusing the editor in IE.
-Version 2.0 (2008-01-30)
-        Fixed bug where the suggestions menu was placed at an incorrect location.
-Version 2.0rc1 (2008-01-14)
-        Moved package from beta to release candidate.
-Version 2.0b3 (2007-12-xx)
-        Fixed bug where the suggestions menu could appear at the wrong location.
-Version 2.0b2 (2007-11-29)
-        Fixed bug where the spellchecker was removing the word when it was ignored.
-Version 2.0b1 (2007-11-21)
-        Moved spellchecker from alpha to beta status.
-Version 2.0a2 (2007-11-13)
-        Updated plugin so it works correctly with the TinyMCE 3.0a3 version.
-Version 2.0a1 (2007-11-01)
-        Rewritten version for TinyMCE 3.0 this new version uses JSON RPC.
</del><ins>+Version 2.0.5 (2011-03-24)
+        Merged with the latest TinyMCE spellchecker version.
+Version 2.0.4 (2010-12-20)
+        Fixed issue with the JSON class not having the correct number of parameters to ord calls.
+Version 2.0.3 (2010-04-19)
+        Added standalone support. Will use native spellchecker for supported browsers.
+        Added @package phpdoc comments. Patch contributed by Jacob Santos.
+        Fixed some PHP missing function issue.
+Version 2.0.2 (2008-04-30)
+        Added new EnchantSpell engine class contributed by Michel Weimerskirch.
+        Added new general.remote_rpc_url option, enables you to proxy requests to another server.
+        Fixed security hole in PSpellShell.php file if PSpellShell engine was used.
+Version 2.0.1 (2008-03-07)
+        Fixed bug where spellchecker was auto focusing the editor in IE.
+Version 2.0 (2008-01-30)
+        Fixed bug where the suggestions menu was placed at an incorrect location.
+Version 2.0rc1 (2008-01-14)
+        Moved package from beta to release candidate.
+Version 2.0b3 (2007-12-xx)
+        Fixed bug where the suggestions menu could appear at the wrong location.
+Version 2.0b2 (2007-11-29)
+        Fixed bug where the spellchecker was removing the word when it was ignored.
+Version 2.0b1 (2007-11-21)
+        Moved spellchecker from alpha to beta status.
+Version 2.0a2 (2007-11-13)
+        Updated plugin so it works correctly with the TinyMCE 3.0a3 version.
+Version 2.0a1 (2007-11-01)
+        Rewritten version for TinyMCE 3.0 this new version uses JSON RPC.
</ins><span class="cx">Property changes on: trunk/wp-includes/js/tinymce/plugins/spellchecker/changelog.txt
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesjstinymcethemesadvancedshortcutshtm"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/themes/advanced/shortcuts.htm (17627 => 17628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/themes/advanced/shortcuts.htm        2011-04-11 08:01:34 UTC (rev 17627)
+++ trunk/wp-includes/js/tinymce/themes/advanced/shortcuts.htm        2011-04-11 18:23:51 UTC (rev 17628)
</span><span class="lines">@@ -1,47 +1,47 @@
</span><del>-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-        <head>
-                <title>{#advanced_dlg.accessibility_help}</title>
-                <script type="text/javascript" src="../../tiny_mce_popup.js?ver=342-20110407"></script>
-                <script type="text/javascript">tinyMCEPopup.requireLangPack();</script>
-        </head>
-        <body id="content">
-                <h1>{#advanced_dlg.accessibility_usage_title}</h1>
-                <h2>Toolbars</h2>
-                <p>Press ALT-F10 to move focus to the toolbars. Navigate through the buttons using the arrow keys.
-                Press enter to activate a button and return focus to the editor.
-                Press escape to return focus to the editor without performing any actions.</p>
-                
-                <h2>Status Bar</h2>
-                <p>To access the editor status bar, press ALT-F11. Use the left and right arrow keys to navigate between elements in the path.
-                Press enter or space to select an element. Press escape to return focus to the editor without changing the selection.</p>
-                
-                <h2>Context Menu</h2>
-                <p>Press shift-F10 to activate the context menu. Use the up and down arrow keys to move between menu items. To open sub-menus press the right arrow key.
-                To close submenus press the left arrow key. Press escape to close the context menu.</p>
-                
-                <h1>Keyboard Shortcuts</h1>
-                <table>
-                        <thead>
-                                <tr>
-                                        <th>Keystroke</th>
-                                        <th>Function</th>
-                                </tr>
-                        </thead>
-                        <tbody>
-                                <tr>
-                                        <td>Control-B</td><td>Bold</td>
-                                </tr>
-                                <tr>
-                                        <td>Control-I</td><td>Italic</td>
-                                </tr>
-                                <tr>
-                                        <td>Control-Z</td><td>Undo</td>
-                                </tr>
-                                <tr>
-                                        <td>Control-Y</td><td>Redo</td>
-                                </tr>
-                        </tbody>
-                </table>
-        </body>
-</html>
</del><ins>+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+        <head>
+                <title>{#advanced_dlg.accessibility_help}</title>
+                <script type="text/javascript" src="../../tiny_mce_popup.js?ver=342-20110407"></script>
+                <script type="text/javascript">tinyMCEPopup.requireLangPack();</script>
+        </head>
+        <body id="content">
+                <h1>{#advanced_dlg.accessibility_usage_title}</h1>
+                <h2>Toolbars</h2>
+                <p>Press ALT-F10 to move focus to the toolbars. Navigate through the buttons using the arrow keys.
+                Press enter to activate a button and return focus to the editor.
+                Press escape to return focus to the editor without performing any actions.</p>
+                
+                <h2>Status Bar</h2>
+                <p>To access the editor status bar, press ALT-F11. Use the left and right arrow keys to navigate between elements in the path.
+                Press enter or space to select an element. Press escape to return focus to the editor without changing the selection.</p>
+                
+                <h2>Context Menu</h2>
+                <p>Press shift-F10 to activate the context menu. Use the up and down arrow keys to move between menu items. To open sub-menus press the right arrow key.
+                To close submenus press the left arrow key. Press escape to close the context menu.</p>
+                
+                <h1>Keyboard Shortcuts</h1>
+                <table>
+                        <thead>
+                                <tr>
+                                        <th>Keystroke</th>
+                                        <th>Function</th>
+                                </tr>
+                        </thead>
+                        <tbody>
+                                <tr>
+                                        <td>Control-B</td><td>Bold</td>
+                                </tr>
+                                <tr>
+                                        <td>Control-I</td><td>Italic</td>
+                                </tr>
+                                <tr>
+                                        <td>Control-Z</td><td>Undo</td>
+                                </tr>
+                                <tr>
+                                        <td>Control-Y</td><td>Redo</td>
+                                </tr>
+                        </tbody>
+                </table>
+        </body>
+</html>
</ins><span class="cx">Property changes on: trunk/wp-includes/js/tinymce/themes/advanced/shortcuts.htm
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesjstinymcethemesadvancedskinshighcontrastcontentcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/content.css (17627 => 17628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/content.css        2011-04-11 08:01:34 UTC (rev 17627)
+++ trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/content.css        2011-04-11 18:23:51 UTC (rev 17628)
</span><span class="lines">@@ -1,23 +1,23 @@
</span><del>-body, td, pre { margin:8px;}
-body.mceForceColors {background:#FFF; color:#000;}
-h1 {font-size: 2em}
-h2 {font-size: 1.5em}
-h3 {font-size: 1.17em}
-h4 {font-size: 1em}
-h5 {font-size: .83em}
-h6 {font-size: .75em}
-.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
-a.mceItemAnchor {display:inline-block; width:11px !important; height:11px !important; background:url(../default/img/items.gif) no-repeat 0 0;}
-span.mceItemNbsp {background: #DDD}
-td.mceSelected, th.mceSelected {background-color:#3399ff !important}
-img {border:0;}
-table {cursor:default}
-table td, table th {cursor:text}
-ins {border-bottom:1px solid green; text-decoration: none; color:green}
-del {color:red; text-decoration:line-through}
-cite {border-bottom:1px dashed blue}
-acronym {border-bottom:1px dotted #CCC; cursor:help}
-abbr {border-bottom:1px dashed #CCC; cursor:help}
-
-img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}
-font[face=mceinline] {font-family:inherit !important}
</del><ins>+body, td, pre { margin:8px;}
+body.mceForceColors {background:#FFF; color:#000;}
+h1 {font-size: 2em}
+h2 {font-size: 1.5em}
+h3 {font-size: 1.17em}
+h4 {font-size: 1em}
+h5 {font-size: .83em}
+h6 {font-size: .75em}
+.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
+a.mceItemAnchor {display:inline-block; width:11px !important; height:11px !important; background:url(../default/img/items.gif) no-repeat 0 0;}
+span.mceItemNbsp {background: #DDD}
+td.mceSelected, th.mceSelected {background-color:#3399ff !important}
+img {border:0;}
+table {cursor:default}
+table td, table th {cursor:text}
+ins {border-bottom:1px solid green; text-decoration: none; color:green}
+del {color:red; text-decoration:line-through}
+cite {border-bottom:1px dashed blue}
+acronym {border-bottom:1px dotted #CCC; cursor:help}
+abbr {border-bottom:1px dashed #CCC; cursor:help}
+
+img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}
+font[face=mceinline] {font-family:inherit !important}
</ins><span class="cx">Property changes on: trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/content.css
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesjstinymcethemesadvancedskinshighcontrastdialogcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/dialog.css (17627 => 17628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/dialog.css        2011-04-11 08:01:34 UTC (rev 17627)
+++ trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/dialog.css        2011-04-11 18:23:51 UTC (rev 17628)
</span><span class="lines">@@ -1,105 +1,105 @@
</span><del>-/* Generic */
-body {
-font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;
</del><ins>+/* Generic */
+body {
+font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;
</ins><span class="cx"> background:#F0F0EE;
</span><del>-color: black;
-padding:0;
-margin:8px 8px 0 8px;
-}
-
-html {background:#F0F0EE; color:#000;}
-td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
-textarea {resize:none;outline:none;}
-a:link, a:visited {color:black;background-color:transparent;}
-a:hover {color:#2B6FB6;background-color:transparent;}
-.nowrap {white-space: nowrap}
-
-/* Forms */
-fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;}
-legend {color:#2B6FB6; font-weight:bold;}
-label.msg {display:none;}
-label.invalid {color:#EE0000; display:inline;background-color:transparent;}
-input.invalid {border:1px solid #EE0000;background-color:transparent;}
-input {background:#FFF; border:1px solid #CCC;color:black;}
-input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
-input, select, textarea {border:1px solid #808080;}
-input.radio {border:1px none #000000; background:transparent; vertical-align:middle;}
-input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;}
-.input_noborder {border:0;}
-
-/* Buttons */
-#insert, #cancel, input.button, .updateButton {
-font-weight:bold;
-width:94px; height:23px;
-cursor:pointer;
-padding-bottom:2px;
-float:left;
-}
-
-#cancel {float:right}
-
-/* Browse */
-a.pickcolor, a.browse {text-decoration:none}
-a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;}
-.mceOldBoxModel a.browse span {width:22px; height:20px;}
-a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;}
-a.browse span.disabled {border:1px solid white; opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
-a.browse:hover span.disabled {border:1px solid white; background-color:transparent;}
-a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;}
-.mceOldBoxModel a.pickcolor span {width:21px; height:17px;}
-a.pickcolor:hover span {background-color:#B2BBD0;}
-a.pickcolor:hover span.disabled {}
-
-/* Charmap */
-table.charmap {border:1px solid #AAA; text-align:center}
-td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;}
-#charmap a {display:block; color:#000; text-decoration:none; border:0}
-#charmap a:hover {background:#CCC;color:#2B6FB6}
-#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center}
-#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center}
-
-/* Source */
-.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;}
-.mceActionPanel {margin-top:5px;}
-
-/* Tabs classes */
-.tabs {width:100%; height:18px; line-height:normal;}
-.tabs ul {margin:0; padding:0; list-style:none;}
-.tabs li {float:left; border: 1px solid black; border-bottom:0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block; cursor:pointer;}
-.tabs li.current {font-weight: bold; margin-right:2px;}
-.tabs span {float:left; display:block; padding:0px 10px 0 0;}
-.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;}
-.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;}
-
-/* Panels */
-.panel_wrapper div.panel {display:none;}
-.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;}
-.panel_wrapper {border:1px solid #919B9C; padding:10px; padding-top:5px; clear:both; background:white;}
-
-/* Columns */
-.column {float:left;}
-.properties {width:100%;}
-.properties .column1 {}
-.properties .column2 {text-align:left;}
-
-/* Titles */
-h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;}
-h3 {font-size:14px;}
-.title {font-size:12px; font-weight:bold; color:#2B6FB6;}
-
-/* Dialog specific */
-#link .panel_wrapper, #link div.current {height:125px;}
-#image .panel_wrapper, #image div.current {height:200px;}
-#plugintable thead {font-weight:bold; background:#DDD;}
-#plugintable, #about #plugintable td {border:1px solid #919B9C;}
-#plugintable {width:96%; margin-top:10px;}
-#pluginscontainer {height:290px; overflow:auto;}
-#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}
-#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
-#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
-#colorpicker #light div {overflow:hidden;}
-#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}
-#colorpicker .panel_wrapper div.current {height:175px;}
-#colorpicker #namedcolors {width:150px;}
-#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
-#colorpicker #colornamecontainer {margin-top:5px;}
</del><ins>+color: black;
+padding:0;
+margin:8px 8px 0 8px;
+}
+
+html {background:#F0F0EE; color:#000;}
+td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+textarea {resize:none;outline:none;}
+a:link, a:visited {color:black;background-color:transparent;}
+a:hover {color:#2B6FB6;background-color:transparent;}
+.nowrap {white-space: nowrap}
+
+/* Forms */
+fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;}
+legend {color:#2B6FB6; font-weight:bold;}
+label.msg {display:none;}
+label.invalid {color:#EE0000; display:inline;background-color:transparent;}
+input.invalid {border:1px solid #EE0000;background-color:transparent;}
+input {background:#FFF; border:1px solid #CCC;color:black;}
+input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+input, select, textarea {border:1px solid #808080;}
+input.radio {border:1px none #000000; background:transparent; vertical-align:middle;}
+input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;}
+.input_noborder {border:0;}
+
+/* Buttons */
+#insert, #cancel, input.button, .updateButton {
+font-weight:bold;
+width:94px; height:23px;
+cursor:pointer;
+padding-bottom:2px;
+float:left;
+}
+
+#cancel {float:right}
+
+/* Browse */
+a.pickcolor, a.browse {text-decoration:none}
+a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;}
+.mceOldBoxModel a.browse span {width:22px; height:20px;}
+a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;}
+a.browse span.disabled {border:1px solid white; opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
+a.browse:hover span.disabled {border:1px solid white; background-color:transparent;}
+a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;}
+.mceOldBoxModel a.pickcolor span {width:21px; height:17px;}
+a.pickcolor:hover span {background-color:#B2BBD0;}
+a.pickcolor:hover span.disabled {}
+
+/* Charmap */
+table.charmap {border:1px solid #AAA; text-align:center}
+td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;}
+#charmap a {display:block; color:#000; text-decoration:none; border:0}
+#charmap a:hover {background:#CCC;color:#2B6FB6}
+#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center}
+#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center}
+
+/* Source */
+.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;}
+.mceActionPanel {margin-top:5px;}
+
+/* Tabs classes */
+.tabs {width:100%; height:18px; line-height:normal;}
+.tabs ul {margin:0; padding:0; list-style:none;}
+.tabs li {float:left; border: 1px solid black; border-bottom:0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block; cursor:pointer;}
+.tabs li.current {font-weight: bold; margin-right:2px;}
+.tabs span {float:left; display:block; padding:0px 10px 0 0;}
+.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;}
+.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;}
+
+/* Panels */
+.panel_wrapper div.panel {display:none;}
+.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;}
+.panel_wrapper {border:1px solid #919B9C; padding:10px; padding-top:5px; clear:both; background:white;}
+
+/* Columns */
+.column {float:left;}
+.properties {width:100%;}
+.properties .column1 {}
+.properties .column2 {text-align:left;}
+
+/* Titles */
+h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;}
+h3 {font-size:14px;}
+.title {font-size:12px; font-weight:bold; color:#2B6FB6;}
+
+/* Dialog specific */
+#link .panel_wrapper, #link div.current {height:125px;}
+#image .panel_wrapper, #image div.current {height:200px;}
+#plugintable thead {font-weight:bold; background:#DDD;}
+#plugintable, #about #plugintable td {border:1px solid #919B9C;}
+#plugintable {width:96%; margin-top:10px;}
+#pluginscontainer {height:290px; overflow:auto;}
+#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}
+#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
+#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
+#colorpicker #light div {overflow:hidden;}
+#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}
+#colorpicker .panel_wrapper div.current {height:175px;}
+#colorpicker #namedcolors {width:150px;}
+#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
+#colorpicker #colornamecontainer {margin-top:5px;}
</ins><span class="cx">Property changes on: trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/dialog.css
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesjstinymcethemesadvancedskinshighcontrastuicss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/ui.css (17627 => 17628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/ui.css        2011-04-11 08:01:34 UTC (rev 17627)
+++ trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/ui.css        2011-04-11 18:23:51 UTC (rev 17628)
</span><span class="lines">@@ -1,101 +1,101 @@
</span><del>-/* Reset */
-.highcontrastSkin table, .highcontrastSkin tbody, .highcontrastSkin a, .highcontrastSkin img, .highcontrastSkin tr, .highcontrastSkin div, .highcontrastSkin td, .highcontrastSkin iframe, .highcontrastSkin span, .highcontrastSkin *, .highcontrastSkin .mceText {border:0; margin:0; padding:0; vertical-align:baseline; border-collapse:separate;}
-.highcontrastSkin a:hover, .highcontrastSkin a:link, .highcontrastSkin a:visited, .highcontrastSkin a:active {text-decoration:none; font-weight:normal; cursor:default;}
-.highcontrastSkin table td {vertical-align:middle}
-
-.highcontrastSkin .mceIconOnly {display: block !important;}
-
-/* External */
-.highcontrastSkin .mceExternalToolbar {position:absolute; border:1px solid; border-bottom:0; display:none; background-color: white;}
-.highcontrastSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
-.highcontrastSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px;}
-
-/* Layout */
-.highcontrastSkin table.mceLayout {border: 1px solid;}
-.highcontrastSkin .mceIframeContainer {border-top:1px solid; border-bottom:1px solid}
-.highcontrastSkin .mceStatusbar a:hover {text-decoration:underline}
-.highcontrastSkin .mceStatusbar {display:block; line-height:1.5em; overflow:visible;}
-.highcontrastSkin .mceStatusbar div {float:left}
-.highcontrastSkin .mceStatusbar a.mceResize {display:block; float:right; width:20px; height:20px; cursor:se-resize; outline:0}
-
-.highcontrastSkin .mceToolbar td { display: inline-block; float: left;}
-.highcontrastSkin .mceToolbar tr { display: block;}
-.highcontrastSkin .mceToolbar table { display: block; }
-
-/* Button */
-
-.highcontrastSkin .mceButton { display:block; margin: 2px; padding: 5px 10px;border: 1px solid; border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; -ms-border-radius: 3px; height: 2em;}
-.highcontrastSkin .mceButton .mceVoiceLabel { height: 100%; vertical-align: center; line-height: 2em}
-.highcontrastSkin .mceButtonDisabled .mceVoiceLabel { opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60);}
-.highcontrastSkin .mceButtonActive, .highcontrastSkin .mceButton:focus, .highcontrastSkin .mceButton:active { border: 5px solid; padding: 1px 6px;-webkit-focus-ring-color:none;outline:none;}
-
-/* Separator */
-.highcontrastSkin .mceSeparator {display:block; width:16px; height:26px;}
-
-/* ListBox */
-.highcontrastSkin .mceListBox { display: block; margin:2px;-webkit-focus-ring-color:none;outline:none;}
-.highcontrastSkin .mceListBox .mceText {padding: 5px 6px; line-height: 2em; width: 15ex; overflow: hidden;}
-.highcontrastSkin .mceListBoxDisabled .mceText { opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60);}
-.highcontrastSkin .mceListBox a.mceText { padding: 5px 10px; display: block; height: 2em; line-height: 2em; border: 1px solid; border-right: 0; border-radius: 3px 0px 0px 3px; -moz-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px; -ms-border-radius: 3px 0px 0px 3px;}
-.highcontrastSkin .mceListBox a.mceOpen { padding: 5px 4px; display: block; height: 2em; line-height: 2em; border: 1px solid; border-left: 0; border-radius: 0px 3px 3px 0px; -moz-border-radius: 0px 3px 3px 0px; -webkit-border-radius: 0px 3px 3px 0px; -ms-border-radius: 0px 3px 3px 0px;}
-.highcontrastSkin .mceListBox:focus a.mceText, .highcontrastSkin .mceListBox:active a.mceText { border-width: 5px; padding: 1px 10px 1px 6px;}
-.highcontrastSkin .mceListBox:focus a.mceOpen, .highcontrastSkin .mceListBox:active a.mceOpen { border-width: 5px; padding: 1px 0px 1px 4px;}
-
-.highcontrastSkin .mceListBoxMenu {overflow-y:auto}
-
-/* SplitButton */
-.highcontrastSkin .mceSplitButtonDisabled .mceAction {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
-
-.highcontrastSkin .mceSplitButton { border-collapse: collapse; margin: 2px; height: 2em; line-height: 2em;-webkit-focus-ring-color:none;outline:none;}
-.highcontrastSkin .mceSplitButton td { display: table-cell; float: none; margin: 0; padding: 0; height: 2em;}
-.highcontrastSkin .mceSplitButton tr { display: table-row; }
-.highcontrastSkin table.mceSplitButton { display: table; }
-.highcontrastSkin .mceSplitButton a.mceAction { padding: 5px 10px; display: block; height: 2em; line-height: 2em; overflow: hidden; border: 1px solid; border-right: 0; border-radius: 3px 0px 0px 3px; -moz-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px; -ms-border-radius: 3px 0px 0px 3px;}
-.highcontrastSkin .mceSplitButton a.mceOpen { padding: 5px 4px; display: block; height: 2em; line-height: 2em; border: 1px solid; border-radius: 0px 3px 3px 0px; -moz-border-radius: 0px 3px 3px 0px; -webkit-border-radius: 0px 3px 3px 0px; -ms-border-radius: 0px 3px 3px 0px;}
-.highcontrastSkin .mceSplitButton .mceVoiceLabel { height: 2em; vertical-align: center; line-height: 2em; }
-.highcontrastSkin .mceSplitButton:focus a.mceAction, .highcontrastSkin .mceSplitButton:active a.mceAction { border-width: 5px; border-right-width: 1px; padding: 1px 10px 1px 6px;-webkit-focus-ring-color:none;outline:none;}
-.highcontrastSkin .mceSplitButton:focus a.mceOpen, .highcontrastSkin .mceSplitButton:active a.mceOpen { border-width: 5px; border-left-width: 1px; padding: 1px 0px 1px 4px;-webkit-focus-ring-color:none;outline:none;}
-
-/* Menu */
-.highcontrastSkin .mceNoIcons span.mceIcon {width:0;}
-.highcontrastSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid; }
-.highcontrastSkin .mceMenu table {background:white; color: black}
-.highcontrastSkin .mceNoIcons a .mceText {padding-left:10px}
-.highcontrastSkin .mceMenu a, .highcontrastSkin .mceMenu span, .highcontrastSkin .mceMenu {display:block;background:white; color: black}
-.highcontrastSkin .mceMenu td {height:2em}
-.highcontrastSkin .mceMenu a {position:relative;padding:3px 0 4px 0; display: block;}
-.highcontrastSkin .mceMenu .mceText {position:relative; display:block; cursor:default; margin:0; padding:0 25px 0 25px;}
-.highcontrastSkin .mceMenu pre.mceText {font-family:Monospace}
-.highcontrastSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:26px;}
-.highcontrastSkin td.mceMenuItemSeparator {border-top:1px solid; height:1px}
-.highcontrastSkin .mceMenuItemTitle a {border:0; border-bottom:1px solid}
-.highcontrastSkin .mceMenuItemTitle span.mceText {font-weight:bold; padding-left:4px}
-.highcontrastSkin .mceNoIcons .mceMenuItemSelected span.mceText:before {content: "\2713\A0";}
-.highcontrastSkin .mceMenu span.mceMenuLine {display:none}
-.highcontrastSkin .mceMenuItemSub a .mceText:after {content: "\A0\25B8"}
-
-/* ColorSplitButton */
-.highcontrastSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid; color: #000}
-.highcontrastSkin .mceColorSplitMenu td {padding:2px}
-.highcontrastSkin .mceColorSplitMenu a {display:block; width:16px; height:16px; overflow:hidden; color:#000; margin: 0; padding: 0;}
-.highcontrastSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
-.highcontrastSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}
-.highcontrastSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid; background-color:#B6BDD2}
-.highcontrastSkin a.mceMoreColors:hover {border:1px solid #0A246A; color: #000;}
-.highcontrastSkin .mceColorPreview {display:none;}
-.highcontrastSkin .mce_forecolor span.mceAction, .highcontrastSkin .mce_backcolor span.mceAction {height:17px;overflow:hidden}
-
-/* Progress,Resize */
-.highcontrastSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF}
-.highcontrastSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
-
-/* Formats */
-.highcontrastSkin .mce_p span.mceText {}
-.highcontrastSkin .mce_address span.mceText {font-style:italic}
-.highcontrastSkin .mce_pre span.mceText {font-family:monospace}
-.highcontrastSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
-.highcontrastSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
-.highcontrastSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
-.highcontrastSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
-.highcontrastSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
-.highcontrastSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
</del><ins>+/* Reset */
+.highcontrastSkin table, .highcontrastSkin tbody, .highcontrastSkin a, .highcontrastSkin img, .highcontrastSkin tr, .highcontrastSkin div, .highcontrastSkin td, .highcontrastSkin iframe, .highcontrastSkin span, .highcontrastSkin *, .highcontrastSkin .mceText {border:0; margin:0; padding:0; vertical-align:baseline; border-collapse:separate;}
+.highcontrastSkin a:hover, .highcontrastSkin a:link, .highcontrastSkin a:visited, .highcontrastSkin a:active {text-decoration:none; font-weight:normal; cursor:default;}
+.highcontrastSkin table td {vertical-align:middle}
+
+.highcontrastSkin .mceIconOnly {display: block !important;}
+
+/* External */
+.highcontrastSkin .mceExternalToolbar {position:absolute; border:1px solid; border-bottom:0; display:none; background-color: white;}
+.highcontrastSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
+.highcontrastSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px;}
+
+/* Layout */
+.highcontrastSkin table.mceLayout {border: 1px solid;}
+.highcontrastSkin .mceIframeContainer {border-top:1px solid; border-bottom:1px solid}
+.highcontrastSkin .mceStatusbar a:hover {text-decoration:underline}
+.highcontrastSkin .mceStatusbar {display:block; line-height:1.5em; overflow:visible;}
+.highcontrastSkin .mceStatusbar div {float:left}
+.highcontrastSkin .mceStatusbar a.mceResize {display:block; float:right; width:20px; height:20px; cursor:se-resize; outline:0}
+
+.highcontrastSkin .mceToolbar td { display: inline-block; float: left;}
+.highcontrastSkin .mceToolbar tr { display: block;}
+.highcontrastSkin .mceToolbar table { display: block; }
+
+/* Button */
+
+.highcontrastSkin .mceButton { display:block; margin: 2px; padding: 5px 10px;border: 1px solid; border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; -ms-border-radius: 3px; height: 2em;}
+.highcontrastSkin .mceButton .mceVoiceLabel { height: 100%; vertical-align: center; line-height: 2em}
+.highcontrastSkin .mceButtonDisabled .mceVoiceLabel { opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60);}
+.highcontrastSkin .mceButtonActive, .highcontrastSkin .mceButton:focus, .highcontrastSkin .mceButton:active { border: 5px solid; padding: 1px 6px;-webkit-focus-ring-color:none;outline:none;}
+
+/* Separator */
+.highcontrastSkin .mceSeparator {display:block; width:16px; height:26px;}
+
+/* ListBox */
+.highcontrastSkin .mceListBox { display: block; margin:2px;-webkit-focus-ring-color:none;outline:none;}
+.highcontrastSkin .mceListBox .mceText {padding: 5px 6px; line-height: 2em; width: 15ex; overflow: hidden;}
+.highcontrastSkin .mceListBoxDisabled .mceText { opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60);}
+.highcontrastSkin .mceListBox a.mceText { padding: 5px 10px; display: block; height: 2em; line-height: 2em; border: 1px solid; border-right: 0; border-radius: 3px 0px 0px 3px; -moz-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px; -ms-border-radius: 3px 0px 0px 3px;}
+.highcontrastSkin .mceListBox a.mceOpen { padding: 5px 4px; display: block; height: 2em; line-height: 2em; border: 1px solid; border-left: 0; border-radius: 0px 3px 3px 0px; -moz-border-radius: 0px 3px 3px 0px; -webkit-border-radius: 0px 3px 3px 0px; -ms-border-radius: 0px 3px 3px 0px;}
+.highcontrastSkin .mceListBox:focus a.mceText, .highcontrastSkin .mceListBox:active a.mceText { border-width: 5px; padding: 1px 10px 1px 6px;}
+.highcontrastSkin .mceListBox:focus a.mceOpen, .highcontrastSkin .mceListBox:active a.mceOpen { border-width: 5px; padding: 1px 0px 1px 4px;}
+
+.highcontrastSkin .mceListBoxMenu {overflow-y:auto}
+
+/* SplitButton */
+.highcontrastSkin .mceSplitButtonDisabled .mceAction {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
+
+.highcontrastSkin .mceSplitButton { border-collapse: collapse; margin: 2px; height: 2em; line-height: 2em;-webkit-focus-ring-color:none;outline:none;}
+.highcontrastSkin .mceSplitButton td { display: table-cell; float: none; margin: 0; padding: 0; height: 2em;}
+.highcontrastSkin .mceSplitButton tr { display: table-row; }
+.highcontrastSkin table.mceSplitButton { display: table; }
+.highcontrastSkin .mceSplitButton a.mceAction { padding: 5px 10px; display: block; height: 2em; line-height: 2em; overflow: hidden; border: 1px solid; border-right: 0; border-radius: 3px 0px 0px 3px; -moz-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px; -ms-border-radius: 3px 0px 0px 3px;}
+.highcontrastSkin .mceSplitButton a.mceOpen { padding: 5px 4px; display: block; height: 2em; line-height: 2em; border: 1px solid; border-radius: 0px 3px 3px 0px; -moz-border-radius: 0px 3px 3px 0px; -webkit-border-radius: 0px 3px 3px 0px; -ms-border-radius: 0px 3px 3px 0px;}
+.highcontrastSkin .mceSplitButton .mceVoiceLabel { height: 2em; vertical-align: center; line-height: 2em; }
+.highcontrastSkin .mceSplitButton:focus a.mceAction, .highcontrastSkin .mceSplitButton:active a.mceAction { border-width: 5px; border-right-width: 1px; padding: 1px 10px 1px 6px;-webkit-focus-ring-color:none;outline:none;}
+.highcontrastSkin .mceSplitButton:focus a.mceOpen, .highcontrastSkin .mceSplitButton:active a.mceOpen { border-width: 5px; border-left-width: 1px; padding: 1px 0px 1px 4px;-webkit-focus-ring-color:none;outline:none;}
+
+/* Menu */
+.highcontrastSkin .mceNoIcons span.mceIcon {width:0;}
+.highcontrastSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid; }
+.highcontrastSkin .mceMenu table {background:white; color: black}
+.highcontrastSkin .mceNoIcons a .mceText {padding-left:10px}
+.highcontrastSkin .mceMenu a, .highcontrastSkin .mceMenu span, .highcontrastSkin .mceMenu {display:block;background:white; color: black}
+.highcontrastSkin .mceMenu td {height:2em}
+.highcontrastSkin .mceMenu a {position:relative;padding:3px 0 4px 0; display: block;}
+.highcontrastSkin .mceMenu .mceText {position:relative; display:block; cursor:default; margin:0; padding:0 25px 0 25px;}
+.highcontrastSkin .mceMenu pre.mceText {font-family:Monospace}
+.highcontrastSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:26px;}
+.highcontrastSkin td.mceMenuItemSeparator {border-top:1px solid; height:1px}
+.highcontrastSkin .mceMenuItemTitle a {border:0; border-bottom:1px solid}
+.highcontrastSkin .mceMenuItemTitle span.mceText {font-weight:bold; padding-left:4px}
+.highcontrastSkin .mceNoIcons .mceMenuItemSelected span.mceText:before {content: "\2713\A0";}
+.highcontrastSkin .mceMenu span.mceMenuLine {display:none}
+.highcontrastSkin .mceMenuItemSub a .mceText:after {content: "\A0\25B8"}
+
+/* ColorSplitButton */
+.highcontrastSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid; color: #000}
+.highcontrastSkin .mceColorSplitMenu td {padding:2px}
+.highcontrastSkin .mceColorSplitMenu a {display:block; width:16px; height:16px; overflow:hidden; color:#000; margin: 0; padding: 0;}
+.highcontrastSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
+.highcontrastSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}
+.highcontrastSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid; background-color:#B6BDD2}
+.highcontrastSkin a.mceMoreColors:hover {border:1px solid #0A246A; color: #000;}
+.highcontrastSkin .mceColorPreview {display:none;}
+.highcontrastSkin .mce_forecolor span.mceAction, .highcontrastSkin .mce_backcolor span.mceAction {height:17px;overflow:hidden}
+
+/* Progress,Resize */
+.highcontrastSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF}
+.highcontrastSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
+
+/* Formats */
+.highcontrastSkin .mce_p span.mceText {}
+.highcontrastSkin .mce_address span.mceText {font-style:italic}
+.highcontrastSkin .mce_pre span.mceText {font-family:monospace}
+.highcontrastSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
+.highcontrastSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
+.highcontrastSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
+.highcontrastSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
+.highcontrastSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
+.highcontrastSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
</ins><span class="cx">Property changes on: trunk/wp-includes/js/tinymce/themes/advanced/skins/highcontrast/ui.css
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre>
</div>
</div>
</body>
</html>