<!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" />
<title>[26876] trunk: TinyMCE 4.0.12, first run.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26876">26876</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-12-28 23:52:04 +0000 (Sat, 28 Dec 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See <a href="http://core.trac.wordpress.org/ticket/24067">#24067</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunksrcwpadmincsswpadmincss">trunk/src/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminjseditorjs">trunk/src/wp-admin/js/editor.js</a></li>
<li><a href="#trunksrcwpadminjsmediauploadjs">trunk/src/wp-admin/js/media-upload.js</a></li>
<li><a href="#trunksrcwpadminjspostjs">trunk/src/wp-admin/js/post.js</a></li>
<li><a href="#trunksrcwpadminjswpfullscreenjs">trunk/src/wp-admin/js/wp-fullscreen.js</a></li>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludescsseditorcss">trunk/src/wp-includes/css/editor.css</a></li>
<li><a href="#trunksrcwpincludesjsautosavejs">trunk/src/wp-includes/js/autosave.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaeditorjs">trunk/src/wp-includes/js/media-editor.js</a></li>
<li><a href="#trunksrcwpincludesjsquicktagsjs">trunk/src/wp-includes/js/quicktags.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcelangswplangsenjs">trunk/src/wp-includes/js/tinymce/langs/wp-langs-en.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsmediamoxieplayerswf">trunk/src/wp-includes/js/tinymce/plugins/media/moxieplayer.swf</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsspellcheckerconfigphp">trunk/src/wp-includes/js/tinymce/plugins/spellchecker/config.php</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsspellcheckerrpcphp">trunk/src/wp-includes/js/tinymce/plugins/spellchecker/rpc.php</a></li>
<li><a href="#trunksrcwpincludesjstinymcetiny_mce_popupjs">trunk/src/wp-includes/js/tinymce/tiny_mce_popup.js</a></li>
<li><a href="#trunksrcwpincludesjstinymceutilseditable_selectsjs">trunk/src/wp-includes/js/tinymce/utils/editable_selects.js</a></li>
<li><a href="#trunksrcwpincludesjstinymceutilsform_utilsjs">trunk/src/wp-includes/js/tinymce/utils/form_utils.js</a></li>
<li><a href="#trunksrcwpincludesjstinymceutilsmctabsjs">trunk/src/wp-includes/js/tinymce/utils/mctabs.js</a></li>
<li><a href="#trunksrcwpincludesjstinymceutilsvalidatejs">trunk/src/wp-includes/js/tinymce/utils/validate.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcewpmcehelpphp">trunk/src/wp-includes/js/tinymce/wp-mce-help.php</a></li>
<li><a href="#trunksrcwpincludesjswplinkjs">trunk/src/wp-includes/js/wplink.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/src/wp-includes/js/tinymce/plugins/charmap/</li>
<li><a href="#trunksrcwpincludesjstinymcepluginscharmappluginjs">trunk/src/wp-includes/js/tinymce/plugins/charmap/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginscharmappluginminjs">trunk/src/wp-includes/js/tinymce/plugins/charmap/plugin.min.js</a></li>
<li>trunk/src/wp-includes/js/tinymce/plugins/compat3x/</li>
<li>trunk/src/wp-includes/js/tinymce/plugins/compat3x/css/</li>
<li><a href="#trunksrcwpincludesjstinymcepluginscompat3xcssdialogcss">trunk/src/wp-includes/js/tinymce/plugins/compat3x/css/dialog.css</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginscompat3xpluginjs">trunk/src/wp-includes/js/tinymce/plugins/compat3x/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginscompat3xpluginminjs">trunk/src/wp-includes/js/tinymce/plugins/compat3x/plugin.min.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsdirectionalitypluginjs">trunk/src/wp-includes/js/tinymce/plugins/directionality/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsdirectionalitypluginminjs">trunk/src/wp-includes/js/tinymce/plugins/directionality/plugin.min.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsfullscreenpluginjs">trunk/src/wp-includes/js/tinymce/plugins/fullscreen/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsfullscreenpluginminjs">trunk/src/wp-includes/js/tinymce/plugins/fullscreen/plugin.min.js</a></li>
<li>trunk/src/wp-includes/js/tinymce/plugins/image/</li>
<li><a href="#trunksrcwpincludesjstinymcepluginsimagepluginjs">trunk/src/wp-includes/js/tinymce/plugins/image/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsimagepluginminjs">trunk/src/wp-includes/js/tinymce/plugins/image/plugin.min.js</a></li>
<li>trunk/src/wp-includes/js/tinymce/plugins/link/</li>
<li><a href="#trunksrcwpincludesjstinymcepluginslinkpluginjs">trunk/src/wp-includes/js/tinymce/plugins/link/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginslinkpluginminjs">trunk/src/wp-includes/js/tinymce/plugins/link/plugin.min.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsmediapluginjs">trunk/src/wp-includes/js/tinymce/plugins/media/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsmediapluginminjs">trunk/src/wp-includes/js/tinymce/plugins/media/plugin.min.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginspastepluginjs">trunk/src/wp-includes/js/tinymce/plugins/paste/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginspastepluginminjs">trunk/src/wp-includes/js/tinymce/plugins/paste/plugin.min.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsspellcheckerpluginjs">trunk/src/wp-includes/js/tinymce/plugins/spellchecker/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsspellcheckerpluginminjs">trunk/src/wp-includes/js/tinymce/plugins/spellchecker/plugin.min.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginstabfocuspluginjs">trunk/src/wp-includes/js/tinymce/plugins/tabfocus/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginstabfocuspluginminjs">trunk/src/wp-includes/js/tinymce/plugins/tabfocus/plugin.min.js</a></li>
<li>trunk/src/wp-includes/js/tinymce/plugins/textcolor/</li>
<li><a href="#trunksrcwpincludesjstinymcepluginstextcolorpluginjs">trunk/src/wp-includes/js/tinymce/plugins/textcolor/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginstextcolorpluginminjs">trunk/src/wp-includes/js/tinymce/plugins/textcolor/plugin.min.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpdialogspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpdialogs/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpeditimagepluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpfullscreenpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpgallerypluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpgallery/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswplinkpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wplink/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpviewpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js</a></li>
<li>trunk/src/wp-includes/js/tinymce/skins/</li>
<li>trunk/src/wp-includes/js/tinymce/skins/lightgray/</li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgraycontentinlinemincss">trunk/src/wp-includes/js/tinymce/skins/lightgray/content.inline.min.css</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgraycontentmincss">trunk/src/wp-includes/js/tinymce/skins/lightgray/content.min.css</a></li>
<li>trunk/src/wp-includes/js/tinymce/skins/lightgray/fonts/</li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayfontsreadmemd">trunk/src/wp-includes/js/tinymce/skins/lightgray/fonts/readme.md</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayfontstinymcesmalleot">trunk/src/wp-includes/js/tinymce/skins/lightgray/fonts/tinymce-small.eot</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayfontstinymcesmallsvg">trunk/src/wp-includes/js/tinymce/skins/lightgray/fonts/tinymce-small.svg</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayfontstinymcesmallttf">trunk/src/wp-includes/js/tinymce/skins/lightgray/fonts/tinymce-small.ttf</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayfontstinymcesmallwoff">trunk/src/wp-includes/js/tinymce/skins/lightgray/fonts/tinymce-small.woff</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayfontstinymceeot">trunk/src/wp-includes/js/tinymce/skins/lightgray/fonts/tinymce.eot</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayfontstinymcesvg">trunk/src/wp-includes/js/tinymce/skins/lightgray/fonts/tinymce.svg</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayfontstinymcettf">trunk/src/wp-includes/js/tinymce/skins/lightgray/fonts/tinymce.ttf</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayfontstinymcewoff">trunk/src/wp-includes/js/tinymce/skins/lightgray/fonts/tinymce.woff</a></li>
<li>trunk/src/wp-includes/js/tinymce/skins/lightgray/img/</li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayimganchorgif">trunk/src/wp-includes/js/tinymce/skins/lightgray/img/anchor.gif</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayimgloadergif">trunk/src/wp-includes/js/tinymce/skins/lightgray/img/loader.gif</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayimgobjectgif">trunk/src/wp-includes/js/tinymce/skins/lightgray/img/object.gif</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayimgtransgif">trunk/src/wp-includes/js/tinymce/skins/lightgray/img/trans.gif</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayimgwlinegif">trunk/src/wp-includes/js/tinymce/skins/lightgray/img/wline.gif</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayskinie7mincss">trunk/src/wp-includes/js/tinymce/skins/lightgray/skin.ie7.min.css</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinslightgrayskinmincss">trunk/src/wp-includes/js/tinymce/skins/lightgray/skin.min.css</a></li>
<li>trunk/src/wp-includes/js/tinymce/skins/wordpress/</li>
<li>trunk/src/wp-includes/js/tinymce/skins/wordpress/images/</li>
<li><a href="#trunksrcwpincludesjstinymceskinswordpressimagesembeddedpng">trunk/src/wp-includes/js/tinymce/skins/wordpress/images/embedded.png</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinswordpressimagesgallery2xpng">trunk/src/wp-includes/js/tinymce/skins/wordpress/images/gallery-2x.png</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinswordpressimagesgallerypng">trunk/src/wp-includes/js/tinymce/skins/wordpress/images/gallery.png</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinswordpresswpcontentcss">trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css</a></li>
<li>trunk/src/wp-includes/js/tinymce/themes/modern/</li>
<li><a href="#trunksrcwpincludesjstinymcethemesmodernthemejs">trunk/src/wp-includes/js/tinymce/themes/modern/theme.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcethemesmodernthememinjs">trunk/src/wp-includes/js/tinymce/themes/modern/theme.min.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcetinymcejs">trunk/src/wp-includes/js/tinymce/tinymce.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcetinymceminjs">trunk/src/wp-includes/js/tinymce/tinymce.min.js</a></li>
<li><a href="#trunksrcwpincludesjswpdialogjs">trunk/src/wp-includes/js/wpdialog.js</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstinymcelangswplangsphp">trunk/src/wp-includes/js/tinymce/langs/wp-langs.php</a></li>
<li><a href="#trunksrcwpincludesjstinymcemark_loaded_srcjs">trunk/src/wp-includes/js/tinymce/mark_loaded_src.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsdirectionalityeditor_pluginjs">trunk/src/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsdirectionalityeditor_plugin_srcjs">trunk/src/wp-includes/js/tinymce/plugins/directionality/editor_plugin_src.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsfullscreeneditor_pluginjs">trunk/src/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsfullscreeneditor_plugin_srcjs">trunk/src/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin_src.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsfullscreenfullscreenhtm">trunk/src/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm</a></li>
<li>trunk/src/wp-includes/js/tinymce/plugins/inlinepopups/</li>
<li>trunk/src/wp-includes/js/tinymce/plugins/media/css/</li>
<li><a href="#trunksrcwpincludesjstinymcepluginsmediaeditor_pluginjs">trunk/src/wp-includes/js/tinymce/plugins/media/editor_plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsmediaeditor_plugin_srcjs">trunk/src/wp-includes/js/tinymce/plugins/media/editor_plugin_src.js</a></li>
<li>trunk/src/wp-includes/js/tinymce/plugins/media/js/</li>
<li><a href="#trunksrcwpincludesjstinymcepluginsmediamediahtm">trunk/src/wp-includes/js/tinymce/plugins/media/media.htm</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginspasteeditor_pluginjs">trunk/src/wp-includes/js/tinymce/plugins/paste/editor_plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginspasteeditor_plugin_srcjs">trunk/src/wp-includes/js/tinymce/plugins/paste/editor_plugin_src.js</a></li>
<li>trunk/src/wp-includes/js/tinymce/plugins/paste/js/</li>
<li><a href="#trunksrcwpincludesjstinymcepluginspastepastetexthtm">trunk/src/wp-includes/js/tinymce/plugins/paste/pastetext.htm</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginspastepastewordhtm">trunk/src/wp-includes/js/tinymce/plugins/paste/pasteword.htm</a></li>
<li>trunk/src/wp-includes/js/tinymce/plugins/spellchecker/css/</li>
<li><a href="#trunksrcwpincludesjstinymcepluginsspellcheckereditor_pluginjs">trunk/src/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginsspellcheckereditor_plugin_srcjs">trunk/src/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin_src.js</a></li>
<li>trunk/src/wp-includes/js/tinymce/plugins/spellchecker/img/</li>
<li><a href="#trunksrcwpincludesjstinymcepluginstabfocuseditor_pluginjs">trunk/src/wp-includes/js/tinymce/plugins/tabfocus/editor_plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginstabfocuseditor_plugin_srcjs">trunk/src/wp-includes/js/tinymce/plugins/tabfocus/editor_plugin_src.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresseditor_plugin_srcjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js</a></li>
<li>trunk/src/wp-includes/js/tinymce/plugins/wordpress/img/</li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpdialogseditor_plugin_srcjs">trunk/src/wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin_src.js</a></li>
<li>trunk/src/wp-includes/js/tinymce/plugins/wpdialogs/js/</li>
<li>trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/css/</li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpeditimageeditimagehtml">trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpeditimageeditor_plugin_srcjs">trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js</a></li>
<li>trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/img/</li>
<li>trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/js/</li>
<li>trunk/src/wp-includes/js/tinymce/plugins/wpfullscreen/css/</li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpfullscreeneditor_plugin_srcjs">trunk/src/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpgalleryeditor_plugin_srcjs">trunk/src/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js</a></li>
<li>trunk/src/wp-includes/js/tinymce/plugins/wpgallery/img/</li>
<li><a href="#trunksrcwpincludesjstinymcepluginswplinkeditor_plugin_srcjs">trunk/src/wp-includes/js/tinymce/plugins/wplink/editor_plugin_src.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpvieweditor_plugin_srcjs">trunk/src/wp-includes/js/tinymce/plugins/wpview/editor_plugin_src.js</a></li>
<li>trunk/src/wp-includes/js/tinymce/themes/advanced/</li>
<li><a href="#trunksrcwpincludesjstinymcetiny_mcejs">trunk/src/wp-includes/js/tinymce/tiny_mce.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcewptinymceschemajs">trunk/src/wp-includes/js/tinymce/wp-tinymce-schema.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4>Modified: trunk/Gruntfile.js (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Gruntfile.js       2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/Gruntfile.js  2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -17,13 +17,7 @@
</span><span class="cx">                          cwd: BUILD_DIR,
</span><span class="cx">                          src: []
</span><span class="cx">                  },
</span><del>-                       tinymce: {
-                               src: [
-                                       '<%= concat.tinymce.dest %>',
-                                       BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce-schema.min.js',
-                                       BUILD_DIR + 'wp-includes/js/tinymce/mark_loaded.js'
-                               ]
-                       },
</del><ins>+                        tinymce: ['<%= concat.tinymce.dest %>'],
</ins><span class="cx">                   qunit: ['tests/qunit/compiled.html']
</span><span class="cx">          },
</span><span class="cx">          copy: {
</span><span class="lines">@@ -191,9 +185,8 @@
</span><span class="cx">                                  'wp-includes/js/mediaelement/wp-mediaelement.js',
</span><span class="cx">                                  'wp-includes/js/plupload/handlers.js',
</span><span class="cx">                                  'wp-includes/js/plupload/wp-plupload.js',
</span><del>-                                       'wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js',
-                                       'wp-includes/js/tinymce/plugins/wp*/editor_plugin_src.js',
-                                       'wp-includes/js/tinymce/mark_loaded_src.js',
</del><ins>+                                        'wp-includes/js/tinymce/plugins/wordpress/plugin.js',
+                                       'wp-includes/js/tinymce/plugins/wp*/plugin.js',
</ins><span class="cx">                                   // Third party scripts
</span><span class="cx">                                  '!wp-admin/js/farbtastic.js',
</span><span class="cx">                                  '!wp-admin/js/iris.min.js',
</span><span class="lines">@@ -262,8 +255,9 @@
</span><span class="cx">                                  'wp-includes/js/*.js',
</span><span class="cx">                                  'wp-includes/js/plupload/handlers.js',
</span><span class="cx">                                  'wp-includes/js/plupload/wp-plupload.js',
</span><del>-                                       'wp-includes/js/tinymce/plugins/wp*/js/*.js',
-                                       'wp-includes/js/tinymce/wp-tinymce-schema.js',
</del><ins>+                                        'wp-includes/js/tinymce/plugins/wordpress/plugin.js',
+                                       'wp-includes/js/tinymce/plugins/wp*/plugin.js',
+
</ins><span class="cx">                                   // Exceptions
</span><span class="cx">                                  '!wp-admin/js/custom-header.js', // Why? We should minify this.
</span><span class="cx">                                  '!wp-admin/js/farbtastic.js',
</span><span class="lines">@@ -271,26 +265,8 @@
</span><span class="cx">                                  '!wp-includes/js/backbone.min.js',
</span><span class="cx">                                  '!wp-includes/js/swfobject.js',
</span><span class="cx">                                  '!wp-includes/js/underscore.min.js',
</span><del>-                                       '!wp-includes/js/zxcvbn.min.js',
-                                       // Hard-coded in editimage.html
-                                       '!wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js'
</del><ins>+                                        '!wp-includes/js/zxcvbn.min.js'
</ins><span class="cx">                           ]
</span><del>-                       },
-                       tinymce: {
-                               expand: true,
-                               cwd: SOURCE_DIR,
-                               dest: BUILD_DIR,
-                               src: [
-                                       'wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js',
-                                       'wp-includes/js/tinymce/plugins/wp*/editor_plugin_src.js',
-                                       'wp-includes/js/tinymce/mark_loaded_src.js'
-                               ],
-                               // TinyMCE plugins use a nonstandard naming scheme: plugin files are named
-                               // `editor_plugin_src.js`, and are compressed into `editor_plugin.js`.
-                               rename: function(destBase, destPath) {
-                                       destPath = destPath.replace(/_src.js$/, '.js');
-                                       return path.join(destBase || '', destPath);
-                               }
</del><span class="cx">                   }
</span><span class="cx">          },
</span><span class="cx">          concat: {
</span><span class="lines">@@ -302,11 +278,9 @@
</span><span class="cx">                                  }
</span><span class="cx">                          },
</span><span class="cx">                          src: [
</span><del>-                                       BUILD_DIR + 'wp-includes/js/tinymce/tiny_mce.js',
-                                       BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce-schema.min.js',
-                                       BUILD_DIR + 'wp-includes/js/tinymce/themes/advanced/editor_template.js',
-                                       BUILD_DIR + 'wp-includes/js/tinymce/plugins/*/editor_plugin.js',
-                                       BUILD_DIR + 'wp-includes/js/tinymce/mark_loaded.js'
</del><ins>+                                        BUILD_DIR + 'wp-includes/js/tinymce/tinymce.min.js',
+                                       BUILD_DIR + 'wp-includes/js/tinymce/themes/modern/theme.min.js',
+                                       BUILD_DIR + 'wp-includes/js/tinymce/plugins/*/plugin.min.js'
</ins><span class="cx">                           ],
</span><span class="cx">                          dest: BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce.js'
</span><span class="cx">                  }
</span><span class="lines">@@ -370,7 +344,7 @@
</span><span class="cx"> 
</span><span class="cx">  // Build task.
</span><span class="cx">  grunt.registerTask('build', ['clean:all', 'copy:all', 'cssmin:core', 'colors', 'rtl', 'cssmin:rtl', 'cssmin:colors',
</span><del>-               'uglify:core', 'uglify:tinymce', 'concat:tinymce', 'compress:tinymce', 'clean:tinymce']);
</del><ins>+                'uglify:core', 'concat:tinymce', 'compress:tinymce', 'clean:tinymce']);
</ins><span class="cx"> 
</span><span class="cx">  // Testing tasks.
</span><span class="cx">  grunt.registerMultiTask('phpunit', 'Runs PHPUnit tests, including the ajax and multisite tests.', function() {
</span><span class="lines">@@ -383,6 +357,7 @@
</span><span class="cx"> 
</span><span class="cx">  grunt.registerTask('qunit:compiled', 'Runs QUnit tests on compiled as well as uncompiled scripts.',
</span><span class="cx">          ['build', 'copy:qunit', 'qunit']);
</span><ins>+
</ins><span class="cx">   grunt.registerTask('test', 'Runs all QUnit and PHPUnit tasks.', ['qunit:compiled', 'phpunit']);
</span><span class="cx"> 
</span><span class="cx">  // Default task.
</span></span></pre></div>
<a id="trunksrcwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/wp-admin.css (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/wp-admin.css      2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-admin/css/wp-admin.css 2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -4315,7 +4315,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .autosave-info {
</span><del>-       padding: 2px 15px;
</del><ins>+        padding: 2px;
</ins><span class="cx">   text-align: right;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -4323,43 +4323,20 @@
</span><span class="cx">  border: none;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#content-resize-handle,
-#post-body .wp_themeSkin .mceStatusbar a.mceResize {
</del><ins>+#content-resize-handle {
</ins><span class="cx">   background: transparent url('../images/resize.gif') no-repeat scroll right bottom;
</span><span class="cx">  width: 12px;
</span><del>-       height: 12px;
-       cursor: se-resize;
</del><ins>+        cursor: n-resize;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.rtl #content-resize-handle,
-.rtl #post-body .wp_themeSkin .mceStatusbar a.mceResize {
-       background: transparent url('../images/resize-rtl.gif') no-repeat scroll right bottom;
</del><ins>+.rtl #content-resize-handle {
+       background: transparent url('../images/resize-rtl.gif') no-repeat scroll left bottom;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-#post-body .wp_themeSkin .mceStatusbar a.mceResize {
-       bottom: 3px;
-       position: absolute;
-       right: 3px;
-}
-
-#post-body .postarea .wp_themeSkin .mceStatusbar a.mceResize {
-       bottom: -20px;
-}
-
-#content-resize-handle {
-       position: absolute;
-       right: 3px;
-       bottom: -20px;
-}
-
</del><span class="cx"> .press-this #content-resize-handle {
</span><span class="cx">  bottom: 2px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.tmce-active #content-resize-handle {
-       display: none;
-}
-
</del><span class="cx"> #wp-word-count {
</span><span class="cx">  display: block;
</span><span class="cx">  padding: 2px 10px;
</span></span></pre></div>
<a id="trunksrcwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/edit-form-advanced.php (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/edit-form-advanced.php        2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-admin/edit-form-advanced.php   2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -483,6 +483,9 @@
</span><span class="cx">  'dfw' => true,
</span><span class="cx">  'tabfocus_elements' => 'insert-media-button,save-post',
</span><span class="cx">  'editor_height' => 360,
</span><ins>+       'tinymce' => array(
+               'resize' => false,
+       ),
</ins><span class="cx"> ) ); ?>
</span><span class="cx"> <table id="post-status-info" cellspacing="0"><tbody><tr>
</span><span class="cx">  <td id="wp-word-count"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></td>
</span><span class="lines">@@ -499,6 +502,7 @@
</span><span class="cx">          echo '</span>';
</span><span class="cx">  } ?>
</span><span class="cx">  </td>
</span><ins>+       <td id="content-resize-handle" class="hide-if-no-js"><br /></td>
</ins><span class="cx"> </tr></tbody></table>
</span><span class="cx"> 
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/ajax-actions.php (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/ajax-actions.php     2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-admin/includes/ajax-actions.php        2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -1787,16 +1787,8 @@
</span><span class="cx"> 
</span><span class="cx">  $post_id = edit_post();
</span><span class="cx"> 
</span><del>-       if ( is_wp_error($post_id) ) {
-               if ( $post_id->get_error_message() )
-                       $message = $post_id->get_error_message();
-               else
-                       $message = __('Save failed');
-
-               echo json_encode( array( 'message' => $message, 'last_edited' => '' ) );
-               wp_die();
-       } else {
-               $message = __('Saved.');
</del><ins>+        if ( is_wp_error( $post_id ) ) {
+               wp_send_json_error();
</ins><span class="cx">   }
</span><span class="cx"> 
</span><span class="cx">  if ( $post ) {
</span><span class="lines">@@ -1807,15 +1799,14 @@
</span><span class="cx">          $last_time = date_i18n( get_option('time_format') );
</span><span class="cx">  }
</span><span class="cx"> 
</span><del>-       if ( $last_id = get_post_meta($post_id, '_edit_last', true) ) {
-               $last_user = get_userdata($last_id);
</del><ins>+        if ( $last_id = get_post_meta( $post_id, '_edit_last', true ) ) {
+               $last_user = get_userdata( $last_id );
</ins><span class="cx">           $last_edited = sprintf( __('Last edited by %1$s on %2$s at %3$s'), esc_html( $last_user->display_name ), $last_date, $last_time );
</span><span class="cx">  } else {
</span><span class="cx">          $last_edited = sprintf( __('Last edited on %1$s at %2$s'), $last_date, $last_time );
</span><span class="cx">  }
</span><span class="cx"> 
</span><del>-       echo json_encode( array( 'message' => $message, 'last_edited' => $last_edited ) );
-       wp_die();
</del><ins>+        wp_send_json_success( array( 'last_edited' => $last_edited ) );
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function wp_ajax_wp_remove_post_lock() {
</span><span class="lines">@@ -1839,9 +1830,9 @@
</span><span class="cx">   *
</span><span class="cx">   * @since 3.3.0
</span><span class="cx">   *
</span><del>-        * @param int $interval The interval in seconds the post lock duration should last, plus 5 seconds. Default 120.
</del><ins>+         * @param int $interval The interval in seconds the post lock duration should last, plus 5 seconds. Default 150.
</ins><span class="cx">    */
</span><del>-       $new_lock = ( time() - apply_filters( 'wp_check_post_lock_window', 120 ) + 5 ) . ':' . $active_lock[1];
</del><ins>+        $new_lock = ( time() - apply_filters( 'wp_check_post_lock_window', 150 ) + 5 ) . ':' . $active_lock[1];
</ins><span class="cx">   update_post_meta( $post_id, '_edit_lock', $new_lock, implode( ':', $active_lock ) );
</span><span class="cx">  wp_die( 1 );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadminjseditorjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/editor.js (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/editor.js  2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-admin/js/editor.js     2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -13,15 +13,15 @@
</span><span class="cx"> 
</span><span class="cx">  // mode can be 'html', 'tmce', or 'toggle'; 'html' is used for the 'Text' editor tab.
</span><span class="cx">  go: function( id, mode ) {
</span><del>-               var t = this, ed, wrap_id, txtarea_el,
-                       dom = tinymce.DOM;
</del><ins>+                var t = this, ed, wrap_id, txtarea_el, editorHeight, toolbarHeight,
+                       DOM = tinymce.DOM; //DOMUtils outside the editor iframe
</ins><span class="cx"> 
</span><span class="cx">          id = id || 'content';
</span><span class="cx">          mode = mode || 'toggle';
</span><span class="cx"> 
</span><span class="cx">          ed = tinymce.get( id );
</span><span class="cx">          wrap_id = 'wp-' + id + '-wrap';
</span><del>-               txtarea_el = dom.get( id );
</del><ins>+                txtarea_el = DOM.get( id );
</ins><span class="cx"> 
</span><span class="cx">          if ( 'toggle' === mode ) {
</span><span class="cx">                  if ( ed && ! ed.isHidden() ) {
</span><span class="lines">@@ -31,6 +31,20 @@
</span><span class="cx">                  }
</span><span class="cx">          }
</span><span class="cx"> 
</span><ins>+               function getToolbarHeight() {
+                       var height;
+
+                       try {
+                               height = DOM.getSize( DOM.select( '.mce-toolbar-grp', ed.getContainer() )[0] );
+                       } catch(e){}
+
+                       if ( height && height.h && height.h > 10 && height.h < 100 ) {
+                               return height.h;
+                       }
+
+                       return 0;
+               }
+
</ins><span class="cx">           if ( 'tmce' === mode || 'tinymce' === mode ) {
</span><span class="cx">                  if ( ed && ! ed.isHidden() ) {
</span><span class="cx">                          return false;
</span><span class="lines">@@ -40,19 +54,32 @@
</span><span class="cx">                          QTags.closeAllTags( id );
</span><span class="cx">                  }
</span><span class="cx"> 
</span><ins>+                       editorHeight = txtarea_el ? parseInt( txtarea_el.style.height, 10 ) : 0;
+
</ins><span class="cx">                   if ( tinyMCEPreInit.mceInit[ id ] && tinyMCEPreInit.mceInit[ id ].wpautop ) {
</span><span class="cx">                          txtarea_el.value = t.wpautop( txtarea_el.value );
</span><span class="cx">                  }
</span><span class="cx"> 
</span><span class="cx">                  if ( ed ) {
</span><span class="cx">                          ed.show();
</span><ins>+
+                               if ( editorHeight && ( toolbarHeight = getToolbarHeight() ) ) {
+                                       editorHeight = editorHeight - toolbarHeight + 11;
+
+                                       // height cannot be under 50 or over 5000
+                                       if ( editorHeight > 50 && editorHeight < 5000 ) {
+                                               ed.theme.resizeTo( null, editorHeight );
+                                       }
+                               }
</ins><span class="cx">                   } else {
</span><del>-                               ed = new tinymce.Editor( id, tinyMCEPreInit.mceInit[ id ] );
-                               ed.render();
</del><ins>+                                tinymce.init( tinyMCEPreInit.mceInit[id] );
+
+               //              ed = tinymce.createEditor( id, tinyMCEPreInit.mceInit[id] );
+               //              ed.render();
</ins><span class="cx">                   }
</span><span class="cx"> 
</span><del>-                       dom.removeClass( wrap_id, 'html-active' );
-                       dom.addClass( wrap_id, 'tmce-active' );
</del><ins>+                        DOM.removeClass( wrap_id, 'html-active' );
+                       DOM.addClass( wrap_id, 'tmce-active' );
</ins><span class="cx">                   setUserSetting( 'editor', 'tinymce' );
</span><span class="cx"> 
</span><span class="cx">          } else if ( 'html' === mode ) {
</span><span class="lines">@@ -62,6 +89,18 @@
</span><span class="cx">                  }
</span><span class="cx"> 
</span><span class="cx">                  if ( ed ) {
</span><ins>+                               editorHeight = DOM.get( id + '_ifr' );
+                               editorHeight = editorHeight ? parseInt( editorHeight.style.height, 10 ) : 0;
+
+                               if ( editorHeight && ( toolbarHeight = getToolbarHeight() ) ) {
+                                       editorHeight = editorHeight + toolbarHeight - 11;
+
+                                       // height cannot be under 50 or over 5000
+                                       if ( editorHeight > 50 && editorHeight < 5000 ) {
+                                               txtarea_el.style.height = editorHeight + 'px';
+                                       }
+                               }
+
</ins><span class="cx">                           ed.hide();
</span><span class="cx">                  } else {
</span><span class="cx">                          // The TinyMCE instance doesn't exist, run the content through 'pre_wpautop()' and show the textarea
</span><span class="lines">@@ -69,11 +108,11 @@
</span><span class="cx">                                  txtarea_el.value = t.pre_wpautop( txtarea_el.value );
</span><span class="cx">                          }
</span><span class="cx"> 
</span><del>-                               dom.setStyles( txtarea_el, {'display': '', 'visibility': ''} );
</del><ins>+                                DOM.setStyles( txtarea_el, {'display': '', 'visibility': ''} );
</ins><span class="cx">                   }
</span><span class="cx"> 
</span><del>-                       dom.removeClass( wrap_id, 'tmce-active' );
-                       dom.addClass( wrap_id, 'html-active' );
</del><ins>+                        DOM.removeClass( wrap_id, 'tmce-active' );
+                       DOM.addClass( wrap_id, 'html-active' );
</ins><span class="cx">                   setUserSetting( 'editor', 'html' );
</span><span class="cx">          }
</span><span class="cx">          return false;
</span><span class="lines">@@ -88,8 +127,9 @@
</span><span class="cx">          if ( content.indexOf( '<pre' ) !== -1 || content.indexOf( '<script' ) !== -1 ) {
</span><span class="cx">                  preserve_linebreaks = true;
</span><span class="cx">                  content = content.replace( /<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function( a ) {
</span><del>-                               a = a.replace( /<br ?\/?>(\r\n|\n)?/g, '<wp-temp-lb>' );
-                               return a.replace( /<\/?p( [^>]*)?>(\r\n|\n)?/g, '<wp-temp-lb>' );
</del><ins>+                                a = a.replace( /<br ?\/?>(\r\n|\n)?/g, '<wp-line-break>' );
+                               a = a.replace( /<\/?p( [^>]*)?>(\r\n|\n)?/g, '<wp-line-break>' );
+                               return a.replace( /\r?\n/g, '<wp-line-break>' );
</ins><span class="cx">                   });
</span><span class="cx">          }
</span><span class="cx"> 
</span><span class="lines">@@ -149,7 +189,7 @@
</span><span class="cx"> 
</span><span class="cx">          // put back the line breaks in pre|script
</span><span class="cx">          if ( preserve_linebreaks ) {
</span><del>-                       content = content.replace( /<wp-temp-lb>/g, '\n' );
</del><ins>+                        content = content.replace( /<wp-line-break>/g, '\n' );
</ins><span class="cx">           }
</span><span class="cx"> 
</span><span class="cx">          // and the <br> tags in captions
</span><span class="lines">@@ -181,7 +221,7 @@
</span><span class="cx">          if ( pee.indexOf( '<pre' ) !== -1 || pee.indexOf( '<script' ) !== -1 ) {
</span><span class="cx">                  preserve_linebreaks = true;
</span><span class="cx">                  pee = pee.replace( /<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function( a ) {
</span><del>-                               return a.replace( /(\r\n|\n)/g, '<wp-temp-lb>' );
</del><ins>+                                return a.replace( /(\r\n|\n)/g, '<wp-line-break>' );
</ins><span class="cx">                   });
</span><span class="cx">          }
</span><span class="cx"> 
</span><span class="lines">@@ -230,7 +270,7 @@
</span><span class="cx"> 
</span><span class="cx">          // put back the line breaks in pre|script
</span><span class="cx">          if ( preserve_linebreaks ) {
</span><del>-                       pee = pee.replace( /<wp-temp-lb>/g, '\n' );
</del><ins>+                        pee = pee.replace( /<wp-line-break>/g, '\n' );
</ins><span class="cx">           }
</span><span class="cx"> 
</span><span class="cx">          if ( preserve_br ) {
</span></span></pre></div>
<a id="trunksrcwpadminjsmediauploadjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/media-upload.js (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/media-upload.js    2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-admin/js/media-upload.js       2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -6,24 +6,21 @@
</span><span class="cx"> send_to_editor = function(h) {
</span><span class="cx">  var ed, mce = typeof(tinymce) != 'undefined', qt = typeof(QTags) != 'undefined';
</span><span class="cx"> 
</span><del>-       if ( !wpActiveEditor ) {
</del><ins>+        if ( ! wpActiveEditor ) {
</ins><span class="cx">           if ( mce && tinymce.activeEditor ) {
</span><span class="cx">                  ed = tinymce.activeEditor;
</span><span class="cx">                  wpActiveEditor = ed.id;
</span><del>-               } else if ( !qt ) {
</del><ins>+                } else if ( ! qt ) {
</ins><span class="cx">                   return false;
</span><span class="cx">          }
</span><span class="cx">  } else if ( mce ) {
</span><del>-               if ( tinymce.activeEditor && (tinymce.activeEditor.id == 'mce_fullscreen' || tinymce.activeEditor.id == 'wp_mce_fullscreen') )
-                       ed = tinymce.activeEditor;
-               else
-                       ed = tinymce.get(wpActiveEditor);
</del><ins>+                ed = tinymce.get( wpActiveEditor );
</ins><span class="cx">   }
</span><span class="cx"> 
</span><del>-       if ( ed && !ed.isHidden() ) {
</del><ins>+        if ( ed && ! ed.isHidden() ) {
</ins><span class="cx">           // restore caret position on IE
</span><del>-               if ( tinymce.isIE && ed.windowManager.insertimagebookmark )
-                       ed.selection.moveToBookmark(ed.windowManager.insertimagebookmark);
</del><ins>+        //      if ( tinymce.isIE && ed.windowManager.insertimagebookmark )
+       //              ed.selection.moveToBookmark(ed.windowManager.insertimagebookmark);
</ins><span class="cx"> 
</span><span class="cx">          if ( h.indexOf('[caption') !== -1 ) {
</span><span class="cx">                  if ( ed.wpSetImgCaption )
</span><span class="lines">@@ -78,7 +75,7 @@
</span><span class="cx">  };
</span><span class="cx"> 
</span><span class="cx">  $(window).resize(function(){ tb_position(); });
</span><del>-
</del><ins>+/*
</ins><span class="cx">   // store caret position in IE
</span><span class="cx">  $(document).ready(function($){
</span><span class="cx">          $('a.thickbox').click(function(){
</span><span class="lines">@@ -90,5 +87,5 @@
</span><span class="cx">                  }
</span><span class="cx">          });
</span><span class="cx">  });
</span><del>-
</del><ins>+*/
</ins><span class="cx"> })(jQuery);
</span></span></pre></div>
<a id="trunksrcwpadminjspostjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/post.js (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/post.js    2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-admin/js/post.js       2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -812,114 +812,72 @@
</span><span class="cx"> 
</span><span class="cx">  wptitlehint();
</span><span class="cx"> 
</span><del>-       // resizable textarea#content
-       (function() {
-               var textarea = $('textarea#content'), offset = null, el;
</del><ins>+        // Resize the visual and text editors
+       ( function() {
+               var editor, offset, mce,
+                       $document = $( document ),
+                       $textarea = $('textarea#content'),
+                       $handle = $('#post-status-info');
+               
</ins><span class="cx">           // No point for touch devices
</span><del>-               if ( !textarea.length || 'ontouchstart' in window )
</del><ins>+                if ( ! $textarea.length || 'ontouchstart' in window ) {
</ins><span class="cx">                   return;
</span><ins>+               }
</ins><span class="cx"> 
</span><del>-               function dragging(e) {
-                       textarea.height( Math.max(50, offset + e.pageY) + 'px' );
-                       return false;
</del><ins>+                function dragging( event ) {
+                       if ( mce ) {
+                               editor.theme.resizeTo( null, offset + event.pageY );
+                       } else {
+                               $textarea.height( Math.max( 50, offset + event.pageY ) );
+                       }
+
+                       event.preventDefault();
</ins><span class="cx">           }
</span><span class="cx"> 
</span><span class="cx">          function endDrag() {
</span><del>-                       var height;
</del><ins>+                        var height, toolbarHeight;
</ins><span class="cx"> 
</span><del>-                       textarea.focus();
-                       $(document).unbind('mousemove', dragging).unbind('mouseup', endDrag);
</del><ins>+                        if ( mce ) {
+                               editor.focus();
+                               toolbarHeight = $( '#wp-content-editor-container .mce-toolbar-grp' ).height();
+                               height = parseInt( $('#content_ifr').css('height'), 10 ) + toolbarHeight - 28;
+                       } else {
+                               $textarea.focus();
+                               height = parseInt( $textarea.css('height'), 10 );
+                       }
</ins><span class="cx"> 
</span><del>-                       height = parseInt( textarea.css('height'), 10 );
</del><ins>+                        $document.off( 'mousemove.wp-editor-resize mouseup.wp-editor-resize' );
</ins><span class="cx"> 
</span><span class="cx">                  // sanity check
</span><del>-                       if ( height && height > 50 && height < 5000 )
</del><ins>+                        if ( height && height > 50 && height < 5000 ) {
</ins><span class="cx">                           setUserSetting( 'ed_size', height );
</span><ins>+                       }
</ins><span class="cx">           }
</span><span class="cx"> 
</span><del>-               textarea.css('resize', 'none');
-               el = $('<div id="content-resize-handle"><br></div>');
-               $('#wp-content-wrap').append(el);
-               el.on('mousedown', function(e) {
-                       offset = textarea.height() - e.pageY;
-                       textarea.blur();
-                       $(document).mousemove(dragging).mouseup(endDrag);
-                       return false;
-               });
-       })();
</del><ins>+                $textarea.css( 'resize', 'none' );
</ins><span class="cx"> 
</span><del>-       if ( typeof(tinymce) != 'undefined' ) {
-               tinymce.onAddEditor.add(function(mce, ed){
-                       // iOS expands the iframe to full height and the user cannot adjust it.
-                       if ( ed.id != 'content' || tinymce.isIOS5 )
-                               return;
</del><ins>+                $handle.on( 'mousedown.wp-editor-resize', function( event ) {
+                       if ( typeof tinymce !== 'undefined' ) {
+                               editor = tinymce.get('content');
+                       }
</ins><span class="cx"> 
</span><del>-                       function getHeight() {
-                               var height, node = document.getElementById('content_ifr'),
-                                       ifr_height = node ? parseInt( node.style.height, 10 ) : 0,
-                                       tb_height = $('#content_tbl tr.mceFirst').height();
-
-                               if ( !ifr_height || !tb_height )
-                                       return false;
-
-                               // total height including toolbar and statusbar
-                               height = ifr_height + tb_height + 21;
-                               // textarea height = total height - 33px toolbar
-                               height -= 33;
-
-                               return height;
</del><ins>+                        if ( editor && ! editor.isHidden() ) {
+                               mce = true;
+                               offset = $('#content_ifr').height() - event.pageY;
+                       } else {
+                               mce = false;
+                               offset = $textarea.height() - event.pageY;
+                               $textarea.blur();
</ins><span class="cx">                   }
</span><span class="cx"> 
</span><del>-                       // resize TinyMCE to match the textarea height when switching Text -> Visual
-                       ed.onLoadContent.add( function() {
-                               var ifr_height, node = document.getElementById('content'),
-                                       height = node ? parseInt( node.style.height, 10 ) : 0,
-                                       tb_height = $('#content_tbl tr.mceFirst').height() || 33;
</del><ins>+                        $document.on( 'mousemove.wp-editor-resize', dragging )
+                               .on( 'mouseup.wp-editor-resize', endDrag );
</ins><span class="cx"> 
</span><del>-                               // height cannot be under 50 or over 5000
-                               if ( !height || height < 50 || height > 5000 )
-                                       height = 360; // default height for the main editor
-
-                               if ( getUserSetting( 'ed_size' ) > 5000  )
-                                       setUserSetting( 'ed_size', 360 );
-
-                               // compensate for padding and toolbars
-                               ifr_height = ( height - tb_height ) + 12;
-
-                               // sanity check
-                               if ( ifr_height > 50 && ifr_height < 5000 ) {
-                                       $('#content_tbl').css('height', '' );
-                                       $('#content_ifr').css('height', ifr_height + 'px' );
-                               }
-                       });
-
-                       // resize the textarea to match TinyMCE's height when switching Visual -> Text
-                       ed.onSaveContent.add( function() {
-                               var height = getHeight();
-
-                               if ( !height || height < 50 || height > 5000 )
-                                       return;
-
-                               $('textarea#content').css( 'height', height + 'px' );
-                       });
-
-                       // save on resizing TinyMCE
-                       ed.onPostRender.add(function() {
-                               $( '#content_resize' ).on( 'mousedown.wp-mce-resize', function() {
-                                       $( document ).on( 'mouseup.wp-mce-resize', function() {
-                                               var height;
-
-                                               $(document).off('mouseup.wp-mce-resize');
-
-                                               height = getHeight();
-                                               // sanity check
-                                               if ( height && height > 50 && height < 5000 )
-                                                       setUserSetting( 'ed_size', height );
-                                       });
-                               });
-                       });
</del><ins>+                        event.preventDefault();
</ins><span class="cx">           });
</span><ins>+       })();
</ins><span class="cx"> 
</span><ins>+       if ( typeof tinymce !== 'undefined' ) {
</ins><span class="cx">           // When changing post formats, change the editor body class
</span><span class="cx">          $( '#post-formats-select input.post-format' ).on( 'change.set-editor-class', function() {
</span><span class="cx">                  var editor, body, format = this.id;
</span></span></pre></div>
<a id="trunksrcwpadminjswpfullscreenjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/wp-fullscreen.js (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/wp-fullscreen.js   2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-admin/js/wp-fullscreen.js      2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -1,132 +1,133 @@
</span><span class="cx"> /* global ajaxurl, deleteUserSetting, setUserSetting, switchEditors, tinymce, tinyMCEPreInit, wp_fullscreen_settings, wpActiveEditor:true, wpLink */
</span><span class="cx"> /**
</span><del>- * PubSub
</del><ins>+ * Distraction Free Writing
+ * (wp-fullscreen)
</ins><span class="cx">  *
</span><del>- * A lightweight publish/subscribe implementation.
- * Private use only!
</del><ins>+ * Access the API globally using the window.wp.editor.fullscreen variable.
</ins><span class="cx">  */
</span><del>-var PubSub, fullscreen, wptitlehint;
</del><ins>+( function( $, window ) {
+       var api, ps, s, toggleUI, uiTimer, PubSub,
+               oldheight = 0,
+               uiScrollTop = 0,
+               transitionend = 'transitionend webkitTransitionEnd',
+               $body = $( document.body ),
+               $document = $( document );
</ins><span class="cx"> 
</span><del>-PubSub = function() {
-       this.topics = {};
-};
</del><ins>+        /**
+        * PubSub
+        *
+        * A lightweight publish/subscribe implementation.
+        *
+        * @access private
+        */
+       PubSub = function() {
+               this.topics = {};
</ins><span class="cx"> 
</span><del>-PubSub.prototype.subscribe = function( topic, callback ) {
-       if ( ! this.topics[ topic ] )
-               this.topics[ topic ] = [];
</del><ins>+                this.subscribe = function( topic, callback ) {
+                       if ( ! this.topics[ topic ] )
+                               this.topics[ topic ] = [];
</ins><span class="cx"> 
</span><del>-       this.topics[ topic ].push( callback );
-       return callback;
-};
</del><ins>+                        this.topics[ topic ].push( callback );
+                       return callback;
+               };
</ins><span class="cx"> 
</span><del>-PubSub.prototype.unsubscribe = function( topic, callback ) {
-       var i, l,
-               topics = this.topics[ topic ];
</del><ins>+                this.unsubscribe = function( topic, callback ) {
+                       var i, l,
+                               topics = this.topics[ topic ];
</ins><span class="cx"> 
</span><del>-       if ( ! topics )
-               return callback || [];
</del><ins>+                        if ( ! topics )
+                               return callback || [];
</ins><span class="cx"> 
</span><del>-       // Clear matching callbacks
-       if ( callback ) {
-               for ( i = 0, l = topics.length; i < l; i++ ) {
-                       if ( callback == topics[i] )
-                               topics.splice( i, 1 );
-               }
-               return callback;
</del><ins>+                        // Clear matching callbacks
+                       if ( callback ) {
+                               for ( i = 0, l = topics.length; i < l; i++ ) {
+                                       if ( callback == topics[i] )
+                                               topics.splice( i, 1 );
+                               }
+                               return callback;
</ins><span class="cx"> 
</span><del>-       // Clear all callbacks
-       } else {
-               this.topics[ topic ] = [];
-               return topics;
-       }
-};
</del><ins>+                        // Clear all callbacks
+                       } else {
+                               this.topics[ topic ] = [];
+                               return topics;
+                       }
+               };
</ins><span class="cx"> 
</span><del>-PubSub.prototype.publish = function( topic, args ) {
-       var i, l, broken,
-               topics = this.topics[ topic ];
</del><ins>+                this.publish = function( topic, args ) {
+                       var i, l, broken,
+                               topics = this.topics[ topic ];
</ins><span class="cx"> 
</span><del>-       if ( ! topics )
-               return;
</del><ins>+                        if ( ! topics )
+                               return;
</ins><span class="cx"> 
</span><del>-       args = args || [];
</del><ins>+                        args = args || [];
</ins><span class="cx"> 
</span><del>-       for ( i = 0, l = topics.length; i < l; i++ ) {
-               broken = ( topics[i].apply( null, args ) === false || broken );
-       }
-       return ! broken;
-};
</del><ins>+                        for ( i = 0, l = topics.length; i < l; i++ ) {
+                               broken = ( topics[i].apply( null, args ) === false || broken );
+                       }
+                       return ! broken;
+               };
+       };
</ins><span class="cx"> 
</span><del>-/**
- * Distraction Free Writing
- * (wp-fullscreen)
- *
- * Access the API globally using the fullscreen variable.
- */
-
-(function($){
-       var api, ps, bounder, s, timer, block, set_title_hint;
-
</del><span class="cx">   // Initialize the fullscreen/api object
</span><del>-       fullscreen = api = {};
</del><ins>+        api = {};
</ins><span class="cx"> 
</span><span class="cx">  // Create the PubSub (publish/subscribe) interface.
</span><span class="cx">  ps = api.pubsub = new PubSub();
</span><del>-       timer = 0;
-       block = false;
</del><span class="cx"> 
</span><span class="cx">  s = api.settings = { // Settings
</span><del>-               visible : false,
-               mode : 'tinymce',
-               editor_id : 'content',
-               title_id : '',
-               timer : 0,
-               toolbar_shown : false
</del><ins>+                visible: false,
+               mode: 'tinymce',
+               id: '',
+               title_id: '',
+               timer: 0,
+               toolbar_shown: false
</ins><span class="cx">   };
</span><span class="cx"> 
</span><ins>+       function _hideUI() {
+               $body.removeClass('wp-dfw-show-ui');
+               uiShown = false;
+       }
+
</ins><span class="cx">   /**
</span><del>-        * Bounder
</del><ins>+         * toggleUI
</ins><span class="cx">    *
</span><del>-        * Creates a function that publishes start/stop topics.
-        * Used to throttle events.
</del><ins>+         * Toggle the CSS class to show/hide the toolbar, borders and statusbar.
</ins><span class="cx">    */
</span><del>-       bounder = api.bounder = function( start, stop, delay, e ) {
-               var y, top;
</del><ins>+        toggleUI = api.toggleUI = function( hide ) {
+               clearTimeout( uiTimer );
</ins><span class="cx"> 
</span><del>-               delay = delay || 1250;
</del><ins>+                if ( ! $body.hasClass('wp-dfw-show-ui') ) {
+                       $body.addClass('wp-dfw-show-ui');
+               }
</ins><span class="cx"> 
</span><del>-               if ( e ) {
-                       y = e.pageY || e.clientY || e.offsetY;
-                       top = $(document).scrollTop();
-
-                       if ( !e.isDefaultPrevented ) // test if e ic jQuery normalized
-                               y = 135 + y;
-
-                       if ( y - top > 120 )
-                               return;
</del><ins>+                if ( hide === 'hide' ) {
+                       uiTimer = setTimeout( _hideUI, 2000 );
</ins><span class="cx">           }
</span><ins>+       };
</ins><span class="cx"> 
</span><del>-               if ( block )
-                       return;
</del><ins>+        function resetCssPosition( add ) {
+               s.$dfwWrap.parents().each( function( i, parent ) {
+                       var cssPosition, $parent = $(parent);
</ins><span class="cx"> 
</span><del>-               block = true;
</del><ins>+                        if ( add ) {
+                               if ( parent.style.position ) {
+                                       $parent.data( 'wp-dfw-css-position', parent.style.position );
+                               }
</ins><span class="cx"> 
</span><del>-               setTimeout( function() {
-                       block = false;
-               }, 400 );
</del><ins>+                                $parent.css( 'position', 'static' );
+                       } else {
+                               cssPosition = $parent.data( 'wp-dfw-css-position' );
+                               cssPosition = cssPosition || '';
+                               $parent.css( 'position', cssPosition );
+                       }
</ins><span class="cx"> 
</span><del>-               if ( s.timer )
-                       clearTimeout( s.timer );
-               else
-                       ps.publish( start );
</del><ins>+                        if ( parent.nodeName === 'BODY' ) {
+                               return false;
+                       }
+               });
+       }
</ins><span class="cx"> 
</span><del>-               function timed() {
-                       ps.publish( stop );
-                       s.timer = 0;
-               }
-
-               s.timer = setTimeout( timed, delay );
-       };
-
</del><span class="cx">   /**
</span><span class="cx">   * on()
</span><span class="cx">   *
</span><span class="lines">@@ -135,30 +136,68 @@
</span><span class="cx">   * @param string mode Optional. Switch to the given mode before opening.
</span><span class="cx">   */
</span><span class="cx">  api.on = function() {
</span><del>-               if ( s.visible )
</del><ins>+                var id, $dfwWrap, editor, titleId;
+
+               if ( s.visible ) {
</ins><span class="cx">                   return;
</span><ins>+               }
</ins><span class="cx"> 
</span><ins>+               if ( ! s.$fullscreenFader ) {
+                       api.ui.init();
+               }
+
</ins><span class="cx">           // Settings can be added or changed by defining "wp_fullscreen_settings" JS object.
</span><del>-               if ( typeof(wp_fullscreen_settings) == 'object' )
-                       $.extend( s, wp_fullscreen_settings );
</del><ins>+                if ( typeof window.wp_fullscreen_settings === 'object' )
+                       $.extend( s, window.wp_fullscreen_settings );
</ins><span class="cx"> 
</span><del>-               s.editor_id = wpActiveEditor || 'content';
</del><ins>+                id = s.id || window.wpActiveEditor;
</ins><span class="cx"> 
</span><del>-               if ( $('input#title').length && s.editor_id == 'content' )
-                       s.title_id = 'title';
-               else if ( $('input#' + s.editor_id + '-title').length ) // the title input field should have [editor_id]-title HTML ID to be auto detected
-                       s.title_id = s.editor_id + '-title';
-               else
-                       $('#wp-fullscreen-title, #wp-fullscreen-title-prompt-text').hide();
</del><ins>+                if ( ! id ) {
+                       if ( s.hasTinymce ) {
+                               id = tinymce.activeEditor.id;
+                       } else {
+                               return;
+                       }
+               }
</ins><span class="cx"> 
</span><del>-               s.mode = $('#' + s.editor_id).is(':hidden') ? 'tinymce' : 'html';
-               s.qt_canvas = $('#' + s.editor_id).get(0);
</del><ins>+                s.id = id;
+               $dfwWrap = s.$dfwWrap = $( '#wp-' + id + '-wrap' );
</ins><span class="cx"> 
</span><del>-               if ( ! s.element )
-                       api.ui.init();
</del><ins>+                if ( ! $dfwWrap.length ) {
+                       return;
+               }
</ins><span class="cx"> 
</span><del>-               s.is_mce_on = s.has_tinymce && typeof( tinymce.get(s.editor_id) ) != 'undefined';
</del><ins>+                s.$dfwTextarea = $( '#' + id );
+               s.$editorContainer = $dfwWrap.find( '.wp-editor-container' );
+               uiScrollTop = $document.scrollTop();
</ins><span class="cx"> 
</span><ins>+               if ( s.hasTinymce ) {
+                       s.editor = tinymce.get( id );
+               }
+
+               if ( s.editor && ! s.editor.isHidden() ) {
+                       s.origHeight = $( '#' + id + '_ifr' ).height();
+                       s.mode = 'tinymce';
+               } else {
+                       s.origHeight = s.$dfwTextarea.height();
+                       s.mode = 'html';
+               }
+
+               // Try to find title field
+               if ( typeof window.adminpage !== 'undefined' &&
+                       ( window.adminpage === 'post-php' || window.adminpage === 'post-new-php' ) ) {
+
+                       titleId = 'title';
+               } else {
+                       titleId = id + '-title';
+               }
+
+               s.$dfwTitle = $( '#' + titleId );
+
+               if ( ! s.$dfwTitle.length ) {
+                       s.$dfwTitle = null;
+               }
+
</ins><span class="cx">           api.ui.fade( 'show', 'showing', 'shown' );
</span><span class="cx">  };
</span><span class="cx"> 
</span><span class="lines">@@ -187,17 +226,33 @@
</span><span class="cx">  api.switchmode = function( to ) {
</span><span class="cx">          var from = s.mode;
</span><span class="cx"> 
</span><del>-               if ( ! to || ! s.visible || ! s.has_tinymce )
</del><ins>+                if ( ! to || ! s.visible || ! s.hasTinymce || typeof switchEditors === 'undefined' ) {
</ins><span class="cx">                   return from;
</span><ins>+               }
</ins><span class="cx"> 
</span><span class="cx">          // Don't switch if the mode is the same.
</span><span class="cx">          if ( from == to )
</span><span class="cx">                  return from;
</span><span class="cx"> 
</span><del>-               ps.publish( 'switchMode', [ from, to ] );
</del><ins>+                if ( to === 'tinymce' && ! s.editor ) {
+                       s.editor = tinymce.get( s.id );
+
+                       if ( ! s.editor &&  typeof tinyMCEPreInit !== 'undefined' &&
+                               tinyMCEPreInit.mceInit && tinyMCEPreInit.mceInit[ s.id ] ) {
+
+                               // If the TinyMCE instance hasn't been created, set the "wp_fulscreen" flag on creating it
+                               tinyMCEPreInit.mceInit[ s.id ].wp_fullscreen = true;
+                       }
+               }
+
</ins><span class="cx">           s.mode = to;
</span><del>-               ps.publish( 'switchedMode', [ from, to ] );
</del><ins>+                switchEditors.go( s.id, to );
+               api.refreshButtons( true );
</ins><span class="cx"> 
</span><ins>+               if ( to === 'html' ) {
+                       setTimeout( api.resizeTextarea, 200 );
+               }
+
</ins><span class="cx">           return to;
</span><span class="cx">  };
</span><span class="cx"> 
</span><span class="lines">@@ -206,309 +261,190 @@
</span><span class="cx">   */
</span><span class="cx"> 
</span><span class="cx">  api.save = function() {
</span><del>-               var hidden = $('#hiddenaction'), old = hidden.val(), spinner = $('#wp-fullscreen-save .spinner'),
-                       message = $('#wp-fullscreen-save span');
</del><ins>+                var $hidden = $('#hiddenaction'),
+                       oldVal = $hidden.val(),
+                       $spinner = $('#wp-fullscreen-save .spinner'),
+                       $saveMessage = $('#wp-fullscreen-save .wp-fullscreen-saved-message')
+                       $errorMessage = $('#wp-fullscreen-save .wp-fullscreen-error-message');
</ins><span class="cx"> 
</span><del>-               spinner.show();
-               api.savecontent();
</del><ins>+                $spinner.show();
+               $errorMessage.hide();
+               $hidden.val('wp-fullscreen-save-post');
</ins><span class="cx"> 
</span><del>-               hidden.val('wp-fullscreen-save-post');
</del><ins>+                if ( s.editor && ! s.editor.isHidden() ) {
+                       s.editor.save();
+               }
</ins><span class="cx"> 
</span><del>-               $.post( ajaxurl, $('form#post').serialize(), function(r){
-                       spinner.hide();
-                       message.show();
</del><ins>+                $.ajax({
+                       url: window.ajaxurl,
+                       type: 'post',
+                       data: $('form#post').serialize(),
+                       dataType: 'json'
+               }).done( function( response ) {
+                       $spinner.hide();
</ins><span class="cx"> 
</span><del>-                       setTimeout( function(){
-                               message.fadeOut(1000);
-                       }, 3000 );
</del><ins>+                        if ( response && response.success ) {
+                               $saveMessage.show();
</ins><span class="cx"> 
</span><del>-                       if ( r.last_edited )
-                               $('#wp-fullscreen-save input').attr( 'title',  r.last_edited );
</del><ins>+                                setTimeout( function() {
+                                       $saveMessage.fadeOut(300);
+                               }, 3000 );
</ins><span class="cx"> 
</span><del>-               }, 'json');
</del><ins>+                                if ( response.data && response.data.last_edited ) {
+                                       $('#wp-fullscreen-save input').attr( 'title',  response.data.last_edited );
+                               }
+                       } else {
+                               $errorMessage.show();
+                       }
+               }).fail( function() {
+                       $spinner.hide();
+                       $errorMessage.show();
+               });
</ins><span class="cx"> 
</span><del>-               hidden.val(old);
</del><ins>+                $hidden.val( oldVal );
</ins><span class="cx">   };
</span><span class="cx"> 
</span><del>-       api.savecontent = function() {
-               var ed, content;
</del><ins>+        api.dfwWidth = function( pixels, total ) {
+               var width;
</ins><span class="cx"> 
</span><del>-               if ( s.title_id )
-                       $('#' + s.title_id).val( $('#wp-fullscreen-title').val() );
</del><ins>+                if ( ! pixels ) {
+                       // reset to theme width
+                       width = $('#wp-fullscreen-body').data('theme-width') || 800;
+                       s.$editorContainer.width( width );
</ins><span class="cx"> 
</span><del>-               if ( s.mode === 'tinymce' && (ed = tinymce.get('wp_mce_fullscreen')) ) {
-                       content = ed.save();
-               } else {
-                       content = $('#wp_mce_fullscreen').val();
-               }
</del><ins>+                        if ( s.$dfwTitle ) {
+                               s.$dfwTitle.width( width - 16 );
+                       }
</ins><span class="cx"> 
</span><del>-               $('#' + s.editor_id).val( content );
-               $(document).triggerHandler('wpcountwords', [ content ]);
-       };
-
-       set_title_hint = function( title ) {
-               if ( ! title.val().length )
-                       title.siblings('label').css( 'visibility', '' );
-               else
-                       title.siblings('label').css( 'visibility', 'hidden' );
-       };
-
-       api.dfw_width = function(n) {
-               var el = $('#wp-fullscreen-wrap'), w = el.width();
-
-               if ( !n ) { // reset to theme width
-                       el.width( $('#wp-fullscreen-central-toolbar').width() );
</del><span class="cx">                   deleteUserSetting('dfw_width');
</span><span class="cx">                  return;
</span><span class="cx">          }
</span><span class="cx"> 
</span><del>-               w = n + w;
</del><ins>+                if ( total ) {
+                       width = pixels;
+               } else {
+                       width = s.$editorContainer.width();
+                       width += pixels;
+               }
</ins><span class="cx"> 
</span><del>-               if ( w < 200 || w > 1200 ) // sanity check
</del><ins>+                if ( width < 200 || width > 1200 ) {
+                       // sanity check
</ins><span class="cx">                   return;
</span><ins>+               }
</ins><span class="cx"> 
</span><del>-               el.width( w );
-               setUserSetting('dfw_width', w);
</del><ins>+                s.$editorContainer.width( width );
+
+               if ( s.$dfwTitle ) {
+                       s.$dfwTitle.width( width - 16 );
+               }
+
+               setUserSetting( 'dfw_width', width );
</ins><span class="cx">   };
</span><span class="cx"> 
</span><del>-       ps.subscribe( 'showToolbar', function() {
-               s.toolbars.removeClass('fade-1000').addClass('fade-300');
-               api.fade.In( s.toolbars, 300, function(){ ps.publish('toolbarShown'); }, true );
-               $('#wp-fullscreen-body').addClass('wp-fullscreen-focus');
-               s.toolbar_shown = true;
-       });
</del><ins>+        // This event occurs before the overlay blocks the UI.
+       ps.subscribe( 'show', function() {
+               var title = $('#last-edit').text();
</ins><span class="cx"> 
</span><del>-       ps.subscribe( 'hideToolbar', function() {
-               s.toolbars.removeClass('fade-300').addClass('fade-1000');
-               api.fade.Out( s.toolbars, 1000, function(){ ps.publish('toolbarHidden'); }, true );
-               $('#wp-fullscreen-body').removeClass('wp-fullscreen-focus');
</del><ins>+                if ( title ) {
+                       $('#wp-fullscreen-save input').attr( 'title', title );
+               }
</ins><span class="cx">   });
</span><span class="cx"> 
</span><del>-       ps.subscribe( 'toolbarShown', function() {
-               s.toolbars.removeClass('fade-300');
-       });
</del><ins>+        // This event occurs while the overlay blocks the UI.
+       ps.subscribe( 'showing', function() {
+               $body.addClass( 'wp-fullscreen-active' );
</ins><span class="cx"> 
</span><del>-       ps.subscribe( 'toolbarHidden', function() {
-               s.toolbars.removeClass('fade-1000');
-               s.toolbar_shown = false;
-       });
</del><ins>+                s.$dfwWrap.addClass( 'wp-fullscreen-wrap' );
+               s.$editorContainer.append( $('#wp-fullscreen-status') );
</ins><span class="cx"> 
</span><del>-       ps.subscribe( 'show', function() { // This event occurs before the overlay blocks the UI.
-               var title;
-
-               if ( s.title_id ) {
-                       title = $('#wp-fullscreen-title').val( $('#' + s.title_id).val() );
-                       set_title_hint( title );
</del><ins>+                if ( s.$dfwTitle ) {
+                       s.$dfwTitle.after( '<span id="wp-fullscreen-title-placeholder">' );
+                       s.$dfwWrap.prepend( s.$dfwTitle.addClass('wp-fullscreen-title') );
</ins><span class="cx">           }
</span><span class="cx"> 
</span><del>-               $('#wp-fullscreen-save input').attr( 'title',  $('#last-edit').text() );
</del><ins>+                api.refreshButtons();
+               resetCssPosition( true );
+               $('#wpadminbar').hide();
</ins><span class="cx"> 
</span><del>-               s.textarea_obj.value = s.qt_canvas.value;
</del><ins>+                // Show the UI for 2 sec. when opening
+               toggleUI('hide');
</ins><span class="cx"> 
</span><del>-               if ( s.has_tinymce && s.mode === 'tinymce' )
-                       tinymce.execCommand('wpFullScreenInit');
</del><ins>+                api.bind_resize();
</ins><span class="cx"> 
</span><del>-               s.orig_y = $(window).scrollTop();
-       });
</del><ins>+                if ( s.editor ) {
+                       s.editor.execCommand( 'wpFullScreenOn' );
+               }
</ins><span class="cx"> 
</span><del>-       ps.subscribe( 'showing', function() { // This event occurs while the DFW overlay blocks the UI.
-               $( document.body ).addClass( 'fullscreen-active' );
-               api.refresh_buttons();
</del><ins>+                api.dfwWidth( $( '#wp-fullscreen-body' ).data('dfw-width') || 800, true );
</ins><span class="cx"> 
</span><del>-               $( document ).bind( 'mousemove.fullscreen', function(e) { bounder( 'showToolbar', 'hideToolbar', 2000, e ); } );
-               bounder( 'showToolbar', 'hideToolbar', 2000 );
-
-               api.bind_resize();
-               setTimeout( api.resize_textarea, 200 );
-
</del><span class="cx">           // scroll to top so the user is not disoriented
</span><span class="cx">          scrollTo(0, 0);
</span><del>-
-               // needed it for IE7 and compat mode
-               $('#wpadminbar').hide();
</del><span class="cx">   });
</span><span class="cx"> 
</span><del>-       ps.subscribe( 'shown', function() { // This event occurs after the DFW overlay is shown
-               var interim_init;
-
</del><ins>+        // This event occurs after the overlay unblocks the UI
+       ps.subscribe( 'shown', function() {
</ins><span class="cx">           s.visible = true;
</span><span class="cx"> 
</span><del>-               // init the standard TinyMCE instance if missing
-               if ( s.has_tinymce && ! s.is_mce_on ) {
-
-                       interim_init = function(mce, ed) {
-                               var el = ed.getElement(), old_val = el.value, settings = tinyMCEPreInit.mceInit[s.editor_id];
-
-                               if ( settings && settings.wpautop && typeof(switchEditors) != 'undefined' )
-                                       el.value = switchEditors.wpautop( el.value );
-
-                               ed.onInit.add(function(ed) {
-                                       ed.hide();
-                                       ed.getElement().value = old_val;
-                                       tinymce.onAddEditor.remove(interim_init);
-                               });
-                       };
-
-                       tinymce.onAddEditor.add(interim_init);
-                       tinymce.init(tinyMCEPreInit.mceInit[s.editor_id]);
-
-                       s.is_mce_on = true;
</del><ins>+                if ( s.editor && ! s.editor.isHidden() ) {
+                       s.editor.execCommand( 'wpAutoResize' );
+               } else {
+                       api.resizeTextarea( 'force' );
</ins><span class="cx">           }
</span><del>-
-               wpActiveEditor = 'wp_mce_fullscreen';
</del><span class="cx">   });
</span><span class="cx"> 
</span><span class="cx">  ps.subscribe( 'hide', function() { // This event occurs before the overlay blocks DFW.
</span><del>-               var htmled_is_hidden = $('#' + s.editor_id).is(':hidden');
-               // Make sure the correct editor is displaying.
-               if ( s.has_tinymce && s.mode === 'tinymce' && !htmled_is_hidden ) {
-                       switchEditors.go(s.editor_id, 'tmce');
-               } else if ( s.mode === 'html' && htmled_is_hidden ) {
-                       switchEditors.go(s.editor_id, 'html');
-               }
</del><ins>+                $document.unbind( '.fullscreen' );
+               s.$dfwTextarea.unbind('.wp-dfw-resize');
+       });
</ins><span class="cx"> 
</span><del>-               // Save content must be after switchEditors or content will be overwritten. See #17229.
-               api.savecontent();
</del><ins>+        ps.subscribe( 'hiding', function() { // This event occurs while the overlay blocks the DFW UI.
+               $body.removeClass( 'wp-fullscreen-active' );
+               $( '#wp-fullscreen-body' ).append( $('#wp-fullscreen-status') );
</ins><span class="cx"> 
</span><del>-               $( document ).unbind( '.fullscreen' );
-               $(s.textarea_obj).unbind('.grow');
</del><ins>+                if ( s.$dfwTitle ) {
+                       $( '#wp-fullscreen-title-placeholder' ).before( s.$dfwTitle.removeClass('wp-fullscreen-title') ).remove();
+               }
</ins><span class="cx"> 
</span><del>-               if ( s.has_tinymce && s.mode === 'tinymce' )
-                       tinymce.execCommand('wpFullScreenSave');
</del><ins>+                s.$dfwWrap.removeClass( 'wp-fullscreen-wrap' )
+               s.$editorContainer.css( 'width', '' );
+               s.$dfwTextarea.add( '#' + s.id + '_ifr' ).height( s.origHeight );
</ins><span class="cx"> 
</span><del>-               if ( s.title_id )
-                       set_title_hint( $('#' + s.title_id) );
</del><ins>+                if ( s.editor ) {
+                       s.editor.execCommand( 'wpFullScreenOff' );
+               }
</ins><span class="cx"> 
</span><del>-               s.qt_canvas.value = s.textarea_obj.value;
-       });
</del><ins>+                resetCssPosition( false );
</ins><span class="cx"> 
</span><del>-       ps.subscribe( 'hiding', function() { // This event occurs while the overlay blocks the DFW UI.
-
-               $( document.body ).removeClass( 'fullscreen-active' );
-               scrollTo(0, s.orig_y);
</del><ins>+                window.scrollTo( 0, uiScrollTop );
</ins><span class="cx">           $('#wpadminbar').show();
</span><span class="cx">  });
</span><span class="cx"> 
</span><del>-       ps.subscribe( 'hidden', function() { // This event occurs after DFW is removed.
</del><ins>+        // This event occurs after DFW is removed.
+       ps.subscribe( 'hidden', function() {
</ins><span class="cx">           s.visible = false;
</span><del>-               $('#wp_mce_fullscreen, #wp-fullscreen-title').removeAttr('style');
-
-               if ( s.has_tinymce && s.is_mce_on )
-                       tinymce.execCommand('wpFullScreenClose');
-
-               s.textarea_obj.value = '';
-               api.oldheight = 0;
-               wpActiveEditor = s.editor_id;
</del><span class="cx">   });
</span><span class="cx"> 
</span><del>-       ps.subscribe( 'switchMode', function( from, to ) {
-               var ed;
-
-               if ( !s.has_tinymce || !s.is_mce_on )
-                       return;
-
-               ed = tinymce.get('wp_mce_fullscreen');
-
-               if ( from === 'html' && to === 'tinymce' ) {
-
-                       if ( tinymce.get(s.editor_id).getParam('wpautop') && typeof(switchEditors) != 'undefined' )
-                               s.textarea_obj.value = switchEditors.wpautop( s.textarea_obj.value );
-
-                       if ( 'undefined' == typeof(ed) )
-                               tinymce.execCommand('wpFullScreenInit');
-                       else
-                               ed.show();
-
-               } else if ( from === 'tinymce' && to === 'html' ) {
-                       if ( ed )
-                               ed.hide();
-               }
-       });
-
-       ps.subscribe( 'switchedMode', function( from, to ) {
-               api.refresh_buttons(true);
-
-               if ( to === 'html' )
-                       setTimeout( api.resize_textarea, 200 );
-       });
-
-       /**
-        * Buttons
-        */
-       api.b = function() {
-               if ( s.has_tinymce && 'tinymce' === s.mode )
-                       tinymce.execCommand('Bold');
-       };
-
-       api.i = function() {
-               if ( s.has_tinymce && 'tinymce' === s.mode )
-                       tinymce.execCommand('Italic');
-       };
-
-       api.ul = function() {
-               if ( s.has_tinymce && 'tinymce' === s.mode )
-                       tinymce.execCommand('InsertUnorderedList');
-       };
-
-       api.ol = function() {
-               if ( s.has_tinymce && 'tinymce' === s.mode )
-                       tinymce.execCommand('InsertOrderedList');
-       };
-
-       api.link = function() {
-               if ( s.has_tinymce && 'tinymce' === s.mode )
-                       tinymce.execCommand('WP_Link');
-               else
-                       wpLink.open();
-       };
-
-       api.unlink = function() {
-               if ( s.has_tinymce && 'tinymce' === s.mode )
-                       tinymce.execCommand('unlink');
-       };
-
-       api.atd = function() {
-               if ( s.has_tinymce && 'tinymce' === s.mode )
-                       tinymce.execCommand('mceWritingImprovementTool');
-       };
-
-       api.help = function() {
-               if ( s.has_tinymce && 'tinymce' === s.mode )
-                       tinymce.execCommand('WP_Help');
-       };
-
-       api.blockquote = function() {
-               if ( s.has_tinymce && 'tinymce' === s.mode )
-                       tinymce.execCommand('mceBlockQuote');
-       };
-
-       api.medialib = function() {
-               if ( typeof wp !== 'undefined' && wp.media && wp.media.editor )
-                       wp.media.editor.open(s.editor_id);
-       };
-
-       api.refresh_buttons = function( fade ) {
-               fade = fade || false;
-
</del><ins>+        api.refreshButtons = function( fade ) {
</ins><span class="cx">           if ( s.mode === 'html' ) {
</span><span class="cx">                  $('#wp-fullscreen-mode-bar').removeClass('wp-tmce-mode').addClass('wp-html-mode');
</span><span class="cx"> 
</span><del>-                       if ( fade )
</del><ins>+                        if ( fade ) {
</ins><span class="cx">                           $('#wp-fullscreen-button-bar').fadeOut( 150, function(){
</span><span class="cx">                                  $(this).addClass('wp-html-mode').fadeIn( 150 );
</span><span class="cx">                          });
</span><del>-                       else
</del><ins>+                        } else {
</ins><span class="cx">                           $('#wp-fullscreen-button-bar').addClass('wp-html-mode');
</span><del>-
</del><ins>+                        }
</ins><span class="cx">           } else if ( s.mode === 'tinymce' ) {
</span><span class="cx">                  $('#wp-fullscreen-mode-bar').removeClass('wp-html-mode').addClass('wp-tmce-mode');
</span><span class="cx"> 
</span><del>-                       if ( fade )
</del><ins>+                        if ( fade ) {
</ins><span class="cx">                           $('#wp-fullscreen-button-bar').fadeOut( 150, function(){
</span><span class="cx">                                  $(this).removeClass('wp-html-mode').fadeIn( 150 );
</span><span class="cx">                          });
</span><del>-                       else
</del><ins>+                        } else {
</ins><span class="cx">                           $('#wp-fullscreen-button-bar').removeClass('wp-html-mode');
</span><ins>+                       }
</ins><span class="cx">           }
</span><span class="cx">  };
</span><span class="cx"> 
</span><span class="lines">@@ -519,29 +455,27 @@
</span><span class="cx">   */
</span><span class="cx">  api.ui = {
</span><span class="cx">          init: function() {
</span><del>-                       var topbar = $('#fullscreen-topbar'), txtarea = $('#wp_mce_fullscreen'), last = 0;
</del><ins>+                        var toolbar, last = 0;
</ins><span class="cx"> 
</span><del>-                       s.toolbars = topbar.add( $('#wp-fullscreen-status') );
-                       s.element = $('#fullscreen-fader');
-                       s.textarea_obj = txtarea[0];
-                       s.has_tinymce = typeof(tinymce) != 'undefined';
</del><ins>+                        s.toolbar = toolbar = $('#fullscreen-topbar');
+                       s.$fullscreenFader = $('#fullscreen-fader');
+                       s.hasTinymce = typeof tinymce !== 'undefined';
</ins><span class="cx"> 
</span><del>-                       if ( !s.has_tinymce )
</del><ins>+                        if ( ! s.hasTinymce )
</ins><span class="cx">                           $('#wp-fullscreen-mode-bar').hide();
</span><span class="cx"> 
</span><del>-                       if ( wptitlehint && $('#wp-fullscreen-title').length )
-                               wptitlehint('wp-fullscreen-title');
-
-                       $(document).keyup(function(e){
</del><ins>+                        $document.keyup( function(e) {
</ins><span class="cx">                           var c = e.keyCode || e.charCode, a, data;
</span><span class="cx"> 
</span><del>-                               if ( !fullscreen.settings.visible )
-                                       return true;
</del><ins>+                                if ( ! s.visible ) {
+                                       return;
+                               }
</ins><span class="cx"> 
</span><del>-                               if ( navigator.platform && navigator.platform.indexOf('Mac') != -1 )
</del><ins>+                                if ( navigator.platform && navigator.platform.indexOf('Mac') !== -1 ) {
</ins><span class="cx">                                   a = e.ctrlKey; // Ctrl key for Mac
</span><del>-                               else
</del><ins>+                                } else {
</ins><span class="cx">                                   a = e.altKey; // Alt key for Win & Linux
</span><ins>+                               }
</ins><span class="cx"> 
</span><span class="cx">                          if ( 27 == c ) { // Esc
</span><span class="cx">                                  data = {
</span><span class="lines">@@ -555,79 +489,102 @@
</span><span class="cx">                                          }
</span><span class="cx">                                  };
</span><span class="cx"> 
</span><del>-                                       if ( ! jQuery(document).triggerHandler( 'wp_CloseOnEscape', [data] ) )
</del><ins>+                                        if ( ! $(document).triggerHandler( 'wp_CloseOnEscape', [data] ) ) {
</ins><span class="cx">                                           fullscreen.off();
</span><ins>+                                       }
</ins><span class="cx">                           }
</span><span class="cx"> 
</span><span class="cx">                          if ( a && (61 == c || 107 == c || 187 == c) ) { // +
</span><del>-                                       api.dfw_width(25);
</del><ins>+                                        api.dfwWidth( 25 );
</ins><span class="cx">                                   e.preventDefault();
</span><span class="cx">                          }
</span><span class="cx"> 
</span><span class="cx">                          if ( a && (45 == c || 109 == c || 189 == c) ) { // -
</span><del>-                                       api.dfw_width(-25);
</del><ins>+                                        api.dfwWidth( -25 );
</ins><span class="cx">                                   e.preventDefault();
</span><span class="cx">                          }
</span><span class="cx"> 
</span><span class="cx">                          if ( a && 48 == c ) { // 0
</span><del>-                                       api.dfw_width(0);
</del><ins>+                                        api.dfwWidth( 0 );
</ins><span class="cx">                                   e.preventDefault();
</span><span class="cx">                          }
</span><span class="cx">                  });
</span><span class="cx"> 
</span><del>-                       // word count in Text mode
-                       if ( typeof(wpWordCount) != 'undefined' ) {
</del><ins>+                        toolbar.on( 'mouseenter', function() {
+                               toggleUI('show');
+                       }).on( 'mouseleave', function() {
+                               toggleUI('hide');
+                       });
</ins><span class="cx"> 
</span><del>-                               txtarea.keyup( function(e) {
-                                       var k = e.keyCode || e.charCode;
</del><ins>+                        // Bind buttons
+                       $('#wp-fullscreen-buttons').on( 'click.wp-fullscreen', function( event ) {
+                               var command = event.target.id && event.target.id.substr(6);
</ins><span class="cx"> 
</span><del>-                                       if ( k == last )
-                                               return true;
</del><ins>+                                if ( s.editor && 'tinymce' === s.mode ) {
+                                       switch( command ) {
+                                               case 'bold':
+                                                       s.editor.execCommand('Bold');
+                                                       break;
+                                               case 'italic':
+                                                       s.editor.execCommand('Italic');
+                                                       break;
+                                               case 'bullist':
+                                                       s.editor.execCommand('InsertUnorderedList');
+                                                       break;
+                                               case 'numlist':
+                                                       s.editor.execCommand('InsertOrderedList');
+                                                       break;
+                                               case 'link':
+                                                       s.editor.execCommand('WP_Link');
+                                                       break;
+                                               case 'unlink':
+                                                       s.editor.execCommand('unlink');
+                                                       break;
+                                               case 'image':
+                                                       s.editor.execCommand('mceImage');
+                                                       break;
+                                               case 'help':
+                                                       s.editor.execCommand('WP_Help');
+                                                       break;
+                                               case 'blockquote':
+                                                       s.editor.execCommand('mceBlockQuote');
+                                                       break;
+                                       }
+                               } else if ( command === 'link' && window.wpLink ) {
+                                       window.wpLink.open();
+                               }
</ins><span class="cx"> 
</span><del>-                                       if ( 13 == k || 8 == last || 46 == last )
-                                               $(document).triggerHandler('wpcountwords', [ txtarea.val() ]);
-
-                                       last = k;
-                                       return true;
-                               });
-                       }
-
-                       topbar.mouseenter(function(){
-                               s.toolbars.addClass('fullscreen-make-sticky');
-                               $( document ).unbind( '.fullscreen' );
-                               clearTimeout( s.timer );
-                               s.timer = 0;
-                       }).mouseleave(function(){
-                               s.toolbars.removeClass('fullscreen-make-sticky');
-
-                               if ( s.visible )
-                                       $( document ).bind( 'mousemove.fullscreen', function(e) { bounder( 'showToolbar', 'hideToolbar', 2000, e ); } );
</del><ins>+                                if ( command === 'wp-media-library' && typeof wp !== 'undefined' && wp.media && wp.media.editor ) {
+                                       wp.media.editor.open( s.id );
+                               }
</ins><span class="cx">                   });
</span><span class="cx">          },
</span><span class="cx"> 
</span><span class="cx">          fade: function( before, during, after ) {
</span><del>-                       if ( ! s.element )
</del><ins>+                        if ( ! s.$fullscreenFader ) {
</ins><span class="cx">                           api.ui.init();
</span><ins>+                       }
</ins><span class="cx"> 
</span><span class="cx">                  // If any callback bound to before returns false, bail.
</span><del>-                       if ( before && ! ps.publish( before ) )
</del><ins>+                        if ( before && ! ps.publish( before ) ) {
</ins><span class="cx">                           return;
</span><ins>+                       }
</ins><span class="cx"> 
</span><del>-                       api.fade.In( s.element, 600, function() {
-                               if ( during )
</del><ins>+                        api.fade.In( s.$fullscreenFader, 200, function() {
+                               if ( during ) {
</ins><span class="cx">                                   ps.publish( during );
</span><ins>+                               }
</ins><span class="cx"> 
</span><del>-                               api.fade.Out( s.element, 600, function() {
-                                       if ( after )
</del><ins>+                                api.fade.Out( s.$fullscreenFader, 200, function() {
+                                       if ( after ) {
</ins><span class="cx">                                           ps.publish( after );
</span><ins>+                                       }
</ins><span class="cx">                           });
</span><span class="cx">                  });
</span><span class="cx">          }
</span><span class="cx">  };
</span><span class="cx"> 
</span><span class="cx">  api.fade = {
</span><del>-               transitionend: 'transitionend webkitTransitionEnd oTransitionEnd',
-
</del><span class="cx">           // Sensitivity to allow browsers to render the blank element before animating.
</span><span class="cx">          sensitivity: 100,
</span><span class="cx"> 
</span><span class="lines">@@ -644,19 +601,22 @@
</span><span class="cx">                          }
</span><span class="cx"> 
</span><span class="cx">                          element.show();
</span><del>-                               element.first().one( this.transitionend, function() {
</del><ins>+                                element.first().one( transitionend, function() {
</ins><span class="cx">                                   callback();
</span><span class="cx">                          });
</span><ins>+
</ins><span class="cx">                           setTimeout( function() { element.addClass( 'fade-trigger' ); }, this.sensitivity );
</span><span class="cx">                  } else {
</span><del>-                               if ( stop )
</del><ins>+                                if ( stop ) {
</ins><span class="cx">                                   element.stop();
</span><ins>+                               }
</ins><span class="cx"> 
</span><span class="cx">                          element.css( 'opacity', 1 );
</span><span class="cx">                          element.first().fadeIn( speed, callback );
</span><span class="cx"> 
</span><del>-                               if ( element.length > 1 )
</del><ins>+                                if ( element.length > 1 ) {
</ins><span class="cx">                                   element.not(':first').fadeIn( speed );
</span><ins>+                               }
</ins><span class="cx">                   }
</span><span class="cx"> 
</span><span class="cx">                  return element;
</span><span class="lines">@@ -668,38 +628,43 @@
</span><span class="cx">                  speed = speed || 400;
</span><span class="cx">                  stop = stop || false;
</span><span class="cx"> 
</span><del>-                       if ( ! element.is(':visible') )
</del><ins>+                        if ( ! element.is(':visible') ) {
</ins><span class="cx">                           return element;
</span><ins>+                       }
</ins><span class="cx"> 
</span><span class="cx">                  if ( api.fade.transitions ) {
</span><del>-                               element.first().one( api.fade.transitionend, function() {
-                                       if ( element.hasClass('fade-trigger') )
</del><ins>+                                element.first().one( transitionend, function() {
+                                       if ( element.hasClass('fade-trigger') ) {
</ins><span class="cx">                                           return;
</span><ins>+                                       }
</ins><span class="cx"> 
</span><span class="cx">                                  element.hide();
</span><span class="cx">                                  callback();
</span><span class="cx">                          });
</span><span class="cx">                          setTimeout( function() { element.removeClass( 'fade-trigger' ); }, this.sensitivity );
</span><span class="cx">                  } else {
</span><del>-                               if ( stop )
</del><ins>+                                if ( stop ) {
</ins><span class="cx">                                   element.stop();
</span><ins>+                               }
</ins><span class="cx"> 
</span><span class="cx">                          element.first().fadeOut( speed, callback );
</span><span class="cx"> 
</span><del>-                               if ( element.length > 1 )
</del><ins>+                                if ( element.length > 1 ) {
</ins><span class="cx">                                   element.not(':first').fadeOut( speed );
</span><ins>+                               }
</ins><span class="cx">                   }
</span><span class="cx"> 
</span><span class="cx">                  return element;
</span><span class="cx">          },
</span><span class="cx"> 
</span><del>-               transitions: (function() { // Check if the browser supports CSS 3.0 transitions
-                       var s = document.documentElement.style;
</del><ins>+                // Check if the browser supports CSS 3.0 transitions
+               transitions: ( function() {
+                       var style = document.documentElement.style;
</ins><span class="cx"> 
</span><del>-                       return ( typeof ( s.WebkitTransition ) == 'string' ||
-                               typeof ( s.MozTransition ) == 'string' ||
-                               typeof ( s.OTransition ) == 'string' ||
-                               typeof ( s.transition ) == 'string' );
</del><ins>+                        return ( typeof style.WebkitTransition === 'string' ||
+                               typeof style.MozTransition === 'string' ||
+                               typeof style.OTransition === 'string' ||
+                               typeof style.transition === 'string' );
</ins><span class="cx">           })()
</span><span class="cx">  };
</span><span class="cx"> 
</span><span class="lines">@@ -708,23 +673,23 @@
</span><span class="cx">   *
</span><span class="cx">   * Automatically updates textarea height.
</span><span class="cx">   */
</span><del>-
</del><span class="cx">   api.bind_resize = function() {
</span><del>-               $(s.textarea_obj).bind('keypress.grow click.grow paste.grow', function(){
-                       setTimeout( api.resize_textarea, 200 );
</del><ins>+                s.$dfwTextarea.on( 'keydown.wp-dfw-resize click.wp-dfw-resize paste.wp-dfw-resize', function(e) {
+                       api.resizeTextarea(e);
</ins><span class="cx">           });
</span><span class="cx">  };
</span><span class="cx"> 
</span><del>-       api.oldheight = 0;
-       api.resize_textarea = function() {
-               var txt = s.textarea_obj, newheight;
</del><ins>+        api.resizeTextarea = function( event ) {
+               var node = s.$dfwTextarea[0];
</ins><span class="cx"> 
</span><del>-               newheight = txt.scrollHeight > 300 ? txt.scrollHeight : 300;
-
-               if ( newheight != api.oldheight ) {
-                       txt.style.height = newheight + 'px';
-                       api.oldheight = newheight;
</del><ins>+                if ( node.scrollHeight > node.clientHeight ) {
+                       node.style.height = node.scrollHeight + 50 + 'px';
</ins><span class="cx">           }
</span><span class="cx">  };
</span><span class="cx"> 
</span><del>-})(jQuery);
</del><ins>+        // Export
+       window.wp = window.wp || {};
+       window.wp.editor = window.wp.editor || {};
+       window.wp.editor.fullscreen = api;
+
+})( jQuery, window );
</ins></span></pre></div>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-editor.php (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-editor.php        2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-includes/class-wp-editor.php   2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -189,46 +189,71 @@
</span><span class="cx"> 
</span><span class="cx">          if ( self::$this_tinymce ) {
</span><span class="cx"> 
</span><del>-                       if ( empty(self::$first_init) ) {
-                               self::$baseurl = includes_url('js/tinymce');
-                               self::$mce_locale = $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1
</del><ins>+                        if ( empty( self::$first_init ) ) {
+                               self::$baseurl = includes_url( 'js/tinymce' );
+                               $mce_locale = get_locale();
+
+                               if ( empty( $mce_locale ) || 'en' == substr( $mce_locale, 0, 2 ) ) {
+                                       $mce_locale = 'en';
+                               }
+
+                               self::$mce_locale = $mce_locale;
</ins><span class="cx">                           $no_captions = (bool) apply_filters( 'disable_captions', '' );
</span><del>-                               $plugins = array( 'inlinepopups', 'tabfocus', 'paste', 'media', 'fullscreen', 'wordpress', 'wpeditimage', 'wpgallery', 'wplink', 'wpdialogs' );
</del><span class="cx">                           $first_run = true;
</span><span class="cx">                          $ext_plugins = '';
</span><span class="cx"> 
</span><span class="cx">                          if ( $set['teeny'] ) {
</span><del>-                                       self::$plugins = $plugins = apply_filters( 'teeny_mce_plugins', array('inlinepopups', 'fullscreen', 'wordpress', 'wplink', 'wpdialogs' ), $editor_id );
</del><ins>+                                        self::$plugins = $plugins = apply_filters( 'teeny_mce_plugins', array( 'fullscreen', 'link', 'image', 'wordpress', 'wplink' ), $editor_id );
</ins><span class="cx">                           } else {
</span><del>-                                       /*
-                                       The following filter takes an associative array of external plugins for TinyMCE in the form 'plugin_name' => 'url'.
-                                       It adds the plugin's name to TinyMCE's plugins init and the call to PluginManager to load the plugin.
-                                       The url should be absolute and should include the js file name to be loaded. Example:
-                                       array( 'myplugin' => 'http://my-site.com/wp-content/plugins/myfolder/mce_plugin.js' )
-                                       If the plugin uses a button, it should be added with one of the "$mce_buttons" filters.
-                                       */
-                                       $mce_external_plugins = apply_filters('mce_external_plugins', array());
</del><ins>+                                        /**
+                                        * TinyMCE external plugins filter
+                                        *
+                                        * Takes an associative array of external plugins for TinyMCE in the form 'plugin_name' => 'url'.
+                                        * The url should be absolute and should include the js file name to be loaded.
+                                        * Example: 'myplugin' => 'http://my-site.com/wp-content/plugins/myfolder/mce_plugin.js'.
+                                        * If the plugin adds a button, it should be added with one of the "$mce_buttons" filters.
+                                        */
+                                       $mce_external_plugins = apply_filters( 'mce_external_plugins', array() );
</ins><span class="cx"> 
</span><del>-                                       if ( ! empty($mce_external_plugins) ) {
</del><ins>+                                        /**
+                                        * TinyMCE default plugins filter
+                                        *
+                                        * Specifies which of the default plugins that are included in WordPress should be added to
+                                        * the TinyMCE instance.
+                                        */
+                                       $plugins = array_unique( apply_filters( 'tiny_mce_plugins', array(
+                                               'charmap',
+                                               'link',
+                                               'media',
+                                               'paste',
+                                               'tabfocus',
+                                               'textcolor',
+                                               'image',
+                                               'fullscreen',
+                                               'wordpress',
+                                               'wpeditimage',
+                                               'wpgallery',
+                                               'wplink',
+                                       ) ) );
</ins><span class="cx"> 
</span><del>-                                               /*
-                                               The following filter loads external language files for TinyMCE plugins.
-                                               It takes an associative array 'plugin_name' => 'path', where path is the
-                                               include path to the file. The language file should follow the same format as
-                                               /tinymce/langs/wp-langs.php and should define a variable $strings that
-                                               holds all translated strings.
-                                               When this filter is not used, the function will try to load {mce_locale}.js.
-                                               If that is not found, en.js will be tried next.
-                                               */
-                                               $mce_external_languages = apply_filters('mce_external_languages', array());
</del><ins>+                                        if ( ! empty( $mce_external_plugins ) ) {
+                                               /**
+                                                * This filter loads translations for external TinyMCE 3.x plugins.
+                                                *
+                                                * Takes an associative array 'plugin_name' => 'path', where path is the
+                                                * include path to the file. The language file should follow the same format as
+                                                * wp_mce_translation() and should define a variable $strings that
+                                                * holds all translated strings.
+                                                */
+                                               $mce_external_languages = apply_filters( 'mce_external_languages', array() );
</ins><span class="cx"> 
</span><span class="cx">                                          $loaded_langs = array();
</span><span class="cx">                                          $strings = '';
</span><span class="cx"> 
</span><del>-                                               if ( ! empty($mce_external_languages) ) {
</del><ins>+                                                if ( ! empty( $mce_external_languages ) ) {
</ins><span class="cx">                                                   foreach ( $mce_external_languages as $name => $path ) {
</span><del>-                                                               if ( @is_file($path) && @is_readable($path) ) {
-                                                                       include_once($path);
</del><ins>+                                                                if ( @is_file( $path ) && @is_readable( $path ) ) {
+                                                                       include_once( $path );
</ins><span class="cx">                                                                   $ext_plugins .= $strings . "\n";
</span><span class="cx">                                                                  $loaded_langs[] = $name;
</span><span class="cx">                                                          }
</span><span class="lines">@@ -236,48 +261,20 @@
</span><span class="cx">                                          }
</span><span class="cx"> 
</span><span class="cx">                                          foreach ( $mce_external_plugins as $name => $url ) {
</span><ins>+                                                       if ( in_array( $name, $plugins, true ) ) {
+                                                               unset( $mce_external_plugins[ $name ] );
+                                                               continue;
+                                                       }
</ins><span class="cx"> 
</span><span class="cx">                                                  $url = set_url_scheme( $url );
</span><ins>+                                                       $mce_external_plugins[ $name ] = $url;
+                                                       $plugurl = dirname( $url );
</ins><span class="cx"> 
</span><del>-                                                       $plugins[] = '-' . $name;
-
-                                                       $plugurl = dirname($url);
-                                                       $strings = $str1 = $str2 = '';
-                                                       if ( ! in_array($name, $loaded_langs) ) {
-                                                               $path = str_replace( content_url(), '', $plugurl );
-                                                               $path = WP_CONTENT_DIR . $path . '/langs/';
-
-                                                               if ( function_exists('realpath') )
-                                                                       $path = trailingslashit( realpath($path) );
-
-                                                               if ( @is_file($path . $mce_locale . '.js') )
-                                                                       $strings .= @file_get_contents($path . $mce_locale . '.js') . "\n";
-
-                                                               if ( @is_file($path . $mce_locale . '_dlg.js') )
-                                                                       $strings .= @file_get_contents($path . $mce_locale . '_dlg.js') . "\n";
-
-                                                               if ( 'en' != $mce_locale && empty($strings) ) {
-                                                                       if ( @is_file($path . 'en.js') ) {
-                                                                               $str1 = @file_get_contents($path . 'en.js');
-                                                                               $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str1, 1 ) . "\n";
-                                                                       }
-
-                                                                       if ( @is_file($path . 'en_dlg.js') ) {
-                                                                               $str2 = @file_get_contents($path . 'en_dlg.js');
-                                                                               $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str2, 1 ) . "\n";
-                                                                       }
-                                                               }
-
-                                                               if ( ! empty($strings) )
-                                                                       $ext_plugins .= "\n" . $strings . "\n";
</del><ins>+                                                        if ( in_array( $name, $loaded_langs ) ) {
+                                                               $ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n";
</ins><span class="cx">                                                   }
</span><del>-
-                                                       $ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n";
-                                                       $ext_plugins .= 'tinymce.PluginManager.load("' . $name . '", "' . $url . '");' . "\n";
</del><span class="cx">                                           }
</span><span class="cx">                                  }
</span><del>-
-                                       $plugins = array_unique( apply_filters('tiny_mce_plugins', $plugins) );
</del><span class="cx">                           }
</span><span class="cx"> 
</span><span class="cx">                          if ( $set['dfw'] )
</span><span class="lines">@@ -286,82 +283,61 @@
</span><span class="cx">                          self::$plugins = $plugins;
</span><span class="cx">                          self::$ext_plugins = $ext_plugins;
</span><span class="cx"> 
</span><del>-                               if ( in_array( 'spellchecker', $plugins ) ) {
-                                       /*
-                                       translators: These languages show up in the spellchecker drop-down menu, in the order specified, and with the first
-                                       language listed being the default language. They must be comma-separated and take the format of name=code, where name
-                                       is the language name (which you may internationalize), and code is a valid ISO 639 language code. Please test the
-                                       spellchecker with your values.
-                                       */
-                                       $mce_spellchecker_languages = __( 'English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv' );
-
-                                       /*
-                                       The following filter allows localization scripts to change the languages displayed in the spellchecker's drop-down menu.
-                                       By default it uses Google's spellchecker API, but can be configured to use PSpell/ASpell if installed on the server.
-                                       The + sign marks the default language. More: http://www.tinymce.com/wiki.php/Plugin:spellchecker.
-                                       */
-                                       $mce_spellchecker_languages = apply_filters( 'mce_spellchecker_languages', '+' . $mce_spellchecker_languages );
-                               }
-
</del><span class="cx">                           self::$first_init = array(
</span><del>-                                       'mode' => 'exact',
-                                       'width' => '100%',
-                                       'theme' => 'advanced',
-                                       'skin' => 'wp_theme',
</del><ins>+                                        'theme' => 'modern',
+                                       'skin' => 'lightgray',
</ins><span class="cx">                                   'language' => self::$mce_locale,
</span><del>-                                       'theme_advanced_toolbar_location' => 'top',
-                                       'theme_advanced_toolbar_align' => 'left',
-                                       'theme_advanced_statusbar_location' => 'bottom',
-                                       'theme_advanced_resizing' => true,
-                                       'theme_advanced_resize_horizontal' => false,
-                                       'dialog_type' => 'modal',
</del><ins>+                                        'resize' => 'vertical',
</ins><span class="cx">                                   'formats' => "{
</span><del>-                                               alignleft : [
-                                                       {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'left'}},
-                                                       {selector : 'img,table', classes : 'alignleft'}
</del><ins>+                                                alignleft: [
+                                                       {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'left'}},
+                                                       {selector: 'img,table,dl.wp-caption', classes: 'alignleft'}
</ins><span class="cx">                                           ],
</span><del>-                                               aligncenter : [
-                                                       {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'center'}},
-                                                       {selector : 'img,table', classes : 'aligncenter'}
</del><ins>+                                                aligncenter: [
+                                                       {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'center'}},
+                                                       {selector: 'img,table,dl.wp-caption', classes: 'aligncenter'}
</ins><span class="cx">                                           ],
</span><del>-                                               alignright : [
-                                                       {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'right'}},
-                                                       {selector : 'img,table', classes : 'alignright'}
</del><ins>+                                                alignright: [
+                                                       {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'right'}},
+                                                       {selector: 'img,table,dl.wp-caption', classes: 'alignright'}
</ins><span class="cx">                                           ],
</span><del>-                                               strikethrough : {inline : 'del'}
</del><ins>+                                                strikethrough: {inline: 'del'}
</ins><span class="cx">                                   }",
</span><span class="cx">                                  'relative_urls' => false,
</span><span class="cx">                                  'remove_script_host' => false,
</span><span class="cx">                                  'convert_urls' => false,
</span><del>-                                       'remove_linebreaks' => true,
-                                       'gecko_spellcheck' => true,
</del><ins>+                                        'browser_spellcheck' => true,
</ins><span class="cx">                                   'fix_list_elements' => true,
</span><ins>+                                       'entities' => '38,amp,60,lt,62,gt',
+                                       'entity_encoding' => 'raw',
+                                       'menubar' => false,
+                                       'object_resizing' => false,
</ins><span class="cx">                                   'keep_styles' => false,
</span><del>-                                       'entities' => '38,amp,60,lt,62,gt',
-                                       'accessibility_focus' => true,
-                                       'media_strict' => false,
</del><span class="cx">                                   'paste_remove_styles' => true,
</span><del>-                                       'paste_remove_spans' => true,
-                                       'paste_strip_class_attributes' => 'all',
-                                       'paste_text_use_dialog' => true,
-                                       'webkit_fake_resize' => false,
-                                       'preview_styles' => 'font-family font-weight text-decoration text-transform',
-                                       'schema' => 'html5',
</del><ins>+
+                                       // limit the preview styles in the menu/toolbar
+                       //              'preview_styles' => 'font-family font-weight font-style text-decoration text-transform color background-color border',
+
</ins><span class="cx">                                   'wpeditimage_disable_captions' => $no_captions,
</span><del>-                                       'wp_fullscreen_content_css' => self::$baseurl . '/plugins/wpfullscreen/css/wp-fullscreen.css',
-                                       'plugins' => implode( ',', $plugins )
</del><ins>+                                        'plugins' => implode( ',', $plugins ),
</ins><span class="cx">                           );
</span><span class="cx"> 
</span><del>-                               if ( in_array( 'spellchecker', $plugins ) ) {
</del><ins>+                                if ( ! empty( $mce_external_plugins ) ) {
+                                       self::$first_init['external_plugins'] = json_encode( $mce_external_plugins );
+                               }
+
+                               if ( in_array( 'spellchecker', $plugins, true ) ) {
</ins><span class="cx">                                   self::$first_init['spellchecker_rpc_url'] = self::$baseurl . '/plugins/spellchecker/rpc.php';
</span><del>-                                       self::$first_init['spellchecker_languages'] = $mce_spellchecker_languages;
</del><ins>+                                        self::$first_init['spellchecker_language'] = self::$mce_locale;
</ins><span class="cx">                           }
</span><span class="cx"> 
</span><ins>+                               // WordPress default stylesheet
+                               $mce_css = array( self::$baseurl . '/skins/wordpress/wp-content.css' );
+
</ins><span class="cx">                           // load editor_style.css if the current theme supports it
</span><span class="cx">                          if ( ! empty( $GLOBALS['editor_styles'] ) && is_array( $GLOBALS['editor_styles'] ) ) {
</span><span class="cx">                                  $editor_styles = $GLOBALS['editor_styles'];
</span><span class="cx"> 
</span><del>-                                       $mce_css = array();
</del><span class="cx">                                   $editor_styles = array_unique( array_filter( $editor_styles ) );
</span><span class="cx">                                  $style_uri = get_stylesheet_directory_uri();
</span><span class="cx">                                  $style_dir = get_stylesheet_directory();
</span><span class="lines">@@ -389,24 +365,20 @@
</span><span class="cx">                                          if ( $file && file_exists( "$style_dir/$file" ) )
</span><span class="cx">                                                  $mce_css[] = "$style_uri/$file";
</span><span class="cx">                                  }
</span><del>-
-                                       $mce_css = implode( ',', $mce_css );
-                               } else {
-                                       $mce_css = '';
</del><span class="cx">                           }
</span><span class="cx"> 
</span><del>-                               $mce_css = trim( apply_filters( 'mce_css', $mce_css ), ' ,' );
</del><ins>+                                $mce_css = trim( apply_filters( 'mce_css', implode( ',', $mce_css ) ), ' ,' );
</ins><span class="cx"> 
</span><span class="cx">                          if ( ! empty($mce_css) )
</span><span class="cx">                                  self::$first_init['content_css'] = $mce_css;
</span><span class="cx">                  }
</span><span class="cx"> 
</span><span class="cx">                  if ( $set['teeny'] ) {
</span><del>-                               $mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'justifyleft', 'justifycenter', 'justifyright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id );
</del><ins>+                                $mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'alignleft', 'aligncenter', 'alignright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id );
</ins><span class="cx">                           $mce_buttons_2 = $mce_buttons_3 = $mce_buttons_4 = array();
</span><span class="cx">                  } else {
</span><del>-                               $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'justifyleft', 'justifycenter', 'justifyright', 'link', 'unlink', 'wp_more', 'spellchecker', 'fullscreen', 'wp_adv' ), $editor_id);
-                               $mce_buttons_2 = apply_filters('mce_buttons_2', array( 'formatselect', 'underline', 'justifyfull', 'forecolor', 'pastetext', 'pasteword', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo', 'wp_help' ), $editor_id);
</del><ins>+                                $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'alignleft', 'aligncenter', 'alignright', 'image', 'link', 'unlink', 'wp_more', 'spellchecker', 'fullscreen', 'wp_adv' ), $editor_id);
+                               $mce_buttons_2 = apply_filters('mce_buttons_2', array( 'formatselect', 'underline', 'alignjustify', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo', 'wp_help' ), $editor_id);
</ins><span class="cx">                           $mce_buttons_3 = apply_filters('mce_buttons_3', array(), $editor_id);
</span><span class="cx">                          $mce_buttons_4 = apply_filters('mce_buttons_4', array(), $editor_id);
</span><span class="cx">                  }
</span><span class="lines">@@ -442,40 +414,36 @@
</span><span class="cx">                  }
</span><span class="cx"> 
</span><span class="cx">                  $mceInit = array (
</span><del>-                               'elements' => $editor_id,
</del><ins>+                                'selector' => "#$editor_id",
</ins><span class="cx">                           'wpautop' => (bool) $set['wpautop'],
</span><del>-                               'remove_linebreaks' => (bool) $set['wpautop'],
-                               'apply_source_formatting' => (bool) !$set['wpautop'],
-                               'theme_advanced_buttons1' => implode($mce_buttons, ','),
-                               'theme_advanced_buttons2' => implode($mce_buttons_2, ','),
-                               'theme_advanced_buttons3' => implode($mce_buttons_3, ','),
-                               'theme_advanced_buttons4' => implode($mce_buttons_4, ','),
</del><ins>+                                'indent' => ! $set['wpautop'],
+                               'toolbar1' => implode($mce_buttons, ','),
+                               'toolbar2' => implode($mce_buttons_2, ','),
+                               'toolbar3' => implode($mce_buttons_3, ','),
+                               'toolbar4' => implode($mce_buttons_4, ','),
</ins><span class="cx">                           'tabfocus_elements' => $set['tabfocus_elements'],
</span><span class="cx">                          'body_class' => $body_class
</span><span class="cx">                  );
</span><span class="cx"> 
</span><del>-                       // The main editor doesn't use the TinyMCE resizing cookie.
-                       $mceInit['theme_advanced_resizing_use_cookie'] = 'content' !== $editor_id || empty( $set['editor_height'] );
-
</del><span class="cx">                   if ( $first_run )
</span><del>-                               $mceInit = array_merge(self::$first_init, $mceInit);
</del><ins>+                                $mceInit = array_merge( self::$first_init, $mceInit );
</ins><span class="cx"> 
</span><del>-                       if ( is_array($set['tinymce']) )
-                               $mceInit = array_merge($mceInit, $set['tinymce']);
</del><ins>+                        if ( is_array( $set['tinymce'] ) )
+                               $mceInit = array_merge( $mceInit, $set['tinymce'] );
</ins><span class="cx"> 
</span><span class="cx">                  // For people who really REALLY know what they're doing with TinyMCE
</span><span class="cx">                  // You can modify $mceInit to add, remove, change elements of the config before tinyMCE.init
</span><span class="cx">                  // Setting "valid_elements", "invalid_elements" and "extended_valid_elements" can be done through this filter.
</span><span class="cx">                  // Best is to use the default cleanup by not specifying valid_elements, as TinyMCE contains full set of XHTML 1.0.
</span><span class="cx">                  if ( $set['teeny'] ) {
</span><del>-                               $mceInit = apply_filters('teeny_mce_before_init', $mceInit, $editor_id);
</del><ins>+                                $mceInit = apply_filters( 'teeny_mce_before_init', $mceInit, $editor_id );
</ins><span class="cx">                   } else {
</span><del>-                               $mceInit = apply_filters('tiny_mce_before_init', $mceInit, $editor_id);
</del><ins>+                                $mceInit = apply_filters( 'tiny_mce_before_init', $mceInit, $editor_id );
</ins><span class="cx">                   }
</span><span class="cx"> 
</span><del>-                       if ( empty($mceInit['theme_advanced_buttons3']) && !empty($mceInit['theme_advanced_buttons4']) ) {
-                               $mceInit['theme_advanced_buttons3'] = $mceInit['theme_advanced_buttons4'];
-                               $mceInit['theme_advanced_buttons4'] = '';
</del><ins>+                        if ( empty( $mceInit['toolbar3'] ) && ! empty( $mceInit['toolbar4'] ) ) {
+                               $mceInit['toolbar3'] = $mceInit['toolbar4'];
+                               $mceInit['toolbar4'] = '';
</ins><span class="cx">                   }
</span><span class="cx"> 
</span><span class="cx">                  self::$mce_settings[$editor_id] = $mceInit;
</span><span class="lines">@@ -511,7 +479,7 @@
</span><span class="cx"> 
</span><span class="cx">          if ( in_array('wplink', self::$plugins, true) || in_array('link', self::$qt_buttons, true) ) {
</span><span class="cx">                  wp_enqueue_script('wplink');
</span><del>-                       wp_enqueue_script('wpdialogs-popup');
</del><ins>+                        wp_enqueue_script('wpdialogs');
</ins><span class="cx">                   wp_enqueue_style('wp-jquery-ui-dialog');
</span><span class="cx">          }
</span><span class="cx"> 
</span><span class="lines">@@ -519,11 +487,210 @@
</span><span class="cx">                  wp_enqueue_script('wp-fullscreen');
</span><span class="cx"> 
</span><span class="cx">          if ( self::$has_medialib ) {
</span><del>-                       add_thickbox();
</del><ins>+        //              add_thickbox(); // ?
</ins><span class="cx">                   wp_enqueue_script('media-upload');
</span><span class="cx">          }
</span><span class="cx">  }
</span><span class="cx"> 
</span><ins>+       public static function wp_mce_translation() {
+
+               $mce_translation = array(
+                       // Default TinyMCE strings
+                       'Cut' => __('Cut'),
+                       'Header 2' => __('Header 2'),
+                       'Your browser doesn\'t support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.' => __('Your browser does not support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.'),
+                       'Div' => __('Div'),
+                       'Paste' => __('Paste'),
+                       'Close' => __('Close'),
+                       'Pre' => __('Pre'),
+                       'Align right' => __('Align right'),
+                       'New document' => __('New document'),
+                       'Blockquote' => __('Blockquote'),
+                       'Numbered list' => __('Numbered list'),
+                       'Increase indent' => __('Increase indent'),
+                       'Formats' => __('Formats'),
+                       'Headers' => __('Headers'),
+                       'Select all' => __('Select all'),
+                       'Header 3' => __('Header 3'),
+                       'Blocks' => __('Blocks'),
+                       'Undo' => __('Undo'),
+                       'Strikethrough' => __('Strikethrough'),
+                       'Bullet list' => __('Bullet list'),
+                       'Header 1' => __('Header 1'),
+                       'Superscript' => __('Superscript'),
+                       'Clear formatting' => __('Clear formatting'),
+                       'Subscript' => __('Subscript'),
+                       'Header 6' => __('Header 6'),
+                       'Redo' => __('Redo'),
+                       'Paragraph' => __('Paragraph'),
+                       'Ok' => __('Ok'),
+                       'Bold' => __('Bold'),
+                       'Code' => __('Code'),
+                       'Italic' => __('Italic'),
+                       'Align center' => __('Align center'),
+                       'Header 5' => __('Header 5'),
+                       'Decrease indent' => __('Decrease indent'),
+                       'Header 4' => __('Header 4'),
+                       'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' => __('Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.'),
+                       'Underline' => __('Underline'),
+                       'Cancel' => __('Cancel'),
+                       'Justify' => __('Justify'),
+                       'Inline' => __('Inline'),
+                       'Copy' => __('Copy'),
+                       'Align left' => __('Align left'),
+                       'Visual aids' => __('Visual aids'),
+                       'Lower Greek' => __('Lower Greek'),
+                       'Square' => __('Square'),
+                       'Default' => __('Default'),
+                       'Lower Alpha' => __('Lower Alpha'),
+                       'Circle' => __('Circle'),
+                       'Disc' => __('Disc'),
+                       'Upper Alpha' => __('Upper Alpha'),
+                       'Upper Roman' => __('Upper Roman'),
+                       'Lower Roman' => __('Lower Roman'),
+                       'Name' => __('Name'),
+                       'Anchor' => __('Anchor'),
+                       'You have unsaved changes are you sure you want to navigate away?' => __('You have unsaved changes are you sure you want to navigate away?'),
+                       'Restore last draft' => __('Restore last draft'),
+                       'Special character' => __('Special character'),
+                       'Source code' => __('Source code'),
+                       'Right to left' => __('Right to left'),
+                       'Left to right' => __('Left to right'),
+                       'Emoticons' => __('Emoticons'),
+                       'Robots' => __('Robots'),
+                       'Document properties' => __('Document properties'),
+                       'Title' => __('Title'),
+                       'Keywords' => __('Keywords'),
+                       'Encoding' => __('Encoding'),
+                       'Description' => __('Description'),
+                       'Author' => __('Author'),
+                       'Fullscreen' => __('Fullscreen'),
+                       'Horizontal line' => __('Horizontal line'),
+                       'Horizontal space' => __('Horizontal space'),
+                       'Insert/edit image' => __('Insert/edit image'),
+                       'General' => __('General'),
+                       'Advanced' => __('Advanced'),
+                       'Source' => __('Source'),
+                       'Border' => __('Border'),
+                       'Constrain proportions' => __('Constrain proportions'),
+                       'Vertical space' => __('Vertical space'),
+                       'Image description' => __('Image description'),
+                       'Style' => __('Style'),
+                       'Dimensions' => __('Dimensions'),
+                       'Insert image' => __('Insert image'),
+                       'Insert date/time' => __('Insert date/time'),
+                       'Remove link' => __('Remove link'),
+                       'Url' => __('Url'),
+                       'Text to display' => __('Text to display'),
+                       'Anchors' => __('Anchors'),
+                       'Insert link' => __('Insert link'),
+                       'New window' => __('New window'),
+                       'None' => __('None'),
+                       'Target' => __('Target'),
+                       'Insert/edit link' => __('Insert/edit link'),
+                       'Insert/edit video' => __('Insert/edit video'),
+                       'Poster' => __('Poster'),
+                       'Alternative source' => __('Alternative source'),
+                       'Paste your embed code below:' => __('Paste your embed code below:'),
+                       'Insert video' => __('Insert video'),
+                       'Embed' => __('Embed'),
+                       'Nonbreaking space' => __('Nonbreaking space'),
+                       'Page break' => __('Page break'),
+                       'Paste as text' => __('Paste as text'),
+                       'Preview' => __('Preview'),
+                       'Print' => __('Print'),
+                       'Save' => __('Save'),
+                       'Could not find the specified string.' => __('Could not find the specified string.'),
+                       'Replace' => __('Replace'),
+                       'Next' => __('Next'),
+                       'Whole words' => __('Whole words'),
+                       'Find and replace' => __('Find and replace'),
+                       'Replace with' => __('Replace with'),
+                       'Find' => __('Find'),
+                       'Replace all' => __('Replace all'),
+                       'Match case' => __('Match case'),
+                       'Prev' => __('Prev'),
+                       'Spellcheck' => __('Spellcheck'),
+                       'Finish' => __('Finish'),
+                       'Ignore all' => __('Ignore all'),
+                       'Ignore' => __('Ignore'),
+                       'Insert row before' => __('Insert row before'),
+                       'Rows' => __('Rows'),
+                       'Height' => __('Height'),
+                       'Paste row after' => __('Paste row after'),
+                       'Alignment' => __('Alignment'),
+                       'Column group' => __('Column group'),
+                       'Row' => __('Row'),
+                       'Insert column before' => __('Insert column before'),
+                       'Split cell' => __('Split cell'),
+                       'Cell padding' => __('Cell padding'),
+                       'Cell spacing' => __('Cell spacing'),
+                       'Row type' => __('Row type'),
+                       'Insert table' => __('Insert table'),
+                       'Body' => __('Body'),
+                       'Caption' => __('Caption'),
+                       'Footer' => __('Footer'),
+                       'Delete row' => __('Delete row'),
+                       'Paste row before' => __('Paste row before'),
+                       'Scope' => __('Scope'),
+                       'Delete table' => __('Delete table'),
+                       'Header cell' => __('Header cell'),
+                       'Column' => __('Column'),
+                       'Cell' => __('Cell'),
+                       'Header' => __('Header'),
+                       'Cell type' => __('Cell type'),
+                       'Copy row' => __('Copy row'),
+                       'Row properties' => __('Row properties'),
+                       'Table properties' => __('Table properties'),
+                       'Row group' => __('Row group'),
+                       'Right' => __('Right'),
+                       'Insert column after' => __('Insert column after'),
+                       'Cols' => __('Cols'),
+                       'Insert row after' => __('Insert row after'),
+                       'Width' => __('Width'),
+                       'Cell properties' => __('Cell properties'),
+                       'Left' => __('Left'),
+                       'Cut row' => __('Cut row'),
+                       'Delete column' => __('Delete column'),
+                       'Center' => __('Center'),
+                       'Merge cells' => __('Merge cells'),
+                       'Insert template' => __('Insert template'),
+                       'Templates' => __('Templates'),
+                       'Background color' => __('Background color'),
+                       'Text color' => __('Text color'),
+                       'Show blocks' => __('Show blocks'),
+                       'Show invisible characters' => __('Show invisible characters'),
+                       'Words: {0}' => __('Words: {0}'),
+                       'Insert' => __('Insert'),
+                       'File' => __('File'),
+                       'Edit' => __('Edit'),
+                       'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help' => __('Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help'),
+                       'Tools' => __('Tools'),
+                       'View' => __('View'),
+                       'Table' => __('Table'),
+                       'Format' => __('Format'),
+
+                       // WordPress strings
+                       'Help' => __('Help'),
+                       'Toolbar Toggle' => __('Toolbar Toggle'),
+                       'Insert Read More tag' => __('Insert Read More tag'),
+                       'Distraction Free Writing' => __('Distraction Free Writing'),
+               );
+
+               $baseurl = self::$baseurl;
+               $mce_locale = self::$mce_locale;
+
+               $mce_translation = apply_filters( 'wp_mce_translation', $mce_translation, $mce_locale );
+
+               foreach ( $mce_translation as $key => $value ) {
+                       if ( strpos( $value, '&' ) !== false )
+                               $mce_translation[$key] = html_entity_decode( $value, ENT_QUOTES );
+               }
+
+               return "tinymce.addI18n( '$mce_locale', " . json_encode( $mce_translation ) . ");\n" .
+                       "tinymce.ScriptLoader.markDone( '$baseurl/langs/$mce_locale.js' );\n";
+       }
+
</ins><span class="cx">   public static function editor_js() {
</span><span class="cx">          global $tinymce_version, $concatenate_scripts, $compress_scripts;
</span><span class="cx"> 
</span><span class="lines">@@ -543,9 +710,6 @@
</span><span class="cx">          $compressed = $compress_scripts && $concatenate_scripts && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
</span><span class="cx">                  && false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
</span><span class="cx"> 
</span><del>-               if ( $tmce_on && 'en' != self::$mce_locale )
-                       include_once(ABSPATH . WPINC . '/js/tinymce/langs/wp-langs.php');
-
</del><span class="cx">           $mceInit = $qtInit = '';
</span><span class="cx">          if ( $tmce_on ) {
</span><span class="cx">                  foreach ( self::$mce_settings as $editor_id => $init ) {
</span><span class="lines">@@ -569,27 +733,26 @@
</span><span class="cx"> 
</span><span class="cx">          $ref = array(
</span><span class="cx">                  'plugins' => implode( ',', self::$plugins ),
</span><del>-                       'theme' => 'advanced',
</del><ins>+                        'theme' => 'modern',
</ins><span class="cx">                   'language' => self::$mce_locale
</span><span class="cx">          );
</span><span class="cx"> 
</span><del>-               $suffix = ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) ? '_src' : '';
</del><ins>+                $suffix = ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) ? '' : '.min';
</ins><span class="cx"> 
</span><del>-               do_action('before_wp_tiny_mce', self::$mce_settings);
-?>
</del><ins>+                do_action( 'before_wp_tiny_mce', self::$mce_settings );
+               ?>
</ins><span class="cx"> 
</span><del>-       <script type="text/javascript">
</del><ins>+                <script type="text/javascript">
</ins><span class="cx">           tinyMCEPreInit = {
</span><del>-                       base : "<?php echo self::$baseurl; ?>",
-                       suffix : "<?php echo $suffix; ?>",
-                       query : "<?php echo $version; ?>",
-                       mceInit : <?php echo $mceInit; ?>,
-                       qtInit : <?php echo $qtInit; ?>,
-                       ref : <?php echo self::_parse_init( $ref ); ?>,
-                       load_ext : function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
</del><ins>+                        baseURL: "<?php echo self::$baseurl; ?>",
+                       suffix: "<?php echo $suffix; ?>",
+                       mceInit: <?php echo $mceInit; ?>,
+                       qtInit: <?php echo $qtInit; ?>,
+                       ref: <?php echo self::_parse_init( $ref ); ?>,
+                       load_ext: function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
</ins><span class="cx">           };
</span><del>-       </script>
-<?php
</del><ins>+                </script>
+               <?php
</ins><span class="cx"> 
</span><span class="cx">          $baseurl = self::$baseurl;
</span><span class="cx"> 
</span><span class="lines">@@ -597,76 +760,59 @@
</span><span class="cx">                  if ( $compressed ) {
</span><span class="cx">                          echo "<script type='text/javascript' src='{$baseurl}/wp-tinymce.php?c=1&amp;$version'></script>\n";
</span><span class="cx">                  } else {
</span><del>-                               echo "<script type='text/javascript' src='{$baseurl}/tiny_mce.js?$version'></script>\n";
-                               echo "<script type='text/javascript' src='{$baseurl}/wp-tinymce-schema.js?$version'></script>\n";
</del><ins>+                                echo "<script type='text/javascript' src='{$baseurl}/tinymce.js?$version'></script>\n";
+                               echo "<script type='text/javascript' src='{$baseurl}/plugins/compat3x/plugin{$suffix}.js?$version'></script>\n";
</ins><span class="cx">                   }
</span><span class="cx"> 
</span><del>-                       if ( 'en' != self::$mce_locale && isset($lang) )
-                               echo "<script type='text/javascript'>\n$lang\n</script>\n";
-                       else
</del><ins>+                        if ( 'en' != self::$mce_locale )
+                               echo "<script type='text/javascript'>\n" . self::wp_mce_translation() . "</script>\n";
+
+                       if ( self::$ext_plugins ) {
+                               // Load the old-format English strings to prevent unsightly labels in old style popups
</ins><span class="cx">                           echo "<script type='text/javascript' src='{$baseurl}/langs/wp-langs-en.js?$version'></script>\n";
</span><ins>+                       }
</ins><span class="cx">           }
</span><span class="cx"> 
</span><del>-               $mce = ( self::$has_tinymce && wp_default_editor() == 'tinymce' ) || ! self::$has_quicktags;
-?>
</del><ins>+                // Allow scripts to be added after tinymce.js has been loaded but before any editor instances are created.
+               do_action( 'wp_tiny_mce_init', self::$mce_settings );
</ins><span class="cx"> 
</span><del>-       <script type="text/javascript">
-               var wpActiveEditor;
</del><ins>+                ?>
+               <script type="text/javascript">
+               <?php
</ins><span class="cx"> 
</span><del>-               (function(){
-                       var init, ed, qt, first_init, DOM, el, i, mce = <?php echo (int) $mce; ?>;
</del><ins>+                if ( self::$ext_plugins )
+                       echo self::$ext_plugins . "\n";
</ins><span class="cx"> 
</span><del>-                       if ( typeof(tinymce) == 'object' ) {
-                               DOM = tinymce.DOM;
-                               // mark wp_theme/ui.css as loaded
-                               DOM.files[tinymce.baseURI.getURI() + '/themes/advanced/skins/wp_theme/ui.css'] = true;
</del><ins>+                if ( ! is_admin() )
+                       echo 'var ajaxurl = "' . admin_url( 'admin-ajax.php', 'relative' ) . '";';
</ins><span class="cx"> 
</span><del>-                               DOM.events.add( DOM.select('.wp-editor-wrap'), 'mousedown', function(e){
-                                       if ( this.id )
-                                               wpActiveEditor = this.id.slice(3, -5);
-                               });
</del><ins>+                ?>
</ins><span class="cx"> 
</span><del>-                               for ( ed in tinyMCEPreInit.mceInit ) {
-                                       if ( first_init ) {
-                                               init = tinyMCEPreInit.mceInit[ed] = tinymce.extend( {}, first_init, tinyMCEPreInit.mceInit[ed] );
</del><ins>+                ( function() {
+                       var init, edId, qtId, firstInit,
+                               loadMCE = typeof getUserSetting !== 'undefined' ? getUserSetting( 'editor' ) === 'tinymce' : true;
+
+                       if ( typeof quicktags !== 'undefined' ) {
+                               for ( qtId in tinyMCEPreInit.qtInit ) {
+                                       try { quicktags( tinyMCEPreInit.qtInit[qtId] ); } catch(e){};
+                               }
+                       }
+
+                       if ( typeof tinymce !== 'undefined' ) {
+                               for ( edId in tinyMCEPreInit.mceInit ) {
+                                       if ( firstInit ) {
+                                               init = tinyMCEPreInit.mceInit[edId] = tinymce.extend( {}, firstInit, tinyMCEPreInit.mceInit[edId] );
</ins><span class="cx">                                   } else {
</span><del>-                                               init = first_init = tinyMCEPreInit.mceInit[ed];
</del><ins>+                                                init = firstInit = tinyMCEPreInit.mceInit[edId];
</ins><span class="cx">                                   }
</span><span class="cx"> 
</span><del>-                                       if ( mce )
-                                               try { tinymce.init(init); } catch(e){}
-                               }
-                       } else {
-                               if ( tinyMCEPreInit.qtInit ) {
-                                       for ( i in tinyMCEPreInit.qtInit ) {
-                                               el = tinyMCEPreInit.qtInit[i].id;
-                                               if ( el )
-                                                       document.getElementById('wp-'+el+'-wrap').onmousedown = function(){ wpActiveEditor = this.id.slice(3, -5); }
</del><ins>+                                        if ( ( loadMCE || ! tinyMCEPreInit.qtInit.hasOwnProperty( edId ) ) && ! init.wp_skip_init ) {
+                                               try { tinymce.init( init ); } catch(e){}
</ins><span class="cx">                                   }
</span><span class="cx">                          }
</span><span class="cx">                  }
</span><ins>+               }());
</ins><span class="cx"> 
</span><del>-                       if ( typeof(QTags) == 'function' ) {
-                               for ( qt in tinyMCEPreInit.qtInit ) {
-                                       try { quicktags( tinyMCEPreInit.qtInit[qt] ); } catch(e){}
-                               }
-                       }
-               })();
-               <?php
-
-               if ( self::$ext_plugins )
-                       echo self::$ext_plugins . "\n";
-
-               if ( ! $compressed && $tmce_on ) {
-                       ?>
-                       (function(){var t=tinyMCEPreInit,sl=tinymce.ScriptLoader,ln=t.ref.language,th=t.ref.theme,pl=t.ref.plugins;sl.markDone(t.base+'/langs/'+ln+'.js');sl.markDone(t.base+'/themes/'+th+'/langs/'+ln+'.js');sl.markDone(t.base+'/themes/'+th+'/langs/'+ln+'_dlg.js');sl.markDone(t.base+'/themes/advanced/skins/wp_theme/ui.css');tinymce.each(pl.split(','),function(n){if(n&&n.charAt(0)!='-'){sl.markDone(t.base+'/plugins/'+n+'/langs/'+ln+'.js');sl.markDone(t.base+'/plugins/'+n+'/langs/'+ln+'_dlg.js');}});})();
-                       <?php
-               }
-
-               if ( !is_admin() )
-                       echo 'var ajaxurl = "' . admin_url( 'admin-ajax.php', 'relative' ) . '";';
-
-               ?>
</del><span class="cx">           </script>
</span><span class="cx">          <?php
</span><span class="cx"> 
</span><span class="lines">@@ -676,93 +822,84 @@
</span><span class="cx">          if ( in_array('wpfullscreen', self::$plugins, true) || in_array('fullscreen', self::$qt_buttons, true) )
</span><span class="cx">                  self::wp_fullscreen_html();
</span><span class="cx"> 
</span><del>-               do_action('after_wp_tiny_mce', self::$mce_settings);
</del><ins>+                do_action( 'after_wp_tiny_mce', self::$mce_settings );
</ins><span class="cx">   }
</span><span class="cx"> 
</span><span class="cx">  public static function wp_fullscreen_html() {
</span><span class="cx">          global $content_width;
</span><span class="cx">          $post = get_post();
</span><span class="cx"> 
</span><del>-               $width = isset($content_width) && 800 > $content_width ? $content_width : 800;
</del><ins>+                $width = isset( $content_width ) && 800 > $content_width ? $content_width : 800;
</ins><span class="cx">           $width = $width + 22; // compensate for the padding and border
</span><span class="cx">          $dfw_width = get_user_setting( 'dfw_width', $width );
</span><del>-               $save = isset($post->post_status) && $post->post_status == 'publish' ? __('Update') : __('Save');
-       ?>
-       <div id="wp-fullscreen-body"<?php if ( is_rtl() ) echo ' class="rtl"'; ?>>
-       <div id="fullscreen-topbar">
-               <div id="wp-fullscreen-toolbar">
-                       <div id="wp-fullscreen-close"><a href="#" onclick="fullscreen.off();return false;"><?php _e('Exit fullscreen'); ?></a></div>
</del><ins>+                $save = isset( $post->post_status ) && $post->post_status == 'publish' ? __('Update') : __('Save');
+
+               ?>
+               <div id="wp-fullscreen-body"<?php if ( is_rtl() ) echo ' class="rtl"'; ?> data-theme-width="<?php echo (int) $width; ?>" data-dfw-width="<?php echo (int) $dfw_width; ?>">
+               <div id="fullscreen-topbar">
+                       <div id="wp-fullscreen-toolbar">
+                       <div id="wp-fullscreen-close"><a href="#" onclick="wp.editor.fullscreen.off();return false;"><?php _e('Exit fullscreen'); ?></a></div>
</ins><span class="cx">                   <div id="wp-fullscreen-central-toolbar" style="width:<?php echo $width; ?>px;">
</span><span class="cx"> 
</span><span class="cx">                  <div id="wp-fullscreen-mode-bar"><div id="wp-fullscreen-modes">
</span><del>-                               <a href="#" onclick="fullscreen.switchmode('tinymce');return false;"><?php _e( 'Visual' ); ?></a>
-                               <a href="#" onclick="fullscreen.switchmode('html');return false;"><?php _ex( 'Text', 'Name for the Text editor tab (formerly HTML)' ); ?></a>
</del><ins>+                                <a href="#" onclick="wp.editor.fullscreen.switchmode('tinymce');return false;"><?php _e( 'Visual' ); ?></a>
+                               <a href="#" onclick="wp.editor.fullscreen.switchmode('html');return false;"><?php _ex( 'Text', 'Name for the Text editor tab (formerly HTML)' ); ?></a>
</ins><span class="cx">                   </div></div>
</span><span class="cx"> 
</span><del>-                       <div id="wp-fullscreen-button-bar"><div id="wp-fullscreen-buttons" class="wp_themeSkin">
-       <?php
</del><ins>+                        <div id="wp-fullscreen-button-bar"><div id="wp-fullscreen-buttons" class="mce-toolbar">
+               <?php
</ins><span class="cx"> 
</span><span class="cx">          $buttons = array(
</span><span class="cx">                  // format: title, onclick, show in both editors
</span><del>-                       'bold' => array( 'title' => __('Bold (Ctrl + B)'), 'onclick' => 'fullscreen.b();', 'both' => false ),
-                       'italic' => array( 'title' => __('Italic (Ctrl + I)'), 'onclick' => 'fullscreen.i();', 'both' => false ),
-                       '0' => 'separator',
-                       'bullist' => array( 'title' => __('Unordered list (Alt + Shift + U)'), 'onclick' => 'fullscreen.ul();', 'both' => false ),
-                       'numlist' => array( 'title' => __('Ordered list (Alt + Shift + O)'), 'onclick' => 'fullscreen.ol();', 'both' => false ),
-                       '1' => 'separator',
-                       'blockquote' => array( 'title' => __('Blockquote (Alt + Shift + Q)'), 'onclick' => 'fullscreen.blockquote();', 'both' => false ),
-                       'image' => array( 'title' => __('Insert/edit image (Alt + Shift + M)'), 'onclick' => "fullscreen.medialib();", 'both' => true ),
-                       '2' => 'separator',
-                       'link' => array( 'title' => __('Insert/edit link (Alt + Shift + A)'), 'onclick' => 'fullscreen.link();', 'both' => true ),
-                       'unlink' => array( 'title' => __('Unlink (Alt + Shift + S)'), 'onclick' => 'fullscreen.unlink();', 'both' => false ),
-                       '3' => 'separator',
-                       'help' => array( 'title' => __('Help (Alt + Shift + H)'), 'onclick' => 'fullscreen.help();', 'both' => false )
</del><ins>+                        'bold' => array( 'title' => __('Bold (Ctrl + B)'), 'both' => false ),
+                       'italic' => array( 'title' => __('Italic (Ctrl + I)'), 'both' => false ),
+                       'bullist' => array( 'title' => __('Unordered list (Alt + Shift + U)'), 'both' => false ),
+                       'numlist' => array( 'title' => __('Ordered list (Alt + Shift + O)'), 'both' => false ),
+                       'blockquote' => array( 'title' => __('Blockquote (Alt + Shift + Q)'), 'both' => false ),
+                       'wp-media-library' => array( 'title' => __('Media library (Alt + Shift + M)'), 'both' => true ),
+                       'image' => array( 'title' => __('Insert/edit image'), 'both' => false ),
+                       'link' => array( 'title' => __('Insert/edit link (Alt + Shift + A)'), 'both' => true ),
+                       'unlink' => array( 'title' => __('Unlink (Alt + Shift + S)'), 'both' => false ),
+                       'help' => array( 'title' => __('Help (Alt + Shift + H)'), 'both' => false ),
</ins><span class="cx">           );
</span><span class="cx"> 
</span><span class="cx">          $buttons = apply_filters( 'wp_fullscreen_buttons', $buttons );
</span><span class="cx"> 
</span><span class="cx">          foreach ( $buttons as $button => $args ) {
</span><del>-                       if ( 'separator' == $args ) { ?>
-                               <div><span aria-orientation="vertical" role="separator" class="mceSeparator"></span></div>
-       <?php                continue;
-                       } ?>
</del><ins>+                        if ( 'separator' == $args ) {
+                               continue;
+                       }
</ins><span class="cx"> 
</span><del>-                       <div<?php if ( $args['both'] ) { ?> class="wp-fullscreen-both"<?php } ?>>
-                       <a title="<?php echo $args['title']; ?>" onclick="<?php echo $args['onclick']; ?>return false;" class="mceButton mceButtonEnabled mce_<?php echo $button; ?>" href="#" id="wp_fs_<?php echo $button; ?>" role="button" aria-pressed="false">
-                       <span class="mceIcon mce_<?php echo $button; ?>"></span>
-                       </a>
-                       </div>
-       <?php
-               } ?>
</del><ins>+                        $onclick = ! empty( $args['onclick'] ) ? ' onclick="' . $args['onclick'] . '"' : '';
+                       ?>
</ins><span class="cx"> 
</span><del>-                       </div></div>
-
-                       <div id="wp-fullscreen-save">
-                               <input type="button" class="button-primary right" value="<?php echo $save; ?>" onclick="fullscreen.save();" />
-                               <span class="spinner"></span>
-                               <span class="fs-saved"><?php if ( $post->post_status == 'publish' ) _e('Updated.'); else _e('Saved.'); ?></span>
</del><ins>+                        <div class="mce-widget mce-btn<?php if ( $args['both'] ) { ?> wp-fullscreen-both<?php } ?>">
+                       <button type="button" role="presentation" title="<?php echo $args['title']; ?>"<?php echo $onclick; ?> id="wp_fs_<?php echo $button; ?>">
+                               <i class="mce-ico mce-i-<?php echo $button; ?>"></i>
+                       </button>
</ins><span class="cx">                   </div>
</span><ins>+                       <?php
+               }
</ins><span class="cx"> 
</span><del>-                       </div>
-               </div>
-       </div>
</del><ins>+                ?>
</ins><span class="cx"> 
</span><del>-       <div id="wp-fullscreen-wrap" style="width:<?php echo $dfw_width; ?>px;">
-               <?php if ( post_type_supports($post->post_type, 'title') ) { ?>
-               <label id="wp-fullscreen-title-prompt-text" for="wp-fullscreen-title"><?php echo apply_filters( 'enter_title_here', __( 'Enter title here' ), $post ); ?></label>
-               <input type="text" id="wp-fullscreen-title" value="" autocomplete="off" />
-               <?php } ?>
</del><ins>+                </div></div>
</ins><span class="cx"> 
</span><del>-               <div id="wp-fullscreen-container">
-                       <textarea id="wp_mce_fullscreen"></textarea>
</del><ins>+                <div id="wp-fullscreen-save">
+                       <input type="button" class="button-primary right" value="<?php echo $save; ?>" onclick="wp.editor.fullscreen.save();" />
+                       <span class="spinner"></span>
+                       <span class="wp-fullscreen-saved-message"><?php if ( $post->post_status == 'publish' ) _e('Updated.'); else _e('Saved.'); ?></span>
+                       <span class="wp-fullscreen-error-message"><?php _e('Save failed.'); ?></span>
</ins><span class="cx">           </div>
</span><span class="cx"> 
</span><del>-               <div id="wp-fullscreen-status">
-                       <div id="wp-fullscreen-count"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></div>
-                       <div id="wp-fullscreen-tagline"><?php _e('Just write.'); ?></div>
</del><span class="cx">           </div>
</span><ins>+               </div>
</ins><span class="cx">   </div>
</span><ins>+       <div id="wp-fullscreen-status">
+               <div id="wp-fullscreen-count"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></div>
+               <div id="wp-fullscreen-tagline"><?php _e('Just write.'); ?></div>
</ins><span class="cx">   </div>
</span><ins>+       </div>
</ins><span class="cx"> 
</span><span class="cx">  <div class="fullscreen-overlay" id="fullscreen-overlay"></div>
</span><span class="cx">  <div class="fullscreen-overlay fullscreen-fader fade-600" id="fullscreen-fader"></div>
</span></span></pre></div>
<a id="trunksrcwpincludescsseditorcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/editor.css (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/editor.css     2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-includes/css/editor.css        2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -1,1146 +1,265 @@
</span><del>-
</del><span class="cx"> /*------------------------------------------------------------------------------
</span><del>-
</del><span class="cx">  TinyMCE and Quicklinks toolbars
</span><span class="cx"> ------------------------------------------------------------------------------*/
</span><span class="cx"> 
</span><del>-/* wp_theme/ui.css */
-.wp_themeSkin table,
-.wp_themeSkin tbody,
-.wp_themeSkin a,
-.wp_themeSkin img,
-.wp_themeSkin tr,
-.wp_themeSkin div,
-.wp_themeSkin td,
-.wp_themeSkin iframe,
-.wp_themeSkin span,
-.wp_themeSkin *,
-.wp_themeSkin .mceText {
</del><ins>+.mce-panel {
</ins><span class="cx">   border: 0;
</span><del>-       margin: 0;
-       padding: 0;
-       white-space: nowrap;
-       text-decoration: none;
-       font-weight: normal;
-       cursor: default;
-       vertical-align: baseline;
-       width: auto;
-       border-collapse: separate;
</del><ins>+        background: #fff;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin a:hover,
-.wp_themeSkin a:link,
-.wp_themeSkin a:visited,
-.wp_themeSkin a:active {
-       text-decoration: none;
-       font-weight: normal;
-       cursor: default;
</del><ins>+.mce-toolbar-grp {
+       border-bottom: 1px solid #dedede;
+       background: #f5f5f5;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin table td {
-       vertical-align: middle;
</del><ins>+.mce-toolbar {
+       padding: 1px 3px;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin *,
-.wp_themeSkin a:hover,
-.wp_themeSkin a:link,
-.wp_themeSkin a:visited,
-.wp_themeSkin a:active {
-       color: #555;
-}
-
-/* These are part of TinyMCE, used in TinyMCE Advanced, but not WordPress. These are not updated for 3.8's design. */
-.wp_themeSkin span.mce_sup,
-.wp_themeSkin span.mce_sub,
-.wp_themeSkin span.mce_media,
-.wp_themeSkin span.mce_styleprops,
-.wp_themeSkin span.mce_search,
-.wp_themeSkin span.mce_emotions,
-.wp_themeSkin span.mce_print,
-.wp_themeSkin span.mce_attribs,
-.wp_themeSkin span.mce_hr,
-.wp_themeSkin span.mce_cut,
-.wp_themeSkin span.mce_copy,
-.wp_themeSkin span.mce_paste,
-.wp_themeSkin span.mce_cite,
-.wp_themeSkin span.mce_visualchars,
-.wp_themeSkin span.mce_advhr,
-.wp_themeSkin span.mce_insertdate,
-.wp_themeSkin span.mce_anchor,
-.wp_themeSkin span.mce_visualaid,
-.wp_themeSkin span.mce_cleanup,
-.wp_themeSkin span.mce_table,
-.wp_themeSkin span.mce_row_props,
-.wp_themeSkin span.mce_cell_props,
-.wp_themeSkin span.mce_row_before,
-.wp_themeSkin span.mce_row_after,
-.wp_themeSkin span.mce_delete_row,
-.wp_themeSkin span.mce_col_before,
-.wp_themeSkin span.mce_col_after,
-.wp_themeSkin span.mce_delete_col,
-.wp_themeSkin span.mce_split_cells,
-.wp_themeSkin span.mce_merge_cells,
-.wp_themeSkin span.mce_delete_table,
-.wp_themeSkin span.mce_ins,
-.wp_themeSkin span.mce_abbr,
-.wp_themeSkin span.mce_acronym,
-.wp_themeSkin span.mce_del,
-.wp_themeSkin span.mce_replace,
-.wp_themeSkin span.mce_code,
-.wp_themeSkin span.mce_nonbreaking,
-.wp_themeSkin span.mce_inserttime,
-.wp_themeSkin span.mce_insertlayer,
-.wp_themeSkin span.mce_moveforward,
-.wp_themeSkin span.mce_movebackward,
-.wp_themeSkin span.mce_absolute {
-       -moz-transition: none;
-       -webkit-transition: none;
-       transition: none;
-       background: url("../js/tinymce/themes/advanced/img/icons.gif") no-repeat 20px 20px;
-}
-
-/* No @font-face support */
-.no-font-face .wp_themeSkin span.mce_undo,
-.no-font-face .wp_themeSkin span.mce_redo,
-.no-font-face .wp_themeSkin span.mce_bullist,
-.no-font-face .wp_themeSkin span.mce_numlist,
-.no-font-face .wp_themeSkin span.mce_blockquote,
-.no-font-face .wp_themeSkin span.mce_charmap,
-.no-font-face .wp_themeSkin span.mce_bold,
-.no-font-face .wp_themeSkin span.mce_italic,
-.no-font-face .wp_themeSkin span.mce_underline,
-.no-font-face .wp_themeSkin span.mce_justifyleft,
-.no-font-face .wp_themeSkin span.mce_justifyright,
-.no-font-face .wp_themeSkin span.mce_justifycenter,
-.no-font-face .wp_themeSkin span.mce_justifyfull,
-.no-font-face .wp_themeSkin span.mce_indent,
-.no-font-face .wp_themeSkin span.mce_outdent,
-.no-font-face .wp_themeSkin span.mce_link,
-.no-font-face .wp_themeSkin span.mce_unlink,
-.no-font-face .wp_themeSkin span.mce_help,
-.no-font-face .wp_themeSkin span.mce_removeformat,
-.no-font-face .wp_themeSkin span.mce_fullscreen,
-.no-font-face .wp_themeSkin span.mce_wp_fullscreen,
-.no-font-face .wp_themeSkin span.mce_media,
-.no-font-face .wp_themeSkin span.mce_pastetext,
-.no-font-face .wp_themeSkin span.mce_pasteword,
-.no-font-face .wp_themeSkin span.mce_wp_help,
-.no-font-face .wp_themeSkin span.mce_wp_adv,
-.no-font-face .wp_themeSkin span.mce_wp_more,
-.no-font-face .wp_themeSkin span.mce_strikethrough,
-.no-font-face .wp_themeSkin span.mce_spellchecker,
-.no-font-face .wp_themeSkin span.mce_forecolor,
-.no-font-face .wp_themeSkin .mce_forecolorpicker,
-.no-font-face .wp_themeSkin .mceSplitButton .mce_spellchecker span.mce_spellchecker,
-.no-font-face .wp_themeSkin .mceSplitButton .mce_forecolor span.mce_forecolor,
-.no-font-face .wp_themeSkin .mceSplitButton span.mce_numlist,
-.no-font-face .wp_themeSkin .mceSplitButton span.mce_bullist {
-       -moz-transition: none;
-       -webkit-transition: none;
-       transition: none;
-       background-image: url('../images/wpicons.png?ver=20120720');
-}
-
-/* Theme */
-.no-font-face .wp_themeSkin span.mce_undo {background-position:-500px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_undo,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_undo {background-position:-500px 0}
-
-.no-font-face .wp_themeSkin span.mce_redo {background-position:-480px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_redo,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_redo {background-position:-480px 0}
-
-.no-font-face .wp_themeSkin span.mce_bullist {background-position:-40px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_bullist,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_bullist,
-.no-font-face .wp_themeSkin .mceSplitButton:hover span.mce_bullist {background-position:-40px 0}
-
-.no-font-face .wp_themeSkin span.mce_numlist {background-position:-60px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_numlist,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_numlist,
-.no-font-face .wp_themeSkin .mceSplitButton:hover span.mce_numlist {background-position:-60px 0}
-
-.no-font-face .wp_themeSkin span.mce_blockquote {background-position:-80px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_blockquote,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_blockquote {background-position:-80px 0}
-
-.no-font-face .wp_themeSkin span.mce_charmap {background-position:-420px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_charmap,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_charmap {background-position:-420px 0}
-
-.no-font-face .wp_themeSkin span.mce_bold {background-position:0 -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_bold,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_bold {background-position:0 0}
-
-.no-font-face .wp_themeSkin span.mce_italic {background-position:-20px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_italic,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_italic {background-position:-20px 0}
-
-.no-font-face .wp_themeSkin span.mce_underline {background-position:-280px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_underline,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_underline {background-position:-280px 0}
-
-.no-font-face .wp_themeSkin span.mce_justifyleft {background-position:-100px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_justifyleft,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_justifyleft {background-position:-100px 0}
-
-.no-font-face .wp_themeSkin span.mce_justifyright {background-position:-140px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_justifyright,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_justifyright {background-position:-140px 0}
-
-.no-font-face .wp_themeSkin span.mce_justifycenter {background-position:-120px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_justifycenter,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_justifycenter {background-position:-120px 0}
-
-.no-font-face .wp_themeSkin span.mce_justifyfull {background-position:-300px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_justifyfull,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_justifyfull {background-position:-300px 0}
-
-.no-font-face .wp_themeSkin span.mce_indent {background-position:-460px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_indent,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_indent {background-position:-460px 0}
-
-.no-font-face .wp_themeSkin span.mce_outdent {background-position:-440px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_outdent,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_outdent {background-position:-440px 0}
-
-.no-font-face .wp_themeSkin span.mce_link {background-position:-160px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_link,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_link {background-position:-160px 0}
-
-.no-font-face .wp_themeSkin span.mce_unlink {background-position:-180px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_unlink,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_unlink {background-position:-180px 0}
-
-.no-font-face .wp_themeSkin span.mce_help {background-position:-520px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_help,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_help {background-position:-520px 0}
-
-.no-font-face .wp_themeSkin span.mce_removeformat {background-position:-380px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_removeformat,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_removeformat {background-position:-380px 0}
-
-.no-font-face .wp_themeSkin span.mce_strikethrough {background-position:-540px -20px;}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_strikethrough,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_strikethrough {background-position:-540px 0}
-
-.no-font-face .wp_themeSkin .mceSplitButton .mce_forecolor span.mce_forecolor {background-position:-320px -20px}
-.no-font-face .wp_themeSkin .mceSplitButtonEnabled:hover span.mce_forecolor,
-.no-font-face .wp_themeSkin .mceSplitButtonSelected span.mce_forecolor {background-position:-320px 0}
-
-.no-font-face .wp_themeSkin .mce_forecolorpicker {background-position:-320px -20px}
-
-/* Plugins in WP */
-.no-font-face .wp_themeSkin span.mce_fullscreen {background-position:-240px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_fullscreen,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_fullscreen {background-position:-240px 0}
-
-.no-font-face .wp_themeSkin span.mce_wp_fullscreen {background-position:-240px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_wp_fullscreen,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_wp_fullscreen {background-position:-240px 0}
-
-.no-font-face .wp_themeSkin span.mce_media {background-position:-400px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_media,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_media {background-position:-400px 0}
-
-.no-font-face .wp_themeSkin span.mce_pastetext {background-position:-340px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_pastetext,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_pastetext {background-position:-340px 0}
-
-.no-font-face .wp_themeSkin span.mce_pasteword {background-position:-360px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_pasteword,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_pasteword {background-position:-360px 0}
-
-.no-font-face .wp_themeSkin span.mce_spellchecker {background-position:-220px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_spellchecker,
-.no-font-face .wp_themeSkin .mceSplitButtonEnabled:hover span.mce_spellchecker,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_spellchecker,
-.no-font-face .wp_themeSkin .mceSplitButtonSelected span.mce_spellchecker {background-position:-220px 0}
-
-.no-font-face .wp_themeSkin span.mce_wp_help {background-position:-520px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_wp_help,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_wp_help {background-position:-520px 0}
-
-.no-font-face .wp_themeSkin span.mce_wp_adv {background-position:-260px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_wp_adv,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_wp_adv {background-position:-260px 0}
-
-.no-font-face .wp_themeSkin span.mce_wp_more {background-position:-200px -20px}
-.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_wp_more,
-.no-font-face .wp_themeSkin .mceButtonActive span.mce_wp_more {background-position:-200px 0}
-
-.no-font-face .mceIcon:before {
-       display: none !important;
-}
-/* End no @font-face */
-
-/* Containers */
-.wp_themeSkin table {}
-
-.wp_themeSkin iframe {
-       display: block;
-}
-
-.wp_themeSkin #mce_fullscreen_ifr {
-       background-color: #fff;
-}
-
-.wp_themeSkin .mceToolbar {
-       padding: 1px;
-}
-
-/* External */
-.wp_themeSkin .mceExternalToolbar {
-       position: absolute;
-       border-bottom: 0;
-       display: none;
-}
-
-.wp_themeSkin .mceExternalToolbar td.mceToolbar {
-       padding-right: 13px;
-}
-
-.wp_themeSkin .mceExternalClose {
-       position: absolute;
-       top: 3px;
-       right: 3px;
-       width: 7px;
-       height: 7px;
-       background: url("../js/tinymce/themes/advanced/img/icons.gif") -820px 0;
-}
-
-/* Layout */
-.wp_themeSkin table.mceToolbar,
-.wp_themeSkin tr.mceFirst .mceToolbar tr td,
-.wp_themeSkin tr.mceLast .mceToolbar tr td {
-       border: 0;
-       margin: 0;
-       padding: 0;
-}
-
-.wp_themeSkin table.mceLayout {
-       border: 0;
-}
-
-.wp_themeSkin .mceStatusbar {
-       background: #fff;
</del><ins>+.mce-statusbar {
</ins><span class="cx">   border-top: 1px solid #eee;
</span><del>-       color: #000;
-       display: block;
-       font-family: sans-serif;
-       font-size: 12px;
-       height: 20px;
-       line-height: 16px;
-       padding: 0 0 0 8px;
-       overflow: visible;
</del><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin .mceStatusbar * {
-       color: #555;
</del><ins>+.mce-path {
+       padding: 0 8px 1px;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin .mceStatusbar div {
-       float: left;
-       padding: 2px;
</del><ins>+.mce-path-item {
+       line-height: 1;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin .mceStatusbar a.mceResize {
-       display: block;
-       float: right;
-       background: url("../js/tinymce/themes/advanced/img/icons.gif") -800px 0;
-       width: 20px;
-       height: 20px;
-       cursor: se-resize;
</del><ins>+.mce-toolbar .mce-btn {
+       border-color: transparent;
+       background: transparent;
+       box-shadow: none;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin .mceStatusbar a:hover {
-       text-decoration: underline;
-}
-
-.wp_themeSkin table.mceToolbar {
-       margin: 0 6px 2px;
-}
-
-.wp_themeSkin table.mceToolbar :active,
-.wp_themeSkin table.mceToolbar :focus,
-.wp_themeSkin table.mceToolbar:focus,
-.wp_themeSkin span.mceSeparator:focus {
-       outline: none;
-}
-
-.wp_themeSkin #content_toolbar1 {
-       margin-top: 2px;
-}
-
-.wp_themeSkin .mceToolbar .mceToolbarEndListBox span {
-       display: none;
-}
-
-.wp_themeSkin span.mceIcon,
-.wp_themeSkin img.mceIcon {
-       display: block;
-       width: 20px;
-       height: 20px;
-}
-
-a .mceIcon, .mceAction {
-       text-align: center;
-       font: normal 20px/1 'dashicons' !important;
-       speak: none;
-       -webkit-font-smoothing: antialiased;
-       -moz-osx-font-smoothing: grayscale;
-}
-
-.mceAction {
-       line-height:16px;
-}
-
-/* Button */
-.wp_themeSkin .mceButton {
-       display: block;
-       width: 20px;
-       height: 20px;
-       cursor: default;
-       padding: 1px 2px;
-       margin: 1px;
</del><ins>+#wp-fullscreen-buttons .mce-btn,
+.mce-toolbar .mce-btn-group .mce-btn {
+       border: 1px solid transparent;
+       margin: 0 1px;
</ins><span class="cx">   -webkit-border-radius: 2px;
</span><span class="cx">  border-radius: 2px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin a.mceButtonEnabled:hover {
-       background-image: inherit 0 -10px;
</del><ins>+#wp-fullscreen-buttons .mce-btn:hover,
+.mce-toolbar .mce-btn-group .mce-btn:hover,
+.mce-toolbar .mce-btn-group .mce-btn.mce-active {
+       box-shadow: 0 0 transparent;
+       border-color: #bbb;
+       background: #eee;
+       background-image: -webkit-gradient(linear, left bottom, left top, from(#e5e5e5), to(#fff));
+       background-image: -webkit-linear-gradient(bottom, #e5e5e5, #fff);
+       background-image: linear-gradient(to top, #e5e5e5, #fff);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin .mceOldBoxModel a.mceButton span, .wp_themeSkin .mceOldBoxModel a.mceButton img {
-       margin: 0 0 0 1px;
</del><ins>+.mce-toolbar .mce-btn-group .mce-disabled.mce-btn:hover {
+       border-color: transparent;
+       background: transparent;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin .mceButtonDisabled .mceIcon {
-       opacity: 0.2;
-       filter: alpha(opacity=20);
</del><ins>+.mce-toolbar .mce-btn-group .mce-first,
+.mce-toolbar .mce-btn-group .mce-last {
+       border-color: transparent;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-/* Separator */
-.wp_themeSkin .mceSeparator {
-       display: none;
</del><ins>+.mce-toolbar .mce-btn button {
+       padding: 2px 3px;
+       line-height: normal;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-/* ListBox */
-.wp_themeSkin .mceListBox,
-.wp_themeSkin .mceListBox a {
-       display: block;
</del><ins>+.mce-toolbar .mce-btn i {
+       text-shadow: 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin .mceListBox .mceText {
-       padding: 1px 4px 1px 5px;
-       width: 70px;
-       text-align: left;
-       text-decoration: none;
-       -webkit-border-bottom-left-radius: 2px;
-       -webkit-border-top-left-radius: 2px;
-       border-bottom-left-radius: 2px;
-       border-top-left-radius: 2px;
-       font-family: sans-serif;
-       font-size: 12px;
-       height: 20px;
-       line-height: 20px;
-       overflow: hidden;
-}
-
-.wp_themeSkin .mceListBox {
-       margin: 1px;
</del><ins>+.mce-toolbar .mce-btn-group .mce-btn.mce-listbox {
+       border-radius: 0;
</ins><span class="cx">   direction: ltr;
</span><del>-       background-color: #fff;
</del><ins>+        background: #fff;
</ins><span class="cx">   border: 1px solid #ddd;
</span><span class="cx">  -webkit-box-shadow: inset 0 1px 1px -1px rgba(0, 0, 0, .2);
</span><span class="cx">  box-shadow:         inset 0 1px 1px -1px rgba(0, 0, 0, .2);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin .mceListBox .mceOpen {
-       width: 12px;
-       height: 20px;
-       border-collapse: separate;
-       padding: 1px;
-       -webkit-border-bottom-left-radius: 0;
-       -webkit-border-top-left-radius: 0;
-       border-bottom-left-radius: 0;
-       border-top-left-radius: 0;
</del><ins>+.mce-toolbar .mce-btn-group .mce-btn.mce-listbox:hover {
+       background-image: none;
+       border-color: #bbb;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin .mceListBox .mceFirst a {
-       border-style: solid;
-       border-width: 1px;
-       border-bottom-right-radius: 2px;
-       border-top-right-radius: 2px;
</del><ins>+.mce-toolbar .mce-colorbutton .mce-open {
+       border-right: 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin .mceListBoxMenu .mce_formatPreview {
-       line-height: normal;
</del><ins>+.mce-toolbar .mce-colorbutton .mce-preview {
+       margin-left: -16px;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin .mceListBox .mceOpen,
-.wp_themeSkin .mceListBoxHover .mceOpen,
-.wp_themeSkin .mceListBoxSelected .mceOpen,
-.wp_themeSkin table.mceListBoxEnabled .mceOpen {
-       background-image: url("../images/down_arrow.gif");
-       background-position: 3px 1px;
-       background-repeat: no-repeat;
-}
-
-.wp_themeSkin .mceListBoxDisabled .mceText {
-       color: gray;
-}
-
-.wp_themeSkin .mceListBoxMenu {
-       overflow: auto;
-       overflow-x: hidden;
-}
-
-.wp_themeSkin .mceOldBoxModel .mceListBox .mceText {
-       height: 22px;
-}
-
-.wp_themeSkin select.mceListBox {
-       font-family: sans-serif;
-       font-size: 12px;
-       border-color: #b2b2b2;
-       background-color: #fff;
-}
-
-/* SplitButton */
-.wp_themeSkin .mceSplitButton a,
-.wp_themeSkin .mceSplitButton span {
-       display: block;
-       height: 20px;
-}
-
-.wp_themeSkin .mceSplitButton {
-       display: block;
-       direction: ltr;
-}
-
-.wp_themeSkin table.mceSplitButton td {
-       padding: 2px;
-       -webkit-border-radius: 2px;
-       border-radius: 2px;
-}
-
-.wp_themeSkin table.mceSplitButton:hover td {
-       background-image: inherit 0 -10px;
-}
-
-.wp_themeSkin .mceSplitButton a.mceAction {
-       height: 20px;
</del><ins>+/* Icons */
+.mce-toolbar .mce-ico {
+       color: #777;
+       line-height: 20px;
</ins><span class="cx">   width: 20px;
</span><del>-       padding: 1px 2px;
-       border-right: 0 none;
-}
-
-.wp_themeSkin .mceSplitButton span.mceAction {
-       background-image: url("../js/tinymce/themes/advanced/img/icons.gif");
-       background-repeat: no-repeat;
-       background-color: transparent;
-       width: 20px;
-}
-
-.wp_themeSkin .mceSplitButton span.mceAction.mce_bullist,
-.wp_themeSkin .mceSplitButton span.mceAction.mce_numlist {
-       background-image: none;
-}
-
-.wp_themeSkin .mceSplitButton a.mceOpen {
-       width: 11px;
</del><span class="cx">   height: 20px;
</span><del>-       background-position: 0px 2px;
-       background-repeat: no-repeat;
-       padding: 1px 0;
-}
-
-.wp_themeSkin .mceSplitButton span.mceOpen {
-       display: none;
-}
-
-.wp_themeSkin .mceSplitButtonDisabled .mceAction {
-       opacity: 0.3;
-       filter: alpha(opacity=30);
-}
-
-.wp_themeSkin .mceListBox a.mceText,
-.wp_themeSkin .mceSplitButton a.mceAction {
-       -webkit-border-bottom-left-radius: 2px;
-       -webkit-border-top-left-radius: 2px;
-       border-bottom-left-radius: 2px;
-       border-top-left-radius: 2px;
-}
-
-.wp_themeSkin .mceSplitButton a.mceOpen,
-.wp_themeSkin .mceListBox a.mceOpen {
-       -webkit-border-bottom-right-radius: 2px;
-       -webkit-border-top-right-radius: 2px;
-       border-bottom-right-radius: 2px;
-       border-top-right-radius: 2px;
-}
-
-/* ColorSplitButton */
-.wp_themeSkin div.mceColorSplitMenu table {
-       background-color: #ebebeb;
-       border-color: #bbb;
-}
-
-.wp_themeSkin .mceColorSplitMenu td {
-       padding: 2px;
-}
-
-.wp_themeSkin .mceColorSplitMenu a {
-       display: block;
-       width: 9px;
-       height: 9px;
-       overflow: hidden;
-       border-color: #B2B2B2;
-}
-
-.wp_themeSkin .mceColorSplitMenu td.mceMoreColors {
-       padding: 1px 3px 1px 1px;
-}
-
-.wp_themeSkin .mceColorSplitMenu a.mceMoreColors {
-       width: 100%;
-       height: auto;
</del><span class="cx">   text-align: center;
</span><del>-       font-family: "Open Sans", sans-serif;
-       font-size: 11px;
-       line-height: 20px;
-       border-color: #fff;
</del><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover {}
-.wp_themeSkin a.mceMoreColors:hover {}
-.wp_themeSkin .mceColorPreview {
-       margin: -5px 0 0 2px;
-       width: 16px;
-       height: 4px;
-       overflow: hidden;
</del><ins>+.mce-toolbar .mce-btn:hover .mce-ico {
+       color: #333;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-/* Menu */
-.wp_themeSkin .mceMenu {
-       position: absolute;
-       left: 0;
-       top: 0;
-       z-index: 1000;
-       border-color: #ddd;
-       direction: ltr;
</del><ins>+.mce-i-bold,
+.mce-i-italic,
+.mce-i-bullist,
+.mce-i-numlist,
+.mce-i-blockquote,
+.mce-i-alignleft,
+.mce-i-aligncenter,
+.mce-i-alignright,
+.mce-i-link,
+.mce-i-unlink,
+.mce-i-wp_more,
+.mce-i-strikethrough,
+.mce-i-spellchecker,
+.mce-i-fullscreen,
+.mce-i-wp_fullscreen,
+.mce-i-wp_adv,
+.mce-i-underline,
+.mce-i-alignjustify,
+.mce-i-forecolor,
+.mce-i-pastetext,
+.mce-i-pasteword,
+.mce-i-removeformat,
+.mce-i-charmap,
+.mce-i-outdent,
+.mce-i-indent,
+.mce-i-undo,
+.mce-i-redo,
+.mce-i-help,
+.mce-i-wp_help,
+.mce-i-wp-media-library,
+.mce-i-ltr {
+       font: normal 20px/1 'dashicons';
+       padding: 0;
+       vertical-align: top;
+       speak: none;
+       -webkit-font-smoothing: antialiased;
+       -moz-osx-font-smoothing: grayscale;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp_themeSkin .mceNoIcons span.mceIcon {
-       width: 0;
-}
-
-.wp_themeSkin .mceNoIcons a .mceText {
-       padding-left: 10px;
-}
-
-.wp_themeSkin .mceMenu table {
-       background-color: #ebeaeb;
-}
-
-.wp_themeSkin .mceMenu a,
-.wp_themeSkin .mceMenu span,
-.wp_themeSkin .mceMenu {
-       display: block;
-}
-
-.wp_themeSkin .mceMenu td {
-       height: 20px;overflow: hidden;
-}
-
-.wp_themeSkin .mceMenu a {
-       position: relative;
-       padding: 3px 0 4px 0;
-       text-decoration: none !important;
-}
-
-.wp_themeSkin .mceMenu .mceText {
-       position: relative;
-       display: block;
-       font-family: "Open Sans", sans-serif;
-       cursor: default;
-       margin: 0;
-       padding: 0 25px;
-       color: #000;
-}
-
-.wp_themeSkin .mceMenu span.mceText, .wp_themeSkin .mceMenu .mcePreview {
-       font-size: 12px;
-}
-
-.wp_themeSkin .mceMenu pre.mceText {
-       font-family: Monospace;
-}
-
-.wp_themeSkin .mceMenu .mceIcon {
-       position: absolute;
-       top: 0;
-       left: 0;
-       width: 22px;
-}
-
-.wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover,
-.wp_themeSkin .mceMenu .mceMenuItemActive {
-       background-color: #f5f5f5;
-}
-
-.wp_themeSkin td.mceMenuItemSeparator {
-       height: 1px;
-       background-color: #aaa;
-}
-
-.wp_themeSkin .mceMenuItemTitle a {
-       border-top: 0;
-       border-right: 0;
-       border-left: 0;
-       border-bottom: 1px solid #aaa;
-       text-decoration: none !important;
-       background-color: #ccc;
-}
-
-.wp_themeSkin .mceMenuItemTitle span.mceText {
-       font-weight: bold;
-       padding-left: 4px;
-       color: #000;
-}
-
-.wp_themeSkin .mceMenuItemSelected .mceIcon {
-       background: url("../js/tinymce/themes/advanced/skins/default/img/menu_check.gif");
-       color: #888;
-}
-
-.wp_themeSkin .mceNoIcons .mceMenuItemSelected a {
-       background: url("../js/tinymce/themes/advanced/skins/default/img/menu_arrow.gif") no-repeat -6px center;
-}
-
-.wp_themeSkin .mceMenu span.mceMenuLine {
-       display: none;
-}
-
-.wp_themeSkin .mceMenuItemSub a {
-       background: url("../js/tinymce/themes/advanced/skins/default/img/menu_arrow.gif") no-repeat top right;
-}
-
-/* Progress,Resize */
-.wp_themeSkin .mceBlocker {
-       position: absolute;
-       left: 0;
-       top: 0;
-       z-index: 1000;
-       opacity: 0.5;
-       filter: alpha(opacity=50);
-       background: #FFF;
-}
-
-.wp_themeSkin .mceProgress {
-       position: absolute;
-       left: 0;
-       top: 0;
-       z-index: 1001;
-       background: url("../js/tinymce/themes/advanced/skins/default/img/progress.gif") no-repeat;
-       width: 32px;
-       height: 32px;
-       margin: -16px 0 0 -16px;
-}
-
-.wp_themeSkin .mcePlaceHolder {
-       border: 1px dotted gray;
-}
-
-/* Rtl */
-.mceRtl .mceListBox .mceText {
-       text-align: right;
-       padding: 0 4px 0 0;
-}
-
-.mceRtl .mceMenuItem .mceText {
-       text-align: right;
-}
-
-/* Formats */
-.wp_themeSkin .mce_p span.mceText {}
-.wp_themeSkin .mce_address span.mceText {
-       font-style: italic;
-}
-
-.wp_themeSkin .mce_pre span.mceText {
-       font-family: monospace;
-}
-
-.wp_themeSkin .mce_h1 span.mceText {
-       font-weight: bolder;
-       font-size: 18px;
-}
-
-.wp_themeSkin .mce_h2 span.mceText {
-       font-weight: bolder;
-       font-size: 14px;
-}
-
-.wp_themeSkin .mce_h3 span.mceText {
-       font-weight: bolder;
-       font-size: 12px;
-}
-
-.wp_themeSkin .mce_h4 span.mceText {
-       font-weight: bolder;
-       font-size: 11px;
-}
-
-.wp_themeSkin .mce_h5 span.mceText {
-       font-weight: bolder;
-       font-size: 11px;
-}
-
-.wp_themeSkin .mce_h6 span.mceText {
-       font-weight: bolder;
-       font-size: 10px;
-}
-
-span.mce_bold:before {
</del><ins>+.mce-i-bold:before {
</ins><span class="cx">   content: '\f200';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_italic:before {
</del><ins>+.mce-i-italic:before {
</ins><span class="cx">   content: '\f201';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_bullist:before {
</del><ins>+.mce-i-bullist:before {
</ins><span class="cx">   content: '\f203';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_numlist:before {
</del><ins>+.mce-i-numlist:before {
</ins><span class="cx">   content: '\f204';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_blockquote:before {
</del><ins>+.mce-i-blockquote:before {
</ins><span class="cx">   content: '\f205';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_justifyleft:before {
</del><ins>+.mce-i-alignleft:before {
</ins><span class="cx">   content: '\f206';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_justifycenter:before {
</del><ins>+.mce-i-aligncenter:before {
</ins><span class="cx">   content: '\f207';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_justifyright:before {
</del><ins>+.mce-i-alignright:before {
</ins><span class="cx">   content: '\f208';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_link:before {
</del><ins>+.mce-i-link:before {
</ins><span class="cx">   content: '\f103';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_unlink:before {
</del><ins>+.mce-i-unlink:before {
</ins><span class="cx">   content: '\f225';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_wp_more:before {
</del><ins>+.mce-i-wp_more:before {
</ins><span class="cx">   content: '\f209';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_strikethrough:before {
</del><ins>+.mce-i-strikethrough:before {
</ins><span class="cx">   content: '\f224';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_spellchecker {
-       font-size: 20px;
-       background: none !important;
-       margin-top: 2px;
-}
-
-span.mce_spellchecker:before {
</del><ins>+.mce-i-spellchecker:before {
</ins><span class="cx">   content: '\f210';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_fullscreen:before,
-span.mce_wp_fullscreen:before {
</del><ins>+.mce-i-fullscreen:before,
+.mce-i-wp_fullscreen:before {
</ins><span class="cx">   content: '\f211';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_wp_adv:before {
</del><ins>+.mce-i-wp_adv:before {
</ins><span class="cx">   content: '\f212';
</span><span class="cx"> }
</span><del>-span.mce_underline:before {
</del><ins>+.mce-i-underline:before {
</ins><span class="cx">   content: '\f213';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_justifyfull:before {
</del><ins>+.mce-i-alignjustify:before {
</ins><span class="cx">   content: '\f214';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_forecolor {
-       background: none !important;
-}
-
-span.mce_forecolor:before {
</del><ins>+.mce-i-forecolor:before {
</ins><span class="cx">   content: '\f215';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_pastetext:before {
</del><ins>+.mce-i-pastetext:before {
</ins><span class="cx">   content: '\f217';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_pasteword:before {
-       content: '\f216';
-}
-
-span.mce_removeformat:before {
</del><ins>+.mce-i-removeformat:before {
</ins><span class="cx">   content: '\f218';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_charmap:before {
</del><ins>+.mce-i-charmap:before {
</ins><span class="cx">   content: '\f220';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_outdent:before {
</del><ins>+.mce-i-outdent:before {
</ins><span class="cx">   content: '\f221';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_indent:before {
</del><ins>+.mce-i-indent:before {
</ins><span class="cx">   content: '\f222';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_undo:before {
</del><ins>+.mce-i-undo:before {
</ins><span class="cx">   content: '\f171';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_redo:before {
</del><ins>+.mce-i-redo:before {
</ins><span class="cx">   content: '\f172';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_help:before,
-span.mce_wp_help:before {
</del><ins>+.mce-i-help:before,
+.mce-i-wp_help:before {
</ins><span class="cx">   content: '\f223';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_image:before {
</del><ins>+.mce-i-wp-media-library:before {
</ins><span class="cx">   content: '\f104';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-span.mce_ltr:before {
</del><ins>+.mce-i-ltr:before {
</ins><span class="cx">   content: '\f320';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-/* Default icons */
-.wp_themeSkin span.mce_cleanup {background-position:-380px -20px}
-.wp_themeSkin span.mce_anchor {background-position:-200px 0}
-.wp_themeSkin span.mce_sub {background-position:-600px 0}
-.wp_themeSkin span.mce_sup {background-position:-620px 0}
-.wp_themeSkin span.mce_newdocument {background-position:-520px 0}
-.wp_themeSkin span.mce_image {background-position:-380px 0}
-.wp_themeSkin span.mce_code {background-position:-260px 0}
-.wp_themeSkin span.mce_hr {background-position:-360px 0}
-.wp_themeSkin span.mce_visualaid {background-position:-660px 0}
-.wp_themeSkin span.mce_paste {background-position:-560px 0}
-.wp_themeSkin span.mce_copy {background-position:-700px 0}
-.wp_themeSkin span.mce_cut {background-position:-680px 0}
-.wp_themeSkin .mce_backcolor span.mceAction {background-position:-760px 0}
-.wp_themeSkin .mce_backcolorpicker {background-position:-760px 0}
-
-/* Plugins */
-.wp_themeSkin span.mce_advhr {background-position:-0px -20px}
-.wp_themeSkin span.mce_ltr {background-position:-20px -20px}
-.wp_themeSkin span.mce_rtl {background-position:-40px -20px}
-.wp_themeSkin span.mce_emotions {background-position:-60px -20px}
-.wp_themeSkin span.mce_fullpage {background-position:-80px -20px}
-.wp_themeSkin span.mce_iespell {background-position:-120px -20px}
-.wp_themeSkin span.mce_insertdate {background-position:-140px -20px}
-.wp_themeSkin span.mce_inserttime {background-position:-160px -20px}
-.wp_themeSkin span.mce_absolute {background-position:-180px -20px}
-.wp_themeSkin span.mce_backward {background-position:-200px -20px}
-.wp_themeSkin span.mce_forward {background-position:-220px -20px}
-.wp_themeSkin span.mce_insert_layer {background-position:-240px -20px}
-.wp_themeSkin span.mce_insertlayer {background-position:-260px -20px}
-.wp_themeSkin span.mce_movebackward {background-position:-280px -20px}
-.wp_themeSkin span.mce_moveforward {background-position:-300px -20px}
-.wp_themeSkin span.mce_media {background-position:-320px -20px}
-.wp_themeSkin span.mce_nonbreaking {background-position:-340px -20px}
-.wp_themeSkin span.mce_selectall {background-position:-400px -20px}
-.wp_themeSkin span.mce_preview {background-position:-420px -20px}
-.wp_themeSkin span.mce_print {background-position:-440px -20px}
-.wp_themeSkin span.mce_cancel {background-position:-460px -20px}
-.wp_themeSkin span.mce_save {background-position:-480px -20px}
-.wp_themeSkin span.mce_replace {background-position:-500px -20px}
-.wp_themeSkin span.mce_search {background-position:-520px -20px}
-.wp_themeSkin span.mce_styleprops {background-position:-560px -20px}
-.wp_themeSkin span.mce_table {background-position:-580px -20px}
-.wp_themeSkin span.mce_cell_props {background-position:-600px -20px}
-.wp_themeSkin span.mce_delete_table {background-position:-620px -20px}
-.wp_themeSkin span.mce_delete_col {background-position:-640px -20px}
-.wp_themeSkin span.mce_delete_row {background-position:-660px -20px}
-.wp_themeSkin span.mce_col_after {background-position:-680px -20px}
-.wp_themeSkin span.mce_col_before {background-position:-700px -20px}
-.wp_themeSkin span.mce_row_after {background-position:-720px -20px}
-.wp_themeSkin span.mce_row_before {background-position:-740px -20px}
-.wp_themeSkin span.mce_merge_cells {background-position:-760px -20px}
-.wp_themeSkin span.mce_table_props {background-position:-980px -20px}
-.wp_themeSkin span.mce_row_props {background-position:-780px -20px}
-.wp_themeSkin span.mce_split_cells {background-position:-800px -20px}
-.wp_themeSkin span.mce_template {background-position:-820px -20px}
-.wp_themeSkin span.mce_visualchars {background-position:-840px -20px}
-.wp_themeSkin span.mce_abbr {background-position:-860px -20px}
-.wp_themeSkin span.mce_acronym {background-position:-880px -20px}
-.wp_themeSkin span.mce_attribs {background-position:-900px -20px}
-.wp_themeSkin span.mce_cite {background-position:-920px -20px}
-.wp_themeSkin span.mce_del {background-position:-940px -20px}
-.wp_themeSkin span.mce_ins {background-position:-960px -20px}
-.wp_themeSkin span.mce_pagebreak {background-position:0 -40px}
-.wp_themeSkin span.mce_restoredraft {background-position:-20px -40px}
-.wp_themeSkin span.mce_visualblocks {background-position: -40px -40px}
-
-/* border */
-.wp_themeSkin .mceExternalToolbar,
-.wp_themeSkin .mceButton,
-.wp_themeSkin a.mceButtonEnabled:hover,
-.wp_themeSkin a.mceButtonActive,
-.wp_themeSkin a.mceButtonSelected,
-.wp_themeSkin .mceListBox .mceText,
-.wp_themeSkin .mceListBox .mceOpen,
-.wp_themeSkin select.mceListBox,
-.wp_themeSkin .mceSplitButton a.mceAction,
-.wp_themeSkin .mceSplitButton a.mceOpen,
-.wp_themeSkin .mceSplitButton a.mceOpen:hover,
-.wp_themeSkin .mceSplitButtonSelected a.mceOpen,
-.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction,
-.wp_themeSkin .mceSplitButton a.mceAction:hover,
-.wp_themeSkin div.mceColorSplitMenu table,
-.wp_themeSkin .mceColorSplitMenu a,
-.wp_themeSkin .mceColorSplitMenu a.mceMoreColors,
-.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover,
-.wp_themeSkin a.mceMoreColors:hover,
-.wp_themeSkin .mceMenu {
-       border-style: solid;
-       border-width: 1px;
-}
-
-.wp_themeSkin .mceListBox .mceText {
-       border-right: 0 none;
-}
-
-.wp_themeSkin iframe {
-       background: transparent;
-}
-
-.wp_themeSkin .mceButton {
-       border-color: transparent;
-}
-
-.wp_themeSkin .mceListBox .mceText,
-.wp_themeSkin .mceListBox .mceOpen {
-       border-color: transparent;
-}
-
-.wp_themeSkin a.mceButtonEnabled:hover,
-.wp_themeSkin table.mceSplitButton:hover {
-       border-color: #bbb;
-       background: #eee;
-       background-image: -webkit-gradient(linear, left bottom, left top, from(#e5e5e5), to(#fff));
-       background-image: -webkit-linear-gradient(bottom, #e5e5e5, #fff);
-       background-image:    -moz-linear-gradient(bottom, #e5e5e5, #fff);
-       background-image:      -o-linear-gradient(bottom, #e5e5e5, #fff);
-       background-image: linear-gradient(to top, #e5e5e5, #fff);
-}
-
-.wp_themeSkin a.mceButton:active,
-.wp_themeSkin a.mceButtonEnabled:active,
-.wp_themeSkin a.mceButtonSelected:active,
-.wp_themeSkin a.mceButtonActive,
-.wp_themeSkin a.mceButtonActive:active,
-.wp_themeSkin a.mceButtonActive:hover,
-.wp_themeSkin .mceSplitButtonSelected table,
-.wp_themeSkin .mceSplitButtonSelected table:hover {
-       outline: none;
-       border-color: #999 #ccc #ccc #999;
-       background: #eee;
-       background-image: -webkit-gradient(linear, left bottom, left top, from(#f6f6f6), to(#e3e3e3));
-       background-image: -webkit-linear-gradient(bottom, #f6f6f6, #e3e3e3);
-       background-image:    -moz-linear-gradient(bottom, #f6f6f6, #e3e3e3);
-       background-image:      -o-linear-gradient(bottom, #f6f6f6, #e3e3e3);
-       background-image: linear-gradient(to top, #f6f6f6, #e3e3e3);
-}
-
-.wp_themeSkin .mceSplitButtonSelected table a.mceOpen,
-.wp_themeSkin .mceSplitButtonSelected table a.mceAction {
-       border-color: #999 #ccc #ccc #999;
-}
-
-.wp_themeSkin .mceButtonDisabled {
-       border-color: transparent;
-}
-
-.wp_themeSkin .mceListBox .mceOpen {
-       border-left: 0;
-}
-
-.wp_themeSkin .mceListBoxEnabled:hover,
-.wp_themeSkin .mceListBoxEnabled:active,
-.wp_themeSkin .mceListBoxHover,
-.wp_themeSkin .mceListBoxHover:active,
-.wp_themeSkin .mceListBoxSelected {
-       -webkit-box-shadow: inset 0 1px 1px -1px rgba(0, 0, 0, .3);
-       box-shadow:         inset 0 1px 1px -1px rgba(0, 0, 0, .3);
-       border-color: #bbb;
-}
-
-/* SplitButton */
-.wp_themeSkin .mceSplitButton .mceLast span.mceOpen .mceIconOnly {
-       display: block;
-}
-
-.wp_themeSkin .mceSplitButton a.mceAction,
-.wp_themeSkin .mceSplitButton a.mceOpen {
-       border-color: transparent;
-}
-
-.wp_themeSkin .mceSplitButton:hover a {
-       border-color: #bbb;
-}
-
-.wp_themeSkin .mceSplitButtonEnabled a.mceOpen,
-.wp_themeSkin .mceSplitButtonSelected a.mceOpen,
-.wp_themeSkin .mceSplitButtonActive a.mceOpen,
-.wp_themeSkin .mceSplitButtonEnabled:hover a.mceOpen {
-       background-image: url("../images/down_arrow.gif");
-       background-position: 1px 2px;
-       background-repeat: no-repeat;
-       border-left: 0;
-}
-
-.wp_themeSkin .mceSplitButtonActive td {
-       -webkit-border-radius: 3px;
-       border-radius: 3px;
-}
-
-.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover {
-       border-color: #0A246A;
-       background-color: #B6BDD2;
-}
-
-.wp_themeSkin a.mceMoreColors:hover {
-       border-color: #0A246A;
-}
-
-.wp_themeSkin .mceMenuItemDisabled .mceText {
-       color: #888;
-}
-
-#mceModalBlocker {
-       background: #000;
-       opacity: 0.7;
-       -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
-       filter: alpha(opacity=70);
-}
-
-/* WP specific */
</del><ins>+/* Editors */
</ins><span class="cx"> .wp-editor-wrap {
</span><span class="cx">  position: relative;
</span><span class="cx"> }
</span><span class="lines">@@ -1285,6 +404,7 @@
</span><span class="cx">  content: '\f104';
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+/* Quicktags */
</ins><span class="cx"> .quicktags-toolbar {
</span><span class="cx">  border-bottom-style: solid;
</span><span class="cx">  border-bottom-width: 1px;
</span><span class="lines">@@ -1879,6 +999,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /* TinyMCE modal */
</span><ins>+/* TODO: restyle the TinyMCE 4.0 modals
</ins><span class="cx"> .clearlooks2 .mceTop {
</span><span class="cx">  border-bottom: 1px solid #ccc;
</span><span class="cx"> }
</span><span class="lines">@@ -1946,7 +1067,7 @@
</span><span class="cx">  color: #999;
</span><span class="cx">  padding-left: 12px;
</span><span class="cx"> }
</span><del>-
</del><ins>+*/
</ins><span class="cx"> /* Distraction Free Writing mode
</span><span class="cx">  * =Overlay Styles
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="lines">@@ -1961,8 +1082,8 @@
</span><span class="cx">  filter: inherit;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.fullscreen-active .fullscreen-overlay,
-.fullscreen-active #wp-fullscreen-body {
</del><ins>+.wp-fullscreen-active .fullscreen-overlay,
+.wp-fullscreen-active #wp-fullscreen-body {
</ins><span class="cx">   display: block;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1970,76 +1091,76 @@
</span><span class="cx">  z-index: 200000;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.fullscreen-active .fullscreen-fader {
</del><ins>+.wp-fullscreen-active .fullscreen-fader {
</ins><span class="cx">   display: none;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /* =Overlay Body
</span><span class="cx"> -------------------------------------------------------------- */
</span><ins>+
</ins><span class="cx"> #wp-fullscreen-body {
</span><del>-       width: 100%;
</del><span class="cx">   z-index: 150005;
</span><span class="cx">  display: none;
</span><ins>+}
+
+.wp-fullscreen-wrap {
+       margin: 0;
+       padding: 0;
</ins><span class="cx">   position: absolute;
</span><del>-       top: 0;
</del><span class="cx">   left: 0;
</span><del>-       font-size: 12px;
</del><ins>+        right: 0;
+       bottom: 30px;
+       top: 60px;
+       z-index: 150010;
+       
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-#wp-fullscreen-wrap {
-       margin: 0 auto 50px;
-       position: relative;
-       padding-top: 60px;
</del><ins>+.wp-fullscreen-wrap .wp-editor-container,
+#wp-fullscreen-central-toolbar {
+       max-width: 100%;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-#wp-fullscreen-title {
-       font-size: 1.7em;
-       line-height: 100%;
-       outline: medium none;
-       padding: 6px 7px;
-       width: 100%;
-       margin-bottom: 30px;
-       -webkit-box-shadow: none;
-       box-shadow: none;
</del><ins>+.wp-fullscreen-active .wp-editor-tools,
+.wp-fullscreen-active .quicktags-toolbar,
+.wp-fullscreen-active .mce-toolbar-grp,
+.wp-fullscreen-active .mce-statusbar {
+       display: none;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-#wp-fullscreen-container {
-       padding: 4px 10px 50px;
</del><ins>+#wp-fullscreen-status {
+       margin: auto;
+       -webkit-transition: opacity 0.4s;
+       transition: opacity 0.4s;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-#wp-fullscreen-title,
-#wp-fullscreen-container {
</del><ins>+.wp-fullscreen-active .wp-fullscreen-title,
+.wp-fullscreen-active .wp-fullscreen-title:focus,
+.wp-fullscreen-active .wp-editor-container {
</ins><span class="cx">   -webkit-border-radius: 0;
</span><span class="cx">  border-radius: 0;
</span><span class="cx">  border: 1px dashed transparent;
</span><span class="cx">  background: transparent;
</span><del>-       -moz-transition-property: border-color;
-       -moz-transition-duration: 0.6s;
-       -webkit-transition-property: border-color;
-       -webkit-transition-duration: 0.6s;
-       -o-transition-property: border-color;
-       -o-transition-duration: 0.6s;
-       transition-property: border-color;
-       transition-duration: 0.6s;
-}
-
-#wp_mce_fullscreen {
-       width: 100%;
-       min-height: 300px;
-       border: 0;
-       background: transparent;
-       font-family: Consolas, Monaco, monospace;
-       line-height: 1.6em;
-       padding: 0;
-       overflow-y: hidden;
-       outline: none;
-       resize: none;
</del><span class="cx">   -webkit-box-shadow: none;
</span><span class="cx">  box-shadow: none;
</span><ins>+       -webkit-transition: border-color 0.4s;
+       transition: border-color 0.4s;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.wp-fullscreen-active .wp-editor-container {
+       margin: auto;
+}
+
+.wp-fullscreen-active .wp-fullscreen-title {
+       font-size: 1.7em;
+       line-height: 100%;
+       outline: medium none;
+       padding: 3px 7px;
+       margin: 10px auto 30px;
+       display: block;
+}
+
</ins><span class="cx"> #wp-fullscreen-tagline {
</span><del>-       color: #BBBBBB;
</del><ins>+        color: #bbb;
</ins><span class="cx">   font-size: 18px;
</span><span class="cx">  float: right;
</span><span class="cx">  padding-top: 5px;
</span><span class="lines">@@ -2050,20 +1171,21 @@
</span><span class="cx"> #fullscreen-topbar {
</span><span class="cx">  background: #f5f5f5;
</span><span class="cx">  border-bottom: 1px solid #fff;
</span><del>-       height: 40px;
</del><ins>+        height: 45px;
+       position: fixed;
</ins><span class="cx">   left: 0;
</span><del>-       min-width: 800px;
-       position: fixed;
</del><ins>+        right: 0;
</ins><span class="cx">   top: 0;
</span><span class="cx">  width: 100%;
</span><span class="cx">  z-index: 150050;
</span><ins>+       -webkit-transition: opacity 0.4s;
+       transition: opacity 0.4s;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #wp-fullscreen-toolbar {
</span><span class="cx">  padding: 6px 10px 0;
</span><span class="cx">  clear: both;
</span><span class="cx">  max-width: 1100px;
</span><del>-       min-width: 820px;
</del><span class="cx">   margin: 0 auto;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -2074,6 +1196,10 @@
</span><span class="cx">  float: left;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#wp-fullscreen-button-bar {
+       margin-top: 2px;
+}
+
</ins><span class="cx"> #wp-fullscreen-save {
</span><span class="cx">  float: right;
</span><span class="cx">  padding: 2px 2px 0 5px;
</span><span class="lines">@@ -2081,7 +1207,7 @@
</span><span class="cx"> 
</span><span class="cx"> #wp-fullscreen-count,
</span><span class="cx"> #wp-fullscreen-close {
</span><del>-       padding-top: 5px;
</del><ins>+        padding-top: 6px;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #wp-fullscreen-central-toolbar {
</span><span class="lines">@@ -2094,7 +1220,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #wp-fullscreen-mode-bar {
</span><del>-       padding: 1px 14px 0 0;
</del><ins>+        padding: 3px 14px 0 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #wp-fullscreen-modes a {
</span><span class="lines">@@ -2146,10 +1272,6 @@
</span><span class="cx">  border-bottom-right-radius: 3px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#wp-fullscreen-buttons .active a {
-       background: inherit;
-}
-
</del><span class="cx"> #wp-fullscreen-buttons .hidden {
</span><span class="cx">  display: none;
</span><span class="cx"> }
</span><span class="lines">@@ -2158,6 +1280,23 @@
</span><span class="cx">  opacity: 0.5;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#wp-fullscreen-buttons .mce-btn button {
+    margin: 0;
+    outline: 0 none;
+    border: 0 none;
+    white-space: nowrap;
+    width: auto;
+    background: none;
+       color: #333333;
+    cursor: pointer;
+    font-size: 18px;
+    line-height: 20px;
+    overflow: visible;
+    text-align: center;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
</ins><span class="cx"> .wp-html-mode #wp-fullscreen-buttons div {
</span><span class="cx">  display: none;
</span><span class="cx"> }
</span><span class="lines">@@ -2166,10 +1305,6 @@
</span><span class="cx">  display: block;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#fullscreen-topbar.fullscreen-make-sticky {
-       display: block !important;
-}
-
</del><span class="cx"> #wp-fullscreen-save img {
</span><span class="cx">  vertical-align: middle;
</span><span class="cx"> }
</span><span class="lines">@@ -2177,82 +1312,94 @@
</span><span class="cx"> #wp-fullscreen-save img,
</span><span class="cx"> #wp-fullscreen-save span {
</span><span class="cx">  padding-right: 4px;
</span><ins>+       line-height: 26px;
</ins><span class="cx">   display: none;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /* =Thickbox Adjustments
</span><span class="cx"> -------------------------------------------------------------- */
</span><del>-.fullscreen-active #TB_overlay {
</del><ins>+.wp-fullscreen-active #TB_overlay {
</ins><span class="cx">   z-index: 150100;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.fullscreen-active #TB_window {
</del><ins>+.wp-fullscreen-active #TB_window {
</ins><span class="cx">   z-index: 150102;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /* =TinyMCE Adjustments
</span><span class="cx"> -------------------------------------------------------------- */
</span><del>-#wp_mce_fullscreen_ifr {
-       background: transparent;
</del><ins>+.wp-fullscreen-active #mce-modal-block {
+       z-index: 150100 !important;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-#wp_mce_fullscreen_parent #wp_mce_fullscreen_tbl tr.mceFirst {
-       display : none;
</del><ins>+.wp-fullscreen-active .mce-window {
+       z-index: 150102 !important;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-#wp-fullscreen-container .wp_themeSkin table td {
-       vertical-align: top;
-}
-
</del><span class="cx"> /* Colors */
</span><span class="cx"> .fullscreen-overlay {
</span><span class="cx">  background: #fff;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wp-fullscreen-focus #wp-fullscreen-title,
-.wp-fullscreen-focus #wp-fullscreen-container {
</del><ins>+/* =CSS 3 transitions
+-------------------------------------------------------------- */
+
+.wp-fullscreen-active #wp-fullscreen-status,
+.wp-fullscreen-active #fullscreen-topbar {
+       -webkit-transition-duration: 0.8s;
+       transition-duration: 0.8s;
+       opacity: 0;
+       filter: alpha(opacity=0);
+}
+
+.wp-fullscreen-active.wp-dfw-show-ui #wp-fullscreen-status,
+.wp-fullscreen-active.wp-dfw-show-ui #fullscreen-topbar {
+       -webkit-transition-duration: 0.4s;
+       transition-duration: 0.4s;
+       opacity: 1;
+       filter: alpha(opacity=100);
+}
+
+.wp-fullscreen-active .wp-fullscreen-title,
+.wp-fullscreen-active .wp-editor-container {
+       -webkit-transition-duration: 0.8s;
+       transition-duration: 0.8s;
+       border-color: transparent;
+}
+
+.wp-fullscreen-active.wp-dfw-show-ui .wp-fullscreen-title,
+.wp-fullscreen-active.wp-dfw-show-ui .wp-editor-container {
+       -webkit-transition-duration: 0.4s;
+       transition-duration: 0.4s;
</ins><span class="cx">   border-color: #ccc;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-/* =CSS 3 transitions
--------------------------------------------------------------- */
-
</del><span class="cx"> .fade-1000,
</span><span class="cx"> .fade-600,
</span><span class="cx"> .fade-400,
</span><span class="cx"> .fade-300 {
</span><span class="cx">  opacity: 0;
</span><del>-       -moz-transition-property: opacity;
</del><span class="cx">   -webkit-transition-property: opacity;
</span><del>-       -o-transition-property: opacity;
</del><span class="cx">   transition-property: opacity;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .fade-1000 {
</span><del>-       -moz-transition-duration: 1s;
</del><span class="cx">   -webkit-transition-duration: 1s;
</span><del>-       -o-transition-duration: 1s;
</del><span class="cx">   transition-duration: 1s;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .fade-600 {
</span><del>-       -moz-transition-duration: 0.6s;
</del><span class="cx">   -webkit-transition-duration: 0.6s;
</span><del>-       -o-transition-duration: 0.6s;
</del><span class="cx">   transition-duration: 0.6s;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .fade-400 {
</span><del>-       -moz-transition-duration: 0.4s;
</del><span class="cx">   -webkit-transition-duration: 0.4s;
</span><del>-       -o-transition-duration: 0.4s;
</del><span class="cx">   transition-duration: 0.4s;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .fade-300 {
</span><del>-       -moz-transition-duration: 0.3s;
</del><span class="cx">   -webkit-transition-duration: 0.3s;
</span><del>-       -o-transition-duration: 0.3s;
</del><span class="cx">   transition-duration: 0.3s;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -2262,21 +1409,13 @@
</span><span class="cx"> 
</span><span class="cx"> /* =Localization
</span><span class="cx"> -------------------------------------------------------------- */
</span><del>-.rtl .wp_themeSkin .mceColorSplitMenu a.mceMoreColors,
-.rtl .wp_themeSkin .mceMenu .mceText,
</del><span class="cx"> .rtl .wp-switch-editor,
</span><del>-.rtl .quicktags-toolbar input,
-.rtl .clearlooks2 .mceTop span,
-.rtl .wp_themeSkin .mceColorSplitMenu a.mceMoreColors {
</del><ins>+.rtl .quicktags-toolbar input {
</ins><span class="cx">   font-family: Tahoma, sans-serif;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-html:lang(he-il) .rtl .wp_themeSkin .mceColorSplitMenu a.mceMoreColors,
-html:lang(he-il) .rtl .wp_themeSkin .mceMenu .mceText,
</del><span class="cx"> html:lang(he-il) .rtl .wp-switch-editor,
</span><del>-html:lang(he-il) .rtl .quicktags-toolbar input,
-html:lang(he-il) .rtl .clearlooks2 .mceTop span,
-html:lang(he-il) .rtl .wp_themeSkin .mceColorSplitMenu a.mceMoreColors  {
</del><ins>+html:lang(he-il) .rtl .quicktags-toolbar input  {
</ins><span class="cx">   font-family: Arial, sans-serif;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -2291,24 +1430,12 @@
</span><span class="cx">          background: none;
</span><span class="cx">  }
</span><span class="cx"> 
</span><del>-       .wp_themeSkin .mceListBox .mceOpen,
-       .wp_themeSkin .mceListBoxHover .mceOpen,
-       .wp_themeSkin .mceListBoxSelected .mceOpen,
-       .wp_themeSkin table.mceListBoxEnabled .mceOpen {
-               background-image: url('../images/down_arrow-2x.gif');
-               background-size: 10px 20px;
-       }
-
-       .wp_themeSkin .mceSplitButtonEnabled a.mceOpen,
-       .wp_themeSkin .mceSplitButtonSelected a.mceOpen,
-       .wp_themeSkin .mceSplitButtonActive a.mceOpen,
-       .wp_themeSkin .mceSplitButtonEnabled:hover a.mceOpen {
-               background-image: url('../images/down_arrow-2x.gif');
-               background-size: 10px 20px;
-       }
-
</del><span class="cx">   #wp-link .toggle-arrow {
</span><span class="cx">          background: transparent url('../images/toggle-arrow-2x.png') top left no-repeat;
</span><span class="cx">          background-size: 19px 69px;
</span><span class="cx">  }
</span><span class="cx"> }
</span><ins>+
+/* TODO: DFW responsive */
+
+
</ins></span></pre></div>
<a id="trunksrcwpincludesjsautosavejs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/autosave.js (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/autosave.js     2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-includes/js/autosave.js        2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -43,23 +43,13 @@
</span><span class="cx">  });
</span><span class="cx"> 
</span><span class="cx">  window.onbeforeunload = function(){
</span><del>-               var editor = typeof(tinymce) != 'undefined' ? tinymce.activeEditor : false, compareString;
</del><ins>+                var editor = typeof(tinymce) != 'undefined' ? tinymce.activeEditor : false;
</ins><span class="cx"> 
</span><span class="cx">          if ( editor && ! editor.isHidden() ) {
</span><span class="cx">                  if ( editor.isDirty() )
</span><span class="cx">                          return autosaveL10n.saveAlert;
</span><span class="cx">          } else {
</span><del>-                       if ( fullscreen && fullscreen.settings.visible ) {
-                               compareString = wp.autosave.getCompareString({
-                                       post_title: $('#wp-fullscreen-title').val() || '',
-                                       content: $('#wp_mce_fullscreen').val() || '',
-                                       excerpt: $('#excerpt').val() || ''
-                               });
-                       } else {
-                               compareString = wp.autosave.getCompareString();
-                       }
-
-                       if ( compareString != autosaveLast )
</del><ins>+                        if ( wp.autosave.getCompareString() != autosaveLast )
</ins><span class="cx">                           return autosaveL10n.saveAlert;
</span><span class="cx">          }
</span><span class="cx">  };
</span><span class="lines">@@ -115,25 +105,23 @@
</span><span class="cx">  };
</span><span class="cx"> 
</span><span class="cx">  // This code is meant to allow tabbing from Title to Post content.
</span><del>-       $('#title').on('keydown.editor-focus', function(e) {
-               var ed;
</del><ins>+        $('#title').on( 'keydown.editor-focus', function( event ) {
+               var editor;
</ins><span class="cx"> 
</span><del>-               if ( e.which != 9 )
-                       return;
</del><ins>+                if ( event.which === 9 && ! event.ctrlKey && ! event.altKey && ! event.shiftKey ) {
+                       if ( typeof tinymce !== 'undefined' ) {
+                               editor = tinymce.get('content');
+                       }
</ins><span class="cx"> 
</span><del>-               if ( !e.ctrlKey && !e.altKey && !e.shiftKey ) {
-                       if ( typeof(tinymce) != 'undefined' )
-                               ed = tinymce.get('content');
-
-                       if ( ed && !ed.isHidden() ) {
-                               $(this).one('keyup', function(){
-                                       $('#content_tbl td.mceToolbar > a').focus();
</del><ins>+                        if ( editor && ! editor.isHidden() ) {
+                               $(this).one( 'keyup', function() {
+                                       editor.focus();
</ins><span class="cx">                           });
</span><span class="cx">                  } else {
</span><span class="cx">                          $('#content').focus();
</span><span class="cx">                  }
</span><span class="cx"> 
</span><del>-                       e.preventDefault();
</del><ins>+                        event.preventDefault();
</ins><span class="cx">           }
</span><span class="cx">  });
</span><span class="cx"> 
</span><span class="lines">@@ -345,20 +333,12 @@
</span><span class="cx">                  data.autosave = false;
</span><span class="cx">                  return data;
</span><span class="cx">          } else {
</span><del>-                       if ( 'mce_fullscreen' == ed.id )
-                               tinymce.get('content').setContent(ed.getContent({format : 'raw'}), {format : 'raw'});
-
</del><span class="cx">                   tinymce.triggerSave();
</span><span class="cx">          }
</span><span class="cx">  }
</span><span class="cx"> 
</span><del>-       if ( typeof fullscreen != 'undefined' && fullscreen.settings.visible ) {
-               data.post_title = $('#wp-fullscreen-title').val() || '';
-               data.content = $('#wp_mce_fullscreen').val() || '';
-       } else {
-               data.post_title = $('#title').val() || '';
-               data.content = $('#content').val() || '';
-       }
</del><ins>+        data.post_title = $('#title').val() || '';
+       data.content = $('#content').val() || '';
</ins><span class="cx"> 
</span><span class="cx">  /*
</span><span class="cx">  // We haven't been saving tags with autosave since 2.8... Start again?
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaeditorjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-editor.js (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-editor.js 2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-includes/js/media-editor.js    2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -466,16 +466,13 @@
</span><span class="cx">                                  return false;
</span><span class="cx">                          }
</span><span class="cx">                  } else if ( mce ) {
</span><del>-                               if ( tinymce.activeEditor && (tinymce.activeEditor.id == 'mce_fullscreen' || tinymce.activeEditor.id == 'wp_mce_fullscreen') )
-                                       ed = tinymce.activeEditor;
-                               else
-                                       ed = tinymce.get(wpActiveEditor);
</del><ins>+                                ed = tinymce.get( wpActiveEditor );
</ins><span class="cx">                   }
</span><span class="cx"> 
</span><del>-                       if ( ed && !ed.isHidden() ) {
</del><ins>+                        if ( ed && ! ed.isHidden() ) {
</ins><span class="cx">                           // restore caret position on IE
</span><del>-                               if ( tinymce.isIE && ed.windowManager.insertimagebookmark )
-                                       ed.selection.moveToBookmark(ed.windowManager.insertimagebookmark);
</del><ins>+        //                      if ( tinymce.isIE && ed.windowManager.insertimagebookmark )
+       //                              ed.selection.moveToBookmark(ed.windowManager.insertimagebookmark);
</ins><span class="cx"> 
</span><span class="cx">                          if ( h.indexOf('[caption') !== -1 ) {
</span><span class="cx">                                  if ( ed.wpSetImgCaption )
</span><span class="lines">@@ -664,7 +661,7 @@
</span><span class="cx">                  options = options || {};
</span><span class="cx"> 
</span><span class="cx">                  id = this.id( id );
</span><del>-
</del><ins>+/*
</ins><span class="cx">                   // Save a bookmark of the caret position in IE.
</span><span class="cx">                  if ( typeof tinymce !== 'undefined' ) {
</span><span class="cx">                          editor = tinymce.get( id );
</span><span class="lines">@@ -674,7 +671,7 @@
</span><span class="cx">                                  editor.windowManager.insertimagebookmark = editor.selection.getBookmark();
</span><span class="cx">                          }
</span><span class="cx">                  }
</span><del>-
</del><ins>+*/
</ins><span class="cx">                   workflow = this.get( id );
</span><span class="cx"> 
</span><span class="cx">                  // Redo workflow if state has changed
</span></span></pre></div>
<a id="trunksrcwpincludesjsquicktagsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/quicktags.js (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/quicktags.js    2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-includes/js/quicktags.js       2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -185,6 +185,9 @@
</span><span class="cx">          tb = document.createElement('div');
</span><span class="cx">          tb.id = toolbar_id;
</span><span class="cx">          tb.className = 'quicktags-toolbar';
</span><ins>+               tb.onclick = function() {
+                       window.wpActiveEditor = id;
+               };
</ins><span class="cx"> 
</span><span class="cx">          canvas.parentNode.insertBefore(tb, canvas);
</span><span class="cx">          t.toolbar = tb;
</span><span class="lines">@@ -563,8 +566,8 @@
</span><span class="cx">  qt.LinkButton.prototype.callback = function(e, c, ed, defaultValue) {
</span><span class="cx">          var URL, t = this;
</span><span class="cx"> 
</span><del>-               if ( typeof(wpLink) !== 'undefined' ) {
-                       wpLink.open();
</del><ins>+                if ( typeof wpLink !== 'undefined' ) {
+                       wpLink.open( ed.id );
</ins><span class="cx">                   return;
</span><span class="cx">          }
</span><span class="cx"> 
</span><span class="lines">@@ -605,11 +608,11 @@
</span><span class="cx">  };
</span><span class="cx">  qt.FullscreenButton.prototype = new qt.Button();
</span><span class="cx">  qt.FullscreenButton.prototype.callback = function(e, c) {
</span><del>-               if ( !c.id || typeof(fullscreen) === 'undefined' ) {
</del><ins>+                if ( ! c.id || typeof wp === 'undefined' || ! wp.editor || ! wp.editor.fullscreen ) {
</ins><span class="cx">                   return;
</span><span class="cx">          }
</span><span class="cx"> 
</span><del>-               fullscreen.on();
</del><ins>+                wp.editor.fullscreen.on();
</ins><span class="cx">   };
</span><span class="cx"> 
</span><span class="cx">  qt.TextDirectionButton = function() {
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcelangswplangsenjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/langs/wp-langs-en.js (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/langs/wp-langs-en.js    2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-includes/js/tinymce/langs/wp-langs-en.js       2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -1,504 +1,519 @@
</span><del>-tinyMCE.addI18n({en:{
-common:{
-edit_confirm:"Do you want to use the WYSIWYG mode for this textarea?",
-apply:"Apply",
-insert:"Insert",
-update:"Update",
-cancel:"Cancel",
-close:"Close",
-browse:"Browse",
-class_name:"Class",
-not_set:"-- Not set --",
-clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.",
-clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.",
-popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.",
-invalid_data:"ERROR: Invalid values entered, these are marked in red.",
-invalid_data_number:"{#field} must be a number",
-invalid_data_min:"{#field} must be a number greater than {#min}",
-invalid_data_size:"{#field} must be a number or percentage",
-more_colors:"More colors"
-},
-colors:{
-"000000":"Black",
-"993300":"Burnt orange",
-"333300":"Dark olive",
-"003300":"Dark green",
-"003366":"Dark azure",
-"000080":"Navy Blue",
-"333399":"Indigo",
-"333333":"Very dark gray",
-"800000":"Maroon",
-"FF6600":"Orange",
-"808000":"Olive",
-"008000":"Green",
-"008080":"Teal",
-"0000FF":"Blue",
-"666699":"Grayish blue",
-"808080":"Gray",
-"FF0000":"Red",
-"FF9900":"Amber",
-"99CC00":"Yellow green",
-"339966":"Sea green",
-"33CCCC":"Turquoise",
-"3366FF":"Royal blue",
-"800080":"Purple",
-"999999":"Medium gray",
-"FF00FF":"Magenta",
-"FFCC00":"Gold",
-"FFFF00":"Yellow",
-"00FF00":"Lime",
-"00FFFF":"Aqua",
-"00CCFF":"Sky blue",
-"993366":"Brown",
-"C0C0C0":"Silver",
-"FF99CC":"Pink",
-"FFCC99":"Peach",
-"FFFF99":"Light yellow",
-"CCFFCC":"Pale green",
-"CCFFFF":"Pale cyan",
-"99CCFF":"Light sky blue",
-"CC99FF":"Plum",
-"FFFFFF":"White"
-},
-contextmenu:{
-align:"Alignment",
-left:"Left",
-center:"Center",
-right:"Right",
-full:"Full"
-},
-insertdatetime:{
-date_fmt:"%Y-%m-%d",
-time_fmt:"%H:%M:%S",
-insertdate_desc:"Insert date",
-inserttime_desc:"Insert time",
-months_long:"January,February,March,April,May,June,July,August,September,October,November,December",
-months_short:"Jan_January_abbreviation,Feb_February_abbreviation,Mar_March_abbreviation,Apr_April_abbreviation,May_May_abbreviation,Jun_June_abbreviation,Jul_July_abbreviation,Aug_August_abbreviation,Sep_September_abbreviation,Oct_October_abbreviation,Nov_November_abbreviation,Dec_December_abbreviation",
-day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday",
-day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat"
-},
-print:{
-print_desc:"Print"
-},
-preview:{
-preview_desc:"Preview"
-},
-directionality:{
-ltr_desc:"Direction left to right",
-rtl_desc:"Direction right to left"
-},
-layer:{
-insertlayer_desc:"Insert new layer",
-forward_desc:"Move forward",
-backward_desc:"Move backward",
-absolute_desc:"Toggle absolute positioning",
-content:"New layer..."
-},
-save:{
-save_desc:"Save",
-cancel_desc:"Cancel all changes"
-},
-nonbreaking:{
-nonbreaking_desc:"Insert non-breaking space character"
-},
-iespell:{
-iespell_desc:"Run spell checking",
-download:"ieSpell not detected. Do you want to install it now?"
-},
-advhr:{
-advhr_desc:"Horizontal rule"
-},
-emotions:{
-emotions_desc:"Emotions"
-},
-searchreplace:{
-search_desc:"Find",
-replace_desc:"Find/Replace"
-},
-advimage:{
-image_desc:"Insert/edit image"
-},
-advlink:{
-link_desc:"Insert/edit link"
-},
-xhtmlxtras:{
-cite_desc:"Citation",
-abbr_desc:"Abbreviation",
-acronym_desc:"Acronym",
-del_desc:"Deletion",
-ins_desc:"Insertion",
-attribs_desc:"Insert/Edit Attributes"
-},
-style:{
-desc:"Edit CSS Style"
-},
-paste:{
-paste_text_desc:"Paste as Plain Text",
-paste_word_desc:"Paste from Word",
-selectall_desc:"Select All",
-plaintext_mode_sticky:"Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.",
-plaintext_mode:"Paste is now in plain text mode. Click again to toggle back to regular paste mode."
-},
-paste_dlg:{
-text_title:"Use CTRL + V on your keyboard to paste the text into the window.",
-text_linebreaks:"Keep linebreaks",
-word_title:"Use CTRL + V on your keyboard to paste the text into the window."
-},
-table:{
-desc:"Inserts a new table",
-row_before_desc:"Insert row before",
-row_after_desc:"Insert row after",
-delete_row_desc:"Delete row",
-col_before_desc:"Insert column before",
-col_after_desc:"Insert column after",
-delete_col_desc:"Remove column",
-split_cells_desc:"Split merged table cells",
-merge_cells_desc:"Merge table cells",
-row_desc:"Table row properties",
-cell_desc:"Table cell properties",
-props_desc:"Table properties",
-paste_row_before_desc:"Paste table row before",
-paste_row_after_desc:"Paste table row after",
-cut_row_desc:"Cut table row",
-copy_row_desc:"Copy table row",
-del:"Delete table",
-row:"Row",
-col:"Column",
-cell:"Cell"
-},
-autosave:{
-unload_msg:"The changes you made will be lost if you navigate away from this page."
-},
-fullscreen:{
-desc:"Toggle fullscreen mode (Alt + Shift + G)"
-},
-media:{
-desc:"Insert / edit embedded media",
-edit:"Edit embedded media"
-},
-fullpage:{
-desc:"Document properties"
-},
-template:{
-desc:"Insert predefined template content"
-},
-visualchars:{
-desc:"Visual control characters on/off."
-},
-spellchecker:{
-desc:"Toggle spellchecker (Alt + Shift + N)",
-menu:"Spellchecker settings",
-ignore_word:"Ignore word",
-ignore_words:"Ignore all",
-langs:"Languages",
-wait:"Please wait...",
-sug:"Suggestions",
-no_sug:"No suggestions",
-no_mpell:"No misspellings found.",
-learn_word:"Learn word" 
-},
-pagebreak:{
-desc:"Insert Page Break"
-},
-advlist:{
-types:"Types",
-def:"Default",
-lower_alpha:"Lower alpha",
-lower_greek:"Lower greek",
-lower_roman:"Lower roman",
-upper_alpha:"Upper alpha",
-upper_roman:"Upper roman",
-circle:"Circle",
-disc:"Disc",
-square:"Square"
-},
-aria:{
-rich_text_area:"Rich Text Area"
-},
-wordcount:{
-words:"Words: "
-}
-}});
</del><ins>+/**
+ * TinyMCE 3.x language strings
+ *
+ * Loaded only when external plugins are added to TinyMCE.
+ */
+( function() {
+       var main = {}, lang = 'en';
</ins><span class="cx"> 
</span><del>-tinyMCE.addI18n("en.advanced",{
-style_select:"Styles",
-font_size:"Font size",
-fontdefault:"Font family",
-block:"Format",
-paragraph:"Paragraph",
-div:"Div",
-address:"Address",
-pre:"Preformatted",
-h1:"Heading 1",
-h2:"Heading 2",
-h3:"Heading 3",
-h4:"Heading 4",
-h5:"Heading 5",
-h6:"Heading 6",
-blockquote:"Blockquote",
-code:"Code",
-samp:"Code sample",
-dt:"Definition term ",
-dd:"Definition description",
-bold_desc:"Bold (Ctrl + B)",
-italic_desc:"Italic (Ctrl + I)",
-underline_desc:"Underline",
-striketrough_desc:"Strikethrough (Alt + Shift + D)",
-justifyleft_desc:"Align Left (Alt + Shift + L)",
-justifycenter_desc:"Align Center (Alt + Shift + C)",
-justifyright_desc:"Align Right (Alt + Shift + R)",
-justifyfull_desc:"Align Full (Alt + Shift + J)",
-bullist_desc:"Unordered list (Alt + Shift + U)",
-numlist_desc:"Ordered list (Alt + Shift + O)",
-outdent_desc:"Outdent",
-indent_desc:"Indent",
-undo_desc:"Undo (Ctrl + Z)",
-redo_desc:"Redo (Ctrl + Y)",
-link_desc:"Insert/edit link (Alt + Shift + A)",
-unlink_desc:"Unlink (Alt + Shift + S)",
-image_desc:"Insert/edit image (Alt + Shift + M)",
-cleanup_desc:"Cleanup messy code",
-code_desc:"Edit HTML Source",
-sub_desc:"Subscript",
-sup_desc:"Superscript",
-hr_desc:"Insert horizontal ruler",
-removeformat_desc:"Remove formatting",
-forecolor_desc:"Select text color",
-backcolor_desc:"Select background color",
-charmap_desc:"Insert custom character",
-visualaid_desc:"Toggle guidelines/invisible elements",
-anchor_desc:"Insert/edit anchor",
-cut_desc:"Cut",
-copy_desc:"Copy",
-paste_desc:"Paste",
-image_props_desc:"Image properties",
-newdocument_desc:"New document",
-help_desc:"Help",
-blockquote_desc:"Blockquote (Alt + Shift + Q)",
-clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.",
-path:"Path",
-newdocument:"Are you sure you want to clear all contents?",
-toolbar_focus:"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",
-more_colors:"More colors",
-shortcuts_desc:"Accessibility Help",
-help_shortcut:" Press ALT F10 for toolbar. Press ALT 0 for help.",
-rich_text_area:"Rich Text Area",
-toolbar:"Toolbar"
-});
</del><ins>+        if ( typeof tinyMCEPreInit !== 'undefined' && tinyMCEPreInit.ref.language !== 'en' ) {
+               lang = tinyMCEPreInit.ref.language;
+       }
</ins><span class="cx"> 
</span><del>-tinyMCE.addI18n("en.advanced_dlg",{
-about_title:"About TinyMCE",
-about_general:"About",
-about_help:"Help",
-about_license:"License",
-about_plugins:"Plugins",
-about_plugin:"Plugin",
-about_author:"Author",
-about_version:"Version",
-about_loaded:"Loaded plugins",
-anchor_title:"Insert/edit anchor",
-anchor_name:"Anchor name",
-code_title:"HTML Source Editor",
-code_wordwrap:"Word wrap",
-colorpicker_title:"Select a color",
-colorpicker_picker_tab:"Picker",
-colorpicker_picker_title:"Color picker",
-colorpicker_palette_tab:"Palette",
-colorpicker_palette_title:"Palette colors",
-colorpicker_named_tab:"Named",
-colorpicker_named_title:"Named colors",
-colorpicker_color:"Color:",
-colorpicker_name:"Name:",
-charmap_title:"Select custom character",
-charmap_usage:"Use left and right arrows to navigate.",
-image_title:"Insert/edit image",
-image_src:"Image URL",
-image_alt:"Image description",
-image_list:"Image list",
-image_border:"Border",
-image_dimensions:"Dimensions",
-image_vspace:"Vertical space",
-image_hspace:"Horizontal space",
-image_align:"Alignment",
-image_align_baseline:"Baseline",
-image_align_top:"Top",
-image_align_middle:"Middle",
-image_align_bottom:"Bottom",
-image_align_texttop:"Text top",
-image_align_textbottom:"Text bottom",
-image_align_left:"Left",
-image_align_right:"Right",
-link_title:"Insert/edit link",
-link_url:"Link URL",
-link_target:"Target",
-link_target_same:"Open link in the same window",
-link_target_blank:"Open link in a new window",
-link_titlefield:"Title",
-link_is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",
-link_is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?",
-link_list:"Link list",
-accessibility_help:"Accessibility Help",
-accessibility_usage_title:"General Usage"
-});
</del><ins>+        main[lang] = {
+               common: {
+                       edit_confirm: "Do you want to use the WYSIWYG mode for this textarea?",
+                       apply: "Apply",
+                       insert: "Insert",
+                       update: "Update",
+                       cancel: "Cancel",
+                       close: "Close",
+                       browse: "Browse",
+                       class_name: "Class",
+                       not_set: "-- Not set --",
+                       clipboard_msg: "Copy/Cut/Paste is not available in Mozilla and Firefox.",
+                       clipboard_no_support: "Currently not supported by your browser, use keyboard shortcuts instead.",
+                       popup_blocked: "Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.",
+                       invalid_data: "ERROR: Invalid values entered, these are marked in red.",
+                       invalid_data_number: "{#field} must be a number",
+                       invalid_data_min: "{#field} must be a number greater than {#min}",
+                       invalid_data_size: "{#field} must be a number or percentage",
+                       more_colors: "More colors"
+               },
+               colors: {
+                       "000000": "Black",
+                       "993300": "Burnt orange",
+                       "333300": "Dark olive",
+                       "003300": "Dark green",
+                       "003366": "Dark azure",
+                       "000080": "Navy Blue",
+                       "333399": "Indigo",
+                       "333333": "Very dark gray",
+                       "800000": "Maroon",
+                       "FF6600": "Orange",
+                       "808000": "Olive",
+                       "008000": "Green",
+                       "008080": "Teal",
+                       "0000FF": "Blue",
+                       "666699": "Grayish blue",
+                       "808080": "Gray",
+                       "FF0000": "Red",
+                       "FF9900": "Amber",
+                       "99CC00": "Yellow green",
+                       "339966": "Sea green",
+                       "33CCCC": "Turquoise",
+                       "3366FF": "Royal blue",
+                       "800080": "Purple",
+                       "999999": "Medium gray",
+                       "FF00FF": "Magenta",
+                       "FFCC00": "Gold",
+                       "FFFF00": "Yellow",
+                       "00FF00": "Lime",
+                       "00FFFF": "Aqua",
+                       "00CCFF": "Sky blue",
+                       "993366": "Brown",
+                       "C0C0C0": "Silver",
+                       "FF99CC": "Pink",
+                       "FFCC99": "Peach",
+                       "FFFF99": "Light yellow",
+                       "CCFFCC": "Pale green",
+                       "CCFFFF": "Pale cyan",
+                       "99CCFF": "Light sky blue",
+                       "CC99FF": "Plum",
+                       "FFFFFF": "White"
+               },
+               contextmenu: {
+                       align: "Alignment",
+                       left: "Left",
+                       center: "Center",
+                       right: "Right",
+                       full: "Full"
+               },
+               insertdatetime: {
+                       date_fmt: "%Y-%m-%d",
+                       time_fmt: "%H:%M:%S",
+                       insertdate_desc: "Insert date",
+                       inserttime_desc: "Insert time",
+                       months_long: "January,February,March,April,May,June,July,August,September,October,November,December",
+                       months_short: "Jan_January_abbreviation,Feb_February_abbreviation,Mar_March_abbreviation,Apr_April_abbreviation,May_May_abbreviation,Jun_June_abbreviation,Jul_July_abbreviation,Aug_August_abbreviation,Sep_September_abbreviation,Oct_October_abbreviation,Nov_November_abbreviation,Dec_December_abbreviation",
+                       day_long: "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday",
+                       day_short: "Sun,Mon,Tue,Wed,Thu,Fri,Sat"
+               },
+               print: {
+                       print_desc: "Print"
+               },
+               preview: {
+                       preview_desc: "Preview"
+               },
+               directionality: {
+                       ltr_desc: "Direction left to right",
+                       rtl_desc: "Direction right to left"
+               },
+               layer: {
+                       insertlayer_desc: "Insert new layer",
+                       forward_desc: "Move forward",
+                       backward_desc: "Move backward",
+                       absolute_desc: "Toggle absolute positioning",
+                       content: "New layer..."
+               },
+               save: {
+                       save_desc: "Save",
+                       cancel_desc: "Cancel all changes"
+               },
+               nonbreaking: {
+                       nonbreaking_desc: "Insert non-breaking space character"
+               },
+               iespell: {
+                       iespell_desc: "Run spell checking",
+                       download: "ieSpell not detected. Do you want to install it now?"
+               },
+               advhr: {
+                       advhr_desc: "Horizontal rule"
+               },
+               emotions: {
+                       emotions_desc: "Emotions"
+               },
+               searchreplace: {
+                       search_desc: "Find",
+                       replace_desc: "Find/Replace"
+               },
+               advimage: {
+                       image_desc: "Insert/edit image"
+               },
+               advlink: {
+                       link_desc: "Insert/edit link"
+               },
+               xhtmlxtras: {
+                       cite_desc: "Citation",
+                       abbr_desc: "Abbreviation",
+                       acronym_desc: "Acronym",
+                       del_desc: "Deletion",
+                       ins_desc: "Insertion",
+                       attribs_desc: "Insert/Edit Attributes"
+               },
+               style: {
+                       desc: "Edit CSS Style"
+               },
+               paste: {
+                       paste_text_desc: "Paste as Plain Text",
+                       paste_word_desc: "Paste from Word",
+                       selectall_desc: "Select All",
+                       plaintext_mode_sticky: "Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.",
+                       plaintext_mode: "Paste is now in plain text mode. Click again to toggle back to regular paste mode."
+               },
+               paste_dlg: {
+                       text_title: "Use CTRL + V on your keyboard to paste the text into the window.",
+                       text_linebreaks: "Keep linebreaks",
+                       word_title: "Use CTRL + V on your keyboard to paste the text into the window."
+               },
+               table: {
+                       desc: "Inserts a new table",
+                       row_before_desc: "Insert row before",
+                       row_after_desc: "Insert row after",
+                       delete_row_desc: "Delete row",
+                       col_before_desc: "Insert column before",
+                       col_after_desc: "Insert column after",
+                       delete_col_desc: "Remove column",
+                       split_cells_desc: "Split merged table cells",
+                       merge_cells_desc: "Merge table cells",
+                       row_desc: "Table row properties",
+                       cell_desc: "Table cell properties",
+                       props_desc: "Table properties",
+                       paste_row_before_desc: "Paste table row before",
+                       paste_row_after_desc: "Paste table row after",
+                       cut_row_desc: "Cut table row",
+                       copy_row_desc: "Copy table row",
+                       del: "Delete table",
+                       row: "Row",
+                       col: "Column",
+                       cell: "Cell"
+               },
+               autosave: {
+                       unload_msg: "The changes you made will be lost if you navigate away from this page."
+               },
+               fullscreen: {
+                       desc: "Toggle fullscreen mode (Alt + Shift + G)"
+               },
+               media: {
+                       desc: "Insert / edit embedded media",
+                       edit: "Edit embedded media"
+               },
+               fullpage: {
+                       desc: "Document properties"
+               },
+               template: {
+                       desc: "Insert predefined template content"
+               },
+               visualchars: {
+                       desc: "Visual control characters on/off."
+               },
+               spellchecker: {
+                       desc: "Toggle spellchecker (Alt + Shift + N)",
+                       menu: "Spellchecker settings",
+                       ignore_word: "Ignore word",
+                       ignore_words: "Ignore all",
+                       langs: "Languages",
+                       wait: "Please wait...",
+                       sug: "Suggestions",
+                       no_sug: "No suggestions",
+                       no_mpell: "No misspellings found.",
+                       learn_word: "Learn word"
+               },
+               pagebreak: {
+                       desc: "Insert Page Break"
+               },
+               advlist:{
+                       types: "Types",
+                       def: "Default",
+                       lower_alpha: "Lower alpha",
+                       lower_greek: "Lower greek",
+                       lower_roman: "Lower roman",
+                       upper_alpha: "Upper alpha",
+                       upper_roman: "Upper roman",
+                       circle: "Circle",
+                       disc: "Disc",
+                       square: "Square"
+               },
+               aria: {
+                       rich_text_area: "Rich Text Area"
+               },
+               wordcount:{
+                       words: "Words: "
+               }
+       };
</ins><span class="cx"> 
</span><del>-tinyMCE.addI18n("en.media_dlg",{
-title:"Insert / edit embedded media",
-general:"General",
-advanced:"Advanced",
-file:"File/URL",
-list:"List",
-size:"Dimensions",
-preview:"Preview",
-constrain_proportions:"Constrain proportions",
-type:"Type",
-id:"Id",
-name:"Name",
-class_name:"Class",
-vspace:"V-Space",
-hspace:"H-Space",
-play:"Auto play",
-loop:"Loop",
-menu:"Show menu",
-quality:"Quality",
-scale:"Scale",
-align:"Align",
-salign:"SAlign",
-wmode:"WMode",
-bgcolor:"Background",
-base:"Base",
-flashvars:"Flashvars",
-liveconnect:"SWLiveConnect",
-autohref:"AutoHREF",
-cache:"Cache",
-hidden:"Hidden",
-controller:"Controller",
-kioskmode:"Kiosk mode",
-playeveryframe:"Play every frame",
-targetcache:"Target cache",
-correction:"No correction",
-enablejavascript:"Enable JavaScript",
-starttime:"Start time",
-endtime:"End time",
-href:"href",
-qtsrcchokespeed:"Choke speed",
-target:"Target",
-volume:"Volume",
-autostart:"Auto start",
-enabled:"Enabled",
-fullscreen:"Fullscreen",
-invokeurls:"Invoke URLs",
-mute:"Mute",
-stretchtofit:"Stretch to fit",
-windowlessvideo:"Windowless video",
-balance:"Balance",
-baseurl:"Base URL",
-captioningid:"Captioning id",
-currentmarker:"Current marker",
-currentposition:"Current position",
-defaultframe:"Default frame",
-playcount:"Play count",
-rate:"Rate",
-uimode:"UI Mode",
-flash_options:"Flash options",
-qt_options:"QuickTime options",
-wmp_options:"Windows media player options",
-rmp_options:"Real media player options",
-shockwave_options:"Shockwave options",
-autogotourl:"Auto goto URL",
-center:"Center",
-imagestatus:"Image status",
-maintainaspect:"Maintain aspect",
-nojava:"No java",
-prefetch:"Prefetch",
-shuffle:"Shuffle",
-console:"Console",
-numloop:"Num loops",
-controls:"Controls",
-scriptcallbacks:"Script callbacks",
-swstretchstyle:"Stretch style",
-swstretchhalign:"Stretch H-Align",
-swstretchvalign:"Stretch V-Align",
-sound:"Sound",
-progress:"Progress",
-qtsrc:"QT Src",
-qt_stream_warn:"Streamed rtsp resources should be added to the QT Src field under the advanced tab.",
-align_top:"Top",
-align_right:"Right",
-align_bottom:"Bottom",
-align_left:"Left",
-align_center:"Center",
-align_top_left:"Top left",
-align_top_right:"Top right",
-align_bottom_left:"Bottom left",
-align_bottom_right:"Bottom right",
-flv_options:"Flash video options",
-flv_scalemode:"Scale mode",
-flv_buffer:"Buffer",
-flv_startimage:"Start image",
-flv_starttime:"Start time",
-flv_defaultvolume:"Default volume",
-flv_hiddengui:"Hidden GUI",
-flv_autostart:"Auto start",
-flv_loop:"Loop",
-flv_showscalemodes:"Show scale modes",
-flv_smoothvideo:"Smooth video",
-flv_jscallback:"JS Callback",
-html5_video_options:"HTML5 Video Options",
-altsource1:"Alternative source 1",
-altsource2:"Alternative source 2",
-preload:"Preload",
-poster:"Poster",
-source:"Source"
-});
</del><ins>+        tinyMCE.addI18n( main );
</ins><span class="cx"> 
</span><del>-tinyMCE.addI18n("en.wordpress",{
-wp_adv_desc:"Show/Hide Kitchen Sink (Alt + Shift + Z)",
-wp_more_desc:"Insert More Tag (Alt + Shift + T)",
-wp_page_desc:"Insert Page break (Alt + Shift + P)",
-wp_help_desc:"Help (Alt + Shift + H)",
-wp_more_alt:"More...",
-wp_page_alt:"Next page...",
-add_media:"Add Media",
-add_image:"Add an Image",
-add_video:"Add Video",
-add_audio:"Add Audio",
-editgallery:"Edit Gallery",
-delgallery:"Delete Gallery",
-wp_fullscreen_desc:"Distraction Free Writing mode (Alt + Shift + W)"
-});
</del><ins>+        tinyMCE.addI18n( lang + ".advanced", {
+               style_select: "Styles",
+               font_size: "Font size",
+               fontdefault: "Font family",
+               block: "Format",
+               paragraph: "Paragraph",
+               div: "Div",
+               address: "Address",
+               pre: "Preformatted",
+               h1: "Heading 1",
+               h2: "Heading 2",
+               h3: "Heading 3",
+               h4: "Heading 4",
+               h5: "Heading 5",
+               h6: "Heading 6",
+               blockquote: "Blockquote",
+               code: "Code",
+               samp: "Code sample",
+               dt: "Definition term ",
+               dd: "Definition description",
+               bold_desc: "Bold (Ctrl + B)",
+               italic_desc: "Italic (Ctrl + I)",
+               underline_desc: "Underline",
+               striketrough_desc: "Strikethrough (Alt + Shift + D)",
+               justifyleft_desc: "Align Left (Alt + Shift + L)",
+               justifycenter_desc: "Align Center (Alt + Shift + C)",
+               justifyright_desc: "Align Right (Alt + Shift + R)",
+               justifyfull_desc: "Align Full (Alt + Shift + J)",
+               bullist_desc: "Unordered list (Alt + Shift + U)",
+               numlist_desc: "Ordered list (Alt + Shift + O)",
+               outdent_desc: "Outdent",
+               indent_desc: "Indent",
+               undo_desc: "Undo (Ctrl + Z)",
+               redo_desc: "Redo (Ctrl + Y)",
+               link_desc: "Insert/edit link (Alt + Shift + A)",
+               unlink_desc: "Unlink (Alt + Shift + S)",
+               image_desc: "Insert/edit image (Alt + Shift + M)",
+               cleanup_desc: "Cleanup messy code",
+               code_desc: "Edit HTML Source",
+               sub_desc: "Subscript",
+               sup_desc: "Superscript",
+               hr_desc: "Insert horizontal ruler",
+               removeformat_desc: "Remove formatting",
+               forecolor_desc: "Select text color",
+               backcolor_desc: "Select background color",
+               charmap_desc: "Insert custom character",
+               visualaid_desc: "Toggle guidelines/invisible elements",
+               anchor_desc: "Insert/edit anchor",
+               cut_desc: "Cut",
+               copy_desc: "Copy",
+               paste_desc: "Paste",
+               image_props_desc: "Image properties",
+               newdocument_desc: "New document",
+               help_desc: "Help",
+               blockquote_desc: "Blockquote (Alt + Shift + Q)",
+               clipboard_msg: "Copy/Cut/Paste is not available in Mozilla and Firefox.",
+               path: "Path",
+               newdocument: "Are you sure you want to clear all contents?",
+               toolbar_focus: "Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",
+               more_colors: "More colors",
+               shortcuts_desc: "Accessibility Help",
+               help_shortcut: " Press ALT F10 for toolbar. Press ALT 0 for help.",
+               rich_text_area: "Rich Text Area",
+               toolbar: "Toolbar"
+       });
</ins><span class="cx"> 
</span><del>-tinyMCE.addI18n("en.wpeditimage",{
-edit_img:"Edit Image",
-del_img:"Delete Image",
-adv_settings:"Advanced Settings",
-none:"None",
-size:"Size",
-thumbnail:"Thumbnail",
-medium:"Medium",
-full_size:"Full Size",
-current_link:"Current Link",
-link_to_img:"Link to Image",
-link_help:"Enter a link URL or click above for presets.",
-adv_img_settings:"Advanced Image Settings",
-source:"Source",
-width:"Width",
-height:"Height",
-orig_size:"Original Size",
-css:"CSS Class",
-adv_link_settings:"Advanced Link Settings",
-link_rel:"Link Rel",
-height:"Height",
-orig_size:"Original Size",
-css:"CSS Class",
-s60:"60%",
-s70:"70%",
-s80:"80%",
-s90:"90%",
-s100:"100%",
-s110:"110%",
-s120:"120%",
-s130:"130%",
-img_title:"Title",
-caption:"Caption",
-alt:"Alternative Text"
-});
</del><ins>+        tinyMCE.addI18n( lang + ".advanced_dlg", {
+               about_title: "About TinyMCE",
+               about_general: "About",
+               about_help: "Help",
+               about_license: "License",
+               about_plugins: "Plugins",
+               about_plugin: "Plugin",
+               about_author: "Author",
+               about_version: "Version",
+               about_loaded: "Loaded plugins",
+               anchor_title: "Insert/edit anchor",
+               anchor_name: "Anchor name",
+               code_title: "HTML Source Editor",
+               code_wordwrap: "Word wrap",
+               colorpicker_title: "Select a color",
+               colorpicker_picker_tab: "Picker",
+               colorpicker_picker_title: "Color picker",
+               colorpicker_palette_tab: "Palette",
+               colorpicker_palette_title: "Palette colors",
+               colorpicker_named_tab: "Named",
+               colorpicker_named_title: "Named colors",
+               colorpicker_color: "Color: ",
+               colorpicker_name: "Name: ",
+               charmap_title: "Select custom character",
+               charmap_usage: "Use left and right arrows to navigate.",
+               image_title: "Insert/edit image",
+               image_src: "Image URL",
+               image_alt: "Image description",
+               image_list: "Image list",
+               image_border: "Border",
+               image_dimensions: "Dimensions",
+               image_vspace: "Vertical space",
+               image_hspace: "Horizontal space",
+               image_align: "Alignment",
+               image_align_baseline: "Baseline",
+               image_align_top: "Top",
+               image_align_middle: "Middle",
+               image_align_bottom: "Bottom",
+               image_align_texttop: "Text top",
+               image_align_textbottom: "Text bottom",
+               image_align_left: "Left",
+               image_align_right: "Right",
+               link_title: "Insert/edit link",
+               link_url: "Link URL",
+               link_target: "Target",
+               link_target_same: "Open link in the same window",
+               link_target_blank: "Open link in a new window",
+               link_titlefield: "Title",
+               link_is_email: "The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",
+               link_is_external: "The URL you entered seems to be an external link, do you want to add the required http:// prefix?",
+               link_list: "Link list",
+               accessibility_help: "Accessibility Help",
+               accessibility_usage_title: "General Usage"
+       });
+
+       tinyMCE.addI18n( lang + ".media_dlg", {
+               title: "Insert / edit embedded media",
+               general: "General",
+               advanced: "Advanced",
+               file: "File/URL",
+               list: "List",
+               size: "Dimensions",
+               preview: "Preview",
+               constrain_proportions: "Constrain proportions",
+               type: "Type",
+               id: "Id",
+               name: "Name",
+               class_name: "Class",
+               vspace: "V-Space",
+               hspace: "H-Space",
+               play: "Auto play",
+               loop: "Loop",
+               menu: "Show menu",
+               quality: "Quality",
+               scale: "Scale",
+               align: "Align",
+               salign: "SAlign",
+               wmode: "WMode",
+               bgcolor: "Background",
+               base: "Base",
+               flashvars: "Flashvars",
+               liveconnect: "SWLiveConnect",
+               autohref: "AutoHREF",
+               cache: "Cache",
+               hidden: "Hidden",
+               controller: "Controller",
+               kioskmode: "Kiosk mode",
+               playeveryframe: "Play every frame",
+               targetcache: "Target cache",
+               correction: "No correction",
+               enablejavascript: "Enable JavaScript",
+               starttime: "Start time",
+               endtime: "End time",
+               href: "href",
+               qtsrcchokespeed: "Choke speed",
+               target: "Target",
+               volume: "Volume",
+               autostart: "Auto start",
+               enabled: "Enabled",
+               fullscreen: "Fullscreen",
+               invokeurls: "Invoke URLs",
+               mute: "Mute",
+               stretchtofit: "Stretch to fit",
+               windowlessvideo: "Windowless video",
+               balance: "Balance",
+               baseurl: "Base URL",
+               captioningid: "Captioning id",
+               currentmarker: "Current marker",
+               currentposition: "Current position",
+               defaultframe: "Default frame",
+               playcount: "Play count",
+               rate: "Rate",
+               uimode: "UI Mode",
+               flash_options: "Flash options",
+               qt_options: "QuickTime options",
+               wmp_options: "Windows media player options",
+               rmp_options: "Real media player options",
+               shockwave_options: "Shockwave options",
+               autogotourl: "Auto goto URL",
+               center: "Center",
+               imagestatus: "Image status",
+               maintainaspect: "Maintain aspect",
+               nojava: "No java",
+               prefetch: "Prefetch",
+               shuffle: "Shuffle",
+               console: "Console",
+               numloop: "Num loops",
+               controls: "Controls",
+               scriptcallbacks: "Script callbacks",
+               swstretchstyle: "Stretch style",
+               swstretchhalign: "Stretch H-Align",
+               swstretchvalign: "Stretch V-Align",
+               sound: "Sound",
+               progress: "Progress",
+               qtsrc: "QT Src",
+               qt_stream_warn: "Streamed rtsp resources should be added to the QT Src field under the advanced tab.",
+               align_top: "Top",
+               align_right: "Right",
+               align_bottom: "Bottom",
+               align_left: "Left",
+               align_center: "Center",
+               align_top_left: "Top left",
+               align_top_right: "Top right",
+               align_bottom_left: "Bottom left",
+               align_bottom_right: "Bottom right",
+               flv_options: "Flash video options",
+               flv_scalemode: "Scale mode",
+               flv_buffer: "Buffer",
+               flv_startimage: "Start image",
+               flv_starttime: "Start time",
+               flv_defaultvolume: "Default volume",
+               flv_hiddengui: "Hidden GUI",
+               flv_autostart: "Auto start",
+               flv_loop: "Loop",
+               flv_showscalemodes: "Show scale modes",
+               flv_smoothvideo: "Smooth video",
+               flv_jscallback: "JS Callback",
+               html5_video_options: "HTML5 Video Options",
+               altsource1: "Alternative source 1",
+               altsource2: "Alternative source 2",
+               preload: "Preload",
+               poster: "Poster",
+               source: "Source"
+       });
+
+       tinyMCE.addI18n( lang + ".wordpress", {
+               wp_adv_desc: "Show/Hide Kitchen Sink (Alt + Shift + Z)",
+               wp_more_desc: "Insert More Tag (Alt + Shift + T)",
+               wp_page_desc: "Insert Page break (Alt + Shift + P)",
+               wp_help_desc: "Help (Alt + Shift + H)",
+               wp_more_alt: "More...",
+               wp_page_alt: "Next page...",
+               add_media: "Add Media",
+               add_image: "Add an Image",
+               add_video: "Add Video",
+               add_audio: "Add Audio",
+               editgallery: "Edit Gallery",
+               delgallery: "Delete Gallery",
+               wp_fullscreen_desc: "Distraction Free Writing mode (Alt + Shift + W)"
+       });
+
+       tinyMCE.addI18n( lang + ".wpeditimage", {
+               edit_img: "Edit Image",
+               del_img: "Delete Image",
+               adv_settings: "Advanced Settings",
+               none: "None",
+               size: "Size",
+               thumbnail: "Thumbnail",
+               medium: "Medium",
+               full_size: "Full Size",
+               current_link: "Current Link",
+               link_to_img: "Link to Image",
+               link_help: "Enter a link URL or click above for presets.",
+               adv_img_settings: "Advanced Image Settings",
+               source: "Source",
+               width: "Width",
+               height: "Height",
+               orig_size: "Original Size",
+               css: "CSS Class",
+               adv_link_settings: "Advanced Link Settings",
+               link_rel: "Link Rel",
+               height: "Height",
+               orig_size: "Original Size",
+               css: "CSS Class",
+               s60: "60%",
+               s70: "70%",
+               s80: "80%",
+               s90: "90%",
+               s100: "100%",
+               s110: "110%",
+               s120: "120%",
+               s130: "130%",
+               img_title: "Title",
+               caption: "Caption",
+               alt: "Alternative Text"
+       });
+}());
</ins></span></pre></div>
<a id="trunksrcwpincludesjstinymcelangswplangsphp"></a>
<div class="delfile"><h4>Deleted: trunk/src/wp-includes/js/tinymce/langs/wp-langs.php (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/langs/wp-langs.php      2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-includes/js/tinymce/langs/wp-langs.php 2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -1,565 +0,0 @@
</span><del>-<?php
-
-if ( ! defined( 'ABSPATH' ) )
-       exit;
-
-if ( ! class_exists( '_WP_Editors' ) )
-       require( ABSPATH . WPINC . '/class-wp-editor.php' );
-
-// deprecated, not used
-function mce_escape($text) {
-       return esc_js($text);
-}
-
-function wp_mce_translation() {
-
-       $default = array(
-               'common' => array(
-                       'edit_confirm' => __('Do you want to use the WYSIWYG mode for this textarea?'),
-                       'apply' => __('Apply'),
-                       'insert' => __('Insert'),
-                       'update' => __('Update'),
-                       'cancel' => __('Cancel'),
-                       'close' => __('Close'),
-                       'browse' => __('Browse'),
-                       'class_name' => __('Class'),
-                       'not_set' => __('-- Not set --'),
-                       'clipboard_msg' => __('Copy/Cut/Paste is not available in Mozilla and Firefox.'),
-                       'clipboard_no_support' => __('Currently not supported by your browser, use keyboard shortcuts instead.'),
-                       'popup_blocked' => __('Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.'),
-                       'invalid_data' => __('ERROR: Invalid values entered, these are marked in red.'),
-                       'invalid_data_number' => __('{#field} must be a number'),
-                       'invalid_data_min' => __('{#field} must be a number greater than {#min}'),
-                       'invalid_data_size' => __('{#field} must be a number or percentage'),
-                       'more_colors' => __('More colors')
-               ),
-
-               'colors' => array(
-                       '000000' => __('Black'),
-                       '993300' => __('Burnt orange'),
-                       '333300' => __('Dark olive'),
-                       '003300' => __('Dark green'),
-                       '003366' => __('Dark azure'),
-                       '000080' => __('Navy Blue'),
-                       '333399' => __('Indigo'),
-                       '333333' => __('Very dark gray'),
-                       '800000' => __('Maroon'),
-                       'FF6600' => __('Orange'),
-                       '808000' => __('Olive'),
-                       '008000' => __('Green'),
-                       '008080' => __('Teal'),
-                       '0000FF' => __('Blue'),
-                       '666699' => __('Grayish blue'),
-                       '808080' => __('Gray'),
-                       'FF0000' => __('Red'),
-                       'FF9900' => __('Amber'),
-                       '99CC00' => __('Yellow green'),
-                       '339966' => __('Sea green'),
-                       '33CCCC' => __('Turquoise'),
-                       '3366FF' => __('Royal blue'),
-                       '800080' => __('Purple'),
-                       '999999' => __('Medium gray'),
-                       'FF00FF' => __('Magenta'),
-                       'FFCC00' => __('Gold'),
-                       'FFFF00' => __('Yellow'),
-                       '00FF00' => __('Lime'),
-                       '00FFFF' => __('Aqua'),
-                       '00CCFF' => __('Sky blue'),
-                       '993366' => __('Brown'),
-                       'C0C0C0' => __('Silver'),
-                       'FF99CC' => __('Pink'),
-                       'FFCC99' => __('Peach'),
-                       'FFFF99' => __('Light yellow'),
-                       'CCFFCC' => __('Pale green'),
-                       'CCFFFF' => __('Pale cyan'),
-                       '99CCFF' => __('Light sky blue'),
-                       'CC99FF' => __('Plum'),
-                       'FFFFFF' => __('White')
-               ),
-
-               'contextmenu' => array(
-                       'align' => __('Alignment'), /* translators: alignment */
-                       'left' => __('Left'), /* translators: alignment */
-                       'center' => __('Center'), /* translators: alignment */
-                       'right' => __('Right'), /* translators: alignment */
-                       'full' => __('Full') /* translators: alignment */
-               ),
-
-               'insertdatetime' => array(
-                       'date_fmt' => __('%Y-%m-%d'), /* translators: year, month, date */
-                       'time_fmt' => __('%H:%M:%S'), /* translators: hours, minutes, seconds */
-                       'insertdate_desc' => __('Insert date'),
-                       'inserttime_desc' => __('Insert time'),
-                       'months_long' => __('January').','.__('February').','.__('March').','.__('April').','.__('May').','.__('June').','.__('July').','.__('August').','.__('September').','.__('October').','.__('November').','.__('December'),
-                       'months_short' => __('Jan_January_abbreviation').','.__('Feb_February_abbreviation').','.__('Mar_March_abbreviation').','.__('Apr_April_abbreviation').','.__('May_May_abbreviation').','.__('Jun_June_abbreviation').','.__('Jul_July_abbreviation').','.__('Aug_August_abbreviation').','.__('Sep_September_abbreviation').','.__('Oct_October_abbreviation').','.__('Nov_November_abbreviation').','.__('Dec_December_abbreviation'),
-                       'day_long' => __('Sunday').','.__('Monday').','.__('Tuesday').','.__('Wednesday').','.__('Thursday').','.__('Friday').','.__('Saturday'),
-                       'day_short' => __('Sun').','.__('Mon').','.__('Tue').','.__('Wed').','.__('Thu').','.__('Fri').','.__('Sat')
-               ),
-
-               'print' => array(
-                       'print_desc' => __('Print')
-               ),
-
-               'preview' => array(
-                       'preview_desc' => __('Preview')
-               ),
-
-               'directionality' => array(
-                       'ltr_desc' => __('Direction left to right'),
-                       'rtl_desc' => __('Direction right to left')
-               ),
-
-               'layer' => array(
-                       'insertlayer_desc' => __('Insert new layer'),
-                       'forward_desc' => __('Move forward'),
-                       'backward_desc' => __('Move backward'),
-                       'absolute_desc' => __('Toggle absolute positioning'),
-                       'content' => __('New layer...')
-               ),
-
-               'save' => array(
-                       'save_desc' => __('Save'),
-                       'cancel_desc' => __('Cancel all changes')
-               ),
-
-               'nonbreaking' => array(
-                       'nonbreaking_desc' => __('Insert non-breaking space character')
-               ),
-
-               'iespell' => array(
-                       'iespell_desc' => __('Run spell checking'),
-                       'download' => __('ieSpell not detected. Do you want to install it now?')
-               ),
-
-               'advhr' => array(
-                       'advhr_desc' => __('Horizontal rule')
-               ),
-
-               'emotions' => array(
-                       'emotions_desc' => __('Emotions')
-               ),
-
-               'searchreplace' => array(
-                       'search_desc' => __('Find'),
-                       'replace_desc' => __('Find/Replace')
-               ),
-
-               'advimage' => array(
-                       'image_desc' => __('Insert/edit image')
-               ),
-
-               'advlink' => array(
-                       'link_desc' => __('Insert/edit link')
-               ),
-
-               'xhtmlxtras' => array(
-                       'cite_desc' => __('Citation'),
-                       'abbr_desc' => __('Abbreviation'),
-                       'acronym_desc' => __('Acronym'),
-                       'del_desc' => __('Deletion'),
-                       'ins_desc' => __('Insertion'),
-                       'attribs_desc' => __('Insert/Edit Attributes')
-               ),
-
-               'style' => array(
-                       'desc' => __('Edit CSS Style')
-               ),
-
-               'paste' => array(
-                       'paste_text_desc' => __('Paste as Plain Text'),
-                       'paste_word_desc' => __('Paste from Word'),
-                       'selectall_desc' => __('Select All'),
-                       'plaintext_mode_sticky' => __('Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.'),
-                       'plaintext_mode' => __('Paste is now in plain text mode. Click again to toggle back to regular paste mode.')
-               ),
-
-               'paste_dlg' => array(
-                       'text_title' => __('Use CTRL+V on your keyboard to paste the text into the window.'),
-                       'text_linebreaks' => __('Keep linebreaks'),
-                       'word_title' => __('Use CTRL+V on your keyboard to paste the text into the window.')
-               ),
-
-               'table' => array(
-                       'desc' => __('Inserts a new table'),
-                       'row_before_desc' => __('Insert row before'),
-                       'row_after_desc' => __('Insert row after'),
-                       'delete_row_desc' => __('Delete row'),
-                       'col_before_desc' => __('Insert column before'),
-                       'col_after_desc' => __('Insert column after'),
-                       'delete_col_desc' => __('Remove column'),
-                       'split_cells_desc' => __('Split merged table cells'),
-                       'merge_cells_desc' => __('Merge table cells'),
-                       'row_desc' => __('Table row properties'),
-                       'cell_desc' => __('Table cell properties'),
-                       'props_desc' => __('Table properties'),
-                       'paste_row_before_desc' => __('Paste table row before'),
-                       'paste_row_after_desc' => __('Paste table row after'),
-                       'cut_row_desc' => __('Cut table row'),
-                       'copy_row_desc' => __('Copy table row'),
-                       'del' => __('Delete table'),
-                       'row' => __('Row'),
-                       'col' => __('Column'),
-                       'cell' => __('Cell')
-               ),
-
-               'autosave' => array(
-                       'unload_msg' => __('The changes you made will be lost if you navigate away from this page.')
-               ),
-
-               'fullscreen' => array(
-                       'desc' => __('Toggle fullscreen mode (Alt + Shift + G)')
-               ),
-
-               'media' => array(
-                       'desc' => __('Insert / edit embedded media'),
-                       'edit' => __('Edit embedded media')
-               ),
-
-               'fullpage' => array(
-                       'desc' => __('Document properties')
-               ),
-
-               'template' => array(
-                       'desc' => __('Insert predefined template content')
-               ),
-
-               'visualchars' => array(
-                       'desc' => __('Visual control characters on/off.')
-               ),
-
-               'spellchecker' => array(
-                       'desc' => __('Toggle spellchecker (Alt + Shift + N)'),
-                       'menu' => __('Spellchecker settings'),
-                       'ignore_word' => __('Ignore word'),
-                       'ignore_words' => __('Ignore all'),
-                       'langs' => __('Languages'),
-                       'wait' => __('Please wait...'),
-                       'sug' => __('Suggestions'),
-                       'no_sug' => __('No suggestions'),
-                       'no_mpell' => __('No misspellings found.'),
-                       'learn_word' => __('Learn word')
-               ),
-
-               'pagebreak' => array(
-                       'desc' => __('Insert Page Break')
-               ),
-
-               'advlist' => array(
-                       'types' => __('Types'),
-                       'def' => __('Default'),
-                       'lower_alpha' => __('Lower alpha'),
-                       'lower_greek' => __('Lower greek'),
-                       'lower_roman' => __('Lower roman'),
-                       'upper_alpha' => __('Upper alpha'),
-                       'upper_roman' => __('Upper roman'),
-                       'circle' => __('Circle'),
-                       'disc' => __('Disc'),
-                       'square' => __('Square')
-               ),
-
-               'aria' => array(
-                       'rich_text_area' => __('Rich Text Area')
-               ),
-
-               'wordcount' => array(
-                       'words' => __('Words:')
-               )
-       );
-
-       $advanced = array(
-               'style_select' => __('Styles'), /* translators: TinyMCE inline styles */
-               'font_size' => __('Font size'),
-               'fontdefault' => __('Font family'),
-               'block' => __('Format'),
-               'paragraph' => __('Paragraph'),
-               'div' => __('Div'),
-               'address' => __('Address'),
-               'pre' => __('Preformatted'),
-               'h1' => __('Heading 1'),
-               'h2' => __('Heading 2'),
-               'h3' => __('Heading 3'),
-               'h4' => __('Heading 4'),
-               'h5' => __('Heading 5'),
-               'h6' => __('Heading 6'),
-               'blockquote' => __('Blockquote'),
-               'code' => __('Code'),
-               'samp' => __('Code sample'),
-               'dt' => __('Definition term '),
-               'dd' => __('Definition description'),
-               'bold_desc' => __('Bold (Ctrl + B)'),
-               'italic_desc' => __('Italic (Ctrl + I)'),
-               'underline_desc' => __('Underline'),
-               'striketrough_desc' => __('Strikethrough (Alt + Shift + D)'),
-               'justifyleft_desc' => __('Align Left (Alt + Shift + L)'),
-               'justifycenter_desc' => __('Align Center (Alt + Shift + C)'),
-               'justifyright_desc' => __('Align Right (Alt + Shift + R)'),
-               'justifyfull_desc' => __('Align Full (Alt + Shift + J)'),
-               'bullist_desc' => __('Unordered list (Alt + Shift + U)'),
-               'numlist_desc' => __('Ordered list (Alt + Shift + O)'),
-               'outdent_desc' => __('Outdent'),
-               'indent_desc' => __('Indent'),
-               'undo_desc' => __('Undo (Ctrl + Z)'),
-               'redo_desc' => __('Redo (Ctrl + Y)'),
-               'link_desc' => __('Insert/edit link (Alt + Shift + A)'),
-               'unlink_desc' => __('Unlink (Alt + Shift + S)'),
-               'image_desc' => __('Insert/edit image (Alt + Shift + M)'),
-               'cleanup_desc' => __('Cleanup messy code'),
-               'code_desc' => __('Edit HTML Source'),
-               'sub_desc' => __('Subscript'),
-               'sup_desc' => __('Superscript'),
-               'hr_desc' => __('Insert horizontal ruler'),
-               'removeformat_desc' => __('Remove formatting'),
-               'forecolor_desc' => __('Select text color'),
-               'backcolor_desc' => __('Select background color'),
-               'charmap_desc' => __('Insert custom character'),
-               'visualaid_desc' => __('Toggle guidelines/invisible elements'),
-               'anchor_desc' => __('Insert/edit anchor'),
-               'cut_desc' => __('Cut'),
-               'copy_desc' => __('Copy'),
-               'paste_desc' => __('Paste'),
-               'image_props_desc' => __('Image properties'),
-               'newdocument_desc' => __('New document'),
-               'help_desc' => __('Help'),
-               'blockquote_desc' => __('Blockquote (Alt + Shift + Q)'),
-               'clipboard_msg' => __('Copy/Cut/Paste is not available in Mozilla and Firefox.'),
-               'path' => __('Path'),
-               'newdocument' => __('Are you sure you want to clear all contents?'),
-               'toolbar_focus' => __('Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X'),
-               'more_colors' => __('More colors'),
-               'shortcuts_desc' => __('Accessibility Help'),
-               'help_shortcut' => __('Press ALT F10 for toolbar. Press ALT 0 for help.'),
-               'rich_text_area' => __('Rich Text Area'),
-               'toolbar' => __('Toolbar')
-       );
-
-       $advanced_dlg = array(
-               'about_title' => __('About TinyMCE'),
-               'about_general' => __('About'),
-               'about_help' => __('Help'),
-               'about_license' => __('License'),
-               'about_plugins' => __('Plugins'),
-               'about_plugin' => __('Plugin'),
-               'about_author' => __('Author'),
-               'about_version' => __('Version'),
-               'about_loaded' => __('Loaded plugins'),
-               'anchor_title' => __('Insert/edit anchor'),
-               'anchor_name' => __('Anchor name'),
-               'code_title' => __('HTML Source Editor'),
-               'code_wordwrap' => __('Word wrap'),
-               'colorpicker_title' => __('Select a color'),
-               'colorpicker_picker_tab' => __('Picker'),
-               'colorpicker_picker_title' => __('Color picker'),
-               'colorpicker_palette_tab' => __('Palette'),
-               'colorpicker_palette_title' => __('Palette colors'),
-               'colorpicker_named_tab' => __('Named'),
-               'colorpicker_named_title' => __('Named colors'),
-               'colorpicker_color' => __('Color:'),
-               'colorpicker_name' => _x('Name:', 'html attribute'),
-               'charmap_title' => __('Select custom character'),
-               'charmap_usage' => __('Use left and right arrows to navigate.'),
-               'image_title' => __('Insert/edit image'),
-               'image_src' => __('Image URL'),
-               'image_alt' => __('Image description'),
-               'image_list' => __('Image list'),
-               'image_border' => __('Border'),
-               'image_dimensions' => __('Dimensions'),
-               'image_vspace' => __('Vertical space'),
-               'image_hspace' => __('Horizontal space'),
-               'image_align' => __('Alignment'),
-               'image_align_baseline' => __('Baseline'),
-               'image_align_top' => __('Top'),
-               'image_align_middle' => __('Middle'),
-               'image_align_bottom' => __('Bottom'),
-               'image_align_texttop' => __('Text top'),
-               'image_align_textbottom' => __('Text bottom'),
-               'image_align_left' => __('Left'),
-               'image_align_right' => __('Right'),
-               'link_title' => __('Insert/edit link'),
-               'link_url' => __('Link URL'),
-               'link_target' => __('Target'),
-               'link_target_same' => __('Open link in the same window'),
-               'link_target_blank' => __('Open link in a new window'),
-               'link_titlefield' => __('Title'),
-               'link_is_email' => __('The URL you entered seems to be an email address, do you want to add the required mailto: prefix?'),
-               'link_is_external' => __('The URL you entered seems to external link, do you want to add the required http:// prefix?'),
-               'link_list' => __('Link list'),
-               'accessibility_help' => __('Accessibility Help'),
-               'accessibility_usage_title' => __('General Usage')
-       );
-
-       $media_dlg = array(
-               'title' => __('Insert / edit embedded media'),
-               'general' => __('General'),
-               'advanced' => __('Advanced'),
-               'file' => __('File/URL'),
-               'list' => __('List'),
-               'size' => __('Dimensions'),
-               'preview' => __('Preview'),
-               'constrain_proportions' => __('Constrain proportions'),
-               'type' => __('Type'),
-               'id' => __('Id'),
-               'name' => _x('Name', 'html attribute'),
-               'class_name' => __('Class'),
-               'vspace' => __('V-Space'),
-               'hspace' => __('H-Space'),
-               'play' => __('Auto play'),
-               'loop' => __('Loop'),
-               'menu' => __('Show menu'),
-               'quality' => __('Quality'),
-               'scale' => __('Scale'),
-               'align' => __('Align'),
-               'salign' => __('SAlign'),
-               'wmode' => __('WMode'),
-               'bgcolor' => __('Background'),
-               'base' => __('Base'),
-               'flashvars' => __('Flashvars'),
-               'liveconnect' => __('SWLiveConnect'),
-               'autohref' => __('AutoHREF'),
-               'cache' => __('Cache'),
-               'hidden' => __('Hidden'),
-               'controller' => __('Controller'),
-               'kioskmode' => __('Kiosk mode'),
-               'playeveryframe' => __('Play every frame'),
-               'targetcache' => __('Target cache'),
-               'correction' => __('No correction'),
-               'enablejavascript' => __('Enable JavaScript'),
-               'starttime' => __('Start time'),
-               'endtime' => __('End time'),
-               'href' => __('href'),
-               'qtsrcchokespeed' => __('Choke speed'),
-               'target' => __('Target'),
-               'volume' => __('Volume'),
-               'autostart' => __('Auto start'),
-               'enabled' => __('Enabled'),
-               'fullscreen' => __('Fullscreen'),
-               'invokeurls' => __('Invoke URLs'),
-               'mute' => __('Mute'),
-               'stretchtofit' => __('Stretch to fit'),
-               'windowlessvideo' => __('Windowless video'),
-               'balance' => __('Balance'),
-               'baseurl' => __('Base URL'),
-               'captioningid' => __('Captioning id'),
-               'currentmarker' => __('Current marker'),
-               'currentposition' => __('Current position'),
-               'defaultframe' => __('Default frame'),
-               'playcount' => __('Play count'),
-               'rate' => __('Rate'),
-               'uimode' => __('UI Mode'),
-               'flash_options' => __('Flash options'),
-               'qt_options' => __('QuickTime options'),
-               'wmp_options' => __('Windows media player options'),
-               'rmp_options' => __('Real media player options'),
-               'shockwave_options' => __('Shockwave options'),
-               'autogotourl' => __('Auto goto URL'),
-               'center' => __('Center'),
-               'imagestatus' => __('Image status'),
-               'maintainaspect' => __('Maintain aspect'),
-               'nojava' => __('No java'),
-               'prefetch' => __('Prefetch'),
-               'shuffle' => __('Shuffle'),
-               'console' => __('Console'),
-               'numloop' => __('Num loops'),
-               'controls' => __('Controls'),
-               'scriptcallbacks' => __('Script callbacks'),
-               'swstretchstyle' => __('Stretch style'),
-               'swstretchhalign' => __('Stretch H-Align'),
-               'swstretchvalign' => __('Stretch V-Align'),
-               'sound' => __('Sound'),
-               'progress' => __('Progress'),
-               'qtsrc' => __('QT Src'),
-               'qt_stream_warn' => __('Streamed rtsp resources should be added to the QT Src field under the advanced tab.'),
-               'align_top' => __('Top'),
-               'align_right' => __('Right'),
-               'align_bottom' => __('Bottom'),
-               'align_left' => __('Left'),
-               'align_center' => __('Center'),
-               'align_top_left' => __('Top left'),
-               'align_top_right' => __('Top right'),
-               'align_bottom_left' => __('Bottom left'),
-               'align_bottom_right' => __('Bottom right'),
-               'flv_options' => __('Flash video options'),
-               'flv_scalemode' => __('Scale mode'),
-               'flv_buffer' => __('Buffer'),
-               'flv_startimage' => __('Start image'),
-               'flv_starttime' => __('Start time'),
-               'flv_defaultvolume' => __('Default volume'),
-               'flv_hiddengui' => __('Hidden GUI'),
-               'flv_autostart' => __('Auto start'),
-               'flv_loop' => __('Loop'),
-               'flv_showscalemodes' => __('Show scale modes'),
-               'flv_smoothvideo' => __('Smooth video'),
-               'flv_jscallback' => __('JS Callback'),
-               'html5_video_options' => __('HTML5 Video Options'),
-               'altsource1' => __('Alternative source 1'),
-               'altsource2' => __('Alternative source 2'),
-               'preload' => __('Preload'),
-               'poster' => __('Poster'),
-               'source' => __('Source')
-       );
-
-       $wordpress = array(
-               'wp_adv_desc' => __('Show/Hide Kitchen Sink (Alt + Shift + Z)'),
-               'wp_more_desc' => __('Insert More Tag (Alt + Shift + T)'),
-               'wp_page_desc' => __('Insert Page break (Alt + Shift + P)'),
-               'wp_help_desc' => __('Help (Alt + Shift + H)'),
-               'wp_more_alt' => __('More...'),
-               'wp_page_alt' => __('Next page...'),
-               'add_media' => __('Add Media'),
-               'add_image' => __('Add an Image'),
-               'add_video' => __('Add Video'),
-               'add_audio' => __('Add Audio'),
-               'editgallery' => __('Edit Gallery'),
-               'delgallery' => __('Delete Gallery'),
-               'wp_fullscreen_desc' => __('Distraction Free Writing mode (Alt + Shift + W)')
-       );
-
-       $wpeditimage = array(
-               'edit_img' => __('Edit Image'),
-               'del_img' => __('Delete Image'),
-               'adv_settings' => __('Advanced Settings'),
-               'none' => __('None'),
-               'size' => __('Size'),
-               'thumbnail' => __('Thumbnail'),
-               'medium' => __('Medium'),
-               'full_size' => __('Full Size'),
-               'current_link' => __('Current Link'),
-               'link_to_img' => __('Link to Image'),
-               'link_help' => __('Enter a link URL or click above for presets.'),
-               'adv_img_settings' => __('Advanced Image Settings'),
-               'source' => __('Source'),
-               'width' => __('Width'),
-               'height' => __('Height'),
-               'orig_size' => __('Original Size'),
-               'css' => __('CSS Class'),
-               'adv_link_settings' => __('Advanced Link Settings'),
-               'link_rel' => __('Link Rel'),
-               'height' => __('Height'),
-               'orig_size' => __('Original Size'),
-               'css' => __('CSS Class'),
-               's60' => __('60%'),
-               's70' => __('70%'),
-               's80' => __('80%'),
-               's90' => __('90%'),
-               's100' => __('100%'),
-               's110' => __('110%'),
-               's120' => __('120%'),
-               's130' => __('130%'),
-               'img_title' => __('Title'),
-               'caption' => __('Caption'),
-               'alt' => __('Alternative Text')
-       );
-
-       $locale = _WP_Editors::$mce_locale;
-
-       $translated = 'tinyMCE.addI18n({' . $locale . ':' . json_encode( $default ) . "});\n";
-       $translated .= 'tinyMCE.addI18n("' . $locale . '.advanced", ' . json_encode( $advanced ) . ");\n";
-       $translated .= 'tinyMCE.addI18n("' . $locale . '.advanced_dlg", ' . json_encode( $advanced_dlg ) . ");\n";
-       $translated .= 'tinyMCE.addI18n("' . $locale . '.media_dlg", ' . json_encode( $media_dlg ) . ");\n";
-       $translated .= 'tinyMCE.addI18n("' . $locale . '.wordpress", ' . json_encode( $wordpress ) . ");\n";
-       $translated .= 'tinyMCE.addI18n("' . $locale . '.wpeditimage", ' . json_encode( $wpeditimage ) . ');';
-
-       return $translated;
-}
-
-$lang = wp_mce_translation();
-
</del></span></pre></div>
<a id="trunksrcwpincludesjstinymcemark_loaded_srcjs"></a>
<div class="delfile"><h4>Deleted: trunk/src/wp-includes/js/tinymce/mark_loaded_src.js (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/mark_loaded_src.js      2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-includes/js/tinymce/mark_loaded_src.js 2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -1,21 +0,0 @@
</span><del>-/* global tinyMCEPreInit, tinymce */
-(function(){
-       if ( typeof tinyMCEPreInit === 'undefined' )
-               return;
-
-       var t = tinyMCEPreInit, baseurl = t.base, markDone = tinymce.ScriptLoader.markDone, lang = t.ref.language,
-               theme = t.ref.theme, plugins = t.ref.plugins, suffix = t.suffix;
-
-       markDone( baseurl+'/langs/'+lang+'.js' );
-       markDone( baseurl+'/themes/'+theme+'/editor_template'+suffix+'.js' );
-       markDone( baseurl+'/themes/'+theme+'/langs/'+lang+'.js' );
-       markDone( baseurl+'/themes/'+theme+'/langs/'+lang+'_dlg.js' );
-
-       tinymce.each( plugins.split(','), function(plugin){
-               if ( plugin && plugin.charAt(0) != '-' ) {
-                       markDone( baseurl+'/plugins/'+plugin+'/editor_plugin'+suffix+'.js' );
-                       markDone( baseurl+'/plugins/'+plugin+'/langs/'+lang+'.js' );
-                       markDone( baseurl+'/plugins/'+plugin+'/langs/'+lang+'_dlg.js' );
-               }
-       });
-})();
</del></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginscharmappluginjs"></a>
<div class="addfile"><h4>Added: trunk/src/wp-includes/js/tinymce/plugins/charmap/plugin.js (0 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/charmap/plugin.js                               (rev 0)
+++ trunk/src/wp-includes/js/tinymce/plugins/charmap/plugin.js  2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -0,0 +1,362 @@
</span><ins>+/**
+ * plugin.js
+ *
+ * Copyright, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://www.tinymce.com/license
+ * Contributing: http://www.tinymce.com/contributing
+ */
+
+/*global tinymce:true */
+
+tinymce.PluginManager.add('charmap', function(editor) {
+       var charmap = [
+               ['160', 'no-break space'],
+               ['38', 'ampersand'],
+               ['34', 'quotation mark'],
+       // finance
+               ['162', 'cent sign'],
+               ['8364', 'euro sign'],
+               ['163', 'pound sign'],
+               ['165', 'yen sign'],
+       // signs
+               ['169', 'copyright sign'],
+               ['174', 'registered sign'],
+               ['8482', 'trade mark sign'],
+               ['8240', 'per mille sign'],
+               ['181', 'micro sign'],
+               ['183', 'middle dot'],
+               ['8226', 'bullet'],
+               ['8230', 'three dot leader'],
+               ['8242', 'minutes / feet'],
+               ['8243', 'seconds / inches'],
+               ['167', 'section sign'],
+               ['182', 'paragraph sign'],
+               ['223', 'sharp s / ess-zed'],
+       // quotations
+               ['8249', 'single left-pointing angle quotation mark'],
+               ['8250', 'single right-pointing angle quotation mark'],
+               ['171', 'left pointing guillemet'],
+               ['187', 'right pointing guillemet'],
+               ['8216', 'left single quotation mark'],
+               ['8217', 'right single quotation mark'],
+               ['8220', 'left double quotation mark'],
+               ['8221', 'right double quotation mark'],
+               ['8218', 'single low-9 quotation mark'],
+               ['8222', 'double low-9 quotation mark'],
+               ['60', 'less-than sign'],
+               ['62', 'greater-than sign'],
+               ['8804', 'less-than or equal to'],
+               ['8805', 'greater-than or equal to'],
+               ['8211', 'en dash'],
+               ['8212', 'em dash'],
+               ['175', 'macron'],
+               ['8254', 'overline'],
+               ['164', 'currency sign'],
+               ['166', 'broken bar'],
+               ['168', 'diaeresis'],
+               ['161', 'inverted exclamation mark'],
+               ['191', 'turned question mark'],
+               ['710', 'circumflex accent'],
+               ['732', 'small tilde'],
+               ['176', 'degree sign'],
+               ['8722', 'minus sign'],
+               ['177', 'plus-minus sign'],
+               ['247', 'division sign'],
+               ['8260', 'fraction slash'],
+               ['215', 'multiplication sign'],
+               ['185', 'superscript one'],
+               ['178', 'superscript two'],
+               ['179', 'superscript three'],
+               ['188', 'fraction one quarter'],
+               ['189', 'fraction one half'],
+               ['190', 'fraction three quarters'],
+       // math / logical
+               ['402', 'function / florin'],
+               ['8747', 'integral'],
+               ['8721', 'n-ary sumation'],
+               ['8734', 'infinity'],
+               ['8730', 'square root'],
+               ['8764', 'similar to'],
+               ['8773', 'approximately equal to'],
+               ['8776', 'almost equal to'],
+               ['8800', 'not equal to'],
+               ['8801', 'identical to'],
+               ['8712', 'element of'],
+               ['8713', 'not an element of'],
+               ['8715', 'contains as member'],
+               ['8719', 'n-ary product'],
+               ['8743', 'logical and'],
+               ['8744', 'logical or'],
+               ['172', 'not sign'],
+               ['8745', 'intersection'],
+               ['8746', 'union'],
+               ['8706', 'partial differential'],
+               ['8704', 'for all'],
+               ['8707', 'there exists'],
+               ['8709', 'diameter'],
+               ['8711', 'backward difference'],
+               ['8727', 'asterisk operator'],
+               ['8733', 'proportional to'],
+               ['8736', 'angle'],
+       // undefined
+               ['180', 'acute accent'],
+               ['184', 'cedilla'],
+               ['170', 'feminine ordinal indicator'],
+               ['186', 'masculine ordinal indicator'],
+               ['8224', 'dagger'],
+               ['8225', 'double dagger'],
+       // alphabetical special chars
+               ['192', 'A - grave'],
+               ['193', 'A - acute'],
+               ['194', 'A - circumflex'],
+               ['195', 'A - tilde'],
+               ['196', 'A - diaeresis'],
+               ['197', 'A - ring above'],
+               ['198', 'ligature AE'],
+               ['199', 'C - cedilla'],
+               ['200', 'E - grave'],
+               ['201', 'E - acute'],
+               ['202', 'E - circumflex'],
+               ['203', 'E - diaeresis'],
+               ['204', 'I - grave'],
+               ['205', 'I - acute'],
+               ['206', 'I - circumflex'],
+               ['207', 'I - diaeresis'],
+               ['208', 'ETH'],
+               ['209', 'N - tilde'],
+               ['210', 'O - grave'],
+               ['211', 'O - acute'],
+               ['212', 'O - circumflex'],
+               ['213', 'O - tilde'],
+               ['214', 'O - diaeresis'],
+               ['216', 'O - slash'],
+               ['338', 'ligature OE'],
+               ['352', 'S - caron'],
+               ['217', 'U - grave'],
+               ['218', 'U - acute'],
+               ['219', 'U - circumflex'],
+               ['220', 'U - diaeresis'],
+               ['221', 'Y - acute'],
+               ['376', 'Y - diaeresis'],
+               ['222', 'THORN'],
+               ['224', 'a - grave'],
+               ['225', 'a - acute'],
+               ['226', 'a - circumflex'],
+               ['227', 'a - tilde'],
+               ['228', 'a - diaeresis'],
+               ['229', 'a - ring above'],
+               ['230', 'ligature ae'],
+               ['231', 'c - cedilla'],
+               ['232', 'e - grave'],
+               ['233', 'e - acute'],
+               ['234', 'e - circumflex'],
+               ['235', 'e - diaeresis'],
+               ['236', 'i - grave'],
+               ['237', 'i - acute'],
+               ['238', 'i - circumflex'],
+               ['239', 'i - diaeresis'],
+               ['240', 'eth'],
+               ['241', 'n - tilde'],
+               ['242', 'o - grave'],
+               ['243', 'o - acute'],
+               ['244', 'o - circumflex'],
+               ['245', 'o - tilde'],
+               ['246', 'o - diaeresis'],
+               ['248', 'o slash'],
+               ['339', 'ligature oe'],
+               ['353', 's - caron'],
+               ['249', 'u - grave'],
+               ['250', 'u - acute'],
+               ['251', 'u - circumflex'],
+               ['252', 'u - diaeresis'],
+               ['253', 'y - acute'],
+               ['254', 'thorn'],
+               ['255', 'y - diaeresis'],
+               ['913', 'Alpha'],
+               ['914', 'Beta'],
+               ['915', 'Gamma'],
+               ['916', 'Delta'],
+               ['917', 'Epsilon'],
+               ['918', 'Zeta'],
+               ['919', 'Eta'],
+               ['920', 'Theta'],
+               ['921', 'Iota'],
+               ['922', 'Kappa'],
+               ['923', 'Lambda'],
+               ['924', 'Mu'],
+               ['925', 'Nu'],
+               ['926', 'Xi'],
+               ['927', 'Omicron'],
+               ['928', 'Pi'],
+               ['929', 'Rho'],
+               ['931', 'Sigma'],
+               ['932', 'Tau'],
+               ['933', 'Upsilon'],
+               ['934', 'Phi'],
+               ['935', 'Chi'],
+               ['936', 'Psi'],
+               ['937', 'Omega'],
+               ['945', 'alpha'],
+               ['946', 'beta'],
+               ['947', 'gamma'],
+               ['948', 'delta'],
+               ['949', 'epsilon'],
+               ['950', 'zeta'],
+               ['951', 'eta'],
+               ['952', 'theta'],
+               ['953', 'iota'],
+               ['954', 'kappa'],
+               ['955', 'lambda'],
+               ['956', 'mu'],
+               ['957', 'nu'],
+               ['958', 'xi'],
+               ['959', 'omicron'],
+               ['960', 'pi'],
+               ['961', 'rho'],
+               ['962', 'final sigma'],
+               ['963', 'sigma'],
+               ['964', 'tau'],
+               ['965', 'upsilon'],
+               ['966', 'phi'],
+               ['967', 'chi'],
+               ['968', 'psi'],
+               ['969', 'omega'],
+       // symbols
+               ['8501', 'alef symbol'],
+               ['982',  'pi symbol'],
+               ['8476', 'real part symbol'],
+               ['978',  'upsilon - hook symbol'],
+               ['8472', 'Weierstrass p'],
+               ['8465', 'imaginary part'],
+       // arrows
+               ['8592', 'leftwards arrow'],
+               ['8593', 'upwards arrow'],
+               ['8594', 'rightwards arrow'],
+               ['8595', 'downwards arrow'],
+               ['8596', 'left right arrow'],
+               ['8629', 'carriage return'],
+               ['8656', 'leftwards double arrow'],
+               ['8657', 'upwards double arrow'],
+               ['8658', 'rightwards double arrow'],
+               ['8659', 'downwards double arrow'],
+               ['8660', 'left right double arrow'],
+               ['8756', 'therefore'],
+               ['8834', 'subset of'],
+               ['8835', 'superset of'],
+               ['8836', 'not a subset of'],
+               ['8838', 'subset of or equal to'],
+               ['8839', 'superset of or equal to'],
+               ['8853', 'circled plus'],
+               ['8855', 'circled times'],
+               ['8869', 'perpendicular'],
+               ['8901', 'dot operator'],
+               ['8968', 'left ceiling'],
+               ['8969', 'right ceiling'],
+               ['8970', 'left floor'],
+               ['8971', 'right floor'],
+               ['9001', 'left-pointing angle bracket'],
+               ['9002', 'right-pointing angle bracket'],
+               ['9674', 'lozenge'],
+               ['9824', 'black spade suit'],
+               ['9827', 'black club suit'],
+               ['9829', 'black heart suit'],
+               ['9830', 'black diamond suit'],
+               ['8194', 'en space'],
+               ['8195', 'em space'],
+               ['8201', 'thin space'],
+               ['8204', 'zero width non-joiner'],
+               ['8205', 'zero width joiner'],
+               ['8206', 'left-to-right mark'],
+               ['8207', 'right-to-left mark'],
+               ['173',  'soft hyphen']
+       ];
+
+       function showDialog() {
+               var gridHtml, x, y, win;
+
+               function getParentTd(elm) {
+                       while (elm) {
+                               if (elm.nodeName == 'TD') {
+                                       return elm;
+                               }
+
+                               elm = elm.parentNode;
+                       }
+               }
+
+               gridHtml = '<table role="presentation" cellspacing="0" class="mce-charmap"><tbody>';
+
+               var width = 25;
+               for (y = 0; y < 10; y++) {
+                       gridHtml += '<tr>';
+
+                       for (x = 0; x < width; x++) {
+                               var chr = charmap[y * width + x];
+                               var id = 'g' + (y * width + x);
+
+                               gridHtml += '<td title="' + chr[1] + '"><div id="' + id + '" tabIndex="-1">' +
+                                       (chr ? String.fromCharCode(parseInt(chr[0], 10)) : '&nbsp;') + '</div></td>';
+                       }
+
+                       gridHtml += '</tr>';
+               }
+
+               gridHtml += '</tbody></table>';
+
+               var charMapPanel = {
+                       type: 'container',
+                       html: gridHtml,
+                       onclick: function(e) {
+                               var target = e.target;
+                               if (target.nodeName == 'DIV') {
+                                       editor.execCommand('mceInsertContent', false, target.firstChild.nodeValue);
+                               }
+                       },
+                       onmouseover: function(e) {
+                               var td = getParentTd(e.target);
+
+                               if (td) {
+                                       win.find('#preview').text(td.firstChild.firstChild.data);
+                               }
+                       }
+               };
+
+               win = editor.windowManager.open({
+                       title: "Special character",
+                       spacing: 10,
+                       padding: 10,
+                       items: [
+                               charMapPanel,
+                               {
+                                       type: 'label',
+                                       name: 'preview',
+                                       text: ' ',
+                                       style: 'font-size: 40px; text-align: center',
+                                       border: 1,
+                                       minWidth: 100,
+                                       minHeight: 80
+                               }
+                       ],
+                       buttons: [
+                               {text: "Close", onclick: function() {
+                                       win.close();
+                               }}
+                       ]
+               });
+       }
+
+       editor.addButton('charmap', {
+               icon: 'charmap',
+               tooltip: 'Special character',
+               onclick: showDialog
+       });
+
+       editor.addMenuItem('charmap', {
+               icon: 'charmap',
+               text: 'Special character',
+               onclick: showDialog,
+               context: 'insert'
+       });
+});
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/src/wp-includes/js/tinymce/plugins/charmap/plugin.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="trunksrcwpincludesjstinymcepluginscharmappluginminjs"></a>
<div class="addfile"><h4>Added: trunk/src/wp-includes/js/tinymce/plugins/charmap/plugin.min.js (0 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/charmap/plugin.min.js                           (rev 0)
+++ trunk/src/wp-includes/js/tinymce/plugins/charmap/plugin.min.js      2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+tinymce.PluginManager.add("charmap",function(e){function t(){function t(e){for(;e;){if("TD"==e.nodeName)return e;e=e.parentNode}}var i,a,r,o;i='<table role="presentation" cellspacing="0" class="mce-charmap"><tbody>';var s=25;for(r=0;10>r;r++){for(i+="<tr>",a=0;s>a;a++){var l=n[r*s+a],c="g"+(r*s+a);i+='<td title="'+l[1]+'"><div id="'+c+'" tabIndex="-1">'+(l?String.fromCharCode(parseInt(l[0],10)):"&nbsp;")+"</div></td>"}i+="</tr>"}i+="</tbody></table>";var u={type:"container",html:i,onclick:function(t){var n=t.target;"DIV"==n.nodeName&&e.execCommand("mceInsertContent",!1,n.firstChild.nodeValue)},onmouseover:function(e){var n=t(e.target);n&&o.find("#preview").text(n.firstChild.firstChild.data)}};o=e.windowManager
 .open({title:"Special character",spacing:10,padding:10,items:[u,{type:"label",name:"preview",text:" ",style:"font-size: 40px; text-align: center",border:1,minWidth:100,minHeight:80}],buttons:[{text:"Close",onclick:function(){o.close()}}]})}var n=[["160","no-break space"],["38","ampersand"],["34","quotation mark"],["162","cent sign"],["8364","euro sign"],["163","pound sign"],["165","yen sign"],["169","copyright sign"],["174","registered sign"],["8482","trade mark sign"],["8240","per mille sign"],["181","micro sign"],["183","middle dot"],["8226","bullet"],["8230","three dot leader"],["8242","minutes / feet"],[&q
 uot;8243","seconds / inches"],["167","section sign"],["182","paragraph sign"],["223","sharp s / ess-zed"],["8249","single left-pointing angle quotation mark"],["8250","single right-pointing angle quotation mark"],["171","left pointing guillemet"],["187","right pointing guillemet"],["8216","left single quotation mark"],["8217","right single quotation mark"],["8220","left double quotation mark"],["8221","right double quotation mark"],["8218","single low-9 quotation mark"],["8222","double low-9 quotation mark"],["60","less-than sign"],["62","greater-than sign"],["8804","less-than or equal to"],["8805","greater-than or equal to"],["8
 211","en dash"],["8212","em dash"],["175","macron"],["8254","overline"],["164","currency sign"],["166","broken bar"],["168","diaeresis"],["161","inverted exclamation mark"],["191","turned question mark"],["710","circumflex accent"],["732","small tilde"],["176","degree sign"],["8722","minus sign"],["177","plus-minus sign"],["247","division sign"],["8260","fraction slash"],["215","multiplication sign"],["185","superscript one"],["178","superscript two"],["179","superscript three"],["188","fraction one quarter"],["189","fraction one half"],["190",&q
 uot;fraction three quarters"],["402","function / florin"],["8747","integral"],["8721","n-ary sumation"],["8734","infinity"],["8730","square root"],["8764","similar to"],["8773","approximately equal to"],["8776","almost equal to"],["8800","not equal to"],["8801","identical to"],["8712","element of"],["8713","not an element of"],["8715","contains as member"],["8719","n-ary product"],["8743","logical and"],["8744","logical or"],["172","not sign"],["8745","intersection"],["8746","union"],["8706","partial differential"],["8704","for all"],["8707","there ex
 ists"],["8709","diameter"],["8711","backward difference"],["8727","asterisk operator"],["8733","proportional to"],["8736","angle"],["180","acute accent"],["184","cedilla"],["170","feminine ordinal indicator"],["186","masculine ordinal indicator"],["8224","dagger"],["8225","double dagger"],["192","A - grave"],["193","A - acute"],["194","A - circumflex"],["195","A - tilde"],["196","A - diaeresis"],["197","A - ring above"],["198","ligature AE"],["199","C - cedilla"],["200","E - grave"],["201","E - acute"],["202","E - circumflex"],["203",&q
 uot;E - diaeresis"],["204","I - grave"],["205","I - acute"],["206","I - circumflex"],["207","I - diaeresis"],["208","ETH"],["209","N - tilde"],["210","O - grave"],["211","O - acute"],["212","O - circumflex"],["213","O - tilde"],["214","O - diaeresis"],["216","O - slash"],["338","ligature OE"],["352","S - caron"],["217","U - grave"],["218","U - acute"],["219","U - circumflex"],["220","U - diaeresis"],["221","Y - acute"],["376","Y - diaeresis"],["222","THORN"],["224","a - grave"],["225","a - acute"],["226","a - ci
 rcumflex"],["227","a - tilde"],["228","a - diaeresis"],["229","a - ring above"],["230","ligature ae"],["231","c - cedilla"],["232","e - grave"],["233","e - acute"],["234","e - circumflex"],["235","e - diaeresis"],["236","i - grave"],["237","i - acute"],["238","i - circumflex"],["239","i - diaeresis"],["240","eth"],["241","n - tilde"],["242","o - grave"],["243","o - acute"],["244","o - circumflex"],["245","o - tilde"],["246","o - diaeresis"],["248","o slash"],["339","ligature oe"],["353","s - caron"],["249","u - 
 grave"],["250","u - acute"],["251","u - circumflex"],["252","u - diaeresis"],["253","y - acute"],["254","thorn"],["255","y - diaeresis"],["913","Alpha"],["914","Beta"],["915","Gamma"],["916","Delta"],["917","Epsilon"],["918","Zeta"],["919","Eta"],["920","Theta"],["921","Iota"],["922","Kappa"],["923","Lambda"],["924","Mu"],["925","Nu"],["926","Xi"],["927","Omicron"],["928","Pi"],["929","Rho"],["931","Sigma"],["932","Tau"],["933","Upsilon"],["934","Phi&qu
 ot;],["935","Chi"],["936","Psi"],["937","Omega"],["945","alpha"],["946","beta"],["947","gamma"],["948","delta"],["949","epsilon"],["950","zeta"],["951","eta"],["952","theta"],["953","iota"],["954","kappa"],["955","lambda"],["956","mu"],["957","nu"],["958","xi"],["959","omicron"],["960","pi"],["961","rho"],["962","final sigma"],["963","sigma"],["964","tau"],["965","upsilon"],["966","phi"],["967","chi"],["968","psi"],["969","omega"],[&
 quot;8501","alef symbol"],["982","pi symbol"],["8476","real part symbol"],["978","upsilon - hook symbol"],["8472","Weierstrass p"],["8465","imaginary part"],["8592","leftwards arrow"],["8593","upwards arrow"],["8594","rightwards arrow"],["8595","downwards arrow"],["8596","left right arrow"],["8629","carriage return"],["8656","leftwards double arrow"],["8657","upwards double arrow"],["8658","rightwards double arrow"],["8659","downwards double arrow"],["8660","left right double arrow"],["8756","therefore"],["8834","subset of"],["8835","superset of"],["8836","not a subset of"],[
 "8838","subset of or equal to"],["8839","superset of or equal to"],["8853","circled plus"],["8855","circled times"],["8869","perpendicular"],["8901","dot operator"],["8968","left ceiling"],["8969","right ceiling"],["8970","left floor"],["8971","right floor"],["9001","left-pointing angle bracket"],["9002","right-pointing angle bracket"],["9674","lozenge"],["9824","black spade suit"],["9827","black club suit"],["9829","black heart suit"],["9830","black diamond suit"],["8194","en space"],["8195","em space"],["8201","thin space"],["8204","zero width non-joiner"],["8205&
 quot;,"zero width joiner"],["8206","left-to-right mark"],["8207","right-to-left mark"],["173","soft hyphen"]];e.addButton("charmap",{icon:"charmap",tooltip:"Special character",onclick:t}),e.addMenuItem("charmap",{icon:"charmap",text:"Special character",onclick:t,context:"insert"})});
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/src/wp-includes/js/tinymce/plugins/charmap/plugin.min.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="trunksrcwpincludesjstinymcepluginscompat3xcssdialogcss"></a>
<div class="addfile"><h4>Added: trunk/src/wp-includes/js/tinymce/plugins/compat3x/css/dialog.css (0 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/compat3x/css/dialog.css                         (rev 0)
+++ trunk/src/wp-includes/js/tinymce/plugins/compat3x/css/dialog.css    2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -0,0 +1,212 @@
</span><ins>+@import url('//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,300,400,600&subset=latin-ext,latin');
+
+/* Generic */
+body {
+font-family: "Open Sans", sans-serif;
+font-size:13px;
+background:#fcfcfc;
+padding:0;
+margin:8px 8px 0 8px;
+}
+
+textarea {resize:none;outline:none;}
+
+a:link, a:hover {
+       color: #2B6FB6;
+}
+
+a:visited {
+       color: #3C2BB6;
+}
+
+.nowrap {white-space: nowrap}
+
+/* Forms */
+form {margin: 0;}
+fieldset {margin:0; padding:4px; border:1px solid #dfdfdf; font-family:Verdana, Arial; font-size:10px;}
+legend {color:#2B6FB6; font-weight:bold;}
+label.msg {display:none;}
+label.invalid {color:#EE0000; display:inline;}
+input.invalid {border:1px solid #EE0000;}
+input {background:#FFF; border:1px solid #dfdfdf;}
+input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+input, select, textarea {border:1px solid #dfdfdf;}
+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,
+#apply,
+.mceActionPanel .button,
+input.mceButton,
+.updateButton {
+       display: inline-block;
+       text-decoration: none;
+       border: 1px solid #adadad;
+       margin: 0;
+       padding: 0 10px 1px;
+       font-size: 13px;
+       height: 24px;
+       line-height: 22px;
+       color: #333;
+       cursor: pointer;
+       -webkit-border-radius: 3px;
+       -webkit-appearance: none;
+       border-radius: 3px;
+       white-space: nowrap;
+       -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+       box-sizing: border-box;
+       background: #fafafa;
+       background-image: -webkit-gradient(linear, left top, left bottom, from(#fafafa), to(#e9e9e9));
+       background-image: -webkit-linear-gradient(top, #fafafa, #e9e9e9);
+       background-image: -moz-linear-gradient(top, #fafafa, #e9e9e9);
+       background-image: -o-linear-gradient(top, #fafafa, #e9e9e9);
+       background-image: linear-gradient(to bottom, #fafafa, #e9e9e9);
+       
+       text-shadow: 0 1px 0 #fff;
+       -webkit-box-shadow: inset 0 1px 0 #fff;
+       -moz-box-shadow: inset 0 1px 0 #fff;
+       box-shadow: inset 0 1px 0 #fff;
+}
+
+#insert {
+       background: #2ea2cc;
+       background: -webkit-gradient(linear, left top, left bottom, from(#2ea2cc), to(#1e8cbe));
+       background: -webkit-linear-gradient(top, #2ea2cc 0%,#1e8cbe 100%);
+       background: linear-gradient(top, #2ea2cc 0%,#1e8cbe 100%);
+       filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#2ea2cc', endColorstr='#1e8cbe',GradientType=0 );
+       border-color: #0074a2;
+       -webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.5);
+       box-shadow: inset 0 1px 0 rgba(120,200,230,0.5);
+       color: #fff;
+       text-decoration: none;
+       text-shadow: 0 1px 0 rgba(0,86,132,0.7);
+}
+
+#cancel:hover,
+input.mceButton:hover,
+.updateButton:hover,
+#cancel:focus,
+input.mceButton:focus,
+.updateButton:focus {
+       background: #f3f3f3;
+       background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#f3f3f3));
+       background-image: -webkit-linear-gradient(top, #fff, #f3f3f3);
+       background-image: -moz-linear-gradient(top, #fff, #f3f3f3);
+       background-image: -ms-linear-gradient(top, #fff, #f3f3f3);
+       background-image: -o-linear-gradient(top, #fff, #f3f3f3);
+       background-image: linear-gradient(to bottom, #fff, #f3f3f3);
+       border-color: #999;
+       color: #222;
+}
+
+#insert:hover,
+#insert:focus {
+       background: #1e8cbe;
+       background: -webkit-gradient(linear, left top, left bottom, from(#1e8cbe), to(#0074a2));
+       background: -webkit-linear-gradient(top, #1e8cbe 0%,#0074a2 100%);
+       background: linear-gradient(top, #1e8cbe 0%,#0074a2 100%);
+       filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1e8cbe', endColorstr='#0074a2',GradientType=0 );
+       border-color: #0074a2;
+       -webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.6);
+       box-shadow: inset 0 1px 0 rgba(120,200,230,0.6);
+       color: #fff;
+}
+
+.mceActionPanel #insert {
+       float: right;
+}
+
+/* Browse */
+a.pickcolor, a.browse {text-decoration:none}
+a.browse span {display:block; width:20px; height:18px; 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; margin-left:2px;}
+.mceOldBoxModel a.pickcolor span {width:21px; height:17px;}
+a.pickcolor:hover span {background-color:#B2BBD0;}
+div.iframecontainer {background: #fff;}
+
+/* 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}
+#charmap #charmapView {background-color:#fff;}
+
+/* Source */
+.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;}
+.mceActionPanel {margin-top:5px;}
+
+/* Tabs classes */
+.tabs {width:100%; height:19px; line-height:normal; border-bottom: 1px solid #aaa;}
+.tabs ul {margin:0; padding:0; list-style:none;}
+.tabs li {float:left; border: 1px solid #aaa; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;}
+.tabs li.current {border-bottom: 1px solid #fff; 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;}
+
+.wp-core-ui #tabs {
+       padding-bottom: 5px;
+       background-color: transparent;
+}
+
+.wp-core-ui #tabs a {
+       padding: 6px 10px;
+       margin: 0 2px;
+}
+
+/* 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; border-top:0px; 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 {display:inline-block; padding-left:40px; height:14px; border:1px solid black; margin-left:5px; margin-right: 5px}
+#colorpicker #previewblock {position: relative; top: -3px; padding-left:5px; padding-top: 0px; display:inline}
+#colorpicker #preview_wrapper {text-align:center; padding-top:4px; white-space: nowrap; float: right;}
+#colorpicker #insert, #colorpicker #cancel {width: 90px}
+#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 .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;}
+#colorpicker #picker_panel fieldset {margin:auto;width:325px;}
+
+
+/* Localization */ 
+
+body[dir="rtl"],
+body[dir="rtl"] fieldset,
+body[dir="rtl"] input, body[dir="rtl"] select, body[dir="rtl"]  textarea,
+body[dir="rtl"]  #charmap #codeN,
+body[dir="rtl"] .tabs a {
+       font-family: Tahoma, sans-serif;
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginscompat3xpluginjs"></a>
<div class="addfile"><h4>Added: trunk/src/wp-includes/js/tinymce/plugins/compat3x/plugin.js (0 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/compat3x/plugin.js                              (rev 0)
+++ trunk/src/wp-includes/js/tinymce/plugins/compat3x/plugin.js 2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -0,0 +1,235 @@
</span><ins>+/**
+ * plugin.js
+ *
+ * Copyright, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://www.tinymce.com/license
+ * Contributing: http://www.tinymce.com/contributing
+ */
+
+/*global tinymce:true, console:true */
+
+/**
+ * This plugin adds missing events form the 4.x API back. Not every event is
+ * properly supported but most things should work.
+ *
+ * Unsupported things:
+ *  - No editor.onEvent
+ *  - Can't cancel execCommands with beforeExecCommand
+ */
+(function(tinymce) {
+       var reported;
+
+       function log(apiCall) {
+               if (!reported && window && window.console) {
+                       reported = true;
+                       console.log("Deprecated TinyMCE API call: " + apiCall);
+               }
+       }
+
+       function Dispatcher(target, newEventName, argsMap, defaultScope) {
+               target = target || this;
+
+               this.add = function(callback, scope) {
+                       log('<target>.on' + newEventName + ".add(..)");
+
+                       // Convert callback({arg1:x, arg2:x}) -> callback(arg1, arg2)
+                       function patchedEventCallback(e) {
+                               var callbackArgs = [];
+
+                               if (typeof argsMap == "string") {
+                                       argsMap = argsMap.split(" ");
+                               }
+
+                               if (argsMap && typeof argsMap != "function") {
+                                       for (var i = 0; i < argsMap.length; i++) {
+                                               callbackArgs.push(e[argsMap[i]]);
+                                       }
+                               }
+
+                               if (typeof argsMap == "function") {
+                                       callbackArgs = argsMap(newEventName, e, target);
+                                       if (!callbackArgs) {
+                                               return;
+                                       }
+                               }
+
+                               if (!argsMap) {
+                                       callbackArgs = [e];
+                               }
+
+                               callbackArgs.unshift(defaultScope || target);
+
+                               if (callback.apply(scope || defaultScope || target, callbackArgs) === false) {
+                                       e.stopImmediatePropagation();
+                               }
+                       }
+
+                       target.on(newEventName, patchedEventCallback);
+
+                       return patchedEventCallback;
+               };
+
+               // Not supported to just use add
+               this.addToTop = this.add;
+
+               this.remove = function(callback) {
+                       return target.off(newEventName, callback);
+               };
+
+               this.dispatch = function() {
+                       target.fire(newEventName);
+
+                       return true;
+               };
+       }
+
+       tinymce.onBeforeUnload = new Dispatcher(tinymce, "BeforeUnload");
+       tinymce.onAddEditor = new Dispatcher(tinymce, "AddEditor", "editor");
+       tinymce.onRemoveEditor = new Dispatcher(tinymce, "RemoveEditor", "editor");
+
+       function patchEditor(editor) {
+               function patchEditorEvents(oldEventNames, argsMap) {
+                       tinymce.each(oldEventNames.split(" "), function(oldName) {
+                               editor["on" + oldName] = new Dispatcher(editor, oldName, argsMap);
+                       });
+               }
+
+               function convertUndoEventArgs(type, event, target) {
+                       return [
+                               event.level,
+                               target
+                       ];
+               }
+
+               function filterSelectionEvents(needsSelection) {
+                       return function(type, e) {
+                               if ((!e.selection && !needsSelection) || e.selection == needsSelection) {
+                                       return [e];
+                               }
+                       };
+               }
+
+               if (editor.controlManager) {
+                       return;
+               }
+
+               editor.controlManager = {
+                       buttons: {},
+
+                       setDisabled: function(name, state) {
+                               log("controlManager.setDisabled(..)");
+
+                               if (this.buttons[name]) {
+                                       this.buttons[name].disabled(state);
+                               }
+                       },
+
+                       setActive: function(name, state) {
+                               log("controlManager.setActive(..)");
+
+                               if (this.buttons[name]) {
+                                       this.buttons[name].active(state);
+                               }
+                       },
+               };
+
+               patchEditorEvents("PreInit BeforeRenderUI PostRender Load Init Remove Activate Deactivate", "editor");
+               patchEditorEvents("Click MouseUp MouseDown DblClick KeyDown KeyUp KeyPress ContextMenu Paste Submit Reset");
+               patchEditorEvents("BeforeExecCommand ExecCommand", "command ui value args"); // args.terminate not supported
+               patchEditorEvents("PreProcess PostProcess LoadContent SaveContent Change");
+               patchEditorEvents("BeforeSetContent BeforeGetContent SetContent GetContent", filterSelectionEvents(false));
+               patchEditorEvents("SetProgressState", "state time");
+               patchEditorEvents("VisualAid", "element hasVisual");
+               patchEditorEvents("Undo Redo", convertUndoEventArgs);
+
+               patchEditorEvents("NodeChange", function(type, e) {
+                       return [
+                               editor.controlManager,
+                               e.element,
+                               editor.selection.isCollapsed(),
+                               e
+                       ];
+               });
+
+               var originalAddButton = editor.addButton;
+               editor.addButton = function(name, settings) {
+                       var originalOnPostRender;
+
+                       function patchedPostRender() {
+                               editor.controlManager.buttons[name] = this;
+
+                               if (originalOnPostRender) {
+                                       return originalOnPostRender.call(this);
+                               }
+                       }
+
+                       for (var key in settings) {
+                               if (key.toLowerCase() === "onpostrender") {
+                                       originalOnPostRender = settings[key];
+                                       settings.onPostRender = patchedPostRender;
+                               }
+                       }
+
+                       if (!originalOnPostRender) {
+                               settings.onPostRender = patchedPostRender;
+                       }
+
+                       settings.title = tinymce.i18n.translate((editor.settings.language || "en") + "." + settings.title);
+
+                       return originalAddButton.call(this, name, settings);
+               };
+
+               editor.on('init', function() {
+                       var undoManager = editor.undoManager, selection = editor.selection;
+
+                       undoManager.onUndo = new Dispatcher(editor, "Undo", convertUndoEventArgs, null, undoManager);
+                       undoManager.onRedo = new Dispatcher(editor, "Redo", convertUndoEventArgs, null, undoManager);
+                       undoManager.onBeforeAdd = new Dispatcher(editor, "BeforeAddUndo", null, undoManager);
+                       undoManager.onAdd = new Dispatcher(editor, "AddUndo", null, undoManager);
+
+                       selection.onBeforeGetContent = new Dispatcher(editor, "BeforeGetContent", filterSelectionEvents(true), selection);
+                       selection.onGetContent = new Dispatcher(editor, "GetContent", filterSelectionEvents(true), selection);
+                       selection.onBeforeSetContent = new Dispatcher(editor, "BeforeSetContent", filterSelectionEvents(true), selection);
+                       selection.onSetContent = new Dispatcher(editor, "SetContent", filterSelectionEvents(true), selection);
+
+                       editor.windowManager.createInstance = function(className, a, b, c, d, e) {
+                               log("windowManager.createInstance(..)");
+
+                               var constr = tinymce.resolve(className);
+                               return new constr(a, b, c, d, e);
+                       };
+               });
+       }
+
+       tinymce.on('SetupEditor', patchEditor);
+       tinymce.PluginManager.add("compat3x", patchEditor);
+
+       tinymce.addI18n = function(prefix, o) {
+               var I18n = tinymce.util.I18n, each = tinymce.each;
+
+               if (typeof(prefix) == "string" && prefix.indexOf('.') === -1) {
+                       I18n.add(prefix, o);
+                       return;
+               }
+
+               if (!tinymce.is(prefix, 'string')) {
+                       each(prefix, function(o, lc) {
+                               each(o, function(o, g) {
+                                       each(o, function(o, k) {
+                                               if (g === 'common') {
+                                                       I18n.data[lc + '.' + k] = o;
+                                               } else {
+                                                       I18n.data[lc + '.' + g + '.' + k] = o;
+                                               }
+                                       });
+                               });
+                       });
+               } else {
+                       each(o, function(o, k) {
+                               I18n.data[prefix + '.' + k] = o;
+                       });
+               }
+       };
+})(tinymce);
</ins><span class="cx">Property changes on: trunk/src/wp-includes/js/tinymce/plugins/compat3x/plugin.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="trunksrcwpincludesjstinymcepluginscompat3xpluginminjs"></a>
<div class="addfile"><h4>Added: trunk/src/wp-includes/js/tinymce/plugins/compat3x/plugin.min.js (0 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/compat3x/plugin.min.js                          (rev 0)
+++ trunk/src/wp-includes/js/tinymce/plugins/compat3x/plugin.min.js     2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+!function(n){function e(n){!i&&window&&window.console&&(i=!0,console.log("Deprecated TinyMCE API call: "+n))}function t(n,t,o,i){n=n||this,this.add=function(r,a){function d(e){var d=[];if("string"==typeof o&&(o=o.split(" ")),o&&"function"!=typeof o)for(var s=0;s<o.length;s++)d.push(e[o[s]]);("function"!=typeof o||(d=o(t,e,n)))&&(o||(d=[e]),d.unshift(i||n),r.apply(a||i||n,d)===!1&&e.stopImmediatePropagation())}return e("<target>.on"+t+".add(..)"),n.on(t,d),d},this.addToTop=this.add,this.remove=function(e){return n.off(t,e)},this.dispatch=function(){return n.fire(t),!0}}function o(o){function i(e,i){n.each(e.split(" "),function(n){o["on"+n]=new t(o,n,i)})}function r(n,e,t){return[e.level,t]}function a(n){return function(e,t){return!t.selection&&!n||t.selection==n?[t]:void 0}}if(!o.controlManager){o.controlManager
 ={buttons:{},setDisabled:function(n,t){e("controlManager.setDisabled(..)"),this.buttons[n]&&this.buttons[n].disabled(t)},setActive:function(n,t){e("controlManager.setActive(..)"),this.buttons[n]&&this.buttons[n].active(t)}},i("PreInit BeforeRenderUI PostRender Load Init Remove Activate Deactivate","editor"),i("Click MouseUp MouseDown DblClick KeyDown KeyUp KeyPress ContextMenu Paste Submit Reset"),i("BeforeExecCommand ExecCommand","command ui value args"),i("PreProcess PostProcess LoadContent SaveContent Change"),i("BeforeSetContent BeforeGetContent SetContent GetContent",a(!1)),i("SetProgressState","state time"),i("VisualAid","element hasVisual"),i("Undo Redo",r),i("NodeChange",function(n,e){return[o.controlManager,e.element,o.selection.isCollapsed(),e]});var d=o.addButton;o.addButton=function(e,t){function i(){return 
 o.controlManager.buttons[e]=this,r?r.call(this):void 0}var r;for(var a in t)"onpostrender"===a.toLowerCase()&&(r=t[a],t.onPostRender=i);return r||(t.onPostRender=i),t.title=n.i18n.translate((o.settings.language||"en")+"."+t.title),d.call(this,e,t)},o.on("init",function(){var i=o.undoManager,d=o.selection;i.onUndo=new t(o,"Undo",r,null,i),i.onRedo=new t(o,"Redo",r,null,i),i.onBeforeAdd=new t(o,"BeforeAddUndo",null,i),i.onAdd=new t(o,"AddUndo",null,i),d.onBeforeGetContent=new t(o,"BeforeGetContent",a(!0),d),d.onGetContent=new t(o,"GetContent",a(!0),d),d.onBeforeSetContent=new t(o,"BeforeSetContent",a(!0),d),d.onSetContent=new t(o,"SetContent",a(!0),d),o.windowManager.createInstance=function(t,o,i,r,a,d){e("windowManager.createInstance(..)");var s=n.resolve(t);return new s(o,i,r,a,d)}})}}var i;n.onBeforeUnload=new t(n,"BeforeUnload"),n.onAd
 dEditor=new t(n,"AddEditor","editor"),n.onRemoveEditor=new t(n,"RemoveEditor","editor"),n.on("SetupEditor",o),n.PluginManager.add("compat3x",o),n.addI18n=function(e,t){var o=n.util.I18n,i=n.each;return"string"==typeof e&&-1===e.indexOf(".")?(o.add(e,t),void 0):(n.is(e,"string")?i(t,function(n,t){o.data[e+"."+t]=n}):i(e,function(n,e){i(n,function(n,t){i(n,function(n,i){"common"===t?o.data[e+"."+i]=n:o.data[e+"."+t+"."+i]=n})})}),void 0)}}(tinymce);
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/src/wp-includes/js/tinymce/plugins/compat3x/plugin.min.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="trunksrcwpincludesjstinymcepluginsdirectionalityeditor_pluginjs"></a>
<div class="delfile"><h4>Deleted: trunk/src/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js 2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js    2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-(function(){tinymce.create("tinymce.plugins.Directionality",{init:function(b,c){var d=this;d.editor=b;function a(e){var h=b.dom,g,f=b.selection.getSelectedBlocks();if(f.length){g=h.getAttrib(f[0],"dir");tinymce.each(f,function(i){if(!h.getParent(i.parentNode,"*[dir='"+e+"']",h.getRoot())){if(g!=e){h.setAttrib(i,"dir",e)}else{h.setAttrib(i,"dir",null)}}});b.nodeChanged()}}b.addCommand("mceDirectionLTR",function(){a("ltr")});b.addCommand("mceDirectionRTL",function(){a("rtl")});b.addButton("ltr",{title:"directionality.ltr_desc",cmd:"mceDirectionLTR"});b.addButton("rtl",{title:"directionality.rtl_desc",cmd:"mceDirectionRTL"});b.onNodeChange.add(d._nodeChange,d)},getInfo:function(){return{longname:"Directionality",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infou
 rl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var d=b.dom,c;e=d.getParent(e,d.isBlock);if(!e){a.setDisabled("ltr",1);a.setDisabled("rtl",1);return}c=d.getAttrib(e,"dir");a.setActive("ltr",c=="ltr");a.setDisabled("ltr",0);a.setActive("rtl",c=="rtl");a.setDisabled("rtl",0)}});tinymce.PluginManager.add("directionality",tinymce.plugins.Directionality)})();
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginsdirectionalityeditor_plugin_srcjs"></a>
<div class="delfile"><h4>Deleted: trunk/src/wp-includes/js/tinymce/plugins/directionality/editor_plugin_src.js (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/directionality/editor_plugin_src.js     2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-includes/js/tinymce/plugins/directionality/editor_plugin_src.js        2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -1,85 +0,0 @@
</span><del>-/**
- * editor_plugin_src.js
- *
- * Copyright 2009, Moxiecode Systems AB
- * Released under LGPL License.
- *
- * License: http://tinymce.moxiecode.com/license
- * Contributing: http://tinymce.moxiecode.com/contributing
- */
-
-(function() {
-       tinymce.create('tinymce.plugins.Directionality', {
-               init : function(ed, url) {
-                       var t = this;
-
-                       t.editor = ed;
-
-                       function setDir(dir) {
-                               var dom = ed.dom, curDir, blocks = ed.selection.getSelectedBlocks();
-
-                               if (blocks.length) {
-                                       curDir = dom.getAttrib(blocks[0], "dir");
-
-                                       tinymce.each(blocks, function(block) {
-                                               // Add dir to block if the parent block doesn't already have that dir
-                                               if (!dom.getParent(block.parentNode, "*[dir='" + dir + "']", dom.getRoot())) {
-                                                       if (curDir != dir) {
-                                                               dom.setAttrib(block, "dir", dir);
-                                                       } else {
-                                                               dom.setAttrib(block, "dir", null);
-                                                       }
-                                               }
-                                       });
-
-                                       ed.nodeChanged();
-                               }
-                       }
-
-                       ed.addCommand('mceDirectionLTR', function() {
-                               setDir("ltr");
-                       });
-
-                       ed.addCommand('mceDirectionRTL', function() {
-                               setDir("rtl");
-                       });
-
-                       ed.addButton('ltr', {title : 'directionality.ltr_desc', cmd : 'mceDirectionLTR'});
-                       ed.addButton('rtl', {title : 'directionality.rtl_desc', cmd : 'mceDirectionRTL'});
-
-                       ed.onNodeChange.add(t._nodeChange, t);
-               },
-
-               getInfo : function() {
-                       return {
-                               longname : 'Directionality',
-                               author : 'Moxiecode Systems AB',
-                               authorurl : 'http://tinymce.moxiecode.com',
-                               infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality',
-                               version : tinymce.majorVersion + "." + tinymce.minorVersion
-                       };
-               },
-
-               // Private methods
-
-               _nodeChange : function(ed, cm, n) {
-                       var dom = ed.dom, dir;
-
-                       n = dom.getParent(n, dom.isBlock);
-                       if (!n) {
-                               cm.setDisabled('ltr', 1);
-                               cm.setDisabled('rtl', 1);
-                               return;
-                       }
-
-                       dir = dom.getAttrib(n, 'dir');
-                       cm.setActive('ltr', dir == "ltr");
-                       cm.setDisabled('ltr', 0);
-                       cm.setActive('rtl', dir == "rtl");
-                       cm.setDisabled('rtl', 0);
-               }
-       });
-
-       // Register plugin
-       tinymce.PluginManager.add('directionality', tinymce.plugins.Directionality);
-})();
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginsdirectionalitypluginjsfromrev26862trunksrcwpincludesjstinymcepluginsdirectionalityeditor_plugin_srcjs"></a>
<div class="copfile"><h4>Copied: trunk/src/wp-includes/js/tinymce/plugins/directionality/plugin.js (from rev 26862, trunk/src/wp-includes/js/tinymce/plugins/directionality/editor_plugin_src.js) (0 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/directionality/plugin.js                                (rev 0)
+++ trunk/src/wp-includes/js/tinymce/plugins/directionality/plugin.js   2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+/**
+ * plugin.js
+ *
+ * Copyright, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://www.tinymce.com/license
+ * Contributing: http://www.tinymce.com/contributing
+ */
+
+/*global tinymce:true */
+
+tinymce.PluginManager.add('directionality', function(editor) {
+       function setDir(dir) {
+               var dom = editor.dom, curDir, blocks = editor.selection.getSelectedBlocks();
+
+               if (blocks.length) {
+                       curDir = dom.getAttrib(blocks[0], "dir");
+
+                       tinymce.each(blocks, function(block) {
+                               // Add dir to block if the parent block doesn't already have that dir
+                               if (!dom.getParent(block.parentNode, "*[dir='" + dir + "']", dom.getRoot())) {
+                                       if (curDir != dir) {
+                                               dom.setAttrib(block, "dir", dir);
+                                       } else {
+                                               dom.setAttrib(block, "dir", null);
+                                       }
+                               }
+                       });
+
+                       editor.nodeChanged();
+               }
+       }
+
+       function generateSelector(dir) {
+               var selector = [];
+
+               tinymce.each('h1 h2 h3 h4 h5 h6 div p'.split(' '), function(name) {
+                       selector.push(name + '[dir=' + dir + ']');
+               });
+
+               return selector.join(',');
+       }
+
+       editor.addCommand('mceDirectionLTR', function() {
+               setDir("ltr");
+       });
+
+       editor.addCommand('mceDirectionRTL', function() {
+               setDir("rtl");
+       });
+
+       editor.addButton('ltr', {
+               title: 'Left to right',
+               cmd: 'mceDirectionLTR',
+               stateSelector: generateSelector('ltr')
+       });
+
+       editor.addButton('rtl', {
+               title: 'Right to left',
+               cmd: 'mceDirectionRTL',
+               stateSelector: generateSelector('rtl')
+       });
+});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginsdirectionalitypluginminjsfromrev26875trunksrcwpincludesjstinymcepluginsdirectionalityeditor_pluginjs"></a>
<div class="copfile"><h4>Copied: trunk/src/wp-includes/js/tinymce/plugins/directionality/plugin.min.js (from rev 26875, trunk/src/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js) (0 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/directionality/plugin.min.js                            (rev 0)
+++ trunk/src/wp-includes/js/tinymce/plugins/directionality/plugin.min.js       2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+tinymce.PluginManager.add("directionality",function(e){function t(t){var n,i=e.dom,a=e.selection.getSelectedBlocks();a.length&&(n=i.getAttrib(a[0],"dir"),tinymce.each(a,function(e){i.getParent(e.parentNode,"*[dir='"+t+"']",i.getRoot())||(n!=t?i.setAttrib(e,"dir",t):i.setAttrib(e,"dir",null))}),e.nodeChanged())}function n(e){var t=[];return tinymce.each("h1 h2 h3 h4 h5 h6 div p".split(" "),function(n){t.push(n+"[dir="+e+"]")}),t.join(",")}e.addCommand("mceDirectionLTR",function(){t("ltr")}),e.addCommand("mceDirectionRTL",function(){t("rtl")}),e.addButton("ltr",{title:"Left to right",cmd:"mceDirectionLTR",stateSelector:n("ltr")}),e.addButton("rtl",{title:"Right to left",cmd:"mceDirectionRTL",stateSelector:n("rtl")})});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginsfullscreeneditor_pluginjs"></a>
<div class="delfile"><h4>Deleted: trunk/src/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js     2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js        2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-(function(){var b=tinymce.DOM;var a=function(d,f,e){var c=function(g){var i=d.controlManager.get(g);var h=f.controlManager.get(g);if(i&&h){h.displayColor(i.value)}};c("forecolor");c("backcolor");f.setContent(d.getContent({format:"raw"}),{format:"raw"});f.selection.moveToBookmark(e);if(d.plugins.spellchecker&&f.plugins.spellchecker){f.plugins.spellchecker.setLanguage(d.plugins.spellchecker.selectedLang)}};tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(i,c){var l=this,m={},k=b.doc.documentElement,d,o,h,g,f,e,j;i.addCommand("mceFullScreen",function(){var q,r;if(i.getParam("fullscreen_is_enabled")){if(i.getParam("fullscreen_new_window")){closeFullscreen()}else{b.win.setTimeout(function(){var t=i;var s=tinyMCE.get(t.getParam("fullscreen_editor_id"));s.plugins.fullscreen.saveState(t);tinyMCE.remove(t)},10)}return}if(i.getParam("fullscreen_new_window&
 quot;)){l.fullscreenSettings={bookmark:i.selection.getBookmark()};q=b.win.open(c+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{q.resizeTo(screen.availWidth,screen.availHeight)}catch(p){}}else{o=b.getStyle(b.doc.body,"overflow",1)||"auto";h=b.getStyle(k,"overflow",1);d=b.getViewPort();g=d.x;f=d.y;if(tinymce.isOpera&&o=="visible"){o="auto"}if(tinymce.isIE&&o=="scroll"){o="auto"}if(tinymce.isIE&&(h=="visible"||h=="scroll")){h="auto"}if(o=="0px"){o=""}b.setStyle(b.doc.body,"overflow","hidden");k.style.overflow="hidden";d=b.getViewPort();b.win.scrollTo(0,0);if(tinymce.isIE){d.h-=1}if(tinymce.isIE6||document.compatMode=="BackCompat"){e=&q
 uot;absolute;top:"+d.y}else{e="fixed;top:0"}n=b.add(b.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+e+";left:0;width:"+d.w+"px;height:"+d.h+"px;z-index:200000;"});b.add(n,"div",{id:"mce_fullscreen"});tinymce.each(i.settings,function(s,t){m[t]=s});m.id="mce_fullscreen";m.width=n.clientWidth;m.height=n.clientHeight-15;m.fullscreen_is_enabled=true;m.fullscreen_editor_id=i.id;m.theme_advanced_resizing=false;m.save_onsavecallback=function(){i.setContent(tinyMCE.get(m.id).getContent());i.execCommand("mceSave")};tinymce.each(i.getParam("fullscreen_settings"),function(t,s){m[s]=t});l.fullscreenSettings={bookmark:i.selection.getBookmark(),fullscreen_overflow:o,fullscreen_html_overflow:h,fullscreen_scrollx:g,fullscreen_scrolly:f};if(m.theme_advanced_toolbar_location==="external"){m.theme_advanced_toolbar_location="top"}tinyMCE.oldSe
 ttings=tinyMCE.settings;l.fullscreenEditor=new tinymce.Editor("mce_fullscreen",m);l.fullscreenEditor.onInit.add(function(){l.loadState(l.fullscreenEditor)});l.fullscreenEditor.render();l.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");l.fullscreenElement.update();l.resizeFunc=tinymce.dom.Event.add(b.win,"resize",function(){var v=tinymce.DOM.getViewPort(),t=l.fullscreenEditor,s,u;s=t.dom.getSize(t.getContainer().getElementsByTagName("table")[0]);u=t.dom.getSize(t.getContainer().getElementsByTagName("iframe")[0]);t.theme.resizeTo(v.w-s.w+u.w,v.h-s.h+u.h)})}});i.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});i.onNodeChange.add(function(q,p){p.setActive("fullscreen",q.getParam("fullscreen_is_enabled"))});l.loadState=function(p){if(!(p&&l.fullscreenSettings)){throw"No fullscreen editor to load to"}a(i,p,l.fullscreenSettings.boo
 kmark);p.focus()};l.saveState=function(q){if(!(q&&l.fullscreenSettings)){throw"No fullscreen editor to restore from"}var p=l.fullscreenSettings;a(q,i,q.selection.getBookmark());if(!i.getParam("fullscreen_new_window")){tinymce.dom.Event.remove(b.win,"resize",l.resizeFunc);delete l.resizeFunc;b.remove("mce_fullscreen_container");b.doc.documentElement.style.overflow=p.fullscreen_html_overflow;b.setStyle(b.doc.body,"overflow",p.fullscreen_overflow);b.win.scrollTo(p.fullscreen_scrollx,p.fullscreen_scrolly)}tinyMCE.settings=tinyMCE.oldSettings;delete tinyMCE.oldSettings;delete l.fullscreenEditor;delete l.fullscreenElement;delete l.fullscreenSettings;b.win.setTimeout(function(){i.selection.moveToBookmark(j);i.focus()},10)}},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugi
 ns/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginsfullscreeneditor_plugin_srcjs"></a>
<div class="delfile"><h4>Deleted: trunk/src/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin_src.js (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin_src.js 2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin_src.js    2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -1,234 +0,0 @@
</span><del>-/**
- * editor_plugin_src.js
- *
- * Copyright 2009, Moxiecode Systems AB
- * Released under LGPL License.
- *
- * License: http://tinymce.moxiecode.com/license
- * Contributing: http://tinymce.moxiecode.com/contributing
- */
-
-(function() {
-       var DOM = tinymce.DOM;
-
-       // State Transfer function
-       var transferState = function(oldEditor, newEditor, bookmark) {
-               var transferColorButtonState = function(swapme) {
-                       var c = oldEditor.controlManager.get(swapme);
-                       var newC = newEditor.controlManager.get(swapme);
-
-                       if (c && newC) {
-                               newC.displayColor(c.value);
-                       }
-
-               };
-
-               transferColorButtonState('forecolor');
-               transferColorButtonState('backcolor');
-               newEditor.setContent(oldEditor.getContent({format : 'raw'}), {format : 'raw'});
-               newEditor.selection.moveToBookmark(bookmark);
-
-               if (oldEditor.plugins.spellchecker && newEditor.plugins.spellchecker) {
-                       newEditor.plugins.spellchecker.setLanguage(oldEditor.plugins.spellchecker.selectedLang);
-               }
-       };
-
-       tinymce.create('tinymce.plugins.FullScreenPlugin', {
-               init : function(ed, url) {
-                       var t = this, s = {}, de = DOM.doc.documentElement, vp, fullscreen_overflow, fullscreen_html_overflow, fullscreen_scrollx, fullscreen_scrolly, posCss, bookmark;
-
-                       // Register commands
-                       ed.addCommand('mceFullScreen', function() {
-                               var win, oed;
-
-                               if (ed.getParam('fullscreen_is_enabled')) {
-                                       if (ed.getParam('fullscreen_new_window'))
-                                               closeFullscreen(); // Call to close in fullscreen.htm
-                                       else {
-                                               DOM.win.setTimeout(function() {
-                                                       var fullscreenEditor = ed;
-
-                                                       // find the editor that opened this one, execute restore function there
-                                                       var originalEditor = tinyMCE.get(fullscreenEditor.getParam('fullscreen_editor_id'));
-                                                       originalEditor.plugins.fullscreen.saveState(fullscreenEditor);
-
-                                                       tinyMCE.remove(fullscreenEditor);
-                                               }, 10);
-                                       }
-
-                                       return;
-                               }
-
-                               if (ed.getParam('fullscreen_new_window')) {
-                                       t.fullscreenSettings = {
-                                               bookmark: ed.selection.getBookmark()
-                                       };
-                                       win = DOM.win.open(url + "/fullscreen.htm", "mceFullScreenPopup", "fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width=" + screen.availWidth + ",height=" + screen.availHeight);
-                                       try {
-                                               win.resizeTo(screen.availWidth, screen.availHeight);
-                                       } catch (e) {
-                                               // Ignore
-                                       }
-                               } else {
-                                       fullscreen_overflow = DOM.getStyle(DOM.doc.body, 'overflow', 1) || 'auto';
-                                       fullscreen_html_overflow = DOM.getStyle(de, 'overflow', 1);
-                                       vp = DOM.getViewPort();
-                                       fullscreen_scrollx = vp.x;
-                                       fullscreen_scrolly = vp.y;
-
-                                       // Fixes an Opera bug where the scrollbars doesn't reappear
-                                       if (tinymce.isOpera && fullscreen_overflow == 'visible')
-                                               fullscreen_overflow = 'auto';
-
-                                       // Fixes an IE bug where horizontal scrollbars would appear
-                                       if (tinymce.isIE && fullscreen_overflow == 'scroll')
-                                               fullscreen_overflow = 'auto';
-
-                                       // Fixes an IE bug where the scrollbars doesn't reappear
-                                       if (tinymce.isIE && (fullscreen_html_overflow == 'visible' || fullscreen_html_overflow == 'scroll'))
-                                               fullscreen_html_overflow = 'auto';
-
-                                       if (fullscreen_overflow == '0px')
-                                               fullscreen_overflow = '';
-
-                                       DOM.setStyle(DOM.doc.body, 'overflow', 'hidden');
-                                       de.style.overflow = 'hidden'; //Fix for IE6/7
-                                       vp = DOM.getViewPort();
-                                       DOM.win.scrollTo(0, 0);
-
-                                       if (tinymce.isIE)
-                                               vp.h -= 1;
-
-                                       // Use fixed position if it exists
-                                       if (tinymce.isIE6 || document.compatMode == 'BackCompat')
-                                               posCss = 'absolute;top:' + vp.y;
-                                       else
-                                               posCss = 'fixed;top:0';
-
-                                       n = DOM.add(DOM.doc.body, 'div', {
-                                               id : 'mce_fullscreen_container',
-                                               style : 'position:' + posCss + ';left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});
-                                       DOM.add(n, 'div', {id : 'mce_fullscreen'});
-
-                                       tinymce.each(ed.settings, function(v, n) {
-                                               s[n] = v;
-                                       });
-
-                                       s.id = 'mce_fullscreen';
-                                       s.width = n.clientWidth;
-                                       s.height = n.clientHeight - 15;
-                                       s.fullscreen_is_enabled = true;
-                                       s.fullscreen_editor_id = ed.id;
-                                       s.theme_advanced_resizing = false;
-                                       s.save_onsavecallback = function() {
-                                               ed.setContent(tinyMCE.get(s.id).getContent());
-                                               ed.execCommand('mceSave');
-                                       };
-
-                                       tinymce.each(ed.getParam('fullscreen_settings'), function(v, k) {
-                                               s[k] = v;
-                                       });
-
-                                       t.fullscreenSettings = {
-                                               bookmark: ed.selection.getBookmark(),
-                                               fullscreen_overflow: fullscreen_overflow,
-                                               fullscreen_html_overflow: fullscreen_html_overflow,
-                                               fullscreen_scrollx: fullscreen_scrollx,
-                                               fullscreen_scrolly: fullscreen_scrolly
-                                       };
-
-                                       if (s.theme_advanced_toolbar_location === 'external')
-                                               s.theme_advanced_toolbar_location = 'top';
-
-                                       tinyMCE.oldSettings = tinyMCE.settings; // Store old settings, the Editor constructor overwrites them
-                                       t.fullscreenEditor = new tinymce.Editor('mce_fullscreen', s);
-                                       t.fullscreenEditor.onInit.add(function() {
-                                               t.loadState(t.fullscreenEditor);
-                                       });
-
-                                       t.fullscreenEditor.render();
-
-                                       t.fullscreenElement = new tinymce.dom.Element('mce_fullscreen_container');
-                                       t.fullscreenElement.update();
-                                       //document.body.overflow = 'hidden';
-
-                                       t.resizeFunc = tinymce.dom.Event.add(DOM.win, 'resize', function() {
-                                               var vp = tinymce.DOM.getViewPort(), fed = t.fullscreenEditor, outerSize, innerSize;
-
-                                               // Get outer/inner size to get a delta size that can be used to calc the new iframe size
-                                               outerSize = fed.dom.getSize(fed.getContainer().getElementsByTagName('table')[0]);
-                                               innerSize = fed.dom.getSize(fed.getContainer().getElementsByTagName('iframe')[0]);
-
-                                               fed.theme.resizeTo(vp.w - outerSize.w + innerSize.w, vp.h - outerSize.h + innerSize.h);
-                                       });
-                               }
-                       });
-
-                       // Register buttons
-                       ed.addButton('fullscreen', {title : 'fullscreen.desc', cmd : 'mceFullScreen'});
-
-                       ed.onNodeChange.add(function(ed, cm) {
-                               cm.setActive('fullscreen', ed.getParam('fullscreen_is_enabled'));
-                       });
-
-                       // fullscreenEditor is a param here because in window mode we don't create it
-                       t.loadState = function(fullscreenEditor) {
-                               if (!(fullscreenEditor && t.fullscreenSettings)) {
-                                       throw "No fullscreen editor to load to";
-                               }
-
-                               transferState(ed, fullscreenEditor, t.fullscreenSettings.bookmark);
-                               fullscreenEditor.focus();
-
-                       };
-
-                       // fullscreenEditor is a param here because in window mode we don't create it
-                       t.saveState = function(fullscreenEditor) {
-                               if (!(fullscreenEditor && t.fullscreenSettings)) {
-                                       throw "No fullscreen editor to restore from";
-                               }
-                               var settings = t.fullscreenSettings;
-
-                               transferState(fullscreenEditor, ed, fullscreenEditor.selection.getBookmark());
-
-                               // cleanup only required if window mode isn't used
-                               if (!ed.getParam('fullscreen_new_window')) {
-                                       tinymce.dom.Event.remove(DOM.win, 'resize', t.resizeFunc);
-                                       delete t.resizeFunc;
-
-                                       DOM.remove('mce_fullscreen_container');
-
-                                       DOM.doc.documentElement.style.overflow = settings.fullscreen_html_overflow;
-                                       DOM.setStyle(DOM.doc.body, 'overflow', settings.fullscreen_overflow);
-                                       DOM.win.scrollTo(settings.fullscreen_scrollx, settings.fullscreen_scrolly);
-                               }
-                               tinyMCE.settings = tinyMCE.oldSettings; // Restore old settings
-
-                               // clear variables
-                               delete tinyMCE.oldSettings;
-                               delete t.fullscreenEditor;
-                               delete t.fullscreenElement;
-                               delete t.fullscreenSettings;
-
-                               // allow the fullscreen editor to be removed before restoring focus and selection
-                               DOM.win.setTimeout(function() {
-                                       ed.selection.moveToBookmark(bookmark);
-                                       ed.focus();
-                               }, 10);
-                       };
-               },
-
-               getInfo : function() {
-                       return {
-                               longname : 'Fullscreen',
-                               author : 'Moxiecode Systems AB',
-                               authorurl : 'http://tinymce.moxiecode.com',
-                               infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',
-                               version : tinymce.majorVersion + "." + tinymce.minorVersion
-                       };
-               }
-       });
-
-       // Register plugin
-       tinymce.PluginManager.add('fullscreen', tinymce.plugins.FullScreenPlugin);
-})();
</del></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginsfullscreenfullscreenhtm"></a>
<div class="delfile"><h4>Deleted: trunk/src/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm (26875 => 26876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm       2013-12-28 05:24:32 UTC (rev 26875)
+++ trunk/src/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm  2013-12-28 23:52:04 UTC (rev 26876)
</span><span class="lines">@@ -1,117 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-       <title></title>
-       <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-       <script type="text/javascript" src="../../tiny_mce.js?ver=359-20131010"></script>
-       <script type="text/javascript">
-               function patchCallback(settings, key) {
-                       if (settings[key])
-                               settings[key] = "window.opener." + settings[key];
-               }
-
-               var settings = {}, paSe = window.opener.tinyMCE.activeEditor.settings, oeID = window.opener.tinyMCE.activeEditor.id;
-
-               // Clone array
-               for (var n in paSe)
-                       settings[n] = paSe[n];
-
-               // Override options for fullscreen
-               for (var n in paSe.fullscreen_settings)
-                       settings[n] = paSe.fullscreen_settings[n];
-
-               // Patch callbacks, make them point to window.opener
-               patchCallback(settings, 'urlconverter_callback');
-             &