Changeset 4080

Timestamp:

08/09/2006 07:39:17 PM (18 years ago)

Author:

ryan

Message:

Update tinyMCE to 2.0.6.1. fixes #3003

Location:

trunk/wp-includes/js

Files:

• dbx.js (modified) (1 diff)
• tinymce/plugins/directionality/editor_plugin.js (modified) (1 diff)
• tinymce/plugins/paste/editor_plugin.js (modified) (1 diff)
• tinymce/plugins/spellchecker/config.php (modified) (1 diff)
• tinymce/plugins/wordpress/editor_plugin.js (modified) (4 diffs)
• tinymce/themes/advanced/editor_template.js (modified) (7 diffs)
• tinymce/tiny_mce.js (modified) (60 diffs)
• tinymce/tiny_mce_config.php (modified) (2 diffs)
• tinymce/tiny_mce_popup.js (modified) (1 diff)

trunk/wp-includes/js/dbx.js

@@ -1 @@
-// DBX2.02 :: Docking Boxes (dbx)
+// DBX2.05 :: Docking Boxes (dbx)
 // *****************************************************
 // DOM scripting by brothercake -- http://www.brothercake.com/
 // GNU Lesser General Public License -- http://www.gnu.org/licenses/lgpl.html
 //******************************************************
-var dbx;function dbxManager(sid){dbx = this;if(!/^[-_a-z0-9]+$/i.test(sid)) { alert('Error from dbxManager:\n"' + sid + '" is an invalid session ID'); return; }this.supported = !(document.getElementsByTagName('*').length == 0 || (navigator.vendor == 'KDE' && typeof window.sidebar == 'undefined'));if(!this.supported) { return; }this.etype = typeof document.addEventListener != 'undefined' ? 'addEventListener' : typeof document.attachEvent != 'undefined' ? 'attachEvent' : 'none';this.eprefix = (this.etype == 'attachEvent' ? 'on' : '');if(typeof window.opera != 'undefined' && parseFloat(navigator.userAgent.toLowerCase().split(/opera[\/ ]/)[1].split(' ')[0], 10) < 7.5){this.etype = 'none';}if(this.etype == 'none') { this.supported = false; return; }this.running = 0;this.sid = sid;this.savedata = {};this.cookiestate = this.getCookieState();};dbxManager.prototype.setCookieState = function(){var now = new Date();now.setTime(now.getTime() + (365*24*60*60*1000));var str = '';for(j in this.savedata){if(typeof this.savedata[j]!='function'){str += j + '=' + this.savedata[j] + '&'}}this.state = str.replace(/^(.+)&$/, '$1');if(typeof this.onstatechange == 'undefined' || this.onstatechange()){document.cookie = 'dbx-' + this.sid + '='+ this.state+ '; expires=' + now.toGMTString()+ '; path=/';}};dbxManager.prototype.getCookieState = function(){this.cookiestate = null;if(document.cookie){if(document.cookie.indexOf('dbx-' + this.sid)!=-1){this.cookie = document.cookie.split('dbx-' + this.sid + '=')[1].split('&');for(var i in this.cookie){if(typeof this.cookie[i]!='function'){this.cookie[i] = this.cookie[i].split('=');this.cookie[i][1] = this.cookie[i][1].split(',');}}this.cookiestate = {};for(i in this.cookie){if(typeof this.cookie[i]!='function'){this.cookiestate[this.cookie[i][0]] = this.cookie[i][1];}}}}return this.cookiestate;};dbxManager.prototype.addDataMember = function(gid, order){this.savedata[gid] = order;};dbxManager.prototype.createElement = function(tag){return typeof document.createElementNS != 'undefined' ? document.createElementNS('http://www.w3.org/1999/xhtml', tag) : document.createElement(tag);};dbxManager.prototype.getTarget = function(e, pattern, node){if(typeof node != 'undefined'){var target = node;}else{target = typeof e.target != 'undefined' ? e.target : e.srcElement;}var regex = new RegExp(pattern, '');while(!regex.test(target.className)){target = target.parentNode;}return target;};function dbxGroup(gid, dir, thresh, fix, ani, togs, def, open, close, move, toggle, kmove, ktoggle, syntax){if(!/^[-_a-z0-9]+$/i.test(gid)) { alert('Error from dbxGroup:\n"' + gid + '" is an invalid container ID'); return; }this.container = document.getElementById(gid);if(this.container == null || !dbx.supported) { return; }var self = this;this.gid = gid;this.dragok = false;this.box = null;this.vertical = dir == 'vertical';this.threshold = parseInt(thresh, 10);this.restrict = fix == 'yes';this.resolution = parseInt(ani, 10);this.toggles = togs == 'yes';this.defopen = def != 'closed';this.vocab = {'open' : open,'close' : close,'move' : move,'toggle' : toggle,'kmove' : kmove,'ktoggle' : ktoggle,'syntax' : syntax};this.container.style.position = 'relative';this.container.style.display = 'block';if(typeof window.opera != 'undefined'){this.container.style.display = 'run-in';}this.boxes = [];this.buttons = [];this.order = [];this.eles = this.container.getElementsByTagName('*');for(var i=0; i<this.eles.length; i++){if(/dbx\-box/i.test(this.eles[i].className) && !/dbx\-dummy/i.test(this.eles[i].className)){this.eles[i].style.position = 'relative';this.eles[i].style.display = 'block';this.boxes.push(this.eles[i]);this.eles[i].className += ' dbx-box-open';this.eles[i].className += ' dbxid' + this.order.length;this.order.push(this.order.length.toString() + '+');this.eles[i][dbx.etype](dbx.eprefix + 'mousedown', function(e){if(!e) { e = window.event; }self.mousedown(e, dbx.getTarget(e, 'dbx\-box'));}, false);}if(/dbx\-handle/i.test(this.eles[i].className)){this.eles[i].style.position = 'relative';this.eles[i].style.display = 'block';this.eles[i].className += ' dbx-handle-cursor';this.eles[i].setAttribute('title', this.eles[i].getAttribute('title') == null || this.eles[i].title == '' ? this.vocab.move : this.vocab.syntax.replace('%mytitle%', this.eles[i].title).replace('%dbxtitle%', this.vocab.move));if(this.toggles){this.buttons.push(this.addToggleBehavior(this.eles[i]));}else{this.eles[i][dbx.etype](dbx.eprefix + 'key' + (typeof document.uniqueID != 'undefined' || navigator.vendor == 'Apple Computer, Inc.' ? 'down' : 'press'), function(e){if(!e) { e = window.event; }return self.keypress(e, dbx.getTarget(e, 'dbx\-handle'));}, false);this.eles[i][dbx.etype](dbx.eprefix + 'focus', function(e){if(!e) { e = window.event; }self.createTooltip(null, dbx.getTarget(e, 'dbx\-handle'));}, false);this.eles[i][dbx.etype](dbx.eprefix + 'blur', function(){self.removeTooltip();}, false);}}}dbx.addDataMember(this.gid, this.order.join(','));var dummy = this.container.appendChild(dbx.createElement('span'));dummy.className = 'dbx-box dbx-dummy';dummy.style.display = 'block';dummy.style.width = '0';dummy.style.height = '0';dummy.style.overflow = 'hidden';if(this.vertical) { dummy.className += ' dbx-offdummy'; }this.boxes.push(dummy);if(dbx.cookiestate != null && typeof dbx.cookiestate[this.gid] != 'undefined'){var num = dbx.cookiestate[this.gid].length;if(num == this.boxes.length - 1){for(i=0; i<num; i++){var index = parseInt(dbx.cookiestate[this.gid][i], 10);this.container.insertBefore(this.boxes[index], dummy);if(this.toggles && /\-$/.test(dbx.cookiestate[this.gid][i])){this.toggleBoxState(this.buttons[index], false);}}this.getBoxOrder();}}else if(!this.defopen && this.toggles){var len = this.buttons.length;for(i=0; i<len; i++){this.toggleBoxState(this.buttons[i], true);}}document[dbx.etype](dbx.eprefix + 'mouseout', function(e){if(typeof e.target == 'undefined') { e = window.event; e.relatedTarget = e.toElement; }if(e.relatedTarget == null){self.mouseup(e);}}, false);document[dbx.etype](dbx.eprefix + 'mousemove', function(e){self.mousemove(e);return false;}, false);document[dbx.etype](dbx.eprefix + 'mouseup', function(e){self.mouseup(e);}, false);this.keydown = false;document[dbx.etype](dbx.eprefix + 'keydown', function(){self.keydown = true;}, false);document[dbx.etype](dbx.eprefix + 'keyup', function(){self.keydown = false;}, false);};dbxGroup.prototype.addToggleBehavior = function(){var self = this;var button = arguments[0].appendChild(dbx.createElement('a'));button.appendChild(document.createTextNode('\u00a0'));button.style.cursor = 'pointer';button.href = 'javascript:void(null)';button.className = 'dbx-toggle dbx-toggle-open';button.setAttribute('title', this.vocab.toggle.replace('%toggle%', this.vocab.close));button.hasfocus = typeof window.opera != 'undefined' || navigator.vendor == 'Apple Computer, Inc.' ? null : false;this.tooltip = null;button.onclick = function(){if(this.hasfocus === true || this.hasfocus === null){self.removeTooltip();self.toggleBoxState(this, true);}};button['onkey' + (typeof document.uniqueID != 'undefined' || navigator.vendor == 'Apple Computer, Inc.' ? 'down' : 'press')] = function(e){if(!e) { e = window.event; }return self.keypress(e, this);};button.onfocus = function(){var len = self.buttons.length;for(var i=0; i<len; i++){self.buttons[i].className = self.buttons[i].className.replace(/[ ](dbx\-toggle\-hilite\-)(open|closed)/, '');}var isopen = (/dbx\-toggle\-open/.test(this.className));this.className += ' dbx-toggle-hilite-' + (isopen ? 'open' : 'closed');self.createTooltip(isopen, this);this.isactive = true;if(this.hasfocus !== null) { this.hasfocus = true; }};button.onblur = function(){this.className = this.className.replace(/[ ](dbx\-toggle\-hilite\-)(open|closed)/, '');self.removeTooltip();if(this.hasfocus !== null) { this.hasfocus = false; }};return button;};dbxGroup.prototype.toggleBoxState = function(button, regen){var isopen = (/dbx\-toggle\-open/.test(button.className));var parent = dbx.getTarget(null, 'dbx\-box', button);dbx.box = parent;dbx.toggle = button;if(typeof dbx.container == 'undefined'){dbx.group = dbx.getTarget(null, 'dbx\-group', parent);}else { dbx.group = dbx.container; }if((!isopen && (typeof dbx.onboxopen == 'undefined' || dbx.onboxopen()))||(isopen && (typeof dbx.onboxclose == 'undefined' || dbx.onboxclose()))){button.className = 'dbx-toggle dbx-toggle-' + (isopen ? 'closed' : 'open');button.title = this.vocab.toggle.replace('%toggle%', isopen ? this.vocab.open : this.vocab.close);if(typeof button.isactive != 'undefined'){button.className += ' dbx-toggle-hilite-' + (isopen ? 'closed' : 'open')}parent.className = parent.className.replace(/[ ](dbx-box-)(open|closed)/, ' $1' + (isopen ? 'closed' : 'open'));if(regen) { this.getBoxOrder(); }}};dbxGroup.prototype.shiftBoxPosition = function(e, anchor, positive){var parent = dbx.getTarget(null, 'dbx\-box', anchor);dbx.group = this.container;dbx.box = parent;dbx.event = e;if(typeof dbx.onboxdrag == 'undefined' || dbx.onboxdrag()){var positions = [];var len = this.boxes.length;for(var i=0; i<len; i++){positions[i] = [i, this.boxes[i][this.vertical ? 'offsetTop' : 'offsetLeft']];if(parent == this.boxes[i]) { this.idref = i; }}positions.sort(this.compare);for(i=0; i<len; i++){if(positions[i][0] == this.idref){if((positive && i < len - 2) || (!positive && i > 0)){var sibling = this.boxes[positions[i + (positive ? 1 : -1)][0]];if(this.resolution > 0){var visipos = { 'x' : parent.offsetLeft, 'y' : parent.offsetTop };var siblingpos = { 'x' : sibling.offsetLeft, 'y' : sibling.offsetTop };}var obj = { 'insert' : (positive ? sibling : parent), 'before' : (positive ? parent : sibling) };this.container.insertBefore(obj.insert, obj.before);if(this.resolution > 0){var animators ={'sibling' : new dbxAnimator(this, sibling, siblingpos, this.resolution, true, anchor),'parent' : new dbxAnimator(this, parent, visipos, this.resolution, true, anchor)};}else{anchor.focus();}break;}}}this.getBoxOrder();}};dbxGroup.prototype.compare = function(a, b){return a[1] - b[1];};dbxGroup.prototype.createTooltip = function(isopen, anchor){if(this.keydown){this.tooltip = this.container.appendChild(dbx.createElement('span'));this.tooltip.style.visibility = 'hidden';this.tooltip.className = 'dbx-tooltip';if(isopen != null){this.tooltip.appendChild(document.createTextNode(this.vocab.kmove + this.vocab.ktoggle.replace('%toggle%', isopen ? this.vocab.close : this.vocab.open)));}else{this.tooltip.appendChild(document.createTextNode(this.vocab.kmove));}var parent = dbx.getTarget(null, 'dbx\-box', anchor);this.tooltip.style.left = parent.offsetLeft + 'px';this.tooltip.style.top = parent.offsetTop + 'px';var tooltip = this.tooltip;window.setTimeout(function(){if(tooltip != null) { tooltip.style.visibility = 'visible'; }}, 500);}};dbxGroup.prototype.removeTooltip = function(){if(this.tooltip != null){this.tooltip.parentNode.removeChild(this.tooltip);this.tooltip = null;}};dbxGroup.prototype.mousedown = function(e, box){var node = typeof e.target != 'undefined' ? e.target : e.srcElement;if(node.nodeName == '#text') { node = node.parentNode; }if(!/dbx\-(toggle|box|group)/i.test(node.className)){while(!/dbx\-(handle|box|group)/i.test(node.className)){node = node.parentNode;}}if(/dbx\-handle/i.test(node.className)){this.removeTooltip();this.released = false;this.initial = { 'x' : e.clientX, 'y' : e.clientY };this.current = { 'x' : 0, 'y' : 0 };this.createCloneBox(box);if(typeof e.preventDefault != 'undefined' ) { e.preventDefault(); }if(typeof document.onselectstart != 'undefined'){document.onselectstart = function() { return false; }}}};dbxGroup.prototype.mousemove = function(e){if(this.dragok && this.box != null){this.positive = this.vertical ? (e.clientY > this.current.y ? true : false) : (e.clientX > this.current.x ? true : false);this.current = { 'x' : e.clientX, 'y' : e.clientY };var overall = { 'x' : this.current.x - this.initial.x, 'y' : this.current.y - this.initial.y };if(((overall.x >= 0 && overall.x <= this.threshold) || (overall.x <= 0 && overall.x >= 0 - this.threshold))&&((overall.y >= 0 && overall.y <= this.threshold) || (overall.y <= 0 && overall.y >= 0 - this.threshold))){this.current.x -= overall.x;this.current.y -= overall.y;}if(this.released || overall.x > this.threshold || overall.x < (0 - this.threshold) || overall.y > this.threshold || overall.y < (0 - this.threshold)){dbx.group = this.container;dbx.box = this.box;dbx.event = e;if(typeof dbx.onboxdrag == 'undefined' || dbx.onboxdrag()){this.released = true;if(!this.restrict || !this.vertical) { this.boxclone.style.left = (this.current.x - this.difference.x) + 'px'; }if(!this.restrict || this.vertical) { this.boxclone.style.top = (this.current.y - this.difference.y) + 'px'; }this.moveOriginalToPosition(this.current.x, this.current.y);if(typeof e.preventDefault != 'undefined' ) { e.preventDefault(); }}}}return true;};dbxGroup.prototype.mouseup = function(e){if(this.box != null){this.moveOriginalToPosition(e.clientX, e.clientY);this.removeCloneBox();this.getBoxOrder();if(typeof document.onselectstart != 'undefined'){document.onselectstart = function() { return true; }}}this.dragok = false;};dbxGroup.prototype.keypress = function(e, anchor){if(/^(3[7-9])|(40)$/.test(e.keyCode)){this.removeTooltip();if((this.vertical && /^(38|40)$/.test(e.keyCode)) || (!this.vertical && /^(37|39)$/.test(e.keyCode))){this.shiftBoxPosition(e, anchor, /^[3][78]$/.test(e.keyCode) ? false : true);if(typeof e.preventDefault != 'undefined') { e.preventDefault(); }else { return false; }typeof e.stopPropagation != 'undefined' ? e.stopPropagation() : e.cancelBubble = true;this.keydown = false;}}return true;};dbxGroup.prototype.getBoxOrder = function(){this.order = [];var len = this.eles.length;for(var j=0; j<len; j++){if(/dbx\-box/i.test(this.eles[j].className) && !/dbx\-(clone|dummy)/i.test(this.eles[j].className)){this.order.push(this.eles[j].className.split('dbxid')[1] + (/dbx\-box\-open/i.test(this.eles[j].className) ? '+' : '-'));}}dbx.savedata[this.gid] = this.order.join(',');dbx.setCookieState();};dbxGroup.prototype.createClone = function(){var clone = this.container.appendChild(arguments[0].cloneNode(true));clone.className += ' dbx-clone';clone.style.position = 'absolute';clone.style.visibility = 'hidden';clone.style.zIndex = arguments[1];clone.style.left = arguments[2].x + 'px';clone.style.top = arguments[2].y + 'px';clone.style.width = arguments[0].offsetWidth + 'px';clone.style.height = arguments[0].offsetHeight + 'px';return clone;};dbxGroup.prototype.createCloneBox = function(box){this.box = box;this.position = { 'x' : this.box.offsetLeft, 'y' : this.box.offsetTop };this.difference = { 'x' : (this.initial.x - this.position.x), 'y' : (this.initial.y - this.position.y) };this.boxclone = this.createClone(this.box, 30000, this.position);this.boxclone.style.cursor = 'move';this.dragok = true;};dbxGroup.prototype.removeCloneBox = function(){this.container.removeChild(this.boxclone);this.box.style.visibility = 'visible';this.box = null;};dbxGroup.prototype.moveOriginalToPosition = function(clientX, clientY){var cloneprops = {'xy' : this.vertical ? clientY - this.difference.y : clientX - this.difference.x,'wh' : this.vertical ? this.boxclone.offsetHeight : this.boxclone.offsetWidth};this.box.style.visibility = 'hidden';this.boxclone.style.visibility = 'visible';var len = this.boxes.length;for(var i=0; i<len; i++){var boxprops = {'xy' : this.vertical ? this.boxes[i].offsetTop : this.boxes[i].offsetLeft,'wh' : this.vertical ? this.boxes[i].offsetHeight : this.boxes[i].offsetWidth};if((this.positive && cloneprops.xy + cloneprops.wh > boxprops.xy && cloneprops.xy < boxprops.xy)||(!this.positive && cloneprops.xy < boxprops.xy && cloneprops.xy + cloneprops.wh > boxprops.xy)){if(this.boxes[i] == this.box) { return; }var sibling = this.box.nextSibling;while(sibling.className == null || !/dbx\-box/.test(sibling.className)){sibling = sibling.nextSibling;}if(this.boxes[i] == sibling) { return; }if(this.resolution > 0){if(this.box[this.vertical ? 'offsetTop' : 'offsetLeft'] < boxprops.xy){var visibox = this.boxes[i].previousSibling;while(visibox.className == null || !/dbx\-box/.test(visibox.className)){visibox = visibox.previousSibling;}}else{visibox = this.boxes[i];}var visipos = { 'x' : visibox.offsetLeft, 'y' : visibox.offsetTop };}var prepos = { 'x' : this.box.offsetLeft, 'y' : this.box.offsetTop };this.container.insertBefore(this.box, this.boxes[i]);this.initial.x += (this.box.offsetLeft - prepos.x);this.initial.y += (this.box.offsetTop - prepos.y);if(this.resolution > 0 && visibox != this.box){var animator = new dbxAnimator(this, visibox, visipos, this.resolution, false, null);}else{}break;}}};function dbxAnimator(caller, box, pos, res, kbd, anchor){this.caller = caller;this.box = box;this.timer = null;var before = pos[this.caller.vertical ? 'y' : 'x'];var after = this.box[this.caller.vertical ? 'offsetTop' : 'offsetLeft'];if(before != after){if(dbx.running > this.caller.boxes.length - 1) { return; }var clone = this.caller.createClone(this.box, 29999, arguments[2]);clone.style.visibility = 'visible';this.box.style.visibility = 'hidden';this.animateClone(clone,before,after > before ? after - before : 0 - (before - after),this.caller.vertical ? 'top' : 'left',res,kbd,anchor);}};dbxAnimator.prototype.animateClone = function(clone, current, change, dir, res, kbd, anchor){var self = this;var count = 0;dbx.running ++;this.timer = window.setInterval(function(){count ++;current += change / res;clone.style[dir] = current + 'px';if(count == res){window.clearTimeout(self.timer);self.timer = null;dbx.running --;self.caller.container.removeChild(clone);self.box.style.visibility = 'visible';if(kbd){if(anchor != null && anchor.parentNode.style.visibility != 'hidden'){anchor.focus();}else if(self.caller.toggles){var button = self.caller.buttons[parseInt(self.box.className.split('dbxid')[1],10)];if(button != null && typeof button.isactive != 'undefined'){button.focus();}}}}}, 20);};if(typeof window.attachEvent != 'undefined'){window.attachEvent('onunload', function(){var ev = ['mousedown', 'mousemove', 'mouseup', 'mouseout', 'click', 'keydown', 'keyup', 'focus', 'blur', 'selectstart', 'statechange', 'boxdrag', 'boxopen', 'boxclose'];var el = ev.length;var dl = document.all.length;for(var i=0; i<dl; i++){for(var j=0; j<el; j++){document.all[i]['on' + ev[j]] = null;}}});}
+var dbx;function dbxManager(sid){dbx = this;if(!/^[-_a-z0-9]+$/i.test(sid)) { alert('Error from dbxManager:\n"' + sid + '" is an invalid session ID'); return; }this.supported = !(document.getElementsByTagName('*').length == 0 || (navigator.vendor == 'KDE' && typeof window.sidebar == 'undefined'));if(!this.supported) { return; }this.etype = typeof document.addEventListener != 'undefined' ? 'addEventListener' : typeof document.attachEvent != 'undefined' ? 'attachEvent' : 'none';this.eprefix = (this.etype == 'attachEvent' ? 'on' : '');if(typeof window.opera != 'undefined' && parseFloat(navigator.userAgent.toLowerCase().split(/opera[\/ ]/)[1].split(' ')[0], 10) < 7.5){this.etype = 'none';}if(this.etype == 'none') { this.supported = false; return; }this.running = 0;this.sid = sid;this.savedata = {};this.cookiestate = this.getCookieState();};dbxManager.prototype.setCookieState = function(){var now = new Date();now.setTime(now.getTime() + (365*24*60*60*1000));var str = '';for(j in this.savedata){if(typeof this.savedata[j]!='function'){str += j + '=' + this.savedata[j] + '&'}}this.state = str.replace(/^(.+)&$/, '$1');this.cookiestring = this.state.replace(/,/g, '|');this.cookiestring = this.cookiestring.replace(/=/g, ':');if(typeof this.onstatechange == 'undefined' || this.onstatechange()){document.cookie = 'dbx-' + this.sid + '='+ this.cookiestring+ '; expires=' + now.toGMTString()+ '; path=/';}};dbxManager.prototype.getCookieState = function(){this.cookiestate = null;if(document.cookie){if(document.cookie.indexOf('dbx-' + this.sid)!=-1){this.cookie = document.cookie.split('dbx-' + this.sid + '=')[1].split(';')[0].split('&');for(var i in this.cookie){if(typeof this.cookie[i]!='function'){this.cookie[i] = this.cookie[i].replace(/\|/g, ',');this.cookie[i]= this.cookie[i].replace(/:/g, '=');this.cookie[i] = this.cookie[i].split('=');this.cookie[i][1] = this.cookie[i][1].split(',');}}this.cookiestate = {};for(i in this.cookie){if(typeof this.cookie[i]!='function'){this.cookiestate[this.cookie[i][0]] = this.cookie[i][1];}}}}return this.cookiestate;};dbxManager.prototype.addDataMember = function(gid, order){this.savedata[gid] = order;};dbxManager.prototype.createElement = function(tag){return typeof document.createElementNS != 'undefined' ? document.createElementNS('http://www.w3.org/1999/xhtml', tag) : document.createElement(tag);};dbxManager.prototype.getTarget = function(e, pattern, node){if(typeof node != 'undefined'){var target = node;}else{target = typeof e.target != 'undefined' ? e.target : e.srcElement;}var regex = new RegExp(pattern, '');while(!regex.test(target.className)){target = target.parentNode;}return target;};function dbxGroup(gid, dir, thresh, fix, ani, togs, def, open, close, move, toggle, kmove, ktoggle, syntax){if(!/^[-_a-z0-9]+$/i.test(gid)) { alert('Error from dbxGroup:\n"' + gid + '" is an invalid container ID'); return; }this.container = document.getElementById(gid);if(this.container == null || !dbx.supported) { return; }var self = this;this.gid = gid;this.dragok = false;this.box = null;this.vertical = dir == 'vertical';this.threshold = parseInt(thresh, 10);this.restrict = fix == 'yes';this.resolution = parseInt(ani, 10);this.toggles = togs == 'yes';this.defopen = def != 'closed';this.vocab = {'open' : open,'close' : close,'move' : move,'toggle' : toggle,'kmove' : kmove,'ktoggle' : ktoggle,'syntax' : syntax};this.container.style.position = 'relative';this.container.style.display = 'block';if(typeof window.opera != 'undefined'){this.container.style.display = 'run-in';}this.boxes = [];this.buttons = [];this.order = [];this.eles = this.container.getElementsByTagName('*');for(var i=0; i<this.eles.length; i++){if(/dbx\-box/i.test(this.eles[i].className) && !/dbx\-dummy/i.test(this.eles[i].className)){this.eles[i].style.position = 'relative';this.eles[i].style.display = 'block';this.boxes.push(this.eles[i]);this.eles[i].className += ' dbx-box-open';this.eles[i].className += ' dbxid' + this.order.length;this.order.push(this.order.length.toString() + '+');this.eles[i][dbx.etype](dbx.eprefix + 'mousedown', function(e){if(!e) { e = window.event; }self.mousedown(e, dbx.getTarget(e, 'dbx\-box'));}, false);}if(/dbx\-handle/i.test(this.eles[i].className)){this.eles[i].style.position = 'relative';this.eles[i].style.display = 'block';this.eles[i].className += ' dbx-handle-cursor';this.eles[i].setAttribute('title', this.eles[i].getAttribute('title') == null || this.eles[i].title == '' ? this.vocab.move : this.vocab.syntax.replace('%mytitle%', this.eles[i].title).replace('%dbxtitle%', this.vocab.move));if(this.toggles){this.buttons.push(this.addToggleBehavior(this.eles[i]));}else{this.eles[i][dbx.etype](dbx.eprefix + 'key' + (typeof document.uniqueID != 'undefined' || navigator.vendor == 'Apple Computer, Inc.' ? 'down' : 'press'), function(e){if(!e) { e = window.event; }return self.keypress(e, dbx.getTarget(e, 'dbx\-handle'));}, false);this.eles[i][dbx.etype](dbx.eprefix + 'focus', function(e){if(!e) { e = window.event; }self.createTooltip(null, dbx.getTarget(e, 'dbx\-handle'));}, false);this.eles[i][dbx.etype](dbx.eprefix + 'blur', function(){self.removeTooltip();}, false);}}}dbx.addDataMember(this.gid, this.order.join(','));var dummy = this.container.appendChild(dbx.createElement('span'));dummy.className = 'dbx-box dbx-dummy';dummy.style.display = 'block';dummy.style.width = '0';dummy.style.height = '0';dummy.style.overflow = 'hidden';if(this.vertical) { dummy.className += ' dbx-offdummy'; }this.boxes.push(dummy);if(dbx.cookiestate != null && typeof dbx.cookiestate[this.gid] != 'undefined'){var num = dbx.cookiestate[this.gid].length;if(num == this.boxes.length - 1){for(i=0; i<num; i++){var index = parseInt(dbx.cookiestate[this.gid][i], 10);this.container.insertBefore(this.boxes[index], dummy);if(this.toggles && /\-$/.test(dbx.cookiestate[this.gid][i])){this.toggleBoxState(this.buttons[index], false);}}this.getBoxOrder();}}else if(!this.defopen && this.toggles){var len = this.buttons.length;for(i=0; i<len; i++){this.toggleBoxState(this.buttons[i], true);}}document[dbx.etype](dbx.eprefix + 'mouseout', function(e){if(typeof e.target == 'undefined') { e = window.event; e.relatedTarget = e.toElement; }if(e.relatedTarget == null){self.mouseup(e);}}, false);document[dbx.etype](dbx.eprefix + 'mousemove', function(e){self.mousemove(e);return !self.dragok;}, false);document[dbx.etype](dbx.eprefix + 'mouseup', function(e){self.mouseup(e);}, false);this.keydown = false;document[dbx.etype](dbx.eprefix + 'keydown', function(){self.keydown = true;}, false);document[dbx.etype](dbx.eprefix + 'keyup', function(){self.keydown = false;}, false);};dbxGroup.prototype.addToggleBehavior = function(){var self = this;var button = arguments[0].appendChild(dbx.createElement('a'));button.appendChild(document.createTextNode('\u00a0'));button.style.cursor = 'pointer';button.href = 'javascript:void(null)';button.className = 'dbx-toggle dbx-toggle-open';button.setAttribute('title', this.vocab.toggle.replace('%toggle%', this.vocab.close));button.hasfocus = typeof window.opera != 'undefined' || navigator.vendor == 'Apple Computer, Inc.' ? null : false;this.tooltip = null;button.onclick = function(){if(this.hasfocus === true || this.hasfocus === null){self.removeTooltip();self.toggleBoxState(this, true);}};button['onkey' + (typeof document.uniqueID != 'undefined' || navigator.vendor == 'Apple Computer, Inc.' ? 'down' : 'press')] = function(e){if(!e) { e = window.event; }return self.keypress(e, this);};button.onfocus = function(){var len = self.buttons.length;for(var i=0; i<len; i++){self.buttons[i].className = self.buttons[i].className.replace(/[ ](dbx\-toggle\-hilite\-)(open|closed)/, '');}var isopen = (/dbx\-toggle\-open/.test(this.className));this.className += ' dbx-toggle-hilite-' + (isopen ? 'open' : 'closed');self.createTooltip(isopen, this);this.isactive = true;if(this.hasfocus !== null) { this.hasfocus = true; }};button.onblur = function(){this.className = this.className.replace(/[ ](dbx\-toggle\-hilite\-)(open|closed)/, '');self.removeTooltip();if(this.hasfocus !== null) { this.hasfocus = false; }};return button;};dbxGroup.prototype.toggleBoxState = function(button, regen){var isopen = (/dbx\-toggle\-open/.test(button.className));var parent = dbx.getTarget(null, 'dbx\-box', button);dbx.box = parent;dbx.toggle = button;if(typeof dbx.container == 'undefined'){dbx.group = dbx.getTarget(null, 'dbx\-group', parent);}else { dbx.group = dbx.container; }if((!isopen && (typeof dbx.onboxopen == 'undefined' || dbx.onboxopen()))||(isopen && (typeof dbx.onboxclose == 'undefined' || dbx.onboxclose()))){button.className = 'dbx-toggle dbx-toggle-' + (isopen ? 'closed' : 'open');button.title = this.vocab.toggle.replace('%toggle%', isopen ? this.vocab.open : this.vocab.close);if(typeof button.isactive != 'undefined'){button.className += ' dbx-toggle-hilite-' + (isopen ? 'closed' : 'open')}parent.className = parent.className.replace(/[ ](dbx-box-)(open|closed)/, ' $1' + (isopen ? 'closed' : 'open'));if(regen) { this.getBoxOrder(); }}};dbxGroup.prototype.shiftBoxPosition = function(e, anchor, positive){var parent = dbx.getTarget(null, 'dbx\-box', anchor);dbx.group = this.container;dbx.box = parent;dbx.event = e;if(typeof dbx.onboxdrag == 'undefined' || dbx.onboxdrag()){var positions = [];var len = this.boxes.length;for(var i=0; i<len; i++){positions[i] = [i, this.boxes[i][this.vertical ? 'offsetTop' : 'offsetLeft']];if(parent == this.boxes[i]) { this.idref = i; }}positions.sort(this.compare);for(i=0; i<len; i++){if(positions[i][0] == this.idref){if((positive && i < len - 2) || (!positive && i > 0)){var sibling = this.boxes[positions[i + (positive ? 1 : -1)][0]];if(this.resolution > 0){var visipos = { 'x' : parent.offsetLeft, 'y' : parent.offsetTop };var siblingpos = { 'x' : sibling.offsetLeft, 'y' : sibling.offsetTop };}var obj = { 'insert' : (positive ? sibling : parent), 'before' : (positive ? parent : sibling) };this.container.insertBefore(obj.insert, obj.before);if(this.resolution > 0){var animators ={'sibling' : new dbxAnimator(this, sibling, siblingpos, this.resolution, true, anchor),'parent' : new dbxAnimator(this, parent, visipos, this.resolution, true, anchor)};}else{anchor.focus();}break;}}}this.getBoxOrder();}};dbxGroup.prototype.compare = function(a, b){return a[1] - b[1];};dbxGroup.prototype.createTooltip = function(isopen, anchor){if(this.keydown){this.tooltip = this.container.appendChild(dbx.createElement('span'));this.tooltip.style.visibility = 'hidden';this.tooltip.className = 'dbx-tooltip';if(isopen != null){this.tooltip.appendChild(document.createTextNode(this.vocab.kmove + this.vocab.ktoggle.replace('%toggle%', isopen ? this.vocab.close : this.vocab.open)));}else{this.tooltip.appendChild(document.createTextNode(this.vocab.kmove));}var parent = dbx.getTarget(null, 'dbx\-box', anchor);this.tooltip.style.left = parent.offsetLeft + 'px';this.tooltip.style.top = parent.offsetTop + 'px';var tooltip = this.tooltip;window.setTimeout(function(){if(tooltip != null) { tooltip.style.visibility = 'visible'; }}, 500);}};dbxGroup.prototype.removeTooltip = function(){if(this.tooltip != null){this.tooltip.parentNode.removeChild(this.tooltip);this.tooltip = null;}};dbxGroup.prototype.mousedown = function(e, box){var node = typeof e.target != 'undefined' ? e.target : e.srcElement;if(node.nodeName == '#text') { node = node.parentNode; }if(!/dbx\-(toggle|box|group)/i.test(node.className)){while(!/dbx\-(handle|box|group)/i.test(node.className)){node = node.parentNode;}}if(/dbx\-handle/i.test(node.className)){this.removeTooltip();this.released = false;this.initial = { 'x' : e.clientX, 'y' : e.clientY };this.current = { 'x' : 0, 'y' : 0 };this.createCloneBox(box);if(typeof e.preventDefault != 'undefined' ) { e.preventDefault(); }if(typeof document.onselectstart != 'undefined'){document.onselectstart = function() { return false; }}}};dbxGroup.prototype.mousemove = function(e){if(this.dragok && this.box != null){this.positive = this.vertical ? (e.clientY > this.current.y ? true : false) : (e.clientX > this.current.x ? true : false);this.current = { 'x' : e.clientX, 'y' : e.clientY };var overall = { 'x' : this.current.x - this.initial.x, 'y' : this.current.y - this.initial.y };if(((overall.x >= 0 && overall.x <= this.threshold) || (overall.x <= 0 && overall.x >= 0 - this.threshold))&&((overall.y >= 0 && overall.y <= this.threshold) || (overall.y <= 0 && overall.y >= 0 - this.threshold))){this.current.x -= overall.x;this.current.y -= overall.y;}if(this.released || overall.x > this.threshold || overall.x < (0 - this.threshold) || overall.y > this.threshold || overall.y < (0 - this.threshold)){dbx.group = this.container;dbx.box = this.box;dbx.event = e;if(typeof dbx.onboxdrag == 'undefined' || dbx.onboxdrag()){this.released = true;if(!this.restrict || !this.vertical) { this.boxclone.style.left = (this.current.x - this.difference.x) + 'px'; }if(!this.restrict || this.vertical) { this.boxclone.style.top = (this.current.y - this.difference.y) + 'px'; }this.moveOriginalToPosition(this.current.x, this.current.y);if(typeof e.preventDefault != 'undefined' ) { e.preventDefault(); }}}}return true;};dbxGroup.prototype.mouseup = function(e){if(this.box != null){this.moveOriginalToPosition(e.clientX, e.clientY);this.removeCloneBox();this.getBoxOrder();if(typeof document.onselectstart != 'undefined'){document.onselectstart = function() { return true; }}}this.dragok = false;};dbxGroup.prototype.keypress = function(e, anchor){if(/^(3[7-9])|(40)$/.test(e.keyCode)){this.removeTooltip();if((this.vertical && /^(38|40)$/.test(e.keyCode)) || (!this.vertical && /^(37|39)$/.test(e.keyCode))){this.shiftBoxPosition(e, anchor, /^[3][78]$/.test(e.keyCode) ? false : true);if(typeof e.preventDefault != 'undefined') { e.preventDefault(); }else { return false; }typeof e.stopPropagation != 'undefined' ? e.stopPropagation() : e.cancelBubble = true;this.keydown = false;}}return true;};dbxGroup.prototype.getBoxOrder = function(){this.order = [];var len = this.eles.length;for(var j=0; j<len; j++){if(/dbx\-box/i.test(this.eles[j].className) && !/dbx\-(clone|dummy)/i.test(this.eles[j].className)){this.order.push(this.eles[j].className.split('dbxid')[1] + (/dbx\-box\-open/i.test(this.eles[j].className) ? '+' : '-'));}}dbx.savedata[this.gid] = this.order.join(',');dbx.setCookieState();};dbxGroup.prototype.createClone = function(){var clone = this.container.appendChild(arguments[0].cloneNode(true));clone.className += ' dbx-clone';clone.style.position = 'absolute';clone.style.visibility = 'hidden';clone.style.zIndex = arguments[1];clone.style.left = arguments[2].x + 'px';clone.style.top = arguments[2].y + 'px';clone.style.width = arguments[0].offsetWidth + 'px';clone.style.height = arguments[0].offsetHeight + 'px';return clone;};dbxGroup.prototype.createCloneBox = function(box){this.box = box;this.position = { 'x' : this.box.offsetLeft, 'y' : this.box.offsetTop };this.difference = { 'x' : (this.initial.x - this.position.x), 'y' : (this.initial.y - this.position.y) };this.boxclone = this.createClone(this.box, 30000, this.position);this.boxclone.style.cursor = 'move';this.dragok = true;};dbxGroup.prototype.removeCloneBox = function(){this.container.removeChild(this.boxclone);this.box.style.visibility = 'visible';this.box = null;};dbxGroup.prototype.moveOriginalToPosition = function(clientX, clientY){var cloneprops = {'xy' : this.vertical ? clientY - this.difference.y : clientX - this.difference.x,'wh' : this.vertical ? this.boxclone.offsetHeight : this.boxclone.offsetWidth};this.box.style.visibility = 'hidden';this.boxclone.style.visibility = 'visible';var len = this.boxes.length;for(var i=0; i<len; i++){var boxprops = {'xy' : this.vertical ? this.boxes[i].offsetTop : this.boxes[i].offsetLeft,'wh' : this.vertical ? this.boxes[i].offsetHeight : this.boxes[i].offsetWidth};if((this.positive && cloneprops.xy + cloneprops.wh > boxprops.xy && cloneprops.xy < boxprops.xy)||(!this.positive && cloneprops.xy < boxprops.xy && cloneprops.xy + cloneprops.wh > boxprops.xy)){if(this.boxes[i] == this.box) { return; }var sibling = this.box.nextSibling;while(sibling.className == null || !/dbx\-box/.test(sibling.className)){sibling = sibling.nextSibling;}if(this.boxes[i] == sibling) { return; }if(this.resolution > 0){if(this.box[this.vertical ? 'offsetTop' : 'offsetLeft'] < boxprops.xy){var visibox = this.boxes[i].previousSibling;while(visibox.className == null || !/dbx\-box/.test(visibox.className)){visibox = visibox.previousSibling;}}else{visibox = this.boxes[i];}var visipos = { 'x' : visibox.offsetLeft, 'y' : visibox.offsetTop };}var prepos = { 'x' : this.box.offsetLeft, 'y' : this.box.offsetTop };this.container.insertBefore(this.box, this.boxes[i]);this.initial.x += (this.box.offsetLeft - prepos.x);this.initial.y += (this.box.offsetTop - prepos.y);if(this.resolution > 0 && visibox != this.box){var animator = new dbxAnimator(this, visibox, visipos, this.resolution, false, null);}else{}break;}}};function dbxAnimator(caller, box, pos, res, kbd, anchor){this.caller = caller;this.box = box;this.timer = null;var before = pos[this.caller.vertical ? 'y' : 'x'];var after = this.box[this.caller.vertical ? 'offsetTop' : 'offsetLeft'];if(before != after){if(dbx.running > this.caller.boxes.length - 1) { return; }var clone = this.caller.createClone(this.box, 29999, arguments[2]);clone.style.visibility = 'visible';this.box.style.visibility = 'hidden';this.animateClone(clone,before,after > before ? after - before : 0 - (before - after),this.caller.vertical ? 'top' : 'left',res,kbd,anchor);}};dbxAnimator.prototype.animateClone = function(clone, current, change, dir, res, kbd, anchor){var self = this;var count = 0;dbx.running ++;this.timer = window.setInterval(function(){count ++;current += change / res;clone.style[dir] = current + 'px';if(count == res){window.clearTimeout(self.timer);self.timer = null;dbx.running --;self.caller.container.removeChild(clone);self.box.style.visibility = 'visible';if(kbd){if(anchor != null && anchor.parentNode.style.visibility != 'hidden'){anchor.focus();}else if(self.caller.toggles){var button = self.caller.buttons[parseInt(self.box.className.split('dbxid')[1],10)];if(button != null && typeof button.isactive != 'undefined'){button.focus();}}}}}, 20);};if(typeof window.attachEvent != 'undefined'){window.attachEvent('onunload', function(){var ev = ['mousedown', 'mousemove', 'mouseup', 'mouseout', 'click', 'keydown', 'keyup', 'focus', 'blur', 'selectstart', 'statechange', 'boxdrag', 'boxopen', 'boxclose'];var el = ev.length;var dl = document.all.length;for(var i=0; i<dl; i++){for(var j=0; j<el; j++){document.all[i]['on' + ev[j]] = null;}}});}

trunk/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js

@@ +1 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.16 $
+ * $Date: 2006/02/10 21:34:28 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
 /* Import plugin specific language pack */
-tinyMCE.importPluginLanguagePack('directionality', 'en,sv,fr_ca,zh_cn,cs,da,he,no,de,hu,ru,ru_KOI8-R,ru_UTF-8,es,cy,is,pl');
+tinyMCE.importPluginLanguagePack('directionality', 'en,tr,sv,fr_ca,zh_cn,cs,da,he,nb,de,hu,ru,ru_KOI8-R,ru_UTF-8,nn,es,cy,is,pl,nl,fr,pt_br');
 
-function TinyMCE_directionality_getInfo() {
-    return {
-        longname : 'Directionality',
-        author : 'Moxiecode Systems',
-        authorurl : 'http://tinymce.moxiecode.com',
-        infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_directionality.html',
-        version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
-    };
+var TinyMCE_DirectionalityPlugin = {
+    getInfo : function() {
+        return {
+            longname : 'Directionality',
+            author : 'Moxiecode Systems',
+            authorurl : 'http://tinymce.moxiecode.com',
+            infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_directionality.html',
+            version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+        };
+    },
+
+    getControlHTML : function(cn) {
+        switch (cn) {
+            case "ltr":
+                return tinyMCE.getButtonHTML(cn, 'lang_directionality_ltr_desc', '{$pluginurl}/images/ltr.gif', 'mceDirectionLTR');
+
+            case "rtl":
+                return tinyMCE.getButtonHTML(cn, 'lang_directionality_rtl_desc', '{$pluginurl}/images/rtl.gif', 'mceDirectionRTL');
+        }
+
+        return "";
+    },
+
+    execCommand : function(editor_id, element, command, user_interface, value) {
+        // Handle commands
+        switch (command) {
+            case "mceDirectionLTR":
+                var inst = tinyMCE.getInstanceById(editor_id);
+                var elm = tinyMCE.getParentElement(inst.getFocusElement(), "p,div,td,h1,h2,h3,h4,h5,h6,pre,address");
+
+                if (elm)
+                    elm.setAttribute("dir", "ltr");
+
+                tinyMCE.triggerNodeChange(false);
+                return true;
+
+            case "mceDirectionRTL":
+                var inst = tinyMCE.getInstanceById(editor_id);
+                var elm = tinyMCE.getParentElement(inst.getFocusElement(), "p,div,td,h1,h2,h3,h4,h5,h6,pre,address");
+
+                if (elm)
+                    elm.setAttribute("dir", "rtl");
+
+                tinyMCE.triggerNodeChange(false);
+                return true;
+        }
+
+        // Pass to next handler in chain
+        return false;
+    },
+
+    handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+        function getAttrib(elm, name) {
+            return elm.getAttribute(name) ? elm.getAttribute(name) : "";
+        }
+
+        if (node == null)
+            return;
+
+        var elm = tinyMCE.getParentElement(node, "p,div,td,h1,h2,h3,h4,h5,h6,pre,address");
+        if (!elm) {
+            tinyMCE.switchClass(editor_id + '_ltr', 'mceButtonDisabled');
+            tinyMCE.switchClass(editor_id + '_rtl', 'mceButtonDisabled');
+            return true;
+        }
+
+        tinyMCE.switchClass(editor_id + '_ltr', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_rtl', 'mceButtonNormal');
+
+        var dir = getAttrib(elm, "dir");
+        if (dir == "ltr" || dir == "")
+            tinyMCE.switchClass(editor_id + '_ltr', 'mceButtonSelected');
+        else
+            tinyMCE.switchClass(editor_id + '_rtl', 'mceButtonSelected');
+
+        return true;
+    }
 };
 
-function TinyMCE_directionality_getControlHTML(control_name) {
-    switch (control_name) {
-        case "ltr":
-            var cmd = 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceDirectionLTR\');return false;';
-            return '<a href="javascript:' + cmd + '" onclick="' + cmd + '" target="_self" onmousedown="return false;"><img id="{$editor_id}_ltr" src="{$pluginurl}/images/ltr.gif" title="{$lang_directionality_ltr_desc}" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>'
-            + '<div class="zerosize"><input type="button" accesskey="." onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceDirectionLTR\',false);" /></div>';
-
-        case "rtl":
-            var cmd = 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceDirectionRTL\');return false;';
-            return '<a href="javascript:' + cmd + '" onclick="' + cmd + '" target="_self" onmousedown="return false;"><img id="{$editor_id}_rtl" src="{$pluginurl}/images/rtl.gif" title="{$lang_directionality_rtl_desc}" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>'
-            + '<div class="zerosize"><input type="button" accesskey="," onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceDirectionRTL\',false);" /></div>';
-    }
-
-    return "";
-}
-
-function TinyMCE_directionality_execCommand(editor_id, element, command, user_interface, value) {
-    // Handle commands
-    switch (command) {
-        case "mceDirectionLTR":
-            var inst = tinyMCE.getInstanceById(editor_id);
-            var elm = tinyMCE.getParentElement(inst.getFocusElement(), "p,div,td,h1,h2,h3,h4,h5,h6,pre,address");
-
-            if (elm)
-                elm.setAttribute("dir", "ltr");
-
-            tinyMCE.triggerNodeChange(false);
-            return true;
-
-        case "mceDirectionRTL":
-            var inst = tinyMCE.getInstanceById(editor_id);
-            var elm = tinyMCE.getParentElement(inst.getFocusElement(), "p,div,td,h1,h2,h3,h4,h5,h6,pre,address");
-
-            if (elm)
-                elm.setAttribute("dir", "rtl");
-
-            tinyMCE.triggerNodeChange(false);
-            return true;
-    }
-
-    // Pass to next handler in chain
-    return false;
-}
-
-function TinyMCE_directionality_handleNodeChange(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
-    function getAttrib(elm, name) {
-        return elm.getAttribute(name) ? elm.getAttribute(name) : "";
-    }
-
-    tinyMCE.switchClassSticky(editor_id + '_ltr', 'mceButtonNormal', false);
-    tinyMCE.switchClassSticky(editor_id + '_rtl', 'mceButtonNormal', false);
-
-    if (node == null)
-        return;
-
-    var elm = tinyMCE.getParentElement(node, "p,div,td,h1,h2,h3,h4,h5,h6,pre,address");
-    if (!elm) {
-        tinyMCE.switchClassSticky(editor_id + '_ltr', 'mceButtonDisabled', true);
-        tinyMCE.switchClassSticky(editor_id + '_rtl', 'mceButtonDisabled', true);
-        return;
-    }
-
-    var dir = getAttrib(elm, "dir");
-    if (dir == "ltr" || dir == "")
-        tinyMCE.switchClassSticky(editor_id + '_ltr', 'mceButtonSelected', false);
-    else
-        tinyMCE.switchClassSticky(editor_id + '_rtl', 'mceButtonSelected', false);
-
-    return true;
-}
+tinyMCE.addPlugin("directionality", TinyMCE_DirectionalityPlugin);

trunk/wp-includes/js/tinymce/plugins/paste/editor_plugin.js

@@ -1 @@
-/**
- * $RCSfile: editor_plugin_src.js,v $
- * $Revision: 1.36 $
- * $Date: 2006/03/20 12:03:44 $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
- */
-
-/* Import plugin specific language pack */ 
-tinyMCE.importPluginLanguagePack('paste', 'en,tr,sv,cs,zh_cn,fr_ca,da,he,nb,de,hu,ru,ru_KOI8-R,ru_UTF-8,nn,fi,es,cy,is,pl,nl,fr,pt_br');
-
-var TinyMCE_PastePlugin = {
-    getInfo : function() {
-        return {
-            longname : 'Paste text/word',
-            author : 'Moxiecode Systems',
-            authorurl : 'http://tinymce.moxiecode.com',
-            infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_paste.html',
-            version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
-        };
-    },
-
-    initInstance : function(inst) {
-        if (tinyMCE.isMSIE && tinyMCE.getParam("paste_auto_cleanup_on_paste", false))
-            tinyMCE.addEvent(inst.getBody(), "paste", TinyMCE_PastePlugin._handlePasteEvent);
-    },
-
-    getControlHTML : function(cn) { 
-        switch (cn) { 
-            case "pastetext":
-                return tinyMCE.getButtonHTML(cn, 'lang_paste_text_desc', '{$pluginurl}/images/pastetext.gif', 'mcePasteText', true);
-
-            case "pasteword":
-                return tinyMCE.getButtonHTML(cn, 'lang_paste_word_desc', '{$pluginurl}/images/pasteword.gif', 'mcePasteWord', true);
-
-            case "selectall":
-                return tinyMCE.getButtonHTML(cn, 'lang_selectall_desc', '{$pluginurl}/images/selectall.gif', 'mceSelectAll', true);
-        } 
-
-        return ''; 
-    },
-
-    execCommand : function(editor_id, element, command, user_interface, value) { 
-        switch (command) { 
-            case "mcePasteText": 
-                if (user_interface) {
-                    if ((tinyMCE.isMSIE && !tinyMCE.isOpera) && !tinyMCE.getParam('paste_use_dialog', false))
-                        TinyMCE_PastePlugin._insertText(clipboardData.getData("Text"), true); 
-                    else { 
-                        var template = new Array(); 
-                        template['file']    = '../../plugins/paste/pastetext.htm'; // Relative to theme 
-                        template['width']  = 450; 
-                        template['height'] = 400; 
-                        var plain_text = ""; 
-                        tinyMCE.openWindow(template, {editor_id : editor_id, plain_text: plain_text, resizable : "yes", scrollbars : "no", inline : "yes", mceDo : 'insert'}); 
-                    }
-                } else
-                    TinyMCE_PastePlugin._insertText(value['html'], value['linebreaks']);
-
-                return true;
-
-            case "mcePasteWord": 
-                if (user_interface) {
-                    if ((tinyMCE.isMSIE && !tinyMCE.isOpera) && !tinyMCE.getParam('paste_use_dialog', false)) {
-                        var html = TinyMCE_PastePlugin._clipboardHTML();
-
-                        if (html && html.length > 0)
-                            TinyMCE_PastePlugin._insertWordContent(html);
-                    } else { 
-                        var template = new Array(); 
-                        template['file']    = '../../plugins/paste/pasteword.htm'; // Relative to theme 
-                        template['width']  = 450; 
-                        template['height'] = 400; 
-                        var plain_text = ""; 
-                        tinyMCE.openWindow(template, {editor_id : editor_id, plain_text: plain_text, resizable : "yes", scrollbars : "no", inline : "yes", mceDo : 'insert'});
-                    }
-                } else
-                    TinyMCE_PastePlugin._insertWordContent(value);
-
-                return true;
-
-            case "mceSelectAll":
-                tinyMCE.execInstanceCommand(editor_id, 'selectall'); 
-                return true; 
-
-        } 
-
-        // Pass to next handler in chain 
-        return false; 
-    },
-
-    // Private plugin internal methods
-
-    _handlePasteEvent : function(e) {
-        switch (e.type) {
-            case "paste":
-                var html = TinyMCE_PastePlugin._clipboardHTML();
-                var r, inst = tinyMCE.selectedInstance;
-
-                // Removes italic, strong etc, the if was needed due to bug #1437114
-                if (inst && (r = inst.getRng()) && r.text.length > 0)
-                    tinyMCE.execCommand('delete');
-
-                if (html && html.length > 0)
-                    tinyMCE.execCommand('mcePasteWord', false, html);
-
-                tinyMCE.cancelEvent(e);
-                return false;
-        }
-
-        return true;
-    },
-
-    _insertText : function(content, bLinebreaks) { 
-        if (content && content.length > 0) {
-            if (bLinebreaks) { 
-                // Special paragraph treatment 
-                if (tinyMCE.getParam("paste_create_paragraphs", true)) {
-                    var rl = tinyMCE.getParam("paste_replace_list", '\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');
-                    for (var i=0; i<rl.length; i+=2)
-                        content = content.replace(new RegExp(rl[i], 'gi'), rl[i+1]);
-
-                    content = tinyMCE.regexpReplace(content, "\r\n\r\n", "</p><p>", "gi"); 
-                    content = tinyMCE.regexpReplace(content, "\r\r", "</p><p>", "gi"); 
-                    content = tinyMCE.regexpReplace(content, "\n\n", "</p><p>", "gi"); 
-
-                    // Has paragraphs 
-                    if ((pos = content.indexOf('</p><p>')) != -1) { 
-                        tinyMCE.execCommand("Delete"); 
-
-                        var node = tinyMCE.selectedInstance.getFocusElement(); 
-
-                        // Get list of elements to break 
-                        var breakElms = new Array(); 
-
-                        do { 
-                            if (node.nodeType == 1) { 
-                                // Don't break tables and break at body 
-                                if (node.nodeName == "TD" || node.nodeName == "BODY") 
-                                    break; 
-        
-                                breakElms[breakElms.length] = node; 
-                            } 
-                        } while(node = node.parentNode); 
-
-                        var before = "", after = "</p>"; 
-                        before += content.substring(0, pos); 
-
-                        for (var i=0; i<breakElms.length; i++) { 
-                            before += "</" + breakElms[i].nodeName + ">"; 
-                            after += "<" + breakElms[(breakElms.length-1)-i].nodeName + ">"; 
-                        } 
-
-                        before += "<p>"; 
-                        content = before + content.substring(pos+7) + after; 
-                    } 
-                } 
-
-                if (tinyMCE.getParam("paste_create_linebreaks", true)) {
-                    content = tinyMCE.regexpReplace(content, "\r\n", "<br />", "gi"); 
-                    content = tinyMCE.regexpReplace(content, "\r", "<br />", "gi"); 
-                    content = tinyMCE.regexpReplace(content, "\n", "<br />", "gi"); 
-                }
-            } 
-        
-            tinyMCE.execCommand("mceInsertRawHTML", false, content); 
-        }
-    },
-
-    _insertWordContent : function(content) { 
-        if (content && content.length > 0) {
-            // Cleanup Word content
-            var bull = String.fromCharCode(8226);
-            var middot = String.fromCharCode(183);
-            var cb;
-
-            if ((cb = tinyMCE.getParam("paste_insert_word_content_callback", "")) != "")
-                content = eval(cb + "('before', content)");
-
-            var rl = tinyMCE.getParam("paste_replace_list", '\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');
-            for (var i=0; i<rl.length; i+=2)
-                content = content.replace(new RegExp(rl[i], 'gi'), rl[i+1]);
-
-            if (tinyMCE.getParam("paste_convert_headers_to_strong", false)) {
-                content = content.replace(new RegExp('<p class=MsoHeading.*?>(.*?)<\/p>', 'gi'), '<p><b>$1</b></p>');
-            }
-
-            content = content.replace(new RegExp('tab-stops: list [0-9]+.0pt">', 'gi'), '">' + "--list--");
-            content = content.replace(new RegExp(bull + "(.*?)<BR>", "gi"), "<p>" + middot + "$1</p>");
-            content = content.replace(new RegExp('<SPAN style="mso-list: Ignore">', 'gi'), "<span>" + bull); // Covert to bull list
-            content = content.replace(/<o:p><\/o:p>/gi, "");
-            content = content.replace(new RegExp('<br style="page-break-before: always;.*>', 'gi'), '-- page break --'); // Replace pagebreaks
-            content = content.replace(new RegExp('<(!--)([^>]*)(--)>', 'g'), "");  // Word comments
-
-            if (tinyMCE.getParam("paste_remove_spans", true))
-                content = content.replace(/<\/?span[^>]*>/gi, "");
-
-            if (tinyMCE.getParam("paste_remove_styles", true))
-                content = content.replace(new RegExp('<(\\w[^>]*) style="([^"]*)"([^>]*)', 'gi'), "<$1$3");
-
-            content = content.replace(/<\/?font[^>]*>/gi, "");
-
-            // Strips class attributes.
-            switch (tinyMCE.getParam("paste_strip_class_attributes", "all")) {
-                case "all":
-                    content = content.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "<$1$3");
-                    break;
-
-                case "mso":
-                    content = content.replace(new RegExp('<(\\w[^>]*) class="?mso([^ |>]*)([^>]*)', 'gi'), "<$1$3");
-                    break;
-            }
-
-            content = content.replace(new RegExp('href="?' + TinyMCE_PastePlugin._reEscape("" + document.location) + '', 'gi'), 'href="' + tinyMCE.settings['document_base_url']);
-            content = content.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi, "<$1$3");
-            content = content.replace(/<\\?\?xml[^>]*>/gi, "");
-            content = content.replace(/<\/?\w+:[^>]*>/gi, "");
-            content = content.replace(/-- page break --\s*<p>&nbsp;<\/p>/gi, ""); // Remove pagebreaks
-            content = content.replace(/-- page break --/gi, ""); // Remove pagebreaks
-
-    //      content = content.replace(/\/?&nbsp;*/gi, ""); &nbsp;
-    //      content = content.replace(/<p>&nbsp;<\/p>/gi, '');
-
-            if (!tinyMCE.settings['force_p_newlines']) {
-                content = content.replace('', '' ,'gi');
-                content = content.replace('</p>', '<br /><br />' ,'gi');
-            }
-
-            if (!tinyMCE.isMSIE && !tinyMCE.settings['force_p_newlines']) {
-                content = content.replace(/<\/?p[^>]*>/gi, "");
-            }
-
-            content = content.replace(/<\/?div[^>]*>/gi, "");
-
-            // Convert all middlot lists to UL lists
-            if (tinyMCE.getParam("paste_convert_middot_lists", true)) {
-                var div = document.createElement("div");
-                div.innerHTML = content;
-
-                // Convert all middot paragraphs to li elements
-                var className = tinyMCE.getParam("paste_unindented_list_class", "unIndentedList");
-
-                while (TinyMCE_PastePlugin._convertMiddots(div, "--list--")) ; // bull
-                while (TinyMCE_PastePlugin._convertMiddots(div, middot, className)) ; // Middot
-                while (TinyMCE_PastePlugin._convertMiddots(div, bull)) ; // bull
-
-                content = div.innerHTML;
-            }
-
-            // Replace all headers with strong and fix some other issues
-            if (tinyMCE.getParam("paste_convert_headers_to_strong", false)) {
-                content = content.replace(/<h[1-6]>&nbsp;<\/h[1-6]>/gi, '<p>&nbsp;&nbsp;</p>');
-                content = content.replace(/<h[1-6]>/gi, '<p><b>');
-                content = content.replace(/<\/h[1-6]>/gi, '</b></p>');
-                content = content.replace(/<b>&nbsp;<\/b>/gi, '<b>&nbsp;&nbsp;</b>');
-                content = content.replace(/^(&nbsp;)*/gi, '');
-            }
-
-            content = content.replace(/--list--/gi, ""); // Remove --list--
-
-            if ((cb = tinyMCE.getParam("paste_insert_word_content_callback", "")) != "")
-                content = eval(cb + "('after', content)");
-
-            // Insert cleaned content
-            tinyMCE.execCommand("mceInsertContent", false, content);
-            window.setTimeout('tinyMCE.execCommand("mceCleanup");', 1); // Do normal cleanup detached from this thread
-        }
-    },
-
-    _reEscape : function(s) {
-        var l = "?.\\*[](){}+^$:";
-        var o = "";
-
-        for (var i=0; i<s.length; i++) {
-            var c = s.charAt(i);
-
-            if (l.indexOf(c) != -1)
-                o += '\\' + c;
-            else
-                o += c;
-        }
-
-        return o;
-    },
-
-    _convertMiddots : function(div, search, class_name) {
-        var mdot = String.fromCharCode(183);
-        var bull = String.fromCharCode(8226);
-
-        var nodes = div.getElementsByTagName("p");
-        var prevul;
-        for (var i=0; i<nodes.length; i++) {
-            var p = nodes[i];
-
-            // Is middot
-            if (p.innerHTML.indexOf(search) == 0) {
-                var ul = document.createElement("ul");
-
-                if (class_name)
-                    ul.className = class_name;
-
-                // Add the first one
-                var li = document.createElement("li");
-                li.innerHTML = p.innerHTML.replace(new RegExp('' + mdot + '|' + bull + '|--list--|&nbsp;', "gi"), '');
-                ul.appendChild(li);
-
-                // Add the rest
-                var np = p.nextSibling;
-                while (np) {
-                        // If the node is whitespace, then
-                        // ignore it and continue on.
-                        if (np.nodeType == 3 && /^\s$/m.test(np.nodeValue)) {
-                                np = np.nextSibling;
-                                continue;
-                        }
-                    
-                    if (search == mdot) {
-                            if (np.nodeType == 1 && /^o(\s+|&nbsp;)/.test(np.innerHTML)) {
-                                    // Second level of nesting
-                                    if (!prevul) {
-                                            prevul = ul;
-                                            ul = document.createElement("ul");
-                                            prevul.appendChild(ul);
-                                    }
-                                    np.innerHTML = np.innerHTML.replace(/^o/, '');
-                            } else {
-                                    // Pop the stack if we're going back up to the first level
-                                    if (prevul) {
-                                            ul = prevul;
-                                            prevul = null;
-                                    }
-                                    // Not element or middot paragraph
-                                    if (np.nodeType != 1 || np.innerHTML.indexOf(search) != 0)
-                                            break;
-                            }
-                    } else {
-                            // Not element or middot paragraph
-                            if (np.nodeType != 1 || np.innerHTML.indexOf(search) != 0)
-                                    break;
-                        }
-
-                    var cp = np.nextSibling;
-                    var li = document.createElement("li");
-                    li.innerHTML = np.innerHTML.replace(new RegExp('' + mdot + '|' + bull + '|--list--|&nbsp;', "gi"), '');
-                    np.parentNode.removeChild(np);
-                    ul.appendChild(li);
-                    np = cp;
-                }
-
-                p.parentNode.replaceChild(ul, p);
-
-                return true;
-            }
-        }
-
-        return false;
-    },
-
-    _clipboardHTML : function() {
-        var div = document.getElementById('_TinyMCE_clipboardHTML');
-
-        if (!div) {
-            var div = document.createElement('DIV');
-            div.id = '_TinyMCE_clipboardHTML';
-
-            with (div.style) {
-                visibility = 'hidden';
-                overflow = 'hidden';
-                position = 'absolute';
-                width = 1;
-                height = 1;
-            }
-
-            document.body.appendChild(div);
-        }
-
-        div.innerHTML = '';
-        var rng = document.body.createTextRange();
-        rng.moveToElementText(div);
-        rng.execCommand('Paste');
-        var html = div.innerHTML;
-        div.innerHTML = '';
-        return html;
-    }
-};
-
-tinyMCE.addPlugin("paste", TinyMCE_PastePlugin);
+tinyMCE.importPluginLanguagePack('paste','en,tr,sv,cs,zh_cn,fr_ca,da,he,nb,de,hu,ru,ru_KOI8-R,ru_UTF-8,nn,fi,es,cy,is,pl,nl,fr,pt_br');var TinyMCE_PastePlugin={getInfo:function(){return{longname:'Paste text/word',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_paste.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){if(tinyMCE.isMSIE&&tinyMCE.getParam("paste_auto_cleanup_on_paste",false))tinyMCE.addEvent(inst.getBody(),"paste",TinyMCE_PastePlugin._handlePasteEvent);},getControlHTML:function(cn){switch(cn){case"pastetext":return tinyMCE.getButtonHTML(cn,'lang_paste_text_desc','{$pluginurl}/images/pastetext.gif','mcePasteText',true);case"pasteword":return tinyMCE.getButtonHTML(cn,'lang_paste_word_desc','{$pluginurl}/images/pasteword.gif','mcePasteWord',true);case"selectall":return tinyMCE.getButtonHTML(cn,'lang_selectall_desc','{$pluginurl}/images/selectall.gif','mceSelectAll',true);}return'';},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mcePasteText":if(user_interface){if((tinyMCE.isMSIE&&!tinyMCE.isOpera)&&!tinyMCE.getParam('paste_use_dialog',false))TinyMCE_PastePlugin._insertText(clipboardData.getData("Text"),true);else{var template=new Array();template['file']='../../plugins/paste/pastetext.htm';template['width']=450;template['height']=400;var plain_text="";tinyMCE.openWindow(template,{editor_id:editor_id,plain_text:plain_text,resizable:"yes",scrollbars:"no",inline:"yes",mceDo:'insert'});}}else TinyMCE_PastePlugin._insertText(value['html'],value['linebreaks']);return true;case"mcePasteWord":if(user_interface){if((tinyMCE.isMSIE&&!tinyMCE.isOpera)&&!tinyMCE.getParam('paste_use_dialog',false)){var html=TinyMCE_PastePlugin._clipboardHTML();if(html&&html.length>0)TinyMCE_PastePlugin._insertWordContent(html);}else{var template=new Array();template['file']='../../plugins/paste/pasteword.htm';template['width']=450;template['height']=400;var plain_text="";tinyMCE.openWindow(template,{editor_id:editor_id,plain_text:plain_text,resizable:"yes",scrollbars:"no",inline:"yes",mceDo:'insert'});}}else TinyMCE_PastePlugin._insertWordContent(value);return true;case"mceSelectAll":tinyMCE.execInstanceCommand(editor_id,'selectall');return true;}return false;},_handlePasteEvent:function(e){switch(e.type){case"paste":var html=TinyMCE_PastePlugin._clipboardHTML();var r,inst=tinyMCE.selectedInstance;if(inst&&(r=inst.getRng())&&r.text.length>0)tinyMCE.execCommand('delete');if(html&&html.length>0)tinyMCE.execCommand('mcePasteWord',false,html);tinyMCE.cancelEvent(e);return false;}return true;},_insertText:function(content,bLinebreaks){if(content&&content.length>0){if(bLinebreaks){if(tinyMCE.getParam("paste_create_paragraphs",true)){var rl=tinyMCE.getParam("paste_replace_list",'\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');for(var i=0;i<rl.length;i+=2)content=content.replace(new RegExp(rl[i],'gi'),rl[i+1]);content=tinyMCE.regexpReplace(content,"\r\n\r\n","</p><p>","gi");content=tinyMCE.regexpReplace(content,"\r\r","</p><p>","gi");content=tinyMCE.regexpReplace(content,"\n\n","</p><p>","gi");if((pos=content.indexOf('</p><p>'))!=-1){tinyMCE.execCommand("Delete");var node=tinyMCE.selectedInstance.getFocusElement();var breakElms=new Array();do{if(node.nodeType==1){if(node.nodeName=="TD"||node.nodeName=="BODY")break;breakElms[breakElms.length]=node;}}while(node=node.parentNode);var before="",after="</p>";before+=content.substring(0,pos);for(var i=0;i<breakElms.length;i++){before+="</"+breakElms[i].nodeName+">";after+="<"+breakElms[(breakElms.length-1)-i].nodeName+">";}before+="<p>";content=before+content.substring(pos+7)+after;}}if(tinyMCE.getParam("paste_create_linebreaks",true)){content=tinyMCE.regexpReplace(content,"\r\n","<br />","gi");content=tinyMCE.regexpReplace(content,"\r","<br />","gi");content=tinyMCE.regexpReplace(content,"\n","<br />","gi");}}tinyMCE.execCommand("mceInsertRawHTML",false,content);}},_insertWordContent:function(content){if(content&&content.length>0){var bull=String.fromCharCode(8226);var middot=String.fromCharCode(183);var cb;if((cb=tinyMCE.getParam("paste_insert_word_content_callback",""))!="")content=eval(cb+"('before', content)");var rl=tinyMCE.getParam("paste_replace_list",'\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');for(var i=0;i<rl.length;i+=2)content=content.replace(new RegExp(rl[i],'gi'),rl[i+1]);if(tinyMCE.getParam("paste_convert_headers_to_strong",false)){content=content.replace(new RegExp('<p class=MsoHeading.*?>(.*?)<\/p>','gi'),'<p><b>$1</b></p>');}content=content.replace(new RegExp('tab-stops: list [0-9]+.0pt">','gi'),'">'+"--list--");content=content.replace(new RegExp(bull+"(.*?)<BR>","gi"),"<p>"+middot+"$1</p>");content=content.replace(new RegExp('<SPAN style="mso-list: Ignore">','gi'),"<span>"+bull);content=content.replace(/<o:p><\/o:p>/gi,"");content=content.replace(new RegExp('<br style="page-break-before: always;.*>','gi'),'-- page break --');content=content.replace(new RegExp('<(!--)([^>]*)(--)>','g'),"");if(tinyMCE.getParam("paste_remove_spans",true))content=content.replace(/<\/?span[^>]*>/gi,"");if(tinyMCE.getParam("paste_remove_styles",true))content=content.replace(new RegExp('<(\\w[^>]*) style="([^"]*)"([^>]*)','gi'),"<$1$3");content=content.replace(/<\/?font[^>]*>/gi,"");switch(tinyMCE.getParam("paste_strip_class_attributes","all")){case"all":content=content.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi,"<$1$3");break;case"mso":content=content.replace(new RegExp('<(\\w[^>]*) class="?mso([^ |>]*)([^>]*)','gi'),"<$1$3");break;}content=content.replace(new RegExp('href="?'+TinyMCE_PastePlugin._reEscape(""+document.location)+'','gi'),'href="'+tinyMCE.settings['document_base_url']);content=content.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi,"<$1$3");content=content.replace(/<\\?\?xml[^>]*>/gi,"");content=content.replace(/<\/?\w+:[^>]*>/gi,"");content=content.replace(/-- page break --\s*<p>&nbsp;<\/p>/gi,"");content=content.replace(/-- page break --/gi,"");if(!tinyMCE.settings['force_p_newlines']){content=content.replace('','','gi');content=content.replace('</p>','<br /><br />','gi');}if(!tinyMCE.isMSIE&&!tinyMCE.settings['force_p_newlines']){content=content.replace(/<\/?p[^>]*>/gi,"");}content=content.replace(/<\/?div[^>]*>/gi,"");if(tinyMCE.getParam("paste_convert_middot_lists",true)){var div=document.createElement("div");div.innerHTML=content;var className=tinyMCE.getParam("paste_unindented_list_class","unIndentedList");while(TinyMCE_PastePlugin._convertMiddots(div,"--list--"));while(TinyMCE_PastePlugin._convertMiddots(div,middot,className));while(TinyMCE_PastePlugin._convertMiddots(div,bull));content=div.innerHTML;}if(tinyMCE.getParam("paste_convert_headers_to_strong",false)){content=content.replace(/<h[1-6]>&nbsp;<\/h[1-6]>/gi,'<p>&nbsp;&nbsp;</p>');content=content.replace(/<h[1-6]>/gi,'<p><b>');content=content.replace(/<\/h[1-6]>/gi,'</b></p>');content=content.replace(/<b>&nbsp;<\/b>/gi,'<b>&nbsp;&nbsp;</b>');content=content.replace(/^(&nbsp;)*/gi,'');}content=content.replace(/--list--/gi,"");if((cb=tinyMCE.getParam("paste_insert_word_content_callback",""))!="")content=eval(cb+"('after', content)");tinyMCE.execCommand("mceInsertContent",false,content);window.setTimeout('tinyMCE.execCommand("mceCleanup");',1);}},_reEscape:function(s){var l="?.\\*[](){}+^$:";var o="";for(var i=0;i<s.length;i++){var c=s.charAt(i);if(l.indexOf(c)!=-1)o+='\\'+c;else o+=c;}return o;},_convertMiddots:function(div,search,class_name){var mdot=String.fromCharCode(183);var bull=String.fromCharCode(8226);var nodes=div.getElementsByTagName("p");var prevul;for(var i=0;i<nodes.length;i++){var p=nodes[i];if(p.innerHTML.indexOf(search)==0){var ul=document.createElement("ul");if(class_name)ul.className=class_name;var li=document.createElement("li");li.innerHTML=p.innerHTML.replace(new RegExp(''+mdot+'|'+bull+'|--list--|&nbsp;',"gi"),'');ul.appendChild(li);var np=p.nextSibling;while(np){if(np.nodeType==3&&new RegExp('^\\s$','m').test(np.nodeValue)){np=np.nextSibling;continue;}if(search==mdot){if(np.nodeType==1&&new RegExp('^o(\\s+|&nbsp;)').test(np.innerHTML)){if(!prevul){prevul=ul;ul=document.createElement("ul");prevul.appendChild(ul);}np.innerHTML=np.innerHTML.replace(/^o/,'');}else{if(prevul){ul=prevul;prevul=null;}if(np.nodeType!=1||np.innerHTML.indexOf(search)!=0)break;}}else{if(np.nodeType!=1||np.innerHTML.indexOf(search)!=0)break;}var cp=np.nextSibling;var li=document.createElement("li");li.innerHTML=np.innerHTML.replace(new RegExp(''+mdot+'|'+bull+'|--list--|&nbsp;',"gi"),'');np.parentNode.removeChild(np);ul.appendChild(li);np=cp;}p.parentNode.replaceChild(ul,p);return true;}}return false;},_clipboardHTML:function(){var div=document.getElementById('_TinyMCE_clipboardHTML');if(!div){var div=document.createElement('DIV');div.id='_TinyMCE_clipboardHTML';with(div.style){visibility='hidden';overflow='hidden';position='absolute';width=1;height=1;}document.body.appendChild(div);}div.innerHTML='';var rng=document.body.createTextRange();rng.moveToElementText(div);rng.execCommand('Paste');var html=div.innerHTML;div.innerHTML='';return html;}};tinyMCE.addPlugin("paste",TinyMCE_PastePlugin);

trunk/wp-includes/js/tinymce/plugins/spellchecker/config.php

@@ -7 +7 @@
     // Pspell shell specific settings
     $spellCheckerConfig['tinypspellshell.aspell'] = '/usr/bin/aspell';
-    $spellCheckerConfig['tinypspellshell.tmp'] = '/tmp';
+    $spellCheckerConfig['tinypspellshell.tmp'] = '/tmp/tinyspell/0';
 
     // Default settings

trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js

@@ -150 +150 @@
 
                 // Parse all <!--more--> tags and replace them with images
-                while ((startPos = content.indexOf('<!--more-->', startPos)) != -1) {
+                while ((startPos = content.indexOf('<!--more', startPos)) != -1) {
+                    var endPos = content.indexOf('-->', startPos) + 3;
                     // Insert image
-                    var contentAfter = content.substring(startPos + 11);
+                    var moreText = content.substring(startPos + 8, endPos - 3);
+                    var contentAfter = content.substring(endPos);
                     content = content.substring(0, startPos);
                     content += '<img src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" ';
-                    content += ' width="100%" height="10px" ';
+                    content += ' width="100%" height="10px" moretext="'+moreText+'" ';
                     content += 'alt="'+altMore+'" title="'+altMore+'" class="mce_plugin_wordpress_more" name="mce_plugin_wordpress_more" />';
                     content += contentAfter;
@@ -201 +203 @@
                         endPos += 2;
 
-                        var embedHTML = '<!--more-->';
+                        var moreText = attribs['moretext'] ? attribs['moretext'] : '';
+                        var embedHTML = '<!--more'+moreText+'-->';
 
                         // Insert embed/object chunk
@@ -343 +346 @@
                     attributeName = attributeName.substring(pos+1);
 
-                attributes[attributeName.toLowerCase()] = attributeValue.substring(1).toLowerCase();
+                attributes[attributeName.toLowerCase()] = attributeValue.substring(1);
 
                 attributeName = "";
@@ -380 +383 @@
     return re;
 };
-
-tinyMCE.orgFixGeckoBaseHREFBug = tinyMCE.fixGeckoBaseHREFBug;
-tinyMCE.fixGeckoBaseHREFBug = function(m, e, h) {
-    if ( tinyMCE.isGecko && m == 1 )
-        h = h.replace(new RegExp('<((a|img|select|area|iframe|base|input|script|embed|object|link)\\s([^>]*\\s)?)(src|href)\\s*=', 'gi'), '<$1 x$4=');
-    else
-        h = tinyMCE.orgFixGeckoBaseHREFBug(m, e, h);
-
-    return h;
-};
-
-tinyMCE.orgStoreAwayURLs = tinyMCE.storeAwayURLs;
-tinyMCE.storeAwayURLs = function(s) {
-        // Remove all mce_src, mce_href and replace them with new ones
-        s = s.replace(new RegExp('mce_(href|src)\\s*=\\s*\"[^ >\"]*\"', 'gi'), '');
-        s = s.replace(new RegExp('<((a|img|select|area|iframe|base|input|script|embed|object|link)\\s([^>]*\\s)?)(src|href)\\s*=\\s*"([^"]*)"', 'gi'), '<$1 $4="$5" mce_$4="$5"');
-
-        return s;
-};

trunk/wp-includes/js/tinymce/themes/advanced/editor_template.js

@@ -1 +1 @@
 /**
  * $RCSfile: editor_template_src.js,v $
- * $Revision: 1.93 $
- * $Date: 2006/03/14 17:33:50 $
+ * $Revision: 1.96 $
+ * $Date: 2006/04/18 13:32:52 $
  *
  * @author Moxiecode
@@ -82 +82 @@
                     ['h4', '{$lang_theme_h4}'],
                     ['h5', '{$lang_theme_h5}'],
-                    ['h6', '{$lang_theme_h6}']
+                    ['h6', '{$lang_theme_h6}'],
+                    ['div', '{$lang_theme_div}'],
+                    ['blockquote', '{$lang_theme_blockquote}'],
+                    ['code', '{$lang_theme_code}'],
+                    ['dt', '{$lang_theme_dt}'],
+                    ['dd', '{$lang_theme_dd}'],
+                    ['samp', '{$lang_theme_samp}']
                 ];
 
@@ -91 +97 @@
                     for (var x=0; x<lookup.length; x++) {
                         if (formats[i] == lookup[x][0])
-                            html += '<option value="<' + lookup[x][0] + '>">' + lookup[x][1] + '</option>';
+                            html += '<option value="&lt;' + lookup[x][0] + '&gt;">' + lookup[x][1] + '</option>';
                     }
                 }
@@ -118 +124 @@
 
             case "fontsizeselect":
-                return '<select id="{$editor_id}_fontSizeSelect" name="{$editor_id}_fontSizeSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontSize\',false,this.options[this.selectedIndex].value);" class="mceSelectList">\
-                        <option value="0">{$lang_theme_font_size}</option>\
-                        <option value="1">1 (8 pt)</option>\
-                        <option value="2">2 (10 pt)</option>\
-                        <option value="3">3 (12 pt)</option>\
-                        <option value="4">4 (14 pt)</option>\
-                        <option value="5">5 (18 pt)</option>\
-                        <option value="6">6 (24 pt)</option>\
-                        <option value="7">7 (36 pt)</option>\
-                        </select>';
+                return '<select id="{$editor_id}_fontSizeSelect" name="{$editor_id}_fontSizeSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontSize\',false,this.options[this.selectedIndex].value);" class="mceSelectList">'+
+                        '<option value="0">{$lang_theme_font_size}</option>'+
+                        '<option value="1">1 (8 pt)</option>'+
+                        '<option value="2">2 (10 pt)</option>'+
+                        '<option value="3">3 (12 pt)</option>'+
+                        '<option value="4">4 (14 pt)</option>'+
+                        '<option value="5">5 (18 pt)</option>'+
+                        '<option value="6">6 (24 pt)</option>'+
+                        '<option value="7">7 (36 pt)</option>'+
+                        '</select>';
 
             case "|":
@@ -459 +465 @@
         var resizing = tinyMCE.getParam("theme_advanced_resizing", false);
         var path = tinyMCE.getParam("theme_advanced_path", true);
-        var statusbarHTML = '<div id="{$editor_id}_path" class="mceStatusbarPathText" style="display: ' + (path ? "block" : "none") + '">&nbsp;</div><div id="{$editor_id}_resize" class="mceStatusbarResize" style="display: ' + (resizing ? "block" : "none") + '" onmousedown="tinyMCE.themes.advanced._setResizing(event,\'{$editor_id}\',true);"></div><br style="clear: both" />';
+        var statusbarHTML = '<div id="{$editor_id}_path" class="mceStatusbarPathText" style="display: ' + (path ? "block" : "none") + '">&#160;</div><div id="{$editor_id}_resize" class="mceStatusbarResize" style="display: ' + (resizing ? "block" : "none") + '" onmousedown="tinyMCE.themes.advanced._setResizing(event,\'{$editor_id}\',true);"></div><br style="clear: both" />';
         var layoutManager = tinyMCE.getParam("theme_advanced_layout_manager", "SimpleLayout");
 
@@ -584 +590 @@
                 {
                     if (containers[i] == "mceEditor") //Exceptions for mceEditor and ...
-                    {
-                        template['html'] += '<tr><td align="center" class="mceEditor_border">\
-                                                    <span id="{$editor_id}"></span>\
-                                                    </td></tr>';
-                    }
+                        template['html'] += '<tr><td align="center" class="mceEditor_border"><span id="{$editor_id}"></span></td></tr>';
                     else if (containers[i] == "mceElementpath" || containers[i] == "mceStatusbar") // ... mceElementpath:
                     {
@@ -815 +817 @@
             }
 
-            pathElm.innerHTML = '<a href="#" accesskey="x"></a>' + tinyMCE.getLang('lang_theme_path') + ": " + html + '&nbsp;';
+            pathElm.innerHTML = '<a href="#" accesskey="x"></a>' + tinyMCE.getLang('lang_theme_path') + ": " + html + '&#160;';
         }
 

trunk/wp-includes/js/tinymce/tiny_mce.js

@@ -4 +4 @@
 function TinyMCE_Engine() {
     this.majorVersion = "2";
-    this.minorVersion = "0.5.1";
-    this.releaseDate = "2006-03-22";
+    this.minorVersion = "0.6.1";
+    this.releaseDate = "2006-05-04";
 
     this.instances = new Array();
@@ -11 +11 @@
     this.windowArgs = new Array();
     this.loadedFiles = new Array();
+    this.pendingFiles = new Array();
+    this.loadingIndex = 0;
     this.configs = new Array();
     this.currentConfig = 0;
@@ -128 +130 @@
         this._def("convert_newlines_to_brs", false);
         this._def("auto_reset_designmode", true);
-        this._def("entities", "160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,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,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,34,quot,38,amp,60,lt,62,gt,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro", true);
+        this._def("entities", "39,#39,160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,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,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,34,quot,38,amp,60,lt,62,gt,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro", true);
         this._def("entity_encoding", "named");
         this._def("cleanup_callback", "");
@@ -160 +162 @@
         this._def("fix_list_elements", false);
         this._def("fix_table_elements", false);
+        this._def("strict_loading_mode", document.contentType == 'application/xhtml+xml');
+        this._def("hidden_tab_class", '');
+        this._def("display_tab_class", '');
+
+        // Force strict loading mode to false on non Gecko browsers
+        if (this.isMSIE && !this.isOpera)
+            this.settings.strict_loading_mode = false;
 
         // Browser check IE
@@ -199 +208 @@
 
         theme = this.settings['theme'];
-        this.blockRegExp = new RegExp("^(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|blockquote|center|dl|dir|fieldset|form|noscript|noframes|menu|isindex)$", "i");
+        this.blockRegExp = new RegExp("^(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|blockquote|center|dl|dt|dd|dir|fieldset|form|noscript|noframes|menu|isindex|samp)$", "i");
         this.posKeyCodes = new Array(13,45,36,35,33,34,37,38,39,40);
-        this.uniqueURL = 'http://tinymce.moxiecode.cp/mce_temp_url'; // Make unique URL non real URL
+        this.uniqueURL = 'javascript:TINYMCE_UNIQUEURL();'; // Make unique URL non real URL
         this.uniqueTag = '<div id="mceTMPElement" style="display: none">TMP</div>';
         this.callbacks = new Array('onInit', 'getInfo', 'getEditorTemplate', 'setupContent', 'onChange', 'onPageLoad', 'handleNodeChange', 'initInstance', 'execCommand', 'getControlHTML', 'handleEvent', 'cleanup');
@@ -288 +297 @@
         settings['index'] = this.configs.length;
         this.configs[this.configs.length] = settings;
+
+        // Start loading first one in chain
+        this.loadNextScript();
     },
 
@@ -320 +332 @@
         p.baseURL = op ? op.baseURL : tinyMCE.baseURL + "/plugins/" + n;
         this.plugins[n] = p;
+
+        this.loadNextScript();
     },
 
@@ -344 +358 @@
     addTheme : function(n, t) {
         this.themes[n] = t;
+
+        this.loadNextScript();
     },
 
@@ -355 +371 @@
 
     loadScript : function(url) {
-        for (var i=0; i<this.loadedFiles.length; i++) {
+        var i;
+
+        for (i=0; i<this.loadedFiles.length; i++) {
             if (this.loadedFiles[i] == url)
                 return;
         }
 
-        document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></script>');
+        if (tinyMCE.settings.strict_loading_mode)
+            this.pendingFiles[this.pendingFiles.length] = url;
+        else
+            document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></script>');
 
         this.loadedFiles[this.loadedFiles.length] = url;
+    },
+
+    loadNextScript : function() {
+        var d = document, se;
+
+        if (!tinyMCE.settings.strict_loading_mode)
+            return;
+
+        if (this.loadingIndex < this.pendingFiles.length) {
+            se = d.createElementNS('http://www.w3.org/1999/xhtml', 'script');
+            se.setAttribute('language', 'javascript');
+            se.setAttribute('type', 'text/javascript');
+            se.setAttribute('src', this.pendingFiles[this.loadingIndex++]);
+
+            d.getElementsByTagName("head")[0].appendChild(se);
+        } else
+            this.loadingIndex = -1; // Done with loading
     },
 
@@ -369 +407 @@
         var lflen = 0, csslen = 0;
         var skip = false;
-        var x = 0, i = 0;
+        var x = 0, i = 0, nl, le;
 
         for (x = 0,csslen = ar.length; x<csslen; x++) {
@@ -384 +422 @@
 
                 if (!skip) {
-                    document.write('<link href="' + ar[x] + '" rel="stylesheet" type="text/css" />');
+                    if (tinyMCE.settings.strict_loading_mode) {
+                        nl = document.getElementsByTagName("head");
+
+                        le = document.createElement('link');
+                        le.setAttribute('href', ar[x]);
+                        le.setAttribute('rel', 'stylesheet');
+                        le.setAttribute('type', 'text/css');
+
+                        nl[0].appendChild(le);          
+                    } else
+                        document.write('<link href="' + ar[x] + '" rel="stylesheet" type="text/css" />');
+
                     this.loadedFiles[this.loadedFiles.length] = ar[x];
                 }
@@ -659 +708 @@
 
         iframe.setAttribute("id", id);
-        iframe.setAttribute("className", "mceEditorIframe");
+        iframe.setAttribute("class", "mceEditorIframe");
         iframe.setAttribute("border", "0");
         iframe.setAttribute("frameBorder", "0");
@@ -669 +718 @@
         iframe.setAttribute("height", ah);
         iframe.setAttribute("allowtransparency", "true");
+        iframe.className = 'mceEditorIframe';
 
         if (tinyMCE.settings["auto_resize"])
@@ -679 +729 @@
         iframe.style.width = aw;
         iframe.style.height = ah;
+
+        // Ugly hack for Gecko problem in strict mode
+        if (tinyMCE.settings.strict_loading_mode)
+            iframe.style.marginBottom = '-5px';
 
         // MSIE 5.0 issue
@@ -697 +751 @@
         var head = doc.getElementsByTagName('head').item(0);
         var content = inst.startContent;
+
+        // HTML values get XML encoded in strict mode
+        if (tinyMCE.settings.strict_loading_mode) {
+            content = content.replace(/&lt;/g, '<');
+            content = content.replace(/&gt;/g, '>');
+            content = content.replace(/&quot;/g, '"');
+            content = content.replace(/&amp;/g, '&');
+        }
 
         inst.switchSettings();
@@ -852 +914 @@
         inst.undoRedo.add({ content : inst.startContent });
 
+        // Cleanup any mess left from storyAwayURLs
+        if (tinyMCE.isGecko) {
+            // Remove mce_src from textnodes and comments
+            tinyMCE.selectNodes(inst.getBody(), function(n) {
+                if (n.nodeType == 3 || n.nodeType == 8) {
+                    n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_src=\"[^\"]*\"', 'gi'), "");
+                    n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_href=\"[^\"]*\"', 'gi'), "");
+                }
+
+                return false;
+            });
+        }
+
+        // Cleanup any mess left from storyAwayURLs
+        tinyMCE._removeInternal(inst.getBody());
+
         tinyMCE.selectedInstance = inst;
         tinyMCE.triggerNodeChange(false, true);
@@ -867 +945 @@
 
         return s;
+    },
+
+    _removeInternal : function(n) {
+        if (tinyMCE.isGecko) {
+            // Remove mce_src from textnodes and comments
+            tinyMCE.selectNodes(n, function(n) {
+                if (n.nodeType == 3 || n.nodeType == 8) {
+                    n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_src=\"[^\"]*\"', 'gi'), "");
+                    n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_href=\"[^\"]*\"', 'gi'), "");
+                }
+
+                return false;
+            });
+        }
     },
 
@@ -923 +1015 @@
                     tinyMCE.selectedInstance.setBaseHREF(null);
 
-                window.setTimeout("tinyMCE.selectedInstance.setBaseHREF(tinyMCE.settings['base_href']);", 1);
+                // Fixes odd MSIE bug where drag/droping elements in a iframe with height 100% breaks
+                // This logic forces the width/height to be in pixels while the user is drag/dropping
+                if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+                    var ife = tinyMCE.selectedInstance.iframeElement;
+
+                    /*if (ife.style.width.indexOf('%') != -1) {
+                        ife._oldWidth = ife.width.height;
+                        ife.style.width = ife.clientWidth;
+                    }*/
+
+                    if (ife.style.height.indexOf('%') != -1) {
+                        ife._oldHeight = ife.style.height;
+                        ife.style.height = ife.clientHeight;
+                    }
+                }
+
+                window.setTimeout("tinyMCE.selectedInstance.setBaseHREF(tinyMCE.settings['base_href']);tinyMCE._resetIframeHeight();", 1);
                 return;
 
@@ -1242 +1350 @@
 
     onLoad : function() {
+        // Wait for everything to be loaded first
+        if (tinyMCE.settings.strict_loading_mode && this.loadingIndex != -1) {
+            window.setTimeout('tinyMCE.onLoad();', 1);
+            return;
+        }
+
         if (tinyMCE.isMSIE && !tinyMCE.isOpera && window.event.type == "readystatechange" && document.readyState != "complete")
             return true;
@@ -1426 +1540 @@
         }
 
+        this.loadNextScript();
+
     //  for (var key in ar)
     //      tinyMCELang[(key.indexOf('lang_') == -1 ? 'lang_' : '') + (prefix != '' ? (prefix + "_") : '') + key] = "|" + ar[key] + "|";
@@ -1672 +1788 @@
     },
 
-    handleVisualAid : function(el, deep, state, inst) {
+    handleVisualAid : function(el, deep, state, inst, skip_dispatch) {
         if (!el)
             return;
+
+        if (!skip_dispatch)
+            tinyMCE.dispatchCallback(inst, 'handle_visual_aid_callback', 'handleVisualAid', el, deep, state, inst);
 
         var tableElement = null;
@@ -1714 +1833 @@
         if (deep && el.hasChildNodes()) {
             for (var i=0; i<el.childNodes.length; i++)
-                tinyMCE.handleVisualAid(el.childNodes[i], deep, state, inst);
+                tinyMCE.handleVisualAid(el.childNodes[i], deep, state, inst, true);
         }
     },
@@ -1752 +1871 @@
 
     fixGeckoBaseHREFBug : function(m, e, h) {
-        var nl, i;
+        var nl, i, a, n, xsrc, xhref, el;
 
         if (tinyMCE.isGecko) {
             if (m == 1) {
-                h = h.replace(/\ssrc=/gi, " xsrc=");
-                h = h.replace(/\shref=/gi, " xhref=");
+                h = h.replace(/\ssrc=/gi, " mce_tsrc=");
+                h = h.replace(/\shref=/gi, " mce_thref=");
 
                 return h;
             } else {
-                var el = new Array('a','img','select','area','iframe','base','input','script','embed','object','link');
-
-                for (var a=0; a<el.length; a++) {
-                    var n = e.getElementsByTagName(el[a]);
+                el = new Array('a','img','select','area','iframe','base','input','script','embed','object','link');
+
+                for (a=0; a<el.length; a++) {
+                    n = e.getElementsByTagName(el[a]);
 
                     for (i=0; i<n.length; i++) {
-                        var xsrc = tinyMCE.getAttrib(n[i], "xsrc");
-                        var xhref = tinyMCE.getAttrib(n[i], "xhref");
+                        xsrc = tinyMCE.getAttrib(n[i], "mce_tsrc");
+                        xhref = tinyMCE.getAttrib(n[i], "mce_thref");
 
                         if (xsrc != "") {
-                            n[i].src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], xsrc);
-                            n[i].removeAttribute("xsrc");
+                            try {
+                                n[i].src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], xsrc);
+                            } catch (e) {
+                                // Ignore, Firefox cast exception if local file wasn't found
+                            }
+
+                            n[i].removeAttribute("mce_tsrc");
                         }
 
                         if (xhref != "") {
-                            n[i].href = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], xhref);
-                            n[i].removeAttribute("xhref");
+                            try {
+                                n[i].href = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], xhref);
+                            } catch (e) {
+                                // Ignore, Firefox cast exception if local file wasn't found
+                            }
+
+                            n[i].removeAttribute("mce_thref");
                         }
                     }
                 }
+
+                el = tinyMCE.selectNodes(e, function(n) {
+                    if (n.nodeType == 3 || n.nodeType == 8) {
+                        n.nodeValue = n.nodeValue.replace(/\smce_tsrc=/gi, " src=");
+                        n.nodeValue = n.nodeValue.replace(/\smce_thref=/gi, " href=");
+                    }
+
+                    return false;
+                });
             }
         }
@@ -1921 +2059 @@
 
         if (doc) {
-            var styles = tinyMCE.isMSIE ? doc.styleSheets : doc.styleSheets;
+            var styles = doc.styleSheets;
 
             if (styles && styles.length > 0) {
@@ -1928 +2066 @@
 
                     // Just ignore any errors
-                    eval("try {var csses = tinyMCE.isMSIE ? doc.styleSheets(" + x + ").rules : doc.styleSheets[" + x + "].cssRules;} catch(e) {}");
+                    eval("try {var csses = tinyMCE.isMSIE ? doc.styleSheets(" + x + ").rules : styles[" + x + "].cssRules;} catch(e) {}");
                     if (!csses)
                         return new Array();
@@ -1939 +2077 @@
                             var rules = selectorText.split(',');
                             for (var c=0; c<rules.length; c++) {
+                                var rule = rules[c];
+
+                                // Strip spaces between selectors
+                                while (rule.indexOf(' ') == 0)
+                                    rule = rule.substring(1);
+
                                 // Invalid rule
-                                if (rules[c].indexOf(' ') != -1 || rules[c].indexOf(':') != -1 || rules[c].indexOf('mceItem') != -1)
+                                if (rule.indexOf(' ') != -1 || rule.indexOf(':') != -1 || rule.indexOf('mceItem') != -1)
                                     continue;
 
-                                if (rules[c] == "." + tinyMCE.settings['visual_table_class'] || rules[c].indexOf('mceEditable') != -1 || rules[c].indexOf('mceNonEditable') != -1)
+                                if (rule.indexOf(tinyMCE.settings['visual_table_class']) != -1 || rule.indexOf('mceEditable') != -1 || rule.indexOf('mceNonEditable') != -1)
                                     continue;
 
                                 // Is class rule
-                                if (rules[c].indexOf('.') != -1) {
-                                    //alert(rules[c].substring(rules[c].indexOf('.')));
-                                    output[output.length] = rules[c].substring(rules[c].indexOf('.')+1);
+                                if (rule.indexOf('.') != -1) {
+                                    var cssClass = rule.substring(rule.indexOf('.') + 1);
+                                    var addClass = true;
+
+                                    for (var p=0; p<output.length && addClass; p++) {
+                                        if (output[p] == cssClass)
+                                            addClass = false;
+                                    }
+
+                                    if (addClass)
+                                        output[output.length] = cssClass;
                                 }
                             }
@@ -2101 +2253 @@
             tinyMCE.lastSelectedMenuBtn = null;
         }
+    },
+
+    explode : function(d, s) {
+        var ar = s.split(d), oar = new Array(), i;
+    
+        for (i = 0; i<ar.length; i++) {
+            if (ar[i] != "")
+                oar[oar.length] = ar[i];
+        }
+    
+        return oar;
     }
 };
@@ -2521 +2684 @@
             case "FormatBlock":
                 if (value == null || value == "") {
-                    var elm = tinyMCE.getParentElement(this.getFocusElement(), "p,div,h1,h2,h3,h4,h5,h6,pre,address");
+                    var elm = tinyMCE.getParentElement(this.getFocusElement(), "p,div,h1,h2,h3,h4,h5,h6,pre,address,blockquote,dt,dl,dd,samp");
 
                     if (elm)
                         this.execCommand("mceRemoveNode", false, elm);
                 } else {
-                    if (value == '<div>' && tinyMCE.isGecko)
-                        value = 'div';
-
-                    this.getDoc().execCommand("FormatBlock", false, value);
+                    if (tinyMCE.isGecko && new RegExp('<(div|blockquote|code|dt|dd|dl|samp)>', 'gi').test(value))
+                        value = value.replace(/[^a-z]/gi, '');
+
+                    if (tinyMCE.isMSIE && new RegExp('blockquote|code|samp', 'gi').test(value)) {
+                        var b = this.selection.getBookmark();
+                        this.getDoc().execCommand("FormatBlock", false, '<p>');
+                        tinyMCE.renameElement(tinyMCE.getParentBlockElement(this.getFocusElement()), value);
+                        this.selection.moveToBookmark(b);
+                    } else
+                        this.getDoc().execCommand("FormatBlock", false, value);
                 }
 
@@ -2829 +2998 @@
                 tinyMCE.setInnerHTML(doc.body, tinyMCE._cleanupHTML(this, doc, tinyMCE.settings, doc.body));
                 tinyMCE.convertAllRelativeURLs(doc.body);
+
+                // Cleanup any mess left from storyAwayURLs
+                tinyMCE._removeInternal(this.getBody());
 
                 // When editing always use fonts internaly
@@ -3274 +3446 @@
                 hc = '<textarea wrap="off" id="' + form_element_name + '" name="' + form_element_name + '" cols="100" rows="15"></textarea>';
             } else {
-                hc = '<input type="hidden" type="text" id="' + form_element_name + '" name="' + form_element_name + '" />';
+                hc = '<input type="hidden" id="' + form_element_name + '" name="' + form_element_name + '" />';
                 this.oldTargetElement.style.display = "none";
             }
@@ -3319 +3491 @@
 
         if (!tinyMCE.isMSIE) {
-            if (tElm && tElm.nodeName == "SPAN") {
+            // Node case is preserved in XML strict mode
+            if (tElm && (tElm.nodeName == "SPAN" || tElm.nodeName == "span")) {
                 tElm = tinyMCE._createIFrame(tElm, targetDoc);
                 dynamicIFrame = true;
@@ -3414 +3587 @@
 
     triggerSave : function(skip_cleanup, skip_callback) {
+        var e, nl = new Array(), i, s;
+
         this.switchSettings();
+        s = tinyMCE.settings;
+
+        // Force hidden tabs visible while serializing
+        if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+            e = this.iframeElement;
+
+            do {
+                if (e.style && e.style.display == 'none') {
+                    e.style.display = 'block';
+                    nl[nl.length] = {elm : e, type : 'style'};
+                }
+
+                if (e.style && s.hidden_tab_class.length > 0 && e.className.indexOf(s.hidden_tab_class) != -1) {
+                    e.className = s.display_tab_class;
+                    nl[nl.length] = {elm : e, type : 'class'};
+                }
+            } while ((e = e.parentNode) != null)
+        }
 
         tinyMCE.settings['preformatted'] = false;
@@ -3457 +3650 @@
         if (tinyMCE.isSafari && this.formElement)
             this.formElement.innerText = htm;
+
+        // Hide them again (tabs in MSIE)
+        for (i=0; i<nl.length; i++) {
+            if (nl[i].type == 'style')
+                nl[i].elm.style.display = 'none';
+            else
+                nl[i].elm.className = s.hidden_tab_class;
+        }
     }
 };
@@ -3463 +3664 @@
 
 TinyMCE_Engine.prototype.cleanupHTMLCode = function(s) {
-    s = s.replace(/<p \/>/gi, '<p>&nbsp;</p>');
-    s = s.replace(/<p>\s*<\/p>/gi, '<p>&nbsp;</p>');
+    s = s.replace(new RegExp('<p \\/>', 'gi'), '<p>&nbsp;</p>');
+    s = s.replace(new RegExp('<p>\\s*<\\/p>', 'gi'), '<p>&nbsp;</p>');
+
+    // Fix close BR elements
+    s = s.replace(new RegExp('<br>\\s*<\\/br>', 'gi'), '<br />');
 
     // Open closed tags like <b/> to <b></b>
-//  tinyMCE.debug("f:" + s);
-    s = s.replace(/<(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|b|font|em|strong|i|strike|u|span|a|ul|ol|li|blockquote)([a-z]*)([^\\|>]*?)\/>/gi, '<$1$2$3></$1$2>');
-//  tinyMCE.debug("e:" + s);
+    s = s.replace(new RegExp('<(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|b|font|em|strong|i|strike|u|span|a|ul|ol|li|blockquote)([a-z]*)([^\\\\|>]*)\\/>', 'gi'), '<$1$2$3></$1$2>');
 
     // Remove trailing space <b > to <b>
@@ -3475 +3677 @@
 
     // Close tags <img></img> to <img/>
-    s = s.replace(/<(img|br|hr)(.*?)><\/(img|br|hr)>/gi, '<$1$2 />');
+    s = s.replace(new RegExp('<(img|br|hr)([^>]*)><\\/(img|br|hr)>', 'gi'), '<$1$2 />');
 
     // Weird MSIE bug, <p><hr /></p> breaks runtime?
     if (tinyMCE.isMSIE)
-        s = s.replace(/<p><hr \/><\/p>/gi, "<hr>");
+        s = s.replace(new RegExp('<p><hr \\/><\\/p>', 'gi'), "<hr>");
 
     // Convert relative anchors to absolute URLs ex: #something to file.htm#something
     if (tinyMCE.getParam('convert_urls'))
-        s = s.replace(new RegExp('(href=\"?)(\\s*?#)', 'gi'), '$1' + tinyMCE.settings['document_base_url'] + "#");
+        s = s.replace(new RegExp('(href=\"{0,1})(\\s*#)', 'gi'), '$1' + tinyMCE.settings['document_base_url'] + "#");
 
     return s;
@@ -3545 +3747 @@
     tinyMCE.compressStyle(ar, "border", "-width", "border-width");
     tinyMCE.compressStyle(ar, "border", "-color", "border-color");
+    tinyMCE.compressStyle(ar, "border", "-style", "border-style");
+    tinyMCE.compressStyle(ar, "padding", "", "padding");
+    tinyMCE.compressStyle(ar, "margin", "", "margin");
 
     for (var key in ar) {
@@ -3705 +3910 @@
     var i, cn, x, an = doc.getElementsByTagName("a");
 
-    for (i=0; i<an.length; i++) {
+    // Loops backwards due to bug #1467987
+    for (i=an.length-1; i>=0; i--) {
         if (tinyMCE.getAttrib(an[i], "name") != "" && tinyMCE.getAttrib(an[i], "href") == "") {
             cn = an[i].childNodes;
@@ -3837 +4043 @@
     h = h.replace(/<p>\s*(&nbsp;|&#160;)\s*<br \/>\s*<\/p>/g, '<p>&nbsp;</p>');
     h = h.replace(/<p>\s*<br \/>\s*&nbsp;\s*<\/p>/g, '<p>&nbsp;</p>');
-    h = h.replace(/<a>(.*?)<\/a>/g, '$1');
+    h = h.replace(new RegExp('<a>(.*?)<\\/a>', 'g'), '$1');
     h = h.replace(/<p([^>]*)>\s*<\/p>/g, '<p$1>&nbsp;</p>');
 
@@ -3913 +4119 @@
     this.vElements = tinyMCE.clearArray(new Array());
     this.vElementsRe = '';
-    this.closeElementsRe = /^(IMG|BR|HR|LINK|META|BASE|INPUT|BUTTON)$/;
+    this.closeElementsRe = /^(IMG|BR|HR|LINK|META|BASE|INPUT|BUTTON|AREA)$/;
     this.codeElementsRe = /^(SCRIPT|STYLE)$/;
     this.serializationId = 0;
@@ -4028 +4234 @@
                         t = a[i];
 
-                        av = /(=|:|<)(.*?)$/.exec(t);
-                        t = t.replace(/(=|:|<).*?$/, '');
+                        av = new RegExp('(=|:|<)(.*?)$').exec(t);
+                        t = t.replace(new RegExp('(=|:|<).*?$'), '');
                         if (av && av.length > 0) {
                             if (av[0].charAt(0) == ':') {
@@ -4335 +4541 @@
                     e = this.entities[c];
 
-                    // &apos; is not working in MSIE
-                    // More info: http://www.w3.org/TR/xhtml1/#C_16
-                    if (c == 39) {
-                        o += "&#39;";
-                        continue;
-                    }
-
                     if (e && e != '')
                         o += '&' + e + ';';
@@ -4379 +4578 @@
 
     _trimComment : function(s) {
-        // Make xsrc, xhref as src and href again
-        if (tinyMCE.isGecko) {
-            s = s.replace(/\sxsrc=/gi, " src=");
-            s = s.replace(/\sxhref=/gi, " href=");
-        }
-
         // Remove mce_src, mce_href
         s = s.replace(new RegExp('\\smce_src=\"[^\"]*\"', 'gi'), "");
@@ -4406 +4599 @@
         if (this.isMSIE && n == "http-equiv")
             v = e.httpEquiv;
+
+        if (this.isMSIE && e.nodeName == "FORM" && n == "enctype" && v == "application/x-www-form-urlencoded")
+            v = "";
+
+        if (this.isMSIE && e.nodeName == "INPUT" && n == "size" && v == "20")
+            v = "";
+
+        if (this.isMSIE && e.nodeName == "INPUT" && n == "maxlength" && v == "2147483647")
+            v = "";
 
         if (n == "style" && !tinyMCE.isOpera)
@@ -4558 +4760 @@
         // Since MSIE auto generated emtpy P tags some times we must tell it to keep the real ones
         h = h.replace(/<p([^>]*)>\u00A0?<\/p>/gi, '<p$1 mce_keep="true">&nbsp;</p>'); // Keep empty paragraphs
-        h = h.replace(/<p([^>]*)>&nbsp;<\/p>/gi, '<p$1 mce_keep="true">&nbsp;</p>'); // Keep empty paragraphs
+        h = h.replace(/<p([^>]*)>\s*&nbsp;\s*<\/p>/gi, '<p$1 mce_keep="true">&nbsp;</p>'); // Keep empty paragraphs
+        h = h.replace(/<p([^>]*)>\s+<\/p>/gi, '<p$1 mce_keep="true">&nbsp;</p>'); // Keep empty paragraphs
 
         // Remove first comment
@@ -4671 +4874 @@
 };
 
+TinyMCE_Engine.prototype.getParentNode = function(n, f) {
+    while (n) {
+        if (f(n))
+            return n;
+
+        n = n.parentNode;
+    }
+
+    return null;
+};
+
 TinyMCE_Engine.prototype.getAttrib = function(elm, name, default_value) {
     if (typeof(default_value) == "undefined")
@@ -4790 +5004 @@
 
     return null;
+};
+
+TinyMCE_Engine.prototype.selectNodes = function(n, f, a) {
+    var i;
+
+    if (!a)
+        a = new Array();
+
+    if (f(n))
+        a[a.length] = n;
+
+    if (n.hasChildNodes()) {
+        for (i=0; i<n.childNodes.length; i++)
+            tinyMCE.selectNodes(n.childNodes[i], f, a);
+    }
+
+    return a;
+};
+
+TinyMCE_Engine.prototype.addCSSClass = function(e, c, b) {
+    var o = this.removeCSSClass(e, c);
+
+    return e.className = b ? c + (o != '' ? (' ' + o) : '') : (o != '' ? (o + ' ') : '') + c;
+};
+
+TinyMCE_Engine.prototype.removeCSSClass = function(e, c) {
+    var a = this.explode(' ', e.className), i;
+
+    for (i=0; i<a.length; i++) {
+        if (a[i] == c)
+            a[i] = '';
+    }
+
+    return e.className = a.join(' ');
+};
+
+TinyMCE_Engine.prototype.renameElement = function(e, n, d) {
+    var ne, i, ar;
+
+    d = typeof(d) == "undefined" ? tinyMCE.selectedInstance.getDoc() : d;
+
+    if (e) {
+        ne = d.createElement(n);
+
+        ar = e.attributes;
+        for (i=ar.length-1; i>-1; i--) {
+            if (ar[i].specified && ar[i].nodeValue)
+                ne.setAttribute(ar[i].nodeName.toLowerCase(), ar[i].nodeValue);
+        }
+
+        ar = e.childNodes;
+        for (i=0; i<ar.length; i++)
+            ne.appendChild(ar[i].cloneNode(true));
+
+        e.parentNode.replaceChild(ne, e);
+    }
 };
 
@@ -4951 +5221 @@
         targetURL.path = "";
 
-    // If empty and not local anchor force slash
+    // If empty and not local anchor force filename or slash
     if (targetURL.path == "" && !targetURL.anchor)
-        targetURL.path = "/";
+        targetURL.path = fileName != "" ? fileName : "/";
 
     return this.serializeURL(targetURL);
@@ -5216 +5486 @@
         tinyMCE.addEvent(doc, "keydown", TinyMCE_Engine.prototype._eventPatch);
         tinyMCE.addEvent(doc, "mouseup", TinyMCE_Engine.prototype._eventPatch);
+        tinyMCE.addEvent(doc, "mousedown", TinyMCE_Engine.prototype._eventPatch);
         tinyMCE.addEvent(doc, "click", TinyMCE_Engine.prototype._eventPatch);
     } else {
@@ -5309 +5580 @@
 };
 
+TinyMCE_Engine.prototype._resetIframeHeight = function() {
+    var ife;
+
+    if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+        ife = tinyMCE.selectedInstance.iframeElement;
+
+/*      if (ife._oldWidth) {
+            ife.style.width = ife._oldWidth;
+            ife.width = ife._oldWidth;
+        }*/
+
+        if (ife._oldHeight) {
+            ife.style.height = ife._oldHeight;
+            ife.height = ife._oldHeight;
+        }
+    }
+};
+
 /* file:jscripts/tiny_mce/classes/TinyMCE_Selection.class.js */
 
@@ -5329 +5618 @@
         if (tinyMCE.isGecko)
             e.appendChild(r.cloneContents());
-        else
-            e.innerHTML = r.htmlText;
+        else 
+            e.innerHTML = r.item ? r.item(0).outerHTML : r.htmlText;
 
         h = tinyMCE._cleanupHTML(inst, inst.contentDocument, inst.settings, e, e, false, true, false);
@@ -5491 +5780 @@
                 nl = doc.getElementsByTagName(bookmark.tag);
 
-                if (nl.length > bookmark.index)
-                    rng.addElement(nl[bookmark.index]);
+                if (nl.length > bookmark.index) {
+                    try {
+                        rng.addElement(nl[bookmark.index]);
+                    } catch (ex) {
+                        // Might be thrown if the node no longer exists
+                    }
+                }
             } else {
                 rng = inst.getSel().createRange();
@@ -5878 +6172 @@
         var endBlock = tinyMCE.getParentBlockElement(endNode);
 
+        // If absolute force paragraph generation within
+        if (startBlock && new RegExp('absolute|relative|static', 'gi').test(startBlock.style.position))
+            startBlock = null;
+
+        if (endBlock && new RegExp('absolute|relative|static', 'gi').test(endBlock.style.position))
+            endBlock = null;
+
         // Use current block name
         if (startBlock != null) {
@@ -6063 +6364 @@
 
     _handleBackSpace : function(inst) {
-        var r = inst.getRng();
-        var sn = r.startContainer;
-
-        if (sn && sn.nextSibling && sn.nextSibling.nodeName == "BR")
-            sn.nextSibling.parentNode.removeChild(sn.nextSibling);
-
-        return false;
+        var r = inst.getRng(), sn = r.startContainer, nv, s = false;
+
+        if (sn && sn.nextSibling && sn.nextSibling.nodeName == "BR") {
+            nv = sn.nodeValue;
+
+            // Handle if a backspace is pressed after a space character #bug 1466054
+            if (nv != null && nv.length >= r.startOffset && nv.charAt(r.startOffset - 1) == ' ')
+                s = true;
+
+            // Only remove BRs if we are at the end of line #bug 1464152
+            if (nv != null && r.startOffset == nv.length)
+                sn.nextSibling.parentNode.removeChild(sn.nextSibling);
+        }
+
+        return s;
     }
 };
@@ -6081 +6390 @@
     this.element = null;
     this.blockMode = typeof(bm) != 'undefined' ? bm : true;
+    this.doc = document;
 };
 
@@ -6145 +6455 @@
         var e = this.getElement();
 
-        e.style.width = w + "px";
-        e.style.height = h + "px";
+        if (w != null)
+            e.style.width = w + "px";
+
+        if (h != null)
+            e.style.height = h + "px";
 
         this.updateBlocker();
@@ -6167 +6480 @@
     getElement : function() {
         if (!this.element)
-            this.element = document.getElementById(this.id);
+            this.element = this.doc.getElementById(this.id);
 
         return this.element;
@@ -6202 +6515 @@
 
         if (!this.blockerElement && this.blockMode) {
-            d = document;
+            d = this.doc;
             b = d.createElement("iframe");
 
@@ -6230 +6543 @@
 
     create : function(n, c, p) {
-        var d = document, e = d.createElement(n);
+        var d = this.doc, e = d.createElement(n);
 
         e.setAttribute('id', this.id);
@@ -6244 +6557 @@
         return this.element = e;
     },
-/*
-    addCSSClass : function(e, c) {
-        this.removeCSSClass(e, c);
-        var a = this.explode(' ', e.className);
-        a[a.length] = c;
-        e.className = a.join(' ');
-    },
-
-    removeCSSClass : function(e, c) {
-        var a = this.explode(' ', e.className), i;
-
-        for (i=0; i<a.length; i++) {
-            if (a[i] == c)
-                a[i] = '';
-        }
-
-        e.className = a.join(' ');
-    },
-
-    explode : function(d, s) {
-        var ar = s.split(d);
-        var oar = new Array();
-
-        for (var i = 0; i<ar.length; i++) {
-            if (ar[i] != "")
-                oar[oar.length] = ar[i];
-        }
-
-        return oar;
-    },
-*/
 
     parseInt : function(s) {
@@ -6398 +6680 @@
             tinyMCE.lastMenu.hide();
 
-        this.parent.show.call(this);
+        TinyMCE_Layer.prototype.show.call(this);
 
         if (!tinyMCE.isOpera) {

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -44 +44 @@
     $mce_css = get_option('siteurl') . '/wp-includes/js/tinymce/plugins/wordpress/wordpress.css';
     $mce_css = apply_filters('mce_css', $mce_css);
+    if ( $_SERVER['HTTPS'] ) {
+        $mce_css = str_replace('http://', 'https://', $mce_css);
+        $mce_popups_css = str_replace('http://', 'https://', $mce_popups_css);
+    }
 ?>
 
@@ -70 +74 @@
     remove_linebreaks : false,
     fix_list_elements : true,
+    entities : "38,amp,60,lt,62,gt",
     content_css : "<?php echo $mce_css; ?>",
     valid_elements : "<?php echo $valid_elements; ?>",

trunk/wp-includes/js/tinymce/tiny_mce_popup.js

@@ -264 +264 @@
 };
 
+TinyMCE_Popup.prototype.importClass = function(c) {
+    window[c] = function() {};
+
+    for (var n in window.opener[c].prototype)
+        window[c].prototype[n] = window.opener[c].prototype[n];
+
+    window[c].constructor = window.opener[c].constructor;
+};
+
 // Setup global instance
 var tinyMCEPopup = new TinyMCE_Popup();