Upgrade TinyMCE to v3.4.5
[citadel.git] / webcit / tiny_mce / tiny_mce_src.js
index 2b3453ba9b4b9f68a3bdd71bc9713030e072b14d..8c665b09535c46d2bdac3012c7b881f0948b6e2c 100644 (file)
@@ -5,9 +5,9 @@
        var tinymce = {\r
                majorVersion : '3',\r
 \r
-               minorVersion : '3.9.2',\r
+               minorVersion : '4.5',\r
 \r
-               releaseDate : '2010-09-29',\r
+               releaseDate : '2011-09-06',\r
 \r
                _init : function() {\r
                        var t = this, d = document, na = navigator, ua = na.userAgent, i, nl, n, base, p, v;\r
 \r
                        t.isIE6 = t.isIE && /MSIE [56]/.test(ua);\r
 \r
+                       t.isIE7 = t.isIE && /MSIE [7]/.test(ua);\r
+\r
+                       t.isIE8 = t.isIE && /MSIE [8]/.test(ua);\r
+\r
+                       t.isIE9 = t.isIE && /MSIE [9]/.test(ua);\r
+\r
                        t.isGecko = !t.isWebKit && /Gecko/.test(ua);\r
 \r
                        t.isMac = ua.indexOf('Mac') != -1;\r
@@ -27,6 +33,8 @@
                        t.isAir = /adobeair/i.test(ua);\r
 \r
                        t.isIDevice = /(iPad|iPhone)/.test(ua);\r
+                       \r
+                       t.isIOS5 = t.isIDevice && ua.match(/AppleWebKit\/(\d*)/)[1]>=534;\r
 \r
                        // TinyMCE .NET webcontrol might be setting the values for TinyMCE\r
                        if (win.tinyMCEPreInit) {\r
                        return typeof(o) == t;\r
                },\r
 \r
+               makeMap : function(items, delim, map) {\r
+                       var i;\r
+\r
+                       items = items || [];\r
+                       delim = delim || ',';\r
+\r
+                       if (typeof(items) == "string")\r
+                               items = items.split(delim);\r
+\r
+                       map = map || {};\r
+\r
+                       i = items.length;\r
+                       while (i--)\r
+                               map[items[i]] = {};\r
+\r
+                       return map;\r
+               },\r
+\r
                each : function(o, cb, s) {\r
                        var n, l;\r
 \r
                        return (s ? '' + s : '').replace(whiteSpaceRe, '');\r
                },\r
 \r
-               create : function(s, p) {\r
+               create : function(s, p, root) {\r
                        var t = this, sp, ns, cn, scn, c, de = 0;\r
 \r
                        // Parse : <prefix> <class>:<super class>\r
                        cn = s[3].match(/(^|\.)(\w+)$/i)[2]; // Class name\r
 \r
                        // Create namespace for new class\r
-                       ns = t.createNS(s[3].replace(/\.\w+$/, ''));\r
+                       ns = t.createNS(s[3].replace(/\.\w+$/, ''), root);\r
 \r
                        // Class already exists\r
                        if (ns[cn])\r
 \r
        // Expose tinymce namespace to the global namespace (window)\r
        win.tinymce = win.tinyMCE = tinymce;\r
-})(window);\r
+\r
+       // Describe the different namespaces\r
+\r
+       })(window);\r
+\r
 \r
 \r
 tinymce.create('tinymce.util.Dispatcher', {\r
@@ -521,7 +551,7 @@ tinymce.create('tinymce.util.Dispatcher', {
 \r
        tinymce.create('tinymce.util.URI', {\r
                URI : function(u, s) {\r
-                       var t = this, o, a, b;\r
+                       var t = this, o, a, b, base_url;\r
 \r
                        // Trim whitespace\r
                        u = tinymce.trim(u);\r
@@ -529,8 +559,9 @@ tinymce.create('tinymce.util.Dispatcher', {
                        // Default settings\r
                        s = t.settings = s || {};\r
 \r
-                       // Strange app protocol or local anchor\r
-                       if (/^(mailto|tel|news|javascript|about|data):/i.test(u) || /^\s*#/.test(u)) {\r
+                       // Strange app protocol that isn't http/https or local anchor\r
+                       // For example: mailto,skype,tel etc.\r
+                       if (/^([\w\-]+):([^\/]{2})/i.test(u) || /^\s*#/.test(u)) {\r
                                t.source = u;\r
                                return;\r
                        }\r
@@ -540,8 +571,10 @@ tinymce.create('tinymce.util.Dispatcher', {
                                u = (s.base_uri ? s.base_uri.protocol || 'http' : 'http') + '://mce_host' + u;\r
 \r
                        // Relative path http:// or protocol relative //path\r
-                       if (!/^\w*:?\/\//.test(u))\r
-                               u = (s.base_uri.protocol || 'http') + '://mce_host' + t.toAbsPath(s.base_uri.path, u);\r
+                       if (!/^[\w-]*:?\/\//.test(u)) {\r
+                               base_url = s.base_uri ? s.base_uri.path : new tinymce.util.URI(location.href).directory;\r
+                               u = ((s.base_uri && s.base_uri.protocol) || 'http') + '://mce_host' + t.toAbsPath(base_url, u);\r
+                       }\r
 \r
                        // Parse URL (Credits goes to Steave, http://blog.stevenlevithan.com/archives/parseuri)\r
                        u = u.replace(/@@/g, '(mce_at)'); // Zope 3 workaround, they use @@something\r
@@ -828,9 +861,11 @@ tinymce.create('tinymce.util.Dispatcher', {
        });\r
 })();\r
 \r
-tinymce.create('static tinymce.util.JSON', {\r
-       serialize : function(o) {\r
-               var i, v, s = tinymce.util.JSON.serialize, t;\r
+(function() {\r
+       function serialize(o, quote) {\r
+               var i, v, t;\r
+\r
+               quote = quote || '"';\r
 \r
                if (o == null)\r
                        return 'null';\r
@@ -840,7 +875,11 @@ tinymce.create('static tinymce.util.JSON', {
                if (t == 'string') {\r
                        v = '\bb\tt\nn\ff\rr\""\'\'\\\\';\r
 \r
-                       return '"' + o.replace(/([\u0080-\uFFFF\x00-\x1f\"])/g, function(a, b) {\r
+                       return quote + o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g, function(a, b) {\r
+                               // Make sure single quotes never get encoded inside double quotes for JSON compatibility\r
+                               if (quote === '"' && a === "'")\r
+                                       return a;\r
+\r
                                i = v.indexOf(b);\r
 \r
                                if (i + 1)\r
@@ -849,13 +888,13 @@ tinymce.create('static tinymce.util.JSON', {
                                a = b.charCodeAt().toString(16);\r
 \r
                                return '\\u' + '0000'.substring(a.length) + a;\r
-                       }) + '"';\r
+                       }) + quote;\r
                }\r
 \r
                if (t == 'object') {\r
                        if (o.hasOwnProperty && o instanceof Array) {\r
                                        for (i=0, v = '['; i<o.length; i++)\r
-                                               v += (i > 0 ? ',' : '') + s(o[i]);\r
+                                               v += (i > 0 ? ',' : '') + serialize(o[i], quote);\r
 \r
                                        return v + ']';\r
                                }\r
@@ -863,24 +902,27 @@ tinymce.create('static tinymce.util.JSON', {
                                v = '{';\r
 \r
                                for (i in o)\r
-                                       v += typeof o[i] != 'function' ? (v.length > 1 ? ',"' : '"') + i + '":' + s(o[i]) : '';\r
+                                       v += typeof o[i] != 'function' ? (v.length > 1 ? ',' + quote : quote) + i + quote +':' + serialize(o[i], quote) : '';\r
 \r
                                return v + '}';\r
                }\r
 \r
                return '' + o;\r
-       },\r
+       };\r
 \r
-       parse : function(s) {\r
-               try {\r
-                       return eval('(' + s + ')');\r
-               } catch (ex) {\r
-                       // Ignore\r
-               }\r
-       }\r
+       tinymce.util.JSON = {\r
+               serialize: serialize,\r
 \r
-       });\r
+               parse: function(s) {\r
+                       try {\r
+                               return eval('(' + s + ')');\r
+                       } catch (ex) {\r
+                               // Ignore\r
+                       }\r
+               }\r
 \r
+               };\r
+})();\r
 tinymce.create('static tinymce.util.XHR', {\r
        send : function(o) {\r
                var x, t, w = window, c = 0;\r
@@ -971,7 +1013,8 @@ tinymce.create('static tinymce.util.XHR', {
                        };\r
 \r
                        o.error = function(ty, x) {\r
-                               ecb.call(o.error_scope || o.scope, ty, x);\r
+                               if (ecb)\r
+                                       ecb.call(o.error_scope || o.scope, ty, x);\r
                        };\r
 \r
                        o.data = JSON.serialize({\r
@@ -993,5820 +1036,7420 @@ tinymce.create('static tinymce.util.XHR', {
                }\r
        });\r
 }());\r
-(function(tinymce) {\r
-       // Shorten names\r
-       var each = tinymce.each,\r
-               is = tinymce.is,\r
-               isWebKit = tinymce.isWebKit,\r
-               isIE = tinymce.isIE,\r
-               blockRe = /^(H[1-6R]|P|DIV|ADDRESS|PRE|FORM|T(ABLE|BODY|HEAD|FOOT|H|R|D)|LI|OL|UL|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|MENU|ISINDEX|SAMP)$/,\r
-               boolAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'),\r
-               mceAttribs = makeMap('src,href,style,coords,shape'),\r
-               encodedChars = {'&' : '&amp;', '"' : '&quot;', '<' : '&lt;', '>' : '&gt;'},\r
-               encodeCharsRe = /[<>&\"]/g,\r
-               simpleSelectorRe = /^([a-z0-9],?)+$/i,\r
-               tagRegExp = /<(\w+)((?:\s+\w+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)(\s*\/?)>/g,\r
-               attrRegExp = /(\w+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;\r
+(function(tinymce){\r
+       tinymce.VK = {\r
+               DELETE:46,\r
+               BACKSPACE:8\r
+               \r
+       }\r
 \r
-       function makeMap(str) {\r
-               var map = {}, i;\r
+})(tinymce);\r
 \r
-               str = str.split(',');\r
-               for (i = str.length; i >= 0; i--)\r
-                       map[str[i]] = 1;\r
+(function(tinymce) {\r
+       var VK = tinymce.VK, BACKSPACE = VK.BACKSPACE, DELETE = VK.DELETE;\r
 \r
-               return map;\r
-       };\r
+       function cleanupStylesWhenDeleting(ed) {\r
+               var dom = ed.dom, selection = ed.selection;\r
 \r
-       tinymce.create('tinymce.dom.DOMUtils', {\r
-               doc : null,\r
-               root : null,\r
-               files : null,\r
-               pixelStyles : /^(top|left|bottom|right|width|height|borderWidth)$/,\r
-               props : {\r
-                       "for" : "htmlFor",\r
-                       "class" : "className",\r
-                       className : "className",\r
-                       checked : "checked",\r
-                       disabled : "disabled",\r
-                       maxlength : "maxLength",\r
-                       readonly : "readOnly",\r
-                       selected : "selected",\r
-                       value : "value",\r
-                       id : "id",\r
-                       name : "name",\r
-                       type : "type"\r
-               },\r
+               ed.onKeyDown.add(function(ed, e) {\r
+                       var rng, blockElm, node, clonedSpan, isDelete;\r
 \r
-               DOMUtils : function(d, s) {\r
-                       var t = this, globalStyle;\r
+                       isDelete = e.keyCode == DELETE;\r
+                       if (isDelete || e.keyCode == BACKSPACE) {\r
+                               e.preventDefault();\r
+                               rng = selection.getRng();\r
 \r
-                       t.doc = d;\r
-                       t.win = window;\r
-                       t.files = {};\r
-                       t.cssFlicker = false;\r
-                       t.counter = 0;\r
-                       t.stdMode = d.documentMode >= 8;\r
-                       t.boxModel = !tinymce.isIE || d.compatMode == "CSS1Compat" || t.stdMode;\r
+                               // Find root block\r
+                               blockElm = dom.getParent(rng.startContainer, dom.isBlock);\r
 \r
-                       t.settings = s = tinymce.extend({\r
-                               keep_values : false,\r
-                               hex_colors : 1,\r
-                               process_html : 1\r
-                       }, s);\r
+                               // On delete clone the root span of the next block element\r
+                               if (isDelete)\r
+                                       blockElm = dom.getNext(blockElm, dom.isBlock);\r
 \r
-                       // Fix IE6SP2 flicker and check it failed for pre SP2\r
-                       if (tinymce.isIE6) {\r
-                               try {\r
-                                       d.execCommand('BackgroundImageCache', false, true);\r
-                               } catch (e) {\r
-                                       t.cssFlicker = true;\r
+                               // Locate root span element and clone it since it would otherwise get merged by the "apple-style-span" on delete/backspace\r
+                               if (blockElm) {\r
+                                       node = blockElm.firstChild;\r
+\r
+                                       if (node && node.nodeName === 'SPAN') {\r
+                                               clonedSpan = node.cloneNode(false);\r
+                                       }\r
                                }\r
-                       }\r
 \r
-                       // Build styles list\r
-                       if (s.valid_styles) {\r
-                               t._styles = {};\r
+                               // Do the backspace/delete actiopn\r
+                               ed.getDoc().execCommand(isDelete ? 'ForwardDelete' : 'Delete', false, null);\r
+\r
+                               // Find all odd apple-style-spans\r
+                               blockElm = dom.getParent(rng.startContainer, dom.isBlock);\r
+                               tinymce.each(dom.select('span.Apple-style-span,font.Apple-style-span', blockElm), function(span) {\r
+                                       var rng = dom.createRng();\r
+\r
+                                       // Set range selection before the span we are about to remove\r
+                                       rng.setStartBefore(span);\r
+                                       rng.setEndBefore(span);\r
+\r
+                                       if (clonedSpan) {\r
+                                               dom.replace(clonedSpan.cloneNode(false), span, true);\r
+                                       } else {\r
+                                               dom.remove(span, true);\r
+                                       }\r
 \r
-                               // Convert styles into a rule list\r
-                               each(s.valid_styles, function(value, key) {\r
-                                       t._styles[key] = tinymce.explode(value);\r
+                                       // Restore the selection\r
+                                       selection.setRng(rng);\r
                                });\r
                        }\r
+               });\r
+       };\r
 \r
-                       tinymce.addUnload(t.destroy, t);\r
-               },\r
+       function emptyEditorWhenDeleting(ed) {\r
+               ed.onKeyUp.add(function(ed, e) {\r
+                       var keyCode = e.keyCode;\r
 \r
-               getRoot : function() {\r
-                       var t = this, s = t.settings;\r
+                       if (keyCode == DELETE || keyCode == BACKSPACE) {\r
+                               if (ed.dom.isEmpty(ed.getBody())) {\r
+                                       ed.setContent('', {format : 'raw'});\r
+                                       ed.nodeChanged();\r
+                                       return;\r
+                               }\r
+                       }\r
+               });\r
+       };\r
+       \r
+       tinymce.create('tinymce.util.Quirks', {\r
+               Quirks: function(ed) {\r
+                       // Load WebKit specific fixed\r
+                       if (tinymce.isWebKit) {\r
+                               cleanupStylesWhenDeleting(ed);\r
+                               emptyEditorWhenDeleting(ed);\r
+                       }\r
 \r
-                       return (s && t.get(s.root_element)) || t.doc.body;\r
-               },\r
+                       // Load IE specific fixes\r
+                       if (tinymce.isIE) {\r
+                               emptyEditorWhenDeleting(ed);\r
+                       }\r
+               }\r
+       });\r
+})(tinymce);\r
+(function(tinymce) {\r
+       var namedEntities, baseEntities, reverseEntities,\r
+               attrsCharsRegExp = /[&<>\"\u007E-\uD7FF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,\r
+               textCharsRegExp = /[<>&\u007E-\uD7FF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,\r
+               rawCharsRegExp = /[<>&\"\']/g,\r
+               entityRegExp = /&(#x|#)?([\w]+);/g,\r
+               asciiMap = {\r
+                               128 : "\u20AC", 130 : "\u201A", 131 : "\u0192", 132 : "\u201E", 133 : "\u2026", 134 : "\u2020",\r
+                               135 : "\u2021", 136 : "\u02C6", 137 : "\u2030", 138 : "\u0160", 139 : "\u2039", 140 : "\u0152",\r
+                               142 : "\u017D", 145 : "\u2018", 146 : "\u2019", 147 : "\u201C", 148 : "\u201D", 149 : "\u2022",\r
+                               150 : "\u2013", 151 : "\u2014", 152 : "\u02DC", 153 : "\u2122", 154 : "\u0161", 155 : "\u203A",\r
+                               156 : "\u0153", 158 : "\u017E", 159 : "\u0178"\r
+               };\r
 \r
-               getViewPort : function(w) {\r
-                       var d, b;\r
+       // Raw entities\r
+       baseEntities = {\r
+               '\"' : '&quot;', // Needs to be escaped since the YUI compressor would otherwise break the code\r
+               "'" : '&#39;',\r
+               '<' : '&lt;',\r
+               '>' : '&gt;',\r
+               '&' : '&amp;'\r
+       };\r
 \r
-                       w = !w ? this.win : w;\r
-                       d = w.document;\r
-                       b = this.boxModel ? d.documentElement : d.body;\r
+       // Reverse lookup table for raw entities\r
+       reverseEntities = {\r
+               '&lt;' : '<',\r
+               '&gt;' : '>',\r
+               '&amp;' : '&',\r
+               '&quot;' : '"',\r
+               '&apos;' : "'"\r
+       };\r
 \r
-                       // Returns viewport size excluding scrollbars\r
-                       return {\r
-                               x : w.pageXOffset || b.scrollLeft,\r
-                               y : w.pageYOffset || b.scrollTop,\r
-                               w : w.innerWidth || b.clientWidth,\r
-                               h : w.innerHeight || b.clientHeight\r
-                       };\r
-               },\r
+       // Decodes text by using the browser\r
+       function nativeDecode(text) {\r
+               var elm;\r
 \r
-               getRect : function(e) {\r
-                       var p, t = this, sr;\r
+               elm = document.createElement("div");\r
+               elm.innerHTML = text;\r
 \r
-                       e = t.get(e);\r
-                       p = t.getPos(e);\r
-                       sr = t.getSize(e);\r
+               return elm.textContent || elm.innerText || text;\r
+       };\r
 \r
-                       return {\r
-                               x : p.x,\r
-                               y : p.y,\r
-                               w : sr.w,\r
-                               h : sr.h\r
-                       };\r
-               },\r
+       // Build a two way lookup table for the entities\r
+       function buildEntitiesLookup(items, radix) {\r
+               var i, chr, entity, lookup = {};\r
 \r
-               getSize : function(e) {\r
-                       var t = this, w, h;\r
+               if (items) {\r
+                       items = items.split(',');\r
+                       radix = radix || 10;\r
 \r
-                       e = t.get(e);\r
-                       w = t.getStyle(e, 'width');\r
-                       h = t.getStyle(e, 'height');\r
+                       // Build entities lookup table\r
+                       for (i = 0; i < items.length; i += 2) {\r
+                               chr = String.fromCharCode(parseInt(items[i], radix));\r
 \r
-                       // Non pixel value, then force offset/clientWidth\r
-                       if (w.indexOf('px') === -1)\r
-                               w = 0;\r
+                               // Only add non base entities\r
+                               if (!baseEntities[chr]) {\r
+                                       entity = '&' + items[i + 1] + ';';\r
+                                       lookup[chr] = entity;\r
+                                       lookup[entity] = chr;\r
+                               }\r
+                       }\r
 \r
-                       // Non pixel value, then force offset/clientWidth\r
-                       if (h.indexOf('px') === -1)\r
-                               h = 0;\r
+                       return lookup;\r
+               }\r
+       };\r
 \r
-                       return {\r
-                               w : parseInt(w) || e.offsetWidth || e.clientWidth,\r
-                               h : parseInt(h) || e.offsetHeight || e.clientHeight\r
-                       };\r
+       // Unpack entities lookup where the numbers are in radix 32 to reduce the size\r
+       namedEntities = buildEntitiesLookup(\r
+               '50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,' +\r
+               '5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,' +\r
+               '5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,' +\r
+               '5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,' +\r
+               '68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,' +\r
+               '6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,' +\r
+               '6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,' +\r
+               '75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,' +\r
+               '7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,' +\r
+               '7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,' +\r
+               'sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,' +\r
+               'st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,' +\r
+               't9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,' +\r
+               'tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,' +\r
+               'u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,' +\r
+               '81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,' +\r
+               '8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,' +\r
+               '8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,' +\r
+               '8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,' +\r
+               '8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,' +\r
+               'nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,' +\r
+               'rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,' +\r
+               'Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,' +\r
+               '80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,' +\r
+               '811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro'\r
+       , 32);\r
+\r
+       tinymce.html = tinymce.html || {};\r
+\r
+       tinymce.html.Entities = {\r
+               encodeRaw : function(text, attr) {\r
+                       return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {\r
+                               return baseEntities[chr] || chr;\r
+                       });\r
                },\r
 \r
-               getParent : function(n, f, r) {\r
-                       return this.getParents(n, f, r, false);\r
+               encodeAllRaw : function(text) {\r
+                       return ('' + text).replace(rawCharsRegExp, function(chr) {\r
+                               return baseEntities[chr] || chr;\r
+                       });\r
                },\r
 \r
-               getParents : function(n, f, r, c) {\r
-                       var t = this, na, se = t.settings, o = [];\r
+               encodeNumeric : function(text, attr) {\r
+                       return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {\r
+                               // Multi byte sequence convert it to a single entity\r
+                               if (chr.length > 1)\r
+                                       return '&#' + (((chr.charCodeAt(0) - 0xD800) * 0x400) + (chr.charCodeAt(1) - 0xDC00) + 0x10000) + ';';\r
 \r
-                       n = t.get(n);\r
-                       c = c === undefined;\r
+                               return baseEntities[chr] || '&#' + chr.charCodeAt(0) + ';';\r
+                       });\r
+               },\r
 \r
-                       if (se.strict_root)\r
-                               r = r || t.getRoot();\r
+               encodeNamed : function(text, attr, entities) {\r
+                       entities = entities || namedEntities;\r
 \r
-                       // Wrap node name as func\r
-                       if (is(f, 'string')) {\r
-                               na = f;\r
+                       return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {\r
+                               return baseEntities[chr] || entities[chr] || chr;\r
+                       });\r
+               },\r
 \r
-                               if (f === '*') {\r
-                                       f = function(n) {return n.nodeType == 1;};\r
-                               } else {\r
-                                       f = function(n) {\r
-                                               return t.is(n, na);\r
-                                       };\r
-                               }\r
-                       }\r
+               getEncodeFunc : function(name, entities) {\r
+                       var Entities = tinymce.html.Entities;\r
 \r
-                       while (n) {\r
-                               if (n == r || !n.nodeType || n.nodeType === 9)\r
-                                       break;\r
+                       entities = buildEntitiesLookup(entities) || namedEntities;\r
 \r
-                               if (!f || f(n)) {\r
-                                       if (c)\r
-                                               o.push(n);\r
-                                       else\r
-                                               return n;\r
-                               }\r
+                       function encodeNamedAndNumeric(text, attr) {\r
+                               return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {\r
+                                       return baseEntities[chr] || entities[chr] || '&#' + chr.charCodeAt(0) + ';' || chr;\r
+                               });\r
+                       };\r
 \r
-                               n = n.parentNode;\r
-                       }\r
+                       function encodeCustomNamed(text, attr) {\r
+                               return Entities.encodeNamed(text, attr, entities);\r
+                       };\r
 \r
-                       return c ? o : null;\r
-               },\r
+                       // Replace + with , to be compatible with previous TinyMCE versions\r
+                       name = tinymce.makeMap(name.replace(/\+/g, ','));\r
 \r
-               get : function(e) {\r
-                       var n;\r
+                       // Named and numeric encoder\r
+                       if (name.named && name.numeric)\r
+                               return encodeNamedAndNumeric;\r
 \r
-                       if (e && this.doc && typeof(e) == 'string') {\r
-                               n = e;\r
-                               e = this.doc.getElementById(e);\r
+                       // Named encoder\r
+                       if (name.named) {\r
+                               // Custom names\r
+                               if (entities)\r
+                                       return encodeCustomNamed;\r
 \r
-                               // IE and Opera returns meta elements when they match the specified input ID, but getElementsByName seems to do the trick\r
-                               if (e && e.id !== n)\r
-                                       return this.doc.getElementsByName(n)[1];\r
+                               return Entities.encodeNamed;\r
                        }\r
 \r
-                       return e;\r
-               },\r
+                       // Numeric\r
+                       if (name.numeric)\r
+                               return Entities.encodeNumeric;\r
 \r
-               getNext : function(node, selector) {\r
-                       return this._findSib(node, selector, 'nextSibling');\r
+                       // Raw encoder\r
+                       return Entities.encodeRaw;\r
                },\r
 \r
-               getPrev : function(node, selector) {\r
-                       return this._findSib(node, selector, 'previousSibling');\r
-               },\r
+               decode : function(text) {\r
+                       return text.replace(entityRegExp, function(all, numeric, value) {\r
+                               if (numeric) {\r
+                                       value = parseInt(value, numeric.length === 2 ? 16 : 10);\r
 \r
+                                       // Support upper UTF\r
+                                       if (value > 0xFFFF) {\r
+                                               value -= 0x10000;\r
 \r
-               select : function(pa, s) {\r
-                       var t = this;\r
+                                               return String.fromCharCode(0xD800 + (value >> 10), 0xDC00 + (value & 0x3FF));\r
+                                       } else\r
+                                               return asciiMap[value] || String.fromCharCode(value);\r
+                               }\r
 \r
-                       return tinymce.dom.Sizzle(pa, t.get(s) || t.get(t.settings.root_element) || t.doc, []);\r
-               },\r
+                               return reverseEntities[all] || namedEntities[all] || nativeDecode(all);\r
+                       });\r
+               }\r
+       };\r
+})(tinymce);\r
 \r
-               is : function(n, selector) {\r
-                       var i;\r
+tinymce.html.Styles = function(settings, schema) {\r
+       var rgbRegExp = /rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,\r
+               urlOrStrRegExp = /(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,\r
+               styleRegExp = /\s*([^:]+):\s*([^;]+);?/g,\r
+               trimRightRegExp = /\s+$/,\r
+               urlColorRegExp = /rgb/,\r
+               undef, i, encodingLookup = {}, encodingItems;\r
 \r
-                       // If it isn't an array then try to do some simple selectors instead of Sizzle for to boost performance\r
-                       if (n.length === undefined) {\r
-                               // Simple all selector\r
-                               if (selector === '*')\r
-                                       return n.nodeType == 1;\r
+       settings = settings || {};\r
 \r
-                               // Simple selector just elements\r
-                               if (simpleSelectorRe.test(selector)) {\r
-                                       selector = selector.toLowerCase().split(/,/);\r
-                                       n = n.nodeName.toLowerCase();\r
+       encodingItems = '\\" \\\' \\; \\: ; : \uFEFF'.split(' ');\r
+       for (i = 0; i < encodingItems.length; i++) {\r
+               encodingLookup[encodingItems[i]] = '\uFEFF' + i;\r
+               encodingLookup['\uFEFF' + i] = encodingItems[i];\r
+       }\r
 \r
-                                       for (i = selector.length - 1; i >= 0; i--) {\r
-                                               if (selector[i] == n)\r
-                                                       return true;\r
-                                       }\r
+       function toHex(match, r, g, b) {\r
+               function hex(val) {\r
+                       val = parseInt(val).toString(16);\r
 \r
-                                       return false;\r
-                               }\r
-                       }\r
+                       return val.length > 1 ? val : '0' + val; // 0 -> 00\r
+               };\r
 \r
-                       return tinymce.dom.Sizzle.matches(selector, n.nodeType ? [n] : n).length > 0;\r
+               return '#' + hex(r) + hex(g) + hex(b);\r
+       };\r
+\r
+       return {\r
+               toHex : function(color) {\r
+                       return color.replace(rgbRegExp, toHex);\r
                },\r
 \r
+               parse : function(css) {\r
+                       var styles = {}, matches, name, value, isEncoded, urlConverter = settings.url_converter, urlConverterScope = settings.url_converter_scope || this;\r
 \r
-               add : function(p, n, a, h, c) {\r
-                       var t = this;\r
+                       function compress(prefix, suffix) {\r
+                               var top, right, bottom, left;\r
 \r
-                       return this.run(p, function(p) {\r
-                               var e, k;\r
+                               // Get values and check it it needs compressing\r
+                               top = styles[prefix + '-top' + suffix];\r
+                               if (!top)\r
+                                       return;\r
 \r
-                               e = is(n, 'string') ? t.doc.createElement(n) : n;\r
-                               t.setAttribs(e, a);\r
+                               right = styles[prefix + '-right' + suffix];\r
+                               if (top != right)\r
+                                       return;\r
 \r
-                               if (h) {\r
-                                       if (h.nodeType)\r
-                                               e.appendChild(h);\r
-                                       else\r
-                                               t.setHTML(e, h);\r
-                               }\r
+                               bottom = styles[prefix + '-bottom' + suffix];\r
+                               if (right != bottom)\r
+                                       return;\r
 \r
-                               return !c ? p.appendChild(e) : e;\r
-                       });\r
-               },\r
+                               left = styles[prefix + '-left' + suffix];\r
+                               if (bottom != left)\r
+                                       return;\r
 \r
-               create : function(n, a, h) {\r
-                       return this.add(this.doc.createElement(n), n, a, h, 1);\r
-               },\r
+                               // Compress\r
+                               styles[prefix + suffix] = left;\r
+                               delete styles[prefix + '-top' + suffix];\r
+                               delete styles[prefix + '-right' + suffix];\r
+                               delete styles[prefix + '-bottom' + suffix];\r
+                               delete styles[prefix + '-left' + suffix];\r
+                       };\r
 \r
-               createHTML : function(n, a, h) {\r
-                       var o = '', t = this, k;\r
+                       function canCompress(key) {\r
+                               var value = styles[key], i;\r
 \r
-                       o += '<' + n;\r
+                               if (!value || value.indexOf(' ') < 0)\r
+                                       return;\r
 \r
-                       for (k in a) {\r
-                               if (a.hasOwnProperty(k))\r
-                                       o += ' ' + k + '="' + t.encode(a[k]) + '"';\r
-                       }\r
+                               value = value.split(' ');\r
+                               i = value.length;\r
+                               while (i--) {\r
+                                       if (value[i] !== value[0])\r
+                                               return false;\r
+                               }\r
 \r
-                       // A call to tinymce.is doesn't work for some odd reason on IE9 possible bug inside their JS runtime\r
-                       if (typeof(h) != "undefined")\r
-                               return o + '>' + h + '</' + n + '>';\r
+                               styles[key] = value[0];\r
 \r
-                       return o + ' />';\r
-               },\r
+                               return true;\r
+                       };\r
 \r
-               remove : function(node, keep_children) {\r
-                       return this.run(node, function(node) {\r
-                               var parent, child;\r
+                       function compress2(target, a, b, c) {\r
+                               if (!canCompress(a))\r
+                                       return;\r
 \r
-                               parent = node.parentNode;\r
+                               if (!canCompress(b))\r
+                                       return;\r
 \r
-                               if (!parent)\r
-                                       return null;\r
+                               if (!canCompress(c))\r
+                                       return;\r
 \r
-                               if (keep_children) {\r
-                                       while (child = node.firstChild) {\r
-                                               // IE 8 will crash if you don't remove completely empty text nodes\r
-                                               if (!tinymce.isIE || child.nodeType !== 3 || child.nodeValue)\r
-                                                       parent.insertBefore(child, node);\r
-                                               else\r
-                                                       node.removeChild(child);\r
-                                       }\r
-                               }\r
+                               // Compress\r
+                               styles[target] = styles[a] + ' ' + styles[b] + ' ' + styles[c];\r
+                               delete styles[a];\r
+                               delete styles[b];\r
+                               delete styles[c];\r
+                       };\r
 \r
-                               return parent.removeChild(node);\r
-                       });\r
-               },\r
+                       // Encodes the specified string by replacing all \" \' ; : with _<num>\r
+                       function encode(str) {\r
+                               isEncoded = true;\r
 \r
-               setStyle : function(n, na, v) {\r
-                       var t = this;\r
+                               return encodingLookup[str];\r
+                       };\r
 \r
-                       return t.run(n, function(e) {\r
-                               var s, i;\r
+                       // Decodes the specified string by replacing all _<num> with it's original value \" \' etc\r
+                       // It will also decode the \" \' if keep_slashes is set to fale or omitted\r
+                       function decode(str, keep_slashes) {\r
+                               if (isEncoded) {\r
+                                       str = str.replace(/\uFEFF[0-9]/g, function(str) {\r
+                                               return encodingLookup[str];\r
+                                       });\r
+                               }\r
 \r
-                               s = e.style;\r
+                               if (!keep_slashes)\r
+                                       str = str.replace(/\\([\'\";:])/g, "$1");\r
 \r
-                               // Camelcase it, if needed\r
-                               na = na.replace(/-(\D)/g, function(a, b){\r
-                                       return b.toUpperCase();\r
+                               return str;\r
+                       }\r
+\r
+                       if (css) {\r
+                               // Encode \" \' % and ; and : inside strings so they don't interfere with the style parsing\r
+                               css = css.replace(/\\[\"\';:\uFEFF]/g, encode).replace(/\"[^\"]+\"|\'[^\']+\'/g, function(str) {\r
+                                       return str.replace(/[;:]/g, encode);\r
                                });\r
 \r
-                               // Default px suffix on these\r
-                               if (t.pixelStyles.test(na) && (tinymce.is(v, 'number') || /^[\-0-9\.]+$/.test(v)))\r
-                                       v += 'px';\r
+                               // Parse styles\r
+                               while (matches = styleRegExp.exec(css)) {\r
+                                       name = matches[1].replace(trimRightRegExp, '').toLowerCase();\r
+                                       value = matches[2].replace(trimRightRegExp, '');\r
 \r
-                               switch (na) {\r
-                                       case 'opacity':\r
-                                               // IE specific opacity\r
-                                               if (isIE) {\r
-                                                       s.filter = v === '' ? '' : "alpha(opacity=" + (v * 100) + ")";\r
+                                       if (name && value.length > 0) {\r
+                                               // Opera will produce 700 instead of bold in their style values\r
+                                               if (name === 'font-weight' && value === '700')\r
+                                                       value = 'bold';\r
+                                               else if (name === 'color' || name === 'background-color') // Lowercase colors like RED\r
+                                                       value = value.toLowerCase();            \r
 \r
-                                                       if (!n.currentStyle || !n.currentStyle.hasLayout)\r
-                                                               s.display = 'inline-block';\r
-                                               }\r
+                                               // Convert RGB colors to HEX\r
+                                               value = value.replace(rgbRegExp, toHex);\r
 \r
-                                               // Fix for older browsers\r
-                                               s[na] = s['-moz-opacity'] = s['-khtml-opacity'] = v || '';\r
-                                               break;\r
+                                               // Convert URLs and force them into url('value') format\r
+                                               value = value.replace(urlOrStrRegExp, function(match, url, url2, url3, str, str2) {\r
+                                                       str = str || str2;\r
 \r
-                                       case 'float':\r
-                                               isIE ? s.styleFloat = v : s.cssFloat = v;\r
-                                               break;\r
-                                       \r
-                                       default:\r
-                                               s[na] = v || '';\r
-                               }\r
+                                                       if (str) {\r
+                                                               str = decode(str);\r
 \r
-                               // Force update of the style data\r
-                               if (t.settings.update_styles)\r
-                                       t.setAttrib(e, '_mce_style');\r
-                       });\r
-               },\r
+                                                               // Force strings into single quote format\r
+                                                               return "'" + str.replace(/\'/g, "\\'") + "'";\r
+                                                       }\r
 \r
-               getStyle : function(n, na, c) {\r
-                       n = this.get(n);\r
+                                                       url = decode(url || url2 || url3);\r
 \r
-                       if (!n)\r
-                               return false;\r
+                                                       // Convert the URL to relative/absolute depending on config\r
+                                                       if (urlConverter)\r
+                                                               url = urlConverter.call(urlConverterScope, url, 'style');\r
 \r
-                       // Gecko\r
-                       if (this.doc.defaultView && c) {\r
-                               // Remove camelcase\r
-                               na = na.replace(/[A-Z]/g, function(a){\r
-                                       return '-' + a;\r
-                               });\r
+                                                       // Output new URL format\r
+                                                       return "url('" + url.replace(/\'/g, "\\'") + "')";\r
+                                               });\r
 \r
-                               try {\r
-                                       return this.doc.defaultView.getComputedStyle(n, null).getPropertyValue(na);\r
-                               } catch (ex) {\r
-                                       // Old safari might fail\r
-                                       return null;\r
+                                               styles[name] = isEncoded ? decode(value, true) : value;\r
+                                       }\r
+\r
+                                       styleRegExp.lastIndex = matches.index + matches[0].length;\r
                                }\r
+\r
+                               // Compress the styles to reduce it's size for example IE will expand styles\r
+                               compress("border", "");\r
+                               compress("border", "-width");\r
+                               compress("border", "-color");\r
+                               compress("border", "-style");\r
+                               compress("padding", "");\r
+                               compress("margin", "");\r
+                               compress2('border', 'border-width', 'border-style', 'border-color');\r
+\r
+                               // Remove pointless border, IE produces these\r
+                               if (styles.border === 'medium none')\r
+                                       delete styles.border;\r
                        }\r
 \r
-                       // Camelcase it, if needed\r
-                       na = na.replace(/-(\D)/g, function(a, b){\r
-                               return b.toUpperCase();\r
-                       });\r
+                       return styles;\r
+               },\r
 \r
-                       if (na == 'float')\r
-                               na = isIE ? 'styleFloat' : 'cssFloat';\r
+               serialize : function(styles, element_name) {\r
+                       var css = '', name, value;\r
 \r
-                       // IE & Opera\r
-                       if (n.currentStyle && c)\r
-                               return n.currentStyle[na];\r
+                       function serializeStyles(name) {\r
+                               var styleList, i, l, value;\r
 \r
-                       return n.style[na];\r
-               },\r
+                               styleList = schema.styles[name];\r
+                               if (styleList) {\r
+                                       for (i = 0, l = styleList.length; i < l; i++) {\r
+                                               name = styleList[i];\r
+                                               value = styles[name];\r
 \r
-               setStyles : function(e, o) {\r
-                       var t = this, s = t.settings, ol;\r
+                                               if (value !== undef && value.length > 0)\r
+                                                       css += (css.length > 0 ? ' ' : '') + name + ': ' + value + ';';\r
+                                       }\r
+                               }\r
+                       };\r
 \r
-                       ol = s.update_styles;\r
-                       s.update_styles = 0;\r
+                       // Serialize styles according to schema\r
+                       if (element_name && schema && schema.styles) {\r
+                               // Serialize global styles and element specific styles\r
+                               serializeStyles('*');\r
+                               serializeStyles(element_name);\r
+                       } else {\r
+                               // Output the styles in the order they are inside the object\r
+                               for (name in styles) {\r
+                                       value = styles[name];\r
 \r
-                       each(o, function(v, n) {\r
-                               t.setStyle(e, n, v);\r
-                       });\r
+                                       if (value !== undef && value.length > 0)\r
+                                               css += (css.length > 0 ? ' ' : '') + name + ': ' + value + ';';\r
+                               }\r
+                       }\r
 \r
-                       // Update style info\r
-                       s.update_styles = ol;\r
-                       if (s.update_styles)\r
-                               t.setAttrib(e, s.cssText);\r
-               },\r
+                       return css;\r
+               }\r
+       };\r
+};\r
 \r
-               setAttrib : function(e, n, v) {\r
-                       var t = this;\r
+(function(tinymce) {\r
+       var transitional = {}, boolAttrMap, blockElementsMap, shortEndedElementsMap, nonEmptyElementsMap, customElementsMap = {},\r
+               defaultWhiteSpaceElementsMap, selfClosingElementsMap, makeMap = tinymce.makeMap, each = tinymce.each;\r
 \r
-                       // Whats the point\r
-                       if (!e || !n)\r
-                               return;\r
+       function split(str, delim) {\r
+               return str.split(delim || ',');\r
+       };\r
 \r
-                       // Strict XML mode\r
-                       if (t.settings.strict)\r
-                               n = n.toLowerCase();\r
+       function unpack(lookup, data) {\r
+               var key, elements = {};\r
 \r
-                       return this.run(e, function(e) {\r
-                               var s = t.settings;\r
+               function replace(value) {\r
+                       return value.replace(/[A-Z]+/g, function(key) {\r
+                               return replace(lookup[key]);\r
+                       });\r
+               };\r
 \r
-                               switch (n) {\r
-                                       case "style":\r
-                                               if (!is(v, 'string')) {\r
-                                                       each(v, function(v, n) {\r
-                                                               t.setStyle(e, n, v);\r
-                                                       });\r
+               // Unpack lookup\r
+               for (key in lookup) {\r
+                       if (lookup.hasOwnProperty(key))\r
+                               lookup[key] = replace(lookup[key]);\r
+               }\r
 \r
-                                                       return;\r
-                                               }\r
+               // Unpack and parse data into object map\r
+               replace(data).replace(/#/g, '#text').replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g, function(str, name, attributes, children) {\r
+                       attributes = split(attributes, '|');\r
 \r
-                                               // No mce_style for elements with these since they might get resized by the user\r
-                                               if (s.keep_values) {\r
-                                                       if (v && !t._isRes(v))\r
-                                                               e.setAttribute('_mce_style', v, 2);\r
-                                                       else\r
-                                                               e.removeAttribute('_mce_style', 2);\r
-                                               }\r
+                       elements[name] = {\r
+                               attributes : makeMap(attributes),\r
+                               attributesOrder : attributes,\r
+                               children : makeMap(children, '|', {'#comment' : {}})\r
+                       }\r
+               });\r
 \r
-                                               e.style.cssText = v;\r
-                                               break;\r
+               return elements;\r
+       };\r
 \r
-                                       case "class":\r
-                                               e.className = v || ''; // Fix IE null bug\r
-                                               break;\r
+       // Build a lookup table for block elements both lowercase and uppercase\r
+       blockElementsMap = 'h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,' + \r
+                                               'th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,' + \r
+                                               'noscript,menu,isindex,samp,header,footer,article,section,hgroup';\r
+       blockElementsMap = makeMap(blockElementsMap, ',', makeMap(blockElementsMap.toUpperCase()));\r
+\r
+       // This is the XHTML 1.0 transitional elements with it's attributes and children packed to reduce it's size\r
+       transitional = unpack({\r
+               Z : 'H|K|N|O|P',\r
+               Y : 'X|form|R|Q',\r
+               ZG : 'E|span|width|align|char|charoff|valign',\r
+               X : 'p|T|div|U|W|isindex|fieldset|table',\r
+               ZF : 'E|align|char|charoff|valign',\r
+               W : 'pre|hr|blockquote|address|center|noframes',\r
+               ZE : 'abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height',\r
+               ZD : '[E][S]',\r
+               U : 'ul|ol|dl|menu|dir',\r
+               ZC : 'p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q',\r
+               T : 'h1|h2|h3|h4|h5|h6',\r
+               ZB : 'X|S|Q',\r
+               S : 'R|P',\r
+               ZA : 'a|G|J|M|O|P',\r
+               R : 'a|H|K|N|O',\r
+               Q : 'noscript|P',\r
+               P : 'ins|del|script',\r
+               O : 'input|select|textarea|label|button',\r
+               N : 'M|L',\r
+               M : 'em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym',\r
+               L : 'sub|sup',\r
+               K : 'J|I',\r
+               J : 'tt|i|b|u|s|strike',\r
+               I : 'big|small|font|basefont',\r
+               H : 'G|F',\r
+               G : 'br|span|bdo',\r
+               F : 'object|applet|img|map|iframe',\r
+               E : 'A|B|C',\r
+               D : 'accesskey|tabindex|onfocus|onblur',\r
+               C : 'onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup',\r
+               B : 'lang|xml:lang|dir',\r
+               A : 'id|class|style|title'\r
+       }, 'script[id|charset|type|language|src|defer|xml:space][]' + \r
+               'style[B|id|type|media|title|xml:space][]' + \r
+               'object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]' + \r
+               'param[id|name|value|valuetype|type][]' + \r
+               'p[E|align][#|S]' + \r
+               'a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]' + \r
+               'br[A|clear][]' + \r
+               'span[E][#|S]' + \r
+               'bdo[A|C|B][#|S]' + \r
+               'applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]' + \r
+               'h1[E|align][#|S]' + \r
+               'img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]' + \r
+               'map[B|C|A|name][X|form|Q|area]' + \r
+               'h2[E|align][#|S]' + \r
+               'iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]' + \r
+               'h3[E|align][#|S]' + \r
+               'tt[E][#|S]' + \r
+               'i[E][#|S]' + \r
+               'b[E][#|S]' + \r
+               'u[E][#|S]' + \r
+               's[E][#|S]' + \r
+               'strike[E][#|S]' + \r
+               'big[E][#|S]' + \r
+               'small[E][#|S]' + \r
+               'font[A|B|size|color|face][#|S]' + \r
+               'basefont[id|size|color|face][]' + \r
+               'em[E][#|S]' + \r
+               'strong[E][#|S]' + \r
+               'dfn[E][#|S]' + \r
+               'code[E][#|S]' + \r
+               'q[E|cite][#|S]' + \r
+               'samp[E][#|S]' + \r
+               'kbd[E][#|S]' + \r
+               'var[E][#|S]' + \r
+               'cite[E][#|S]' + \r
+               'abbr[E][#|S]' + \r
+               'acronym[E][#|S]' + \r
+               'sub[E][#|S]' + \r
+               'sup[E][#|S]' + \r
+               'input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]' + \r
+               'select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]' + \r
+               'optgroup[E|disabled|label][option]' + \r
+               'option[E|selected|disabled|label|value][]' + \r
+               'textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]' + \r
+               'label[E|for|accesskey|onfocus|onblur][#|S]' + \r
+               'button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' + \r
+               'h4[E|align][#|S]' + \r
+               'ins[E|cite|datetime][#|Y]' + \r
+               'h5[E|align][#|S]' + \r
+               'del[E|cite|datetime][#|Y]' + \r
+               'h6[E|align][#|S]' + \r
+               'div[E|align][#|Y]' + \r
+               'ul[E|type|compact][li]' + \r
+               'li[E|type|value][#|Y]' + \r
+               'ol[E|type|compact|start][li]' + \r
+               'dl[E|compact][dt|dd]' + \r
+               'dt[E][#|S]' + \r
+               'dd[E][#|Y]' + \r
+               'menu[E|compact][li]' + \r
+               'dir[E|compact][li]' + \r
+               'pre[E|width|xml:space][#|ZA]' + \r
+               'hr[E|align|noshade|size|width][]' + \r
+               'blockquote[E|cite][#|Y]' + \r
+               'address[E][#|S|p]' + \r
+               'center[E][#|Y]' + \r
+               'noframes[E][#|Y]' + \r
+               'isindex[A|B|prompt][]' + \r
+               'fieldset[E][#|legend|Y]' + \r
+               'legend[E|accesskey|align][#|S]' + \r
+               'table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]' + \r
+               'caption[E|align][#|S]' + \r
+               'col[ZG][]' + \r
+               'colgroup[ZG][col]' + \r
+               'thead[ZF][tr]' + \r
+               'tr[ZF|bgcolor][th|td]' + \r
+               'th[E|ZE][#|Y]' + \r
+               'form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]' + \r
+               'noscript[E][#|Y]' + \r
+               'td[E|ZE][#|Y]' + \r
+               'tfoot[ZF][tr]' + \r
+               'tbody[ZF][tr]' + \r
+               'area[E|D|shape|coords|href|nohref|alt|target][]' + \r
+               'base[id|href|target][]' + \r
+               'body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]'\r
+       );\r
 \r
-                                       case "src":\r
-                                       case "href":\r
-                                               if (s.keep_values) {\r
-                                                       if (s.url_converter)\r
-                                                               v = s.url_converter.call(s.url_converter_scope || t, v, n, e);\r
+       boolAttrMap = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected,autoplay,loop,controls');\r
+       shortEndedElementsMap = makeMap('area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed,source');\r
+       nonEmptyElementsMap = tinymce.extend(makeMap('td,th,iframe,video,audio,object'), shortEndedElementsMap);\r
+       defaultWhiteSpaceElementsMap = makeMap('pre,script,style,textarea');\r
+       selfClosingElementsMap = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr');\r
 \r
-                                                       t.setAttrib(e, '_mce_' + n, v, 2);\r
-                                               }\r
+       tinymce.html.Schema = function(settings) {\r
+               var self = this, elements = {}, children = {}, patternElements = [], validStyles, whiteSpaceElementsMap;\r
 \r
-                                               break;\r
-                                       \r
-                                       case "shape":\r
-                                               e.setAttribute('_mce_style', v);\r
-                                               break;\r
-                               }\r
+               settings = settings || {};\r
 \r
-                               if (is(v) && v !== null && v.length !== 0)\r
-                                       e.setAttribute(n, '' + v, 2);\r
-                               else\r
-                                       e.removeAttribute(n, 2);\r
-                       });\r
-               },\r
+               // Allow all elements and attributes if verify_html is set to false\r
+               if (settings.verify_html === false)\r
+                       settings.valid_elements = '*[*]';\r
 \r
-               setAttribs : function(e, o) {\r
-                       var t = this;\r
+               // Build styles list\r
+               if (settings.valid_styles) {\r
+                       validStyles = {};\r
 \r
-                       return this.run(e, function(e) {\r
-                               each(o, function(v, n) {\r
-                                       t.setAttrib(e, n, v);\r
-                               });\r
+                       // Convert styles into a rule list\r
+                       each(settings.valid_styles, function(value, key) {\r
+                               validStyles[key] = tinymce.explode(value);\r
                        });\r
-               },\r
+               }\r
 \r
-               getAttrib : function(e, n, dv) {\r
-                       var v, t = this;\r
+               whiteSpaceElementsMap = settings.whitespace_elements ? makeMap(settings.whitespace_elements) : defaultWhiteSpaceElementsMap;\r
 \r
-                       e = t.get(e);\r
+               // Converts a wildcard expression string to a regexp for example *a will become /.*a/.\r
+               function patternToRegExp(str) {\r
+                       return new RegExp('^' + str.replace(/([?+*])/g, '.$1') + '$');\r
+               };\r
 \r
-                       if (!e || e.nodeType !== 1)\r
-                               return false;\r
+               // Parses the specified valid_elements string and adds to the current rules\r
+               // This function is a bit hard to read since it's heavily optimized for speed\r
+               function addValidElements(valid_elements) {\r
+                       var ei, el, ai, al, yl, matches, element, attr, attrData, elementName, attrName, attrType, attributes, attributesOrder,\r
+                               prefix, outputName, globalAttributes, globalAttributesOrder, transElement, key, childKey, value,\r
+                               elementRuleRegExp = /^([#+-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,\r
+                               attrRuleRegExp = /^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,\r
+                               hasPatternsRegExp = /[*?+]/;\r
+\r
+                       if (valid_elements) {\r
+                               // Split valid elements into an array with rules\r
+                               valid_elements = split(valid_elements);\r
+\r
+                               if (elements['@']) {\r
+                                       globalAttributes = elements['@'].attributes;\r
+                                       globalAttributesOrder = elements['@'].attributesOrder;\r
+                               }\r
 \r
-                       if (!is(dv))\r
-                               dv = '';\r
+                               // Loop all rules\r
+                               for (ei = 0, el = valid_elements.length; ei < el; ei++) {\r
+                                       // Parse element rule\r
+                                       matches = elementRuleRegExp.exec(valid_elements[ei]);\r
+                                       if (matches) {\r
+                                               // Setup local names for matches\r
+                                               prefix = matches[1];\r
+                                               elementName = matches[2];\r
+                                               outputName = matches[3];\r
+                                               attrData = matches[4];\r
+\r
+                                               // Create new attributes and attributesOrder\r
+                                               attributes = {};\r
+                                               attributesOrder = [];\r
+\r
+                                               // Create the new element\r
+                                               element = {\r
+                                                       attributes : attributes,\r
+                                                       attributesOrder : attributesOrder\r
+                                               };\r
 \r
-                       // Try the mce variant for these\r
-                       if (/^(src|href|style|coords|shape)$/.test(n)) {\r
-                               v = e.getAttribute("_mce_" + n);\r
+                                               // Padd empty elements prefix\r
+                                               if (prefix === '#')\r
+                                                       element.paddEmpty = true;\r
 \r
-                               if (v)\r
-                                       return v;\r
-                       }\r
+                                               // Remove empty elements prefix\r
+                                               if (prefix === '-')\r
+                                                       element.removeEmpty = true;\r
 \r
-                       if (isIE && t.props[n]) {\r
-                               v = e[t.props[n]];\r
-                               v = v && v.nodeValue ? v.nodeValue : v;\r
-                       }\r
+                                               // Copy attributes from global rule into current rule\r
+                                               if (globalAttributes) {\r
+                                                       for (key in globalAttributes)\r
+                                                               attributes[key] = globalAttributes[key];\r
 \r
-                       if (!v)\r
-                               v = e.getAttribute(n, 2);\r
+                                                       attributesOrder.push.apply(attributesOrder, globalAttributesOrder);\r
+                                               }\r
 \r
-                       // Check boolean attribs\r
-                       if (/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(n)) {\r
-                               if (e[t.props[n]] === true && v === '')\r
-                                       return n;\r
+                                               // Attributes defined\r
+                                               if (attrData) {\r
+                                                       attrData = split(attrData, '|');\r
+                                                       for (ai = 0, al = attrData.length; ai < al; ai++) {\r
+                                                               matches = attrRuleRegExp.exec(attrData[ai]);\r
+                                                               if (matches) {\r
+                                                                       attr = {};\r
+                                                                       attrType = matches[1];\r
+                                                                       attrName = matches[2].replace(/::/g, ':');\r
+                                                                       prefix = matches[3];\r
+                                                                       value = matches[4];\r
+\r
+                                                                       // Required\r
+                                                                       if (attrType === '!') {\r
+                                                                               element.attributesRequired = element.attributesRequired || [];\r
+                                                                               element.attributesRequired.push(attrName);\r
+                                                                               attr.required = true;\r
+                                                                       }\r
 \r
-                               return v ? n : '';\r
-                       }\r
+                                                                       // Denied from global\r
+                                                                       if (attrType === '-') {\r
+                                                                               delete attributes[attrName];\r
+                                                                               attributesOrder.splice(tinymce.inArray(attributesOrder, attrName), 1);\r
+                                                                               continue;\r
+                                                                       }\r
 \r
-                       // Inner input elements will override attributes on form elements\r
-                       if (e.nodeName === "FORM" && e.getAttributeNode(n))\r
-                               return e.getAttributeNode(n).nodeValue;\r
+                                                                       // Default value\r
+                                                                       if (prefix) {\r
+                                                                               // Default value\r
+                                                                               if (prefix === '=') {\r
+                                                                                       element.attributesDefault = element.attributesDefault || [];\r
+                                                                                       element.attributesDefault.push({name: attrName, value: value});\r
+                                                                                       attr.defaultValue = value;\r
+                                                                               }\r
 \r
-                       if (n === 'style') {\r
-                               v = v || e.style.cssText;\r
+                                                                               // Forced value\r
+                                                                               if (prefix === ':') {\r
+                                                                                       element.attributesForced = element.attributesForced || [];\r
+                                                                                       element.attributesForced.push({name: attrName, value: value});\r
+                                                                                       attr.forcedValue = value;\r
+                                                                               }\r
 \r
-                               if (v) {\r
-                                       v = t.serializeStyle(t.parseStyle(v), e.nodeName);\r
+                                                                               // Required values\r
+                                                                               if (prefix === '<')\r
+                                                                                       attr.validValues = makeMap(value, '?');\r
+                                                                       }\r
 \r
-                                       if (t.settings.keep_values && !t._isRes(v))\r
-                                               e.setAttribute('_mce_style', v);\r
+                                                                       // Check for attribute patterns\r
+                                                                       if (hasPatternsRegExp.test(attrName)) {\r
+                                                                               element.attributePatterns = element.attributePatterns || [];\r
+                                                                               attr.pattern = patternToRegExp(attrName);\r
+                                                                               element.attributePatterns.push(attr);\r
+                                                                       } else {\r
+                                                                               // Add attribute to order list if it doesn't already exist\r
+                                                                               if (!attributes[attrName])\r
+                                                                                       attributesOrder.push(attrName);\r
+\r
+                                                                               attributes[attrName] = attr;\r
+                                                                       }\r
+                                                               }\r
+                                                       }\r
+                                               }\r
+\r
+                                               // Global rule, store away these for later usage\r
+                                               if (!globalAttributes && elementName == '@') {\r
+                                                       globalAttributes = attributes;\r
+                                                       globalAttributesOrder = attributesOrder;\r
+                                               }\r
+\r
+                                               // Handle substitute elements such as b/strong\r
+                                               if (outputName) {\r
+                                                       element.outputName = elementName;\r
+                                                       elements[outputName] = element;\r
+                                               }\r
+\r
+                                               // Add pattern or exact element\r
+                                               if (hasPatternsRegExp.test(elementName)) {\r
+                                                       element.pattern = patternToRegExp(elementName);\r
+                                                       patternElements.push(element);\r
+                                               } else\r
+                                                       elements[elementName] = element;\r
+                                       }\r
                                }\r
                        }\r
+               };\r
 \r
-                       // Remove Apple and WebKit stuff\r
-                       if (isWebKit && n === "class" && v)\r
-                               v = v.replace(/(apple|webkit)\-[a-z\-]+/gi, '');\r
+               function setValidElements(valid_elements) {\r
+                       elements = {};\r
+                       patternElements = [];\r
 \r
-                       // Handle IE issues\r
-                       if (isIE) {\r
-                               switch (n) {\r
-                                       case 'rowspan':\r
-                                       case 'colspan':\r
-                                               // IE returns 1 as default value\r
-                                               if (v === 1)\r
-                                                       v = '';\r
+                       addValidElements(valid_elements);\r
 \r
-                                               break;\r
+                       each(transitional, function(element, name) {\r
+                               children[name] = element.children;\r
+                       });\r
+               };\r
 \r
-                                       case 'size':\r
-                                               // IE returns +0 as default value for size\r
-                                               if (v === '+0' || v === 20 || v === 0)\r
-                                                       v = '';\r
+               // Adds custom non HTML elements to the schema\r
+               function addCustomElements(custom_elements) {\r
+                       var customElementRegExp = /^(~)?(.+)$/;\r
 \r
-                                               break;\r
+                       if (custom_elements) {\r
+                               each(split(custom_elements), function(rule) {\r
+                                       var matches = customElementRegExp.exec(rule),\r
+                                               inline = matches[1] === '~',\r
+                                               cloneName = inline ? 'span' : 'div',\r
+                                               name = matches[2];\r
 \r
-                                       case 'width':\r
-                                       case 'height':\r
-                                       case 'vspace':\r
-                                       case 'checked':\r
-                                       case 'disabled':\r
-                                       case 'readonly':\r
-                                               if (v === 0)\r
-                                                       v = '';\r
+                                       children[name] = children[cloneName];\r
+                                       customElementsMap[name] = cloneName;\r
 \r
-                                               break;\r
+                                       // If it's not marked as inline then add it to valid block elements\r
+                                       if (!inline)\r
+                                               blockElementsMap[name] = {};\r
 \r
-                                       case 'hspace':\r
-                                               // IE returns -1 as default value\r
-                                               if (v === -1)\r
-                                                       v = '';\r
+                                       // Add custom elements at span/div positions\r
+                                       each(children, function(element, child) {\r
+                                               if (element[cloneName])\r
+                                                       element[name] = element[cloneName];\r
+                                       });\r
+                               });\r
+                       }\r
+               };\r
 \r
-                                               break;\r
+               // Adds valid children to the schema object\r
+               function addValidChildren(valid_children) {\r
+                       var childRuleRegExp = /^([+\-]?)(\w+)\[([^\]]+)\]$/;\r
 \r
-                                       case 'maxlength':\r
-                                       case 'tabindex':\r
-                                               // IE returns default value\r
-                                               if (v === 32768 || v === 2147483647 || v === '32768')\r
-                                                       v = '';\r
+                       if (valid_children) {\r
+                               each(split(valid_children), function(rule) {\r
+                                       var matches = childRuleRegExp.exec(rule), parent, prefix;\r
 \r
-                                               break;\r
+                                       if (matches) {\r
+                                               prefix = matches[1];\r
 \r
-                                       case 'multiple':\r
-                                       case 'compact':\r
-                                       case 'noshade':\r
-                                       case 'nowrap':\r
-                                               if (v === 65535)\r
-                                                       return n;\r
+                                               // Add/remove items from default\r
+                                               if (prefix)\r
+                                                       parent = children[matches[2]];\r
+                                               else\r
+                                                       parent = children[matches[2]] = {'#comment' : {}};\r
 \r
-                                               return dv;\r
+                                               parent = children[matches[2]];\r
 \r
-                                       case 'shape':\r
-                                               v = v.toLowerCase();\r
-                                               break;\r
+                                               each(split(matches[3], '|'), function(child) {\r
+                                                       if (prefix === '-')\r
+                                                               delete parent[child];\r
+                                                       else\r
+                                                               parent[child] = {};\r
+                                               });\r
+                                       }\r
+                               });\r
+                       }\r
+               };\r
 \r
-                                       default:\r
-                                               // IE has odd anonymous function for event attributes\r
-                                               if (n.indexOf('on') === 0 && v)\r
-                                                       v = tinymce._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/, '$1', '' + v);\r
-                               }\r
+               function getElementRule(name) {\r
+                       var element = elements[name], i;\r
+\r
+                       // Exact match found\r
+                       if (element)\r
+                               return element;\r
+\r
+                       // No exact match then try the patterns\r
+                       i = patternElements.length;\r
+                       while (i--) {\r
+                               element = patternElements[i];\r
+\r
+                               if (element.pattern.test(name))\r
+                                       return element;\r
                        }\r
+               };\r
 \r
-                       return (v !== undefined && v !== null && v !== '') ? '' + v : dv;\r
-               },\r
+               if (!settings.valid_elements) {\r
+                       // No valid elements defined then clone the elements from the transitional spec\r
+                       each(transitional, function(element, name) {\r
+                               elements[name] = {\r
+                                       attributes : element.attributes,\r
+                                       attributesOrder : element.attributesOrder\r
+                               };\r
 \r
-               getPos : function(n, ro) {\r
-                       var t = this, x = 0, y = 0, e, d = t.doc, r;\r
+                               children[name] = element.children;\r
+                       });\r
 \r
-                       n = t.get(n);\r
-                       ro = ro || d.body;\r
+                       // Switch these\r
+                       each(split('strong/b,em/i'), function(item) {\r
+                               item = split(item, '/');\r
+                               elements[item[1]].outputName = item[0];\r
+                       });\r
 \r
-                       if (n) {\r
-                               // Use getBoundingClientRect on IE, Opera has it but it's not perfect\r
-                               if (isIE && !t.stdMode) {\r
-                                       n = n.getBoundingClientRect();\r
-                                       e = t.boxModel ? d.documentElement : d.body;\r
-                                       x = t.getStyle(t.select('html')[0], 'borderWidth'); // Remove border\r
-                                       x = (x == 'medium' || t.boxModel && !t.isIE6) && 2 || x;\r
+                       // Add default alt attribute for images\r
+                       elements.img.attributesDefault = [{name: 'alt', value: ''}];\r
 \r
-                                       return {x : n.left + e.scrollLeft - x, y : n.top + e.scrollTop - x};\r
-                               }\r
+                       // Remove these if they are empty by default\r
+                       each(split('ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr'), function(name) {\r
+                               elements[name].removeEmpty = true;\r
+                       });\r
 \r
-                               r = n;\r
-                               while (r && r != ro && r.nodeType) {\r
-                                       x += r.offsetLeft || 0;\r
-                                       y += r.offsetTop || 0;\r
-                                       r = r.offsetParent;\r
-                               }\r
+                       // Padd these by default\r
+                       each(split('p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption'), function(name) {\r
+                               elements[name].paddEmpty = true;\r
+                       });\r
+               } else\r
+                       setValidElements(settings.valid_elements);\r
 \r
-                               r = n.parentNode;\r
-                               while (r && r != ro && r.nodeType) {\r
-                                       x -= r.scrollLeft || 0;\r
-                                       y -= r.scrollTop || 0;\r
-                                       r = r.parentNode;\r
-                               }\r
-                       }\r
+               addCustomElements(settings.custom_elements);\r
+               addValidChildren(settings.valid_children);\r
+               addValidElements(settings.extended_valid_elements);\r
 \r
-                       return {x : x, y : y};\r
-               },\r
+               // Todo: Remove this when we fix list handling to be valid\r
+               addValidChildren('+ol[ul|ol],+ul[ul|ol]');\r
 \r
-               parseStyle : function(st) {\r
-                       var t = this, s = t.settings, o = {};\r
+               // If the user didn't allow span only allow internal spans\r
+               if (!getElementRule('span'))\r
+                       addValidElements('span[!data-mce-type|*]');\r
 \r
-                       if (!st)\r
-                               return o;\r
+               // Delete invalid elements\r
+               if (settings.invalid_elements) {\r
+                       tinymce.each(tinymce.explode(settings.invalid_elements), function(item) {\r
+                               if (elements[item])\r
+                                       delete elements[item];\r
+                       });\r
+               }\r
 \r
-                       function compress(p, s, ot) {\r
-                               var t, r, b, l;\r
+               self.children = children;\r
 \r
-                               // Get values and check it it needs compressing\r
-                               t = o[p + '-top' + s];\r
-                               if (!t)\r
-                                       return;\r
+               self.styles = validStyles;\r
 \r
-                               r = o[p + '-right' + s];\r
-                               if (t != r)\r
-                                       return;\r
+               self.getBoolAttrs = function() {\r
+                       return boolAttrMap;\r
+               };\r
 \r
-                               b = o[p + '-bottom' + s];\r
-                               if (r != b)\r
-                                       return;\r
+               self.getBlockElements = function() {\r
+                       return blockElementsMap;\r
+               };\r
 \r
-                               l = o[p + '-left' + s];\r
-                               if (b != l)\r
-                                       return;\r
+               self.getShortEndedElements = function() {\r
+                       return shortEndedElementsMap;\r
+               };\r
 \r
-                               // Compress\r
-                               o[ot] = l;\r
-                               delete o[p + '-top' + s];\r
-                               delete o[p + '-right' + s];\r
-                               delete o[p + '-bottom' + s];\r
-                               delete o[p + '-left' + s];\r
-                       };\r
+               self.getSelfClosingElements = function() {\r
+                       return selfClosingElementsMap;\r
+               };\r
 \r
-                       function compress2(ta, a, b, c) {\r
-                               var t;\r
+               self.getNonEmptyElements = function() {\r
+                       return nonEmptyElementsMap;\r
+               };\r
 \r
-                               t = o[a];\r
-                               if (!t)\r
-                                       return;\r
+               self.getWhiteSpaceElements = function() {\r
+                       return whiteSpaceElementsMap;\r
+               };\r
 \r
-                               t = o[b];\r
-                               if (!t)\r
-                                       return;\r
+               self.isValidChild = function(name, child) {\r
+                       var parent = children[name];\r
 \r
-                               t = o[c];\r
-                               if (!t)\r
-                                       return;\r
+                       return !!(parent && parent[child]);\r
+               };\r
 \r
-                               // Compress\r
-                               o[ta] = o[a] + ' ' + o[b] + ' ' + o[c];\r
-                               delete o[a];\r
-                               delete o[b];\r
-                               delete o[c];\r
-                       };\r
+               self.getElementRule = getElementRule;\r
 \r
-                       st = st.replace(/&(#?[a-z0-9]+);/g, '&$1_MCE_SEMI_'); // Protect entities\r
+               self.getCustomElements = function() {\r
+                       return customElementsMap;\r
+               };\r
 \r
-                       each(st.split(';'), function(v) {\r
-                               var sv, ur = [];\r
+               self.addValidElements = addValidElements;\r
 \r
-                               if (v) {\r
-                                       v = v.replace(/_MCE_SEMI_/g, ';'); // Restore entities\r
-                                       v = v.replace(/url\([^\)]+\)/g, function(v) {ur.push(v);return 'url(' + ur.length + ')';});\r
-                                       v = v.split(':');\r
-                                       sv = tinymce.trim(v[1]);\r
-                                       sv = sv.replace(/url\(([^\)]+)\)/g, function(a, b) {return ur[parseInt(b) - 1];});\r
-\r
-                                       sv = sv.replace(/rgb\([^\)]+\)/g, function(v) {\r
-                                               return t.toHex(v);\r
-                                       });\r
+               self.setValidElements = setValidElements;\r
 \r
-                                       if (s.url_converter) {\r
-                                               sv = sv.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g, function(x, c) {\r
-                                                       return 'url(' + s.url_converter.call(s.url_converter_scope || t, t.decode(c), 'style', null) + ')';\r
-                                               });\r
-                                       }\r
+               self.addCustomElements = addCustomElements;\r
 \r
-                                       o[tinymce.trim(v[0]).toLowerCase()] = sv;\r
-                               }\r
-                       });\r
+               self.addValidChildren = addValidChildren;\r
+       };\r
 \r
-                       compress("border", "", "border");\r
-                       compress("border", "-width", "border-width");\r
-                       compress("border", "-color", "border-color");\r
-                       compress("border", "-style", "border-style");\r
-                       compress("padding", "", "padding");\r
-                       compress("margin", "", "margin");\r
-                       compress2('border', 'border-width', 'border-style', 'border-color');\r
+       // Expose boolMap and blockElementMap as static properties for usage in DOMUtils\r
+       tinymce.html.Schema.boolAttrMap = boolAttrMap;\r
+       tinymce.html.Schema.blockElementsMap = blockElementsMap;\r
+})(tinymce);\r
 \r
-                       if (isIE) {\r
-                               // Remove pointless border\r
-                               if (o.border == 'medium none')\r
-                                       o.border = '';\r
-                       }\r
+(function(tinymce) {\r
+       tinymce.html.SaxParser = function(settings, schema) {\r
+               var self = this, noop = function() {};\r
 \r
-                       return o;\r
-               },\r
+               settings = settings || {};\r
+               self.schema = schema = schema || new tinymce.html.Schema();\r
 \r
-               serializeStyle : function(o, name) {\r
-                       var t = this, s = '';\r
+               if (settings.fix_self_closing !== false)\r
+                       settings.fix_self_closing = true;\r
 \r
-                       function add(v, k) {\r
-                               if (k && v) {\r
-                                       // Remove browser specific styles like -moz- or -webkit-\r
-                                       if (k.indexOf('-') === 0)\r
-                                               return;\r
+               // Add handler functions from settings and setup default handlers\r
+               tinymce.each('comment cdata text start end pi doctype'.split(' '), function(name) {\r
+                       if (name)\r
+                               self[name] = settings[name] || noop;\r
+               });\r
 \r
-                                       switch (k) {\r
-                                               case 'font-weight':\r
-                                                       // Opera will output bold as 700\r
-                                                       if (v == 700)\r
-                                                               v = 'bold';\r
+               self.parse = function(html) {\r
+                       var self = this, matches, index = 0, value, endRegExp, stack = [], attrList, i, text, name, isInternalElement, removeInternalElements,\r
+                               shortEndedElements, fillAttrsMap, isShortEnded, validate, elementRule, isValidElement, attr, attribsValue, invalidPrefixRegExp,\r
+                               validAttributesMap, validAttributePatterns, attributesRequired, attributesDefault, attributesForced, selfClosing,\r
+                               tokenRegExp, attrRegExp, specialElements, attrValue, idCount = 0, decode = tinymce.html.Entities.decode, fixSelfClosing, isIE;\r
 \r
-                                                       break;\r
+                       function processEndTag(name) {\r
+                               var pos, i;\r
 \r
-                                               case 'color':\r
-                                               case 'background-color':\r
-                                                       v = v.toLowerCase();\r
-                                                       break;\r
+                               // Find position of parent of the same type\r
+                               pos = stack.length;\r
+                               while (pos--) {\r
+                                       if (stack[pos].name === name)\r
+                                               break;                                          \r
+                               }\r
+\r
+                               // Found parent\r
+                               if (pos >= 0) {\r
+                                       // Close all the open elements\r
+                                       for (i = stack.length - 1; i >= pos; i--) {\r
+                                               name = stack[i];\r
+\r
+                                               if (name.valid)\r
+                                                       self.end(name.name);\r
                                        }\r
 \r
-                                       s += (s ? ' ' : '') + k + ': ' + v + ';';\r
+                                       // Remove the open elements from the stack\r
+                                       stack.length = pos;\r
                                }\r
                        };\r
 \r
-                       // Validate style output\r
-                       if (name && t._styles) {\r
-                               each(t._styles['*'], function(name) {\r
-                                       add(o[name], name);\r
-                               });\r
+                       // Precompile RegExps and map objects\r
+                       tokenRegExp = new RegExp('<(?:' +\r
+                               '(?:!--([\\w\\W]*?)-->)|' + // Comment\r
+                               '(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|' + // CDATA\r
+                               '(?:!DOCTYPE([\\w\\W]*?)>)|' + // DOCTYPE\r
+                               '(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|' + // PI\r
+                               '(?:\\/([^>]+)>)|' + // End element\r
+                               '(?:([^\\s\\/<>]+)\\s*((?:[^"\'>]+(?:(?:"[^"]*")|(?:\'[^\']*\')|[^>]*))*)>)' + // Start element\r
+                       ')', 'g');\r
+\r
+                       attrRegExp = /([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:\\.|[^\"])*)\")|(?:\'((?:\\.|[^\'])*)\')|([^>\s]+)))?/g;\r
+                       specialElements = {\r
+                               'script' : /<\/script[^>]*>/gi,\r
+                               'style' : /<\/style[^>]*>/gi,\r
+                               'noscript' : /<\/noscript[^>]*>/gi\r
+                       };\r
 \r
-                               each(t._styles[name.toLowerCase()], function(name) {\r
-                                       add(o[name], name);\r
-                               });\r
-                       } else\r
-                               each(o, add);\r
+                       // Setup lookup tables for empty elements and boolean attributes\r
+                       shortEndedElements = schema.getShortEndedElements();\r
+                       selfClosing = schema.getSelfClosingElements();\r
+                       fillAttrsMap = schema.getBoolAttrs();\r
+                       validate = settings.validate;\r
+                       removeInternalElements = settings.remove_internals;\r
+                       fixSelfClosing = settings.fix_self_closing;\r
+                       isIE = tinymce.isIE;\r
+                       invalidPrefixRegExp = /^:/;\r
+\r
+                       while (matches = tokenRegExp.exec(html)) {\r
+                               // Text\r
+                               if (index < matches.index)\r
+                                       self.text(decode(html.substr(index, matches.index - index)));\r
+\r
+                               if (value = matches[6]) { // End element\r
+                                       value = value.toLowerCase();\r
+\r
+                                       // IE will add a ":" in front of elements it doesn't understand like custom elements or HTML5 elements\r
+                                       if (isIE && invalidPrefixRegExp.test(value))\r
+                                               value = value.substr(1);\r
+\r
+                                       processEndTag(value);\r
+                               } else if (value = matches[7]) { // Start element\r
+                                       value = value.toLowerCase();\r
+\r
+                                       // IE will add a ":" in front of elements it doesn't understand like custom elements or HTML5 elements\r
+                                       if (isIE && invalidPrefixRegExp.test(value))\r
+                                               value = value.substr(1);\r
+\r
+                                       isShortEnded = value in shortEndedElements;\r
+\r
+                                       // Is self closing tag for example an <li> after an open <li>\r
+                                       if (fixSelfClosing && selfClosing[value] && stack.length > 0 && stack[stack.length - 1].name === value)\r
+                                               processEndTag(value);\r
+\r
+                                       // Validate element\r
+                                       if (!validate || (elementRule = schema.getElementRule(value))) {\r
+                                               isValidElement = true;\r
+\r
+                                               // Grab attributes map and patters when validation is enabled\r
+                                               if (validate) {\r
+                                                       validAttributesMap = elementRule.attributes;\r
+                                                       validAttributePatterns = elementRule.attributePatterns;\r
+                                               }\r
 \r
-                       return s;\r
-               },\r
+                                               // Parse attributes\r
+                                               if (attribsValue = matches[8]) {\r
+                                                       isInternalElement = attribsValue.indexOf('data-mce-type') !== -1; // Check if the element is an internal element\r
 \r
-               loadCSS : function(u) {\r
-                       var t = this, d = t.doc, head;\r
+                                                       // If the element has internal attributes then remove it if we are told to do so\r
+                                                       if (isInternalElement && removeInternalElements)\r
+                                                               isValidElement = false;\r
 \r
-                       if (!u)\r
-                               u = '';\r
+                                                       attrList = [];\r
+                                                       attrList.map = {};\r
 \r
-                       head = t.select('head')[0];\r
+                                                       attribsValue.replace(attrRegExp, function(match, name, value, val2, val3) {\r
+                                                               var attrRule, i;\r
 \r
-                       each(u.split(','), function(u) {\r
-                               var link;\r
+                                                               name = name.toLowerCase();\r
+                                                               value = name in fillAttrsMap ? name : decode(value || val2 || val3 || ''); // Handle boolean attribute than value attribute\r
 \r
-                               if (t.files[u])\r
-                                       return;\r
+                                                               // Validate name and value\r
+                                                               if (validate && !isInternalElement && name.indexOf('data-') !== 0) {\r
+                                                                       attrRule = validAttributesMap[name];\r
 \r
-                               t.files[u] = true;\r
-                               link = t.create('link', {rel : 'stylesheet', href : tinymce._addVer(u)});\r
+                                                                       // Find rule by pattern matching\r
+                                                                       if (!attrRule && validAttributePatterns) {\r
+                                                                               i = validAttributePatterns.length;\r
+                                                                               while (i--) {\r
+                                                                                       attrRule = validAttributePatterns[i];\r
+                                                                                       if (attrRule.pattern.test(name))\r
+                                                                                               break;\r
+                                                                               }\r
 \r
-                               // IE 8 has a bug where dynamically loading stylesheets would produce a 1 item remaining bug\r
-                               // This fix seems to resolve that issue by realcing the document ones a stylesheet finishes loading\r
-                               // It's ugly but it seems to work fine.\r
-                               if (isIE && d.documentMode && d.recalc) {\r
-                                       link.onload = function() {\r
-                                               d.recalc();\r
-                                               link.onload = null;\r
-                                       };\r
-                               }\r
+                                                                               // No rule matched\r
+                                                                               if (i === -1)\r
+                                                                                       attrRule = null;\r
+                                                                       }\r
 \r
-                               head.appendChild(link);\r
-                       });\r
-               },\r
+                                                                       // No attribute rule found\r
+                                                                       if (!attrRule)\r
+                                                                               return;\r
 \r
-               addClass : function(e, c) {\r
-                       return this.run(e, function(e) {\r
-                               var o;\r
+                                                                       // Validate value\r
+                                                                       if (attrRule.validValues && !(value in attrRule.validValues))\r
+                                                                               return;\r
+                                                               }\r
 \r
-                               if (!c)\r
-                                       return 0;\r
+                                                               // Add attribute to list and map\r
+                                                               attrList.map[name] = value;\r
+                                                               attrList.push({\r
+                                                                       name: name,\r
+                                                                       value: value\r
+                                                               });\r
+                                                       });\r
+                                               } else {\r
+                                                       attrList = [];\r
+                                                       attrList.map = {};\r
+                                               }\r
 \r
-                               if (this.hasClass(e, c))\r
-                                       return e.className;\r
+                                               // Process attributes if validation is enabled\r
+                                               if (validate && !isInternalElement) {\r
+                                                       attributesRequired = elementRule.attributesRequired;\r
+                                                       attributesDefault = elementRule.attributesDefault;\r
+                                                       attributesForced = elementRule.attributesForced;\r
+\r
+                                                       // Handle forced attributes\r
+                                                       if (attributesForced) {\r
+                                                               i = attributesForced.length;\r
+                                                               while (i--) {\r
+                                                                       attr = attributesForced[i];\r
+                                                                       name = attr.name;\r
+                                                                       attrValue = attr.value;\r
+\r
+                                                                       if (attrValue === '{$uid}')\r
+                                                                               attrValue = 'mce_' + idCount++;\r
+\r
+                                                                       attrList.map[name] = attrValue;\r
+                                                                       attrList.push({name: name, value: attrValue});\r
+                                                               }\r
+                                                       }\r
 \r
-                               o = this.removeClass(e, c);\r
+                                                       // Handle default attributes\r
+                                                       if (attributesDefault) {\r
+                                                               i = attributesDefault.length;\r
+                                                               while (i--) {\r
+                                                                       attr = attributesDefault[i];\r
+                                                                       name = attr.name;\r
 \r
-                               return e.className = (o != '' ? (o + ' ') : '') + c;\r
-                       });\r
-               },\r
+                                                                       if (!(name in attrList.map)) {\r
+                                                                               attrValue = attr.value;\r
 \r
-               removeClass : function(e, c) {\r
-                       var t = this, re;\r
+                                                                               if (attrValue === '{$uid}')\r
+                                                                                       attrValue = 'mce_' + idCount++;\r
 \r
-                       return t.run(e, function(e) {\r
-                               var v;\r
+                                                                               attrList.map[name] = attrValue;\r
+                                                                               attrList.push({name: name, value: attrValue});\r
+                                                                       }\r
+                                                               }\r
+                                                       }\r
 \r
-                               if (t.hasClass(e, c)) {\r
-                                       if (!re)\r
-                                               re = new RegExp("(^|\\s+)" + c + "(\\s+|$)", "g");\r
+                                                       // Handle required attributes\r
+                                                       if (attributesRequired) {\r
+                                                               i = attributesRequired.length;\r
+                                                               while (i--) {\r
+                                                                       if (attributesRequired[i] in attrList.map)\r
+                                                                               break;\r
+                                                               }\r
 \r
-                                       v = e.className.replace(re, ' ');\r
-                                       v = tinymce.trim(v != ' ' ? v : '');\r
+                                                               // None of the required attributes where found\r
+                                                               if (i === -1)\r
+                                                                       isValidElement = false;\r
+                                                       }\r
 \r
-                                       e.className = v;\r
+                                                       // Invalidate element if it's marked as bogus\r
+                                                       if (attrList.map['data-mce-bogus'])\r
+                                                               isValidElement = false;\r
+                                               }\r
 \r
-                                       // Empty class attr\r
-                                       if (!v) {\r
-                                               e.removeAttribute('class');\r
-                                               e.removeAttribute('className');\r
-                                       }\r
+                                               if (isValidElement)\r
+                                                       self.start(value, attrList, isShortEnded);\r
+                                       } else\r
+                                               isValidElement = false;\r
 \r
-                                       return v;\r
-                               }\r
+                                       // Treat script, noscript and style a bit different since they may include code that looks like elements\r
+                                       if (endRegExp = specialElements[value]) {\r
+                                               endRegExp.lastIndex = index = matches.index + matches[0].length;\r
 \r
-                               return e.className;\r
-                       });\r
-               },\r
+                                               if (matches = endRegExp.exec(html)) {\r
+                                                       if (isValidElement)\r
+                                                               text = html.substr(index, matches.index - index);\r
 \r
-               hasClass : function(n, c) {\r
-                       n = this.get(n);\r
-\r
-                       if (!n || !c)\r
-                               return false;\r
+                                                       index = matches.index + matches[0].length;\r
+                                               } else {\r
+                                                       text = html.substr(index);\r
+                                                       index = html.length;\r
+                                               }\r
 \r
-                       return (' ' + n.className + ' ').indexOf(' ' + c + ' ') !== -1;\r
-               },\r
+                                               if (isValidElement && text.length > 0)\r
+                                                       self.text(text, true);\r
 \r
-               show : function(e) {\r
-                       return this.setStyle(e, 'display', 'block');\r
-               },\r
+                                               if (isValidElement)\r
+                                                       self.end(value);\r
 \r
-               hide : function(e) {\r
-                       return this.setStyle(e, 'display', 'none');\r
-               },\r
+                                               tokenRegExp.lastIndex = index;\r
+                                               continue;\r
+                                       }\r
 \r
-               isHidden : function(e) {\r
-                       e = this.get(e);\r
+                                       // Push value on to stack\r
+                                       if (!isShortEnded) {\r
+                                               if (!attribsValue || attribsValue.indexOf('/') != attribsValue.length - 1)\r
+                                                       stack.push({name: value, valid: isValidElement});\r
+                                               else if (isValidElement)\r
+                                                       self.end(value);\r
+                                       }\r
+                               } else if (value = matches[1]) { // Comment\r
+                                       self.comment(value);\r
+                               } else if (value = matches[2]) { // CDATA\r
+                                       self.cdata(value);\r
+                               } else if (value = matches[3]) { // DOCTYPE\r
+                                       self.doctype(value);\r
+                               } else if (value = matches[4]) { // PI\r
+                                       self.pi(value, matches[5]);\r
+                               }\r
 \r
-                       return !e || e.style.display == 'none' || this.getStyle(e, 'display') == 'none';\r
-               },\r
+                               index = matches.index + matches[0].length;\r
+                       }\r
 \r
-               uniqueId : function(p) {\r
-                       return (!p ? 'mce_' : p) + (this.counter++);\r
-               },\r
+                       // Text\r
+                       if (index < html.length)\r
+                               self.text(decode(html.substr(index)));\r
 \r
-               setHTML : function(e, h) {\r
-                       var t = this;\r
+                       // Close any open elements\r
+                       for (i = stack.length - 1; i >= 0; i--) {\r
+                               value = stack[i];\r
 \r
-                       return this.run(e, function(e) {\r
-                               var x, i, nl, n, p, x;\r
+                               if (value.valid)\r
+                                       self.end(value.name);\r
+                       }\r
+               };\r
+       }\r
+})(tinymce);\r
 \r
-                               h = t.processHTML(h);\r
+(function(tinymce) {\r
+       var whiteSpaceRegExp = /^[ \t\r\n]*$/, typeLookup = {\r
+               '#text' : 3,\r
+               '#comment' : 8,\r
+               '#cdata' : 4,\r
+               '#pi' : 7,\r
+               '#doctype' : 10,\r
+               '#document-fragment' : 11\r
+       };\r
 \r
-                               if (isIE) {\r
-                                       function set() {\r
-                                               // Remove all child nodes\r
-                                               while (e.firstChild)\r
-                                                       e.firstChild.removeNode();\r
+       // Walks the tree left/right\r
+       function walk(node, root_node, prev) {\r
+               var sibling, parent, startName = prev ? 'lastChild' : 'firstChild', siblingName = prev ? 'prev' : 'next';\r
 \r
-                                               try {\r
-                                                       // IE will remove comments from the beginning\r
-                                                       // unless you padd the contents with something\r
-                                                       e.innerHTML = '<br />' + h;\r
-                                                       e.removeChild(e.firstChild);\r
-                                               } catch (ex) {\r
-                                                       // IE sometimes produces an unknown runtime error on innerHTML if it's an block element within a block element for example a div inside a p\r
-                                                       // This seems to fix this problem\r
-\r
-                                                       // Create new div with HTML contents and a BR infront to keep comments\r
-                                                       x = t.create('div');\r
-                                                       x.innerHTML = '<br />' + h;\r
-\r
-                                                       // Add all children from div to target\r
-                                                       each (x.childNodes, function(n, i) {\r
-                                                               // Skip br element\r
-                                                               if (i)\r
-                                                                       e.appendChild(n);\r
-                                                       });\r
-                                               }\r
-                                       };\r
+               // Walk into nodes if it has a start\r
+               if (node[startName])\r
+                       return node[startName];\r
 \r
-                                       // IE has a serious bug when it comes to paragraphs it can produce an invalid\r
-                                       // DOM tree if contents like this <p><ul><li>Item 1</li></ul></p> is inserted\r
-                                       // It seems to be that IE doesn't like a root block element placed inside another root block element\r
-                                       if (t.settings.fix_ie_paragraphs)\r
-                                               h = h.replace(/<p><\/p>|<p([^>]+)><\/p>|<p[^\/+]\/>/gi, '<p$1 _mce_keep="true">&nbsp;</p>');\r
+               // Return the sibling if it has one\r
+               if (node !== root_node) {\r
+                       sibling = node[siblingName];\r
 \r
-                                       set();\r
+                       if (sibling)\r
+                               return sibling;\r
 \r
-                                       if (t.settings.fix_ie_paragraphs) {\r
-                                               // Check for odd paragraphs this is a sign of a broken DOM\r
-                                               nl = e.getElementsByTagName("p");\r
-                                               for (i = nl.length - 1, x = 0; i >= 0; i--) {\r
-                                                       n = nl[i];\r
+                       // Walk up the parents to look for siblings\r
+                       for (parent = node.parent; parent && parent !== root_node; parent = parent.parent) {\r
+                               sibling = parent[siblingName];\r
 \r
-                                                       if (!n.hasChildNodes()) {\r
-                                                               if (!n._mce_keep) {\r
-                                                                       x = 1; // Is broken\r
-                                                                       break;\r
-                                                               }\r
+                               if (sibling)\r
+                                       return sibling;\r
+                       }\r
+               }\r
+       };\r
 \r
-                                                               n.removeAttribute('_mce_keep');\r
-                                                       }\r
-                                               }\r
-                                       }\r
+       function Node(name, type) {\r
+               this.name = name;\r
+               this.type = type;\r
 \r
-                                       // Time to fix the madness IE left us\r
-                                       if (x) {\r
-                                               // So if we replace the p elements with divs and mark them and then replace them back to paragraphs\r
-                                               // after we use innerHTML we can fix the DOM tree\r
-                                               h = h.replace(/<p ([^>]+)>|<p>/ig, '<div $1 _mce_tmp="1">');\r
-                                               h = h.replace(/<\/p>/gi, '</div>');\r
+               if (type === 1) {\r
+                       this.attributes = [];\r
+                       this.attributes.map = {};\r
+               }\r
+       }\r
 \r
-                                               // Set the new HTML with DIVs\r
-                                               set();\r
+       tinymce.extend(Node.prototype, {\r
+               replace : function(node) {\r
+                       var self = this;\r
 \r
-                                               // Replace all DIV elements with the _mce_tmp attibute back to paragraphs\r
-                                               // This is needed since IE has a annoying bug see above for details\r
-                                               // This is a slow process but it has to be done. :(\r
-                                               if (t.settings.fix_ie_paragraphs) {\r
-                                                       nl = e.getElementsByTagName("DIV");\r
-                                                       for (i = nl.length - 1; i >= 0; i--) {\r
-                                                               n = nl[i];\r
+                       if (node.parent)\r
+                               node.remove();\r
 \r
-                                                               // Is it a temp div\r
-                                                               if (n._mce_tmp) {\r
-                                                                       // Create new paragraph\r
-                                                                       p = t.doc.createElement('p');\r
+                       self.insert(node, self);\r
+                       self.remove();\r
 \r
-                                                                       // Copy all attributes\r
-                                                                       n.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi, function(a, b) {\r
-                                                                               var v;\r
+                       return self;\r
+               },\r
 \r
-                                                                               if (b !== '_mce_tmp') {\r
-                                                                                       v = n.getAttribute(b);\r
+               attr : function(name, value) {\r
+                       var self = this, attrs, i, undef;\r
 \r
-                                                                                       if (!v && b === 'class')\r
-                                                                                               v = n.className;\r
+                       if (typeof name !== "string") {\r
+                               for (i in name)\r
+                                       self.attr(i, name[i]);\r
 \r
-                                                                                       p.setAttribute(b, v);\r
-                                                                               }\r
-                                                                       });\r
+                               return self;\r
+                       }\r
 \r
-                                                                       // Append all children to new paragraph\r
-                                                                       for (x = 0; x<n.childNodes.length; x++)\r
-                                                                               p.appendChild(n.childNodes[x].cloneNode(true));\r
+                       if (attrs = self.attributes) {\r
+                               if (value !== undef) {\r
+                                       // Remove attribute\r
+                                       if (value === null) {\r
+                                               if (name in attrs.map) {\r
+                                                       delete attrs.map[name];\r
 \r
-                                                                       // Replace div with new paragraph\r
-                                                                       n.swapNode(p);\r
+                                                       i = attrs.length;\r
+                                                       while (i--) {\r
+                                                               if (attrs[i].name === name) {\r
+                                                                       attrs = attrs.splice(i, 1);\r
+                                                                       return self;\r
                                                                }\r
                                                        }\r
                                                }\r
-                                       }\r
-                               } else\r
-                                       e.innerHTML = h;\r
 \r
-                               return h;\r
-                       });\r
-               },\r
+                                               return self;\r
+                                       }\r
 \r
-               processHTML : function(h) {\r
-                       var t = this, s = t.settings, codeBlocks = [];\r
+                                       // Set attribute\r
+                                       if (name in attrs.map) {\r
+                                               // Set attribute\r
+                                               i = attrs.length;\r
+                                               while (i--) {\r
+                                                       if (attrs[i].name === name) {\r
+                                                               attrs[i].value = value;\r
+                                                               break;\r
+                                                       }\r
+                                               }\r
+                                       } else\r
+                                               attrs.push({name: name, value: value});\r
 \r
-                       if (!s.process_html)\r
-                               return h;\r
+                                       attrs.map[name] = value;\r
 \r
-                       if (isIE) {\r
-                               h = h.replace(/&apos;/g, '&#39;'); // IE can't handle apos\r
-                               h = h.replace(/\s+(disabled|checked|readonly|selected)\s*=\s*[\"\']?(false|0)[\"\']?/gi, ''); // IE doesn't handle default values correct\r
+                                       return self;\r
+                               } else {\r
+                                       return attrs.map[name];\r
+                               }\r
                        }\r
+               },\r
 \r
-                       // Force tags open, and on IE9 replace $1$2 that got left behind due to bugs in their RegExp engine\r
-                       h = tinymce._replace(/<a( )([^>]+)\/>|<a\/>/gi, '<a$1$2></a>', h); // Force open\r
-\r
-                       // Store away src and href in _mce_src and mce_href since browsers mess them up\r
-                       if (s.keep_values) {\r
-                               // Wrap scripts and styles in comments for serialization purposes\r
-                               if (/<script|noscript|style/i.test(h)) {\r
-                                       function trim(s) {\r
-                                               // Remove prefix and suffix code for element\r
-                                               s = s.replace(/(<!--\[CDATA\[|\]\]-->)/g, '\n');\r
-                                               s = s.replace(/^[\r\n]*|[\r\n]*$/g, '');\r
-                                               s = s.replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g, '');\r
-                                               s = s.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g, '');\r
-\r
-                                               return s;\r
-                                       };\r
-\r
-                                       // Wrap the script contents in CDATA and keep them from executing\r
-                                       h = h.replace(/<script([^>]+|)>([\s\S]*?)<\/script>/gi, function(v, attribs, text) {\r
-                                               // Force type attribute\r
-                                               if (!attribs)\r
-                                                       attribs = ' type="text/javascript"';\r
-\r
-                                               // Convert the src attribute of the scripts\r
-                                               attribs = attribs.replace(/src=\"([^\"]+)\"?/i, function(a, url) {\r
-                                                       if (s.url_converter)\r
-                                                               url = t.encode(s.url_converter.call(s.url_converter_scope || t, t.decode(url), 'src', 'script'));\r
+               clone : function() {\r
+                       var self = this, clone = new Node(self.name, self.type), i, l, selfAttrs, selfAttr, cloneAttrs;\r
 \r
-                                                       return '_mce_src="' + url + '"';\r
-                                               });\r
+                       // Clone element attributes\r
+                       if (selfAttrs = self.attributes) {\r
+                               cloneAttrs = [];\r
+                               cloneAttrs.map = {};\r
 \r
-                                               // Wrap text contents\r
-                                               if (tinymce.trim(text)) {\r
-                                                       codeBlocks.push(trim(text));\r
-                                                       text = '<!--\nMCE_SCRIPT:' + (codeBlocks.length - 1) + '\n// -->';\r
-                                               }\r
+                               for (i = 0, l = selfAttrs.length; i < l; i++) {\r
+                                       selfAttr = selfAttrs[i];\r
 \r
-                                               return '<mce:script' + attribs + '>' + text + '</mce:script>';\r
-                                       });\r
+                                       // Clone everything except id\r
+                                       if (selfAttr.name !== 'id') {\r
+                                               cloneAttrs[cloneAttrs.length] = {name: selfAttr.name, value: selfAttr.value};\r
+                                               cloneAttrs.map[selfAttr.name] = selfAttr.value;\r
+                                       }\r
+                               }\r
 \r
-                                       // Wrap style elements\r
-                                       h = h.replace(/<style([^>]+|)>([\s\S]*?)<\/style>/gi, function(v, attribs, text) {\r
-                                               // Wrap text contents\r
-                                               if (text) {\r
-                                                       codeBlocks.push(trim(text));\r
-                                                       text = '<!--\nMCE_SCRIPT:' + (codeBlocks.length - 1) + '\n-->';\r
-                                               }\r
+                               clone.attributes = cloneAttrs;\r
+                       }\r
 \r
-                                               return '<mce:style' + attribs + '>' + text + '</mce:style><style ' + attribs + ' _mce_bogus="1">' + text + '</style>';\r
-                                       });\r
+                       clone.value = self.value;\r
+                       clone.shortEnded = self.shortEnded;\r
 \r
-                                       // Wrap noscript elements\r
-                                       h = h.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g, function(v, attribs, text) {\r
-                                               return '<mce:noscript' + attribs + '><!--' + t.encode(text).replace(/--/g, '&#45;&#45;') + '--></mce:noscript>';\r
-                                       });\r
-                               }\r
+                       return clone;\r
+               },\r
 \r
-                               h = tinymce._replace(/<!\[CDATA\[([\s\S]+)\]\]>/g, '<!--[CDATA[$1]]-->', h);\r
+               wrap : function(wrapper) {\r
+                       var self = this;\r
 \r
-                               // This function processes the attributes in the HTML string to force boolean\r
-                               // attributes to the attr="attr" format and convert style, src and href to _mce_ versions\r
-                               function processTags(html) {\r
-                                       return html.replace(tagRegExp, function(match, elm_name, attrs, end) {\r
-                                               return '<' + elm_name + attrs.replace(attrRegExp, function(match, name, value, val2, val3) {\r
-                                                       var mceValue;\r
+                       self.parent.insert(wrapper, self);\r
+                       wrapper.append(self);\r
 \r
-                                                       name = name.toLowerCase();\r
-                                                       value = value || val2 || val3 || "";\r
+                       return self;\r
+               },\r
 \r
-                                                       // Treat boolean attributes\r
-                                                       if (boolAttrs[name]) {\r
-                                                               // false or 0 is treated as a missing attribute\r
-                                                               if (value === 'false' || value === '0')\r
-                                                                       return;\r
+               unwrap : function() {\r
+                       var self = this, node, next;\r
 \r
-                                                               return name + '="' + name + '"';\r
-                                                       }\r
+                       for (node = self.firstChild; node; ) {\r
+                               next = node.next;\r
+                               self.insert(node, self, true);\r
+                               node = next;\r
+                       }\r
 \r
-                                                       // Is attribute one that needs special treatment\r
-                                                       if (mceAttribs[name] && attrs.indexOf('_mce_' + name) == -1) {\r
-                                                               mceValue = t.decode(value);\r
+                       self.remove();\r
+               },\r
 \r
-                                                               // Convert URLs to relative/absolute ones\r
-                                                               if (s.url_converter && (name == "src" || name == "href"))\r
-                                                                       mceValue = s.url_converter.call(s.url_converter_scope || t, mceValue, name, elm_name);\r
+               remove : function() {\r
+                       var self = this, parent = self.parent, next = self.next, prev = self.prev;\r
 \r
-                                                               // Process styles lowercases them and compresses them\r
-                                                               if (name == 'style')\r
-                                                                       mceValue = t.serializeStyle(t.parseStyle(mceValue), name);\r
+                       if (parent) {\r
+                               if (parent.firstChild === self) {\r
+                                       parent.firstChild = next;\r
 \r
-                                                               return name + '="' + value + '"' + ' _mce_' + name + '="' + t.encode(mceValue) + '"';\r
-                                                       }\r
+                                       if (next)\r
+                                               next.prev = null;\r
+                               } else {\r
+                                       prev.next = next;\r
+                               }\r
 \r
-                                                       return match;\r
-                                               }) + end + '>';\r
-                                       });\r
-                               };\r
+                               if (parent.lastChild === self) {\r
+                                       parent.lastChild = prev;\r
 \r
-                               h = processTags(h);\r
+                                       if (prev)\r
+                                               prev.next = null;\r
+                               } else {\r
+                                       next.prev = prev;\r
+                               }\r
 \r
-                               // Restore script blocks\r
-                               h = h.replace(/MCE_SCRIPT:([0-9]+)/g, function(val, idx) {\r
-                                       return codeBlocks[idx];\r
-                               });\r
+                               self.parent = self.next = self.prev = null;\r
                        }\r
 \r
-                       return h;\r
+                       return self;\r
                },\r
 \r
-               getOuterHTML : function(e) {\r
-                       var d;\r
-\r
-                       e = this.get(e);\r
+               append : function(node) {\r
+                       var self = this, last;\r
 \r
-                       if (!e)\r
-                               return null;\r
+                       if (node.parent)\r
+                               node.remove();\r
 \r
-                       if (e.outerHTML !== undefined)\r
-                               return e.outerHTML;\r
+                       last = self.lastChild;\r
+                       if (last) {\r
+                               last.next = node;\r
+                               node.prev = last;\r
+                               self.lastChild = node;\r
+                       } else\r
+                               self.lastChild = self.firstChild = node;\r
 \r
-                       d = (e.ownerDocument || this.doc).createElement("body");\r
-                       d.appendChild(e.cloneNode(true));\r
+                       node.parent = self;\r
 \r
-                       return d.innerHTML;\r
+                       return node;\r
                },\r
 \r
-               setOuterHTML : function(e, h, d) {\r
-                       var t = this;\r
+               insert : function(node, ref_node, before) {\r
+                       var parent;\r
 \r
-                       function setHTML(e, h, d) {\r
-                               var n, tp;\r
+                       if (node.parent)\r
+                               node.remove();\r
 \r
-                               tp = d.createElement("body");\r
-                               tp.innerHTML = h;\r
+                       parent = ref_node.parent || this;\r
 \r
-                               n = tp.lastChild;\r
-                               while (n) {\r
-                                       t.insertAfter(n.cloneNode(true), e);\r
-                                       n = n.previousSibling;\r
-                               }\r
+                       if (before) {\r
+                               if (ref_node === parent.firstChild)\r
+                                       parent.firstChild = node;\r
+                               else\r
+                                       ref_node.prev.next = node;\r
 \r
-                               t.remove(e);\r
-                       };\r
+                               node.prev = ref_node.prev;\r
+                               node.next = ref_node;\r
+                               ref_node.prev = node;\r
+                       } else {\r
+                               if (ref_node === parent.lastChild)\r
+                                       parent.lastChild = node;\r
+                               else\r
+                                       ref_node.next.prev = node;\r
 \r
-                       return this.run(e, function(e) {\r
-                               e = t.get(e);\r
+                               node.next = ref_node.next;\r
+                               node.prev = ref_node;\r
+                               ref_node.next = node;\r
+                       }\r
 \r
-                               // Only set HTML on elements\r
-                               if (e.nodeType == 1) {\r
-                                       d = d || e.ownerDocument || t.doc;\r
+                       node.parent = parent;\r
 \r
-                                       if (isIE) {\r
-                                               try {\r
-                                                       // Try outerHTML for IE it sometimes produces an unknown runtime error\r
-                                                       if (isIE && e.nodeType == 1)\r
-                                                               e.outerHTML = h;\r
-                                                       else\r
-                                                               setHTML(e, h, d);\r
-                                               } catch (ex) {\r
-                                                       // Fix for unknown runtime error\r
-                                                       setHTML(e, h, d);\r
-                                               }\r
-                                       } else\r
-                                               setHTML(e, h, d);\r
-                               }\r
-                       });\r
+                       return node;\r
                },\r
 \r
-               decode : function(s) {\r
-                       var e, n, v;\r
-\r
-                       // Look for entities to decode\r
-                       if (/&[\w#]+;/.test(s)) {\r
-                               // Decode the entities using a div element not super efficient but less code\r
-                               e = this.doc.createElement("div");\r
-                               e.innerHTML = s;\r
-                               n = e.firstChild;\r
-                               v = '';\r
-\r
-                               if (n) {\r
-                                       do {\r
-                                               v += n.nodeValue;\r
-                                       } while (n = n.nextSibling);\r
-                               }\r
+               getAll : function(name) {\r
+                       var self = this, node, collection = [];\r
 \r
-                               return v || s;\r
+                       for (node = self.firstChild; node; node = walk(node, self)) {\r
+                               if (node.name === name)\r
+                                       collection.push(node);\r
                        }\r
 \r
-                       return s;\r
+                       return collection;\r
                },\r
 \r
-               encode : function(str) {\r
-                       return ('' + str).replace(encodeCharsRe, function(chr) {\r
-                               return encodedChars[chr];\r
-                       });\r
-               },\r
+               empty : function() {\r
+                       var self = this, nodes, i, node;\r
 \r
-               insertAfter : function(node, reference_node) {\r
-                       reference_node = this.get(reference_node);\r
+                       // Remove all children\r
+                       if (self.firstChild) {\r
+                               nodes = [];\r
 \r
-                       return this.run(node, function(node) {\r
-                               var parent, nextSibling;\r
+                               // Collect the children\r
+                               for (node = self.firstChild; node; node = walk(node, self))\r
+                                       nodes.push(node);\r
 \r
-                               parent = reference_node.parentNode;\r
-                               nextSibling = reference_node.nextSibling;\r
+                               // Remove the children\r
+                               i = nodes.length;\r
+                               while (i--) {\r
+                                       node = nodes[i];\r
+                                       node.parent = node.firstChild = node.lastChild = node.next = node.prev = null;\r
+                               }\r
+                       }\r
 \r
-                               if (nextSibling)\r
-                                       parent.insertBefore(node, nextSibling);\r
-                               else\r
-                                       parent.appendChild(node);\r
+                       self.firstChild = self.lastChild = null;\r
 \r
-                               return node;\r
-                       });\r
+                       return self;\r
                },\r
 \r
-               isBlock : function(n) {\r
-                       if (n.nodeType && n.nodeType !== 1)\r
-                               return false;\r
-\r
-                       n = n.nodeName || n;\r
+               isEmpty : function(elements) {\r
+                       var self = this, node = self.firstChild, i, name;\r
 \r
-                       return blockRe.test(n);\r
-               },\r
+                       if (node) {\r
+                               do {\r
+                                       if (node.type === 1) {\r
+                                               // Ignore bogus elements\r
+                                               if (node.attributes.map['data-mce-bogus'])\r
+                                                       continue;\r
 \r
-               replace : function(n, o, k) {\r
-                       var t = this;\r
+                                               // Keep empty elements like <img />\r
+                                               if (elements[node.name])\r
+                                                       return false;\r
 \r
-                       if (is(o, 'array'))\r
-                               n = n.cloneNode(true);\r
+                                               // Keep elements with data attributes or name attribute like <a name="1"></a>\r
+                                               i = node.attributes.length;\r
+                                               while (i--) {\r
+                                                       name = node.attributes[i].name;\r
+                                                       if (name === "name" || name.indexOf('data-') === 0)\r
+                                                               return false;\r
+                                               }\r
+                                       }\r
 \r
-                       return t.run(o, function(o) {\r
-                               if (k) {\r
-                                       each(tinymce.grep(o.childNodes), function(c) {\r
-                                               n.appendChild(c);\r
-                                       });\r
-                               }\r
+                                       // Keep non whitespace text nodes\r
+                                       if ((node.type === 3 && !whiteSpaceRegExp.test(node.value)))\r
+                                               return false;\r
+                               } while (node = walk(node, self));\r
+                       }\r
 \r
-                               return o.parentNode.replaceChild(n, o);\r
-                       });\r
+                       return true;\r
                },\r
 \r
-               rename : function(elm, name) {\r
-                       var t = this, newElm;\r
+               walk : function(prev) {\r
+                       return walk(this, null, prev);\r
+               }\r
+       });\r
 \r
-                       if (elm.nodeName != name.toUpperCase()) {\r
-                               // Rename block element\r
-                               newElm = t.create(name);\r
+       tinymce.extend(Node, {\r
+               create : function(name, attrs) {\r
+                       var node, attrName;\r
 \r
-                               // Copy attribs to new block\r
-                               each(t.getAttribs(elm), function(attr_node) {\r
-                                       t.setAttrib(newElm, attr_node.nodeName, t.getAttrib(elm, attr_node.nodeName));\r
-                               });\r
+                       // Create node\r
+                       node = new Node(name, typeLookup[name] || 1);\r
 \r
-                               // Replace block\r
-                               t.replace(newElm, elm, 1);\r
+                       // Add attributes if needed\r
+                       if (attrs) {\r
+                               for (attrName in attrs)\r
+                                       node.attr(attrName, attrs[attrName]);\r
                        }\r
 \r
-                       return newElm || elm;\r
-               },\r
+                       return node;\r
+               }\r
+       });\r
 \r
-               findCommonAncestor : function(a, b) {\r
-                       var ps = a, pe;\r
+       tinymce.html.Node = Node;\r
+})(tinymce);\r
 \r
-                       while (ps) {\r
-                               pe = b;\r
+(function(tinymce) {\r
+       var Node = tinymce.html.Node;\r
 \r
-                               while (pe && ps != pe)\r
-                                       pe = pe.parentNode;\r
+       tinymce.html.DomParser = function(settings, schema) {\r
+               var self = this, nodeFilters = {}, attributeFilters = [], matchedNodes = {}, matchedAttributes = {};\r
 \r
-                               if (ps == pe)\r
-                                       break;\r
+               settings = settings || {};\r
+               settings.validate = "validate" in settings ? settings.validate : true;\r
+               settings.root_name = settings.root_name || 'body';\r
+               self.schema = schema = schema || new tinymce.html.Schema();\r
 \r
-                               ps = ps.parentNode;\r
-                       }\r
+               function fixInvalidChildren(nodes) {\r
+                       var ni, node, parent, parents, newParent, currentNode, tempNode, childNode, i,\r
+                               childClone, nonEmptyElements, nonSplitableElements, sibling, nextNode;\r
 \r
-                       if (!ps && a.ownerDocument)\r
-                               return a.ownerDocument.documentElement;\r
+                       nonSplitableElements = tinymce.makeMap('tr,td,th,tbody,thead,tfoot,table');\r
+                       nonEmptyElements = schema.getNonEmptyElements();\r
 \r
-                       return ps;\r
-               },\r
+                       for (ni = 0; ni < nodes.length; ni++) {\r
+                               node = nodes[ni];\r
 \r
-               toHex : function(s) {\r
-                       var c = /^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(s);\r
+                               // Already removed\r
+                               if (!node.parent)\r
+                                       continue;\r
 \r
-                       function hex(s) {\r
-                               s = parseInt(s).toString(16);\r
+                               // Get list of all parent nodes until we find a valid parent to stick the child into\r
+                               parents = [node];\r
+                               for (parent = node.parent; parent && !schema.isValidChild(parent.name, node.name) && !nonSplitableElements[parent.name]; parent = parent.parent)\r
+                                       parents.push(parent);\r
 \r
-                               return s.length > 1 ? s : '0' + s; // 0 -> 00\r
-                       };\r
+                               // Found a suitable parent\r
+                               if (parent && parents.length > 1) {\r
+                                       // Reverse the array since it makes looping easier\r
+                                       parents.reverse();\r
 \r
-                       if (c) {\r
-                               s = '#' + hex(c[1]) + hex(c[2]) + hex(c[3]);\r
+                                       // Clone the related parent and insert that after the moved node\r
+                                       newParent = currentNode = self.filterNode(parents[0].clone());\r
 \r
-                               return s;\r
-                       }\r
+                                       // Start cloning and moving children on the left side of the target node\r
+                                       for (i = 0; i < parents.length - 1; i++) {\r
+                                               if (schema.isValidChild(currentNode.name, parents[i].name)) {\r
+                                                       tempNode = self.filterNode(parents[i].clone());\r
+                                                       currentNode.append(tempNode);\r
+                                               } else\r
+                                                       tempNode = currentNode;\r
 \r
-                       return s;\r
-               },\r
+                                               for (childNode = parents[i].firstChild; childNode && childNode != parents[i + 1]; ) {\r
+                                                       nextNode = childNode.next;\r
+                                                       tempNode.append(childNode);\r
+                                                       childNode = nextNode;\r
+                                               }\r
 \r
-               getClasses : function() {\r
-                       var t = this, cl = [], i, lo = {}, f = t.settings.class_filter, ov;\r
+                                               currentNode = tempNode;\r
+                                       }\r
 \r
-                       if (t.classes)\r
-                               return t.classes;\r
+                                       if (!newParent.isEmpty(nonEmptyElements)) {\r
+                                               parent.insert(newParent, parents[0], true);\r
+                                               parent.insert(node, newParent);\r
+                                       } else {\r
+                                               parent.insert(node, parents[0], true);\r
+                                       }\r
 \r
-                       function addClasses(s) {\r
-                               // IE style imports\r
-                               each(s.imports, function(r) {\r
-                                       addClasses(r);\r
-                               });\r
-\r
-                               each(s.cssRules || s.rules, function(r) {\r
-                                       // Real type or fake it on IE\r
-                                       switch (r.type || 1) {\r
-                                               // Rule\r
-                                               case 1:\r
-                                                       if (r.selectorText) {\r
-                                                               each(r.selectorText.split(','), function(v) {\r
-                                                                       v = v.replace(/^\s*|\s*$|^\s\./g, "");\r
+                                       // Check if the element is empty by looking through it's contents and special treatment for <p><br /></p>\r
+                                       parent = parents[0];\r
+                                       if (parent.isEmpty(nonEmptyElements) || parent.firstChild === parent.lastChild && parent.firstChild.name === 'br') {\r
+                                               parent.empty().remove();\r
+                                       }\r
+                               } else if (node.parent) {\r
+                                       // If it's an LI try to find a UL/OL for it or wrap it\r
+                                       if (node.name === 'li') {\r
+                                               sibling = node.prev;\r
+                                               if (sibling && (sibling.name === 'ul' || sibling.name === 'ul')) {\r
+                                                       sibling.append(node);\r
+                                                       continue;\r
+                                               }\r
 \r
-                                                                       // Is internal or it doesn't contain a class\r
-                                                                       if (/\.mce/.test(v) || !/\.[\w\-]+$/.test(v))\r
-                                                                               return;\r
+                                               sibling = node.next;\r
+                                               if (sibling && (sibling.name === 'ul' || sibling.name === 'ul')) {\r
+                                                       sibling.insert(node, sibling.firstChild, true);\r
+                                                       continue;\r
+                                               }\r
 \r
-                                                                       // Remove everything but class name\r
-                                                                       ov = v;\r
-                                                                       v = tinymce._replace(/.*\.([a-z0-9_\-]+).*/i, '$1', v);\r
+                                               node.wrap(self.filterNode(new Node('ul', 1)));\r
+                                               continue;\r
+                                       }\r
 \r
-                                                                       // Filter classes\r
-                                                                       if (f && !(v = f(v, ov)))\r
-                                                                               return;\r
+                                       // Try wrapping the element in a DIV\r
+                                       if (schema.isValidChild(node.parent.name, 'div') && schema.isValidChild('div', node.name)) {\r
+                                               node.wrap(self.filterNode(new Node('div', 1)));\r
+                                       } else {\r
+                                               // We failed wrapping it, then remove or unwrap it\r
+                                               if (node.name === 'style' || node.name === 'script')\r
+                                                       node.empty().remove();\r
+                                               else\r
+                                                       node.unwrap();\r
+                                       }\r
+                               }\r
+                       }\r
+               };\r
 \r
-                                                                       if (!lo[v]) {\r
-                                                                               cl.push({'class' : v});\r
-                                                                               lo[v] = 1;\r
-                                                                       }\r
-                                                               });\r
-                                                       }\r
-                                                       break;\r
+               self.filterNode = function(node) {\r
+                       var i, name, list;\r
 \r
-                                               // Import\r
-                                               case 3:\r
-                                                       addClasses(r.styleSheet);\r
-                                                       break;\r
-                                       }\r
-                               });\r
-                       };\r
+                       // Run element filters\r
+                       if (name in nodeFilters) {\r
+                               list = matchedNodes[name];\r
 \r
-                       try {\r
-                               each(t.doc.styleSheets, addClasses);\r
-                       } catch (ex) {\r
-                               // Ignore\r
+                               if (list)\r
+                                       list.push(node);\r
+                               else\r
+                                       matchedNodes[name] = [node];\r
                        }\r
 \r
-                       if (cl.length > 0)\r
-                               t.classes = cl;\r
+                       // Run attribute filters\r
+                       i = attributeFilters.length;\r
+                       while (i--) {\r
+                               name = attributeFilters[i].name;\r
 \r
-                       return cl;\r
-               },\r
+                               if (name in node.attributes.map) {\r
+                                       list = matchedAttributes[name];\r
 \r
-               run : function(e, f, s) {\r
-                       var t = this, o;\r
+                                       if (list)\r
+                                               list.push(node);\r
+                                       else\r
+                                               matchedAttributes[name] = [node];\r
+                               }\r
+                       }\r
 \r
-                       if (t.doc && typeof(e) === 'string')\r
-                               e = t.get(e);\r
+                       return node;\r
+               };\r
 \r
-                       if (!e)\r
-                               return false;\r
+               self.addNodeFilter = function(name, callback) {\r
+                       tinymce.each(tinymce.explode(name), function(name) {\r
+                               var list = nodeFilters[name];\r
 \r
-                       s = s || this;\r
-                       if (!e.nodeType && (e.length || e.length === 0)) {\r
-                               o = [];\r
+                               if (!list)\r
+                                       nodeFilters[name] = list = [];\r
 \r
-                               each(e, function(e, i) {\r
-                                       if (e) {\r
-                                               if (typeof(e) == 'string')\r
-                                                       e = t.doc.getElementById(e);\r
+                               list.push(callback);\r
+                       });\r
+               };\r
 \r
-                                               o.push(f.call(s, e, i));\r
+               self.addAttributeFilter = function(name, callback) {\r
+                       tinymce.each(tinymce.explode(name), function(name) {\r
+                               var i;\r
+\r
+                               for (i = 0; i < attributeFilters.length; i++) {\r
+                                       if (attributeFilters[i].name === name) {\r
+                                               attributeFilters[i].callbacks.push(callback);\r
+                                               return;\r
                                        }\r
-                               });\r
+                               }\r
 \r
-                               return o;\r
-                       }\r
+                               attributeFilters.push({name: name, callbacks: [callback]});\r
+                       });\r
+               };\r
 \r
-                       return f.call(s, e);\r
-               },\r
+               self.parse = function(html, args) {\r
+                       var parser, rootNode, node, nodes, i, l, fi, fl, list, name, validate,\r
+                               blockElements, startWhiteSpaceRegExp, invalidChildren = [],\r
+                               endWhiteSpaceRegExp, allWhiteSpaceRegExp, whiteSpaceElements, children, nonEmptyElements, rootBlockName;\r
+\r
+                       args = args || {};\r
+                       matchedNodes = {};\r
+                       matchedAttributes = {};\r
+                       blockElements = tinymce.extend(tinymce.makeMap('script,style,head,html,body,title,meta,param'), schema.getBlockElements());\r
+                       nonEmptyElements = schema.getNonEmptyElements();\r
+                       children = schema.children;\r
+                       validate = settings.validate;\r
+                       rootBlockName = "forced_root_block" in args ? args.forced_root_block : settings.forced_root_block;\r
+\r
+                       whiteSpaceElements = schema.getWhiteSpaceElements();\r
+                       startWhiteSpaceRegExp = /^[ \t\r\n]+/;\r
+                       endWhiteSpaceRegExp = /[ \t\r\n]+$/;\r
+                       allWhiteSpaceRegExp = /[ \t\r\n]+/g;\r
+\r
+                       function addRootBlocks() {\r
+                               var node = rootNode.firstChild, next, rootBlockNode;\r
+\r
+                               while (node) {\r
+                                       next = node.next;\r
+\r
+                                       if (node.type == 3 || (node.type == 1 && node.name !== 'p' && !blockElements[node.name] && !node.attr('data-mce-type'))) {\r
+                                               if (!rootBlockNode) {\r
+                                                       // Create a new root block element\r
+                                                       rootBlockNode = createNode(rootBlockName, 1);\r
+                                                       rootNode.insert(rootBlockNode, node);\r
+                                                       rootBlockNode.append(node);\r
+                                               } else\r
+                                                       rootBlockNode.append(node);\r
+                                       } else {\r
+                                               rootBlockNode = null;\r
+                                       }\r
 \r
-               getAttribs : function(n) {\r
-                       var o;\r
+                                       node = next;\r
+                               };\r
+                       };\r
 \r
-                       n = this.get(n);\r
+                       function createNode(name, type) {\r
+                               var node = new Node(name, type), list;\r
 \r
-                       if (!n)\r
-                               return [];\r
+                               if (name in nodeFilters) {\r
+                                       list = matchedNodes[name];\r
 \r
-                       if (isIE) {\r
-                               o = [];\r
+                                       if (list)\r
+                                               list.push(node);\r
+                                       else\r
+                                               matchedNodes[name] = [node];\r
+                               }\r
 \r
-                               // Object will throw exception in IE\r
-                               if (n.nodeName == 'OBJECT')\r
-                                       return n.attributes;\r
+                               return node;\r
+                       };\r
 \r
-                               // IE doesn't keep the selected attribute if you clone option elements\r
-                               if (n.nodeName === 'OPTION' && this.getAttrib(n, 'selected'))\r
-                                       o.push({specified : 1, nodeName : 'selected'});\r
+                       function removeWhitespaceBefore(node) {\r
+                               var textNode, textVal, sibling;\r
 \r
-                               // It's crazy that this is faster in IE but it's because it returns all attributes all the time\r
-                               n.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi, '').replace(/[\w:\-]+/gi, function(a) {\r
-                                       o.push({specified : 1, nodeName : a});\r
-                               });\r
+                               for (textNode = node.prev; textNode && textNode.type === 3; ) {\r
+                                       textVal = textNode.value.replace(endWhiteSpaceRegExp, '');\r
 \r
-                               return o;\r
-                       }\r
+                                       if (textVal.length > 0) {\r
+                                               textNode.value = textVal;\r
+                                               textNode = textNode.prev;\r
+                                       } else {\r
+                                               sibling = textNode.prev;\r
+                                               textNode.remove();\r
+                                               textNode = sibling;\r
+                                       }\r
+                               }\r
+                       };\r
 \r
-                       return n.attributes;\r
-               },\r
+                       parser = new tinymce.html.SaxParser({\r
+                               validate : validate,\r
+                               fix_self_closing : !validate, // Let the DOM parser handle <li> in <li> or <p> in <p> for better results\r
 \r
-               destroy : function(s) {\r
-                       var t = this;\r
+                               cdata: function(text) {\r
+                                       node.append(createNode('#cdata', 4)).value = text;\r
+                               },\r
 \r
-                       if (t.events)\r
-                               t.events.destroy();\r
+                               text: function(text, raw) {\r
+                                       var textNode;\r
 \r
-                       t.win = t.doc = t.root = t.events = null;\r
+                                       // Trim all redundant whitespace on non white space elements\r
+                                       if (!whiteSpaceElements[node.name]) {\r
+                                               text = text.replace(allWhiteSpaceRegExp, ' ');\r
 \r
-                       // Manual destroy then remove unload handler\r
-                       if (!s)\r
-                               tinymce.removeUnload(t.destroy);\r
-               },\r
+                                               if (node.lastChild && blockElements[node.lastChild.name])\r
+                                                       text = text.replace(startWhiteSpaceRegExp, '');\r
+                                       }\r
 \r
-               createRng : function() {\r
-                       var d = this.doc;\r
+                                       // Do we need to create the node\r
+                                       if (text.length !== 0) {\r
+                                               textNode = createNode('#text', 3);\r
+                                               textNode.raw = !!raw;\r
+                                               node.append(textNode).value = text;\r
+                                       }\r
+                               },\r
 \r
-                       return d.createRange ? d.createRange() : new tinymce.dom.Range(this);\r
-               },\r
+                               comment: function(text) {\r
+                                       node.append(createNode('#comment', 8)).value = text;\r
+                               },\r
 \r
-               nodeIndex : function(node, normalized) {\r
-                       var idx = 0, lastNodeType, lastNode, nodeType;\r
+                               pi: function(name, text) {\r
+                                       node.append(createNode(name, 7)).value = text;\r
+                                       removeWhitespaceBefore(node);\r
+                               },\r
 \r
-                       if (node) {\r
-                               for (lastNodeType = node.nodeType, node = node.previousSibling, lastNode = node; node; node = node.previousSibling) {\r
-                                       nodeType = node.nodeType;\r
+                               doctype: function(text) {\r
+                                       var newNode;\r
+               \r
+                                       newNode = node.append(createNode('#doctype', 10));\r
+                                       newNode.value = text;\r
+                                       removeWhitespaceBefore(node);\r
+                               },\r
 \r
-                                       // Normalize text nodes\r
-                                       if (normalized && nodeType == 3) {\r
-                                               if (nodeType == lastNodeType || !node.nodeValue.length)\r
-                                                       continue;\r
-                                       }\r
+                               start: function(name, attrs, empty) {\r
+                                       var newNode, attrFiltersLen, elementRule, textNode, attrName, text, sibling, parent;\r
 \r
-                                       idx++;\r
-                                       lastNodeType = nodeType;\r
-                               }\r
-                       }\r
+                                       elementRule = validate ? schema.getElementRule(name) : {};\r
+                                       if (elementRule) {\r
+                                               newNode = createNode(elementRule.outputName || name, 1);\r
+                                               newNode.attributes = attrs;\r
+                                               newNode.shortEnded = empty;\r
 \r
-                       return idx;\r
-               },\r
+                                               node.append(newNode);\r
 \r
-               split : function(pe, e, re) {\r
-                       var t = this, r = t.createRng(), bef, aft, pa;\r
+                                               // Check if node is valid child of the parent node is the child is\r
+                                               // unknown we don't collect it since it's probably a custom element\r
+                                               parent = children[node.name];\r
+                                               if (parent && children[newNode.name] && !parent[newNode.name])\r
+                                                       invalidChildren.push(newNode);\r
 \r
-                       // W3C valid browsers tend to leave empty nodes to the left/right side of the contents, this makes sense\r
-                       // but we don't want that in our code since it serves no purpose for the end user\r
-                       // For example if this is chopped:\r
-                       //   <p>text 1<span><b>CHOP</b></span>text 2</p>\r
-                       // would produce:\r
-                       //   <p>text 1<span></span></p><b>CHOP</b><p><span></span>text 2</p>\r
-                       // this function will then trim of empty edges and produce:\r
-                       //   <p>text 1</p><b>CHOP</b><p>text 2</p>\r
-                       function trim(node) {\r
-                               var i, children = node.childNodes;\r
+                                               attrFiltersLen = attributeFilters.length;\r
+                                               while (attrFiltersLen--) {\r
+                                                       attrName = attributeFilters[attrFiltersLen].name;\r
 \r
-                               if (node.nodeType == 1 && node.getAttribute('_mce_type') == 'bookmark')\r
-                                       return;\r
+                                                       if (attrName in attrs.map) {\r
+                                                               list = matchedAttributes[attrName];\r
 \r
-                               for (i = children.length - 1; i >= 0; i--)\r
-                                       trim(children[i]);\r
+                                                               if (list)\r
+                                                                       list.push(newNode);\r
+                                                               else\r
+                                                                       matchedAttributes[attrName] = [newNode];\r
+                                                       }\r
+                                               }\r
 \r
-                               if (node.nodeType != 9) {\r
-                                       // Keep non whitespace text nodes\r
-                                       if (node.nodeType == 3 && node.nodeValue.length > 0) {\r
-                                               // If parent element isn't a block or there isn't any useful contents for example "<p>   </p>"\r
-                                               if (!t.isBlock(node.parentNode) || tinymce.trim(node.nodeValue).length > 0)\r
-                                                       return;\r
+                                               // Trim whitespace before block\r
+                                               if (blockElements[name])\r
+                                                       removeWhitespaceBefore(newNode);\r
+\r
+                                               // Change current node if the element wasn't empty i.e not <br /> or <img />\r
+                                               if (!empty)\r
+                                                       node = newNode;\r
                                        }\r
+                               },\r
 \r
-                                       if (node.nodeType == 1) {\r
-                                               // If the only child is a bookmark then move it up\r
-                                               children = node.childNodes;\r
-                                               if (children.length == 1 && children[0] && children[0].nodeType == 1 && children[0].getAttribute('_mce_type') == 'bookmark')\r
-                                                       node.parentNode.insertBefore(children[0], node);\r
+                               end: function(name) {\r
+                                       var textNode, elementRule, text, sibling, tempNode;\r
 \r
-                                               // Keep non empty elements or img, hr etc\r
-                                               if (children.length || /^(br|hr|input|img)$/i.test(node.nodeName))\r
-                                                       return;\r
-                                       }\r
+                                       elementRule = validate ? schema.getElementRule(name) : {};\r
+                                       if (elementRule) {\r
+                                               if (blockElements[name]) {\r
+                                                       if (!whiteSpaceElements[node.name]) {\r
+                                                               // Trim whitespace at beginning of block\r
+                                                               for (textNode = node.firstChild; textNode && textNode.type === 3; ) {\r
+                                                                       text = textNode.value.replace(startWhiteSpaceRegExp, '');\r
 \r
-                                       t.remove(node);\r
-                               }\r
+                                                                       if (text.length > 0) {\r
+                                                                               textNode.value = text;\r
+                                                                               textNode = textNode.next;\r
+                                                                       } else {\r
+                                                                               sibling = textNode.next;\r
+                                                                               textNode.remove();\r
+                                                                               textNode = sibling;\r
+                                                                       }\r
+                                                               }\r
 \r
-                               return node;\r
-                       };\r
+                                                               // Trim whitespace at end of block\r
+                                                               for (textNode = node.lastChild; textNode && textNode.type === 3; ) {\r
+                                                                       text = textNode.value.replace(endWhiteSpaceRegExp, '');\r
 \r
-                       if (pe && e) {\r
-                               // Get before chunk\r
-                               r.setStart(pe.parentNode, t.nodeIndex(pe));\r
-                               r.setEnd(e.parentNode, t.nodeIndex(e));\r
-                               bef = r.extractContents();\r
+                                                                       if (text.length > 0) {\r
+                                                                               textNode.value = text;\r
+                                                                               textNode = textNode.prev;\r
+                                                                       } else {\r
+                                                                               sibling = textNode.prev;\r
+                                                                               textNode.remove();\r
+                                                                               textNode = sibling;\r
+                                                                       }\r
+                                                               }\r
+                                                       }\r
 \r
-                               // Get after chunk\r
-                               r = t.createRng();\r
-                               r.setStart(e.parentNode, t.nodeIndex(e) + 1);\r
-                               r.setEnd(pe.parentNode, t.nodeIndex(pe) + 1);\r
-                               aft = r.extractContents();\r
+                                                       // Trim start white space\r
+                                                       textNode = node.prev;\r
+                                                       if (textNode && textNode.type === 3) {\r
+                                                               text = textNode.value.replace(startWhiteSpaceRegExp, '');\r
 \r
-                               // Insert before chunk\r
-                               pa = pe.parentNode;\r
-                               pa.insertBefore(trim(bef), pe);\r
+                                                               if (text.length > 0)\r
+                                                                       textNode.value = text;\r
+                                                               else\r
+                                                                       textNode.remove();\r
+                                                       }\r
+                                               }\r
 \r
-                               // Insert middle chunk\r
-                               if (re)\r
-                                       pa.replaceChild(re, e);\r
-                               else\r
-                                       pa.insertBefore(e, pe);\r
+                                               // Handle empty nodes\r
+                                               if (elementRule.removeEmpty || elementRule.paddEmpty) {\r
+                                                       if (node.isEmpty(nonEmptyElements)) {\r
+                                                               if (elementRule.paddEmpty)\r
+                                                                       node.empty().append(new Node('#text', '3')).value = '\u00a0';\r
+                                                               else {\r
+                                                                       // Leave nodes that have a name like <a name="name">\r
+                                                                       if (!node.attributes.map.name) {\r
+                                                                               tempNode = node.parent;\r
+                                                                               node.empty().remove();\r
+                                                                               node = tempNode;\r
+                                                                               return;\r
+                                                                       }\r
+                                                               }\r
+                                                       }\r
+                                               }\r
 \r
-                               // Insert after chunk\r
-                               pa.insertBefore(trim(aft), pe);\r
-                               t.remove(pe);\r
+                                               node = node.parent;\r
+                                       }\r
+                               }\r
+                       }, schema);\r
 \r
-                               return re || e;\r
+                       rootNode = node = new Node(args.context || settings.root_name, 11);\r
+\r
+                       parser.parse(html);\r
+\r
+                       // Fix invalid children or report invalid children in a contextual parsing\r
+                       if (validate && invalidChildren.length) {\r
+                               if (!args.context)\r
+                                       fixInvalidChildren(invalidChildren);\r
+                               else\r
+                                       args.invalid = true;\r
                        }\r
-               },\r
 \r
-               bind : function(target, name, func, scope) {\r
-                       var t = this;\r
+                       // Wrap nodes in the root into block elements if the root is body\r
+                       if (rootBlockName && rootNode.name == 'body')\r
+                               addRootBlocks();\r
 \r
-                       if (!t.events)\r
-                               t.events = new tinymce.dom.EventUtils();\r
+                       // Run filters only when the contents is valid\r
+                       if (!args.invalid) {\r
+                               // Run node filters\r
+                               for (name in matchedNodes) {\r
+                                       list = nodeFilters[name];\r
+                                       nodes = matchedNodes[name];\r
 \r
-                       return t.events.add(target, name, func, scope || this);\r
-               },\r
+                                       // Remove already removed children\r
+                                       fi = nodes.length;\r
+                                       while (fi--) {\r
+                                               if (!nodes[fi].parent)\r
+                                                       nodes.splice(fi, 1);\r
+                                       }\r
 \r
-               unbind : function(target, name, func) {\r
-                       var t = this;\r
+                                       for (i = 0, l = list.length; i < l; i++)\r
+                                               list[i](nodes, name, args);\r
+                               }\r
 \r
-                       if (!t.events)\r
-                               t.events = new tinymce.dom.EventUtils();\r
+                               // Run attribute filters\r
+                               for (i = 0, l = attributeFilters.length; i < l; i++) {\r
+                                       list = attributeFilters[i];\r
 \r
-                       return t.events.remove(target, name, func);\r
-               },\r
+                                       if (list.name in matchedAttributes) {\r
+                                               nodes = matchedAttributes[list.name];\r
 \r
+                                               // Remove already removed children\r
+                                               fi = nodes.length;\r
+                                               while (fi--) {\r
+                                                       if (!nodes[fi].parent)\r
+                                                               nodes.splice(fi, 1);\r
+                                               }\r
 \r
-               _findSib : function(node, selector, name) {\r
-                       var t = this, f = selector;\r
+                                               for (fi = 0, fl = list.callbacks.length; fi < fl; fi++)\r
+                                                       list.callbacks[fi](nodes, list.name, args);\r
+                                       }\r
+                               }\r
+                       }\r
 \r
-                       if (node) {\r
-                               // If expression make a function of it using is\r
-                               if (is(f, 'string')) {\r
-                                       f = function(node) {\r
-                                               return t.is(node, selector);\r
-                                       };\r
-                               }\r
+                       return rootNode;\r
+               };\r
 \r
-                               // Loop all siblings\r
-                               for (node = node[name]; node; node = node[name]) {\r
-                                       if (f(node))\r
-                                               return node;\r
-                               }\r
-                       }\r
+               // Remove <br> at end of block elements Gecko and WebKit injects BR elements to\r
+               // make it possible to place the caret inside empty blocks. This logic tries to remove\r
+               // these elements and keep br elements that where intended to be there intact\r
+               if (settings.remove_trailing_brs) {\r
+                       self.addNodeFilter('br', function(nodes, name) {\r
+                               var i, l = nodes.length, node, blockElements = schema.getBlockElements(),\r
+                                       nonEmptyElements = schema.getNonEmptyElements(), parent, prev, prevName;\r
+\r
+                               // Remove brs from body element as well\r
+                               blockElements.body = 1;\r
+\r
+                               // Must loop forwards since it will otherwise remove all brs in <p>a<br><br><br></p>\r
+                               for (i = 0; i < l; i++) {\r
+                                       node = nodes[i];\r
+                                       parent = node.parent;\r
+\r
+                                       if (blockElements[node.parent.name] && node === parent.lastChild) {\r
+                                               // Loop all nodes to the right of the current node and check for other BR elements\r
+                                               // excluding bookmarks since they are invisible\r
+                                               prev = node.prev;\r
+                                               while (prev) {\r
+                                                       prevName = prev.name;\r
+\r
+                                                       // Ignore bookmarks\r
+                                                       if (prevName !== "span" || prev.attr('data-mce-type') !== 'bookmark') {\r
+                                                               // Found a non BR element\r
+                                                               if (prevName !== "br")\r
+                                                                       break;\r
+       \r
+                                                               // Found another br it's a <br><br> structure then don't remove anything\r
+                                                               if (prevName === 'br') {\r
+                                                                       node = null;\r
+                                                                       break;\r
+                                                               }\r
+                                                       }\r
 \r
-                       return null;\r
-               },\r
+                                                       prev = prev.prev;\r
+                                               }\r
 \r
-               _isRes : function(c) {\r
-                       // Is live resizble element\r
-                       return /^(top|left|bottom|right|width|height)/i.test(c) || /;\s*(top|left|bottom|right|width|height)/i.test(c);\r
+                                               if (node) {\r
+                                                       node.remove();\r
+\r
+                                                       // Is the parent to be considered empty after we removed the BR\r
+                                                       if (parent.isEmpty(nonEmptyElements)) {\r
+                                                               elementRule = schema.getElementRule(parent.name);\r
+\r
+                                                               // Remove or padd the element depending on schema rule\r
+                                                               if (elementRule) {\r
+                                                                 if (elementRule.removeEmpty)\r
+                                                                         parent.remove();\r
+                                                                 else if (elementRule.paddEmpty)\r
+                                                                         parent.empty().append(new tinymce.html.Node('#text', 3)).value = '\u00a0';\r
+                                                         }\r
+              }\r
+                                               }\r
+                                       }\r
+                               }\r
+                       });\r
                }\r
+       }\r
+})(tinymce);\r
 \r
-               /*\r
-               walk : function(n, f, s) {\r
-                       var d = this.doc, w;\r
+tinymce.html.Writer = function(settings) {\r
+       var html = [], indent, indentBefore, indentAfter, encode, htmlOutput;\r
 \r
-                       if (d.createTreeWalker) {\r
-                               w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);\r
+       settings = settings || {};\r
+       indent = settings.indent;\r
+       indentBefore = tinymce.makeMap(settings.indent_before || '');\r
+       indentAfter = tinymce.makeMap(settings.indent_after || '');\r
+       encode = tinymce.html.Entities.getEncodeFunc(settings.entity_encoding || 'raw', settings.entities);\r
+       htmlOutput = settings.element_format == "html";\r
 \r
-                               while ((n = w.nextNode()) != null)\r
-                                       f.call(s || this, n);\r
-                       } else\r
-                               tinymce.walk(n, f, 'childNodes', s);\r
-               }\r
-               */\r
+       return {\r
+               start: function(name, attrs, empty) {\r
+                       var i, l, attr, value;\r
 \r
-               /*\r
-               toRGB : function(s) {\r
-                       var c = /^\s*?#([0-9A-F]{2})([0-9A-F]{1,2})([0-9A-F]{2})?\s*?$/.exec(s);\r
+                       if (indent && indentBefore[name] && html.length > 0) {\r
+                               value = html[html.length - 1];\r
 \r
-                       if (c) {\r
-                               // #FFF -> #FFFFFF\r
-                               if (!is(c[3]))\r
-                                       c[3] = c[2] = c[1];\r
+                               if (value.length > 0 && value !== '\n')\r
+                                       html.push('\n');\r
+                       }\r
 \r
-                               return "rgb(" + parseInt(c[1], 16) + "," + parseInt(c[2], 16) + "," + parseInt(c[3], 16) + ")";\r
+                       html.push('<', name);\r
+\r
+                       if (attrs) {\r
+                               for (i = 0, l = attrs.length; i < l; i++) {\r
+                                       attr = attrs[i];\r
+                                       html.push(' ', attr.name, '="', encode(attr.value, true), '"');\r
+                               }\r
                        }\r
 \r
-                       return s;\r
-               }\r
-               */\r
-       });\r
+                       if (!empty || htmlOutput)\r
+                               html[html.length] = '>';\r
+                       else\r
+                               html[html.length] = ' />';\r
 \r
-       tinymce.DOM = new tinymce.dom.DOMUtils(document, {process_html : 0});\r
-})(tinymce);\r
+                       if (empty && indent && indentAfter[name] && html.length > 0) {\r
+                               value = html[html.length - 1];\r
 \r
-(function(ns) {\r
-       // Range constructor\r
-       function Range(dom) {\r
-               var t = this,\r
-                       doc = dom.doc,\r
-                       EXTRACT = 0,\r
-                       CLONE = 1,\r
-                       DELETE = 2,\r
-                       TRUE = true,\r
-                       FALSE = false,\r
-                       START_OFFSET = 'startOffset',\r
-                       START_CONTAINER = 'startContainer',\r
-                       END_CONTAINER = 'endContainer',\r
-                       END_OFFSET = 'endOffset',\r
-                       extend = tinymce.extend,\r
-                       nodeIndex = dom.nodeIndex;\r
+                               if (value.length > 0 && value !== '\n')\r
+                                       html.push('\n');\r
+                       }\r
+               },\r
 \r
-               extend(t, {\r
-                       // Inital states\r
-                       startContainer : doc,\r
-                       startOffset : 0,\r
-                       endContainer : doc,\r
-                       endOffset : 0,\r
-                       collapsed : TRUE,\r
-                       commonAncestorContainer : doc,\r
+               end: function(name) {\r
+                       var value;\r
 \r
-                       // Range constants\r
-                       START_TO_START : 0,\r
-                       START_TO_END : 1,\r
-                       END_TO_END : 2,\r
-                       END_TO_START : 3,\r
+                       /*if (indent && indentBefore[name] && html.length > 0) {\r
+                               value = html[html.length - 1];\r
 \r
-                       // Public methods\r
-                       setStart : setStart,\r
-                       setEnd : setEnd,\r
-                       setStartBefore : setStartBefore,\r
-                       setStartAfter : setStartAfter,\r
-                       setEndBefore : setEndBefore,\r
-                       setEndAfter : setEndAfter,\r
-                       collapse : collapse,\r
-                       selectNode : selectNode,\r
-                       selectNodeContents : selectNodeContents,\r
-                       compareBoundaryPoints : compareBoundaryPoints,\r
-                       deleteContents : deleteContents,\r
-                       extractContents : extractContents,\r
-                       cloneContents : cloneContents,\r
-                       insertNode : insertNode,\r
-                       surroundContents : surroundContents,\r
-                       cloneRange : cloneRange\r
-               });\r
+                               if (value.length > 0 && value !== '\n')\r
+                                       html.push('\n');\r
+                       }*/\r
 \r
-               function setStart(n, o) {\r
-                       _setEndPoint(TRUE, n, o);\r
-               };\r
+                       html.push('</', name, '>');\r
 \r
-               function setEnd(n, o) {\r
-                       _setEndPoint(FALSE, n, o);\r
-               };\r
+                       if (indent && indentAfter[name] && html.length > 0) {\r
+                               value = html[html.length - 1];\r
 \r
-               function setStartBefore(n) {\r
-                       setStart(n.parentNode, nodeIndex(n));\r
-               };\r
+                               if (value.length > 0 && value !== '\n')\r
+                                       html.push('\n');\r
+                       }\r
+               },\r
 \r
-               function setStartAfter(n) {\r
-                       setStart(n.parentNode, nodeIndex(n) + 1);\r
-               };\r
+               text: function(text, raw) {\r
+                       if (text.length > 0)\r
+                               html[html.length] = raw ? text : encode(text);\r
+               },\r
 \r
-               function setEndBefore(n) {\r
-                       setEnd(n.parentNode, nodeIndex(n));\r
-               };\r
+               cdata: function(text) {\r
+                       html.push('<![CDATA[', text, ']]>');\r
+               },\r
 \r
-               function setEndAfter(n) {\r
-                       setEnd(n.parentNode, nodeIndex(n) + 1);\r
-               };\r
+               comment: function(text) {\r
+                       html.push('<!--', text, '-->');\r
+               },\r
 \r
-               function collapse(ts) {\r
-                       if (ts) {\r
-                               t[END_CONTAINER] = t[START_CONTAINER];\r
-                               t[END_OFFSET] = t[START_OFFSET];\r
-                       } else {\r
-                               t[START_CONTAINER] = t[END_CONTAINER];\r
-                               t[START_OFFSET] = t[END_OFFSET];\r
-                       }\r
+               pi: function(name, text) {\r
+                       if (text)\r
+                               html.push('<?', name, ' ', text, '?>');\r
+                       else\r
+                               html.push('<?', name, '?>');\r
 \r
-                       t.collapsed = TRUE;\r
-               };\r
+                       if (indent)\r
+                               html.push('\n');\r
+               },\r
 \r
-               function selectNode(n) {\r
-                       setStartBefore(n);\r
-                       setEndAfter(n);\r
-               };\r
+               doctype: function(text) {\r
+                       html.push('<!DOCTYPE', text, '>', indent ? '\n' : '');\r
+               },\r
 \r
-               function selectNodeContents(n) {\r
-                       setStart(n, 0);\r
-                       setEnd(n, n.nodeType === 1 ? n.childNodes.length : n.nodeValue.length);\r
-               };\r
+               reset: function() {\r
+                       html.length = 0;\r
+               },\r
 \r
-               function compareBoundaryPoints(h, r) {\r
-                       var sc = t[START_CONTAINER], so = t[START_OFFSET], ec = t[END_CONTAINER], eo = t[END_OFFSET];\r
+               getContent: function() {\r
+                       return html.join('').replace(/\n$/, '');\r
+               }\r
+       };\r
+};\r
 \r
-                       // Check START_TO_START\r
-                       if (h === 0)\r
-                               return _compareBoundaryPoints(sc, so, sc, so);\r
+(function(tinymce) {\r
+       tinymce.html.Serializer = function(settings, schema) {\r
+               var self = this, writer = new tinymce.html.Writer(settings);\r
 \r
-                       // Check START_TO_END\r
-                       if (h === 1)\r
-                               return _compareBoundaryPoints(sc, so, ec, eo);\r
+               settings = settings || {};\r
+               settings.validate = "validate" in settings ? settings.validate : true;\r
 \r
-                       // Check END_TO_END\r
-                       if (h === 2)\r
-                               return _compareBoundaryPoints(ec, eo, ec, eo);\r
+               self.schema = schema = schema || new tinymce.html.Schema();\r
+               self.writer = writer;\r
 \r
-                       // Check END_TO_START\r
-                       if (h === 3)\r
-                               return _compareBoundaryPoints(ec, eo, sc, so);\r
-               };\r
+               self.serialize = function(node) {\r
+                       var handlers, validate;\r
 \r
-               function deleteContents() {\r
-                       _traverse(DELETE);\r
-               };\r
+                       validate = settings.validate;\r
 \r
-               function extractContents() {\r
-                       return _traverse(EXTRACT);\r
-               };\r
+                       handlers = {\r
+                               // #text\r
+                               3: function(node, raw) {\r
+                                       writer.text(node.value, node.raw);\r
+                               },\r
 \r
-               function cloneContents() {\r
-                       return _traverse(CLONE);\r
-               };\r
+                               // #comment\r
+                               8: function(node) {\r
+                                       writer.comment(node.value);\r
+                               },\r
 \r
-               function insertNode(n) {\r
-                       var startContainer = this[START_CONTAINER],\r
-                               startOffset = this[START_OFFSET], nn, o;\r
+                               // Processing instruction\r
+                               7: function(node) {\r
+                                       writer.pi(node.name, node.value);\r
+                               },\r
 \r
-                       // Node is TEXT_NODE or CDATA\r
-                       if ((startContainer.nodeType === 3 || startContainer.nodeType === 4) && startContainer.nodeValue) {\r
-                               if (!startOffset) {\r
-                                       // At the start of text\r
-                                       startContainer.parentNode.insertBefore(n, startContainer);\r
-                               } else if (startOffset >= startContainer.nodeValue.length) {\r
-                                       // At the end of text\r
-                                       dom.insertAfter(n, startContainer);\r
-                               } else {\r
-                                       // Middle, need to split\r
-                                       nn = startContainer.splitText(startOffset);\r
-                                       startContainer.parentNode.insertBefore(n, nn);\r
+                               // Doctype\r
+                               10: function(node) {\r
+                                       writer.doctype(node.value);\r
+                               },\r
+\r
+                               // CDATA\r
+                               4: function(node) {\r
+                                       writer.cdata(node.value);\r
+                               },\r
+\r
+                               // Document fragment\r
+                               11: function(node) {\r
+                                       if ((node = node.firstChild)) {\r
+                                               do {\r
+                                                       walk(node);\r
+                                               } while (node = node.next);\r
+                                       }\r
                                }\r
-                       } else {\r
-                               // Insert element node\r
-                               if (startContainer.childNodes.length > 0)\r
-                                       o = startContainer.childNodes[startOffset];\r
+                       };\r
 \r
-                               if (o)\r
-                                       startContainer.insertBefore(n, o);\r
-                               else\r
-                                       startContainer.appendChild(n);\r
-                       }\r
-               };\r
+                       writer.reset();\r
 \r
-               function surroundContents(n) {\r
-                       var f = t.extractContents();\r
+                       function walk(node) {\r
+                               var handler = handlers[node.type], name, isEmpty, attrs, attrName, attrValue, sortedAttrs, i, l, elementRule;\r
 \r
-                       t.insertNode(n);\r
-                       n.appendChild(f);\r
-                       t.selectNode(n);\r
-               };\r
+                               if (!handler) {\r
+                                       name = node.name;\r
+                                       isEmpty = node.shortEnded;\r
+                                       attrs = node.attributes;\r
 \r
-               function cloneRange() {\r
-                       return extend(new Range(dom), {\r
-                               startContainer : t[START_CONTAINER],\r
-                               startOffset : t[START_OFFSET],\r
-                               endContainer : t[END_CONTAINER],\r
-                               endOffset : t[END_OFFSET],\r
-                               collapsed : t.collapsed,\r
-                               commonAncestorContainer : t.commonAncestorContainer\r
-                       });\r
-               };\r
+                                       // Sort attributes\r
+                                       if (validate && attrs && attrs.length > 1) {\r
+                                               sortedAttrs = [];\r
+                                               sortedAttrs.map = {};\r
 \r
-               // Private methods\r
+                                               elementRule = schema.getElementRule(node.name);\r
+                                               for (i = 0, l = elementRule.attributesOrder.length; i < l; i++) {\r
+                                                       attrName = elementRule.attributesOrder[i];\r
 \r
-               function _getSelectedNode(container, offset) {\r
-                       var child;\r
+                                                       if (attrName in attrs.map) {\r
+                                                               attrValue = attrs.map[attrName];\r
+                                                               sortedAttrs.map[attrName] = attrValue;\r
+                                                               sortedAttrs.push({name: attrName, value: attrValue});\r
+                                                       }\r
+                                               }\r
 \r
-                       if (container.nodeType == 3 /* TEXT_NODE */)\r
-                               return container;\r
+                                               for (i = 0, l = attrs.length; i < l; i++) {\r
+                                                       attrName = attrs[i].name;\r
 \r
-                       if (offset < 0)\r
-                               return container;\r
+                                                       if (!(attrName in sortedAttrs.map)) {\r
+                                                               attrValue = attrs.map[attrName];\r
+                                                               sortedAttrs.map[attrName] = attrValue;\r
+                                                               sortedAttrs.push({name: attrName, value: attrValue});\r
+                                                       }\r
+                                               }\r
 \r
-                       child = container.firstChild;\r
-                       while (child && offset > 0) {\r
-                               --offset;\r
-                               child = child.nextSibling;\r
-                       }\r
+                                               attrs = sortedAttrs;\r
+                                       }\r
 \r
-                       if (child)\r
-                               return child;\r
+                                       writer.start(node.name, attrs, isEmpty);\r
 \r
-                       return container;\r
-               };\r
+                                       if (!isEmpty) {\r
+                                               if ((node = node.firstChild)) {\r
+                                                       do {\r
+                                                               walk(node);\r
+                                                       } while (node = node.next);\r
+                                               }\r
 \r
-               function _isCollapsed() {\r
-                       return (t[START_CONTAINER] == t[END_CONTAINER] && t[START_OFFSET] == t[END_OFFSET]);\r
-               };\r
+                                               writer.end(name);\r
+                                       }\r
+                               } else\r
+                                       handler(node);\r
+                       }\r
 \r
-               function _compareBoundaryPoints(containerA, offsetA, containerB, offsetB) {\r
-                       var c, offsetC, n, cmnRoot, childA, childB;\r
+                       // Serialize element and treat all non elements as fragments\r
+                       if (node.type == 1 && !settings.inner)\r
+                               walk(node);\r
+                       else\r
+                               handlers[11](node);\r
 \r
-                       // In the first case the boundary-points have the same container. A is before B\r
-                       // if its offset is less than the offset of B, A is equal to B if its offset is\r
-                       // equal to the offset of B, and A is after B if its offset is greater than the\r
-                       // offset of B.\r
-                       if (containerA == containerB) {\r
-                               if (offsetA == offsetB)\r
-                                       return 0; // equal\r
-\r
-                               if (offsetA < offsetB)\r
-                                       return -1; // before\r
+                       return writer.getContent();\r
+               };\r
+       }\r
+})(tinymce);\r
 \r
-                               return 1; // after\r
-                       }\r
+(function(tinymce) {\r
+       // Shorten names\r
+       var each = tinymce.each,\r
+               is = tinymce.is,\r
+               isWebKit = tinymce.isWebKit,\r
+               isIE = tinymce.isIE,\r
+               Entities = tinymce.html.Entities,\r
+               simpleSelectorRe = /^([a-z0-9],?)+$/i,\r
+               blockElementsMap = tinymce.html.Schema.blockElementsMap,\r
+               whiteSpaceRegExp = /^[ \t\r\n]*$/;\r
 \r
-                       // In the second case a child node C of the container of A is an ancestor\r
-                       // container of B. In this case, A is before B if the offset of A is less than or\r
-                       // equal to the index of the child node C and A is after B otherwise.\r
-                       c = containerB;\r
-                       while (c && c.parentNode != containerA)\r
-                               c = c.parentNode;\r
+       tinymce.create('tinymce.dom.DOMUtils', {\r
+               doc : null,\r
+               root : null,\r
+               files : null,\r
+               pixelStyles : /^(top|left|bottom|right|width|height|borderWidth)$/,\r
+               props : {\r
+                       "for" : "htmlFor",\r
+                       "class" : "className",\r
+                       className : "className",\r
+                       checked : "checked",\r
+                       disabled : "disabled",\r
+                       maxlength : "maxLength",\r
+                       readonly : "readOnly",\r
+                       selected : "selected",\r
+                       value : "value",\r
+                       id : "id",\r
+                       name : "name",\r
+                       type : "type"\r
+               },\r
 \r
-                       if (c) {\r
-                               offsetC = 0;\r
-                               n = containerA.firstChild;\r
+               DOMUtils : function(d, s) {\r
+                       var t = this, globalStyle, name;\r
 \r
-                               while (n != c && offsetC < offsetA) {\r
-                                       offsetC++;\r
-                                       n = n.nextSibling;\r
-                               }\r
+                       t.doc = d;\r
+                       t.win = window;\r
+                       t.files = {};\r
+                       t.cssFlicker = false;\r
+                       t.counter = 0;\r
+                       t.stdMode = !tinymce.isIE || d.documentMode >= 8;\r
+                       t.boxModel = !tinymce.isIE || d.compatMode == "CSS1Compat" || t.stdMode;\r
+                       t.hasOuterHTML = "outerHTML" in d.createElement("a");\r
 \r
-                               if (offsetA <= offsetC)\r
-                                       return -1; // before\r
+                       t.settings = s = tinymce.extend({\r
+                               keep_values : false,\r
+                               hex_colors : 1\r
+                       }, s);\r
+                       \r
+                       t.schema = s.schema;\r
+                       t.styles = new tinymce.html.Styles({\r
+                               url_converter : s.url_converter,\r
+                               url_converter_scope : s.url_converter_scope\r
+                       }, s.schema);\r
 \r
-                               return 1; // after\r
+                       // Fix IE6SP2 flicker and check it failed for pre SP2\r
+                       if (tinymce.isIE6) {\r
+                               try {\r
+                                       d.execCommand('BackgroundImageCache', false, true);\r
+                               } catch (e) {\r
+                                       t.cssFlicker = true;\r
+                               }\r
                        }\r
 \r
-                       // In the third case a child node C of the container of B is an ancestor container\r
-                       // of A. In this case, A is before B if the index of the child node C is less than\r
-                       // the offset of B and A is after B otherwise.\r
-                       c = containerA;\r
-                       while (c && c.parentNode != containerB) {\r
-                               c = c.parentNode;\r
+                       if (isIE && s.schema) {\r
+                               // Add missing HTML 4/5 elements to IE\r
+                               ('abbr article aside audio canvas ' +\r
+                               'details figcaption figure footer ' +\r
+                               'header hgroup mark menu meter nav ' +\r
+                               'output progress section summary ' +\r
+                               'time video').replace(/\w+/g, function(name) {\r
+                                       d.createElement(name);\r
+                               });\r
+\r
+                               // Create all custom elements\r
+                               for (name in s.schema.getCustomElements()) {\r
+                                       d.createElement(name);\r
+                               }\r
                        }\r
 \r
-                       if (c) {\r
-                               offsetC = 0;\r
-                               n = containerB.firstChild;\r
+                       tinymce.addUnload(t.destroy, t);\r
+               },\r
 \r
-                               while (n != c && offsetC < offsetB) {\r
-                                       offsetC++;\r
-                                       n = n.nextSibling;\r
-                               }\r
+               getRoot : function() {\r
+                       var t = this, s = t.settings;\r
 \r
-                               if (offsetC < offsetB)\r
-                                       return -1; // before\r
+                       return (s && t.get(s.root_element)) || t.doc.body;\r
+               },\r
 \r
-                               return 1; // after\r
-                       }\r
+               getViewPort : function(w) {\r
+                       var d, b;\r
 \r
-                       // In the fourth case, none of three other cases hold: the containers of A and B\r
-                       // are siblings or descendants of sibling nodes. In this case, A is before B if\r
-                       // the container of A is before the container of B in a pre-order traversal of the\r
-                       // Ranges' context tree and A is after B otherwise.\r
-                       cmnRoot = dom.findCommonAncestor(containerA, containerB);\r
-                       childA = containerA;\r
+                       w = !w ? this.win : w;\r
+                       d = w.document;\r
+                       b = this.boxModel ? d.documentElement : d.body;\r
 \r
-                       while (childA && childA.parentNode != cmnRoot)\r
-                               childA = childA.parentNode;\r
+                       // Returns viewport size excluding scrollbars\r
+                       return {\r
+                               x : w.pageXOffset || b.scrollLeft,\r
+                               y : w.pageYOffset || b.scrollTop,\r
+                               w : w.innerWidth || b.clientWidth,\r
+                               h : w.innerHeight || b.clientHeight\r
+                       };\r
+               },\r
 \r
-                       if (!childA)\r
-                               childA = cmnRoot;\r
+               getRect : function(e) {\r
+                       var p, t = this, sr;\r
 \r
-                       childB = containerB;\r
-                       while (childB && childB.parentNode != cmnRoot)\r
-                               childB = childB.parentNode;\r
+                       e = t.get(e);\r
+                       p = t.getPos(e);\r
+                       sr = t.getSize(e);\r
 \r
-                       if (!childB)\r
-                               childB = cmnRoot;\r
+                       return {\r
+                               x : p.x,\r
+                               y : p.y,\r
+                               w : sr.w,\r
+                               h : sr.h\r
+                       };\r
+               },\r
 \r
-                       if (childA == childB)\r
-                               return 0; // equal\r
+               getSize : function(e) {\r
+                       var t = this, w, h;\r
 \r
-                       n = cmnRoot.firstChild;\r
-                       while (n) {\r
-                               if (n == childA)\r
-                                       return -1; // before\r
+                       e = t.get(e);\r
+                       w = t.getStyle(e, 'width');\r
+                       h = t.getStyle(e, 'height');\r
 \r
-                               if (n == childB)\r
-                                       return 1; // after\r
+                       // Non pixel value, then force offset/clientWidth\r
+                       if (w.indexOf('px') === -1)\r
+                               w = 0;\r
 \r
-                               n = n.nextSibling;\r
-                       }\r
-               };\r
+                       // Non pixel value, then force offset/clientWidth\r
+                       if (h.indexOf('px') === -1)\r
+                               h = 0;\r
 \r
-               function _setEndPoint(st, n, o) {\r
-                       var ec, sc;\r
+                       return {\r
+                               w : parseInt(w) || e.offsetWidth || e.clientWidth,\r
+                               h : parseInt(h) || e.offsetHeight || e.clientHeight\r
+                       };\r
+               },\r
 \r
-                       if (st) {\r
-                               t[START_CONTAINER] = n;\r
-                               t[START_OFFSET] = o;\r
-                       } else {\r
-                               t[END_CONTAINER] = n;\r
-                               t[END_OFFSET] = o;\r
-                       }\r
+               getParent : function(n, f, r) {\r
+                       return this.getParents(n, f, r, false);\r
+               },\r
 \r
-                       // If one boundary-point of a Range is set to have a root container\r
-                       // other than the current one for the Range, the Range is collapsed to\r
-                       // the new position. This enforces the restriction that both boundary-\r
-                       // points of a Range must have the same root container.\r
-                       ec = t[END_CONTAINER];\r
-                       while (ec.parentNode)\r
-                               ec = ec.parentNode;\r
+               getParents : function(n, f, r, c) {\r
+                       var t = this, na, se = t.settings, o = [];\r
 \r
-                       sc = t[START_CONTAINER];\r
-                       while (sc.parentNode)\r
-                               sc = sc.parentNode;\r
+                       n = t.get(n);\r
+                       c = c === undefined;\r
 \r
-                       if (sc == ec) {\r
-                               // The start position of a Range is guaranteed to never be after the\r
-                               // end position. To enforce this restriction, if the start is set to\r
-                               // be at a position after the end, the Range is collapsed to that\r
-                               // position.\r
-                               if (_compareBoundaryPoints(t[START_CONTAINER], t[START_OFFSET], t[END_CONTAINER], t[END_OFFSET]) > 0)\r
-                                       t.collapse(st);\r
-                       } else\r
-                               t.collapse(st);\r
+                       if (se.strict_root)\r
+                               r = r || t.getRoot();\r
 \r
-                       t.collapsed = _isCollapsed();\r
-                       t.commonAncestorContainer = dom.findCommonAncestor(t[START_CONTAINER], t[END_CONTAINER]);\r
-               };\r
+                       // Wrap node name as func\r
+                       if (is(f, 'string')) {\r
+                               na = f;\r
 \r
-               function _traverse(how) {\r
-                       var c, endContainerDepth = 0, startContainerDepth = 0, p, depthDiff, startNode, endNode, sp, ep;\r
+                               if (f === '*') {\r
+                                       f = function(n) {return n.nodeType == 1;};\r
+                               } else {\r
+                                       f = function(n) {\r
+                                               return t.is(n, na);\r
+                                       };\r
+                               }\r
+                       }\r
 \r
-                       if (t[START_CONTAINER] == t[END_CONTAINER])\r
-                               return _traverseSameContainer(how);\r
+                       while (n) {\r
+                               if (n == r || !n.nodeType || n.nodeType === 9)\r
+                                       break;\r
 \r
-                       for (c = t[END_CONTAINER], p = c.parentNode; p; c = p, p = p.parentNode) {\r
-                               if (p == t[START_CONTAINER])\r
-                                       return _traverseCommonStartContainer(c, how);\r
+                               if (!f || f(n)) {\r
+                                       if (c)\r
+                                               o.push(n);\r
+                                       else\r
+                                               return n;\r
+                               }\r
 \r
-                               ++endContainerDepth;\r
+                               n = n.parentNode;\r
                        }\r
 \r
-                       for (c = t[START_CONTAINER], p = c.parentNode; p; c = p, p = p.parentNode) {\r
-                               if (p == t[END_CONTAINER])\r
-                                       return _traverseCommonEndContainer(c, how);\r
+                       return c ? o : null;\r
+               },\r
 \r
-                               ++startContainerDepth;\r
+               get : function(e) {\r
+                       var n;\r
+\r
+                       if (e && this.doc && typeof(e) == 'string') {\r
+                               n = e;\r
+                               e = this.doc.getElementById(e);\r
+\r
+                               // IE and Opera returns meta elements when they match the specified input ID, but getElementsByName seems to do the trick\r
+                               if (e && e.id !== n)\r
+                                       return this.doc.getElementsByName(n)[1];\r
                        }\r
 \r
-                       depthDiff = startContainerDepth - endContainerDepth;\r
+                       return e;\r
+               },\r
 \r
-                       startNode = t[START_CONTAINER];\r
-                       while (depthDiff > 0) {\r
-                               startNode = startNode.parentNode;\r
-                               depthDiff--;\r
-                       }\r
+               getNext : function(node, selector) {\r
+                       return this._findSib(node, selector, 'nextSibling');\r
+               },\r
 \r
-                       endNode = t[END_CONTAINER];\r
-                       while (depthDiff < 0) {\r
-                               endNode = endNode.parentNode;\r
-                               depthDiff++;\r
-                       }\r
+               getPrev : function(node, selector) {\r
+                       return this._findSib(node, selector, 'previousSibling');\r
+               },\r
 \r
-                       // ascend the ancestor hierarchy until we have a common parent.\r
-                       for (sp = startNode.parentNode, ep = endNode.parentNode; sp != ep; sp = sp.parentNode, ep = ep.parentNode) {\r
-                               startNode = sp;\r
-                               endNode = ep;\r
-                       }\r
 \r
-                       return _traverseCommonAncestors(startNode, endNode, how);\r
-               };\r
+               select : function(pa, s) {\r
+                       var t = this;\r
 \r
-                function _traverseSameContainer(how) {\r
-                       var frag, s, sub, n, cnt, sibling, xferNode;\r
+                       return tinymce.dom.Sizzle(pa, t.get(s) || t.get(t.settings.root_element) || t.doc, []);\r
+               },\r
 \r
-                       if (how != DELETE)\r
-                               frag = doc.createDocumentFragment();\r
+               is : function(n, selector) {\r
+                       var i;\r
 \r
-                       // If selection is empty, just return the fragment\r
-                       if (t[START_OFFSET] == t[END_OFFSET])\r
-                               return frag;\r
+                       // If it isn't an array then try to do some simple selectors instead of Sizzle for to boost performance\r
+                       if (n.length === undefined) {\r
+                               // Simple all selector\r
+                               if (selector === '*')\r
+                                       return n.nodeType == 1;\r
 \r
-                       // Text node needs special case handling\r
-                       if (t[START_CONTAINER].nodeType == 3 /* TEXT_NODE */) {\r
-                               // get the substring\r
-                               s = t[START_CONTAINER].nodeValue;\r
-                               sub = s.substring(t[START_OFFSET], t[END_OFFSET]);\r
+                               // Simple selector just elements\r
+                               if (simpleSelectorRe.test(selector)) {\r
+                                       selector = selector.toLowerCase().split(/,/);\r
+                                       n = n.nodeName.toLowerCase();\r
 \r
-                               // set the original text node to its new value\r
-                               if (how != CLONE) {\r
-                                       t[START_CONTAINER].deleteData(t[START_OFFSET], t[END_OFFSET] - t[START_OFFSET]);\r
+                                       for (i = selector.length - 1; i >= 0; i--) {\r
+                                               if (selector[i] == n)\r
+                                                       return true;\r
+                                       }\r
 \r
-                                       // Nothing is partially selected, so collapse to start point\r
-                                       t.collapse(TRUE);\r
+                                       return false;\r
                                }\r
+                       }\r
 \r
-                               if (how == DELETE)\r
-                                       return;\r
+                       return tinymce.dom.Sizzle.matches(selector, n.nodeType ? [n] : n).length > 0;\r
+               },\r
 \r
-                               frag.appendChild(doc.createTextNode(sub));\r
-                               return frag;\r
-                       }\r
 \r
-                       // Copy nodes between the start/end offsets.\r
-                       n = _getSelectedNode(t[START_CONTAINER], t[START_OFFSET]);\r
-                       cnt = t[END_OFFSET] - t[START_OFFSET];\r
+               add : function(p, n, a, h, c) {\r
+                       var t = this;\r
 \r
-                       while (cnt > 0) {\r
-                               sibling = n.nextSibling;\r
-                               xferNode = _traverseFullySelected(n, how);\r
+                       return this.run(p, function(p) {\r
+                               var e, k;\r
 \r
-                               if (frag)\r
-                                       frag.appendChild( xferNode );\r
+                               e = is(n, 'string') ? t.doc.createElement(n) : n;\r
+                               t.setAttribs(e, a);\r
 \r
-                               --cnt;\r
-                               n = sibling;\r
-                       }\r
+                               if (h) {\r
+                                       if (h.nodeType)\r
+                                               e.appendChild(h);\r
+                                       else\r
+                                               t.setHTML(e, h);\r
+                               }\r
 \r
-                       // Nothing is partially selected, so collapse to start point\r
-                       if (how != CLONE)\r
-                               t.collapse(TRUE);\r
+                               return !c ? p.appendChild(e) : e;\r
+                       });\r
+               },\r
 \r
-                       return frag;\r
-               };\r
+               create : function(n, a, h) {\r
+                       return this.add(this.doc.createElement(n), n, a, h, 1);\r
+               },\r
 \r
-               function _traverseCommonStartContainer(endAncestor, how) {\r
-                       var frag, n, endIdx, cnt, sibling, xferNode;\r
+               createHTML : function(n, a, h) {\r
+                       var o = '', t = this, k;\r
 \r
-                       if (how != DELETE)\r
-                               frag = doc.createDocumentFragment();\r
+                       o += '<' + n;\r
 \r
-                       n = _traverseRightBoundary(endAncestor, how);\r
+                       for (k in a) {\r
+                               if (a.hasOwnProperty(k))\r
+                                       o += ' ' + k + '="' + t.encode(a[k]) + '"';\r
+                       }\r
 \r
-                       if (frag)\r
-                               frag.appendChild(n);\r
+                       // A call to tinymce.is doesn't work for some odd reason on IE9 possible bug inside their JS runtime\r
+                       if (typeof(h) != "undefined")\r
+                               return o + '>' + h + '</' + n + '>';\r
 \r
-                       endIdx = nodeIndex(endAncestor);\r
-                       cnt = endIdx - t[START_OFFSET];\r
+                       return o + ' />';\r
+               },\r
 \r
-                       if (cnt <= 0) {\r
-                               // Collapse to just before the endAncestor, which\r
-                               // is partially selected.\r
-                               if (how != CLONE) {\r
-                                       t.setEndBefore(endAncestor);\r
-                                       t.collapse(FALSE);\r
+               remove : function(node, keep_children) {\r
+                       return this.run(node, function(node) {\r
+                               var child, parent = node.parentNode;\r
+\r
+                               if (!parent)\r
+                                       return null;\r
+\r
+                               if (keep_children) {\r
+                                       while (child = node.firstChild) {\r
+                                               // IE 8 will crash if you don't remove completely empty text nodes\r
+                                               if (!tinymce.isIE || child.nodeType !== 3 || child.nodeValue)\r
+                                                       parent.insertBefore(child, node);\r
+                                               else\r
+                                                       node.removeChild(child);\r
+                                       }\r
                                }\r
 \r
-                               return frag;\r
-                       }\r
+                               return parent.removeChild(node);\r
+                       });\r
+               },\r
 \r
-                       n = endAncestor.previousSibling;\r
-                       while (cnt > 0) {\r
-                               sibling = n.previousSibling;\r
-                               xferNode = _traverseFullySelected(n, how);\r
+               setStyle : function(n, na, v) {\r
+                       var t = this;\r
 \r
-                               if (frag)\r
-                                       frag.insertBefore(xferNode, frag.firstChild);\r
+                       return t.run(n, function(e) {\r
+                               var s, i;\r
 \r
-                               --cnt;\r
-                               n = sibling;\r
-                       }\r
+                               s = e.style;\r
 \r
-                       // Collapse to just before the endAncestor, which\r
-                       // is partially selected.\r
-                       if (how != CLONE) {\r
-                               t.setEndBefore(endAncestor);\r
-                               t.collapse(FALSE);\r
-                       }\r
+                               // Camelcase it, if needed\r
+                               na = na.replace(/-(\D)/g, function(a, b){\r
+                                       return b.toUpperCase();\r
+                               });\r
 \r
-                       return frag;\r
-               };\r
+                               // Default px suffix on these\r
+                               if (t.pixelStyles.test(na) && (tinymce.is(v, 'number') || /^[\-0-9\.]+$/.test(v)))\r
+                                       v += 'px';\r
 \r
-               function _traverseCommonEndContainer(startAncestor, how) {\r
-                       var frag, startIdx, n, cnt, sibling, xferNode;\r
+                               switch (na) {\r
+                                       case 'opacity':\r
+                                               // IE specific opacity\r
+                                               if (isIE) {\r
+                                                       s.filter = v === '' ? '' : "alpha(opacity=" + (v * 100) + ")";\r
 \r
-                       if (how != DELETE)\r
-                               frag = doc.createDocumentFragment();\r
+                                                       if (!n.currentStyle || !n.currentStyle.hasLayout)\r
+                                                               s.display = 'inline-block';\r
+                                               }\r
 \r
-                       n = _traverseLeftBoundary(startAncestor, how);\r
-                       if (frag)\r
-                               frag.appendChild(n);\r
+                                               // Fix for older browsers\r
+                                               s[na] = s['-moz-opacity'] = s['-khtml-opacity'] = v || '';\r
+                                               break;\r
 \r
-                       startIdx = nodeIndex(startAncestor);\r
-                       ++startIdx;  // Because we already traversed it....\r
+                                       case 'float':\r
+                                               isIE ? s.styleFloat = v : s.cssFloat = v;\r
+                                               break;\r
+                                       \r
+                                       default:\r
+                                               s[na] = v || '';\r
+                               }\r
 \r
-                       cnt = t[END_OFFSET] - startIdx;\r
-                       n = startAncestor.nextSibling;\r
-                       while (cnt > 0) {\r
-                               sibling = n.nextSibling;\r
-                               xferNode = _traverseFullySelected(n, how);\r
+                               // Force update of the style data\r
+                               if (t.settings.update_styles)\r
+                                       t.setAttrib(e, 'data-mce-style');\r
+                       });\r
+               },\r
 \r
-                               if (frag)\r
-                                       frag.appendChild(xferNode);\r
+               getStyle : function(n, na, c) {\r
+                       n = this.get(n);\r
 \r
-                               --cnt;\r
-                               n = sibling;\r
-                       }\r
+                       if (!n)\r
+                               return;\r
 \r
-                       if (how != CLONE) {\r
-                               t.setStartAfter(startAncestor);\r
-                               t.collapse(TRUE);\r
+                       // Gecko\r
+                       if (this.doc.defaultView && c) {\r
+                               // Remove camelcase\r
+                               na = na.replace(/[A-Z]/g, function(a){\r
+                                       return '-' + a;\r
+                               });\r
+\r
+                               try {\r
+                                       return this.doc.defaultView.getComputedStyle(n, null).getPropertyValue(na);\r
+                               } catch (ex) {\r
+                                       // Old safari might fail\r
+                                       return null;\r
+                               }\r
                        }\r
 \r
-                       return frag;\r
-               };\r
+                       // Camelcase it, if needed\r
+                       na = na.replace(/-(\D)/g, function(a, b){\r
+                               return b.toUpperCase();\r
+                       });\r
 \r
-               function _traverseCommonAncestors(startAncestor, endAncestor, how) {\r
-                       var n, frag, commonParent, startOffset, endOffset, cnt, sibling, nextSibling;\r
+                       if (na == 'float')\r
+                               na = isIE ? 'styleFloat' : 'cssFloat';\r
 \r
-                       if (how != DELETE)\r
-                               frag = doc.createDocumentFragment();\r
+                       // IE & Opera\r
+                       if (n.currentStyle && c)\r
+                               return n.currentStyle[na];\r
 \r
-                       n = _traverseLeftBoundary(startAncestor, how);\r
-                       if (frag)\r
-                               frag.appendChild(n);\r
+                       return n.style ? n.style[na] : undefined;\r
+               },\r
 \r
-                       commonParent = startAncestor.parentNode;\r
-                       startOffset = nodeIndex(startAncestor);\r
-                       endOffset = nodeIndex(endAncestor);\r
-                       ++startOffset;\r
+               setStyles : function(e, o) {\r
+                       var t = this, s = t.settings, ol;\r
 \r
-                       cnt = endOffset - startOffset;\r
-                       sibling = startAncestor.nextSibling;\r
+                       ol = s.update_styles;\r
+                       s.update_styles = 0;\r
 \r
-                       while (cnt > 0) {\r
-                               nextSibling = sibling.nextSibling;\r
-                               n = _traverseFullySelected(sibling, how);\r
+                       each(o, function(v, n) {\r
+                               t.setStyle(e, n, v);\r
+                       });\r
 \r
-                               if (frag)\r
-                                       frag.appendChild(n);\r
+                       // Update style info\r
+                       s.update_styles = ol;\r
+                       if (s.update_styles)\r
+                               t.setAttrib(e, s.cssText);\r
+               },\r
 \r
-                               sibling = nextSibling;\r
-                               --cnt;\r
-                       }\r
+               removeAllAttribs: function(e) {\r
+                       return this.run(e, function(e) {\r
+                               var i, attrs = e.attributes;\r
+                               for (i = attrs.length - 1; i >= 0; i--) {\r
+                                       e.removeAttributeNode(attrs.item(i));\r
+                               }\r
+                       });\r
+               },\r
 \r
-                       n = _traverseRightBoundary(endAncestor, how);\r
+               setAttrib : function(e, n, v) {\r
+                       var t = this;\r
 \r
-                       if (frag)\r
-                               frag.appendChild(n);\r
+                       // Whats the point\r
+                       if (!e || !n)\r
+                               return;\r
 \r
-                       if (how != CLONE) {\r
-                               t.setStartAfter(startAncestor);\r
-                               t.collapse(TRUE);\r
-                       }\r
+                       // Strict XML mode\r
+                       if (t.settings.strict)\r
+                               n = n.toLowerCase();\r
 \r
-                       return frag;\r
-               };\r
+                       return this.run(e, function(e) {\r
+                               var s = t.settings;\r
 \r
-               function _traverseRightBoundary(root, how) {\r
-                       var next = _getSelectedNode(t[END_CONTAINER], t[END_OFFSET] - 1), parent, clonedParent, prevSibling, clonedChild, clonedGrandParent, isFullySelected = next != t[END_CONTAINER];\r
+                               switch (n) {\r
+                                       case "style":\r
+                                               if (!is(v, 'string')) {\r
+                                                       each(v, function(v, n) {\r
+                                                               t.setStyle(e, n, v);\r
+                                                       });\r
 \r
-                       if (next == root)\r
-                               return _traverseNode(next, isFullySelected, FALSE, how);\r
+                                                       return;\r
+                                               }\r
 \r
-                       parent = next.parentNode;\r
-                       clonedParent = _traverseNode(parent, FALSE, FALSE, how);\r
+                                               // No mce_style for elements with these since they might get resized by the user\r
+                                               if (s.keep_values) {\r
+                                                       if (v && !t._isRes(v))\r
+                                                               e.setAttribute('data-mce-style', v, 2);\r
+                                                       else\r
+                                                               e.removeAttribute('data-mce-style', 2);\r
+                                               }\r
 \r
-                       while (parent) {\r
-                               while (next) {\r
-                                       prevSibling = next.previousSibling;\r
-                                       clonedChild = _traverseNode(next, isFullySelected, FALSE, how);\r
+                                               e.style.cssText = v;\r
+                                               break;\r
 \r
-                                       if (how != DELETE)\r
-                                               clonedParent.insertBefore(clonedChild, clonedParent.firstChild);\r
+                                       case "class":\r
+                                               e.className = v || ''; // Fix IE null bug\r
+                                               break;\r
 \r
-                                       isFullySelected = TRUE;\r
-                                       next = prevSibling;\r
-                               }\r
+                                       case "src":\r
+                                       case "href":\r
+                                               if (s.keep_values) {\r
+                                                       if (s.url_converter)\r
+                                                               v = s.url_converter.call(s.url_converter_scope || t, v, n, e);\r
 \r
-                               if (parent == root)\r
-                                       return clonedParent;\r
+                                                       t.setAttrib(e, 'data-mce-' + n, v, 2);\r
+                                               }\r
 \r
-                               next = parent.previousSibling;\r
-                               parent = parent.parentNode;\r
+                                               break;\r
 \r
-                               clonedGrandParent = _traverseNode(parent, FALSE, FALSE, how);\r
+                                       case "shape":\r
+                                               e.setAttribute('data-mce-style', v);\r
+                                               break;\r
+                               }\r
 \r
-                               if (how != DELETE)\r
-                                       clonedGrandParent.appendChild(clonedParent);\r
+                               if (is(v) && v !== null && v.length !== 0)\r
+                                       e.setAttribute(n, '' + v, 2);\r
+                               else\r
+                                       e.removeAttribute(n, 2);\r
+                       });\r
+               },\r
 \r
-                               clonedParent = clonedGrandParent;\r
-                       }\r
-               };\r
+               setAttribs : function(e, o) {\r
+                       var t = this;\r
 \r
-               function _traverseLeftBoundary(root, how) {\r
-                       var next = _getSelectedNode(t[START_CONTAINER], t[START_OFFSET]), isFullySelected = next != t[START_CONTAINER], parent, clonedParent, nextSibling, clonedChild, clonedGrandParent;\r
+                       return this.run(e, function(e) {\r
+                               each(o, function(v, n) {\r
+                                       t.setAttrib(e, n, v);\r
+                               });\r
+                       });\r
+               },\r
 \r
-                       if (next == root)\r
-                               return _traverseNode(next, isFullySelected, TRUE, how);\r
+               getAttrib : function(e, n, dv) {\r
+                       var v, t = this, undef;\r
 \r
-                       parent = next.parentNode;\r
-                       clonedParent = _traverseNode(parent, FALSE, TRUE, how);\r
+                       e = t.get(e);\r
 \r
-                       while (parent) {\r
-                               while (next) {\r
-                                       nextSibling = next.nextSibling;\r
-                                       clonedChild = _traverseNode(next, isFullySelected, TRUE, how);\r
+                       if (!e || e.nodeType !== 1)\r
+                               return dv === undef ? false : dv;\r
 \r
-                                       if (how != DELETE)\r
-                                               clonedParent.appendChild(clonedChild);\r
+                       if (!is(dv))\r
+                               dv = '';\r
 \r
-                                       isFullySelected = TRUE;\r
-                                       next = nextSibling;\r
-                               }\r
+                       // Try the mce variant for these\r
+                       if (/^(src|href|style|coords|shape)$/.test(n)) {\r
+                               v = e.getAttribute("data-mce-" + n);\r
 \r
-                               if (parent == root)\r
-                                       return clonedParent;\r
+                               if (v)\r
+                                       return v;\r
+                       }\r
 \r
-                               next = parent.nextSibling;\r
-                               parent = parent.parentNode;\r
+                       if (isIE && t.props[n]) {\r
+                               v = e[t.props[n]];\r
+                               v = v && v.nodeValue ? v.nodeValue : v;\r
+                       }\r
 \r
-                               clonedGrandParent = _traverseNode(parent, FALSE, TRUE, how);\r
+                       if (!v)\r
+                               v = e.getAttribute(n, 2);\r
 \r
-                               if (how != DELETE)\r
-                                       clonedGrandParent.appendChild(clonedParent);\r
+                       // Check boolean attribs\r
+                       if (/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(n)) {\r
+                               if (e[t.props[n]] === true && v === '')\r
+                                       return n;\r
 \r
-                               clonedParent = clonedGrandParent;\r
+                               return v ? n : '';\r
                        }\r
-               };\r
 \r
-               function _traverseNode(n, isFullySelected, isLeft, how) {\r
-                       var txtValue, newNodeValue, oldNodeValue, offset, newNode;\r
+                       // Inner input elements will override attributes on form elements\r
+                       if (e.nodeName === "FORM" && e.getAttributeNode(n))\r
+                               return e.getAttributeNode(n).nodeValue;\r
 \r
-                       if (isFullySelected)\r
-                               return _traverseFullySelected(n, how);\r
+                       if (n === 'style') {\r
+                               v = v || e.style.cssText;\r
 \r
-                       if (n.nodeType == 3 /* TEXT_NODE */) {\r
-                               txtValue = n.nodeValue;\r
+                               if (v) {\r
+                                       v = t.serializeStyle(t.parseStyle(v), e.nodeName);\r
 \r
-                               if (isLeft) {\r
-                                       offset = t[START_OFFSET];\r
-                                       newNodeValue = txtValue.substring(offset);\r
-                                       oldNodeValue = txtValue.substring(0, offset);\r
-                               } else {\r
-                                       offset = t[END_OFFSET];\r
-                                       newNodeValue = txtValue.substring(0, offset);\r
-                                       oldNodeValue = txtValue.substring(offset);\r
+                                       if (t.settings.keep_values && !t._isRes(v))\r
+                                               e.setAttribute('data-mce-style', v);\r
                                }\r
-\r
-                               if (how != CLONE)\r
-                                       n.nodeValue = oldNodeValue;\r
-\r
-                               if (how == DELETE)\r
-                                       return;\r
-\r
-                               newNode = n.cloneNode(FALSE);\r
-                               newNode.nodeValue = newNodeValue;\r
-\r
-                               return newNode;\r
                        }\r
 \r
-                       if (how == DELETE)\r
-                               return;\r
+                       // Remove Apple and WebKit stuff\r
+                       if (isWebKit && n === "class" && v)\r
+                               v = v.replace(/(apple|webkit)\-[a-z\-]+/gi, '');\r
 \r
-                       return n.cloneNode(FALSE);\r
-               };\r
+                       // Handle IE issues\r
+                       if (isIE) {\r
+                               switch (n) {\r
+                                       case 'rowspan':\r
+                                       case 'colspan':\r
+                                               // IE returns 1 as default value\r
+                                               if (v === 1)\r
+                                                       v = '';\r
 \r
-               function _traverseFullySelected(n, how) {\r
-                       if (how != DELETE)\r
-                               return how == CLONE ? n.cloneNode(TRUE) : n;\r
+                                               break;\r
 \r
-                       n.parentNode.removeChild(n);\r
-               };\r
-       };\r
+                                       case 'size':\r
+                                               // IE returns +0 as default value for size\r
+                                               if (v === '+0' || v === 20 || v === 0)\r
+                                                       v = '';\r
 \r
-       ns.Range = Range;\r
-})(tinymce.dom);\r
+                                               break;\r
 \r
-(function() {\r
-       function Selection(selection) {\r
-               var t = this, invisibleChar = '\uFEFF', range, lastIERng, dom = selection.dom, TRUE = true, FALSE = false;\r
+                                       case 'width':\r
+                                       case 'height':\r
+                                       case 'vspace':\r
+                                       case 'checked':\r
+                                       case 'disabled':\r
+                                       case 'readonly':\r
+                                               if (v === 0)\r
+                                                       v = '';\r
 \r
-               // Returns a W3C DOM compatible range object by using the IE Range API\r
-               function getRange() {\r
-                       var ieRange = selection.getRng(), domRange = dom.createRng(), element, collapsed;\r
+                                               break;\r
 \r
-                       // If selection is outside the current document just return an empty range\r
-                       element = ieRange.item ? ieRange.item(0) : ieRange.parentElement();\r
-                       if (element.ownerDocument != dom.doc)\r
-                               return domRange;\r
+                                       case 'hspace':\r
+                                               // IE returns -1 as default value\r
+                                               if (v === -1)\r
+                                                       v = '';\r
 \r
-                       // Handle control selection or text selection of a image\r
-                       if (ieRange.item || !element.hasChildNodes()) {\r
-                               domRange.setStart(element.parentNode, dom.nodeIndex(element));\r
-                               domRange.setEnd(domRange.startContainer, domRange.startOffset + 1);\r
+                                               break;\r
 \r
-                               return domRange;\r
-                       }\r
+                                       case 'maxlength':\r
+                                       case 'tabindex':\r
+                                               // IE returns default value\r
+                                               if (v === 32768 || v === 2147483647 || v === '32768')\r
+                                                       v = '';\r
 \r
-                       collapsed = selection.isCollapsed();\r
+                                               break;\r
 \r
-                       function findEndPoint(start) {\r
-                               var marker, container, offset, nodes, startIndex = 0, endIndex, index, parent, checkRng, position;\r
+                                       case 'multiple':\r
+                                       case 'compact':\r
+                                       case 'noshade':\r
+                                       case 'nowrap':\r
+                                               if (v === 65535)\r
+                                                       return n;\r
 \r
-                               // Setup temp range and collapse it\r
-                               checkRng = ieRange.duplicate();\r
-                               checkRng.collapse(start);\r
+                                               return dv;\r
 \r
-                               // Create marker and insert it at the end of the endpoints parent\r
-                               marker = dom.create('a');\r
-                               parent = checkRng.parentElement();\r
+                                       case 'shape':\r
+                                               v = v.toLowerCase();\r
+                                               break;\r
 \r
-                               // If parent doesn't have any children then set the container to that parent and the index to 0\r
-                               if (!parent.hasChildNodes()) {\r
-                                       domRange[start ? 'setStart' : 'setEnd'](parent, 0);\r
-                                       return;\r
+                                       default:\r
+                                               // IE has odd anonymous function for event attributes\r
+                                               if (n.indexOf('on') === 0 && v)\r
+                                                       v = tinymce._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/, '$1', '' + v);\r
                                }\r
+                       }\r
 \r
-                               parent.appendChild(marker);\r
-                               checkRng.moveToElementText(marker);\r
-                               position = ieRange.compareEndPoints(start ? 'StartToStart' : 'EndToEnd', checkRng);\r
-                               if (position > 0) {\r
-                                       // The position is after the end of the parent element.\r
-                                       // This is the case where IE puts the caret to the left edge of a table.\r
-                                       domRange[start ? 'setStartAfter' : 'setEndAfter'](parent);\r
-                                       dom.remove(marker);\r
-                                       return;\r
+                       return (v !== undef && v !== null && v !== '') ? '' + v : dv;\r
+               },\r
+\r
+               getPos : function(n, ro) {\r
+                       var t = this, x = 0, y = 0, e, d = t.doc, r;\r
+\r
+                       n = t.get(n);\r
+                       ro = ro || d.body;\r
+\r
+                       if (n) {\r
+                               // Use getBoundingClientRect if it exists since it's faster than looping offset nodes\r
+                               if (n.getBoundingClientRect) {\r
+                                       n = n.getBoundingClientRect();\r
+                                       e = t.boxModel ? d.documentElement : d.body;\r
+\r
+                                       // Add scroll offsets from documentElement or body since IE with the wrong box model will use d.body and so do WebKit\r
+                                       // Also remove the body/documentelement clientTop/clientLeft on IE 6, 7 since they offset the position\r
+                                       x = n.left + (d.documentElement.scrollLeft || d.body.scrollLeft) - e.clientTop;\r
+                                       y = n.top + (d.documentElement.scrollTop || d.body.scrollTop) - e.clientLeft;\r
+\r
+                                       return {x : x, y : y};\r
                                }\r
 \r
-                               // Setup node list and endIndex\r
-                               nodes = tinymce.grep(parent.childNodes);\r
-                               endIndex = nodes.length - 1;\r
-                               // Perform a binary search for the position\r
-                               while (startIndex <= endIndex) {\r
-                                       index = Math.floor((startIndex + endIndex) / 2);\r
-\r
-                                       // Insert marker and check it's position relative to the selection\r
-                                       parent.insertBefore(marker, nodes[index]);\r
-                                       checkRng.moveToElementText(marker);\r
-                                       position = ieRange.compareEndPoints(start ? 'StartToStart' : 'EndToEnd', checkRng);\r
-                                       if (position > 0) {\r
-                                               // Marker is to the right\r
-                                               startIndex = index + 1;\r
-                                       } else if (position < 0) {\r
-                                               // Marker is to the left\r
-                                               endIndex = index - 1;\r
-                                       } else {\r
-                                               // Maker is where we are\r
-                                               found = true;\r
-                                               break;\r
-                                       }\r
+                               r = n;\r
+                               while (r && r != ro && r.nodeType) {\r
+                                       x += r.offsetLeft || 0;\r
+                                       y += r.offsetTop || 0;\r
+                                       r = r.offsetParent;\r
                                }\r
 \r
-                               // Setup container\r
-                               container = position > 0 || index == 0 ? marker.nextSibling : marker.previousSibling;\r
+                               r = n.parentNode;\r
+                               while (r && r != ro && r.nodeType) {\r
+                                       x -= r.scrollLeft || 0;\r
+                                       y -= r.scrollTop || 0;\r
+                                       r = r.parentNode;\r
+                               }\r
+                       }\r
 \r
-                               // Handle element selection\r
-                               if (container.nodeType == 1) {\r
-                                       dom.remove(marker);\r
+                       return {x : x, y : y};\r
+               },\r
 \r
-                                       // Find offset and container\r
-                                       offset = dom.nodeIndex(container);\r
-                                       container = container.parentNode;\r
+               parseStyle : function(st) {\r
+                       return this.styles.parse(st);\r
+               },\r
 \r
-                                       // Move the offset if we are setting the end or the position is after an element\r
-                                       if (!start || index > 0)\r
-                                               offset++;\r
-                               } else {\r
-                                       // Calculate offset within text node\r
-                                       if (position > 0 || index == 0) {\r
-                                               checkRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', ieRange);\r
-                                               offset = checkRng.text.length;\r
-                                       } else {\r
-                                               checkRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', ieRange);\r
-                                               offset = container.nodeValue.length - checkRng.text.length;\r
-                                       }\r
+               serializeStyle : function(o, name) {\r
+                       return this.styles.serialize(o, name);\r
+               },\r
 \r
-                                       dom.remove(marker);\r
+               loadCSS : function(u) {\r
+                       var t = this, d = t.doc, head;\r
+\r
+                       if (!u)\r
+                               u = '';\r
+\r
+                       head = t.select('head')[0];\r
+\r
+                       each(u.split(','), function(u) {\r
+                               var link;\r
+\r
+                               if (t.files[u])\r
+                                       return;\r
+\r
+                               t.files[u] = true;\r
+                               link = t.create('link', {rel : 'stylesheet', href : tinymce._addVer(u)});\r
+\r
+                               // IE 8 has a bug where dynamically loading stylesheets would produce a 1 item remaining bug\r
+                               // This fix seems to resolve that issue by realcing the document ones a stylesheet finishes loading\r
+                               // It's ugly but it seems to work fine.\r
+                               if (isIE && d.documentMode && d.recalc) {\r
+                                       link.onload = function() {\r
+                                               if (d.recalc)\r
+                                                       d.recalc();\r
+\r
+                                               link.onload = null;\r
+                                       };\r
                                }\r
 \r
-                               domRange[start ? 'setStart' : 'setEnd'](container, offset);\r
-                       };\r
+                               head.appendChild(link);\r
+                       });\r
+               },\r
 \r
-                       // Find start point\r
-                       findEndPoint(true);\r
+               addClass : function(e, c) {\r
+                       return this.run(e, function(e) {\r
+                               var o;\r
 \r
-                       // Find end point if needed\r
-                       if (!collapsed)\r
-                               findEndPoint();\r
+                               if (!c)\r
+                                       return 0;\r
 \r
-                       return domRange;\r
-               };\r
+                               if (this.hasClass(e, c))\r
+                                       return e.className;\r
 \r
-               this.addRange = function(rng) {\r
-                       var ieRng, ctrlRng, startContainer, startOffset, endContainer, endOffset, doc = selection.dom.doc, body = doc.body;\r
+                               o = this.removeClass(e, c);\r
 \r
-                       function setEndPoint(start) {\r
-                               var container, offset, marker, tmpRng, nodes;\r
+                               return e.className = (o != '' ? (o + ' ') : '') + c;\r
+                       });\r
+               },\r
 \r
-                               marker = dom.create('a');\r
-                               container = start ? startContainer : endContainer;\r
-                               offset = start ? startOffset : endOffset;\r
-                               tmpRng = ieRng.duplicate();\r
+               removeClass : function(e, c) {\r
+                       var t = this, re;\r
 \r
-                               if (container == doc) {\r
-                                       container = body;\r
-                                       offset = 0;\r
-                               }\r
+                       return t.run(e, function(e) {\r
+                               var v;\r
 \r
-                               if (container.nodeType == 3) {\r
-                                       container.parentNode.insertBefore(marker, container);\r
-                                       tmpRng.moveToElementText(marker);\r
-                                       tmpRng.moveStart('character', offset);\r
-                                       dom.remove(marker);\r
-                                       ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);\r
-                               } else {\r
-                                       nodes = container.childNodes;\r
+                               if (t.hasClass(e, c)) {\r
+                                       if (!re)\r
+                                               re = new RegExp("(^|\\s+)" + c + "(\\s+|$)", "g");\r
 \r
-                                       if (nodes.length) {\r
-                                               if (offset >= nodes.length) {\r
-                                                       dom.insertAfter(marker, nodes[nodes.length - 1]);\r
-                                               } else {\r
-                                                       container.insertBefore(marker, nodes[offset]);\r
-                                               }\r
+                                       v = e.className.replace(re, ' ');\r
+                                       v = tinymce.trim(v != ' ' ? v : '');\r
 \r
-                                               tmpRng.moveToElementText(marker);\r
-                                       } else {\r
-                                               // Empty node selection for example <div>|</div>\r
-                                               marker = doc.createTextNode(invisibleChar);\r
-                                               container.appendChild(marker);\r
-                                               tmpRng.moveToElementText(marker.parentNode);\r
-                                               tmpRng.collapse(TRUE);\r
+                                       e.className = v;\r
+\r
+                                       // Empty class attr\r
+                                       if (!v) {\r
+                                               e.removeAttribute('class');\r
+                                               e.removeAttribute('className');\r
                                        }\r
 \r
-                                       ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);\r
-                                       dom.remove(marker);\r
+                                       return v;\r
                                }\r
-                       }\r
 \r
-                       // Destroy cached range\r
-                       this.destroy();\r
+                               return e.className;\r
+                       });\r
+               },\r
 \r
-                       // Setup some shorter versions\r
-                       startContainer = rng.startContainer;\r
-                       startOffset = rng.startOffset;\r
-                       endContainer = rng.endContainer;\r
-                       endOffset = rng.endOffset;\r
-                       ieRng = body.createTextRange();\r
+               hasClass : function(n, c) {\r
+                       n = this.get(n);\r
 \r
-                       // If single element selection then try making a control selection out of it\r
-                       if (startContainer == endContainer && startContainer.nodeType == 1 && startOffset == endOffset - 1) {\r
-                               if (startOffset == endOffset - 1) {\r
-                                       try {\r
-                                               ctrlRng = body.createControlRange();\r
-                                               ctrlRng.addElement(startContainer.childNodes[startOffset]);\r
-                                               ctrlRng.select();\r
-                                               ctrlRng.scrollIntoView();\r
-                                               return;\r
-                                       } catch (ex) {\r
-                                               // Ignore\r
-                                       }\r
-                               }\r
-                       }\r
+                       if (!n || !c)\r
+                               return false;\r
 \r
-                       // Set start/end point of selection\r
-                       setEndPoint(true);\r
-                       setEndPoint();\r
+                       return (' ' + n.className + ' ').indexOf(' ' + c + ' ') !== -1;\r
+               },\r
 \r
-                       // Select the new range and scroll it into view\r
-                       ieRng.select();\r
-                       ieRng.scrollIntoView();\r
-               };\r
+               show : function(e) {\r
+                       return this.setStyle(e, 'display', 'block');\r
+               },\r
 \r
-               this.getRangeAt = function() {\r
-                       // Setup new range if the cache is empty\r
-                       if (!range || !tinymce.dom.RangeUtils.compareRanges(lastIERng, selection.getRng())) {\r
-                               range = getRange();\r
+               hide : function(e) {\r
+                       return this.setStyle(e, 'display', 'none');\r
+               },\r
 \r
-                               // Store away text range for next call\r
-                               lastIERng = selection.getRng();\r
-                       }\r
+               isHidden : function(e) {\r
+                       e = this.get(e);\r
 \r
-                       // IE will say that the range is equal then produce an invalid argument exception\r
-                       // if you perform specific operations in a keyup event. For example Ctrl+Del.\r
-                       // This hack will invalidate the range cache if the exception occurs\r
-                       try {\r
-                               range.startContainer.nextSibling;\r
-                       } catch (ex) {\r
-                               range = getRange();\r
-                               lastIERng = null;\r
-                       }\r
+                       return !e || e.style.display == 'none' || this.getStyle(e, 'display') == 'none';\r
+               },\r
 \r
-                       // Return cached range\r
-                       return range;\r
-               };\r
+               uniqueId : function(p) {\r
+                       return (!p ? 'mce_' : p) + (this.counter++);\r
+               },\r
 \r
-               this.destroy = function() {\r
-                       // Destroy cached range and last IE range to avoid memory leaks\r
-                       lastIERng = range = null;\r
-               };\r
-       };\r
+               setHTML : function(element, html) {\r
+                       var self = this;\r
 \r
-       // Expose the selection object\r
-       tinymce.dom.TridentSelection = Selection;\r
-})();\r
+                       return self.run(element, function(element) {\r
+                               if (isIE) {\r
+                                       // Remove all child nodes, IE keeps empty text nodes in DOM\r
+                                       while (element.firstChild)\r
+                                               element.removeChild(element.firstChild);\r
 \r
+                                       try {\r
+                                               // IE will remove comments from the beginning\r
+                                               // unless you padd the contents with something\r
+                                               element.innerHTML = '<br />' + html;\r
+                                               element.removeChild(element.firstChild);\r
+                                       } catch (ex) {\r
+                                               // IE sometimes produces an unknown runtime error on innerHTML if it's an block element within a block element for example a div inside a p\r
+                                               // This seems to fix this problem\r
+\r
+                                               // Create new div with HTML contents and a BR infront to keep comments\r
+                                               element = self.create('div');\r
+                                               element.innerHTML = '<br />' + html;\r
+\r
+                                               // Add all children from div to target\r
+                                               each (element.childNodes, function(node, i) {\r
+                                                       // Skip br element\r
+                                                       if (i)\r
+                                                               element.appendChild(node);\r
+                                               });\r
+                                       }\r
+                               } else\r
+                                       element.innerHTML = html;\r
 \r
-/*\r
- * Sizzle CSS Selector Engine - v1.0\r
- *  Copyright 2009, The Dojo Foundation\r
- *  Released under the MIT, BSD, and GPL Licenses.\r
- *  More information: http://sizzlejs.com/\r
- */\r
-(function(){\r
+                               return html;\r
+                       });\r
+               },\r
 \r
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,\r
-       done = 0,\r
-       toString = Object.prototype.toString,\r
-       hasDuplicate = false,\r
-       baseHasDuplicate = true;\r
+               getOuterHTML : function(elm) {\r
+                       var doc, self = this;\r
 \r
-// Here we check if the JavaScript engine is using some sort of\r
-// optimization where it does not always call our comparision\r
-// function. If that is the case, discard the hasDuplicate value.\r
-//   Thus far that includes Google Chrome.\r
-[0, 0].sort(function(){\r
-       baseHasDuplicate = false;\r
-       return 0;\r
-});\r
+                       elm = self.get(elm);\r
 \r
-var Sizzle = function(selector, context, results, seed) {\r
-       results = results || [];\r
-       context = context || document;\r
+                       if (!elm)\r
+                               return null;\r
 \r
-       var origContext = context;\r
+                       if (elm.nodeType === 1 && self.hasOuterHTML)\r
+                               return elm.outerHTML;\r
 \r
-       if ( context.nodeType !== 1 && context.nodeType !== 9 ) {\r
-               return [];\r
-       }\r
-       \r
-       if ( !selector || typeof selector !== "string" ) {\r
-               return results;\r
-       }\r
+                       doc = (elm.ownerDocument || self.doc).createElement("body");\r
+                       doc.appendChild(elm.cloneNode(true));\r
 \r
-       var parts = [], m, set, checkSet, extra, prune = true, contextXML = Sizzle.isXML(context),\r
-               soFar = selector, ret, cur, pop, i;\r
-       \r
-       // Reset the position of the chunker regexp (start from head)\r
-       do {\r
-               chunker.exec("");\r
-               m = chunker.exec(soFar);\r
+                       return doc.innerHTML;\r
+               },\r
 \r
-               if ( m ) {\r
-                       soFar = m[3];\r
-               \r
-                       parts.push( m[1] );\r
-               \r
-                       if ( m[2] ) {\r
-                               extra = m[3];\r
-                               break;\r
-                       }\r
-               }\r
-       } while ( m );\r
+               setOuterHTML : function(e, h, d) {\r
+                       var t = this;\r
 \r
-       if ( parts.length > 1 && origPOS.exec( selector ) ) {\r
-               if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {\r
-                       set = posProcess( parts[0] + parts[1], context );\r
-               } else {\r
-                       set = Expr.relative[ parts[0] ] ?\r
-                               [ context ] :\r
-                               Sizzle( parts.shift(), context );\r
+                       function setHTML(e, h, d) {\r
+                               var n, tp;\r
 \r
-                       while ( parts.length ) {\r
-                               selector = parts.shift();\r
+                               tp = d.createElement("body");\r
+                               tp.innerHTML = h;\r
 \r
-                               if ( Expr.relative[ selector ] ) {\r
-                                       selector += parts.shift();\r
+                               n = tp.lastChild;\r
+                               while (n) {\r
+                                       t.insertAfter(n.cloneNode(true), e);\r
+                                       n = n.previousSibling;\r
                                }\r
-                               \r
-                               set = posProcess( selector, set );\r
-                       }\r
-               }\r
-       } else {\r
-               // Take a shortcut and set the context if the root selector is an ID\r
-               // (but not if it'll be faster if the inner selector is an ID)\r
-               if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&\r
-                               Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {\r
-                       ret = Sizzle.find( parts.shift(), context, contextXML );\r
-                       context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];\r
-               }\r
 \r
-               if ( context ) {\r
-                       ret = seed ?\r
-                               { expr: parts.pop(), set: makeArray(seed) } :\r
-                               Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );\r
-                       set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;\r
+                               t.remove(e);\r
+                       };\r
 \r
-                       if ( parts.length > 0 ) {\r
-                               checkSet = makeArray(set);\r
-                       } else {\r
-                               prune = false;\r
-                       }\r
+                       return this.run(e, function(e) {\r
+                               e = t.get(e);\r
 \r
-                       while ( parts.length ) {\r
-                               cur = parts.pop();\r
-                               pop = cur;\r
+                               // Only set HTML on elements\r
+                               if (e.nodeType == 1) {\r
+                                       d = d || e.ownerDocument || t.doc;\r
 \r
-                               if ( !Expr.relative[ cur ] ) {\r
-                                       cur = "";\r
-                               } else {\r
-                                       pop = parts.pop();\r
+                                       if (isIE) {\r
+                                               try {\r
+                                                       // Try outerHTML for IE it sometimes produces an unknown runtime error\r
+                                                       if (isIE && e.nodeType == 1)\r
+                                                               e.outerHTML = h;\r
+                                                       else\r
+                                                               setHTML(e, h, d);\r
+                                               } catch (ex) {\r
+                                                       // Fix for unknown runtime error\r
+                                                       setHTML(e, h, d);\r
+                                               }\r
+                                       } else\r
+                                               setHTML(e, h, d);\r
                                }\r
+                       });\r
+               },\r
 \r
-                               if ( pop == null ) {\r
-                                       pop = context;\r
-                               }\r
+               decode : Entities.decode,\r
 \r
-                               Expr.relative[ cur ]( checkSet, pop, contextXML );\r
-                       }\r
-               } else {\r
-                       checkSet = parts = [];\r
-               }\r
-       }\r
+               encode : Entities.encodeAllRaw,\r
 \r
-       if ( !checkSet ) {\r
-               checkSet = set;\r
-       }\r
+               insertAfter : function(node, reference_node) {\r
+                       reference_node = this.get(reference_node);\r
 \r
-       if ( !checkSet ) {\r
-               Sizzle.error( cur || selector );\r
-       }\r
+                       return this.run(node, function(node) {\r
+                               var parent, nextSibling;\r
 \r
-       if ( toString.call(checkSet) === "[object Array]" ) {\r
-               if ( !prune ) {\r
-                       results.push.apply( results, checkSet );\r
-               } else if ( context && context.nodeType === 1 ) {\r
-                       for ( i = 0; checkSet[i] != null; i++ ) {\r
-                               if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {\r
-                                       results.push( set[i] );\r
-                               }\r
-                       }\r
-               } else {\r
-                       for ( i = 0; checkSet[i] != null; i++ ) {\r
-                               if ( checkSet[i] && checkSet[i].nodeType === 1 ) {\r
-                                       results.push( set[i] );\r
-                               }\r
-                       }\r
-               }\r
-       } else {\r
-               makeArray( checkSet, results );\r
-       }\r
+                               parent = reference_node.parentNode;\r
+                               nextSibling = reference_node.nextSibling;\r
 \r
-       if ( extra ) {\r
-               Sizzle( extra, origContext, results, seed );\r
-               Sizzle.uniqueSort( results );\r
-       }\r
+                               if (nextSibling)\r
+                                       parent.insertBefore(node, nextSibling);\r
+                               else\r
+                                       parent.appendChild(node);\r
 \r
-       return results;\r
-};\r
+                               return node;\r
+                       });\r
+               },\r
 \r
-Sizzle.uniqueSort = function(results){\r
-       if ( sortOrder ) {\r
-               hasDuplicate = baseHasDuplicate;\r
-               results.sort(sortOrder);\r
+               isBlock : function(node) {\r
+                       var type = node.nodeType;\r
 \r
-               if ( hasDuplicate ) {\r
-                       for ( var i = 1; i < results.length; i++ ) {\r
-                               if ( results[i] === results[i-1] ) {\r
-                                       results.splice(i--, 1);\r
-                               }\r
-                       }\r
-               }\r
-       }\r
+                       // If it's a node then check the type and use the nodeName\r
+                       if (type)\r
+                               return !!(type === 1 && blockElementsMap[node.nodeName]);\r
 \r
-       return results;\r
-};\r
+                       return !!blockElementsMap[node];\r
+               },\r
 \r
-Sizzle.matches = function(expr, set){\r
-       return Sizzle(expr, null, null, set);\r
-};\r
+               replace : function(n, o, k) {\r
+                       var t = this;\r
 \r
-Sizzle.find = function(expr, context, isXML){\r
-       var set;\r
+                       if (is(o, 'array'))\r
+                               n = n.cloneNode(true);\r
 \r
-       if ( !expr ) {\r
-               return [];\r
-       }\r
+                       return t.run(o, function(o) {\r
+                               if (k) {\r
+                                       each(tinymce.grep(o.childNodes), function(c) {\r
+                                               n.appendChild(c);\r
+                                       });\r
+                               }\r
 \r
-       for ( var i = 0, l = Expr.order.length; i < l; i++ ) {\r
-               var type = Expr.order[i], match;\r
-               \r
-               if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {\r
-                       var left = match[1];\r
-                       match.splice(1,1);\r
+                               return o.parentNode.replaceChild(n, o);\r
+                       });\r
+               },\r
 \r
-                       if ( left.substr( left.length - 1 ) !== "\\" ) {\r
-                               match[1] = (match[1] || "").replace(/\\/g, "");\r
-                               set = Expr.find[ type ]( match, context, isXML );\r
-                               if ( set != null ) {\r
-                                       expr = expr.replace( Expr.match[ type ], "" );\r
-                                       break;\r
-                               }\r
-                       }\r
-               }\r
-       }\r
+               rename : function(elm, name) {\r
+                       var t = this, newElm;\r
 \r
-       if ( !set ) {\r
-               set = context.getElementsByTagName("*");\r
-       }\r
+                       if (elm.nodeName != name.toUpperCase()) {\r
+                               // Rename block element\r
+                               newElm = t.create(name);\r
 \r
-       return {set: set, expr: expr};\r
-};\r
+                               // Copy attribs to new block\r
+                               each(t.getAttribs(elm), function(attr_node) {\r
+                                       t.setAttrib(newElm, attr_node.nodeName, t.getAttrib(elm, attr_node.nodeName));\r
+                               });\r
 \r
-Sizzle.filter = function(expr, set, inplace, not){\r
-       var old = expr, result = [], curLoop = set, match, anyFound,\r
-               isXMLFilter = set && set[0] && Sizzle.isXML(set[0]);\r
+                               // Replace block\r
+                               t.replace(newElm, elm, 1);\r
+                       }\r
 \r
-       while ( expr && set.length ) {\r
-               for ( var type in Expr.filter ) {\r
-                       if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {\r
-                               var filter = Expr.filter[ type ], found, item, left = match[1];\r
-                               anyFound = false;\r
+                       return newElm || elm;\r
+               },\r
 \r
-                               match.splice(1,1);\r
+               findCommonAncestor : function(a, b) {\r
+                       var ps = a, pe;\r
 \r
-                               if ( left.substr( left.length - 1 ) === "\\" ) {\r
-                                       continue;\r
-                               }\r
+                       while (ps) {\r
+                               pe = b;\r
 \r
-                               if ( curLoop === result ) {\r
-                                       result = [];\r
-                               }\r
+                               while (pe && ps != pe)\r
+                                       pe = pe.parentNode;\r
 \r
-                               if ( Expr.preFilter[ type ] ) {\r
-                                       match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );\r
+                               if (ps == pe)\r
+                                       break;\r
 \r
-                                       if ( !match ) {\r
-                                               anyFound = found = true;\r
-                                       } else if ( match === true ) {\r
-                                               continue;\r
-                                       }\r
-                               }\r
+                               ps = ps.parentNode;\r
+                       }\r
 \r
-                               if ( match ) {\r
-                                       for ( var i = 0; (item = curLoop[i]) != null; i++ ) {\r
-                                               if ( item ) {\r
-                                                       found = filter( item, match, i, curLoop );\r
-                                                       var pass = not ^ !!found;\r
+                       if (!ps && a.ownerDocument)\r
+                               return a.ownerDocument.documentElement;\r
 \r
-                                                       if ( inplace && found != null ) {\r
-                                                               if ( pass ) {\r
-                                                                       anyFound = true;\r
-                                                               } else {\r
-                                                                       curLoop[i] = false;\r
-                                                               }\r
-                                                       } else if ( pass ) {\r
-                                                               result.push( item );\r
-                                                               anyFound = true;\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               }\r
+                       return ps;\r
+               },\r
 \r
-                               if ( found !== undefined ) {\r
-                                       if ( !inplace ) {\r
-                                               curLoop = result;\r
-                                       }\r
+               toHex : function(s) {\r
+                       var c = /^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(s);\r
 \r
-                                       expr = expr.replace( Expr.match[ type ], "" );\r
+                       function hex(s) {\r
+                               s = parseInt(s).toString(16);\r
 \r
-                                       if ( !anyFound ) {\r
-                                               return [];\r
-                                       }\r
+                               return s.length > 1 ? s : '0' + s; // 0 -> 00\r
+                       };\r
 \r
-                                       break;\r
-                               }\r
-                       }\r
-               }\r
+                       if (c) {\r
+                               s = '#' + hex(c[1]) + hex(c[2]) + hex(c[3]);\r
 \r
-               // Improper expression\r
-               if ( expr === old ) {\r
-                       if ( anyFound == null ) {\r
-                               Sizzle.error( expr );\r
-                       } else {\r
-                               break;\r
+                               return s;\r
                        }\r
-               }\r
 \r
-               old = expr;\r
-       }\r
+                       return s;\r
+               },\r
 \r
-       return curLoop;\r
-};\r
+               getClasses : function() {\r
+                       var t = this, cl = [], i, lo = {}, f = t.settings.class_filter, ov;\r
 \r
-Sizzle.error = function( msg ) {\r
-       throw "Syntax error, unrecognized expression: " + msg;\r
-};\r
+                       if (t.classes)\r
+                               return t.classes;\r
 \r
-var Expr = Sizzle.selectors = {\r
-       order: [ "ID", "NAME", "TAG" ],\r
-       match: {\r
-               ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,\r
-               CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,\r
-               NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,\r
-               ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,\r
-               TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,\r
-               CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,\r
-               POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,\r
-               PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/\r
-       },\r
-       leftMatch: {},\r
-       attrMap: {\r
-               "class": "className",\r
-               "for": "htmlFor"\r
-       },\r
-       attrHandle: {\r
-               href: function(elem){\r
-                       return elem.getAttribute("href");\r
-               }\r
-       },\r
-       relative: {\r
-               "+": function(checkSet, part){\r
-                       var isPartStr = typeof part === "string",\r
-                               isTag = isPartStr && !/\W/.test(part),\r
-                               isPartStrNotTag = isPartStr && !isTag;\r
+                       function addClasses(s) {\r
+                               // IE style imports\r
+                               each(s.imports, function(r) {\r
+                                       addClasses(r);\r
+                               });\r
 \r
-                       if ( isTag ) {\r
-                               part = part.toLowerCase();\r
-                       }\r
+                               each(s.cssRules || s.rules, function(r) {\r
+                                       // Real type or fake it on IE\r
+                                       switch (r.type || 1) {\r
+                                               // Rule\r
+                                               case 1:\r
+                                                       if (r.selectorText) {\r
+                                                               each(r.selectorText.split(','), function(v) {\r
+                                                                       v = v.replace(/^\s*|\s*$|^\s\./g, "");\r
 \r
-                       for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {\r
-                               if ( (elem = checkSet[i]) ) {\r
-                                       while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}\r
+                                                                       // Is internal or it doesn't contain a class\r
+                                                                       if (/\.mce/.test(v) || !/\.[\w\-]+$/.test(v))\r
+                                                                               return;\r
 \r
-                                       checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?\r
-                                               elem || false :\r
-                                               elem === part;\r
-                               }\r
-                       }\r
+                                                                       // Remove everything but class name\r
+                                                                       ov = v;\r
+                                                                       v = tinymce._replace(/.*\.([a-z0-9_\-]+).*/i, '$1', v);\r
 \r
-                       if ( isPartStrNotTag ) {\r
-                               Sizzle.filter( part, checkSet, true );\r
-                       }\r
-               },\r
-               ">": function(checkSet, part){\r
-                       var isPartStr = typeof part === "string",\r
-                               elem, i = 0, l = checkSet.length;\r
+                                                                       // Filter classes\r
+                                                                       if (f && !(v = f(v, ov)))\r
+                                                                               return;\r
 \r
-                       if ( isPartStr && !/\W/.test(part) ) {\r
-                               part = part.toLowerCase();\r
+                                                                       if (!lo[v]) {\r
+                                                                               cl.push({'class' : v});\r
+                                                                               lo[v] = 1;\r
+                                                                       }\r
+                                                               });\r
+                                                       }\r
+                                                       break;\r
 \r
-                               for ( ; i < l; i++ ) {\r
-                                       elem = checkSet[i];\r
-                                       if ( elem ) {\r
-                                               var parent = elem.parentNode;\r
-                                               checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;\r
-                                       }\r
-                               }\r
-                       } else {\r
-                               for ( ; i < l; i++ ) {\r
-                                       elem = checkSet[i];\r
-                                       if ( elem ) {\r
-                                               checkSet[i] = isPartStr ?\r
-                                                       elem.parentNode :\r
-                                                       elem.parentNode === part;\r
+                                               // Import\r
+                                               case 3:\r
+                                                       addClasses(r.styleSheet);\r
+                                                       break;\r
                                        }\r
-                               }\r
+                               });\r
+                       };\r
 \r
-                               if ( isPartStr ) {\r
-                                       Sizzle.filter( part, checkSet, true );\r
-                               }\r
+                       try {\r
+                               each(t.doc.styleSheets, addClasses);\r
+                       } catch (ex) {\r
+                               // Ignore\r
                        }\r
-               },\r
-               "": function(checkSet, part, isXML){\r
-                       var doneName = done++, checkFn = dirCheck, nodeCheck;\r
 \r
-                       if ( typeof part === "string" && !/\W/.test(part) ) {\r
-                               part = part.toLowerCase();\r
-                               nodeCheck = part;\r
-                               checkFn = dirNodeCheck;\r
-                       }\r
+                       if (cl.length > 0)\r
+                               t.classes = cl;\r
 \r
-                       checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);\r
+                       return cl;\r
                },\r
-               "~": function(checkSet, part, isXML){\r
-                       var doneName = done++, checkFn = dirCheck, nodeCheck;\r
 \r
-                       if ( typeof part === "string" && !/\W/.test(part) ) {\r
-                               part = part.toLowerCase();\r
-                               nodeCheck = part;\r
-                               checkFn = dirNodeCheck;\r
-                       }\r
+               run : function(e, f, s) {\r
+                       var t = this, o;\r
 \r
-                       checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);\r
-               }\r
-       },\r
-       find: {\r
-               ID: function(match, context, isXML){\r
-                       if ( typeof context.getElementById !== "undefined" && !isXML ) {\r
-                               var m = context.getElementById(match[1]);\r
-                               return m ? [m] : [];\r
-                       }\r
-               },\r
-               NAME: function(match, context){\r
-                       if ( typeof context.getElementsByName !== "undefined" ) {\r
-                               var ret = [], results = context.getElementsByName(match[1]);\r
+                       if (t.doc && typeof(e) === 'string')\r
+                               e = t.get(e);\r
 \r
-                               for ( var i = 0, l = results.length; i < l; i++ ) {\r
-                                       if ( results[i].getAttribute("name") === match[1] ) {\r
-                                               ret.push( results[i] );\r
-                                       }\r
-                               }\r
+                       if (!e)\r
+                               return false;\r
 \r
-                               return ret.length === 0 ? null : ret;\r
-                       }\r
-               },\r
-               TAG: function(match, context){\r
-                       return context.getElementsByTagName(match[1]);\r
-               }\r
-       },\r
-       preFilter: {\r
-               CLASS: function(match, curLoop, inplace, result, not, isXML){\r
-                       match = " " + match[1].replace(/\\/g, "") + " ";\r
+                       s = s || this;\r
+                       if (!e.nodeType && (e.length || e.length === 0)) {\r
+                               o = [];\r
 \r
-                       if ( isXML ) {\r
-                               return match;\r
-                       }\r
+                               each(e, function(e, i) {\r
+                                       if (e) {\r
+                                               if (typeof(e) == 'string')\r
+                                                       e = t.doc.getElementById(e);\r
 \r
-                       for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {\r
-                               if ( elem ) {\r
-                                       if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {\r
-                                               if ( !inplace ) {\r
-                                                       result.push( elem );\r
-                                               }\r
-                                       } else if ( inplace ) {\r
-                                               curLoop[i] = false;\r
+                                               o.push(f.call(s, e, i));\r
                                        }\r
-                               }\r
+                               });\r
+\r
+                               return o;\r
                        }\r
 \r
-                       return false;\r
-               },\r
-               ID: function(match){\r
-                       return match[1].replace(/\\/g, "");\r
-               },\r
-               TAG: function(match, curLoop){\r
-                       return match[1].toLowerCase();\r
+                       return f.call(s, e);\r
                },\r
-               CHILD: function(match){\r
-                       if ( match[1] === "nth" ) {\r
-                               // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'\r
-                               var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(\r
-                                       match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||\r
-                                       !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);\r
 \r
-                               // calculate the numbers (first)n+(last) including if they are negative\r
-                               match[2] = (test[1] + (test[2] || 1)) - 0;\r
-                               match[3] = test[3] - 0;\r
-                       }\r
+               getAttribs : function(n) {\r
+                       var o;\r
 \r
-                       // TODO: Move to normal caching system\r
-                       match[0] = done++;\r
+                       n = this.get(n);\r
 \r
-                       return match;\r
-               },\r
-               ATTR: function(match, curLoop, inplace, result, not, isXML){\r
-                       var name = match[1].replace(/\\/g, "");\r
-                       \r
-                       if ( !isXML && Expr.attrMap[name] ) {\r
-                               match[1] = Expr.attrMap[name];\r
-                       }\r
+                       if (!n)\r
+                               return [];\r
 \r
-                       if ( match[2] === "~=" ) {\r
-                               match[4] = " " + match[4] + " ";\r
+                       if (isIE) {\r
+                               o = [];\r
+\r
+                               // Object will throw exception in IE\r
+                               if (n.nodeName == 'OBJECT')\r
+                                       return n.attributes;\r
+\r
+                               // IE doesn't keep the selected attribute if you clone option elements\r
+                               if (n.nodeName === 'OPTION' && this.getAttrib(n, 'selected'))\r
+                                       o.push({specified : 1, nodeName : 'selected'});\r
+\r
+                               // It's crazy that this is faster in IE but it's because it returns all attributes all the time\r
+                               n.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi, '').replace(/[\w:\-]+/gi, function(a) {\r
+                                       o.push({specified : 1, nodeName : a});\r
+                               });\r
+\r
+                               return o;\r
                        }\r
 \r
-                       return match;\r
+                       return n.attributes;\r
                },\r
-               PSEUDO: function(match, curLoop, inplace, result, not){\r
-                       if ( match[1] === "not" ) {\r
-                               // If we're dealing with a complex expression, or a simple one\r
-                               if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {\r
-                                       match[3] = Sizzle(match[3], null, null, curLoop);\r
-                               } else {\r
-                                       var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);\r
-                                       if ( !inplace ) {\r
-                                               result.push.apply( result, ret );\r
+\r
+               isEmpty : function(node, elements) {\r
+                       var self = this, i, attributes, type, walker, name, parentNode;\r
+\r
+                       node = node.firstChild;\r
+                       if (node) {\r
+                               walker = new tinymce.dom.TreeWalker(node);\r
+                               elements = elements || self.schema ? self.schema.getNonEmptyElements() : null;\r
+\r
+                               do {\r
+                                       type = node.nodeType;\r
+\r
+                                       if (type === 1) {\r
+                                               // Ignore bogus elements\r
+                                               if (node.getAttribute('data-mce-bogus'))\r
+                                                       continue;\r
+\r
+                                               // Keep empty elements like <img />\r
+                                               name = node.nodeName.toLowerCase();\r
+                                               if (elements && elements[name]) {\r
+                                                       // Ignore single BR elements in blocks like <p><br /></p>\r
+                                                       parentNode = node.parentNode;\r
+                                                       if (name === 'br' && self.isBlock(parentNode) && parentNode.firstChild === node && parentNode.lastChild === node) {\r
+                                                               continue;\r
+                                                       }\r
+\r
+                                                       return false;\r
+                                               }\r
+\r
+                                               // Keep elements with data-bookmark attributes or name attribute like <a name="1"></a>\r
+                                               attributes = self.getAttribs(node);\r
+                                               i = node.attributes.length;\r
+                                               while (i--) {\r
+                                                       name = node.attributes[i].nodeName;\r
+                                                       if (name === "name" || name === 'data-mce-bookmark')\r
+                                                               return false;\r
+                                               }\r
                                        }\r
-                                       return false;\r
-                               }\r
-                       } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {\r
-                               return true;\r
+\r
+                                       // Keep non whitespace text nodes\r
+                                       if ((type === 3 && !whiteSpaceRegExp.test(node.nodeValue)))\r
+                                               return false;\r
+                               } while (node = walker.next());\r
                        }\r
-                       \r
-                       return match;\r
-               },\r
-               POS: function(match){\r
-                       match.unshift( true );\r
-                       return match;\r
-               }\r
-       },\r
-       filters: {\r
-               enabled: function(elem){\r
-                       return elem.disabled === false && elem.type !== "hidden";\r
-               },\r
-               disabled: function(elem){\r
-                       return elem.disabled === true;\r
-               },\r
-               checked: function(elem){\r
-                       return elem.checked === true;\r
-               },\r
-               selected: function(elem){\r
-                       // Accessing this property makes selected-by-default\r
-                       // options in Safari work properly\r
-                       elem.parentNode.selectedIndex;\r
-                       return elem.selected === true;\r
-               },\r
-               parent: function(elem){\r
-                       return !!elem.firstChild;\r
-               },\r
-               empty: function(elem){\r
-                       return !elem.firstChild;\r
-               },\r
-               has: function(elem, i, match){\r
-                       return !!Sizzle( match[3], elem ).length;\r
-               },\r
-               header: function(elem){\r
-                       return (/h\d/i).test( elem.nodeName );\r
-               },\r
-               text: function(elem){\r
-                       return "text" === elem.type;\r
-               },\r
-               radio: function(elem){\r
-                       return "radio" === elem.type;\r
-               },\r
-               checkbox: function(elem){\r
-                       return "checkbox" === elem.type;\r
-               },\r
-               file: function(elem){\r
-                       return "file" === elem.type;\r
-               },\r
-               password: function(elem){\r
-                       return "password" === elem.type;\r
-               },\r
-               submit: function(elem){\r
-                       return "submit" === elem.type;\r
-               },\r
-               image: function(elem){\r
-                       return "image" === elem.type;\r
-               },\r
-               reset: function(elem){\r
-                       return "reset" === elem.type;\r
-               },\r
-               button: function(elem){\r
-                       return "button" === elem.type || elem.nodeName.toLowerCase() === "button";\r
-               },\r
-               input: function(elem){\r
-                       return (/input|select|textarea|button/i).test(elem.nodeName);\r
-               }\r
-       },\r
-       setFilters: {\r
-               first: function(elem, i){\r
-                       return i === 0;\r
-               },\r
-               last: function(elem, i, match, array){\r
-                       return i === array.length - 1;\r
-               },\r
-               even: function(elem, i){\r
-                       return i % 2 === 0;\r
-               },\r
-               odd: function(elem, i){\r
-                       return i % 2 === 1;\r
-               },\r
-               lt: function(elem, i, match){\r
-                       return i < match[3] - 0;\r
+\r
+                       return true;\r
                },\r
-               gt: function(elem, i, match){\r
-                       return i > match[3] - 0;\r
+\r
+               destroy : function(s) {\r
+                       var t = this;\r
+\r
+                       if (t.events)\r
+                               t.events.destroy();\r
+\r
+                       t.win = t.doc = t.root = t.events = null;\r
+\r
+                       // Manual destroy then remove unload handler\r
+                       if (!s)\r
+                               tinymce.removeUnload(t.destroy);\r
                },\r
-               nth: function(elem, i, match){\r
-                       return match[3] - 0 === i;\r
+\r
+               createRng : function() {\r
+                       var d = this.doc;\r
+\r
+                       return d.createRange ? d.createRange() : new tinymce.dom.Range(this);\r
                },\r
-               eq: function(elem, i, match){\r
-                       return match[3] - 0 === i;\r
-               }\r
-       },\r
-       filter: {\r
-               PSEUDO: function(elem, match, i, array){\r
-                       var name = match[1], filter = Expr.filters[ name ];\r
 \r
-                       if ( filter ) {\r
-                               return filter( elem, i, match, array );\r
-                       } else if ( name === "contains" ) {\r
-                               return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;\r
-                       } else if ( name === "not" ) {\r
-                               var not = match[3];\r
+               nodeIndex : function(node, normalized) {\r
+                       var idx = 0, lastNodeType, lastNode, nodeType;\r
 \r
-                               for ( var j = 0, l = not.length; j < l; j++ ) {\r
-                                       if ( not[j] === elem ) {\r
-                                               return false;\r
+                       if (node) {\r
+                               for (lastNodeType = node.nodeType, node = node.previousSibling, lastNode = node; node; node = node.previousSibling) {\r
+                                       nodeType = node.nodeType;\r
+\r
+                                       // Normalize text nodes\r
+                                       if (normalized && nodeType == 3) {\r
+                                               if (nodeType == lastNodeType || !node.nodeValue.length)\r
+                                                       continue;\r
                                        }\r
+                                       idx++;\r
+                                       lastNodeType = nodeType;\r
                                }\r
-\r
-                               return true;\r
-                       } else {\r
-                               Sizzle.error( "Syntax error, unrecognized expression: " + name );\r
                        }\r
+\r
+                       return idx;\r
                },\r
-               CHILD: function(elem, match){\r
-                       var type = match[1], node = elem;\r
-                       switch (type) {\r
-                               case 'only':\r
-                               case 'first':\r
-                                       while ( (node = node.previousSibling) )  {\r
-                                               if ( node.nodeType === 1 ) { \r
-                                                       return false; \r
-                                               }\r
-                                       }\r
-                                       if ( type === "first" ) { \r
-                                               return true; \r
-                                       }\r
-                                       node = elem;\r
-                               case 'last':\r
-                                       while ( (node = node.nextSibling) )      {\r
-                                               if ( node.nodeType === 1 ) { \r
-                                                       return false; \r
-                                               }\r
-                                       }\r
-                                       return true;\r
-                               case 'nth':\r
-                                       var first = match[2], last = match[3];\r
 \r
-                                       if ( first === 1 && last === 0 ) {\r
-                                               return true;\r
-                                       }\r
-                                       \r
-                                       var doneName = match[0],\r
-                                               parent = elem.parentNode;\r
-       \r
-                                       if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {\r
-                                               var count = 0;\r
-                                               for ( node = parent.firstChild; node; node = node.nextSibling ) {\r
-                                                       if ( node.nodeType === 1 ) {\r
-                                                               node.nodeIndex = ++count;\r
-                                                       }\r
-                                               } \r
-                                               parent.sizcache = doneName;\r
-                                       }\r
-                                       \r
-                                       var diff = elem.nodeIndex - last;\r
-                                       if ( first === 0 ) {\r
-                                               return diff === 0;\r
-                                       } else {\r
-                                               return ( diff % first === 0 && diff / first >= 0 );\r
+               split : function(pe, e, re) {\r
+                       var t = this, r = t.createRng(), bef, aft, pa;\r
+\r
+                       // W3C valid browsers tend to leave empty nodes to the left/right side of the contents, this makes sense\r
+                       // but we don't want that in our code since it serves no purpose for the end user\r
+                       // For example if this is chopped:\r
+                       //   <p>text 1<span><b>CHOP</b></span>text 2</p>\r
+                       // would produce:\r
+                       //   <p>text 1<span></span></p><b>CHOP</b><p><span></span>text 2</p>\r
+                       // this function will then trim of empty edges and produce:\r
+                       //   <p>text 1</p><b>CHOP</b><p>text 2</p>\r
+                       function trim(node) {\r
+                               var i, children = node.childNodes, type = node.nodeType;\r
+\r
+                               if (type == 1 && node.getAttribute('data-mce-type') == 'bookmark')\r
+                                       return;\r
+\r
+                               for (i = children.length - 1; i >= 0; i--)\r
+                                       trim(children[i]);\r
+\r
+                               if (type != 9) {\r
+                                       // Keep non whitespace text nodes\r
+                                       if (type == 3 && node.nodeValue.length > 0) {\r
+                                               // If parent element isn't a block or there isn't any useful contents for example "<p>   </p>"\r
+                                               if (!t.isBlock(node.parentNode) || tinymce.trim(node.nodeValue).length > 0)\r
+                                                       return;\r
+                                       } else if (type == 1) {\r
+                                               // If the only child is a bookmark then move it up\r
+                                               children = node.childNodes;\r
+                                               if (children.length == 1 && children[0] && children[0].nodeType == 1 && children[0].getAttribute('data-mce-type') == 'bookmark')\r
+                                                       node.parentNode.insertBefore(children[0], node);\r
+\r
+                                               // Keep non empty elements or img, hr etc\r
+                                               if (children.length || /^(br|hr|input|img)$/i.test(node.nodeName))\r
+                                                       return;\r
                                        }\r
+\r
+                                       t.remove(node);\r
+                               }\r
+\r
+                               return node;\r
+                       };\r
+\r
+                       if (pe && e) {\r
+                               // Get before chunk\r
+                               r.setStart(pe.parentNode, t.nodeIndex(pe));\r
+                               r.setEnd(e.parentNode, t.nodeIndex(e));\r
+                               bef = r.extractContents();\r
+\r
+                               // Get after chunk\r
+                               r = t.createRng();\r
+                               r.setStart(e.parentNode, t.nodeIndex(e) + 1);\r
+                               r.setEnd(pe.parentNode, t.nodeIndex(pe) + 1);\r
+                               aft = r.extractContents();\r
+\r
+                               // Insert before chunk\r
+                               pa = pe.parentNode;\r
+                               pa.insertBefore(trim(bef), pe);\r
+\r
+                               // Insert middle chunk\r
+                               if (re)\r
+                                       pa.replaceChild(re, e);\r
+                               else\r
+                                       pa.insertBefore(e, pe);\r
+\r
+                               // Insert after chunk\r
+                               pa.insertBefore(trim(aft), pe);\r
+                               t.remove(pe);\r
+\r
+                               return re || e;\r
                        }\r
                },\r
-               ID: function(elem, match){\r
-                       return elem.nodeType === 1 && elem.getAttribute("id") === match;\r
-               },\r
-               TAG: function(elem, match){\r
-                       return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;\r
-               },\r
-               CLASS: function(elem, match){\r
-                       return (" " + (elem.className || elem.getAttribute("class")) + " ")\r
-                               .indexOf( match ) > -1;\r
-               },\r
-               ATTR: function(elem, match){\r
-                       var name = match[1],\r
-                               result = Expr.attrHandle[ name ] ?\r
-                                       Expr.attrHandle[ name ]( elem ) :\r
-                                       elem[ name ] != null ?\r
-                                               elem[ name ] :\r
-                                               elem.getAttribute( name ),\r
-                               value = result + "",\r
-                               type = match[2],\r
-                               check = match[4];\r
 \r
-                       return result == null ?\r
-                               type === "!=" :\r
-                               type === "=" ?\r
-                               value === check :\r
-                               type === "*=" ?\r
-                               value.indexOf(check) >= 0 :\r
-                               type === "~=" ?\r
-                               (" " + value + " ").indexOf(check) >= 0 :\r
-                               !check ?\r
-                               value && result !== false :\r
-                               type === "!=" ?\r
-                               value !== check :\r
-                               type === "^=" ?\r
-                               value.indexOf(check) === 0 :\r
-                               type === "$=" ?\r
-                               value.substr(value.length - check.length) === check :\r
-                               type === "|=" ?\r
-                               value === check || value.substr(0, check.length + 1) === check + "-" :\r
-                               false;\r
-               },\r
-               POS: function(elem, match, i, array){\r
-                       var name = match[2], filter = Expr.setFilters[ name ];\r
+               bind : function(target, name, func, scope) {\r
+                       var t = this;\r
 \r
-                       if ( filter ) {\r
-                               return filter( elem, i, match, array );\r
-                       }\r
-               }\r
-       }\r
-};\r
+                       if (!t.events)\r
+                               t.events = new tinymce.dom.EventUtils();\r
 \r
-var origPOS = Expr.match.POS,\r
-       fescape = function(all, num){\r
-               return "\\" + (num - 0 + 1);\r
-       };\r
+                       return t.events.add(target, name, func, scope || this);\r
+               },\r
 \r
-for ( var type in Expr.match ) {\r
-       Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );\r
-       Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );\r
-}\r
+               unbind : function(target, name, func) {\r
+                       var t = this;\r
 \r
-var makeArray = function(array, results) {\r
-       array = Array.prototype.slice.call( array, 0 );\r
+                       if (!t.events)\r
+                               t.events = new tinymce.dom.EventUtils();\r
 \r
-       if ( results ) {\r
-               results.push.apply( results, array );\r
-               return results;\r
-       }\r
-       \r
-       return array;\r
-};\r
+                       return t.events.remove(target, name, func);\r
+               },\r
 \r
-// Perform a simple check to determine if the browser is capable of\r
-// converting a NodeList to an array using builtin methods.\r
-// Also verifies that the returned array holds DOM nodes\r
-// (which is not the case in the Blackberry browser)\r
-try {\r
-       Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;\r
 \r
-// Provide a fallback method if it does not work\r
-} catch(e){\r
-       makeArray = function(array, results) {\r
-               var ret = results || [], i = 0;\r
+               _findSib : function(node, selector, name) {\r
+                       var t = this, f = selector;\r
 \r
-               if ( toString.call(array) === "[object Array]" ) {\r
-                       Array.prototype.push.apply( ret, array );\r
-               } else {\r
-                       if ( typeof array.length === "number" ) {\r
-                               for ( var l = array.length; i < l; i++ ) {\r
-                                       ret.push( array[i] );\r
+                       if (node) {\r
+                               // If expression make a function of it using is\r
+                               if (is(f, 'string')) {\r
+                                       f = function(node) {\r
+                                               return t.is(node, selector);\r
+                                       };\r
                                }\r
-                       } else {\r
-                               for ( ; array[i]; i++ ) {\r
-                                       ret.push( array[i] );\r
+\r
+                               // Loop all siblings\r
+                               for (node = node[name]; node; node = node[name]) {\r
+                                       if (f(node))\r
+                                               return node;\r
                                }\r
                        }\r
-               }\r
-\r
-               return ret;\r
-       };\r
-}\r
 \r
-var sortOrder;\r
+                       return null;\r
+               },\r
 \r
-if ( document.documentElement.compareDocumentPosition ) {\r
-       sortOrder = function( a, b ) {\r
-               if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {\r
-                       if ( a == b ) {\r
-                               hasDuplicate = true;\r
-                       }\r
-                       return a.compareDocumentPosition ? -1 : 1;\r
+               _isRes : function(c) {\r
+                       // Is live resizble element\r
+                       return /^(top|left|bottom|right|width|height)/i.test(c) || /;\s*(top|left|bottom|right|width|height)/i.test(c);\r
                }\r
 \r
-               var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;\r
-               if ( ret === 0 ) {\r
-                       hasDuplicate = true;\r
-               }\r
-               return ret;\r
-       };\r
-} else if ( "sourceIndex" in document.documentElement ) {\r
-       sortOrder = function( a, b ) {\r
-               if ( !a.sourceIndex || !b.sourceIndex ) {\r
-                       if ( a == b ) {\r
-                               hasDuplicate = true;\r
-                       }\r
-                       return a.sourceIndex ? -1 : 1;\r
-               }\r
+               /*\r
+               walk : function(n, f, s) {\r
+                       var d = this.doc, w;\r
 \r
-               var ret = a.sourceIndex - b.sourceIndex;\r
-               if ( ret === 0 ) {\r
-                       hasDuplicate = true;\r
-               }\r
-               return ret;\r
-       };\r
-} else if ( document.createRange ) {\r
-       sortOrder = function( a, b ) {\r
-               if ( !a.ownerDocument || !b.ownerDocument ) {\r
-                       if ( a == b ) {\r
-                               hasDuplicate = true;\r
-                       }\r
-                       return a.ownerDocument ? -1 : 1;\r
-               }\r
+                       if (d.createTreeWalker) {\r
+                               w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);\r
 \r
-               var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();\r
-               aRange.setStart(a, 0);\r
-               aRange.setEnd(a, 0);\r
-               bRange.setStart(b, 0);\r
-               bRange.setEnd(b, 0);\r
-               var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);\r
-               if ( ret === 0 ) {\r
-                       hasDuplicate = true;\r
+                               while ((n = w.nextNode()) != null)\r
+                                       f.call(s || this, n);\r
+                       } else\r
+                               tinymce.walk(n, f, 'childNodes', s);\r
                }\r
-               return ret;\r
-       };\r
-}\r
+               */\r
 \r
-// Utility function for retreiving the text value of an array of DOM nodes\r
-Sizzle.getText = function( elems ) {\r
-       var ret = "", elem;\r
+               /*\r
+               toRGB : function(s) {\r
+                       var c = /^\s*?#([0-9A-F]{2})([0-9A-F]{1,2})([0-9A-F]{2})?\s*?$/.exec(s);\r
 \r
-       for ( var i = 0; elems[i]; i++ ) {\r
-               elem = elems[i];\r
+                       if (c) {\r
+                               // #FFF -> #FFFFFF\r
+                               if (!is(c[3]))\r
+                                       c[3] = c[2] = c[1];\r
 \r
-               // Get the text from text nodes and CDATA nodes\r
-               if ( elem.nodeType === 3 || elem.nodeType === 4 ) {\r
-                       ret += elem.nodeValue;\r
+                               return "rgb(" + parseInt(c[1], 16) + "," + parseInt(c[2], 16) + "," + parseInt(c[3], 16) + ")";\r
+                       }\r
 \r
-               // Traverse everything else, except comment nodes\r
-               } else if ( elem.nodeType !== 8 ) {\r
-                       ret += Sizzle.getText( elem.childNodes );\r
+                       return s;\r
                }\r
-       }\r
-\r
-       return ret;\r
-};\r
+               */\r
+       });\r
 \r
-// Check to see if the browser returns elements by name when\r
-// querying by getElementById (and provide a workaround)\r
-(function(){\r
-       // We're going to inject a fake input element with a specified name\r
-       var form = document.createElement("div"),\r
-               id = "script" + (new Date()).getTime();\r
-       form.innerHTML = "<a name='" + id + "'/>";\r
+       tinymce.DOM = new tinymce.dom.DOMUtils(document, {process_html : 0});\r
+})(tinymce);\r
 \r
-       // Inject it into the root element, check its status, and remove it quickly\r
-       var root = document.documentElement;\r
-       root.insertBefore( form, root.firstChild );\r
+(function(ns) {\r
+       // Range constructor\r
+       function Range(dom) {\r
+               var t = this,\r
+                       doc = dom.doc,\r
+                       EXTRACT = 0,\r
+                       CLONE = 1,\r
+                       DELETE = 2,\r
+                       TRUE = true,\r
+                       FALSE = false,\r
+                       START_OFFSET = 'startOffset',\r
+                       START_CONTAINER = 'startContainer',\r
+                       END_CONTAINER = 'endContainer',\r
+                       END_OFFSET = 'endOffset',\r
+                       extend = tinymce.extend,\r
+                       nodeIndex = dom.nodeIndex;\r
 \r
-       // The workaround has to do additional checks after a getElementById\r
-       // Which slows things down for other browsers (hence the branching)\r
-       if ( document.getElementById( id ) ) {\r
-               Expr.find.ID = function(match, context, isXML){\r
-                       if ( typeof context.getElementById !== "undefined" && !isXML ) {\r
-                               var m = context.getElementById(match[1]);\r
-                               return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];\r
-                       }\r
-               };\r
+               extend(t, {\r
+                       // Inital states\r
+                       startContainer : doc,\r
+                       startOffset : 0,\r
+                       endContainer : doc,\r
+                       endOffset : 0,\r
+                       collapsed : TRUE,\r
+                       commonAncestorContainer : doc,\r
 \r
-               Expr.filter.ID = function(elem, match){\r
-                       var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");\r
-                       return elem.nodeType === 1 && node && node.nodeValue === match;\r
-               };\r
-       }\r
+                       // Range constants\r
+                       START_TO_START : 0,\r
+                       START_TO_END : 1,\r
+                       END_TO_END : 2,\r
+                       END_TO_START : 3,\r
 \r
-       root.removeChild( form );\r
-       root = form = null; // release memory in IE\r
-})();\r
+                       // Public methods\r
+                       setStart : setStart,\r
+                       setEnd : setEnd,\r
+                       setStartBefore : setStartBefore,\r
+                       setStartAfter : setStartAfter,\r
+                       setEndBefore : setEndBefore,\r
+                       setEndAfter : setEndAfter,\r
+                       collapse : collapse,\r
+                       selectNode : selectNode,\r
+                       selectNodeContents : selectNodeContents,\r
+                       compareBoundaryPoints : compareBoundaryPoints,\r
+                       deleteContents : deleteContents,\r
+                       extractContents : extractContents,\r
+                       cloneContents : cloneContents,\r
+                       insertNode : insertNode,\r
+                       surroundContents : surroundContents,\r
+                       cloneRange : cloneRange\r
+               });\r
 \r
-(function(){\r
-       // Check to see if the browser returns only elements\r
-       // when doing getElementsByTagName("*")\r
+               function setStart(n, o) {\r
+                       _setEndPoint(TRUE, n, o);\r
+               };\r
 \r
-       // Create a fake element\r
-       var div = document.createElement("div");\r
-       div.appendChild( document.createComment("") );\r
+               function setEnd(n, o) {\r
+                       _setEndPoint(FALSE, n, o);\r
+               };\r
 \r
-       // Make sure no comments are found\r
-       if ( div.getElementsByTagName("*").length > 0 ) {\r
-               Expr.find.TAG = function(match, context){\r
-                       var results = context.getElementsByTagName(match[1]);\r
+               function setStartBefore(n) {\r
+                       setStart(n.parentNode, nodeIndex(n));\r
+               };\r
 \r
-                       // Filter out possible comments\r
-                       if ( match[1] === "*" ) {\r
-                               var tmp = [];\r
+               function setStartAfter(n) {\r
+                       setStart(n.parentNode, nodeIndex(n) + 1);\r
+               };\r
 \r
-                               for ( var i = 0; results[i]; i++ ) {\r
-                                       if ( results[i].nodeType === 1 ) {\r
-                                               tmp.push( results[i] );\r
-                                       }\r
-                               }\r
+               function setEndBefore(n) {\r
+                       setEnd(n.parentNode, nodeIndex(n));\r
+               };\r
 \r
-                               results = tmp;\r
+               function setEndAfter(n) {\r
+                       setEnd(n.parentNode, nodeIndex(n) + 1);\r
+               };\r
+\r
+               function collapse(ts) {\r
+                       if (ts) {\r
+                               t[END_CONTAINER] = t[START_CONTAINER];\r
+                               t[END_OFFSET] = t[START_OFFSET];\r
+                       } else {\r
+                               t[START_CONTAINER] = t[END_CONTAINER];\r
+                               t[START_OFFSET] = t[END_OFFSET];\r
                        }\r
 \r
-                       return results;\r
+                       t.collapsed = TRUE;\r
                };\r
-       }\r
 \r
-       // Check to see if an attribute returns normalized href attributes\r
-       div.innerHTML = "<a href='#'></a>";\r
-       if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&\r
-                       div.firstChild.getAttribute("href") !== "#" ) {\r
-               Expr.attrHandle.href = function(elem){\r
-                       return elem.getAttribute("href", 2);\r
+               function selectNode(n) {\r
+                       setStartBefore(n);\r
+                       setEndAfter(n);\r
                };\r
-       }\r
 \r
-       div = null; // release memory in IE\r
-})();\r
+               function selectNodeContents(n) {\r
+                       setStart(n, 0);\r
+                       setEnd(n, n.nodeType === 1 ? n.childNodes.length : n.nodeValue.length);\r
+               };\r
 \r
-if ( document.querySelectorAll ) {\r
-       (function(){\r
-               var oldSizzle = Sizzle, div = document.createElement("div");\r
-               div.innerHTML = "<p class='TEST'></p>";\r
+               function compareBoundaryPoints(h, r) {\r
+                       var sc = t[START_CONTAINER], so = t[START_OFFSET], ec = t[END_CONTAINER], eo = t[END_OFFSET],\r
+                       rsc = r.startContainer, rso = r.startOffset, rec = r.endContainer, reo = r.endOffset;\r
 \r
-               // Safari can't handle uppercase or unicode characters when\r
-               // in quirks mode.\r
-               if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {\r
-                       return;\r
-               }\r
+                       // Check START_TO_START\r
+                       if (h === 0)\r
+                               return _compareBoundaryPoints(sc, so, rsc, rso);\r
        \r
-               Sizzle = function(query, context, extra, seed){\r
-                       context = context || document;\r
+                       // Check START_TO_END\r
+                       if (h === 1)\r
+                               return _compareBoundaryPoints(ec, eo, rsc, rso);\r
+       \r
+                       // Check END_TO_END\r
+                       if (h === 2)\r
+                               return _compareBoundaryPoints(ec, eo, rec, reo);\r
+       \r
+                       // Check END_TO_START\r
+                       if (h === 3) \r
+                               return _compareBoundaryPoints(sc, so, rec, reo);\r
+               };\r
 \r
-                       // Only use querySelectorAll on non-XML documents\r
-                       // (ID selectors don't work in non-HTML documents)\r
-                       if ( !seed && context.nodeType === 9 && !Sizzle.isXML(context) ) {\r
-                               try {\r
-                                       return makeArray( context.querySelectorAll(query), extra );\r
-                               } catch(e){}\r
-                       }\r
-               \r
-                       return oldSizzle(query, context, extra, seed);\r
+               function deleteContents() {\r
+                       _traverse(DELETE);\r
                };\r
 \r
-               for ( var prop in oldSizzle ) {\r
-                       Sizzle[ prop ] = oldSizzle[ prop ];\r
-               }\r
+               function extractContents() {\r
+                       return _traverse(EXTRACT);\r
+               };\r
 \r
-               div = null; // release memory in IE\r
-       })();\r
-}\r
+               function cloneContents() {\r
+                       return _traverse(CLONE);\r
+               };\r
 \r
-(function(){\r
-       var div = document.createElement("div");\r
+               function insertNode(n) {\r
+                       var startContainer = this[START_CONTAINER],\r
+                               startOffset = this[START_OFFSET], nn, o;\r
 \r
-       div.innerHTML = "<div class='test e'></div><div class='test'></div>";\r
+                       // Node is TEXT_NODE or CDATA\r
+                       if ((startContainer.nodeType === 3 || startContainer.nodeType === 4) && startContainer.nodeValue) {\r
+                               if (!startOffset) {\r
+                                       // At the start of text\r
+                                       startContainer.parentNode.insertBefore(n, startContainer);\r
+                               } else if (startOffset >= startContainer.nodeValue.length) {\r
+                                       // At the end of text\r
+                                       dom.insertAfter(n, startContainer);\r
+                               } else {\r
+                                       // Middle, need to split\r
+                                       nn = startContainer.splitText(startOffset);\r
+                                       startContainer.parentNode.insertBefore(n, nn);\r
+                               }\r
+                       } else {\r
+                               // Insert element node\r
+                               if (startContainer.childNodes.length > 0)\r
+                                       o = startContainer.childNodes[startOffset];\r
 \r
-       // Opera can't find a second classname (in 9.6)\r
-       // Also, make sure that getElementsByClassName actually exists\r
-       if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {\r
-               return;\r
-       }\r
+                               if (o)\r
+                                       startContainer.insertBefore(n, o);\r
+                               else\r
+                                       startContainer.appendChild(n);\r
+                       }\r
+               };\r
 \r
-       // Safari caches class attributes, doesn't catch changes (in 3.2)\r
-       div.lastChild.className = "e";\r
+               function surroundContents(n) {\r
+                       var f = t.extractContents();\r
 \r
-       if ( div.getElementsByClassName("e").length === 1 ) {\r
-               return;\r
-       }\r
-       \r
-       Expr.order.splice(1, 0, "CLASS");\r
-       Expr.find.CLASS = function(match, context, isXML) {\r
-               if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {\r
-                       return context.getElementsByClassName(match[1]);\r
-               }\r
-       };\r
+                       t.insertNode(n);\r
+                       n.appendChild(f);\r
+                       t.selectNode(n);\r
+               };\r
 \r
-       div = null; // release memory in IE\r
-})();\r
+               function cloneRange() {\r
+                       return extend(new Range(dom), {\r
+                               startContainer : t[START_CONTAINER],\r
+                               startOffset : t[START_OFFSET],\r
+                               endContainer : t[END_CONTAINER],\r
+                               endOffset : t[END_OFFSET],\r
+                               collapsed : t.collapsed,\r
+                               commonAncestorContainer : t.commonAncestorContainer\r
+                       });\r
+               };\r
 \r
-function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {\r
-       for ( var i = 0, l = checkSet.length; i < l; i++ ) {\r
-               var elem = checkSet[i];\r
-               if ( elem ) {\r
-                       elem = elem[dir];\r
-                       var match = false;\r
+               // Private methods\r
 \r
-                       while ( elem ) {\r
-                               if ( elem.sizcache === doneName ) {\r
-                                       match = checkSet[elem.sizset];\r
-                                       break;\r
-                               }\r
+               function _getSelectedNode(container, offset) {\r
+                       var child;\r
 \r
-                               if ( elem.nodeType === 1 && !isXML ){\r
-                                       elem.sizcache = doneName;\r
-                                       elem.sizset = i;\r
-                               }\r
+                       if (container.nodeType == 3 /* TEXT_NODE */)\r
+                               return container;\r
 \r
-                               if ( elem.nodeName.toLowerCase() === cur ) {\r
-                                       match = elem;\r
-                                       break;\r
-                               }\r
+                       if (offset < 0)\r
+                               return container;\r
 \r
-                               elem = elem[dir];\r
+                       child = container.firstChild;\r
+                       while (child && offset > 0) {\r
+                               --offset;\r
+                               child = child.nextSibling;\r
                        }\r
 \r
-                       checkSet[i] = match;\r
-               }\r
-       }\r
-}\r
+                       if (child)\r
+                               return child;\r
 \r
-function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {\r
-       for ( var i = 0, l = checkSet.length; i < l; i++ ) {\r
-               var elem = checkSet[i];\r
-               if ( elem ) {\r
-                       elem = elem[dir];\r
-                       var match = false;\r
+                       return container;\r
+               };\r
 \r
-                       while ( elem ) {\r
-                               if ( elem.sizcache === doneName ) {\r
-                                       match = checkSet[elem.sizset];\r
-                                       break;\r
-                               }\r
+               function _isCollapsed() {\r
+                       return (t[START_CONTAINER] == t[END_CONTAINER] && t[START_OFFSET] == t[END_OFFSET]);\r
+               };\r
 \r
-                               if ( elem.nodeType === 1 ) {\r
-                                       if ( !isXML ) {\r
-                                               elem.sizcache = doneName;\r
-                                               elem.sizset = i;\r
-                                       }\r
-                                       if ( typeof cur !== "string" ) {\r
-                                               if ( elem === cur ) {\r
-                                                       match = true;\r
-                                                       break;\r
-                                               }\r
+               function _compareBoundaryPoints(containerA, offsetA, containerB, offsetB) {\r
+                       var c, offsetC, n, cmnRoot, childA, childB;\r
+                       \r
+                       // In the first case the boundary-points have the same container. A is before B\r
+                       // if its offset is less than the offset of B, A is equal to B if its offset is\r
+                       // equal to the offset of B, and A is after B if its offset is greater than the\r
+                       // offset of B.\r
+                       if (containerA == containerB) {\r
+                               if (offsetA == offsetB)\r
+                                       return 0; // equal\r
 \r
-                                       } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {\r
-                                               match = elem;\r
-                                               break;\r
-                                       }\r
-                               }\r
+                               if (offsetA < offsetB)\r
+                                       return -1; // before\r
 \r
-                               elem = elem[dir];\r
+                               return 1; // after\r
                        }\r
 \r
-                       checkSet[i] = match;\r
-               }\r
-       }\r
-}\r
+                       // In the second case a child node C of the container of A is an ancestor\r
+                       // container of B. In this case, A is before B if the offset of A is less than or\r
+                       // equal to the index of the child node C and A is after B otherwise.\r
+                       c = containerB;\r
+                       while (c && c.parentNode != containerA)\r
+                               c = c.parentNode;\r
 \r
-Sizzle.contains = document.compareDocumentPosition ? function(a, b){\r
-       return !!(a.compareDocumentPosition(b) & 16);\r
-} : function(a, b){\r
-       return a !== b && (a.contains ? a.contains(b) : true);\r
-};\r
+                       if (c) {\r
+                               offsetC = 0;\r
+                               n = containerA.firstChild;\r
 \r
-Sizzle.isXML = function(elem){\r
-       // documentElement is verified for cases where it doesn't yet exist\r
-       // (such as loading iframes in IE - #4833) \r
-       var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;\r
-       return documentElement ? documentElement.nodeName !== "HTML" : false;\r
-};\r
+                               while (n != c && offsetC < offsetA) {\r
+                                       offsetC++;\r
+                                       n = n.nextSibling;\r
+                               }\r
 \r
-var posProcess = function(selector, context){\r
-       var tmpSet = [], later = "", match,\r
-               root = context.nodeType ? [context] : context;\r
+                               if (offsetA <= offsetC)\r
+                                       return -1; // before\r
 \r
-       // Position selectors must be done after the filter\r
-       // And so must :not(positional) so we move all PSEUDOs to the end\r
-       while ( (match = Expr.match.PSEUDO.exec( selector )) ) {\r
-               later += match[0];\r
-               selector = selector.replace( Expr.match.PSEUDO, "" );\r
-       }\r
+                               return 1; // after\r
+                       }\r
 \r
-       selector = Expr.relative[selector] ? selector + "*" : selector;\r
+                       // In the third case a child node C of the container of B is an ancestor container\r
+                       // of A. In this case, A is before B if the index of the child node C is less than\r
+                       // the offset of B and A is after B otherwise.\r
+                       c = containerA;\r
+                       while (c && c.parentNode != containerB) {\r
+                               c = c.parentNode;\r
+                       }\r
 \r
-       for ( var i = 0, l = root.length; i < l; i++ ) {\r
-               Sizzle( selector, root[i], tmpSet );\r
-       }\r
+                       if (c) {\r
+                               offsetC = 0;\r
+                               n = containerB.firstChild;\r
 \r
-       return Sizzle.filter( later, tmpSet );\r
-};\r
+                               while (n != c && offsetC < offsetB) {\r
+                                       offsetC++;\r
+                                       n = n.nextSibling;\r
+                               }\r
 \r
-// EXPOSE\r
+                               if (offsetC < offsetB)\r
+                                       return -1; // before\r
 \r
-window.tinymce.dom.Sizzle = Sizzle;\r
+                               return 1; // after\r
+                       }\r
 \r
-})();\r
+                       // In the fourth case, none of three other cases hold: the containers of A and B\r
+                       // are siblings or descendants of sibling nodes. In this case, A is before B if\r
+                       // the container of A is before the container of B in a pre-order traversal of the\r
+                       // Ranges' context tree and A is after B otherwise.\r
+                       cmnRoot = dom.findCommonAncestor(containerA, containerB);\r
+                       childA = containerA;\r
 \r
+                       while (childA && childA.parentNode != cmnRoot)\r
+                               childA = childA.parentNode;\r
 \r
-(function(tinymce) {\r
-       // Shorten names\r
-       var each = tinymce.each, DOM = tinymce.DOM, isIE = tinymce.isIE, isWebKit = tinymce.isWebKit, Event;\r
+                       if (!childA)\r
+                               childA = cmnRoot;\r
 \r
-       tinymce.create('tinymce.dom.EventUtils', {\r
-               EventUtils : function() {\r
-                       this.inits = [];\r
-                       this.events = [];\r
-               },\r
+                       childB = containerB;\r
+                       while (childB && childB.parentNode != cmnRoot)\r
+                               childB = childB.parentNode;\r
 \r
-               add : function(o, n, f, s) {\r
-                       var cb, t = this, el = t.events, r;\r
+                       if (!childB)\r
+                               childB = cmnRoot;\r
 \r
-                       if (n instanceof Array) {\r
-                               r = [];\r
+                       if (childA == childB)\r
+                               return 0; // equal\r
 \r
-                               each(n, function(n) {\r
-                                       r.push(t.add(o, n, f, s));\r
-                               });\r
+                       n = cmnRoot.firstChild;\r
+                       while (n) {\r
+                               if (n == childA)\r
+                                       return -1; // before\r
 \r
-                               return r;\r
-                       }\r
+                               if (n == childB)\r
+                                       return 1; // after\r
 \r
-                       // Handle array\r
-                       if (o && o.hasOwnProperty && o instanceof Array) {\r
-                               r = [];\r
+                               n = n.nextSibling;\r
+                       }\r
+               };\r
 \r
-                               each(o, function(o) {\r
-                                       o = DOM.get(o);\r
-                                       r.push(t.add(o, n, f, s));\r
-                               });\r
+               function _setEndPoint(st, n, o) {\r
+                       var ec, sc;\r
 \r
-                               return r;\r
+                       if (st) {\r
+                               t[START_CONTAINER] = n;\r
+                               t[START_OFFSET] = o;\r
+                       } else {\r
+                               t[END_CONTAINER] = n;\r
+                               t[END_OFFSET] = o;\r
                        }\r
 \r
-                       o = DOM.get(o);\r
-\r
-                       if (!o)\r
-                               return;\r
+                       // If one boundary-point of a Range is set to have a root container\r
+                       // other than the current one for the Range, the Range is collapsed to\r
+                       // the new position. This enforces the restriction that both boundary-\r
+                       // points of a Range must have the same root container.\r
+                       ec = t[END_CONTAINER];\r
+                       while (ec.parentNode)\r
+                               ec = ec.parentNode;\r
 \r
-                       // Setup event callback\r
-                       cb = function(e) {\r
-                               // Is all events disabled\r
-                               if (t.disabled)\r
-                                       return;\r
+                       sc = t[START_CONTAINER];\r
+                       while (sc.parentNode)\r
+                               sc = sc.parentNode;\r
 \r
-                               e = e || window.event;\r
+                       if (sc == ec) {\r
+                               // The start position of a Range is guaranteed to never be after the\r
+                               // end position. To enforce this restriction, if the start is set to\r
+                               // be at a position after the end, the Range is collapsed to that\r
+                               // position.\r
+                               if (_compareBoundaryPoints(t[START_CONTAINER], t[START_OFFSET], t[END_CONTAINER], t[END_OFFSET]) > 0)\r
+                                       t.collapse(st);\r
+                       } else\r
+                               t.collapse(st);\r
 \r
-                               // Patch in target, preventDefault and stopPropagation in IE it's W3C valid\r
-                               if (e && isIE) {\r
-                                       if (!e.target)\r
-                                               e.target = e.srcElement;\r
+                       t.collapsed = _isCollapsed();\r
+                       t.commonAncestorContainer = dom.findCommonAncestor(t[START_CONTAINER], t[END_CONTAINER]);\r
+               };\r
 \r
-                                       // Patch in preventDefault, stopPropagation methods for W3C compatibility\r
-                                       tinymce.extend(e, t._stoppers);\r
-                               }\r
+               function _traverse(how) {\r
+                       var c, endContainerDepth = 0, startContainerDepth = 0, p, depthDiff, startNode, endNode, sp, ep;\r
 \r
-                               if (!s)\r
-                                       return f(e);\r
+                       if (t[START_CONTAINER] == t[END_CONTAINER])\r
+                               return _traverseSameContainer(how);\r
 \r
-                               return f.call(s, e);\r
-                       };\r
+                       for (c = t[END_CONTAINER], p = c.parentNode; p; c = p, p = p.parentNode) {\r
+                               if (p == t[START_CONTAINER])\r
+                                       return _traverseCommonStartContainer(c, how);\r
 \r
-                       if (n == 'unload') {\r
-                               tinymce.unloads.unshift({func : cb});\r
-                               return cb;\r
+                               ++endContainerDepth;\r
                        }\r
 \r
-                       if (n == 'init') {\r
-                               if (t.domLoaded)\r
-                                       cb();\r
-                               else\r
-                                       t.inits.push(cb);\r
+                       for (c = t[START_CONTAINER], p = c.parentNode; p; c = p, p = p.parentNode) {\r
+                               if (p == t[END_CONTAINER])\r
+                                       return _traverseCommonEndContainer(c, how);\r
 \r
-                               return cb;\r
+                               ++startContainerDepth;\r
                        }\r
 \r
-                       // Store away listener reference\r
-                       el.push({\r
-                               obj : o,\r
-                               name : n,\r
-                               func : f,\r
-                               cfunc : cb,\r
-                               scope : s\r
-                       });\r
+                       depthDiff = startContainerDepth - endContainerDepth;\r
 \r
-                       t._add(o, n, cb);\r
+                       startNode = t[START_CONTAINER];\r
+                       while (depthDiff > 0) {\r
+                               startNode = startNode.parentNode;\r
+                               depthDiff--;\r
+                       }\r
 \r
-                       return f;\r
-               },\r
+                       endNode = t[END_CONTAINER];\r
+                       while (depthDiff < 0) {\r
+                               endNode = endNode.parentNode;\r
+                               depthDiff++;\r
+                       }\r
 \r
-               remove : function(o, n, f) {\r
-                       var t = this, a = t.events, s = false, r;\r
+                       // ascend the ancestor hierarchy until we have a common parent.\r
+                       for (sp = startNode.parentNode, ep = endNode.parentNode; sp != ep; sp = sp.parentNode, ep = ep.parentNode) {\r
+                               startNode = sp;\r
+                               endNode = ep;\r
+                       }\r
 \r
-                       // Handle array\r
-                       if (o && o.hasOwnProperty && o instanceof Array) {\r
-                               r = [];\r
+                       return _traverseCommonAncestors(startNode, endNode, how);\r
+               };\r
 \r
-                               each(o, function(o) {\r
-                                       o = DOM.get(o);\r
-                                       r.push(t.remove(o, n, f));\r
-                               });\r
+                function _traverseSameContainer(how) {\r
+                       var frag, s, sub, n, cnt, sibling, xferNode;\r
 \r
-                               return r;\r
-                       }\r
+                       if (how != DELETE)\r
+                               frag = doc.createDocumentFragment();\r
 \r
-                       o = DOM.get(o);\r
+                       // If selection is empty, just return the fragment\r
+                       if (t[START_OFFSET] == t[END_OFFSET])\r
+                               return frag;\r
 \r
-                       each(a, function(e, i) {\r
-                               if (e.obj == o && e.name == n && (!f || (e.func == f || e.cfunc == f))) {\r
-                                       a.splice(i, 1);\r
-                                       t._remove(o, n, e.cfunc);\r
-                                       s = true;\r
-                                       return false;\r
+                       // Text node needs special case handling\r
+                       if (t[START_CONTAINER].nodeType == 3 /* TEXT_NODE */) {\r
+                               // get the substring\r
+                               s = t[START_CONTAINER].nodeValue;\r
+                               sub = s.substring(t[START_OFFSET], t[END_OFFSET]);\r
+\r
+                               // set the original text node to its new value\r
+                               if (how != CLONE) {\r
+                                       t[START_CONTAINER].deleteData(t[START_OFFSET], t[END_OFFSET] - t[START_OFFSET]);\r
+\r
+                                       // Nothing is partially selected, so collapse to start point\r
+                                       t.collapse(TRUE);\r
                                }\r
-                       });\r
 \r
-                       return s;\r
-               },\r
+                               if (how == DELETE)\r
+                                       return;\r
 \r
-               clear : function(o) {\r
-                       var t = this, a = t.events, i, e;\r
+                               frag.appendChild(doc.createTextNode(sub));\r
+                               return frag;\r
+                       }\r
 \r
-                       if (o) {\r
-                               o = DOM.get(o);\r
+                       // Copy nodes between the start/end offsets.\r
+                       n = _getSelectedNode(t[START_CONTAINER], t[START_OFFSET]);\r
+                       cnt = t[END_OFFSET] - t[START_OFFSET];\r
 \r
-                               for (i = a.length - 1; i >= 0; i--) {\r
-                                       e = a[i];\r
+                       while (cnt > 0) {\r
+                               sibling = n.nextSibling;\r
+                               xferNode = _traverseFullySelected(n, how);\r
 \r
-                                       if (e.obj === o) {\r
-                                               t._remove(e.obj, e.name, e.cfunc);\r
-                                               e.obj = e.cfunc = null;\r
-                                               a.splice(i, 1);\r
-                                       }\r
+                               if (frag)\r
+                                       frag.appendChild( xferNode );\r
+\r
+                               --cnt;\r
+                               n = sibling;\r
+                       }\r
+\r
+                       // Nothing is partially selected, so collapse to start point\r
+                       if (how != CLONE)\r
+                               t.collapse(TRUE);\r
+\r
+                       return frag;\r
+               };\r
+\r
+               function _traverseCommonStartContainer(endAncestor, how) {\r
+                       var frag, n, endIdx, cnt, sibling, xferNode;\r
+\r
+                       if (how != DELETE)\r
+                               frag = doc.createDocumentFragment();\r
+\r
+                       n = _traverseRightBoundary(endAncestor, how);\r
+\r
+                       if (frag)\r
+                               frag.appendChild(n);\r
+\r
+                       endIdx = nodeIndex(endAncestor);\r
+                       cnt = endIdx - t[START_OFFSET];\r
+\r
+                       if (cnt <= 0) {\r
+                               // Collapse to just before the endAncestor, which\r
+                               // is partially selected.\r
+                               if (how != CLONE) {\r
+                                       t.setEndBefore(endAncestor);\r
+                                       t.collapse(FALSE);\r
                                }\r
+\r
+                               return frag;\r
                        }\r
-               },\r
 \r
-               cancel : function(e) {\r
-                       if (!e)\r
-                               return false;\r
+                       n = endAncestor.previousSibling;\r
+                       while (cnt > 0) {\r
+                               sibling = n.previousSibling;\r
+                               xferNode = _traverseFullySelected(n, how);\r
 \r
-                       this.stop(e);\r
+                               if (frag)\r
+                                       frag.insertBefore(xferNode, frag.firstChild);\r
 \r
-                       return this.prevent(e);\r
-               },\r
+                               --cnt;\r
+                               n = sibling;\r
+                       }\r
 \r
-               stop : function(e) {\r
-                       if (e.stopPropagation)\r
-                               e.stopPropagation();\r
-                       else\r
-                               e.cancelBubble = true;\r
+                       // Collapse to just before the endAncestor, which\r
+                       // is partially selected.\r
+                       if (how != CLONE) {\r
+                               t.setEndBefore(endAncestor);\r
+                               t.collapse(FALSE);\r
+                       }\r
 \r
-                       return false;\r
-               },\r
+                       return frag;\r
+               };\r
 \r
-               prevent : function(e) {\r
-                       if (e.preventDefault)\r
-                               e.preventDefault();\r
-                       else\r
-                               e.returnValue = false;\r
+               function _traverseCommonEndContainer(startAncestor, how) {\r
+                       var frag, startIdx, n, cnt, sibling, xferNode;\r
 \r
-                       return false;\r
-               },\r
+                       if (how != DELETE)\r
+                               frag = doc.createDocumentFragment();\r
 \r
-               destroy : function() {\r
-                       var t = this;\r
+                       n = _traverseLeftBoundary(startAncestor, how);\r
+                       if (frag)\r
+                               frag.appendChild(n);\r
 \r
-                       each(t.events, function(e, i) {\r
-                               t._remove(e.obj, e.name, e.cfunc);\r
-                               e.obj = e.cfunc = null;\r
-                       });\r
+                       startIdx = nodeIndex(startAncestor);\r
+                       ++startIdx; // Because we already traversed it\r
 \r
-                       t.events = [];\r
-                       t = null;\r
-               },\r
+                       cnt = t[END_OFFSET] - startIdx;\r
+                       n = startAncestor.nextSibling;\r
+                       while (cnt > 0) {\r
+                               sibling = n.nextSibling;\r
+                               xferNode = _traverseFullySelected(n, how);\r
 \r
-               _add : function(o, n, f) {\r
-                       if (o.attachEvent)\r
-                               o.attachEvent('on' + n, f);\r
-                       else if (o.addEventListener)\r
-                               o.addEventListener(n, f, false);\r
-                       else\r
-                               o['on' + n] = f;\r
-               },\r
+                               if (frag)\r
+                                       frag.appendChild(xferNode);\r
 \r
-               _remove : function(o, n, f) {\r
-                       if (o) {\r
-                               try {\r
-                                       if (o.detachEvent)\r
-                                               o.detachEvent('on' + n, f);\r
-                                       else if (o.removeEventListener)\r
-                                               o.removeEventListener(n, f, false);\r
-                                       else\r
-                                               o['on' + n] = null;\r
-                               } catch (ex) {\r
-                                       // Might fail with permission denined on IE so we just ignore that\r
-                               }\r
+                               --cnt;\r
+                               n = sibling;\r
                        }\r
-               },\r
 \r
-               _pageInit : function(win) {\r
-                       var t = this;\r
+                       if (how != CLONE) {\r
+                               t.setStartAfter(startAncestor);\r
+                               t.collapse(TRUE);\r
+                       }\r
 \r
-                       // Keep it from running more than once\r
-                       if (t.domLoaded)\r
-                               return;\r
+                       return frag;\r
+               };\r
 \r
-                       t.domLoaded = true;\r
+               function _traverseCommonAncestors(startAncestor, endAncestor, how) {\r
+                       var n, frag, commonParent, startOffset, endOffset, cnt, sibling, nextSibling;\r
 \r
-                       each(t.inits, function(c) {\r
-                               c();\r
-                       });\r
+                       if (how != DELETE)\r
+                               frag = doc.createDocumentFragment();\r
+\r
+                       n = _traverseLeftBoundary(startAncestor, how);\r
+                       if (frag)\r
+                               frag.appendChild(n);\r
+\r
+                       commonParent = startAncestor.parentNode;\r
+                       startOffset = nodeIndex(startAncestor);\r
+                       endOffset = nodeIndex(endAncestor);\r
+                       ++startOffset;\r
+\r
+                       cnt = endOffset - startOffset;\r
+                       sibling = startAncestor.nextSibling;\r
+\r
+                       while (cnt > 0) {\r
+                               nextSibling = sibling.nextSibling;\r
+                               n = _traverseFullySelected(sibling, how);\r
+\r
+                               if (frag)\r
+                                       frag.appendChild(n);\r
+\r
+                               sibling = nextSibling;\r
+                               --cnt;\r
+                       }\r
+\r
+                       n = _traverseRightBoundary(endAncestor, how);\r
+\r
+                       if (frag)\r
+                               frag.appendChild(n);\r
+\r
+                       if (how != CLONE) {\r
+                               t.setStartAfter(startAncestor);\r
+                               t.collapse(TRUE);\r
+                       }\r
+\r
+                       return frag;\r
+               };\r
+\r
+               function _traverseRightBoundary(root, how) {\r
+                       var next = _getSelectedNode(t[END_CONTAINER], t[END_OFFSET] - 1), parent, clonedParent, prevSibling, clonedChild, clonedGrandParent, isFullySelected = next != t[END_CONTAINER];\r
+\r
+                       if (next == root)\r
+                               return _traverseNode(next, isFullySelected, FALSE, how);\r
+\r
+                       parent = next.parentNode;\r
+                       clonedParent = _traverseNode(parent, FALSE, FALSE, how);\r
+\r
+                       while (parent) {\r
+                               while (next) {\r
+                                       prevSibling = next.previousSibling;\r
+                                       clonedChild = _traverseNode(next, isFullySelected, FALSE, how);\r
+\r
+                                       if (how != DELETE)\r
+                                               clonedParent.insertBefore(clonedChild, clonedParent.firstChild);\r
+\r
+                                       isFullySelected = TRUE;\r
+                                       next = prevSibling;\r
+                               }\r
+\r
+                               if (parent == root)\r
+                                       return clonedParent;\r
+\r
+                               next = parent.previousSibling;\r
+                               parent = parent.parentNode;\r
+\r
+                               clonedGrandParent = _traverseNode(parent, FALSE, FALSE, how);\r
+\r
+                               if (how != DELETE)\r
+                                       clonedGrandParent.appendChild(clonedParent);\r
+\r
+                               clonedParent = clonedGrandParent;\r
+                       }\r
+               };\r
+\r
+               function _traverseLeftBoundary(root, how) {\r
+                       var next = _getSelectedNode(t[START_CONTAINER], t[START_OFFSET]), isFullySelected = next != t[START_CONTAINER], parent, clonedParent, nextSibling, clonedChild, clonedGrandParent;\r
+\r
+                       if (next == root)\r
+                               return _traverseNode(next, isFullySelected, TRUE, how);\r
+\r
+                       parent = next.parentNode;\r
+                       clonedParent = _traverseNode(parent, FALSE, TRUE, how);\r
+\r
+                       while (parent) {\r
+                               while (next) {\r
+                                       nextSibling = next.nextSibling;\r
+                                       clonedChild = _traverseNode(next, isFullySelected, TRUE, how);\r
+\r
+                                       if (how != DELETE)\r
+                                               clonedParent.appendChild(clonedChild);\r
+\r
+                                       isFullySelected = TRUE;\r
+                                       next = nextSibling;\r
+                               }\r
+\r
+                               if (parent == root)\r
+                                       return clonedParent;\r
+\r
+                               next = parent.nextSibling;\r
+                               parent = parent.parentNode;\r
+\r
+                               clonedGrandParent = _traverseNode(parent, FALSE, TRUE, how);\r
+\r
+                               if (how != DELETE)\r
+                                       clonedGrandParent.appendChild(clonedParent);\r
+\r
+                               clonedParent = clonedGrandParent;\r
+                       }\r
+               };\r
+\r
+               function _traverseNode(n, isFullySelected, isLeft, how) {\r
+                       var txtValue, newNodeValue, oldNodeValue, offset, newNode;\r
+\r
+                       if (isFullySelected)\r
+                               return _traverseFullySelected(n, how);\r
+\r
+                       if (n.nodeType == 3 /* TEXT_NODE */) {\r
+                               txtValue = n.nodeValue;\r
+\r
+                               if (isLeft) {\r
+                                       offset = t[START_OFFSET];\r
+                                       newNodeValue = txtValue.substring(offset);\r
+                                       oldNodeValue = txtValue.substring(0, offset);\r
+                               } else {\r
+                                       offset = t[END_OFFSET];\r
+                                       newNodeValue = txtValue.substring(0, offset);\r
+                                       oldNodeValue = txtValue.substring(offset);\r
+                               }\r
+\r
+                               if (how != CLONE)\r
+                                       n.nodeValue = oldNodeValue;\r
+\r
+                               if (how == DELETE)\r
+                                       return;\r
+\r
+                               newNode = n.cloneNode(FALSE);\r
+                               newNode.nodeValue = newNodeValue;\r
+\r
+                               return newNode;\r
+                       }\r
+\r
+                       if (how == DELETE)\r
+                               return;\r
+\r
+                       return n.cloneNode(FALSE);\r
+               };\r
+\r
+               function _traverseFullySelected(n, how) {\r
+                       if (how != DELETE)\r
+                               return how == CLONE ? n.cloneNode(TRUE) : n;\r
+\r
+                       n.parentNode.removeChild(n);\r
+               };\r
+       };\r
+\r
+       ns.Range = Range;\r
+})(tinymce.dom);\r
+\r
+(function() {\r
+       function Selection(selection) {\r
+               var self = this, dom = selection.dom, TRUE = true, FALSE = false;\r
+\r
+               function getPosition(rng, start) {\r
+                       var checkRng, startIndex = 0, endIndex, inside,\r
+                               children, child, offset, index, position = -1, parent;\r
+\r
+                       // Setup test range, collapse it and get the parent\r
+                       checkRng = rng.duplicate();\r
+                       checkRng.collapse(start);\r
+                       parent = checkRng.parentElement();\r
+\r
+                       // Check if the selection is within the right document\r
+                       if (parent.ownerDocument !== selection.dom.doc)\r
+                               return;\r
+\r
+                       // IE will report non editable elements as it's parent so look for an editable one\r
+                       while (parent.contentEditable === "false") {\r
+                               parent = parent.parentNode;\r
+                       }\r
+\r
+                       // If parent doesn't have any children then return that we are inside the element\r
+                       if (!parent.hasChildNodes()) {\r
+                               return {node : parent, inside : 1};\r
+                       }\r
+\r
+                       // Setup node list and endIndex\r
+                       children = parent.children;\r
+                       endIndex = children.length - 1;\r
+\r
+                       // Perform a binary search for the position\r
+                       while (startIndex <= endIndex) {\r
+                               index = Math.floor((startIndex + endIndex) / 2);\r
+\r
+                               // Move selection to node and compare the ranges\r
+                               child = children[index];\r
+                               checkRng.moveToElementText(child);\r
+                               position = checkRng.compareEndPoints(start ? 'StartToStart' : 'EndToEnd', rng);\r
+\r
+                               // Before/after or an exact match\r
+                               if (position > 0) {\r
+                                       endIndex = index - 1;\r
+                               } else if (position < 0) {\r
+                                       startIndex = index + 1;\r
+                               } else {\r
+                                       return {node : child};\r
+                               }\r
+                       }\r
+\r
+                       // Check if child position is before or we didn't find a position\r
+                       if (position < 0) {\r
+                               // No element child was found use the parent element and the offset inside that\r
+                               if (!child) {\r
+                                       checkRng.moveToElementText(parent);\r
+                                       checkRng.collapse(true);\r
+                                       child = parent;\r
+                                       inside = true;\r
+                               } else\r
+                                       checkRng.collapse(false);\r
+\r
+                               checkRng.setEndPoint(start ? 'EndToStart' : 'EndToEnd', rng);\r
+\r
+                               // Fix for edge case: <div style="width: 100px; height:100px;"><table>..</table>ab|c</div>\r
+                               if (checkRng.compareEndPoints(start ? 'StartToStart' : 'StartToEnd', rng) > 0) {\r
+                                       checkRng = rng.duplicate();\r
+                                       checkRng.collapse(start);\r
+\r
+                                       offset = -1;\r
+                                       while (parent == checkRng.parentElement()) {\r
+                                               if (checkRng.move('character', -1) == 0)\r
+                                                       break;\r
+\r
+                                               offset++;\r
+                                       }\r
+                               }\r
+\r
+                               offset = offset || checkRng.text.replace('\r\n', ' ').length;\r
+                       } else {\r
+                               // Child position is after the selection endpoint\r
+                               checkRng.collapse(true);\r
+                               checkRng.setEndPoint(start ? 'StartToStart' : 'StartToEnd', rng);\r
+\r
+                               // Get the length of the text to find where the endpoint is relative to it's container\r
+                               offset = checkRng.text.replace('\r\n', ' ').length;\r
+                       }\r
+\r
+                       return {node : child, position : position, offset : offset, inside : inside};\r
+               };\r
+\r
+               // Returns a W3C DOM compatible range object by using the IE Range API\r
+               function getRange() {\r
+                       var ieRange = selection.getRng(), domRange = dom.createRng(), element, collapsed, tmpRange, element2, bookmark, fail;\r
+\r
+                       // If selection is outside the current document just return an empty range\r
+                       element = ieRange.item ? ieRange.item(0) : ieRange.parentElement();\r
+                       if (element.ownerDocument != dom.doc)\r
+                               return domRange;\r
+\r
+                       collapsed = selection.isCollapsed();\r
+\r
+                       // Handle control selection\r
+                       if (ieRange.item) {\r
+                               domRange.setStart(element.parentNode, dom.nodeIndex(element));\r
+                               domRange.setEnd(domRange.startContainer, domRange.startOffset + 1);\r
+\r
+                               return domRange;\r
+                       }\r
+\r
+                       function findEndPoint(start) {\r
+                               var endPoint = getPosition(ieRange, start), container, offset, textNodeOffset = 0, sibling, undef, nodeValue;\r
+\r
+                               container = endPoint.node;\r
+                               offset = endPoint.offset;\r
+\r
+                               if (endPoint.inside && !container.hasChildNodes()) {\r
+                                       domRange[start ? 'setStart' : 'setEnd'](container, 0);\r
+                                       return;\r
+                               }\r
+\r
+                               if (offset === undef) {\r
+                                       domRange[start ? 'setStartBefore' : 'setEndAfter'](container);\r
+                                       return;\r
+                               }\r
+\r
+                               if (endPoint.position < 0) {\r
+                                       sibling = endPoint.inside ? container.firstChild : container.nextSibling;\r
+\r
+                                       if (!sibling) {\r
+                                               domRange[start ? 'setStartAfter' : 'setEndAfter'](container);\r
+                                               return;\r
+                                       }\r
+\r
+                                       if (!offset) {\r
+                                               if (sibling.nodeType == 3)\r
+                                                       domRange[start ? 'setStart' : 'setEnd'](sibling, 0);\r
+                                               else\r
+                                                       domRange[start ? 'setStartBefore' : 'setEndBefore'](sibling);\r
+\r
+                                               return;\r
+                                       }\r
+\r
+                                       // Find the text node and offset\r
+                                       while (sibling) {\r
+                                               nodeValue = sibling.nodeValue;\r
+                                               textNodeOffset += nodeValue.length;\r
+\r
+                                               // We are at or passed the position we where looking for\r
+                                               if (textNodeOffset >= offset) {\r
+                                                       container = sibling;\r
+                                                       textNodeOffset -= offset;\r
+                                                       textNodeOffset = nodeValue.length - textNodeOffset;\r
+                                                       break;\r
+                                               }\r
+\r
+                                               sibling = sibling.nextSibling;\r
+                                       }\r
+                               } else {\r
+                                       // Find the text node and offset\r
+                                       sibling = container.previousSibling;\r
+\r
+                                       if (!sibling)\r
+                                               return domRange[start ? 'setStartBefore' : 'setEndBefore'](container);\r
+\r
+                                       // If there isn't any text to loop then use the first position\r
+                                       if (!offset) {\r
+                                               if (container.nodeType == 3)\r
+                                                       domRange[start ? 'setStart' : 'setEnd'](sibling, container.nodeValue.length);\r
+                                               else\r
+                                                       domRange[start ? 'setStartAfter' : 'setEndAfter'](sibling);\r
+\r
+                                               return;\r
+                                       }\r
+\r
+                                       while (sibling) {\r
+                                               textNodeOffset += sibling.nodeValue.length;\r
+\r
+                                               // We are at or passed the position we where looking for\r
+                                               if (textNodeOffset >= offset) {\r
+                                                       container = sibling;\r
+                                                       textNodeOffset -= offset;\r
+                                                       break;\r
+                                               }\r
+\r
+                                               sibling = sibling.previousSibling;\r
+                                       }\r
+                               }\r
+\r
+                               domRange[start ? 'setStart' : 'setEnd'](container, textNodeOffset);\r
+                       };\r
+\r
+                       try {\r
+                               // Find start point\r
+                               findEndPoint(true);\r
+\r
+                               // Find end point if needed\r
+                               if (!collapsed)\r
+                                       findEndPoint();\r
+                       } catch (ex) {\r
+                               // IE has a nasty bug where text nodes might throw "invalid argument" when you\r
+                               // access the nodeValue or other properties of text nodes. This seems to happend when\r
+                               // text nodes are split into two nodes by a delete/backspace call. So lets detect it and try to fix it.\r
+                               if (ex.number == -2147024809) {\r
+                                       // Get the current selection\r
+                                       bookmark = self.getBookmark(2);\r
+\r
+                                       // Get start element\r
+                                       tmpRange = ieRange.duplicate();\r
+                                       tmpRange.collapse(true);\r
+                                       element = tmpRange.parentElement();\r
+\r
+                                       // Get end element\r
+                                       if (!collapsed) {\r
+                                               tmpRange = ieRange.duplicate();\r
+                                               tmpRange.collapse(false);\r
+                                               element2 = tmpRange.parentElement();\r
+                                               element2.innerHTML = element2.innerHTML;\r
+                                       }\r
+\r
+                                       // Remove the broken elements\r
+                                       element.innerHTML = element.innerHTML;\r
+\r
+                                       // Restore the selection\r
+                                       self.moveToBookmark(bookmark);\r
+\r
+                                       // Since the range has moved we need to re-get it\r
+                                       ieRange = selection.getRng();\r
+\r
+                                       // Find start point\r
+                                       findEndPoint(true);\r
+\r
+                                       // Find end point if needed\r
+                                       if (!collapsed)\r
+                                               findEndPoint();\r
+                               } else\r
+                                       throw ex; // Throw other errors\r
+                       }\r
+\r
+                       return domRange;\r
+               };\r
+\r
+               this.getBookmark = function(type) {\r
+                       var rng = selection.getRng(), start, end, bookmark = {};\r
+\r
+                       function getIndexes(node) {\r
+                               var node, parent, root, children, i, indexes = [];\r
+\r
+                               parent = node.parentNode;\r
+                               root = dom.getRoot().parentNode;\r
+\r
+                               while (parent != root) {\r
+                                       children = parent.children;\r
+\r
+                                       i = children.length;\r
+                                       while (i--) {\r
+                                               if (node === children[i]) {\r
+                                                       indexes.push(i);\r
+                                                       break;\r
+                                               }\r
+                                       }\r
+\r
+                                       node = parent;\r
+                                       parent = parent.parentNode;\r
+                               }\r
+\r
+                               return indexes;\r
+                       };\r
+\r
+                       function getBookmarkEndPoint(start) {\r
+                               var position;\r
+\r
+                               position = getPosition(rng, start);\r
+                               if (position) {\r
+                                       return {\r
+                                               position : position.position,\r
+                                               offset : position.offset,\r
+                                               indexes : getIndexes(position.node),\r
+                                               inside : position.inside\r
+                                       };\r
+                               }\r
+                       };\r
+\r
+                       // Non ubstructive bookmark\r
+                       if (type === 2) {\r
+                               // Handle text selection\r
+                               if (!rng.item) {\r
+                                       bookmark.start = getBookmarkEndPoint(true);\r
+\r
+                                       if (!selection.isCollapsed())\r
+                                               bookmark.end = getBookmarkEndPoint();\r
+                               } else\r
+                                       bookmark.start = {ctrl : true, indexes : getIndexes(rng.item(0))};\r
+                       }\r
+\r
+                       return bookmark;\r
+               };\r
+\r
+               this.moveToBookmark = function(bookmark) {\r
+                       var rng, body = dom.doc.body;\r
+\r
+                       function resolveIndexes(indexes) {\r
+                               var node, i, idx, children;\r
+\r
+                               node = dom.getRoot();\r
+                               for (i = indexes.length - 1; i >= 0; i--) {\r
+                                       children = node.children;\r
+                                       idx = indexes[i];\r
+\r
+                                       if (idx <= children.length - 1) {\r
+                                               node = children[idx];\r
+                                       }\r
+                               }\r
+\r
+                               return node;\r
+                       };\r
+                       \r
+                       function setBookmarkEndPoint(start) {\r
+                               var endPoint = bookmark[start ? 'start' : 'end'], moveLeft, moveRng, undef;\r
+\r
+                               if (endPoint) {\r
+                                       moveLeft = endPoint.position > 0;\r
+\r
+                                       moveRng = body.createTextRange();\r
+                                       moveRng.moveToElementText(resolveIndexes(endPoint.indexes));\r
+\r
+                                       offset = endPoint.offset;\r
+                                       if (offset !== undef) {\r
+                                               moveRng.collapse(endPoint.inside || moveLeft);\r
+                                               moveRng.moveStart('character', moveLeft ? -offset : offset);\r
+                                       } else\r
+                                               moveRng.collapse(start);\r
+\r
+                                       rng.setEndPoint(start ? 'StartToStart' : 'EndToStart', moveRng);\r
+\r
+                                       if (start)\r
+                                               rng.collapse(true);\r
+                               }\r
+                       };\r
+\r
+                       if (bookmark.start) {\r
+                               if (bookmark.start.ctrl) {\r
+                                       rng = body.createControlRange();\r
+                                       rng.addElement(resolveIndexes(bookmark.start.indexes));\r
+                                       rng.select();\r
+                               } else {\r
+                                       rng = body.createTextRange();\r
+                                       setBookmarkEndPoint(true);\r
+                                       setBookmarkEndPoint();\r
+                                       rng.select();\r
+                               }\r
+                       }\r
+               };\r
+\r
+               this.addRange = function(rng) {\r
+                       var ieRng, ctrlRng, startContainer, startOffset, endContainer, endOffset, doc = selection.dom.doc, body = doc.body;\r
+\r
+                       function setEndPoint(start) {\r
+                               var container, offset, marker, tmpRng, nodes;\r
+\r
+                               marker = dom.create('a');\r
+                               container = start ? startContainer : endContainer;\r
+                               offset = start ? startOffset : endOffset;\r
+                               tmpRng = ieRng.duplicate();\r
+\r
+                               if (container == doc || container == doc.documentElement) {\r
+                                       container = body;\r
+                                       offset = 0;\r
+                               }\r
+\r
+                               if (container.nodeType == 3) {\r
+                                       container.parentNode.insertBefore(marker, container);\r
+                                       tmpRng.moveToElementText(marker);\r
+                                       tmpRng.moveStart('character', offset);\r
+                                       dom.remove(marker);\r
+                                       ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);\r
+                               } else {\r
+                                       nodes = container.childNodes;\r
+\r
+                                       if (nodes.length) {\r
+                                               if (offset >= nodes.length) {\r
+                                                       dom.insertAfter(marker, nodes[nodes.length - 1]);\r
+                                               } else {\r
+                                                       container.insertBefore(marker, nodes[offset]);\r
+                                               }\r
+\r
+                                               tmpRng.moveToElementText(marker);\r
+                                       } else {\r
+                                               // Empty node selection for example <div>|</div>\r
+                                               marker = doc.createTextNode('\uFEFF');\r
+                                               container.appendChild(marker);\r
+                                               tmpRng.moveToElementText(marker.parentNode);\r
+                                               tmpRng.collapse(TRUE);\r
+                                       }\r
+\r
+                                       ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);\r
+                                       dom.remove(marker);\r
+                               }\r
+                       }\r
+\r
+                       // Setup some shorter versions\r
+                       startContainer = rng.startContainer;\r
+                       startOffset = rng.startOffset;\r
+                       endContainer = rng.endContainer;\r
+                       endOffset = rng.endOffset;\r
+                       ieRng = body.createTextRange();\r
+\r
+                       // If single element selection then try making a control selection out of it\r
+                       if (startContainer == endContainer && startContainer.nodeType == 1 && startOffset == endOffset - 1) {\r
+                               if (startOffset == endOffset - 1) {\r
+                                       try {\r
+                                               ctrlRng = body.createControlRange();\r
+                                               ctrlRng.addElement(startContainer.childNodes[startOffset]);\r
+                                               ctrlRng.select();\r
+                                               return;\r
+                                       } catch (ex) {\r
+                                               // Ignore\r
+                                       }\r
+                               }\r
+                       }\r
+\r
+                       // Set start/end point of selection\r
+                       setEndPoint(true);\r
+                       setEndPoint();\r
+\r
+                       // Select the new range and scroll it into view\r
+                       ieRng.select();\r
+               };\r
+\r
+               // Expose range method\r
+               this.getRangeAt = getRange;\r
+       };\r
+\r
+       // Expose the selection object\r
+       tinymce.dom.TridentSelection = Selection;\r
+})();\r
+\r
+\r
+/*\r
+ * Sizzle CSS Selector Engine - v1.0\r
+ *  Copyright 2009, The Dojo Foundation\r
+ *  Released under the MIT, BSD, and GPL Licenses.\r
+ *  More information: http://sizzlejs.com/\r
+ */\r
+(function(){\r
+\r
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,\r
+       done = 0,\r
+       toString = Object.prototype.toString,\r
+       hasDuplicate = false,\r
+       baseHasDuplicate = true;\r
+\r
+// Here we check if the JavaScript engine is using some sort of\r
+// optimization where it does not always call our comparision\r
+// function. If that is the case, discard the hasDuplicate value.\r
+//   Thus far that includes Google Chrome.\r
+[0, 0].sort(function(){\r
+       baseHasDuplicate = false;\r
+       return 0;\r
+});\r
+\r
+var Sizzle = function(selector, context, results, seed) {\r
+       results = results || [];\r
+       context = context || document;\r
+\r
+       var origContext = context;\r
+\r
+       if ( context.nodeType !== 1 && context.nodeType !== 9 ) {\r
+               return [];\r
+       }\r
+       \r
+       if ( !selector || typeof selector !== "string" ) {\r
+               return results;\r
+       }\r
+\r
+       var parts = [], m, set, checkSet, extra, prune = true, contextXML = Sizzle.isXML(context),\r
+               soFar = selector, ret, cur, pop, i;\r
+       \r
+       // Reset the position of the chunker regexp (start from head)\r
+       do {\r
+               chunker.exec("");\r
+               m = chunker.exec(soFar);\r
+\r
+               if ( m ) {\r
+                       soFar = m[3];\r
+               \r
+                       parts.push( m[1] );\r
+               \r
+                       if ( m[2] ) {\r
+                               extra = m[3];\r
+                               break;\r
+                       }\r
+               }\r
+       } while ( m );\r
+\r
+       if ( parts.length > 1 && origPOS.exec( selector ) ) {\r
+               if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {\r
+                       set = posProcess( parts[0] + parts[1], context );\r
+               } else {\r
+                       set = Expr.relative[ parts[0] ] ?\r
+                               [ context ] :\r
+                               Sizzle( parts.shift(), context );\r
+\r
+                       while ( parts.length ) {\r
+                               selector = parts.shift();\r
+\r
+                               if ( Expr.relative[ selector ] ) {\r
+                                       selector += parts.shift();\r
+                               }\r
+                               \r
+                               set = posProcess( selector, set );\r
+                       }\r
+               }\r
+       } else {\r
+               // Take a shortcut and set the context if the root selector is an ID\r
+               // (but not if it'll be faster if the inner selector is an ID)\r
+               if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&\r
+                               Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {\r
+                       ret = Sizzle.find( parts.shift(), context, contextXML );\r
+                       context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];\r
+               }\r
+\r
+               if ( context ) {\r
+                       ret = seed ?\r
+                               { expr: parts.pop(), set: makeArray(seed) } :\r
+                               Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );\r
+                       set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;\r
+\r
+                       if ( parts.length > 0 ) {\r
+                               checkSet = makeArray(set);\r
+                       } else {\r
+                               prune = false;\r
+                       }\r
+\r
+                       while ( parts.length ) {\r
+                               cur = parts.pop();\r
+                               pop = cur;\r
+\r
+                               if ( !Expr.relative[ cur ] ) {\r
+                                       cur = "";\r
+                               } else {\r
+                                       pop = parts.pop();\r
+                               }\r
+\r
+                               if ( pop == null ) {\r
+                                       pop = context;\r
+                               }\r
+\r
+                               Expr.relative[ cur ]( checkSet, pop, contextXML );\r
+                       }\r
+               } else {\r
+                       checkSet = parts = [];\r
+               }\r
+       }\r
+\r
+       if ( !checkSet ) {\r
+               checkSet = set;\r
+       }\r
+\r
+       if ( !checkSet ) {\r
+               Sizzle.error( cur || selector );\r
+       }\r
+\r
+       if ( toString.call(checkSet) === "[object Array]" ) {\r
+               if ( !prune ) {\r
+                       results.push.apply( results, checkSet );\r
+               } else if ( context && context.nodeType === 1 ) {\r
+                       for ( i = 0; checkSet[i] != null; i++ ) {\r
+                               if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {\r
+                                       results.push( set[i] );\r
+                               }\r
+                       }\r
+               } else {\r
+                       for ( i = 0; checkSet[i] != null; i++ ) {\r
+                               if ( checkSet[i] && checkSet[i].nodeType === 1 ) {\r
+                                       results.push( set[i] );\r
+                               }\r
+                       }\r
+               }\r
+       } else {\r
+               makeArray( checkSet, results );\r
+       }\r
+\r
+       if ( extra ) {\r
+               Sizzle( extra, origContext, results, seed );\r
+               Sizzle.uniqueSort( results );\r
+       }\r
+\r
+       return results;\r
+};\r
+\r
+Sizzle.uniqueSort = function(results){\r
+       if ( sortOrder ) {\r
+               hasDuplicate = baseHasDuplicate;\r
+               results.sort(sortOrder);\r
+\r
+               if ( hasDuplicate ) {\r
+                       for ( var i = 1; i < results.length; i++ ) {\r
+                               if ( results[i] === results[i-1] ) {\r
+                                       results.splice(i--, 1);\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       return results;\r
+};\r
+\r
+Sizzle.matches = function(expr, set){\r
+       return Sizzle(expr, null, null, set);\r
+};\r
+\r
+Sizzle.find = function(expr, context, isXML){\r
+       var set;\r
+\r
+       if ( !expr ) {\r
+               return [];\r
+       }\r
+\r
+       for ( var i = 0, l = Expr.order.length; i < l; i++ ) {\r
+               var type = Expr.order[i], match;\r
+               \r
+               if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {\r
+                       var left = match[1];\r
+                       match.splice(1,1);\r
+\r
+                       if ( left.substr( left.length - 1 ) !== "\\" ) {\r
+                               match[1] = (match[1] || "").replace(/\\/g, "");\r
+                               set = Expr.find[ type ]( match, context, isXML );\r
+                               if ( set != null ) {\r
+                                       expr = expr.replace( Expr.match[ type ], "" );\r
+                                       break;\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       if ( !set ) {\r
+               set = context.getElementsByTagName("*");\r
+       }\r
+\r
+       return {set: set, expr: expr};\r
+};\r
+\r
+Sizzle.filter = function(expr, set, inplace, not){\r
+       var old = expr, result = [], curLoop = set, match, anyFound,\r
+               isXMLFilter = set && set[0] && Sizzle.isXML(set[0]);\r
+\r
+       while ( expr && set.length ) {\r
+               for ( var type in Expr.filter ) {\r
+                       if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {\r
+                               var filter = Expr.filter[ type ], found, item, left = match[1];\r
+                               anyFound = false;\r
+\r
+                               match.splice(1,1);\r
+\r
+                               if ( left.substr( left.length - 1 ) === "\\" ) {\r
+                                       continue;\r
+                               }\r
+\r
+                               if ( curLoop === result ) {\r
+                                       result = [];\r
+                               }\r
+\r
+                               if ( Expr.preFilter[ type ] ) {\r
+                                       match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );\r
+\r
+                                       if ( !match ) {\r
+                                               anyFound = found = true;\r
+                                       } else if ( match === true ) {\r
+                                               continue;\r
+                                       }\r
+                               }\r
+\r
+                               if ( match ) {\r
+                                       for ( var i = 0; (item = curLoop[i]) != null; i++ ) {\r
+                                               if ( item ) {\r
+                                                       found = filter( item, match, i, curLoop );\r
+                                                       var pass = not ^ !!found;\r
+\r
+                                                       if ( inplace && found != null ) {\r
+                                                               if ( pass ) {\r
+                                                                       anyFound = true;\r
+                                                               } else {\r
+                                                                       curLoop[i] = false;\r
+                                                               }\r
+                                                       } else if ( pass ) {\r
+                                                               result.push( item );\r
+                                                               anyFound = true;\r
+                                                       }\r
+                                               }\r
+                                       }\r
+                               }\r
+\r
+                               if ( found !== undefined ) {\r
+                                       if ( !inplace ) {\r
+                                               curLoop = result;\r
+                                       }\r
+\r
+                                       expr = expr.replace( Expr.match[ type ], "" );\r
+\r
+                                       if ( !anyFound ) {\r
+                                               return [];\r
+                                       }\r
+\r
+                                       break;\r
+                               }\r
+                       }\r
+               }\r
+\r
+               // Improper expression\r
+               if ( expr === old ) {\r
+                       if ( anyFound == null ) {\r
+                               Sizzle.error( expr );\r
+                       } else {\r
+                               break;\r
+                       }\r
+               }\r
+\r
+               old = expr;\r
+       }\r
+\r
+       return curLoop;\r
+};\r
+\r
+Sizzle.error = function( msg ) {\r
+       throw "Syntax error, unrecognized expression: " + msg;\r
+};\r
+\r
+var Expr = Sizzle.selectors = {\r
+       order: [ "ID", "NAME", "TAG" ],\r
+       match: {\r
+               ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,\r
+               CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,\r
+               NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,\r
+               ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,\r
+               TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,\r
+               CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,\r
+               POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,\r
+               PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/\r
+       },\r
+       leftMatch: {},\r
+       attrMap: {\r
+               "class": "className",\r
+               "for": "htmlFor"\r
+       },\r
+       attrHandle: {\r
+               href: function(elem){\r
+                       return elem.getAttribute("href");\r
+               }\r
+       },\r
+       relative: {\r
+               "+": function(checkSet, part){\r
+                       var isPartStr = typeof part === "string",\r
+                               isTag = isPartStr && !/\W/.test(part),\r
+                               isPartStrNotTag = isPartStr && !isTag;\r
+\r
+                       if ( isTag ) {\r
+                               part = part.toLowerCase();\r
+                       }\r
+\r
+                       for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {\r
+                               if ( (elem = checkSet[i]) ) {\r
+                                       while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}\r
+\r
+                                       checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?\r
+                                               elem || false :\r
+                                               elem === part;\r
+                               }\r
+                       }\r
+\r
+                       if ( isPartStrNotTag ) {\r
+                               Sizzle.filter( part, checkSet, true );\r
+                       }\r
+               },\r
+               ">": function(checkSet, part){\r
+                       var isPartStr = typeof part === "string",\r
+                               elem, i = 0, l = checkSet.length;\r
+\r
+                       if ( isPartStr && !/\W/.test(part) ) {\r
+                               part = part.toLowerCase();\r
+\r
+                               for ( ; i < l; i++ ) {\r
+                                       elem = checkSet[i];\r
+                                       if ( elem ) {\r
+                                               var parent = elem.parentNode;\r
+                                               checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;\r
+                                       }\r
+                               }\r
+                       } else {\r
+                               for ( ; i < l; i++ ) {\r
+                                       elem = checkSet[i];\r
+                                       if ( elem ) {\r
+                                               checkSet[i] = isPartStr ?\r
+                                                       elem.parentNode :\r
+                                                       elem.parentNode === part;\r
+                                       }\r
+                               }\r
+\r
+                               if ( isPartStr ) {\r
+                                       Sizzle.filter( part, checkSet, true );\r
+                               }\r
+                       }\r
+               },\r
+               "": function(checkSet, part, isXML){\r
+                       var doneName = done++, checkFn = dirCheck, nodeCheck;\r
+\r
+                       if ( typeof part === "string" && !/\W/.test(part) ) {\r
+                               part = part.toLowerCase();\r
+                               nodeCheck = part;\r
+                               checkFn = dirNodeCheck;\r
+                       }\r
+\r
+                       checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);\r
+               },\r
+               "~": function(checkSet, part, isXML){\r
+                       var doneName = done++, checkFn = dirCheck, nodeCheck;\r
+\r
+                       if ( typeof part === "string" && !/\W/.test(part) ) {\r
+                               part = part.toLowerCase();\r
+                               nodeCheck = part;\r
+                               checkFn = dirNodeCheck;\r
+                       }\r
+\r
+                       checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);\r
+               }\r
+       },\r
+       find: {\r
+               ID: function(match, context, isXML){\r
+                       if ( typeof context.getElementById !== "undefined" && !isXML ) {\r
+                               var m = context.getElementById(match[1]);\r
+                               return m ? [m] : [];\r
+                       }\r
+               },\r
+               NAME: function(match, context){\r
+                       if ( typeof context.getElementsByName !== "undefined" ) {\r
+                               var ret = [], results = context.getElementsByName(match[1]);\r
+\r
+                               for ( var i = 0, l = results.length; i < l; i++ ) {\r
+                                       if ( results[i].getAttribute("name") === match[1] ) {\r
+                                               ret.push( results[i] );\r
+                                       }\r
+                               }\r
+\r
+                               return ret.length === 0 ? null : ret;\r
+                       }\r
+               },\r
+               TAG: function(match, context){\r
+                       return context.getElementsByTagName(match[1]);\r
+               }\r
+       },\r
+       preFilter: {\r
+               CLASS: function(match, curLoop, inplace, result, not, isXML){\r
+                       match = " " + match[1].replace(/\\/g, "") + " ";\r
+\r
+                       if ( isXML ) {\r
+                               return match;\r
+                       }\r
+\r
+                       for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {\r
+                               if ( elem ) {\r
+                                       if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {\r
+                                               if ( !inplace ) {\r
+                                                       result.push( elem );\r
+                                               }\r
+                                       } else if ( inplace ) {\r
+                                               curLoop[i] = false;\r
+                                       }\r
+                               }\r
+                       }\r
+\r
+                       return false;\r
+               },\r
+               ID: function(match){\r
+                       return match[1].replace(/\\/g, "");\r
+               },\r
+               TAG: function(match, curLoop){\r
+                       return match[1].toLowerCase();\r
+               },\r
+               CHILD: function(match){\r
+                       if ( match[1] === "nth" ) {\r
+                               // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'\r
+                               var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(\r
+                                       match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||\r
+                                       !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);\r
+\r
+                               // calculate the numbers (first)n+(last) including if they are negative\r
+                               match[2] = (test[1] + (test[2] || 1)) - 0;\r
+                               match[3] = test[3] - 0;\r
+                       }\r
+\r
+                       // TODO: Move to normal caching system\r
+                       match[0] = done++;\r
+\r
+                       return match;\r
+               },\r
+               ATTR: function(match, curLoop, inplace, result, not, isXML){\r
+                       var name = match[1].replace(/\\/g, "");\r
+                       \r
+                       if ( !isXML && Expr.attrMap[name] ) {\r
+                               match[1] = Expr.attrMap[name];\r
+                       }\r
+\r
+                       if ( match[2] === "~=" ) {\r
+                               match[4] = " " + match[4] + " ";\r
+                       }\r
+\r
+                       return match;\r
+               },\r
+               PSEUDO: function(match, curLoop, inplace, result, not){\r
+                       if ( match[1] === "not" ) {\r
+                               // If we're dealing with a complex expression, or a simple one\r
+                               if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {\r
+                                       match[3] = Sizzle(match[3], null, null, curLoop);\r
+                               } else {\r
+                                       var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);\r
+                                       if ( !inplace ) {\r
+                                               result.push.apply( result, ret );\r
+                                       }\r
+                                       return false;\r
+                               }\r
+                       } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {\r
+                               return true;\r
+                       }\r
+                       \r
+                       return match;\r
+               },\r
+               POS: function(match){\r
+                       match.unshift( true );\r
+                       return match;\r
+               }\r
+       },\r
+       filters: {\r
+               enabled: function(elem){\r
+                       return elem.disabled === false && elem.type !== "hidden";\r
+               },\r
+               disabled: function(elem){\r
+                       return elem.disabled === true;\r
+               },\r
+               checked: function(elem){\r
+                       return elem.checked === true;\r
+               },\r
+               selected: function(elem){\r
+                       // Accessing this property makes selected-by-default\r
+                       // options in Safari work properly\r
+                       elem.parentNode.selectedIndex;\r
+                       return elem.selected === true;\r
+               },\r
+               parent: function(elem){\r
+                       return !!elem.firstChild;\r
+               },\r
+               empty: function(elem){\r
+                       return !elem.firstChild;\r
+               },\r
+               has: function(elem, i, match){\r
+                       return !!Sizzle( match[3], elem ).length;\r
+               },\r
+               header: function(elem){\r
+                       return (/h\d/i).test( elem.nodeName );\r
+               },\r
+               text: function(elem){\r
+                       return "text" === elem.type;\r
+               },\r
+               radio: function(elem){\r
+                       return "radio" === elem.type;\r
+               },\r
+               checkbox: function(elem){\r
+                       return "checkbox" === elem.type;\r
+               },\r
+               file: function(elem){\r
+                       return "file" === elem.type;\r
+               },\r
+               password: function(elem){\r
+                       return "password" === elem.type;\r
+               },\r
+               submit: function(elem){\r
+                       return "submit" === elem.type;\r
+               },\r
+               image: function(elem){\r
+                       return "image" === elem.type;\r
+               },\r
+               reset: function(elem){\r
+                       return "reset" === elem.type;\r
+               },\r
+               button: function(elem){\r
+                       return "button" === elem.type || elem.nodeName.toLowerCase() === "button";\r
+               },\r
+               input: function(elem){\r
+                       return (/input|select|textarea|button/i).test(elem.nodeName);\r
+               }\r
+       },\r
+       setFilters: {\r
+               first: function(elem, i){\r
+                       return i === 0;\r
+               },\r
+               last: function(elem, i, match, array){\r
+                       return i === array.length - 1;\r
+               },\r
+               even: function(elem, i){\r
+                       return i % 2 === 0;\r
+               },\r
+               odd: function(elem, i){\r
+                       return i % 2 === 1;\r
+               },\r
+               lt: function(elem, i, match){\r
+                       return i < match[3] - 0;\r
+               },\r
+               gt: function(elem, i, match){\r
+                       return i > match[3] - 0;\r
+               },\r
+               nth: function(elem, i, match){\r
+                       return match[3] - 0 === i;\r
+               },\r
+               eq: function(elem, i, match){\r
+                       return match[3] - 0 === i;\r
+               }\r
+       },\r
+       filter: {\r
+               PSEUDO: function(elem, match, i, array){\r
+                       var name = match[1], filter = Expr.filters[ name ];\r
+\r
+                       if ( filter ) {\r
+                               return filter( elem, i, match, array );\r
+                       } else if ( name === "contains" ) {\r
+                               return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;\r
+                       } else if ( name === "not" ) {\r
+                               var not = match[3];\r
+\r
+                               for ( var j = 0, l = not.length; j < l; j++ ) {\r
+                                       if ( not[j] === elem ) {\r
+                                               return false;\r
+                                       }\r
+                               }\r
+\r
+                               return true;\r
+                       } else {\r
+                               Sizzle.error( "Syntax error, unrecognized expression: " + name );\r
+                       }\r
+               },\r
+               CHILD: function(elem, match){\r
+                       var type = match[1], node = elem;\r
+                       switch (type) {\r
+                               case 'only':\r
+                               case 'first':\r
+                                       while ( (node = node.previousSibling) )  {\r
+                                               if ( node.nodeType === 1 ) { \r
+                                                       return false; \r
+                                               }\r
+                                       }\r
+                                       if ( type === "first" ) { \r
+                                               return true; \r
+                                       }\r
+                                       node = elem;\r
+                               case 'last':\r
+                                       while ( (node = node.nextSibling) )      {\r
+                                               if ( node.nodeType === 1 ) { \r
+                                                       return false; \r
+                                               }\r
+                                       }\r
+                                       return true;\r
+                               case 'nth':\r
+                                       var first = match[2], last = match[3];\r
+\r
+                                       if ( first === 1 && last === 0 ) {\r
+                                               return true;\r
+                                       }\r
+                                       \r
+                                       var doneName = match[0],\r
+                                               parent = elem.parentNode;\r
+       \r
+                                       if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {\r
+                                               var count = 0;\r
+                                               for ( node = parent.firstChild; node; node = node.nextSibling ) {\r
+                                                       if ( node.nodeType === 1 ) {\r
+                                                               node.nodeIndex = ++count;\r
+                                                       }\r
+                                               } \r
+                                               parent.sizcache = doneName;\r
+                                       }\r
+                                       \r
+                                       var diff = elem.nodeIndex - last;\r
+                                       if ( first === 0 ) {\r
+                                               return diff === 0;\r
+                                       } else {\r
+                                               return ( diff % first === 0 && diff / first >= 0 );\r
+                                       }\r
+                       }\r
+               },\r
+               ID: function(elem, match){\r
+                       return elem.nodeType === 1 && elem.getAttribute("id") === match;\r
+               },\r
+               TAG: function(elem, match){\r
+                       return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;\r
+               },\r
+               CLASS: function(elem, match){\r
+                       return (" " + (elem.className || elem.getAttribute("class")) + " ")\r
+                               .indexOf( match ) > -1;\r
+               },\r
+               ATTR: function(elem, match){\r
+                       var name = match[1],\r
+                               result = Expr.attrHandle[ name ] ?\r
+                                       Expr.attrHandle[ name ]( elem ) :\r
+                                       elem[ name ] != null ?\r
+                                               elem[ name ] :\r
+                                               elem.getAttribute( name ),\r
+                               value = result + "",\r
+                               type = match[2],\r
+                               check = match[4];\r
+\r
+                       return result == null ?\r
+                               type === "!=" :\r
+                               type === "=" ?\r
+                               value === check :\r
+                               type === "*=" ?\r
+                               value.indexOf(check) >= 0 :\r
+                               type === "~=" ?\r
+                               (" " + value + " ").indexOf(check) >= 0 :\r
+                               !check ?\r
+                               value && result !== false :\r
+                               type === "!=" ?\r
+                               value !== check :\r
+                               type === "^=" ?\r
+                               value.indexOf(check) === 0 :\r
+                               type === "$=" ?\r
+                               value.substr(value.length - check.length) === check :\r
+                               type === "|=" ?\r
+                               value === check || value.substr(0, check.length + 1) === check + "-" :\r
+                               false;\r
+               },\r
+               POS: function(elem, match, i, array){\r
+                       var name = match[2], filter = Expr.setFilters[ name ];\r
+\r
+                       if ( filter ) {\r
+                               return filter( elem, i, match, array );\r
+                       }\r
+               }\r
+       }\r
+};\r
 \r
-                       t.inits = [];\r
-               },\r
+var origPOS = Expr.match.POS,\r
+       fescape = function(all, num){\r
+               return "\\" + (num - 0 + 1);\r
+       };\r
 \r
-               _wait : function(win) {\r
-                       var t = this, doc = win.document;\r
+for ( var type in Expr.match ) {\r
+       Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );\r
+       Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );\r
+}\r
 \r
-                       // No need since the document is already loaded\r
-                       if (win.tinyMCE_GZ && tinyMCE_GZ.loaded) {\r
-                               t.domLoaded = 1;\r
-                               return;\r
-                       }\r
+var makeArray = function(array, results) {\r
+       array = Array.prototype.slice.call( array, 0 );\r
 \r
-                       // Use IE method\r
-                       if (doc.attachEvent) {\r
-                               doc.attachEvent("onreadystatechange", function() {\r
-                                       if (doc.readyState === "complete") {\r
-                                               doc.detachEvent("onreadystatechange", arguments.callee);\r
-                                               t._pageInit(win);\r
-                                       }\r
-                               });\r
+       if ( results ) {\r
+               results.push.apply( results, array );\r
+               return results;\r
+       }\r
+       \r
+       return array;\r
+};\r
 \r
-                               if (doc.documentElement.doScroll && win == win.top) {\r
-                                       (function() {\r
-                                               if (t.domLoaded)\r
-                                                       return;\r
+// Perform a simple check to determine if the browser is capable of\r
+// converting a NodeList to an array using builtin methods.\r
+// Also verifies that the returned array holds DOM nodes\r
+// (which is not the case in the Blackberry browser)\r
+try {\r
+       Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;\r
 \r
-                                               try {\r
-                                                       // If IE is used, use the trick by Diego Perini\r
-                                                       // http://javascript.nwbox.com/IEContentLoaded/\r
-                                                       doc.documentElement.doScroll("left");\r
-                                               } catch (ex) {\r
-                                                       setTimeout(arguments.callee, 0);\r
-                                                       return;\r
-                                               }\r
+// Provide a fallback method if it does not work\r
+} catch(e){\r
+       makeArray = function(array, results) {\r
+               var ret = results || [], i = 0;\r
 \r
-                                               t._pageInit(win);\r
-                                       })();\r
+               if ( toString.call(array) === "[object Array]" ) {\r
+                       Array.prototype.push.apply( ret, array );\r
+               } else {\r
+                       if ( typeof array.length === "number" ) {\r
+                               for ( var l = array.length; i < l; i++ ) {\r
+                                       ret.push( array[i] );\r
+                               }\r
+                       } else {\r
+                               for ( ; array[i]; i++ ) {\r
+                                       ret.push( array[i] );\r
                                }\r
-                       } else if (doc.addEventListener) {\r
-                               t._add(win, 'DOMContentLoaded', function() {\r
-                                       t._pageInit(win);\r
-                               });\r
                        }\r
+               }\r
 \r
-                       t._add(win, 'load', function() {\r
-                               t._pageInit(win);\r
-                       });\r
-               },\r
+               return ret;\r
+       };\r
+}\r
 \r
-               _stoppers : {\r
-                       preventDefault :  function() {\r
-                               this.returnValue = false;\r
-                       },\r
+var sortOrder;\r
 \r
-                       stopPropagation : function() {\r
-                               this.cancelBubble = true;\r
+if ( document.documentElement.compareDocumentPosition ) {\r
+       sortOrder = function( a, b ) {\r
+               if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {\r
+                       if ( a == b ) {\r
+                               hasDuplicate = true;\r
                        }\r
+                       return a.compareDocumentPosition ? -1 : 1;\r
                }\r
-       });\r
 \r
-       Event = tinymce.dom.Event = new tinymce.dom.EventUtils();\r
-\r
-       // Dispatch DOM content loaded event for IE and Safari\r
-       Event._wait(window);\r
+               var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;\r
+               if ( ret === 0 ) {\r
+                       hasDuplicate = true;\r
+               }\r
+               return ret;\r
+       };\r
+} else if ( "sourceIndex" in document.documentElement ) {\r
+       sortOrder = function( a, b ) {\r
+               if ( !a.sourceIndex || !b.sourceIndex ) {\r
+                       if ( a == b ) {\r
+                               hasDuplicate = true;\r
+                       }\r
+                       return a.sourceIndex ? -1 : 1;\r
+               }\r
 \r
-       tinymce.addUnload(function() {\r
-               Event.destroy();\r
-       });\r
-})(tinymce);\r
+               var ret = a.sourceIndex - b.sourceIndex;\r
+               if ( ret === 0 ) {\r
+                       hasDuplicate = true;\r
+               }\r
+               return ret;\r
+       };\r
+} else if ( document.createRange ) {\r
+       sortOrder = function( a, b ) {\r
+               if ( !a.ownerDocument || !b.ownerDocument ) {\r
+                       if ( a == b ) {\r
+                               hasDuplicate = true;\r
+                       }\r
+                       return a.ownerDocument ? -1 : 1;\r
+               }\r
 \r
-(function(tinymce) {\r
-       tinymce.dom.Element = function(id, settings) {\r
-               var t = this, dom, el;\r
+               var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();\r
+               aRange.setStart(a, 0);\r
+               aRange.setEnd(a, 0);\r
+               bRange.setStart(b, 0);\r
+               bRange.setEnd(b, 0);\r
+               var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);\r
+               if ( ret === 0 ) {\r
+                       hasDuplicate = true;\r
+               }\r
+               return ret;\r
+       };\r
+}\r
 \r
-               t.settings = settings = settings || {};\r
-               t.id = id;\r
-               t.dom = dom = settings.dom || tinymce.DOM;\r
+// Utility function for retreiving the text value of an array of DOM nodes\r
+Sizzle.getText = function( elems ) {\r
+       var ret = "", elem;\r
 \r
-               // Only IE leaks DOM references, this is a lot faster\r
-               if (!tinymce.isIE)\r
-                       el = dom.get(t.id);\r
+       for ( var i = 0; elems[i]; i++ ) {\r
+               elem = elems[i];\r
 \r
-               tinymce.each(\r
-                               ('getPos,getRect,getParent,add,setStyle,getStyle,setStyles,' + \r
-                               'setAttrib,setAttribs,getAttrib,addClass,removeClass,' + \r
-                               'hasClass,getOuterHTML,setOuterHTML,remove,show,hide,' + \r
-                               'isHidden,setHTML,get').split(/,/)\r
-                       , function(k) {\r
-                               t[k] = function() {\r
-                                       var a = [id], i;\r
+               // Get the text from text nodes and CDATA nodes\r
+               if ( elem.nodeType === 3 || elem.nodeType === 4 ) {\r
+                       ret += elem.nodeValue;\r
 \r
-                                       for (i = 0; i < arguments.length; i++)\r
-                                               a.push(arguments[i]);\r
+               // Traverse everything else, except comment nodes\r
+               } else if ( elem.nodeType !== 8 ) {\r
+                       ret += Sizzle.getText( elem.childNodes );\r
+               }\r
+       }\r
 \r
-                                       a = dom[k].apply(dom, a);\r
-                                       t.update(k);\r
+       return ret;\r
+};\r
 \r
-                                       return a;\r
-                               };\r
-               });\r
+// Check to see if the browser returns elements by name when\r
+// querying by getElementById (and provide a workaround)\r
+(function(){\r
+       // We're going to inject a fake input element with a specified name\r
+       var form = document.createElement("div"),\r
+               id = "script" + (new Date()).getTime();\r
+       form.innerHTML = "<a name='" + id + "'/>";\r
 \r
-               tinymce.extend(t, {\r
-                       on : function(n, f, s) {\r
-                               return tinymce.dom.Event.add(t.id, n, f, s);\r
-                       },\r
+       // Inject it into the root element, check its status, and remove it quickly\r
+       var root = document.documentElement;\r
+       root.insertBefore( form, root.firstChild );\r
 \r
-                       getXY : function() {\r
-                               return {\r
-                                       x : parseInt(t.getStyle('left')),\r
-                                       y : parseInt(t.getStyle('top'))\r
-                               };\r
-                       },\r
+       // The workaround has to do additional checks after a getElementById\r
+       // Which slows things down for other browsers (hence the branching)\r
+       if ( document.getElementById( id ) ) {\r
+               Expr.find.ID = function(match, context, isXML){\r
+                       if ( typeof context.getElementById !== "undefined" && !isXML ) {\r
+                               var m = context.getElementById(match[1]);\r
+                               return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];\r
+                       }\r
+               };\r
 \r
-                       getSize : function() {\r
-                               var n = dom.get(t.id);\r
+               Expr.filter.ID = function(elem, match){\r
+                       var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");\r
+                       return elem.nodeType === 1 && node && node.nodeValue === match;\r
+               };\r
+       }\r
 \r
-                               return {\r
-                                       w : parseInt(t.getStyle('width') || n.clientWidth),\r
-                                       h : parseInt(t.getStyle('height') || n.clientHeight)\r
-                               };\r
-                       },\r
+       root.removeChild( form );\r
+       root = form = null; // release memory in IE\r
+})();\r
 \r
-                       moveTo : function(x, y) {\r
-                               t.setStyles({left : x, top : y});\r
-                       },\r
+(function(){\r
+       // Check to see if the browser returns only elements\r
+       // when doing getElementsByTagName("*")\r
 \r
-                       moveBy : function(x, y) {\r
-                               var p = t.getXY();\r
+       // Create a fake element\r
+       var div = document.createElement("div");\r
+       div.appendChild( document.createComment("") );\r
 \r
-                               t.moveTo(p.x + x, p.y + y);\r
-                       },\r
+       // Make sure no comments are found\r
+       if ( div.getElementsByTagName("*").length > 0 ) {\r
+               Expr.find.TAG = function(match, context){\r
+                       var results = context.getElementsByTagName(match[1]);\r
 \r
-                       resizeTo : function(w, h) {\r
-                               t.setStyles({width : w, height : h});\r
-                       },\r
+                       // Filter out possible comments\r
+                       if ( match[1] === "*" ) {\r
+                               var tmp = [];\r
 \r
-                       resizeBy : function(w, h) {\r
-                               var s = t.getSize();\r
+                               for ( var i = 0; results[i]; i++ ) {\r
+                                       if ( results[i].nodeType === 1 ) {\r
+                                               tmp.push( results[i] );\r
+                                       }\r
+                               }\r
 \r
-                               t.resizeTo(s.w + w, s.h + h);\r
-                       },\r
+                               results = tmp;\r
+                       }\r
 \r
-                       update : function(k) {\r
-                               var b;\r
+                       return results;\r
+               };\r
+       }\r
 \r
-                               if (tinymce.isIE6 && settings.blocker) {\r
-                                       k = k || '';\r
+       // Check to see if an attribute returns normalized href attributes\r
+       div.innerHTML = "<a href='#'></a>";\r
+       if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&\r
+                       div.firstChild.getAttribute("href") !== "#" ) {\r
+               Expr.attrHandle.href = function(elem){\r
+                       return elem.getAttribute("href", 2);\r
+               };\r
+       }\r
 \r
-                                       // Ignore getters\r
-                                       if (k.indexOf('get') === 0 || k.indexOf('has') === 0 || k.indexOf('is') === 0)\r
-                                               return;\r
+       div = null; // release memory in IE\r
+})();\r
 \r
-                                       // Remove blocker on remove\r
-                                       if (k == 'remove') {\r
-                                               dom.remove(t.blocker);\r
-                                               return;\r
-                                       }\r
+if ( document.querySelectorAll ) {\r
+       (function(){\r
+               var oldSizzle = Sizzle, div = document.createElement("div");\r
+               div.innerHTML = "<p class='TEST'></p>";\r
 \r
-                                       if (!t.blocker) {\r
-                                               t.blocker = dom.uniqueId();\r
-                                               b = dom.add(settings.container || dom.getRoot(), 'iframe', {id : t.blocker, style : 'position:absolute;', frameBorder : 0, src : 'javascript:""'});\r
-                                               dom.setStyle(b, 'opacity', 0);\r
-                                       } else\r
-                                               b = dom.get(t.blocker);\r
+               // Safari can't handle uppercase or unicode characters when\r
+               // in quirks mode.\r
+               if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {\r
+                       return;\r
+               }\r
+       \r
+               Sizzle = function(query, context, extra, seed){\r
+                       context = context || document;\r
 \r
-                                       dom.setStyles(b, {\r
-                                               left : t.getStyle('left', 1),\r
-                                               top : t.getStyle('top', 1),\r
-                                               width : t.getStyle('width', 1),\r
-                                               height : t.getStyle('height', 1),\r
-                                               display : t.getStyle('display', 1),\r
-                                               zIndex : parseInt(t.getStyle('zIndex', 1) || 0) - 1\r
-                                       });\r
-                               }\r
+                       // Only use querySelectorAll on non-XML documents\r
+                       // (ID selectors don't work in non-HTML documents)\r
+                       if ( !seed && context.nodeType === 9 && !Sizzle.isXML(context) ) {\r
+                               try {\r
+                                       return makeArray( context.querySelectorAll(query), extra );\r
+                               } catch(e){}\r
                        }\r
-               });\r
-       };\r
-})(tinymce);\r
-\r
-(function(tinymce) {\r
-       function trimNl(s) {\r
-               return s.replace(/[\n\r]+/g, '');\r
-       };\r
+               \r
+                       return oldSizzle(query, context, extra, seed);\r
+               };\r
 \r
-       // Shorten names\r
-       var is = tinymce.is, isIE = tinymce.isIE, each = tinymce.each;\r
+               for ( var prop in oldSizzle ) {\r
+                       Sizzle[ prop ] = oldSizzle[ prop ];\r
+               }\r
 \r
-       tinymce.create('tinymce.dom.Selection', {\r
-               Selection : function(dom, win, serializer) {\r
-                       var t = this;\r
+               div = null; // release memory in IE\r
+       })();\r
+}\r
 \r
-                       t.dom = dom;\r
-                       t.win = win;\r
-                       t.serializer = serializer;\r
+(function(){\r
+       var div = document.createElement("div");\r
 \r
-                       // Add events\r
-                       each([\r
-                               'onBeforeSetContent',\r
-                               'onBeforeGetContent',\r
-                               'onSetContent',\r
-                               'onGetContent'\r
-                       ], function(e) {\r
-                               t[e] = new tinymce.util.Dispatcher(t);\r
-                       });\r
+       div.innerHTML = "<div class='test e'></div><div class='test'></div>";\r
 \r
-                       // No W3C Range support\r
-                       if (!t.win.getSelection)\r
-                               t.tridentSel = new tinymce.dom.TridentSelection(t);\r
+       // Opera can't find a second classname (in 9.6)\r
+       // Also, make sure that getElementsByClassName actually exists\r
+       if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {\r
+               return;\r
+       }\r
 \r
-                       if (tinymce.isIE && dom.boxModel)\r
-                               this._fixIESelection();\r
+       // Safari caches class attributes, doesn't catch changes (in 3.2)\r
+       div.lastChild.className = "e";\r
 \r
-                       // Prevent leaks\r
-                       tinymce.addUnload(t.destroy, t);\r
-               },\r
+       if ( div.getElementsByClassName("e").length === 1 ) {\r
+               return;\r
+       }\r
+       \r
+       Expr.order.splice(1, 0, "CLASS");\r
+       Expr.find.CLASS = function(match, context, isXML) {\r
+               if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {\r
+                       return context.getElementsByClassName(match[1]);\r
+               }\r
+       };\r
 \r
-               getContent : function(s) {\r
-                       var t = this, r = t.getRng(), e = t.dom.create("body"), se = t.getSel(), wb, wa, n;\r
+       div = null; // release memory in IE\r
+})();\r
 \r
-                       s = s || {};\r
-                       wb = wa = '';\r
-                       s.get = true;\r
-                       s.format = s.format || 'html';\r
-                       t.onBeforeGetContent.dispatch(t, s);\r
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {\r
+       for ( var i = 0, l = checkSet.length; i < l; i++ ) {\r
+               var elem = checkSet[i];\r
+               if ( elem ) {\r
+                       elem = elem[dir];\r
+                       var match = false;\r
 \r
-                       if (s.format == 'text')\r
-                               return t.isCollapsed() ? '' : (r.text || (se.toString ? se.toString() : ''));\r
+                       while ( elem ) {\r
+                               if ( elem.sizcache === doneName ) {\r
+                                       match = checkSet[elem.sizset];\r
+                                       break;\r
+                               }\r
 \r
-                       if (r.cloneContents) {\r
-                               n = r.cloneContents();\r
+                               if ( elem.nodeType === 1 && !isXML ){\r
+                                       elem.sizcache = doneName;\r
+                                       elem.sizset = i;\r
+                               }\r
 \r
-                               if (n)\r
-                                       e.appendChild(n);\r
-                       } else if (is(r.item) || is(r.htmlText))\r
-                               e.innerHTML = r.item ? r.item(0).outerHTML : r.htmlText;\r
-                       else\r
-                               e.innerHTML = r.toString();\r
+                               if ( elem.nodeName.toLowerCase() === cur ) {\r
+                                       match = elem;\r
+                                       break;\r
+                               }\r
 \r
-                       // Keep whitespace before and after\r
-                       if (/^\s/.test(e.innerHTML))\r
-                               wb = ' ';\r
+                               elem = elem[dir];\r
+                       }\r
 \r
-                       if (/\s+$/.test(e.innerHTML))\r
-                               wa = ' ';\r
+                       checkSet[i] = match;\r
+               }\r
+       }\r
+}\r
 \r
-                       s.getInner = true;\r
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {\r
+       for ( var i = 0, l = checkSet.length; i < l; i++ ) {\r
+               var elem = checkSet[i];\r
+               if ( elem ) {\r
+                       elem = elem[dir];\r
+                       var match = false;\r
 \r
-                       s.content = t.isCollapsed() ? '' : wb + t.serializer.serialize(e, s) + wa;\r
-                       t.onGetContent.dispatch(t, s);\r
+                       while ( elem ) {\r
+                               if ( elem.sizcache === doneName ) {\r
+                                       match = checkSet[elem.sizset];\r
+                                       break;\r
+                               }\r
 \r
-                       return s.content;\r
-               },\r
+                               if ( elem.nodeType === 1 ) {\r
+                                       if ( !isXML ) {\r
+                                               elem.sizcache = doneName;\r
+                                               elem.sizset = i;\r
+                                       }\r
+                                       if ( typeof cur !== "string" ) {\r
+                                               if ( elem === cur ) {\r
+                                                       match = true;\r
+                                                       break;\r
+                                               }\r
 \r
-               setContent : function(h, s) {\r
-                       var t = this, r = t.getRng(), c, d = t.win.document;\r
+                                       } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {\r
+                                               match = elem;\r
+                                               break;\r
+                                       }\r
+                               }\r
 \r
-                       s = s || {format : 'html'};\r
-                       s.set = true;\r
-                       h = s.content = t.dom.processHTML(h);\r
+                               elem = elem[dir];\r
+                       }\r
 \r
-                       // Dispatch before set content event\r
-                       t.onBeforeSetContent.dispatch(t, s);\r
-                       h = s.content;\r
+                       checkSet[i] = match;\r
+               }\r
+       }\r
+}\r
 \r
-                       if (r.insertNode) {\r
-                               // Make caret marker since insertNode places the caret in the beginning of text after insert\r
-                               h += '<span id="__caret">_</span>';\r
+Sizzle.contains = document.compareDocumentPosition ? function(a, b){\r
+       return !!(a.compareDocumentPosition(b) & 16);\r
+} : function(a, b){\r
+       return a !== b && (a.contains ? a.contains(b) : true);\r
+};\r
 \r
-                               // Delete and insert new node\r
-                               \r
-                               if (r.startContainer == d && r.endContainer ==  d) {\r
-                                       // WebKit will fail if the body is empty since the range is then invalid and it can't insert contents\r
-                                       d.body.innerHTML = h;\r
-                               } else {\r
-                                       r.deleteContents();\r
-                                       if (d.body.childNodes.length == 0) {\r
-                                               d.body.innerHTML = h;\r
-                                       } else {\r
-                                               // createContextualFragment doesn't exists in IE 9 DOMRanges\r
-                                               if (r.createContextualFragment) {\r
-                                                       r.insertNode(r.createContextualFragment(h));\r
-                                               } else {\r
-                                                       // Fake createContextualFragment call in IE 9\r
-                                                       var frag = d.createDocumentFragment(), temp = d.createElement('div');\r
+Sizzle.isXML = function(elem){\r
+       // documentElement is verified for cases where it doesn't yet exist\r
+       // (such as loading iframes in IE - #4833) \r
+       var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;\r
+       return documentElement ? documentElement.nodeName !== "HTML" : false;\r
+};\r
 \r
-                                                       frag.appendChild(temp);\r
-                                                       temp.outerHTML = h;\r
+var posProcess = function(selector, context){\r
+       var tmpSet = [], later = "", match,\r
+               root = context.nodeType ? [context] : context;\r
 \r
-                                                       r.insertNode(frag);\r
-                                               }\r
-                                       }\r
-                               }\r
+       // Position selectors must be done after the filter\r
+       // And so must :not(positional) so we move all PSEUDOs to the end\r
+       while ( (match = Expr.match.PSEUDO.exec( selector )) ) {\r
+               later += match[0];\r
+               selector = selector.replace( Expr.match.PSEUDO, "" );\r
+       }\r
 \r
-                               // Move to caret marker\r
-                               c = t.dom.get('__caret');\r
-                               // Make sure we wrap it compleatly, Opera fails with a simple select call\r
-                               r = d.createRange();\r
-                               r.setStartBefore(c);\r
-                               r.setEndBefore(c);\r
-                               t.setRng(r);\r
+       selector = Expr.relative[selector] ? selector + "*" : selector;\r
 \r
-                               // Remove the caret position\r
-                               t.dom.remove('__caret');\r
-                       } else {\r
-                               if (r.item) {\r
-                                       // Delete content and get caret text selection\r
-                                       d.execCommand('Delete', false, null);\r
-                                       r = t.getRng();\r
-                               }\r
+       for ( var i = 0, l = root.length; i < l; i++ ) {\r
+               Sizzle( selector, root[i], tmpSet );\r
+       }\r
 \r
-                               r.pasteHTML(h);\r
-                       }\r
+       return Sizzle.filter( later, tmpSet );\r
+};\r
 \r
-                       // Dispatch set content event\r
-                       t.onSetContent.dispatch(t, s);\r
-               },\r
+// EXPOSE\r
 \r
-               getStart : function() {\r
-                       var rng = this.getRng(), startElement, parentElement, checkRng, node;\r
+window.tinymce.dom.Sizzle = Sizzle;\r
 \r
-                       if (rng.duplicate || rng.item) {\r
-                               // Control selection, return first item\r
-                               if (rng.item)\r
-                                       return rng.item(0);\r
+})();\r
 \r
-                               // Get start element\r
-                               checkRng = rng.duplicate();\r
-                               checkRng.collapse(1);\r
-                               startElement = checkRng.parentElement();\r
 \r
-                               // Check if range parent is inside the start element, then return the inner parent element\r
-                               // This will fix issues when a single element is selected, IE would otherwise return the wrong start element\r
-                               parentElement = node = rng.parentElement();\r
-                               while (node = node.parentNode) {\r
-                                       if (node == startElement) {\r
-                                               startElement = parentElement;\r
-                                               break;\r
-                                       }\r
-                               }\r
+(function(tinymce) {\r
+       // Shorten names\r
+       var each = tinymce.each, DOM = tinymce.DOM, isIE = tinymce.isIE, isWebKit = tinymce.isWebKit, Event;\r
 \r
-                               // If start element is body element try to move to the first child if it exists\r
-                               if (startElement && startElement.nodeName == 'BODY')\r
-                                       return startElement.firstChild || startElement;\r
+       tinymce.create('tinymce.dom.EventUtils', {\r
+               EventUtils : function() {\r
+                       this.inits = [];\r
+                       this.events = [];\r
+               },\r
 \r
-                               return startElement;\r
-                       } else {\r
-                               startElement = rng.startContainer;\r
+               add : function(o, n, f, s) {\r
+                       var cb, t = this, el = t.events, r;\r
 \r
-                               if (startElement.nodeType == 1 && startElement.hasChildNodes())\r
-                                       startElement = startElement.childNodes[Math.min(startElement.childNodes.length - 1, rng.startOffset)];\r
+                       if (n instanceof Array) {\r
+                               r = [];\r
 \r
-                               if (startElement && startElement.nodeType == 3)\r
-                                       return startElement.parentNode;\r
+                               each(n, function(n) {\r
+                                       r.push(t.add(o, n, f, s));\r
+                               });\r
 \r
-                               return startElement;\r
+                               return r;\r
                        }\r
-               },\r
-\r
-               getEnd : function() {\r
-                       var t = this, r = t.getRng(), e, eo;\r
 \r
-                       if (r.duplicate || r.item) {\r
-                               if (r.item)\r
-                                       return r.item(0);\r
+                       // Handle array\r
+                       if (o && o.hasOwnProperty && o instanceof Array) {\r
+                               r = [];\r
 \r
-                               r = r.duplicate();\r
-                               r.collapse(0);\r
-                               e = r.parentElement();\r
+                               each(o, function(o) {\r
+                                       o = DOM.get(o);\r
+                                       r.push(t.add(o, n, f, s));\r
+                               });\r
 \r
-                               if (e && e.nodeName == 'BODY')\r
-                                       return e.lastChild || e;\r
+                               return r;\r
+                       }\r
 \r
-                               return e;\r
-                       } else {\r
-                               e = r.endContainer;\r
-                               eo = r.endOffset;\r
+                       o = DOM.get(o);\r
 \r
-                               if (e.nodeType == 1 && e.hasChildNodes())\r
-                                       e = e.childNodes[eo > 0 ? eo - 1 : eo];\r
+                       if (!o)\r
+                               return;\r
 \r
-                               if (e && e.nodeType == 3)\r
-                                       return e.parentNode;\r
+                       // Setup event callback\r
+                       cb = function(e) {\r
+                               // Is all events disabled\r
+                               if (t.disabled)\r
+                                       return;\r
 \r
-                               return e;\r
-                       }\r
-               },\r
+                               e = e || window.event;\r
 \r
-               getBookmark : function(type, normalized) {\r
-                       var t = this, dom = t.dom, rng, rng2, id, collapsed, name, element, index, chr = '\uFEFF', styles;\r
+                               // Patch in target, preventDefault and stopPropagation in IE it's W3C valid\r
+                               if (e && isIE) {\r
+                                       if (!e.target)\r
+                                               e.target = e.srcElement;\r
 \r
-                       function findIndex(name, element) {\r
-                               var index = 0;\r
+                                       // Patch in preventDefault, stopPropagation methods for W3C compatibility\r
+                                       tinymce.extend(e, t._stoppers);\r
+                               }\r
 \r
-                               each(dom.select(name), function(node, i) {\r
-                                       if (node == element)\r
-                                               index = i;\r
-                               });\r
+                               if (!s)\r
+                                       return f(e);\r
 \r
-                               return index;\r
+                               return f.call(s, e);\r
                        };\r
 \r
-                       if (type == 2) {\r
-                               function getLocation() {\r
-                                       var rng = t.getRng(true), root = dom.getRoot(), bookmark = {};\r
+                       if (n == 'unload') {\r
+                               tinymce.unloads.unshift({func : cb});\r
+                               return cb;\r
+                       }\r
 \r
-                                       function getPoint(rng, start) {\r
-                                               var container = rng[start ? 'startContainer' : 'endContainer'],\r
-                                                       offset = rng[start ? 'startOffset' : 'endOffset'], point = [], node, childNodes, after = 0;\r
+                       if (n == 'init') {\r
+                               if (t.domLoaded)\r
+                                       cb();\r
+                               else\r
+                                       t.inits.push(cb);\r
 \r
-                                               if (container.nodeType == 3) {\r
-                                                       if (normalized) {\r
-                                                               for (node = container.previousSibling; node && node.nodeType == 3; node = node.previousSibling)\r
-                                                                       offset += node.nodeValue.length;\r
-                                                       }\r
+                               return cb;\r
+                       }\r
 \r
-                                                       point.push(offset);\r
-                                               } else {\r
-                                                       childNodes = container.childNodes;\r
+                       // Store away listener reference\r
+                       el.push({\r
+                               obj : o,\r
+                               name : n,\r
+                               func : f,\r
+                               cfunc : cb,\r
+                               scope : s\r
+                       });\r
 \r
-                                                       if (offset >= childNodes.length && childNodes.length) {\r
-                                                               after = 1;\r
-                                                               offset = Math.max(0, childNodes.length - 1);\r
-                                                       }\r
+                       t._add(o, n, cb);\r
 \r
-                                                       point.push(t.dom.nodeIndex(childNodes[offset], normalized) + after);\r
-                                               }\r
+                       return f;\r
+               },\r
 \r
-                                               for (; container && container != root; container = container.parentNode)\r
-                                                       point.push(t.dom.nodeIndex(container, normalized));\r
+               remove : function(o, n, f) {\r
+                       var t = this, a = t.events, s = false, r;\r
 \r
-                                               return point;\r
-                                       };\r
+                       // Handle array\r
+                       if (o && o.hasOwnProperty && o instanceof Array) {\r
+                               r = [];\r
 \r
-                                       bookmark.start = getPoint(rng, true);\r
+                               each(o, function(o) {\r
+                                       o = DOM.get(o);\r
+                                       r.push(t.remove(o, n, f));\r
+                               });\r
 \r
-                                       if (!t.isCollapsed())\r
-                                               bookmark.end = getPoint(rng);\r
+                               return r;\r
+                       }\r
 \r
-                                       return bookmark;\r
-                               };\r
+                       o = DOM.get(o);\r
 \r
-                               return getLocation();\r
-                       }\r
+                       each(a, function(e, i) {\r
+                               if (e.obj == o && e.name == n && (!f || (e.func == f || e.cfunc == f))) {\r
+                                       a.splice(i, 1);\r
+                                       t._remove(o, n, e.cfunc);\r
+                                       s = true;\r
+                                       return false;\r
+                               }\r
+                       });\r
 \r
-                       // Handle simple range\r
-                       if (type)\r
-                               return {rng : t.getRng()};\r
+                       return s;\r
+               },\r
 \r
-                       rng = t.getRng();\r
-                       id = dom.uniqueId();\r
-                       collapsed = tinyMCE.activeEditor.selection.isCollapsed();\r
-                       styles = 'overflow:hidden;line-height:0px';\r
+               clear : function(o) {\r
+                       var t = this, a = t.events, i, e;\r
 \r
-                       // Explorer method\r
-                       if (rng.duplicate || rng.item) {\r
-                               // Text selection\r
-                               if (!rng.item) {\r
-                                       rng2 = rng.duplicate();\r
+                       if (o) {\r
+                               o = DOM.get(o);\r
 \r
-                                       // Insert start marker\r
-                                       rng.collapse();\r
-                                       rng.pasteHTML('<span _mce_type="bookmark" id="' + id + '_start" style="' + styles + '">' + chr + '</span>');\r
+                               for (i = a.length - 1; i >= 0; i--) {\r
+                                       e = a[i];\r
 \r
-                                       // Insert end marker\r
-                                       if (!collapsed) {\r
-                                               rng2.collapse(false);\r
-                                               rng2.pasteHTML('<span _mce_type="bookmark" id="' + id + '_end" style="' + styles + '">' + chr + '</span>');\r
+                                       if (e.obj === o) {\r
+                                               t._remove(e.obj, e.name, e.cfunc);\r
+                                               e.obj = e.cfunc = null;\r
+                                               a.splice(i, 1);\r
                                        }\r
-                               } else {\r
-                                       // Control selection\r
-                                       element = rng.item(0);\r
-                                       name = element.nodeName;\r
-\r
-                                       return {name : name, index : findIndex(name, element)};\r
                                }\r
-                       } else {\r
-                               element = t.getNode();\r
-                               name = element.nodeName;\r
-                               if (name == 'IMG')\r
-                                       return {name : name, index : findIndex(name, element)};\r
+                       }\r
+               },\r
 \r
-                               // W3C method\r
-                               rng2 = rng.cloneRange();\r
+               cancel : function(e) {\r
+                       if (!e)\r
+                               return false;\r
 \r
-                               // Insert end marker\r
-                               if (!collapsed) {\r
-                                       rng2.collapse(false);\r
-                                       rng2.insertNode(dom.create('span', {_mce_type : "bookmark", id : id + '_end', style : styles}, chr));\r
-                               }\r
+                       this.stop(e);\r
 \r
-                               rng.collapse(true);\r
-                               rng.insertNode(dom.create('span', {_mce_type : "bookmark", id : id + '_start', style : styles}, chr));\r
-                       }\r
+                       return this.prevent(e);\r
+               },\r
 \r
-                       t.moveToBookmark({id : id, keep : 1});\r
+               stop : function(e) {\r
+                       if (e.stopPropagation)\r
+                               e.stopPropagation();\r
+                       else\r
+                               e.cancelBubble = true;\r
 \r
-                       return {id : id};\r
+                       return false;\r
                },\r
 \r
-               moveToBookmark : function(bookmark) {\r
-                       var t = this, dom = t.dom, marker1, marker2, rng, root, startContainer, endContainer, startOffset, endOffset;\r
-\r
-                       // Clear selection cache\r
-                       if (t.tridentSel)\r
-                               t.tridentSel.destroy();\r
+               prevent : function(e) {\r
+                       if (e.preventDefault)\r
+                               e.preventDefault();\r
+                       else\r
+                               e.returnValue = false;\r
 \r
-                       if (bookmark) {\r
-                               if (bookmark.start) {\r
-                                       rng = dom.createRng();\r
-                                       root = dom.getRoot();\r
+                       return false;\r
+               },\r
 \r
-                                       function setEndPoint(start) {\r
-                                               var point = bookmark[start ? 'start' : 'end'], i, node, offset, children;\r
+               destroy : function() {\r
+                       var t = this;\r
 \r
-                                               if (point) {\r
-                                                       // Find container node\r
-                                                       for (node = root, i = point.length - 1; i >= 1; i--) {\r
-                                                               children = node.childNodes;\r
+                       each(t.events, function(e, i) {\r
+                               t._remove(e.obj, e.name, e.cfunc);\r
+                               e.obj = e.cfunc = null;\r
+                       });\r
 \r
-                                                               if (children.length)\r
-                                                                       node = children[point[i]];\r
-                                                       }\r
+                       t.events = [];\r
+                       t = null;\r
+               },\r
 \r
-                                                       // Set offset within container node\r
-                                                       if (start)\r
-                                                               rng.setStart(node, point[0]);\r
-                                                       else\r
-                                                               rng.setEnd(node, point[0]);\r
-                                               }\r
-                                       };\r
+               _add : function(o, n, f) {\r
+                       if (o.attachEvent)\r
+                               o.attachEvent('on' + n, f);\r
+                       else if (o.addEventListener)\r
+                               o.addEventListener(n, f, false);\r
+                       else\r
+                               o['on' + n] = f;\r
+               },\r
 \r
-                                       setEndPoint(true);\r
-                                       setEndPoint();\r
+               _remove : function(o, n, f) {\r
+                       if (o) {\r
+                               try {\r
+                                       if (o.detachEvent)\r
+                                               o.detachEvent('on' + n, f);\r
+                                       else if (o.removeEventListener)\r
+                                               o.removeEventListener(n, f, false);\r
+                                       else\r
+                                               o['on' + n] = null;\r
+                               } catch (ex) {\r
+                                       // Might fail with permission denined on IE so we just ignore that\r
+                               }\r
+                       }\r
+               },\r
 \r
-                                       t.setRng(rng);\r
-                               } else if (bookmark.id) {\r
-                                       function restoreEndPoint(suffix) {\r
-                                               var marker = dom.get(bookmark.id + '_' + suffix), node, idx, next, prev, keep = bookmark.keep;\r
+               _pageInit : function(win) {\r
+                       var t = this;\r
 \r
-                                               if (marker) {\r
-                                                       node = marker.parentNode;\r
+                       // Keep it from running more than once\r
+                       if (t.domLoaded)\r
+                               return;\r
 \r
-                                                       if (suffix == 'start') {\r
-                                                               if (!keep) {\r
-                                                                       idx = dom.nodeIndex(marker);\r
-                                                               } else {\r
-                                                                       node = marker.firstChild;\r
-                                                                       idx = 1;\r
-                                                               }\r
+                       t.domLoaded = true;\r
 \r
-                                                               startContainer = endContainer = node;\r
-                                                               startOffset = endOffset = idx;\r
-                                                       } else {\r
-                                                               if (!keep) {\r
-                                                                       idx = dom.nodeIndex(marker);\r
-                                                               } else {\r
-                                                                       node = marker.firstChild;\r
-                                                                       idx = 1;\r
-                                                               }\r
+                       each(t.inits, function(c) {\r
+                               c();\r
+                       });\r
 \r
-                                                               endContainer = node;\r
-                                                               endOffset = idx;\r
-                                                       }\r
+                       t.inits = [];\r
+               },\r
 \r
-                                                       if (!keep) {\r
-                                                               prev = marker.previousSibling;\r
-                                                               next = marker.nextSibling;\r
+               _wait : function(win) {\r
+                       var t = this, doc = win.document;\r
 \r
-                                                               // Remove all marker text nodes\r
-                                                               each(tinymce.grep(marker.childNodes), function(node) {\r
-                                                                       if (node.nodeType == 3)\r
-                                                                               node.nodeValue = node.nodeValue.replace(/\uFEFF/g, '');\r
-                                                               });\r
+                       // No need since the document is already loaded\r
+                       if (win.tinyMCE_GZ && tinyMCE_GZ.loaded) {\r
+                               t.domLoaded = 1;\r
+                               return;\r
+                       }\r
 \r
-                                                               // Remove marker but keep children if for example contents where inserted into the marker\r
-                                                               // Also remove duplicated instances of the marker for example by a split operation or by WebKit auto split on paste feature\r
-                                                               while (marker = dom.get(bookmark.id + '_' + suffix))\r
-                                                                       dom.remove(marker, 1);\r
+                       // Use IE method\r
+                       if (doc.attachEvent) {\r
+                               doc.attachEvent("onreadystatechange", function() {\r
+                                       if (doc.readyState === "complete") {\r
+                                               doc.detachEvent("onreadystatechange", arguments.callee);\r
+                                               t._pageInit(win);\r
+                                       }\r
+                               });\r
 \r
-                                                               // If siblings are text nodes then merge them unless it's Opera since it some how removes the node\r
-                                                               // and we are sniffing since adding a lot of detection code for a browser with 3% of the market isn't worth the effort. Sorry, Opera but it's just a fact\r
-                                                               if (prev && next && prev.nodeType == next.nodeType && prev.nodeType == 3 && !tinymce.isOpera) {\r
-                                                                       idx = prev.nodeValue.length;\r
-                                                                       prev.appendData(next.nodeValue);\r
-                                                                       dom.remove(next);\r
+                               if (doc.documentElement.doScroll && win == win.top) {\r
+                                       (function() {\r
+                                               if (t.domLoaded)\r
+                                                       return;\r
 \r
-                                                                       if (suffix == 'start') {\r
-                                                                               startContainer = endContainer = prev;\r
-                                                                               startOffset = endOffset = idx;\r
-                                                                       } else {\r
-                                                                               endContainer = prev;\r
-                                                                               endOffset = idx;\r
-                                                                       }\r
-                                                               }\r
-                                                       }\r
+                                               try {\r
+                                                       // If IE is used, use the trick by Diego Perini licensed under MIT by request to the author.\r
+                                                       // http://javascript.nwbox.com/IEContentLoaded/\r
+                                                       doc.documentElement.doScroll("left");\r
+                                               } catch (ex) {\r
+                                                       setTimeout(arguments.callee, 0);\r
+                                                       return;\r
                                                }\r
-                                       };\r
 \r
-                                       function addBogus(node) {\r
-                                               // Adds a bogus BR element for empty block elements\r
-                                               // on non IE browsers just to have a place to put the caret\r
-                                               if (!isIE && dom.isBlock(node) && !node.innerHTML)\r
-                                                       node.innerHTML = '<br _mce_bogus="1" />';\r
+                                               t._pageInit(win);\r
+                                       })();\r
+                               }\r
+                       } else if (doc.addEventListener) {\r
+                               t._add(win, 'DOMContentLoaded', function() {\r
+                                       t._pageInit(win);\r
+                               });\r
+                       }\r
 \r
-                                               return node;\r
-                                       };\r
+                       t._add(win, 'load', function() {\r
+                               t._pageInit(win);\r
+                       });\r
+               },\r
 \r
-                                       // Restore start/end points\r
-                                       restoreEndPoint('start');\r
-                                       restoreEndPoint('end');\r
+               _stoppers : {\r
+                       preventDefault : function() {\r
+                               this.returnValue = false;\r
+                       },\r
 \r
-                                       if (startContainer) {\r
-                                               rng = dom.createRng();\r
-                                               rng.setStart(addBogus(startContainer), startOffset);\r
-                                               rng.setEnd(addBogus(endContainer), endOffset);\r
-                                               t.setRng(rng);\r
-                                       }\r
-                               } else if (bookmark.name) {\r
-                                       t.select(dom.select(bookmark.name)[bookmark.index]);\r
-                               } else if (bookmark.rng)\r
-                                       t.setRng(bookmark.rng);\r
+                       stopPropagation : function() {\r
+                               this.cancelBubble = true;\r
                        }\r
-               },\r
+               }\r
+       });\r
 \r
-               select : function(node, content) {\r
-                       var t = this, dom = t.dom, rng = dom.createRng(), idx;\r
+       Event = tinymce.dom.Event = new tinymce.dom.EventUtils();\r
 \r
-                       idx = dom.nodeIndex(node);\r
-                       rng.setStart(node.parentNode, idx);\r
-                       rng.setEnd(node.parentNode, idx + 1);\r
+       // Dispatch DOM content loaded event for IE and Safari\r
+       Event._wait(window);\r
 \r
-                       // Find first/last text node or BR element\r
-                       if (content) {\r
-                               function setPoint(node, start) {\r
-                                       var walker = new tinymce.dom.TreeWalker(node, node);\r
+       tinymce.addUnload(function() {\r
+               Event.destroy();\r
+       });\r
+})(tinymce);\r
 \r
-                                       do {\r
-                                               // Text node\r
-                                               if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {\r
-                                                       if (start)\r
-                                                               rng.setStart(node, 0);\r
-                                                       else\r
-                                                               rng.setEnd(node, node.nodeValue.length);\r
+(function(tinymce) {\r
+       tinymce.dom.Element = function(id, settings) {\r
+               var t = this, dom, el;\r
 \r
-                                                       return;\r
-                                               }\r
+               t.settings = settings = settings || {};\r
+               t.id = id;\r
+               t.dom = dom = settings.dom || tinymce.DOM;\r
 \r
-                                               // BR element\r
-                                               if (node.nodeName == 'BR') {\r
-                                                       if (start)\r
-                                                               rng.setStartBefore(node);\r
-                                                       else\r
-                                                               rng.setEndBefore(node);\r
+               // Only IE leaks DOM references, this is a lot faster\r
+               if (!tinymce.isIE)\r
+                       el = dom.get(t.id);\r
 \r
-                                                       return;\r
-                                               }\r
-                                       } while (node = (start ? walker.next() : walker.prev()));\r
-                               };\r
+               tinymce.each(\r
+                               ('getPos,getRect,getParent,add,setStyle,getStyle,setStyles,' + \r
+                               'setAttrib,setAttribs,getAttrib,addClass,removeClass,' + \r
+                               'hasClass,getOuterHTML,setOuterHTML,remove,show,hide,' + \r
+                               'isHidden,setHTML,get').split(/,/)\r
+                       , function(k) {\r
+                               t[k] = function() {\r
+                                       var a = [id], i;\r
 \r
-                               setPoint(node, 1);\r
-                               setPoint(node);\r
-                       }\r
+                                       for (i = 0; i < arguments.length; i++)\r
+                                               a.push(arguments[i]);\r
 \r
-                       t.setRng(rng);\r
+                                       a = dom[k].apply(dom, a);\r
+                                       t.update(k);\r
 \r
-                       return node;\r
-               },\r
+                                       return a;\r
+                               };\r
+               });\r
 \r
-               isCollapsed : function() {\r
-                       var t = this, r = t.getRng(), s = t.getSel();\r
+               tinymce.extend(t, {\r
+                       on : function(n, f, s) {\r
+                               return tinymce.dom.Event.add(t.id, n, f, s);\r
+                       },\r
 \r
-                       if (!r || r.item)\r
-                               return false;\r
+                       getXY : function() {\r
+                               return {\r
+                                       x : parseInt(t.getStyle('left')),\r
+                                       y : parseInt(t.getStyle('top'))\r
+                               };\r
+                       },\r
 \r
-                       if (r.compareEndPoints)\r
-                               return r.compareEndPoints('StartToEnd', r) === 0;\r
+                       getSize : function() {\r
+                               var n = dom.get(t.id);\r
 \r
-                       return !s || r.collapsed;\r
-               },\r
+                               return {\r
+                                       w : parseInt(t.getStyle('width') || n.clientWidth),\r
+                                       h : parseInt(t.getStyle('height') || n.clientHeight)\r
+                               };\r
+                       },\r
+\r
+                       moveTo : function(x, y) {\r
+                               t.setStyles({left : x, top : y});\r
+                       },\r
 \r
-               collapse : function(b) {\r
-                       var t = this, r = t.getRng(), n;\r
+                       moveBy : function(x, y) {\r
+                               var p = t.getXY();\r
 \r
-                       // Control range on IE\r
-                       if (r.item) {\r
-                               n = r.item(0);\r
-                               r = this.win.document.body.createTextRange();\r
-                               r.moveToElementText(n);\r
-                       }\r
+                               t.moveTo(p.x + x, p.y + y);\r
+                       },\r
 \r
-                       r.collapse(!!b);\r
-                       t.setRng(r);\r
-               },\r
+                       resizeTo : function(w, h) {\r
+                               t.setStyles({width : w, height : h});\r
+                       },\r
 \r
-               getSel : function() {\r
-                       var t = this, w = this.win;\r
+                       resizeBy : function(w, h) {\r
+                               var s = t.getSize();\r
 \r
-                       return w.getSelection ? w.getSelection() : w.document.selection;\r
-               },\r
+                               t.resizeTo(s.w + w, s.h + h);\r
+                       },\r
 \r
-               getRng : function(w3c) {\r
-                       var t = this, s, r, elm, doc = t.win.document;\r
+                       update : function(k) {\r
+                               var b;\r
 \r
-                       // Found tridentSel object then we need to use that one\r
-                       if (w3c && t.tridentSel)\r
-                               return t.tridentSel.getRangeAt(0);\r
+                               if (tinymce.isIE6 && settings.blocker) {\r
+                                       k = k || '';\r
 \r
-                       try {\r
-                               if (s = t.getSel())\r
-                                       r = s.rangeCount > 0 ? s.getRangeAt(0) : (s.createRange ? s.createRange() : doc.createRange());\r
-                       } catch (ex) {\r
-                               // IE throws unspecified error here if TinyMCE is placed in a frame/iframe\r
-                       }\r
+                                       // Ignore getters\r
+                                       if (k.indexOf('get') === 0 || k.indexOf('has') === 0 || k.indexOf('is') === 0)\r
+                                               return;\r
 \r
-                       // We have W3C ranges and it's IE then fake control selection since IE9 doesn't handle that correctly yet\r
-                       if (tinymce.isIE && r.setStart && doc.selection.createRange().item) {\r
-                               elm = doc.selection.createRange().item(0);\r
-                               r = doc.createRange();\r
-                               r.setStartBefore(elm);\r
-                               r.setEndAfter(elm);\r
-                       }\r
+                                       // Remove blocker on remove\r
+                                       if (k == 'remove') {\r
+                                               dom.remove(t.blocker);\r
+                                               return;\r
+                                       }\r
 \r
-                       // No range found then create an empty one\r
-                       // This can occur when the editor is placed in a hidden container element on Gecko\r
-                       // Or on IE when there was an exception\r
-                       if (!r)\r
-                               r = doc.createRange ? doc.createRange() : doc.body.createTextRange();\r
+                                       if (!t.blocker) {\r
+                                               t.blocker = dom.uniqueId();\r
+                                               b = dom.add(settings.container || dom.getRoot(), 'iframe', {id : t.blocker, style : 'position:absolute;', frameBorder : 0, src : 'javascript:""'});\r
+                                               dom.setStyle(b, 'opacity', 0);\r
+                                       } else\r
+                                               b = dom.get(t.blocker);\r
 \r
-                       if (t.selectedRange && t.explicitRange) {\r
-                               if (r.compareBoundaryPoints(r.START_TO_START, t.selectedRange) === 0 && r.compareBoundaryPoints(r.END_TO_END, t.selectedRange) === 0) {\r
-                                       // Safari, Opera and Chrome only ever select text which causes the range to change.\r
-                                       // This lets us use the originally set range if the selection hasn't been changed by the user.\r
-                                       r = t.explicitRange;\r
-                               } else {\r
-                                       t.selectedRange = null;\r
-                                       t.explicitRange = null;\r
+                                       dom.setStyles(b, {\r
+                                               left : t.getStyle('left', 1),\r
+                                               top : t.getStyle('top', 1),\r
+                                               width : t.getStyle('width', 1),\r
+                                               height : t.getStyle('height', 1),\r
+                                               display : t.getStyle('display', 1),\r
+                                               zIndex : parseInt(t.getStyle('zIndex', 1) || 0) - 1\r
+                                       });\r
                                }\r
                        }\r
-                       return r;\r
-               },\r
-\r
-               setRng : function(r) {\r
-                       var s, t = this;\r
-                       \r
-                       if (!t.tridentSel) {\r
-                               s = t.getSel();\r
+               });\r
+       };\r
+})(tinymce);\r
 \r
-                               if (s) {\r
-                                       t.explicitRange = r;\r
-                                       s.removeAllRanges();\r
-                                       s.addRange(r);\r
-                                       t.selectedRange = s.getRangeAt(0);\r
-                               }\r
-                       } else {\r
-                               // Is W3C Range\r
-                               if (r.cloneRange) {\r
-                                       t.tridentSel.addRange(r);\r
-                                       return;\r
-                               }\r
+(function(tinymce) {\r
+       function trimNl(s) {\r
+               return s.replace(/[\n\r]+/g, '');\r
+       };\r
 \r
-                               // Is IE specific range\r
-                               try {\r
-                                       r.select();\r
-                               } catch (ex) {\r
-                                       // Needed for some odd IE bug #1843306\r
-                               }\r
-                       }\r
-               },\r
+       // Shorten names\r
+       var is = tinymce.is, isIE = tinymce.isIE, each = tinymce.each;\r
 \r
-               setNode : function(n) {\r
+       tinymce.create('tinymce.dom.Selection', {\r
+               Selection : function(dom, win, serializer) {\r
                        var t = this;\r
 \r
-                       t.setContent(t.dom.getOuterHTML(n));\r
-\r
-                       return n;\r
-               },\r
+                       t.dom = dom;\r
+                       t.win = win;\r
+                       t.serializer = serializer;\r
 \r
-               getNode : function() {\r
-                       var t = this, rng = t.getRng(), sel = t.getSel(), elm;\r
+                       // Add events\r
+                       each([\r
+                               'onBeforeSetContent',\r
 \r
-                       if (rng.setStart) {\r
-                               // Range maybe lost after the editor is made visible again\r
-                               if (!rng)\r
-                                       return t.dom.getRoot();\r
+                               'onBeforeGetContent',\r
 \r
-                               elm = rng.commonAncestorContainer;\r
+                               'onSetContent',\r
 \r
-                               // Handle selection a image or other control like element such as anchors\r
-                               if (!rng.collapsed) {\r
-                                       if (rng.startContainer == rng.endContainer) {\r
-                                               if (rng.startOffset - rng.endOffset < 2) {\r
-                                                       if (rng.startContainer.hasChildNodes())\r
-                                                               elm = rng.startContainer.childNodes[rng.startOffset];\r
-                                               }\r
-                                       }\r
+                               'onGetContent'\r
+                       ], function(e) {\r
+                               t[e] = new tinymce.util.Dispatcher(t);\r
+                       });\r
 \r
-                                       // If the anchor node is a element instead of a text node then return this element\r
-                                       if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1) \r
-                                               return sel.anchorNode.childNodes[sel.anchorOffset]; \r
-                               }\r
+                       // No W3C Range support\r
+                       if (!t.win.getSelection)\r
+                               t.tridentSel = new tinymce.dom.TridentSelection(t);\r
 \r
-                               if (elm && elm.nodeType == 3)\r
-                                       return elm.parentNode;\r
+                       if (tinymce.isIE && dom.boxModel)\r
+                               this._fixIESelection();\r
 \r
-                               return elm;\r
-                       }\r
+                       // Prevent leaks\r
+                       tinymce.addUnload(t.destroy, t);\r
+               },\r
 \r
-                       return rng.item ? rng.item(0) : rng.parentElement();\r
+               setCursorLocation: function(node, offset) {\r
+                       var t = this; var r = t.dom.createRng();\r
+                       r.setStart(node, offset);\r
+                       r.setEnd(node, offset);\r
+                       t.setRng(r);\r
+                       t.collapse(false);\r
                },\r
+               getContent : function(s) {\r
+                       var t = this, r = t.getRng(), e = t.dom.create("body"), se = t.getSel(), wb, wa, n;\r
 \r
-               getSelectedBlocks : function(st, en) {\r
-                       var t = this, dom = t.dom, sb, eb, n, bl = [];\r
+                       s = s || {};\r
+                       wb = wa = '';\r
+                       s.get = true;\r
+                       s.format = s.format || 'html';\r
+                       s.forced_root_block = '';\r
+                       t.onBeforeGetContent.dispatch(t, s);\r
 \r
-                       sb = dom.getParent(st || t.getStart(), dom.isBlock);\r
-                       eb = dom.getParent(en || t.getEnd(), dom.isBlock);\r
+                       if (s.format == 'text')\r
+                               return t.isCollapsed() ? '' : (r.text || (se.toString ? se.toString() : ''));\r
 \r
-                       if (sb)\r
-                               bl.push(sb);\r
+                       if (r.cloneContents) {\r
+                               n = r.cloneContents();\r
 \r
-                       if (sb && eb && sb != eb) {\r
-                               n = sb;\r
+                               if (n)\r
+                                       e.appendChild(n);\r
+                       } else if (is(r.item) || is(r.htmlText)) {\r
+                               // IE will produce invalid markup if elements are present that\r
+                               // it doesn't understand like custom elements or HTML5 elements.\r
+                               // Adding a BR in front of the contents and then remoiving it seems to fix it though.\r
+                               e.innerHTML = '<br>' + (r.item ? r.item(0).outerHTML : r.htmlText);\r
+                               e.removeChild(e.firstChild);\r
+                       } else\r
+                               e.innerHTML = r.toString();\r
 \r
-                               while ((n = n.nextSibling) && n != eb) {\r
-                                       if (dom.isBlock(n))\r
-                                               bl.push(n);\r
-                               }\r
-                       }\r
+                       // Keep whitespace before and after\r
+                       if (/^\s/.test(e.innerHTML))\r
+                               wb = ' ';\r
 \r
-                       if (eb && sb != eb)\r
-                               bl.push(eb);\r
+                       if (/\s+$/.test(e.innerHTML))\r
+                               wa = ' ';\r
 \r
-                       return bl;\r
+                       s.getInner = true;\r
+\r
+                       s.content = t.isCollapsed() ? '' : wb + t.serializer.serialize(e, s) + wa;\r
+                       t.onGetContent.dispatch(t, s);\r
+\r
+                       return s.content;\r
                },\r
 \r
-               destroy : function(s) {\r
-                       var t = this;\r
+               setContent : function(content, args) {\r
+                       var self = this, rng = self.getRng(), caretNode, doc = self.win.document, frag, temp;\r
 \r
-                       t.win = null;\r
+                       args = args || {format : 'html'};\r
+                       args.set = true;\r
+                       content = args.content = content;\r
 \r
-                       if (t.tridentSel)\r
-                               t.tridentSel.destroy();\r
+                       // Dispatch before set content event\r
+                       if (!args.no_events)\r
+                               self.onBeforeSetContent.dispatch(self, args);\r
 \r
-                       // Manual destroy then remove unload handler\r
-                       if (!s)\r
-                               tinymce.removeUnload(t.destroy);\r
-               },\r
+                       content = args.content;\r
 \r
-               // IE has an issue where you can't select/move the caret by clicking outside the body if the document is in standards mode\r
-               _fixIESelection : function() {\r
-                       var dom = this.dom, doc = dom.doc, body = doc.body, started, startRng;\r
+                       if (rng.insertNode) {\r
+                               // Make caret marker since insertNode places the caret in the beginning of text after insert\r
+                               content += '<span id="__caret">_</span>';\r
 \r
-                       // Make HTML element unselectable since we are going to handle selection by hand\r
-                       doc.documentElement.unselectable = true;\r
+                               // Delete and insert new node\r
+                               if (rng.startContainer == doc && rng.endContainer == doc) {\r
+                                       // WebKit will fail if the body is empty since the range is then invalid and it can't insert contents\r
+                                       doc.body.innerHTML = content;\r
+                               } else {\r
+                                       rng.deleteContents();\r
 \r
-                       // Return range from point or null if it failed\r
-                       function rngFromPoint(x, y) {\r
-                               var rng = body.createTextRange();\r
+                                       if (doc.body.childNodes.length == 0) {\r
+                                               doc.body.innerHTML = content;\r
+                                       } else {\r
+                                               // createContextualFragment doesn't exists in IE 9 DOMRanges\r
+                                               if (rng.createContextualFragment) {\r
+                                                       rng.insertNode(rng.createContextualFragment(content));\r
+                                               } else {\r
+                                                       // Fake createContextualFragment call in IE 9\r
+                                                       frag = doc.createDocumentFragment();\r
+                                                       temp = doc.createElement('div');\r
 \r
-                               try {\r
-                                       rng.moveToPoint(x, y);\r
-                               } catch (ex) {\r
-                                       // IE sometimes throws and exception, so lets just ignore it\r
-                                       rng = null;\r
+                                                       frag.appendChild(temp);\r
+                                                       temp.outerHTML = content;\r
+\r
+                                                       rng.insertNode(frag);\r
+                                               }\r
+                                       }\r
                                }\r
 \r
-                               return rng;\r
-                       };\r
+                               // Move to caret marker\r
+                               caretNode = self.dom.get('__caret');\r
 \r
-                       // Fires while the selection is changing\r
-                       function selectionChange(e) {\r
-                               var pointRng;\r
+                               // Make sure we wrap it compleatly, Opera fails with a simple select call\r
+                               rng = doc.createRange();\r
+                               rng.setStartBefore(caretNode);\r
+                               rng.setEndBefore(caretNode);\r
+                               self.setRng(rng);\r
 \r
-                               // Check if the button is down or not\r
-                               if (e.button) {\r
-                                       // Create range from mouse position\r
-                                       pointRng = rngFromPoint(e.x, e.y);\r
+                               // Remove the caret position\r
+                               self.dom.remove('__caret');\r
 \r
-                                       if (pointRng) {\r
-                                               // Check if pointRange is before/after selection then change the endPoint\r
-                                               if (pointRng.compareEndPoints('StartToStart', startRng) > 0)\r
-                                                       pointRng.setEndPoint('StartToStart', startRng);\r
-                                               else\r
-                                                       pointRng.setEndPoint('EndToEnd', startRng);\r
+                               try {\r
+                                       self.setRng(rng);\r
+                               } catch (ex) {\r
+                                       // Might fail on Opera for some odd reason\r
+                               }\r
+                       } else {\r
+                               if (rng.item) {\r
+                                       // Delete content and get caret text selection\r
+                                       doc.execCommand('Delete', false, null);\r
+                                       rng = self.getRng();\r
+                               }\r
 \r
-                                               pointRng.select();\r
-                                       }\r
+                               // Explorer removes spaces from the beginning of pasted contents\r
+                               if (/^\s+/.test(content)) {\r
+                                       rng.pasteHTML('<span id="__mce_tmp">_</span>' + content);\r
+                                       self.dom.remove('__mce_tmp');\r
                                } else\r
-                                       endSelection();\r
+                                       rng.pasteHTML(content);\r
                        }\r
 \r
-                       // Removes listeners\r
-                       function endSelection() {\r
-                               dom.unbind(doc, 'mouseup', endSelection);\r
-                               dom.unbind(doc, 'mousemove', selectionChange);\r
-                               started = 0;\r
-                       };\r
+                       // Dispatch set content event\r
+                       if (!args.no_events)\r
+                               self.onSetContent.dispatch(self, args);\r
+               },\r
 \r
-                       // Detect when user selects outside BODY\r
-                       dom.bind(doc, 'mousedown', function(e) {\r
-                               if (e.target.nodeName === 'HTML') {\r
-                                       if (started)\r
-                                               endSelection();\r
+               getStart : function() {\r
+                       var rng = this.getRng(), startElement, parentElement, checkRng, node;\r
 \r
-                                       started = 1;\r
+                       if (rng.duplicate || rng.item) {\r
+                               // Control selection, return first item\r
+                               if (rng.item)\r
+                                       return rng.item(0);\r
 \r
-                                       // Setup start position\r
-                                       startRng = rngFromPoint(e.x, e.y);\r
-                                       if (startRng) {\r
-                                               // Listen for selection change events\r
-                                               dom.bind(doc, 'mouseup', endSelection);\r
-                                               dom.bind(doc, 'mousemove', selectionChange);\r
+                               // Get start element\r
+                               checkRng = rng.duplicate();\r
+                               checkRng.collapse(1);\r
+                               startElement = checkRng.parentElement();\r
 \r
-                                               dom.win.focus();\r
-                                               startRng.select();\r
+                               // Check if range parent is inside the start element, then return the inner parent element\r
+                               // This will fix issues when a single element is selected, IE would otherwise return the wrong start element\r
+                               parentElement = node = rng.parentElement();\r
+                               while (node = node.parentNode) {\r
+                                       if (node == startElement) {\r
+                                               startElement = parentElement;\r
+                                               break;\r
                                        }\r
                                }\r
-                       });\r
-               }\r
-       });\r
-})(tinymce);\r
 \r
-(function(tinymce) {\r
-       tinymce.create('tinymce.dom.XMLWriter', {\r
-               node : null,\r
-\r
-               XMLWriter : function(s) {\r
-                       // Get XML document\r
-                       function getXML() {\r
-                               var i = document.implementation;\r
-\r
-                               if (!i || !i.createDocument) {\r
-                                       // Try IE objects\r
-                                       try {return new ActiveXObject('MSXML2.DOMDocument');} catch (ex) {}\r
-                                       try {return new ActiveXObject('Microsoft.XmlDom');} catch (ex) {}\r
-                               } else\r
-                                       return i.createDocument('', '', null);\r
-                       };\r
+                               return startElement;\r
+                       } else {\r
+                               startElement = rng.startContainer;\r
 \r
-                       this.doc = getXML();\r
-                       \r
-                       // Since Opera and WebKit doesn't escape > into &gt; we need to do it our self to normalize the output for all browsers\r
-                       this.valid = tinymce.isOpera || tinymce.isWebKit;\r
+                               if (startElement.nodeType == 1 && startElement.hasChildNodes())\r
+                                       startElement = startElement.childNodes[Math.min(startElement.childNodes.length - 1, rng.startOffset)];\r
+\r
+                               if (startElement && startElement.nodeType == 3)\r
+                                       return startElement.parentNode;\r
 \r
-                       this.reset();\r
+                               return startElement;\r
+                       }\r
                },\r
 \r
-               reset : function() {\r
-                       var t = this, d = t.doc;\r
+               getEnd : function() {\r
+                       var t = this, r = t.getRng(), e, eo;\r
 \r
-                       if (d.firstChild)\r
-                               d.removeChild(d.firstChild);\r
+                       if (r.duplicate || r.item) {\r
+                               if (r.item)\r
+                                       return r.item(0);\r
 \r
-                       t.node = d.appendChild(d.createElement("html"));\r
-               },\r
+                               r = r.duplicate();\r
+                               r.collapse(0);\r
+                               e = r.parentElement();\r
 \r
-               writeStartElement : function(n) {\r
-                       var t = this;\r
+                               if (e && e.nodeName == 'BODY')\r
+                                       return e.lastChild || e;\r
 \r
-                       t.node = t.node.appendChild(t.doc.createElement(n));\r
-               },\r
+                               return e;\r
+                       } else {\r
+                               e = r.endContainer;\r
+                               eo = r.endOffset;\r
 \r
-               writeAttribute : function(n, v) {\r
-                       if (this.valid)\r
-                               v = v.replace(/>/g, '%MCGT%');\r
+                               if (e.nodeType == 1 && e.hasChildNodes())\r
+                                       e = e.childNodes[eo > 0 ? eo - 1 : eo];\r
 \r
-                       this.node.setAttribute(n, v);\r
-               },\r
+                               if (e && e.nodeType == 3)\r
+                                       return e.parentNode;\r
 \r
-               writeEndElement : function() {\r
-                       this.node = this.node.parentNode;\r
+                               return e;\r
+                       }\r
                },\r
 \r
-               writeFullEndElement : function() {\r
-                       var t = this, n = t.node;\r
+               getBookmark : function(type, normalized) {\r
+                       var t = this, dom = t.dom, rng, rng2, id, collapsed, name, element, index, chr = '\uFEFF', styles;\r
 \r
-                       n.appendChild(t.doc.createTextNode(""));\r
-                       t.node = n.parentNode;\r
-               },\r
+                       function findIndex(name, element) {\r
+                               var index = 0;\r
 \r
-               writeText : function(v) {\r
-                       if (this.valid)\r
-                               v = v.replace(/>/g, '%MCGT%');\r
+                               each(dom.select(name), function(node, i) {\r
+                                       if (node == element)\r
+                                               index = i;\r
+                               });\r
 \r
-                       this.node.appendChild(this.doc.createTextNode(v));\r
-               },\r
+                               return index;\r
+                       };\r
 \r
-               writeCDATA : function(v) {\r
-                       this.node.appendChild(this.doc.createCDATASection(v));\r
-               },\r
+                       if (type == 2) {\r
+                               function getLocation() {\r
+                                       var rng = t.getRng(true), root = dom.getRoot(), bookmark = {};\r
 \r
-               writeComment : function(v) {\r
-                       // Fix for bug #2035694\r
-                       if (tinymce.isIE)\r
-                               v = v.replace(/^\-|\-$/g, ' ');\r
+                                       function getPoint(rng, start) {\r
+                                               var container = rng[start ? 'startContainer' : 'endContainer'],\r
+                                                       offset = rng[start ? 'startOffset' : 'endOffset'], point = [], node, childNodes, after = 0;\r
 \r
-                       this.node.appendChild(this.doc.createComment(v.replace(/\-\-/g, ' ')));\r
-               },\r
+                                               if (container.nodeType == 3) {\r
+                                                       if (normalized) {\r
+                                                               for (node = container.previousSibling; node && node.nodeType == 3; node = node.previousSibling)\r
+                                                                       offset += node.nodeValue.length;\r
+                                                       }\r
 \r
-               getContent : function() {\r
-                       var h;\r
+                                                       point.push(offset);\r
+                                               } else {\r
+                                                       childNodes = container.childNodes;\r
 \r
-                       h = this.doc.xml || new XMLSerializer().serializeToString(this.doc);\r
-                       h = h.replace(/<\?[^?]+\?>|<html[^>]*>|<\/html>|<html\/>|<!DOCTYPE[^>]+>/g, '');\r
-                       h = h.replace(/ ?\/>/g, ' />');\r
+                                                       if (offset >= childNodes.length && childNodes.length) {\r
+                                                               after = 1;\r
+                                                               offset = Math.max(0, childNodes.length - 1);\r
+                                                       }\r
 \r
-                       if (this.valid)\r
-                               h = h.replace(/\%MCGT%/g, '&gt;');\r
+                                                       point.push(t.dom.nodeIndex(childNodes[offset], normalized) + after);\r
+                                               }\r
 \r
-                       return h;\r
-               }\r
-       });\r
-})(tinymce);\r
+                                               for (; container && container != root; container = container.parentNode)\r
+                                                       point.push(t.dom.nodeIndex(container, normalized));\r
 \r
-(function(tinymce) {\r
-       var attrsCharsRegExp = /[&\"<>]/g, textCharsRegExp = /[<>&]/g, encodedChars = {'&' : '&amp;', '"' : '&quot;', '<' : '&lt;', '>' : '&gt;'};\r
-\r
-       tinymce.create('tinymce.dom.StringWriter', {\r
-               str : null,\r
-               tags : null,\r
-               count : 0,\r
-               settings : null,\r
-               indent : null,\r
-\r
-               StringWriter : function(s) {\r
-                       this.settings = tinymce.extend({\r
-                               indent_char : ' ',\r
-                               indentation : 0\r
-                       }, s);\r
+                                               return point;\r
+                                       };\r
 \r
-                       this.reset();\r
-               },\r
+                                       bookmark.start = getPoint(rng, true);\r
 \r
-               reset : function() {\r
-                       this.indent = '';\r
-                       this.str = "";\r
-                       this.tags = [];\r
-                       this.count = 0;\r
-               },\r
+                                       if (!t.isCollapsed())\r
+                                               bookmark.end = getPoint(rng);\r
 \r
-               writeStartElement : function(n) {\r
-                       this._writeAttributesEnd();\r
-                       this.writeRaw('<' + n);\r
-                       this.tags.push(n);\r
-                       this.inAttr = true;\r
-                       this.count++;\r
-                       this.elementCount = this.count;\r
-                       this.attrs = {};\r
-               },\r
+                                       return bookmark;\r
+                               };\r
 \r
-               writeAttribute : function(n, v) {\r
-                       var t = this;\r
+                               if (t.tridentSel)\r
+                                       return t.tridentSel.getBookmark(type);\r
 \r
-                       if (!t.attrs[n]) {\r
-                               t.writeRaw(" " + t.encode(n, true) + '="' + t.encode(v, true) + '"');\r
-                               t.attrs[n] = v;\r
+                               return getLocation();\r
                        }\r
-               },\r
 \r
-               writeEndElement : function() {\r
-                       var n;\r
+                       // Handle simple range\r
+                       if (type)\r
+                               return {rng : t.getRng()};\r
 \r
-                       if (this.tags.length > 0) {\r
-                               n = this.tags.pop();\r
+                       rng = t.getRng();\r
+                       id = dom.uniqueId();\r
+                       collapsed = tinyMCE.activeEditor.selection.isCollapsed();\r
+                       styles = 'overflow:hidden;line-height:0px';\r
 \r
-                               if (this._writeAttributesEnd(1))\r
-                                       this.writeRaw('</' + n + '>');\r
+                       // Explorer method\r
+                       if (rng.duplicate || rng.item) {\r
+                               // Text selection\r
+                               if (!rng.item) {\r
+                                       rng2 = rng.duplicate();\r
 \r
-                               if (this.settings.indentation > 0)\r
-                                       this.writeRaw('\n');\r
-                       }\r
-               },\r
+                                       try {\r
+                                               // Insert start marker\r
+                                               rng.collapse();\r
+                                               rng.pasteHTML('<span data-mce-type="bookmark" id="' + id + '_start" style="' + styles + '">' + chr + '</span>');\r
 \r
-               writeFullEndElement : function() {\r
-                       if (this.tags.length > 0) {\r
-                               this._writeAttributesEnd();\r
-                               this.writeRaw('</' + this.tags.pop() + '>');\r
+                                               // Insert end marker\r
+                                               if (!collapsed) {\r
+                                                       rng2.collapse(false);\r
 \r
-                               if (this.settings.indentation > 0)\r
-                                       this.writeRaw('\n');\r
-                       }\r
-               },\r
+                                                       // Detect the empty space after block elements in IE and move the end back one character <p></p>] becomes <p>]</p>\r
+                                                       rng.moveToElementText(rng2.parentElement());\r
+                                                       if (rng.compareEndPoints('StartToEnd', rng2) == 0)\r
+                                                               rng2.move('character', -1);\r
 \r
-               writeText : function(v) {\r
-                       this._writeAttributesEnd();\r
-                       this.writeRaw(this.encode(v));\r
-                       this.count++;\r
-               },\r
+                                                       rng2.pasteHTML('<span data-mce-type="bookmark" id="' + id + '_end" style="' + styles + '">' + chr + '</span>');\r
+                                               }\r
+                                       } catch (ex) {\r
+                                               // IE might throw unspecified error so lets ignore it\r
+                                               return null;\r
+                                       }\r
+                               } else {\r
+                                       // Control selection\r
+                                       element = rng.item(0);\r
+                                       name = element.nodeName;\r
 \r
-               writeCDATA : function(v) {\r
-                       this._writeAttributesEnd();\r
-                       this.writeRaw('<![CDATA[' + v + ']]>');\r
-                       this.count++;\r
-               },\r
+                                       return {name : name, index : findIndex(name, element)};\r
+                               }\r
+                       } else {\r
+                               element = t.getNode();\r
+                               name = element.nodeName;\r
+                               if (name == 'IMG')\r
+                                       return {name : name, index : findIndex(name, element)};\r
 \r
-               writeComment : function(v) {\r
-                       this._writeAttributesEnd();\r
-                       this.writeRaw('<!--' + v + '-->');\r
-                       this.count++;\r
-               },\r
+                               // W3C method\r
+                               rng2 = rng.cloneRange();\r
 \r
-               writeRaw : function(v) {\r
-                       this.str += v;\r
-               },\r
+                               // Insert end marker\r
+                               if (!collapsed) {\r
+                                       rng2.collapse(false);\r
+                                       rng2.insertNode(dom.create('span', {'data-mce-type' : "bookmark", id : id + '_end', style : styles}, chr));\r
+                               }\r
 \r
-               encode : function(s, attr) {\r
-                       return s.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(v) {\r
-                               return encodedChars[v];\r
-                       });\r
-               },\r
+                               rng.collapse(true);\r
+                               rng.insertNode(dom.create('span', {'data-mce-type' : "bookmark", id : id + '_start', style : styles}, chr));\r
+                       }\r
+\r
+                       t.moveToBookmark({id : id, keep : 1});\r
 \r
-               getContent : function() {\r
-                       return this.str;\r
+                       return {id : id};\r
                },\r
 \r
-               _writeAttributesEnd : function(s) {\r
-                       if (!this.inAttr)\r
-                               return;\r
+               moveToBookmark : function(bookmark) {\r
+                       var t = this, dom = t.dom, marker1, marker2, rng, root, startContainer, endContainer, startOffset, endOffset;\r
 \r
-                       this.inAttr = false;\r
+                       if (bookmark) {\r
+                               if (bookmark.start) {\r
+                                       rng = dom.createRng();\r
+                                       root = dom.getRoot();\r
 \r
-                       if (s && this.elementCount == this.count) {\r
-                               this.writeRaw(' />');\r
-                               return false;\r
-                       }\r
+                                       function setEndPoint(start) {\r
+                                               var point = bookmark[start ? 'start' : 'end'], i, node, offset, children;\r
 \r
-                       this.writeRaw('>');\r
+                                               if (point) {\r
+                                                       offset = point[0];\r
 \r
-                       return true;\r
-               }\r
-       });\r
-})(tinymce);\r
+                                                       // Find container node\r
+                                                       for (node = root, i = point.length - 1; i >= 1; i--) {\r
+                                                               children = node.childNodes;\r
 \r
-(function(tinymce) {\r
-       // Shorten names\r
-       var extend = tinymce.extend, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher, isIE = tinymce.isIE, isGecko = tinymce.isGecko;\r
+                                                               if (point[i] > children.length - 1)\r
+                                                                       return;\r
 \r
-       function wildcardToRE(s) {\r
-               return s.replace(/([?+*])/g, '.$1');\r
-       };\r
+                                                               node = children[point[i]];\r
+                                                       }\r
 \r
-       tinymce.create('tinymce.dom.Serializer', {\r
-               Serializer : function(s) {\r
-                       var t = this;\r
+                                                       // Move text offset to best suitable location\r
+                                                       if (node.nodeType === 3)\r
+                                                               offset = Math.min(point[0], node.nodeValue.length);\r
 \r
-                       t.key = 0;\r
-                       t.onPreProcess = new Dispatcher(t);\r
-                       t.onPostProcess = new Dispatcher(t);\r
+                                                       // Move element offset to best suitable location\r
+                                                       if (node.nodeType === 1)\r
+                                                               offset = Math.min(point[0], node.childNodes.length);\r
 \r
-                       try {\r
-                               t.writer = new tinymce.dom.XMLWriter();\r
-                       } catch (ex) {\r
-                               // IE might throw exception if ActiveX is disabled so we then switch to the slightly slower StringWriter\r
-                               t.writer = new tinymce.dom.StringWriter();\r
-                       }\r
+                                                       // Set offset within container node\r
+                                                       if (start)\r
+                                                               rng.setStart(node, offset);\r
+                                                       else\r
+                                                               rng.setEnd(node, offset);\r
+                                               }\r
 \r
-                       // IE9 broke the XML attributes order so it can't be used anymore\r
-                       if (tinymce.isIE && document.documentMode > 8) {\r
-                               t.writer = new tinymce.dom.StringWriter();\r
-                       }\r
+                                               return true;\r
+                                       };\r
 \r
-                       // Default settings\r
-                       t.settings = s = extend({\r
-                               dom : tinymce.DOM,\r
-                               valid_nodes : 0,\r
-                               node_filter : 0,\r
-                               attr_filter : 0,\r
-                               invalid_attrs : /^(_mce_|_moz_|sizset|sizcache)/,\r
-                               closed : /^(br|hr|input|meta|img|link|param|area)$/,\r
-                               entity_encoding : 'named',\r
-                               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,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',\r
-                               valid_elements : '*[*]',\r
-                               extended_valid_elements : 0,\r
-                               invalid_elements : 0,\r
-                               fix_table_elements : 1,\r
-                               fix_list_elements : true,\r
-                               fix_content_duplication : true,\r
-                               convert_fonts_to_spans : false,\r
-                               font_size_classes : 0,\r
-                               apply_source_formatting : 0,\r
-                               indent_mode : 'simple',\r
-                               indent_char : '\t',\r
-                               indent_levels : 1,\r
-                               remove_linebreaks : 1,\r
-                               remove_redundant_brs : 1,\r
-                               element_format : 'xhtml'\r
-                       }, s);\r
+                                       if (t.tridentSel)\r
+                                               return t.tridentSel.moveToBookmark(bookmark);\r
 \r
-                       t.dom = s.dom;\r
-                       t.schema = s.schema;\r
+                                       if (setEndPoint(true) && setEndPoint()) {\r
+                                               t.setRng(rng);\r
+                                       }\r
+                               } else if (bookmark.id) {\r
+                                       function restoreEndPoint(suffix) {\r
+                                               var marker = dom.get(bookmark.id + '_' + suffix), node, idx, next, prev, keep = bookmark.keep;\r
+\r
+                                               if (marker) {\r
+                                                       node = marker.parentNode;\r
+\r
+                                                       if (suffix == 'start') {\r
+                                                               if (!keep) {\r
+                                                                       idx = dom.nodeIndex(marker);\r
+                                                               } else {\r
+                                                                       node = marker.firstChild;\r
+                                                                       idx = 1;\r
+                                                               }\r
 \r
-                       // Use raw entities if no entities are defined\r
-                       if (s.entity_encoding == 'named' && !s.entities)\r
-                               s.entity_encoding = 'raw';\r
+                                                               startContainer = endContainer = node;\r
+                                                               startOffset = endOffset = idx;\r
+                                                       } else {\r
+                                                               if (!keep) {\r
+                                                                       idx = dom.nodeIndex(marker);\r
+                                                               } else {\r
+                                                                       node = marker.firstChild;\r
+                                                                       idx = 1;\r
+                                                               }\r
 \r
-                       if (s.remove_redundant_brs) {\r
-                               t.onPostProcess.add(function(se, o) {\r
-                                       // Remove single BR at end of block elements since they get rendered\r
-                                       o.content = o.content.replace(/(<br \/>\s*)+<\/(p|h[1-6]|div|li)>/gi, function(a, b, c) {\r
-                                               // Check if it's a single element\r
-                                               if (/^<br \/>\s*<\//.test(a))\r
-                                                       return '</' + c + '>';\r
+                                                               endContainer = node;\r
+                                                               endOffset = idx;\r
+                                                       }\r
 \r
-                                               return a;\r
-                                       });\r
-                               });\r
-                       }\r
+                                                       if (!keep) {\r
+                                                               prev = marker.previousSibling;\r
+                                                               next = marker.nextSibling;\r
 \r
-                       // Remove XHTML element endings i.e. produce crap :) XHTML is better\r
-                       if (s.element_format == 'html') {\r
-                               t.onPostProcess.add(function(se, o) {\r
-                                       o.content = o.content.replace(/<([^>]+) \/>/g, '<$1>');\r
-                               });\r
-                       }\r
+                                                               // Remove all marker text nodes\r
+                                                               each(tinymce.grep(marker.childNodes), function(node) {\r
+                                                                       if (node.nodeType == 3)\r
+                                                                               node.nodeValue = node.nodeValue.replace(/\uFEFF/g, '');\r
+                                                               });\r
 \r
-                       if (s.fix_list_elements) {\r
-                               t.onPreProcess.add(function(se, o) {\r
-                                       var nl, x, a = ['ol', 'ul'], i, n, p, r = /^(OL|UL)$/, np;\r
+                                                               // Remove marker but keep children if for example contents where inserted into the marker\r
+                                                               // Also remove duplicated instances of the marker for example by a split operation or by WebKit auto split on paste feature\r
+                                                               while (marker = dom.get(bookmark.id + '_' + suffix))\r
+                                                                       dom.remove(marker, 1);\r
 \r
-                                       function prevNode(e, n) {\r
-                                               var a = n.split(','), i;\r
+                                                               // If siblings are text nodes then merge them unless it's Opera since it some how removes the node\r
+                                                               // and we are sniffing since adding a lot of detection code for a browser with 3% of the market isn't worth the effort. Sorry, Opera but it's just a fact\r
+                                                               if (prev && next && prev.nodeType == next.nodeType && prev.nodeType == 3 && !tinymce.isOpera) {\r
+                                                                       idx = prev.nodeValue.length;\r
+                                                                       prev.appendData(next.nodeValue);\r
+                                                                       dom.remove(next);\r
 \r
-                                               while ((e = e.previousSibling) != null) {\r
-                                                       for (i=0; i<a.length; i++) {\r
-                                                               if (e.nodeName == a[i])\r
-                                                                       return e;\r
+                                                                       if (suffix == 'start') {\r
+                                                                               startContainer = endContainer = prev;\r
+                                                                               startOffset = endOffset = idx;\r
+                                                                       } else {\r
+                                                                               endContainer = prev;\r
+                                                                               endOffset = idx;\r
+                                                                       }\r
+                                                               }\r
                                                        }\r
                                                }\r
-\r
-                                               return null;\r
                                        };\r
 \r
-                                       for (x=0; x<a.length; x++) {\r
-                                               nl = t.dom.select(a[x], o.node);\r
-\r
-                                               for (i=0; i<nl.length; i++) {\r
-                                                       n = nl[i];\r
-                                                       p = n.parentNode;\r
-\r
-                                                       if (r.test(p.nodeName)) {\r
-                                                               np = prevNode(n, 'LI');\r
+                                       function addBogus(node) {\r
+                                               // Adds a bogus BR element for empty block elements or just a space on IE since it renders BR elements incorrectly\r
+                                               if (dom.isBlock(node) && !node.innerHTML)\r
+                                                       node.innerHTML = !isIE ? '<br data-mce-bogus="1" />' : ' ';\r
 \r
-                                                               if (!np) {\r
-                                                                       np = t.dom.create('li');\r
-                                                                       np.innerHTML = '&nbsp;';\r
-                                                                       np.appendChild(n);\r
-                                                                       p.insertBefore(np, p.firstChild);\r
-                                                               } else\r
-                                                                       np.appendChild(n);\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               });\r
-                       }\r
+                                               return node;\r
+                                       };\r
 \r
-                       if (s.fix_table_elements) {\r
-                               t.onPreProcess.add(function(se, o) {\r
-                                       // Since Opera will crash if you attach the node to a dynamic document we need to brrowser sniff a specific build\r
-                                       // so Opera users with an older version will have to live with less compaible output not much we can do here\r
-                                       if (!tinymce.isOpera || opera.buildNumber() >= 1767) {\r
-                                               each(t.dom.select('p table', o.node).reverse(), function(n) {\r
-                                                       var parent = t.dom.getParent(n.parentNode, 'table,p');\r
+                                       // Restore start/end points\r
+                                       restoreEndPoint('start');\r
+                                       restoreEndPoint('end');\r
 \r
-                                                       if (parent.nodeName != 'TABLE') {\r
-                                                               try {\r
-                                                                       t.dom.split(parent, n);\r
-                                                               } catch (ex) {\r
-                                                                       // IE can sometimes fire an unknown runtime error so we just ignore it\r
-                                                               }\r
-                                                       }\r
-                                               });\r
+                                       if (startContainer) {\r
+                                               rng = dom.createRng();\r
+                                               rng.setStart(addBogus(startContainer), startOffset);\r
+                                               rng.setEnd(addBogus(endContainer), endOffset);\r
+                                               t.setRng(rng);\r
                                        }\r
-                               });\r
+                               } else if (bookmark.name) {\r
+                                       t.select(dom.select(bookmark.name)[bookmark.index]);\r
+                               } else if (bookmark.rng)\r
+                                       t.setRng(bookmark.rng);\r
                        }\r
                },\r
 \r
-               setEntities : function(s) {\r
-                       var t = this, a, i, l = {}, v;\r
-\r
-                       // No need to setup more than once\r
-                       if (t.entityLookup)\r
-                               return;\r
-\r
-                       // Build regex and lookup array\r
-                       a = s.split(',');\r
-                       for (i = 0; i < a.length; i += 2) {\r
-                               v = a[i];\r
+               select : function(node, content) {\r
+                       var t = this, dom = t.dom, rng = dom.createRng(), idx;\r
 \r
-                               // Don't add default &amp; &quot; etc.\r
-                               if (v == 34 || v == 38 || v == 60 || v == 62)\r
-                                       continue;\r
+                       if (node) {\r
+                               idx = dom.nodeIndex(node);\r
+                               rng.setStart(node.parentNode, idx);\r
+                               rng.setEnd(node.parentNode, idx + 1);\r
+\r
+                               // Find first/last text node or BR element\r
+                               if (content) {\r
+                                       function setPoint(node, start) {\r
+                                               var walker = new tinymce.dom.TreeWalker(node, node);\r
+\r
+                                               do {\r
+                                                       // Text node\r
+                                                       if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {\r
+                                                               if (start)\r
+                                                                       rng.setStart(node, 0);\r
+                                                               else\r
+                                                                       rng.setEnd(node, node.nodeValue.length);\r
 \r
-                               l[String.fromCharCode(a[i])] = a[i + 1];\r
+                                                               return;\r
+                                                       }\r
 \r
-                               v = parseInt(a[i]).toString(16);\r
-                       }\r
+                                                       // BR element\r
+                                                       if (node.nodeName == 'BR') {\r
+                                                               if (start)\r
+                                                                       rng.setStartBefore(node);\r
+                                                               else\r
+                                                                       rng.setEndBefore(node);\r
 \r
-                       t.entityLookup = l;\r
-               },\r
+                                                               return;\r
+                                                       }\r
+                                               } while (node = (start ? walker.next() : walker.prev()));\r
+                                       };\r
 \r
-               setRules : function(s) {\r
-                       var t = this;\r
+                                       setPoint(node, 1);\r
+                                       setPoint(node);\r
+                               }\r
 \r
-                       t._setup();\r
-                       t.rules = {};\r
-                       t.wildRules = [];\r
-                       t.validElements = {};\r
+                               t.setRng(rng);\r
+                       }\r
 \r
-                       return t.addRules(s);\r
+                       return node;\r
                },\r
 \r
-               addRules : function(s) {\r
-                       var t = this, dr;\r
+               isCollapsed : function() {\r
+                       var t = this, r = t.getRng(), s = t.getSel();\r
 \r
-                       if (!s)\r
-                               return;\r
+                       if (!r || r.item)\r
+                               return false;\r
 \r
-                       t._setup();\r
+                       if (r.compareEndPoints)\r
+                               return r.compareEndPoints('StartToEnd', r) === 0;\r
 \r
-                       each(s.split(','), function(s) {\r
-                               var p = s.split(/\[|\]/), tn = p[0].split('/'), ra, at, wat, va = [];\r
+                       return !s || r.collapsed;\r
+               },\r
 \r
-                               // Extend with default rules\r
-                               if (dr)\r
-                                       at = tinymce.extend([], dr.attribs);\r
+               collapse : function(to_start) {\r
+                       var self = this, rng = self.getRng(), node;\r
 \r
-                               // Parse attributes\r
-                               if (p.length > 1) {\r
-                                       each(p[1].split('|'), function(s) {\r
-                                               var ar = {}, i;\r
+                       // Control range on IE\r
+                       if (rng.item) {\r
+                               node = rng.item(0);\r
+                               rng = self.win.document.body.createTextRange();\r
+                               rng.moveToElementText(node);\r
+                       }\r
 \r
-                                               at = at || [];\r
+                       rng.collapse(!!to_start);\r
+                       self.setRng(rng);\r
+               },\r
 \r
-                                               // Parse attribute rule\r
-                                               s = s.replace(/::/g, '~');\r
-                                               s = /^([!\-])?([\w*.?~_\-]+|)([=:<])?(.+)?$/.exec(s);\r
-                                               s[2] = s[2].replace(/~/g, ':');\r
+               getSel : function() {\r
+                       var t = this, w = this.win;\r
 \r
-                                               // Add required attributes\r
-                                               if (s[1] == '!') {\r
-                                                       ra = ra || [];\r
-                                                       ra.push(s[2]);\r
-                                               }\r
+                       return w.getSelection ? w.getSelection() : w.document.selection;\r
+               },\r
 \r
-                                               // Remove inherited attributes\r
-                                               if (s[1] == '-') {\r
-                                                       for (i = 0; i <at.length; i++) {\r
-                                                               if (at[i].name == s[2]) {\r
-                                                                       at.splice(i, 1);\r
-                                                                       return;\r
-                                                               }\r
-                                                       }\r
-                                               }\r
+               getRng : function(w3c) {\r
+                       var t = this, s, r, elm, doc = t.win.document;\r
 \r
-                                               switch (s[3]) {\r
-                                                       // Add default attrib values\r
-                                                       case '=':\r
-                                                               ar.defaultVal = s[4] || '';\r
-                                                               break;\r
+                       // Found tridentSel object then we need to use that one\r
+                       if (w3c && t.tridentSel)\r
+                               return t.tridentSel.getRangeAt(0);\r
 \r
-                                                       // Add forced attrib values\r
-                                                       case ':':\r
-                                                               ar.forcedVal = s[4];\r
-                                                               break;\r
+                       try {\r
+                               if (s = t.getSel())\r
+                                       r = s.rangeCount > 0 ? s.getRangeAt(0) : (s.createRange ? s.createRange() : doc.createRange());\r
+                       } catch (ex) {\r
+                               // IE throws unspecified error here if TinyMCE is placed in a frame/iframe\r
+                       }\r
 \r
-                                                       // Add validation values\r
-                                                       case '<':\r
-                                                               ar.validVals = s[4].split('?');\r
-                                                               break;\r
-                                               }\r
+                       // We have W3C ranges and it's IE then fake control selection since IE9 doesn't handle that correctly yet\r
+                       if (tinymce.isIE && r && r.setStart && doc.selection.createRange().item) {\r
+                               elm = doc.selection.createRange().item(0);\r
+                               r = doc.createRange();\r
+                               r.setStartBefore(elm);\r
+                               r.setEndAfter(elm);\r
+                       }\r
 \r
-                                               if (/[*.?]/.test(s[2])) {\r
-                                                       wat = wat || [];\r
-                                                       ar.nameRE = new RegExp('^' + wildcardToRE(s[2]) + '$');\r
-                                                       wat.push(ar);\r
-                                               } else {\r
-                                                       ar.name = s[2];\r
-                                                       at.push(ar);\r
-                                               }\r
+                       // No range found then create an empty one\r
+                       // This can occur when the editor is placed in a hidden container element on Gecko\r
+                       // Or on IE when there was an exception\r
+                       if (!r)\r
+                               r = doc.createRange ? doc.createRange() : doc.body.createTextRange();\r
 \r
-                                               va.push(s[2]);\r
-                                       });\r
+                       if (t.selectedRange && t.explicitRange) {\r
+                               if (r.compareBoundaryPoints(r.START_TO_START, t.selectedRange) === 0 && r.compareBoundaryPoints(r.END_TO_END, t.selectedRange) === 0) {\r
+                                       // Safari, Opera and Chrome only ever select text which causes the range to change.\r
+                                       // This lets us use the originally set range if the selection hasn't been changed by the user.\r
+                                       r = t.explicitRange;\r
+                               } else {\r
+                                       t.selectedRange = null;\r
+                                       t.explicitRange = null;\r
                                }\r
+                       }\r
 \r
-                               // Handle element names\r
-                               each(tn, function(s, i) {\r
-                                       var pr = s.charAt(0), x = 1, ru = {};\r
-\r
-                                       // Extend with default rule data\r
-                                       if (dr) {\r
-                                               if (dr.noEmpty)\r
-                                                       ru.noEmpty = dr.noEmpty;\r
-\r
-                                               if (dr.fullEnd)\r
-                                                       ru.fullEnd = dr.fullEnd;\r
-\r
-                                               if (dr.padd)\r
-                                                       ru.padd = dr.padd;\r
-                                       }\r
-\r
-                                       // Handle prefixes\r
-                                       switch (pr) {\r
-                                               case '-':\r
-                                                       ru.noEmpty = true;\r
-                                                       break;\r
-\r
-                                               case '+':\r
-                                                       ru.fullEnd = true;\r
-                                                       break;\r
-\r
-                                               case '#':\r
-                                                       ru.padd = true;\r
-                                                       break;\r
-\r
-                                               default:\r
-                                                       x = 0;\r
-                                       }\r
-\r
-                                       tn[i] = s = s.substring(x);\r
-                                       t.validElements[s] = 1;\r
-\r
-                                       // Add element name or element regex\r
-                                       if (/[*.?]/.test(tn[0])) {\r
-                                               ru.nameRE = new RegExp('^' + wildcardToRE(tn[0]) + '$');\r
-                                               t.wildRules = t.wildRules || {};\r
-                                               t.wildRules.push(ru);\r
-                                       } else {\r
-                                               ru.name = tn[0];\r
-\r
-                                               // Store away default rule\r
-                                               if (tn[0] == '@')\r
-                                                       dr = ru;\r
-\r
-                                               t.rules[s] = ru;\r
-                                       }\r
-\r
-                                       ru.attribs = at;\r
+                       return r;\r
+               },\r
 \r
-                                       if (ra)\r
-                                               ru.requiredAttribs = ra;\r
+               setRng : function(r) {\r
+                       var s, t = this;\r
+                       \r
+                       if (!t.tridentSel) {\r
+                               s = t.getSel();\r
 \r
-                                       if (wat) {\r
-                                               // Build valid attributes regexp\r
-                                               s = '';\r
-                                               each(va, function(v) {\r
-                                                       if (s)\r
-                                                               s += '|';\r
+                               if (s) {\r
+                                       t.explicitRange = r;\r
 \r
-                                                       s += '(' + wildcardToRE(v) + ')';\r
-                                               });\r
-                                               ru.validAttribsRE = new RegExp('^' + s.toLowerCase() + '$');\r
-                                               ru.wildAttribs = wat;\r
+                                       try {\r
+                                               s.removeAllRanges();\r
+                                       } catch (ex) {\r
+                                               // IE9 might throw errors here don't know why\r
                                        }\r
-                               });\r
-                       });\r
-\r
-                       // Build valid elements regexp\r
-                       s = '';\r
-                       each(t.validElements, function(v, k) {\r
-                               if (s)\r
-                                       s += '|';\r
-\r
-                               if (k != '@')\r
-                                       s += k;\r
-                       });\r
-                       t.validElementsRE = new RegExp('^(' + wildcardToRE(s.toLowerCase()) + ')$');\r
-\r
-                       //console.debug(t.validElementsRE.toString());\r
-                       //console.dir(t.rules);\r
-                       //console.dir(t.wildRules);\r
-               },\r
 \r
-               findRule : function(n) {\r
-                       var t = this, rl = t.rules, i, r;\r
-\r
-                       t._setup();\r
-\r
-                       // Exact match\r
-                       r = rl[n];\r
-                       if (r)\r
-                               return r;\r
+                                       s.addRange(r);\r
+                                       t.selectedRange = s.getRangeAt(0);\r
+                               }\r
+                       } else {\r
+                               // Is W3C Range\r
+                               if (r.cloneRange) {\r
+                                       t.tridentSel.addRange(r);\r
+                                       return;\r
+                               }\r
 \r
-                       // Try wildcards\r
-                       rl = t.wildRules;\r
-                       for (i = 0; i < rl.length; i++) {\r
-                               if (rl[i].nameRE.test(n))\r
-                                       return rl[i];\r
+                               // Is IE specific range\r
+                               try {\r
+                                       r.select();\r
+                               } catch (ex) {\r
+                                       // Needed for some odd IE bug #1843306\r
+                               }\r
                        }\r
-\r
-                       return null;\r
                },\r
 \r
-               findAttribRule : function(ru, n) {\r
-                       var i, wa = ru.wildAttribs;\r
+               setNode : function(n) {\r
+                       var t = this;\r
 \r
-                       for (i = 0; i < wa.length; i++) {\r
-                               if (wa[i].nameRE.test(n))\r
-                                       return wa[i];\r
-                       }\r
+                       t.setContent(t.dom.getOuterHTML(n));\r
 \r
-                       return null;\r
+                       return n;\r
                },\r
 \r
-               serialize : function(n, o) {\r
-                       var h, t = this, doc, oldDoc, impl, selected;\r
-\r
-                       t._setup();\r
-                       o = o || {};\r
-                       o.format = o.format || 'html';\r
-                       t.processObj = o;\r
-\r
-                       // IE looses the selected attribute on option elements so we need to store it\r
-                       // See: http://support.microsoft.com/kb/829907\r
-                       if (isIE) {\r
-                               selected = [];\r
-                               each(n.getElementsByTagName('option'), function(n) {\r
-                                       var v = t.dom.getAttrib(n, 'selected');\r
+               getNode : function() {\r
+                       var t = this, rng = t.getRng(), sel = t.getSel(), elm, start = rng.startContainer, end = rng.endContainer;\r
 \r
-                                       selected.push(v ? v : null);\r
-                               });\r
-                       }\r
+                       // Range maybe lost after the editor is made visible again\r
+                       if (!rng)\r
+                               return t.dom.getRoot();\r
 \r
-                       n = n.cloneNode(true);\r
+                       if (rng.setStart) {\r
+                               elm = rng.commonAncestorContainer;\r
 \r
-                       // IE looses the selected attribute on option elements so we need to restore it\r
-                       if (isIE) {\r
-                               each(n.getElementsByTagName('option'), function(n, i) {\r
-                                       t.dom.setAttrib(n, 'selected', selected[i]);\r
-                               });\r
-                       }\r
+                               // Handle selection a image or other control like element such as anchors\r
+                               if (!rng.collapsed) {\r
+                                       if (rng.startContainer == rng.endContainer) {\r
+                                               if (rng.endOffset - rng.startOffset < 2) {\r
+                                                       if (rng.startContainer.hasChildNodes())\r
+                                                               elm = rng.startContainer.childNodes[rng.startOffset];\r
+                                               }\r
+                                       }\r
 \r
-                       // Nodes needs to be attached to something in WebKit/Opera\r
-                       // Older builds of Opera crashes if you attach the node to an document created dynamically\r
-                       // and since we can't feature detect a crash we need to sniff the acutal build number\r
-                       // This fix will make DOM ranges and make Sizzle happy!\r
-                       impl = n.ownerDocument.implementation;\r
-                       if (impl.createHTMLDocument && (tinymce.isOpera && opera.buildNumber() >= 1767)) {\r
-                               // Create an empty HTML document\r
-                               doc = impl.createHTMLDocument("");\r
+                                       // If the anchor node is a element instead of a text node then return this element\r
+                                       //if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1) \r
+                                       //      return sel.anchorNode.childNodes[sel.anchorOffset];\r
+\r
+                                       // Handle cases where the selection is immediately wrapped around a node and return that node instead of it's parent.\r
+                                       // This happens when you double click an underlined word in FireFox.\r
+                                       if (start.nodeType === 3 && end.nodeType === 3) {\r
+                                               function skipEmptyTextNodes(n, forwards) {\r
+                                                       var orig = n;\r
+                                                       while (n && n.nodeType === 3 && n.length === 0) {\r
+                                                               n = forwards ? n.nextSibling : n.previousSibling;\r
+                                                       }\r
+                                                       return n || orig;\r
+                                               }\r
+                                               if (start.length === rng.startOffset) {\r
+                                                       start = skipEmptyTextNodes(start.nextSibling, true);\r
+                                               } else {\r
+                                                       start = start.parentNode;\r
+                                               }\r
+                                               if (rng.endOffset === 0) {\r
+                                                       end = skipEmptyTextNodes(end.previousSibling, false);\r
+                                               } else {\r
+                                                       end = end.parentNode;\r
+                                               }\r
 \r
-                               // Add the element or it's children if it's a body element to the new document\r
-                               each(n.nodeName == 'BODY' ? n.childNodes : [n], function(node) {\r
-                                       doc.body.appendChild(doc.importNode(node, true));\r
-                               });\r
+                                               if (start && start === end)\r
+                                                       return start;\r
+                                       }\r
+                               }\r
 \r
-                               // Grab first child or body element for serialization\r
-                               if (n.nodeName != 'BODY')\r
-                                       n = doc.body.firstChild;\r
-                               else\r
-                                       n = doc.body;\r
+                               if (elm && elm.nodeType == 3)\r
+                                       return elm.parentNode;\r
 \r
-                               // set the new document in DOMUtils so createElement etc works\r
-                               oldDoc = t.dom.doc;\r
-                               t.dom.doc = doc;\r
+                               return elm;\r
                        }\r
 \r
-                       t.key = '' + (parseInt(t.key) + 1);\r
+                       return rng.item ? rng.item(0) : rng.parentElement();\r
+               },\r
 \r
-                       // Pre process\r
-                       if (!o.no_events) {\r
-                               o.node = n;\r
-                               t.onPreProcess.dispatch(t, o);\r
-                       }\r
+               getSelectedBlocks : function(st, en) {\r
+                       var t = this, dom = t.dom, sb, eb, n, bl = [];\r
 \r
-                       // Serialize HTML DOM into a string\r
-                       t.writer.reset();\r
-                       t._info = o;\r
-                       t._serializeNode(n, o.getInner);\r
+                       sb = dom.getParent(st || t.getStart(), dom.isBlock);\r
+                       eb = dom.getParent(en || t.getEnd(), dom.isBlock);\r
 \r
-                       // Post process\r
-                       o.content = t.writer.getContent();\r
+                       if (sb)\r
+                               bl.push(sb);\r
 \r
-                       // Restore the old document if it was changed\r
-                       if (oldDoc)\r
-                               t.dom.doc = oldDoc;\r
+                       if (sb && eb && sb != eb) {\r
+                               n = sb;\r
 \r
-                       if (!o.no_events)\r
-                               t.onPostProcess.dispatch(t, o);\r
+                               while ((n = n.nextSibling) && n != eb) {\r
+                                       if (dom.isBlock(n))\r
+                                               bl.push(n);\r
+                               }\r
+                       }\r
 \r
-                       t._postProcess(o);\r
-                       o.node = null;\r
+                       if (eb && sb != eb)\r
+                               bl.push(eb);\r
 \r
-                       return tinymce.trim(o.content);\r
+                       return bl;\r
                },\r
 \r
-               // Internal functions\r
+               normalize : function() {\r
+                       var self = this, rng, normalized;\r
 \r
-               _postProcess : function(o) {\r
-                       var t = this, s = t.settings, h = o.content, sc = [], p;\r
-\r
-                       if (o.format == 'html') {\r
-                               // Protect some elements\r
-                               p = t._protect({\r
-                                       content : h,\r
-                                       patterns : [\r
-                                               {pattern : /(<script[^>]*>)(.*?)(<\/script>)/g},\r
-                                               {pattern : /(<noscript[^>]*>)(.*?)(<\/noscript>)/g},\r
-                                               {pattern : /(<style[^>]*>)(.*?)(<\/style>)/g},\r
-                                               {pattern : /(<pre[^>]*>)(.*?)(<\/pre>)/g, encode : 1},\r
-                                               {pattern : /(<!--\[CDATA\[)(.*?)(\]\]-->)/g}\r
-                                       ]\r
-                               });\r
+                       // Normalize only on non IE browsers for now\r
+                       if (tinymce.isIE)\r
+                               return;\r
 \r
-                               h = p.content;\r
+                       function normalizeEndPoint(start) {\r
+                               var container, offset, walker, dom = self.dom, body = dom.getRoot(), node;\r
 \r
-                               // Entity encode\r
-                               if (s.entity_encoding !== 'raw')\r
-                                       h = t._encode(h);\r
+                               container = rng[(start ? 'start' : 'end') + 'Container'];\r
+                               offset = rng[(start ? 'start' : 'end') + 'Offset'];\r
 \r
-                               // Use BR instead of &nbsp; padded P elements inside editor and use <p>&nbsp;</p> outside editor\r
-/*                             if (o.set)\r
-                                       h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p><br /></p>');\r
-                               else\r
-                                       h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p>$1</p>');*/\r
+                               // If the container is a document move it to the body element\r
+                               if (container.nodeType === 9) {\r
+                                       container = container.body;\r
+                                       offset = 0;\r
+                               }\r
 \r
-                               // Since Gecko and Safari keeps whitespace in the DOM we need to\r
-                               // remove it inorder to match other browsers. But I think Gecko and Safari is right.\r
-                               // This process is only done when getting contents out from the editor.\r
-                               if (!o.set) {\r
-                                       // We need to replace paragraph whitespace with an nbsp before indentation to keep the \u00a0 char\r
-                                       h = tinymce._replace(/<p>\s+<\/p>|<p([^>]+)>\s+<\/p>/g, s.entity_encoding == 'numeric' ? '<p$1>&#160;</p>' : '<p$1>&nbsp;</p>', h);\r
+                               // If the container is body try move it into the closest text node or position\r
+                               // TODO: Add more logic here to handle element selection cases\r
+                               if (container === body) {\r
+                                       // Resolve the index\r
+                                       if (container.hasChildNodes()) {\r
+                                               container = container.childNodes[Math.min(!start && offset > 0 ? offset - 1 : offset, container.childNodes.length - 1)];\r
+                                               offset = 0;\r
+\r
+                                               // Don't walk into elements that doesn't have any child nodes like a IMG\r
+                                               if (container.hasChildNodes()) {\r
+                                                       // Walk the DOM to find a text node to place the caret at or a BR\r
+                                                       node = container;\r
+                                                       walker = new tinymce.dom.TreeWalker(container, body);\r
+                                                       do {\r
+                                                               // Found a text node use that position\r
+                                                               if (node.nodeType === 3) {\r
+                                                                       offset = start ? 0 : node.nodeValue.length - 1;\r
+                                                                       container = node;\r
+                                                                       break;\r
+                                                               }\r
 \r
-                                       if (s.remove_linebreaks) {\r
-                                               h = h.replace(/\r?\n|\r/g, ' ');\r
-                                               h = tinymce._replace(/(<[^>]+>)\s+/g, '$1 ', h);\r
-                                               h = tinymce._replace(/\s+(<\/[^>]+>)/g, ' $1', h);\r
-                                               h = tinymce._replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object) ([^>]+)>\s+/g, '<$1 $2>', h); // Trim block start\r
-                                               h = tinymce._replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>\s+/g, '<$1>', h); // Trim block start\r
-                                               h = tinymce._replace(/\s+<\/(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>/g, '</$1>', h); // Trim block end\r
-                                       }\r
+                                                               // Found a BR element that we can place the caret before\r
+                                                               if (node.nodeName === 'BR') {\r
+                                                                       offset = dom.nodeIndex(node);\r
+                                                                       container = node.parentNode;\r
+                                                                       break;\r
+                                                               }\r
+                                                       } while (node = (start ? walker.next() : walker.prev()));\r
 \r
-                                       // Simple indentation\r
-                                       if (s.apply_source_formatting && s.indent_mode == 'simple') {\r
-                                               // Add line breaks before and after block elements\r
-                                               h = tinymce._replace(/<(\/?)(ul|hr|table|meta|link|tbody|tr|object|body|head|html|map)(|[^>]+)>\s*/g, '\n<$1$2$3>\n', h);\r
-                                               h = tinymce._replace(/\s*<(p|h[1-6]|blockquote|div|title|style|pre|script|td|li|area)(|[^>]+)>/g, '\n<$1$2>', h);\r
-                                               h = tinymce._replace(/<\/(p|h[1-6]|blockquote|div|title|style|pre|script|td|li)>\s*/g, '</$1>\n', h);\r
-                                               h = h.replace(/\n\n/g, '\n');\r
+                                                       normalized = true;\r
+                                               }\r
                                        }\r
                                }\r
 \r
-                               h = t._unprotect(h, p);\r
+                               // Set endpoint if it was normalized\r
+                               if (normalized)\r
+                                       rng['set' + (start ? 'Start' : 'End')](container, offset);\r
+                       };\r
 \r
-                               // Restore CDATA sections\r
-                               h = tinymce._replace(/<!--\[CDATA\[([\s\S]+)\]\]-->/g, '<![CDATA[$1]]>', h);\r
+                       rng = self.getRng();\r
 \r
-                               // Restore the \u00a0 character if raw mode is enabled\r
-                               if (s.entity_encoding == 'raw')\r
-                                       h = tinymce._replace(/<p>&nbsp;<\/p>|<p([^>]+)>&nbsp;<\/p>/g, '<p$1>\u00a0</p>', h);\r
+                       // Normalize the end points\r
+                       normalizeEndPoint(true);\r
+                       \r
+                       if (rng.collapsed)\r
+                               normalizeEndPoint();\r
 \r
-                               // Restore noscript elements\r
-                               h = h.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g, function(v, attribs, text) {\r
-                                       return '<noscript' + attribs + '>' + t.dom.decode(text.replace(/<!--|-->/g, '')) + '</noscript>';\r
-                               });\r
+                       // Set the selection if it was normalized\r
+                       if (normalized) {\r
+                               //console.log(self.dom.dumpRng(rng));\r
+                               self.setRng(rng);\r
                        }\r
-\r
-                       o.content = h;\r
                },\r
 \r
-               _serializeNode : function(n, inner) {\r
-                       var t = this, s = t.settings, w = t.writer, hc, el, cn, i, l, a, at, no, v, nn, ru, ar, iv, closed, keep, type, scopeName;\r
-\r
-                       if (!s.node_filter || s.node_filter(n)) {\r
-                               switch (n.nodeType) {\r
-                                       case 1: // Element\r
-                                               if (n.hasAttribute ? n.hasAttribute('_mce_bogus') : n.getAttribute('_mce_bogus'))\r
-                                                       return;\r
-\r
-                                               iv = keep = false;\r
-                                               hc = n.hasChildNodes();\r
-                                               nn = n.getAttribute('_mce_name') || n.nodeName.toLowerCase();\r
-\r
-                                               // Get internal type\r
-                                               type = n.getAttribute('_mce_type');\r
-                                               if (type) {\r
-                                                       if (!t._info.cleanup) {\r
-                                                               iv = true;\r
-                                                               return;\r
-                                                       } else\r
-                                                               keep = 1;\r
-                                               }\r
-\r
-                                               // Add correct prefix on IE\r
-                                               if (isIE) {\r
-                                                       scopeName = n.scopeName;\r
-                                                       if (scopeName && scopeName !== 'HTML' && scopeName !== 'html')\r
-                                                               nn = scopeName + ':' + nn;\r
-                                               }\r
-\r
-                                               // Remove mce prefix on IE needed for the abbr element\r
-                                               if (nn.indexOf('mce:') === 0)\r
-                                                       nn = nn.substring(4);\r
+               destroy : function(s) {\r
+                       var t = this;\r
 \r
-                                               // Check if valid\r
-                                               if (!keep) {\r
-                                                       if (!t.validElementsRE || !t.validElementsRE.test(nn) || (t.invalidElementsRE && t.invalidElementsRE.test(nn)) || inner) {\r
-                                                               iv = true;\r
-                                                               break;\r
-                                                       }\r
-                                               }\r
+                       t.win = null;\r
 \r
-                                               if (isIE) {\r
-                                                       // Fix IE content duplication (DOM can have multiple copies of the same node)\r
-                                                       if (s.fix_content_duplication) {\r
-                                                               if (n._mce_serialized == t.key)\r
-                                                                       return;\r
+                       // Manual destroy then remove unload handler\r
+                       if (!s)\r
+                               tinymce.removeUnload(t.destroy);\r
+               },\r
 \r
-                                                               n._mce_serialized = t.key;\r
-                                                       }\r
+               // IE has an issue where you can't select/move the caret by clicking outside the body if the document is in standards mode\r
+               _fixIESelection : function() {\r
+                       var dom = this.dom, doc = dom.doc, body = doc.body, started, startRng, htmlElm;\r
 \r
-                                                       // IE sometimes adds a / infront of the node name\r
-                                                       if (nn.charAt(0) == '/')\r
-                                                               nn = nn.substring(1);\r
-                                               } else if (isGecko) {\r
-                                                       // Ignore br elements\r
-                                                       if (n.nodeName === 'BR' && n.getAttribute('type') == '_moz')\r
-                                                               return;\r
-                                               }\r
+                       // Make HTML element unselectable since we are going to handle selection by hand\r
+                       doc.documentElement.unselectable = true;\r
 \r
-                                               // Check if valid child\r
-                                               if (s.validate_children) {\r
-                                                       if (t.elementName && !t.schema.isValid(t.elementName, nn)) {\r
-                                                               iv = true;\r
-                                                               break;\r
-                                                       }\r
+                       // Return range from point or null if it failed\r
+                       function rngFromPoint(x, y) {\r
+                               var rng = body.createTextRange();\r
 \r
-                                                       t.elementName = nn;\r
-                                               }\r
+                               try {\r
+                                       rng.moveToPoint(x, y);\r
+                               } catch (ex) {\r
+                                       // IE sometimes throws and exception, so lets just ignore it\r
+                                       rng = null;\r
+                               }\r
 \r
-                                               ru = t.findRule(nn);\r
-                                               \r
-                                               // No valid rule for this element could be found then skip it\r
-                                               if (!ru) {\r
-                                                       iv = true;\r
-                                                       break;\r
-                                               }\r
+                               return rng;\r
+                       };\r
 \r
-                                               nn = ru.name || nn;\r
-                                               closed = s.closed.test(nn);\r
+                       // Fires while the selection is changing\r
+                       function selectionChange(e) {\r
+                               var pointRng;\r
 \r
-                                               // Skip empty nodes or empty node name in IE\r
-                                               if ((!hc && ru.noEmpty) || (isIE && !nn)) {\r
-                                                       iv = true;\r
-                                                       break;\r
-                                               }\r
+                               // Check if the button is down or not\r
+                               if (e.button) {\r
+                                       // Create range from mouse position\r
+                                       pointRng = rngFromPoint(e.x, e.y);\r
 \r
-                                               // Check required\r
-                                               if (ru.requiredAttribs) {\r
-                                                       a = ru.requiredAttribs;\r
+                                       if (pointRng) {\r
+                                               // Check if pointRange is before/after selection then change the endPoint\r
+                                               if (pointRng.compareEndPoints('StartToStart', startRng) > 0)\r
+                                                       pointRng.setEndPoint('StartToStart', startRng);\r
+                                               else\r
+                                                       pointRng.setEndPoint('EndToEnd', startRng);\r
 \r
-                                                       for (i = a.length - 1; i >= 0; i--) {\r
-                                                               if (this.dom.getAttrib(n, a[i]) !== '')\r
-                                                                       break;\r
-                                                       }\r
+                                               pointRng.select();\r
+                                       }\r
+                               } else\r
+                                       endSelection();\r
+                       }\r
 \r
-                                                       // None of the required was there\r
-                                                       if (i == -1) {\r
-                                                               iv = true;\r
-                                                               break;\r
-                                                       }\r
-                                               }\r
+                       // Removes listeners\r
+                       function endSelection() {\r
+                               var rng = doc.selection.createRange();\r
 \r
-                                               w.writeStartElement(nn);\r
+                               // If the range is collapsed then use the last start range\r
+                               if (startRng && !rng.item && rng.compareEndPoints('StartToEnd', rng) === 0)\r
+                                       startRng.select();\r
 \r
-                                               // Add ordered attributes\r
-                                               if (ru.attribs) {\r
-                                                       for (i=0, at = ru.attribs, l = at.length; i<l; i++) {\r
-                                                               a = at[i];\r
-                                                               v = t._getAttrib(n, a);\r
+                               dom.unbind(doc, 'mouseup', endSelection);\r
+                               dom.unbind(doc, 'mousemove', selectionChange);\r
+                               startRng = started = 0;\r
+                       };\r
 \r
-                                                               if (v !== null)\r
-                                                                       w.writeAttribute(a.name, v);\r
-                                                       }\r
-                                               }\r
+                       // Detect when user selects outside BODY\r
+                       dom.bind(doc, ['mousedown', 'contextmenu'], function(e) {\r
+                               if (e.target.nodeName === 'HTML') {\r
+                                       if (started)\r
+                                               endSelection();\r
 \r
-                                               // Add wild attributes\r
-                                               if (ru.validAttribsRE) {\r
-                                                       at = t.dom.getAttribs(n);\r
-                                                       for (i=at.length-1; i>-1; i--) {\r
-                                                               no = at[i];\r
+                                       // Detect vertical scrollbar, since IE will fire a mousedown on the scrollbar and have target set as HTML\r
+                                       htmlElm = doc.documentElement;\r
+                                       if (htmlElm.scrollHeight > htmlElm.clientHeight)\r
+                                               return;\r
 \r
-                                                               if (no.specified) {\r
-                                                                       a = no.nodeName.toLowerCase();\r
+                                       started = 1;\r
+                                       // Setup start position\r
+                                       startRng = rngFromPoint(e.x, e.y);\r
+                                       if (startRng) {\r
+                                               // Listen for selection change events\r
+                                               dom.bind(doc, 'mouseup', endSelection);\r
+                                               dom.bind(doc, 'mousemove', selectionChange);\r
 \r
-                                                                       if (s.invalid_attrs.test(a) || !ru.validAttribsRE.test(a))\r
-                                                                               continue;\r
+                                               dom.win.focus();\r
+                                               startRng.select();\r
+                                       }\r
+                               }\r
+                       });\r
+               }\r
+       });\r
+})(tinymce);\r
 \r
-                                                                       ar = t.findAttribRule(ru, a);\r
-                                                                       v = t._getAttrib(n, ar, a);\r
+(function(tinymce) {\r
+       tinymce.dom.Serializer = function(settings, dom, schema) {\r
+               var onPreProcess, onPostProcess, isIE = tinymce.isIE, each = tinymce.each, htmlParser;\r
 \r
-                                                                       if (v !== null)\r
-                                                                               w.writeAttribute(a, v);\r
-                                                               }\r
-                                                       }\r
-                                               }\r
+               // Support the old apply_source_formatting option\r
+               if (!settings.apply_source_formatting)\r
+                       settings.indent = false;\r
 \r
-                                               // Keep type attribute\r
-                                               if (type && keep)\r
-                                                       w.writeAttribute('_mce_type', type);\r
+               settings.remove_trailing_brs = true;\r
 \r
-                                               // Write text from script\r
-                                               if (nn === 'script' && tinymce.trim(n.innerHTML)) {\r
-                                                       w.writeText('// '); // Padd it with a comment so it will parse on older browsers\r
-                                                       w.writeCDATA(n.innerHTML.replace(/<!--|-->|<\[CDATA\[|\]\]>/g, '')); // Remove comments and cdata stuctures\r
-                                                       hc = false;\r
-                                                       break;\r
-                                               }\r
+               // Default DOM and Schema if they are undefined\r
+               dom = dom || tinymce.DOM;\r
+               schema = schema || new tinymce.html.Schema(settings);\r
+               settings.entity_encoding = settings.entity_encoding || 'named';\r
 \r
-                                               // Padd empty nodes with a &nbsp;\r
-                                               if (ru.padd) {\r
-                                                       // If it has only one bogus child, padd it anyway workaround for <td><br /></td> bug\r
-                                                       if (hc && (cn = n.firstChild) && cn.nodeType === 1 && n.childNodes.length === 1) {\r
-                                                               if (cn.hasAttribute ? cn.hasAttribute('_mce_bogus') : cn.getAttribute('_mce_bogus'))\r
-                                                                       w.writeText('\u00a0');\r
-                                                       } else if (!hc)\r
-                                                               w.writeText('\u00a0'); // No children then padd it\r
-                                               }\r
+               onPreProcess = new tinymce.util.Dispatcher(self);\r
 \r
-                                               break;\r
+               onPostProcess = new tinymce.util.Dispatcher(self);\r
 \r
-                                       case 3: // Text\r
-                                               // Check if valid child\r
-                                               if (s.validate_children && t.elementName && !t.schema.isValid(t.elementName, '#text'))\r
-                                                       return;\r
+               htmlParser = new tinymce.html.DomParser(settings, schema);\r
 \r
-                                               return w.writeText(n.nodeValue);\r
+               // Convert move data-mce-src, data-mce-href and data-mce-style into nodes or process them if needed\r
+               htmlParser.addAttributeFilter('src,href,style', function(nodes, name) {\r
+                       var i = nodes.length, node, value, internalName = 'data-mce-' + name, urlConverter = settings.url_converter, urlConverterScope = settings.url_converter_scope, undef;\r
 \r
-                                       case 4: // CDATA\r
-                                               return w.writeCDATA(n.nodeValue);\r
+                       while (i--) {\r
+                               node = nodes[i];\r
 \r
-                                       case 8: // Comment\r
-                                               return w.writeComment(n.nodeValue);\r
-                               }\r
-                       } else if (n.nodeType == 1)\r
-                               hc = n.hasChildNodes();\r
+                               value = node.attributes.map[internalName];\r
+                               if (value !== undef) {\r
+                                       // Set external name to internal value and remove internal\r
+                                       node.attr(name, value.length > 0 ? value : null);\r
+                                       node.attr(internalName, null);\r
+                               } else {\r
+                                       // No internal attribute found then convert the value we have in the DOM\r
+                                       value = node.attributes.map[name];\r
 \r
-                       if (hc && !closed) {\r
-                               cn = n.firstChild;\r
+                                       if (name === "style")\r
+                                               value = dom.serializeStyle(dom.parseStyle(value), node.name);\r
+                                       else if (urlConverter)\r
+                                               value = urlConverter.call(urlConverterScope, value, name, node.name);\r
 \r
-                               while (cn) {\r
-                                       t._serializeNode(cn);\r
-                                       t.elementName = nn;\r
-                                       cn = cn.nextSibling;\r
+                                       node.attr(name, value.length > 0 ? value : null);\r
                                }\r
                        }\r
+               });\r
 \r
-                       // Write element end\r
-                       if (!iv) {\r
-                               if (!closed)\r
-                                       w.writeFullEndElement();\r
-                               else\r
-                                       w.writeEndElement();\r
-                       }\r
-               },\r
+               // Remove internal classes mceItem<..>\r
+               htmlParser.addAttributeFilter('class', function(nodes, name) {\r
+                       var i = nodes.length, node, value;\r
 \r
-               _protect : function(o) {\r
-                       var t = this;\r
+                       while (i--) {\r
+                               node = nodes[i];\r
+                               value = node.attr('class').replace(/\s*mce(Item\w+|Selected)\s*/g, '');\r
+                               node.attr('class', value.length > 0 ? value : null);\r
+                       }\r
+               });\r
 \r
-                       o.items = o.items || [];\r
+               // Remove bookmark elements\r
+               htmlParser.addAttributeFilter('data-mce-type', function(nodes, name, args) {\r
+                       var i = nodes.length, node;\r
 \r
-                       function enc(s) {\r
-                               return s.replace(/[\r\n\\]/g, function(c) {\r
-                                       if (c === '\n')\r
-                                               return '\\n';\r
-                                       else if (c === '\\')\r
-                                               return '\\\\';\r
+                       while (i--) {\r
+                               node = nodes[i];\r
 \r
-                                       return '\\r';\r
-                               });\r
-                       };\r
+                               if (node.attributes.map['data-mce-type'] === 'bookmark' && !args.cleanup)\r
+                                       node.remove();\r
+                       }\r
+               });\r
 \r
-                       function dec(s) {\r
-                               return s.replace(/\\[\\rn]/g, function(c) {\r
-                                       if (c === '\\n')\r
-                                               return '\n';\r
-                                       else if (c === '\\\\')\r
-                                               return '\\';\r
+               // Force script into CDATA sections and remove the mce- prefix also add comments around styles\r
+               htmlParser.addNodeFilter('script,style', function(nodes, name) {\r
+                       var i = nodes.length, node, value;\r
 \r
-                                       return '\r';\r
-                               });\r
+                       function trim(value) {\r
+                               return value.replace(/(<!--\[CDATA\[|\]\]-->)/g, '\n')\r
+                                               .replace(/^[\r\n]*|[\r\n]*$/g, '')\r
+                                               .replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g, '')\r
+                                               .replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g, '');\r
                        };\r
 \r
-                       each(o.patterns, function(p) {\r
-                               o.content = dec(enc(o.content).replace(p.pattern, function(x, a, b, c) {\r
-                                       b = dec(b);\r
-\r
-                                       if (p.encode)\r
-                                               b = t._encode(b);\r
-\r
-                                       o.items.push(b);\r
-                                       return a + '<!--mce:' + (o.items.length - 1) + '-->' + c;\r
-                               }));\r
-                       });\r
-\r
-                       return o;\r
-               },\r
+                       while (i--) {\r
+                               node = nodes[i];\r
+                               value = node.firstChild ? node.firstChild.value : '';\r
 \r
-               _unprotect : function(h, o) {\r
-                       h = h.replace(/\<!--mce:([0-9]+)--\>/g, function(a, b) {\r
-                               return o.items[parseInt(b)];\r
-                       });\r
+                               if (name === "script") {\r
+                                       // Remove mce- prefix from script elements\r
+                                       node.attr('type', (node.attr('type') || 'text/javascript').replace(/^mce\-/, ''));\r
 \r
-                       o.items = [];\r
+                                       if (value.length > 0)\r
+                                               node.firstChild.value = '// <![CDATA[\n' + trim(value) + '\n// ]]>';\r
+                               } else {\r
+                                       if (value.length > 0)\r
+                                               node.firstChild.value = '<!--\n' + trim(value) + '\n-->';\r
+                               }\r
+                       }\r
+               });\r
 \r
-                       return h;\r
-               },\r
+               // Convert comments to cdata and handle protected comments\r
+               htmlParser.addNodeFilter('#comment', function(nodes, name) {\r
+                       var i = nodes.length, node;\r
+\r
+                       while (i--) {\r
+                               node = nodes[i];\r
+\r
+                               if (node.value.indexOf('[CDATA[') === 0) {\r
+                                       node.name = '#cdata';\r
+                                       node.type = 4;\r
+                                       node.value = node.value.replace(/^\[CDATA\[|\]\]$/g, '');\r
+                               } else if (node.value.indexOf('mce:protected ') === 0) {\r
+                                       node.name = "#text";\r
+                                       node.type = 3;\r
+                                       node.raw = true;\r
+                                       node.value = unescape(node.value).substr(14);\r
+                               }\r
+                       }\r
+               });\r
 \r
-               _encode : function(h) {\r
-                       var t = this, s = t.settings, l;\r
+               htmlParser.addNodeFilter('xml:namespace,input', function(nodes, name) {\r
+                       var i = nodes.length, node;\r
 \r
-                       // Entity encode\r
-                       if (s.entity_encoding !== 'raw') {\r
-                               if (s.entity_encoding.indexOf('named') != -1) {\r
-                                       t.setEntities(s.entities);\r
-                                       l = t.entityLookup;\r
+                       while (i--) {\r
+                               node = nodes[i];\r
+                               if (node.type === 7)\r
+                                       node.remove();\r
+                               else if (node.type === 1) {\r
+                                       if (name === "input" && !("type" in node.attributes.map))\r
+                                               node.attr('type', 'text');\r
+                               }\r
+                       }\r
+               });\r
 \r
-                                       h = h.replace(/[\u007E-\uFFFF]/g, function(a) {\r
-                                               var v;\r
+               // Fix list elements, TODO: Replace this later\r
+               if (settings.fix_list_elements) {\r
+                       htmlParser.addNodeFilter('ul,ol', function(nodes, name) {\r
+                               var i = nodes.length, node, parentNode;\r
 \r
-                                               if (v = l[a])\r
-                                                       a = '&' + v + ';';\r
+                               while (i--) {\r
+                                       node = nodes[i];\r
+                                       parentNode = node.parent;\r
 \r
-                                               return a;\r
-                                       });\r
+                                       if (parentNode.name === 'ul' || parentNode.name === 'ol') {\r
+                                               if (node.prev && node.prev.name === 'li') {\r
+                                                       node.prev.append(node);\r
+                                               }\r
+                                       }\r
                                }\r
+                       });\r
+               }\r
 \r
-                               if (s.entity_encoding.indexOf('numeric') != -1) {\r
-                                       h = h.replace(/[\u007E-\uFFFF]/g, function(a) {\r
-                                               return '&#' + a.charCodeAt(0) + ';';\r
-                                       });\r
-                               }\r
+               // Remove internal data attributes\r
+               htmlParser.addAttributeFilter('data-mce-src,data-mce-href,data-mce-style', function(nodes, name) {\r
+                       var i = nodes.length;\r
+\r
+                       while (i--) {\r
+                               nodes[i].attr(name, null);\r
                        }\r
+               });\r
 \r
-                       return h;\r
-               },\r
+               // Return public methods\r
+               return {\r
+                       schema : schema,\r
 \r
-               _setup : function() {\r
-                       var t = this, s = this.settings;\r
+                       addNodeFilter : htmlParser.addNodeFilter,\r
 \r
-                       if (t.done)\r
-                               return;\r
+                       addAttributeFilter : htmlParser.addAttributeFilter,\r
 \r
-                       t.done = 1;\r
+                       onPreProcess : onPreProcess,\r
 \r
-                       t.setRules(s.valid_elements);\r
-                       t.addRules(s.extended_valid_elements);\r
+                       onPostProcess : onPostProcess,\r
 \r
-                       if (s.invalid_elements)\r
-                               t.invalidElementsRE = new RegExp('^(' + wildcardToRE(s.invalid_elements.replace(/,/g, '|').toLowerCase()) + ')$');\r
+                       serialize : function(node, args) {\r
+                               var impl, doc, oldDoc, htmlSerializer, content;\r
 \r
-                       if (s.attrib_value_filter)\r
-                               t.attribValueFilter = s.attribValueFilter;\r
-               },\r
+                               // Explorer won't clone contents of script and style and the\r
+                               // selected index of select elements are cleared on a clone operation.\r
+                               if (isIE && dom.select('script,style,select,map').length > 0) {\r
+                                       content = node.innerHTML;\r
+                                       node = node.cloneNode(false);\r
+                                       dom.setHTML(node, content);\r
+                               } else\r
+                                       node = node.cloneNode(true);\r
+\r
+                               // Nodes needs to be attached to something in WebKit/Opera\r
+                               // Older builds of Opera crashes if you attach the node to an document created dynamically\r
+                               // and since we can't feature detect a crash we need to sniff the acutal build number\r
+                               // This fix will make DOM ranges and make Sizzle happy!\r
+                               impl = node.ownerDocument.implementation;\r
+                               if (impl.createHTMLDocument) {\r
+                                       // Create an empty HTML document\r
+                                       doc = impl.createHTMLDocument("");\r
+\r
+                                       // Add the element or it's children if it's a body element to the new document\r
+                                       each(node.nodeName == 'BODY' ? node.childNodes : [node], function(node) {\r
+                                               doc.body.appendChild(doc.importNode(node, true));\r
+                                       });\r
 \r
-               _getAttrib : function(n, a, na) {\r
-                       var i, v;\r
+                                       // Grab first child or body element for serialization\r
+                                       if (node.nodeName != 'BODY')\r
+                                               node = doc.body.firstChild;\r
+                                       else\r
+                                               node = doc.body;\r
 \r
-                       na = na || a.name;\r
+                                       // set the new document in DOMUtils so createElement etc works\r
+                                       oldDoc = dom.doc;\r
+                                       dom.doc = doc;\r
+                               }\r
 \r
-                       if (a.forcedVal && (v = a.forcedVal)) {\r
-                               if (v === '{$uid}')\r
-                                       return this.dom.uniqueId();\r
+                               args = args || {};\r
+                               args.format = args.format || 'html';\r
 \r
-                               return v;\r
-                       }\r
+                               // Pre process\r
+                               if (!args.no_events) {\r
+                                       args.node = node;\r
+                                       onPreProcess.dispatch(self, args);\r
+                               }\r
 \r
-                       v = this.dom.getAttrib(n, na);\r
+                               // Setup serializer\r
+                               htmlSerializer = new tinymce.html.Serializer(settings, schema);\r
 \r
-                       switch (na) {\r
-                               case 'rowspan':\r
-                               case 'colspan':\r
-                                       // Whats the point? Remove usless attribute value\r
-                                       if (v == '1')\r
-                                               v = '';\r
+                               // Parse and serialize HTML\r
+                               args.content = htmlSerializer.serialize(\r
+                                       htmlParser.parse(args.getInner ? node.innerHTML : tinymce.trim(dom.getOuterHTML(node), args), args)\r
+                               );\r
 \r
-                                       break;\r
-                       }\r
+                               // Replace all BOM characters for now until we can find a better solution\r
+                               if (!args.cleanup)\r
+                                       args.content = args.content.replace(/\uFEFF/g, '');\r
 \r
-                       if (this.attribValueFilter)\r
-                               v = this.attribValueFilter(na, v, n);\r
+                               // Post process\r
+                               if (!args.no_events)\r
+                                       onPostProcess.dispatch(self, args);\r
 \r
-                       if (a.validVals) {\r
-                               for (i = a.validVals.length - 1; i >= 0; i--) {\r
-                                       if (v == a.validVals[i])\r
-                                               break;\r
-                               }\r
+                               // Restore the old document if it was changed\r
+                               if (oldDoc)\r
+                                       dom.doc = oldDoc;\r
 \r
-                               if (i == -1)\r
-                                       return null;\r
-                       }\r
+                               args.node = null;\r
 \r
-                       if (v === '' && typeof(a.defaultVal) != 'undefined') {\r
-                               v = a.defaultVal;\r
+                               return args.content;\r
+                       },\r
 \r
-                               if (v === '{$uid}')\r
-                                       return this.dom.uniqueId();\r
+                       addRules : function(rules) {\r
+                               schema.addValidElements(rules);\r
+                       },\r
 \r
-                               return v;\r
-                       } else {\r
-                               // Remove internal mceItemXX classes when content is extracted from editor\r
-                               if (na == 'class' && this.processObj.get)\r
-                                       v = v.replace(/\s?mceItem\w+\s?/g, '');\r
+                       setRules : function(rules) {\r
+                               schema.setValidElements(rules);\r
                        }\r
-\r
-                       if (v === '')\r
-                               return null;\r
-\r
-\r
-                       return v;\r
-               }\r
-       });\r
+               };\r
+       };\r
 })(tinymce);\r
-\r
 (function(tinymce) {\r
        tinymce.dom.ScriptLoader = function(settings) {\r
                var QUEUED = 0,\r
@@ -6831,6 +8474,17 @@ window.tinymce.dom.Sizzle = Sizzle;
 \r
                                callback();\r
                        };\r
+                       \r
+                       function error() {\r
+                               // Report the error so it's easier for people to spot loading errors\r
+                               if (typeof(console) !== "undefined" && console.log)\r
+                                       console.log("Failed to load: " + url);\r
+\r
+                               // We can't mark it as done if there is a load error since\r
+                               // A) We don't want to produce 404 errors on the server and\r
+                               // B) the onerror event won't fire on all browsers.\r
+                               // done();\r
+                       };\r
 \r
                        id = dom.uniqueId();\r
 \r
@@ -6840,7 +8494,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 \r
                                // If script is from same domain and we\r
                                // use IE 6 then use XHR since it's more reliable\r
-                               if (uri.host == loc.hostname && uri.port == loc.port && (uri.protocol + ':') == loc.protocol) {\r
+                               if (uri.host == loc.hostname && uri.port == loc.port && (uri.protocol + ':') == loc.protocol && uri.protocol.toLowerCase() != 'file') {\r
                                        tinymce.util.XHR.send({\r
                                                url : tinymce._addVer(uri.getURI()),\r
                                                success : function(content) {\r
@@ -6855,7 +8509,9 @@ window.tinymce.dom.Sizzle = Sizzle;
                                                        dom.remove(script);\r
 \r
                                                        done();\r
-                                               }\r
+                                               },\r
+                                               \r
+                                               error : error\r
                                        });\r
 \r
                                        return;\r
@@ -6874,15 +8530,21 @@ window.tinymce.dom.Sizzle = Sizzle;
                        if (!tinymce.isIE)\r
                                elm.onload = done;\r
 \r
-                       elm.onreadystatechange = function() {\r
-                               var state = elm.readyState;\r
+                       // Add onerror event will get fired on some browsers but not all of them\r
+                       elm.onerror = error;\r
 \r
-                               // Loaded state is passed on IE 6 however there\r
-                               // are known issues with this method but we can't use\r
-                               // XHR in a cross domain loading\r
-                               if (state == 'complete' || state == 'loaded')\r
-                                       done();\r
-                       };\r
+                       // Opera 9.60 doesn't seem to fire the onreadystate event at correctly\r
+                       if (!tinymce.isOpera) {\r
+                               elm.onreadystatechange = function() {\r
+                                       var state = elm.readyState;\r
+\r
+                                       // Loaded state is passed on IE 6 however there\r
+                                       // are known issues with this method but we can't use\r
+                                       // XHR in a cross domain loading\r
+                                       if (state == 'complete' || state == 'loaded')\r
+                                               done();\r
+                               };\r
+                       }\r
 \r
                        // Most browsers support this feature so we report errors\r
                        // for those at least to help users track their missing plugins etc\r
@@ -7016,178 +8678,24 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
                                        sibling = parent[sibling_name];\r
                                        if (sibling)\r
                                                return sibling;\r
-                               }\r
-                       }\r
-               }\r
-       };\r
-\r
-       this.current = function() {\r
-               return node;\r
-       };\r
-\r
-       this.next = function(shallow) {\r
-               return (node = findSibling(node, 'firstChild', 'nextSibling', shallow));\r
-       };\r
-\r
-       this.prev = function(shallow) {\r
-               return (node = findSibling(node, 'lastChild', 'lastSibling', shallow));\r
-       };\r
-};\r
-\r
-(function() {\r
-       var transitional = {};\r
-\r
-       function unpack(lookup, data) {\r
-               var key;\r
-\r
-               function replace(value) {\r
-                       return value.replace(/[A-Z]+/g, function(key) {\r
-                               return replace(lookup[key]);\r
-                       });\r
-               };\r
-\r
-               // Unpack lookup\r
-               for (key in lookup) {\r
-                       if (lookup.hasOwnProperty(key))\r
-                               lookup[key] = replace(lookup[key]);\r
-               }\r
-\r
-               // Unpack and parse data into object map\r
-               replace(data).replace(/#/g, '#text').replace(/(\w+)\[([^\]]+)\]/g, function(str, name, children) {\r
-                       var i, map = {};\r
-\r
-                       children = children.split(/\|/);\r
-\r
-                       for (i = children.length - 1; i >= 0; i--)\r
-                               map[children[i]] = 1;\r
-\r
-                       transitional[name] = map;\r
-               });\r
-       };\r
-\r
-       // This is the XHTML 1.0 transitional elements with it's children packed to reduce it's size\r
-       // we will later include the attributes here and use it as a default for valid elements but it\r
-       // requires us to rewrite the serializer engine\r
-       unpack({\r
-               Z : '#|H|K|N|O|P',\r
-               Y : '#|X|form|R|Q',\r
-               X : 'p|T|div|U|W|isindex|fieldset|table',\r
-               W : 'pre|hr|blockquote|address|center|noframes',\r
-               U : 'ul|ol|dl|menu|dir',\r
-               ZC : '#|p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q',\r
-               T : 'h1|h2|h3|h4|h5|h6',\r
-               ZB : '#|X|S|Q',\r
-               S : 'R|P',\r
-               ZA : '#|a|G|J|M|O|P',\r
-               R : '#|a|H|K|N|O',\r
-               Q : 'noscript|P',\r
-               P : 'ins|del|script',\r
-               O : 'input|select|textarea|label|button',\r
-               N : 'M|L',\r
-               M : 'em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym',\r
-               L : 'sub|sup',\r
-               K : 'J|I',\r
-               J : 'tt|i|b|u|s|strike',\r
-               I : 'big|small|font|basefont',\r
-               H : 'G|F',\r
-               G : 'br|span|bdo',\r
-               F : 'object|applet|img|map|iframe'\r
-       }, 'script[]' + \r
-               'style[]' + \r
-               'object[#|param|X|form|a|H|K|N|O|Q]' + \r
-               'param[]' + \r
-               'p[S]' + \r
-               'a[Z]' + \r
-               'br[]' + \r
-               'span[S]' + \r
-               'bdo[S]' + \r
-               'applet[#|param|X|form|a|H|K|N|O|Q]' + \r
-               'h1[S]' + \r
-               'img[]' + \r
-               'map[X|form|Q|area]' + \r
-               'h2[S]' + \r
-               'iframe[#|X|form|a|H|K|N|O|Q]' + \r
-               'h3[S]' + \r
-               'tt[S]' + \r
-               'i[S]' + \r
-               'b[S]' + \r
-               'u[S]' + \r
-               's[S]' + \r
-               'strike[S]' + \r
-               'big[S]' + \r
-               'small[S]' + \r
-               'font[S]' + \r
-               'basefont[]' + \r
-               'em[S]' + \r
-               'strong[S]' + \r
-               'dfn[S]' + \r
-               'code[S]' + \r
-               'q[S]' + \r
-               'samp[S]' + \r
-               'kbd[S]' + \r
-               'var[S]' + \r
-               'cite[S]' + \r
-               'abbr[S]' + \r
-               'acronym[S]' + \r
-               'sub[S]' + \r
-               'sup[S]' + \r
-               'input[]' + \r
-               'select[optgroup|option]' + \r
-               'optgroup[option]' + \r
-               'option[]' + \r
-               'textarea[]' + \r
-               'label[S]' + \r
-               'button[#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' + \r
-               'h4[S]' + \r
-               'ins[#|X|form|a|H|K|N|O|Q]' + \r
-               'h5[S]' + \r
-               'del[#|X|form|a|H|K|N|O|Q]' + \r
-               'h6[S]' + \r
-               'div[#|X|form|a|H|K|N|O|Q]' + \r
-               'ul[li]' + \r
-               'li[#|X|form|a|H|K|N|O|Q]' + \r
-               'ol[li]' + \r
-               'dl[dt|dd]' + \r
-               'dt[S]' + \r
-               'dd[#|X|form|a|H|K|N|O|Q]' + \r
-               'menu[li]' + \r
-               'dir[li]' + \r
-               'pre[ZA]' + \r
-               'hr[]' + \r
-               'blockquote[#|X|form|a|H|K|N|O|Q]' + \r
-               'address[S|p]' + \r
-               'center[#|X|form|a|H|K|N|O|Q]' + \r
-               'noframes[#|X|form|a|H|K|N|O|Q]' + \r
-               'isindex[]' + \r
-               'fieldset[#|legend|X|form|a|H|K|N|O|Q]' + \r
-               'legend[S]' + \r
-               'table[caption|col|colgroup|thead|tfoot|tbody|tr]' + \r
-               'caption[S]' + \r
-               'col[]' + \r
-               'colgroup[col]' + \r
-               'thead[tr]' + \r
-               'tr[th|td]' + \r
-               'th[#|X|form|a|H|K|N|O|Q]' + \r
-               'form[#|X|a|H|K|N|O|Q]' + \r
-               'noscript[#|X|form|a|H|K|N|O|Q]' + \r
-               'td[#|X|form|a|H|K|N|O|Q]' + \r
-               'tfoot[tr]' + \r
-               'tbody[tr]' + \r
-               'area[]' + \r
-               'base[]' + \r
-               'body[#|X|form|a|H|K|N|O|Q]'\r
-       );\r
+                               }\r
+                       }\r
+               }\r
+       };\r
 \r
-       tinymce.dom.Schema = function() {\r
-               var t = this, elements = transitional;\r
+       this.current = function() {\r
+               return node;\r
+       };\r
 \r
-               t.isValid = function(name, child_name) {\r
-                       var element = elements[name];\r
+       this.next = function(shallow) {\r
+               return (node = findSibling(node, 'firstChild', 'nextSibling', shallow));\r
+       };\r
 \r
-                       return !!(element && (!child_name || element[child_name]));\r
-               };\r
+       this.prev = function(shallow) {\r
+               return (node = findSibling(node, 'lastChild', 'previousSibling', shallow));\r
        };\r
-})();\r
+};\r
+\r
 (function(tinymce) {\r
        tinymce.dom.RangeUtils = function(dom) {\r
                var INVISIBLE_CHAR = '\uFEFF';\r
@@ -7251,7 +8759,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 \r
                        // If index based end position then resolve it\r
                        if (endContainer.nodeType == 1 && endContainer.hasChildNodes())\r
-                               endContainer = endContainer.childNodes[Math.min(startOffset == endOffset ? endOffset : endOffset - 1, endContainer.childNodes.length - 1)];\r
+                               endContainer = endContainer.childNodes[Math.min(endOffset - 1, endContainer.childNodes.length - 1)];\r
 \r
                        // Find common ancestor and end points\r
                        ancestor = dom.findCommonAncestor(startContainer, endContainer);\r
@@ -7371,12 +8879,158 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
        };\r
 })(tinymce);\r
 \r
+(function(tinymce) {\r
+       var Event = tinymce.dom.Event, each = tinymce.each;\r
+\r
+       tinymce.create('tinymce.ui.KeyboardNavigation', {\r
+               KeyboardNavigation: function(settings, dom) {\r
+                       var t = this, root = settings.root, items = settings.items,\r
+                                       enableUpDown = settings.enableUpDown, enableLeftRight = settings.enableLeftRight || !settings.enableUpDown,\r
+                                       excludeFromTabOrder = settings.excludeFromTabOrder,\r
+                                       itemFocussed, itemBlurred, rootKeydown, rootFocussed, focussedId;\r
+\r
+                       dom = dom || tinymce.DOM;\r
+\r
+                       itemFocussed = function(evt) {\r
+                               focussedId = evt.target.id;\r
+                       };\r
+                       \r
+                       itemBlurred = function(evt) {\r
+                               dom.setAttrib(evt.target.id, 'tabindex', '-1');\r
+                       };\r
+                       \r
+                       rootFocussed = function(evt) {\r
+                               var item = dom.get(focussedId);\r
+                               dom.setAttrib(item, 'tabindex', '0');\r
+                               item.focus();\r
+                       };\r
+                       \r
+                       t.focus = function() {\r
+                               dom.get(focussedId).focus();\r
+                       };\r
+\r
+                       t.destroy = function() {\r
+                               each(items, function(item) {\r
+                                       dom.unbind(dom.get(item.id), 'focus', itemFocussed);\r
+                                       dom.unbind(dom.get(item.id), 'blur', itemBlurred);\r
+                               });\r
+\r
+                               dom.unbind(dom.get(root), 'focus', rootFocussed);\r
+                               dom.unbind(dom.get(root), 'keydown', rootKeydown);\r
+\r
+                               items = dom = root = t.focus = itemFocussed = itemBlurred = rootKeydown = rootFocussed = null;\r
+                               t.destroy = function() {};\r
+                       };\r
+                       \r
+                       t.moveFocus = function(dir, evt) {\r
+                               var idx = -1, controls = t.controls, newFocus;\r
+\r
+                               if (!focussedId)\r
+                                       return;\r
+\r
+                               each(items, function(item, index) {\r
+                                       if (item.id === focussedId) {\r
+                                               idx = index;\r
+                                               return false;\r
+                                       }\r
+                               });\r
+\r
+                               idx += dir;\r
+                               if (idx < 0) {\r
+                                       idx = items.length - 1;\r
+                               } else if (idx >= items.length) {\r
+                                       idx = 0;\r
+                               }\r
+                               \r
+                               newFocus = items[idx];\r
+                               dom.setAttrib(focussedId, 'tabindex', '-1');\r
+                               dom.setAttrib(newFocus.id, 'tabindex', '0');\r
+                               dom.get(newFocus.id).focus();\r
+\r
+                               if (settings.actOnFocus) {\r
+                                       settings.onAction(newFocus.id);\r
+                               }\r
+\r
+                               if (evt)\r
+                                       Event.cancel(evt);\r
+                       };\r
+                       \r
+                       rootKeydown = function(evt) {\r
+                               var DOM_VK_LEFT = 37, DOM_VK_RIGHT = 39, DOM_VK_UP = 38, DOM_VK_DOWN = 40, DOM_VK_ESCAPE = 27, DOM_VK_ENTER = 14, DOM_VK_RETURN = 13, DOM_VK_SPACE = 32;\r
+                               \r
+                               switch (evt.keyCode) {\r
+                                       case DOM_VK_LEFT:\r
+                                               if (enableLeftRight) t.moveFocus(-1);\r
+                                               break;\r
+       \r
+                                       case DOM_VK_RIGHT:\r
+                                               if (enableLeftRight) t.moveFocus(1);\r
+                                               break;\r
+       \r
+                                       case DOM_VK_UP:\r
+                                               if (enableUpDown) t.moveFocus(-1);\r
+                                               break;\r
+\r
+                                       case DOM_VK_DOWN:\r
+                                               if (enableUpDown) t.moveFocus(1);\r
+                                               break;\r
+\r
+                                       case DOM_VK_ESCAPE:\r
+                                               if (settings.onCancel) {\r
+                                                       settings.onCancel();\r
+                                                       Event.cancel(evt);\r
+                                               }\r
+                                               break;\r
+\r
+                                       case DOM_VK_ENTER:\r
+                                       case DOM_VK_RETURN:\r
+                                       case DOM_VK_SPACE:\r
+                                               if (settings.onAction) {\r
+                                                       settings.onAction(focussedId);\r
+                                                       Event.cancel(evt);\r
+                                               }\r
+                                               break;\r
+                               }\r
+                       };\r
+\r
+                       // Set up state and listeners for each item.\r
+                       each(items, function(item, idx) {\r
+                               var tabindex;\r
+\r
+                               if (!item.id) {\r
+                                       item.id = dom.uniqueId('_mce_item_');\r
+                               }\r
+\r
+                               if (excludeFromTabOrder) {\r
+                                       dom.bind(item.id, 'blur', itemBlurred);\r
+                                       tabindex = '-1';\r
+                               } else {\r
+                                       tabindex = (idx === 0 ? '0' : '-1');\r
+                               }\r
+\r
+                               dom.setAttrib(item.id, 'tabindex', tabindex);\r
+                               dom.bind(dom.get(item.id), 'focus', itemFocussed);\r
+                       });\r
+                       \r
+                       // Setup initial state for root element.\r
+                       if (items[0]){\r
+                               focussedId = items[0].id;\r
+                       }\r
+\r
+                       dom.setAttrib(root, 'tabindex', '-1');\r
+                       \r
+                       // Setup listeners for root element.\r
+                       dom.bind(dom.get(root), 'focus', rootFocussed);\r
+                       dom.bind(dom.get(root), 'keydown', rootKeydown);\r
+               }\r
+       });\r
+})(tinymce);\r
 (function(tinymce) {\r
        // Shorten class names\r
        var DOM = tinymce.DOM, is = tinymce.is;\r
 \r
        tinymce.create('tinymce.ui.Control', {\r
-               Control : function(id, s) {\r
+               Control : function(id, s, editor) {\r
                        this.id = id;\r
                        this.settings = s = s || {};\r
                        this.rendered = false;\r
@@ -7385,22 +9039,23 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
                        this.scope = s.scope || this;\r
                        this.disabled = 0;\r
                        this.active = 0;\r
+                       this.editor = editor;\r
+               },\r
+               \r
+               setAriaProperty : function(property, value) {\r
+                       var element = DOM.get(this.id + '_aria') || DOM.get(this.id);\r
+                       if (element) {\r
+                               DOM.setAttrib(element, 'aria-' + property, !!value);\r
+                       }\r
+               },\r
+               \r
+               focus : function() {\r
+                       DOM.get(this.id).focus();\r
                },\r
 \r
                setDisabled : function(s) {\r
-                       var e;\r
-\r
                        if (s != this.disabled) {\r
-                               e = DOM.get(this.id);\r
-\r
-                               // Add accessibility title for unavailable actions\r
-                               if (e && this.settings.unavailable_prefix) {\r
-                                       if (s) {\r
-                                               this.prevTitle = e.title;\r
-                                               e.title = this.settings.unavailable_prefix + ": " + e.title;\r
-                                       } else\r
-                                               e.title = this.prevTitle;\r
-                               }\r
+                               this.setAriaProperty('disabled', s);\r
 \r
                                this.setState('Disabled', s);\r
                                this.setState('Enabled', !s);\r
@@ -7416,6 +9071,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
                        if (s != this.active) {\r
                                this.setState('Active', s);\r
                                this.active = s;\r
+                               this.setAriaProperty('pressed', s);\r
                        }\r
                },\r
 \r
@@ -7473,8 +9129,8 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
        });\r
 })(tinymce);\r
 tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {\r
-       Container : function(id, s) {\r
-               this.parent(id, s);\r
+       Container : function(id, s, editor) {\r
+               this.parent(id, s, editor);\r
 \r
                this.controls = [];\r
 \r
@@ -7498,10 +9154,11 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
        Separator : function(id, s) {\r
                this.parent(id, s);\r
                this.classPrefix = 'mceSeparator';\r
+               this.setDisabled(true);\r
        },\r
 \r
        renderHTML : function() {\r
-               return tinymce.DOM.createHTML('span', {'class' : this.classPrefix});\r
+               return tinymce.DOM.createHTML('span', {'class' : this.classPrefix, role : 'separator', 'aria-orientation' : 'vertical', tabindex : '-1'});\r
        }\r
 });\r
 \r
@@ -7516,6 +9173,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 \r
                setSelected : function(s) {\r
                        this.setState('Selected', s);\r
+                       this.setAriaProperty('checked', !!s);\r
                        this.selected = s;\r
                },\r
 \r
@@ -7663,12 +9321,20 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        s['class'] = s['class'] || cs['class'];\r
                        s.vp_offset_x = s.vp_offset_x || cs.vp_offset_x;\r
                        s.vp_offset_y = s.vp_offset_y || cs.vp_offset_y;\r
+                       s.keyboard_focus = cs.keyboard_focus;\r
                        m = new tinymce.ui.DropMenu(s.id || DOM.uniqueId(), s);\r
 \r
                        m.onAddItem.add(t.onAddItem.dispatch, t.onAddItem);\r
 \r
                        return m;\r
                },\r
+               \r
+               focus : function() {\r
+                       var t = this;\r
+                       if (t.keyboardNav) {\r
+                               t.keyboardNav.focus();\r
+                       }\r
+               },\r
 \r
                update : function() {\r
                        var t = this, s = t.settings, tb = DOM.get('menu_' + t.id + '_tbl'), co = DOM.get('menu_' + t.id + '_co'), tw, th;\r
@@ -7792,13 +9458,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                        }\r
                                });\r
                        }\r
+                       \r
+                       Event.add(co, 'keydown', t._keyHandler, t);\r
 \r
                        t.onShowMenu.dispatch(t);\r
 \r
-                       if (s.keyboard_focus) {\r
-                               Event.add(co, 'keydown', t._keyHandler, t);\r
-                               DOM.select('a', 'menu_' + t.id)[0].focus(); // Select first link\r
-                               t._focusIdx = 0;\r
+                       if (s.keyboard_focus) { \r
+                               t._setupKeyboardNav(); \r
                        }\r
                },\r
 \r
@@ -7808,6 +9474,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        if (!t.isMenuVisible)\r
                                return;\r
 \r
+                       if (t.keyboardNav) t.keyboardNav.destroy();\r
                        Event.remove(co, 'mouseover', t.mouseOverFunc);\r
                        Event.remove(co, 'click', t.mouseClickFunc);\r
                        Event.remove(co, 'keydown', t._keyHandler);\r
@@ -7852,8 +9519,11 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                destroy : function() {\r
                        var t = this, co = DOM.get('menu_' + t.id);\r
 \r
+                       if (t.keyboardNav) t.keyboardNav.destroy();\r
                        Event.remove(co, 'mouseover', t.mouseOverFunc);\r
+                       Event.remove(DOM.select('a', co), 'focus', t.mouseOverFunc);\r
                        Event.remove(co, 'click', t.mouseClickFunc);\r
+                       Event.remove(co, 'keydown', t._keyHandler);\r
 \r
                        if (t.element)\r
                                t.element.remove();\r
@@ -7864,15 +9534,18 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                renderNode : function() {\r
                        var t = this, s = t.settings, n, tb, co, w;\r
 \r
-                       w = DOM.create('div', {id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:200000'});\r
-                       co = DOM.add(w, 'div', {id : 'menu_' + t.id + '_co', 'class' : t.classPrefix + (s['class'] ? ' ' + s['class'] : '')});\r
+                       w = DOM.create('div', {role: 'listbox', id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:200000;outline:0'});\r
+                       if (t.settings.parent) {\r
+                               DOM.setAttrib(w, 'aria-parent', 'menu_' + t.settings.parent.id);\r
+                       }\r
+                       co = DOM.add(w, 'div', {role: 'presentation', id : 'menu_' + t.id + '_co', 'class' : t.classPrefix + (s['class'] ? ' ' + s['class'] : '')});\r
                        t.element = new Element('menu_' + t.id, {blocker : 1, container : s.container});\r
 \r
                        if (s.menu_line)\r
                                DOM.add(co, 'span', {'class' : t.classPrefix + 'Line'});\r
 \r
 //                     n = DOM.add(co, 'div', {id : 'menu_' + t.id + '_co', 'class' : 'mceMenuContainer'});\r
-                       n = DOM.add(co, 'table', {id : 'menu_' + t.id + '_tbl', border : 0, cellPadding : 0, cellSpacing : 0});\r
+                       n = DOM.add(co, 'table', {role: 'presentation', id : 'menu_' + t.id + '_tbl', border : 0, cellPadding : 0, cellSpacing : 0});\r
                        tb = DOM.add(n, 'tbody');\r
 \r
                        each(t.items, function(o) {\r
@@ -7885,33 +9558,36 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                },\r
 \r
                // Internal functions\r
+               _setupKeyboardNav : function(){\r
+                       var contextMenu, menuItems, t=this; \r
+                       contextMenu = DOM.select('#menu_' + t.id)[0];\r
+                       menuItems = DOM.select('a[role=option]', 'menu_' + t.id);\r
+                       menuItems.splice(0,0,contextMenu);\r
+                       t.keyboardNav = new tinymce.ui.KeyboardNavigation({\r
+                               root: 'menu_' + t.id,\r
+                               items: menuItems,\r
+                               onCancel: function() {\r
+                                       t.hideMenu();\r
+                               },\r
+                               enableUpDown: true\r
+                       });\r
+                       contextMenu.focus();\r
+               },\r
 \r
-               _keyHandler : function(e) {\r
-                       var t = this, kc = e.keyCode;\r
-\r
-                       function focus(d) {\r
-                               var i = t._focusIdx + d, e = DOM.select('a', 'menu_' + t.id)[i];\r
-\r
-                               if (e) {\r
-                                       t._focusIdx = i;\r
-                                       e.focus();\r
-                               }\r
-                       };\r
-\r
-                       switch (kc) {\r
-                               case 38:\r
-                                       focus(-1); // Select first link\r
-                                       return;\r
-\r
-                               case 40:\r
-                                       focus(1);\r
-                                       return;\r
-\r
-                               case 13:\r
-                                       return;\r
-\r
-                               case 27:\r
-                                       return this.hideMenu();\r
+               _keyHandler : function(evt) {\r
+                       var t = this, e;\r
+                       switch (evt.keyCode) {\r
+                               case 37: // Left\r
+                                       if (t.settings.parent) {\r
+                                               t.hideMenu();\r
+                                               t.settings.parent.focus();\r
+                                               Event.cancel(evt);\r
+                                       }\r
+                                       break;\r
+                               case 39: // Right\r
+                                       if (t.mouseOverFunc)\r
+                                               t.mouseOverFunc(evt);\r
+                                       break;\r
                        }\r
                },\r
 \r
@@ -7929,8 +9605,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        }\r
 \r
                        n = ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'Item ' + cp + 'ItemEnabled'});\r
-                       n = it = DOM.add(n, 'td');\r
-                       n = a = DOM.add(n, 'a', {href : 'javascript:;', onclick : "return false;", onmousedown : 'return false;'});\r
+                       n = it = DOM.add(n, s.titleItem ? 'th' : 'td');\r
+                       n = a = DOM.add(n, 'a', {id: o.id + '_aria',  role: s.titleItem ? 'presentation' : 'option', href : 'javascript:;', onclick : "return false;", onmousedown : 'return false;'});\r
+\r
+                       if (s.parent) {\r
+                               DOM.setAttrib(a, 'aria-haspopup', 'true');\r
+                               DOM.setAttrib(a, 'aria-owns', 'menu_' + o.id);\r
+                       }\r
 \r
                        DOM.addClass(it, s['class']);\r
 //                     n = DOM.add(n, 'span', {'class' : 'item'});\r
@@ -7965,8 +9646,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
        var DOM = tinymce.DOM;\r
 \r
        tinymce.create('tinymce.ui.Button:tinymce.ui.Control', {\r
-               Button : function(id, s) {\r
-                       this.parent(id, s);\r
+               Button : function(id, s, ed) {\r
+                       this.parent(id, s, ed);\r
                        this.classPrefix = 'mceButton';\r
                },\r
 \r
@@ -7974,13 +9655,14 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        var cp = this.classPrefix, s = this.settings, h, l;\r
 \r
                        l = DOM.encode(s.label || '');\r
-                       h = '<a id="' + this.id + '" href="javascript:;" class="' + cp + ' ' + cp + 'Enabled ' + s['class'] + (l ? ' ' + cp + 'Labeled' : '') +'" onmousedown="return false;" onclick="return false;" title="' + DOM.encode(s.title) + '">';\r
-\r
-                       if (s.image)\r
-                               h += '<img class="mceIcon" src="' + s.image + '" />' + l + '</a>';\r
+                       h = '<a role="button" id="' + this.id + '" href="javascript:;" class="' + cp + ' ' + cp + 'Enabled ' + s['class'] + (l ? ' ' + cp + 'Labeled' : '') +'" onmousedown="return false;" onclick="return false;" aria-labelledby="' + this.id + '_voice" title="' + DOM.encode(s.title) + '">';\r
+                       if (s.image && !(this.editor  &&this.editor.forcedHighContrastMode) )\r
+                               h += '<img class="mceIcon" src="' + s.image + '" alt="' + DOM.encode(s.title) + '" />' + l;\r
                        else\r
-                               h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '') + '</a>';\r
+                               h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '');\r
 \r
+                       h += '<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="' + this.id + '_voice">' + s.title + '</span>'; \r
+                       h += '</a>';\r
                        return h;\r
                },\r
 \r
@@ -7999,10 +9681,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
        var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;\r
 \r
        tinymce.create('tinymce.ui.ListBox:tinymce.ui.Control', {\r
-               ListBox : function(id, s) {\r
+               ListBox : function(id, s, ed) {\r
                        var t = this;\r
 \r
-                       t.parent(id, s);\r
+                       t.parent(id, s, ed);\r
 \r
                        t.items = [];\r
 \r
@@ -8060,12 +9742,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                        t.selectedIndex = idx;\r
                                        DOM.setHTML(e, DOM.encode(o.title));\r
                                        DOM.removeClass(e, 'mceTitle');\r
+                                       DOM.setAttrib(t.id, 'aria-valuenow', o.title);\r
                                } else {\r
                                        DOM.setHTML(e, DOM.encode(t.settings.title));\r
                                        DOM.addClass(e, 'mceTitle');\r
                                        t.selectedValue = t.selectedIndex = null;\r
+                                       DOM.setAttrib(t.id, 'aria-valuenow', t.settings.title);\r
                                }\r
-\r
                                e = 0;\r
                        }\r
                },\r
@@ -8090,16 +9773,17 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                renderHTML : function() {\r
                        var h = '', t = this, s = t.settings, cp = t.classPrefix;\r
 \r
-                       h = '<table id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';\r
-                       h += '<td>' + DOM.createHTML('a', {id : t.id + '_text', href : 'javascript:;', 'class' : 'mceText', onclick : "return false;", onmousedown : 'return false;'}, DOM.encode(t.settings.title)) + '</td>';\r
-                       h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', tabindex : -1, href : 'javascript:;', 'class' : 'mceOpen', onclick : "return false;", onmousedown : 'return false;'}, '<span></span>') + '</td>';\r
-                       h += '</tr></tbody></table>';\r
+                       h = '<span role="button" aria-haspopup="true" aria-labelledby="' + t.id +'_text" aria-describedby="' + t.id + '_voiceDesc"><table role="presentation" tabindex="0" id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';\r
+                       h += '<td>' + DOM.createHTML('span', {id: t.id + '_voiceDesc', 'class': 'voiceLabel', style:'display:none;'}, t.settings.title); \r
+                       h += DOM.createHTML('a', {id : t.id + '_text', tabindex : -1, href : 'javascript:;', 'class' : 'mceText', onclick : "return false;", onmousedown : 'return false;'}, DOM.encode(t.settings.title)) + '</td>';\r
+                       h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', tabindex : -1, href : 'javascript:;', 'class' : 'mceOpen', onclick : "return false;", onmousedown : 'return false;'}, '<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>') + '</td>';\r
+                       h += '</tr></tbody></table></span>';\r
 \r
                        return h;\r
                },\r
 \r
                showMenu : function() {\r
-                       var t = this, p1, p2, e = DOM.get(this.id), m;\r
+                       var t = this, p2, e = DOM.get(this.id), m;\r
 \r
                        if (t.isDisabled() || t.items.length == 0)\r
                                return;\r
@@ -8112,7 +9796,6 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                t.isMenuRendered = true;\r
                        }\r
 \r
-                       p1 = DOM.getPos(this.settings.menu_container);\r
                        p2 = DOM.getPos(e);\r
 \r
                        m = t.menu;\r
@@ -8143,6 +9826,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        var t = this;\r
 \r
                        if (t.menu && t.menu.isMenuVisible) {\r
+                               DOM.removeClass(t.id, t.classPrefix + 'Selected');\r
+\r
                                // Prevent double toogles by canceling the mouse click event to the button\r
                                if (e && e.type == "mousedown" && (e.target.id == t.id + '_text' || e.target.id == t.id + '_open'))\r
                                        return;\r
@@ -8165,7 +9850,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                max_height : 150\r
                        });\r
 \r
-                       m.onHideMenu.add(t.hideMenu, t);\r
+                       m.onHideMenu.add(function() {\r
+                               t.hideMenu();\r
+                               t.focus();\r
+                       });\r
 \r
                        m.add({\r
                                title : t.settings.title,\r
@@ -8206,40 +9894,39 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        var t = this, cp = t.classPrefix;\r
 \r
                        Event.add(t.id, 'click', t.showMenu, t);\r
-                       Event.add(t.id + '_text', 'focus', function() {\r
+                       Event.add(t.id, 'keydown', function(evt) {\r
+                               if (evt.keyCode == 32) { // Space\r
+                                       t.showMenu(evt);\r
+                                       Event.cancel(evt);\r
+                               }\r
+                       });\r
+                       Event.add(t.id, 'focus', function() {\r
                                if (!t._focused) {\r
-                                       t.keyDownHandler = Event.add(t.id + '_text', 'keydown', function(e) {\r
-                                               var idx = -1, v, kc = e.keyCode;\r
-\r
-                                               // Find current index\r
-                                               each(t.items, function(v, i) {\r
-                                                       if (t.selectedValue == v.value)\r
-                                                               idx = i;\r
-                                               });\r
-\r
-                                               // Move up/down\r
-                                               if (kc == 38)\r
-                                                       v = t.items[idx - 1];\r
-                                               else if (kc == 40)\r
-                                                       v = t.items[idx + 1];\r
-                                               else if (kc == 13) {\r
+                                       t.keyDownHandler = Event.add(t.id, 'keydown', function(e) {\r
+                                               if (e.keyCode == 40) {\r
+                                                       t.showMenu();\r
+                                                       Event.cancel(e);\r
+                                               }\r
+                                       });\r
+                                       t.keyPressHandler = Event.add(t.id, 'keypress', function(e) {\r
+                                               var v;\r
+                                               if (e.keyCode == 13) {\r
                                                        // Fake select on enter\r
                                                        v = t.selectedValue;\r
                                                        t.selectedValue = null; // Needs to be null to fake change\r
+                                                       Event.cancel(e);\r
                                                        t.settings.onselect(v);\r
-                                                       return Event.cancel(e);\r
-                                               }\r
-\r
-                                               if (v) {\r
-                                                       t.hideMenu();\r
-                                                       t.select(v.value);\r
                                                }\r
                                        });\r
                                }\r
 \r
                                t._focused = 1;\r
                        });\r
-                       Event.add(t.id + '_text', 'blur', function() {Event.remove(t.id + '_text', 'keydown', t.keyDownHandler); t._focused = 0;});\r
+                       Event.add(t.id, 'blur', function() {\r
+                               Event.remove(t.id, 'keydown', t.keyDownHandler);\r
+                               Event.remove(t.id, 'keypress', t.keyPressHandler);\r
+                               t._focused = 0;\r
+                       });\r
 \r
                        // Old IE doesn't have hover on all elements\r
                        if (tinymce.isIE6 || !DOM.boxModel) {\r
@@ -8276,6 +9963,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 \r
                setDisabled : function(s) {\r
                        DOM.get(this.id).disabled = s;\r
+                       this.setAriaProperty('disabled', s);\r
                },\r
 \r
                isDisabled : function() {\r
@@ -8350,13 +10038,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                h += DOM.createHTML('option', {value : it.value}, it.title);\r
                        });\r
 \r
-                       h = DOM.createHTML('select', {id : t.id, 'class' : 'mceNativeListBox'}, h);\r
-\r
+                       h = DOM.createHTML('select', {id : t.id, 'class' : 'mceNativeListBox', 'aria-labelledby': t.id + '_aria'}, h);\r
+                       h += DOM.createHTML('span', {id : t.id + '_aria', 'style': 'display: none'}, t.settings.title);\r
                        return h;\r
                },\r
 \r
                postRender : function() {\r
-                       var t = this, ch;\r
+                       var t = this, ch, changeListenerAdded = true;\r
 \r
                        t.rendered = true;\r
 \r
@@ -8378,12 +10066,20 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                var bf;\r
 \r
                                Event.remove(t.id, 'change', ch);\r
+                               changeListenerAdded = false;\r
 \r
                                bf = Event.add(t.id, 'blur', function() {\r
+                                       if (changeListenerAdded) return;\r
+                                       changeListenerAdded = true;\r
                                        Event.add(t.id, 'change', onChange);\r
                                        Event.remove(t.id, 'blur', bf);\r
                                });\r
 \r
+                               //prevent default left and right keys on chrome - so that the keyboard navigation is used.\r
+                               if (tinymce.isWebKit && (e.keyCode==37 ||e.keyCode==39)) {\r
+                                       return Event.prevent(e);\r
+                               }\r
+                               \r
                                if (e.keyCode == 13 || e.keyCode == 32) {\r
                                        onChange(e);\r
                                        return Event.cancel(e);\r
@@ -8394,12 +10090,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                }\r
        });\r
 })(tinymce);\r
+\r
 (function(tinymce) {\r
        var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;\r
 \r
        tinymce.create('tinymce.ui.MenuButton:tinymce.ui.Button', {\r
-               MenuButton : function(id, s) {\r
-                       this.parent(id, s);\r
+               MenuButton : function(id, s, ed) {\r
+                       this.parent(id, s, ed);\r
 \r
                        this.onRenderMenu = new tinymce.util.Dispatcher(this);\r
 \r
@@ -8446,7 +10143,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                icons : t.settings.icons\r
                        });\r
 \r
-                       m.onHideMenu.add(t.hideMenu, t);\r
+                       m.onHideMenu.add(function() {\r
+                               t.hideMenu();\r
+                               t.focus();\r
+                       });\r
 \r
                        t.onRenderMenu.dispatch(t, m);\r
                        t.menu = m;\r
@@ -8488,8 +10188,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
        var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;\r
 \r
        tinymce.create('tinymce.ui.SplitButton:tinymce.ui.MenuButton', {\r
-               SplitButton : function(id, s) {\r
-                       this.parent(id, s);\r
+               SplitButton : function(id, s, ed) {\r
+                       this.parent(id, s, ed);\r
                        this.classPrefix = 'mceSplitButton';\r
                },\r
 \r
@@ -8499,33 +10199,50 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        h = '<tbody><tr>';\r
 \r
                        if (s.image)\r
-                               h1 = DOM.createHTML('img ', {src : s.image, 'class' : 'mceAction ' + s['class']});\r
+                               h1 = DOM.createHTML('img ', {src : s.image, role: 'presentation', 'class' : 'mceAction ' + s['class']});\r
                        else\r
                                h1 = DOM.createHTML('span', {'class' : 'mceAction ' + s['class']}, '');\r
 \r
-                       h += '<td>' + DOM.createHTML('a', {id : t.id + '_action', href : 'javascript:;', 'class' : 'mceAction ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';\r
+                       h1 += DOM.createHTML('span', {'class': 'mceVoiceLabel mceIconOnly', id: t.id + '_voice', style: 'display:none;'}, s.title);\r
+                       h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_action', tabindex: '-1', href : 'javascript:;', 'class' : 'mceAction ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';\r
        \r
-                       h1 = DOM.createHTML('span', {'class' : 'mceOpen ' + s['class']});\r
-                       h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', href : 'javascript:;', 'class' : 'mceOpen ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';\r
+                       h1 = DOM.createHTML('span', {'class' : 'mceOpen ' + s['class']}, '<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');\r
+                       h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_open', tabindex: '-1', href : 'javascript:;', 'class' : 'mceOpen ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';\r
 \r
                        h += '</tr></tbody>';\r
-\r
-                       return DOM.createHTML('table', {id : t.id, 'class' : 'mceSplitButton mceSplitButtonEnabled ' + s['class'], cellpadding : '0', cellspacing : '0', onmousedown : 'return false;', title : s.title}, h);\r
+                       h = DOM.createHTML('table', {id : t.id, role: 'presentation', tabindex: '0',  'class' : 'mceSplitButton mceSplitButtonEnabled ' + s['class'], cellpadding : '0', cellspacing : '0', title : s.title}, h);\r
+                       return DOM.createHTML('span', {role: 'button', 'aria-labelledby': t.id + '_voice', 'aria-haspopup': 'true'}, h);\r
                },\r
 \r
                postRender : function() {\r
-                       var t = this, s = t.settings;\r
+                       var t = this, s = t.settings, activate;\r
 \r
                        if (s.onclick) {\r
-                               Event.add(t.id + '_action', 'click', function() {\r
-                                       if (!t.isDisabled())\r
+                               activate = function(evt) {\r
+                                       if (!t.isDisabled()) {\r
                                                s.onclick(t.value);\r
+                                               Event.cancel(evt);\r
+                                       }\r
+                               };\r
+                               Event.add(t.id + '_action', 'click', activate);\r
+                               Event.add(t.id, ['click', 'keydown'], function(evt) {\r
+                                       var DOM_VK_SPACE = 32, DOM_VK_ENTER = 14, DOM_VK_RETURN = 13, DOM_VK_UP = 38, DOM_VK_DOWN = 40;\r
+                                       if ((evt.keyCode === 32 || evt.keyCode === 13 || evt.keyCode === 14) && !evt.altKey && !evt.ctrlKey && !evt.metaKey) {\r
+                                               activate();\r
+                                               Event.cancel(evt);\r
+                                       } else if (evt.type === 'click' || evt.keyCode === DOM_VK_DOWN) {\r
+                                               t.showMenu();\r
+                                               Event.cancel(evt);\r
+                                       }\r
                                });\r
                        }\r
 \r
-                       Event.add(t.id + '_open', 'click', t.showMenu, t);\r
-                       Event.add(t.id + '_open', 'focus', function() {t._focused = 1;});\r
-                       Event.add(t.id + '_open', 'blur', function() {t._focused = 0;});\r
+                       Event.add(t.id + '_open', 'click', function (evt) {\r
+                               t.showMenu();\r
+                               Event.cancel(evt);\r
+                       });\r
+                       Event.add([t.id, t.id + '_open'], 'focus', function() {t._focused = 1;});\r
+                       Event.add([t.id, t.id + '_open'], 'blur', function() {t._focused = 0;});\r
 \r
                        // Old IE doesn't have hover on all elements\r
                        if (tinymce.isIE6 || !DOM.boxModel) {\r
@@ -8546,6 +10263,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 \r
                        Event.clear(this.id + '_action');\r
                        Event.clear(this.id + '_open');\r
+                       Event.clear(this.id);\r
                }\r
        });\r
 })(tinymce);\r
@@ -8554,10 +10272,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
        var DOM = tinymce.DOM, Event = tinymce.dom.Event, is = tinymce.is, each = tinymce.each;\r
 \r
        tinymce.create('tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton', {\r
-               ColorSplitButton : function(id, s) {\r
+               ColorSplitButton : function(id, s, ed) {\r
                        var t = this;\r
 \r
-                       t.parent(id, s);\r
+                       t.parent(id, s, ed);\r
 \r
                        t.settings = s = tinymce.extend({\r
                                colors : '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF',\r
@@ -8615,30 +10333,31 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                hideMenu : function(e) {\r
                        var t = this;\r
 \r
-                       // Prevent double toogles by canceling the mouse click event to the button\r
-                       if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id + '_open';}))\r
-                               return;\r
-\r
-                       if (!e || !DOM.getParent(e.target, '.mceSplitButtonMenu')) {\r
-                               DOM.removeClass(t.id, 'mceSplitButtonSelected');\r
-                               Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);\r
-                               Event.remove(t.id + '_menu', 'keydown', t._keyHandler);\r
-                               DOM.hide(t.id + '_menu');\r
-                       }\r
+                       if (t.isMenuVisible) {\r
+                               // Prevent double toogles by canceling the mouse click event to the button\r
+                               if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id + '_open';}))\r
+                                       return;\r
 \r
-                       t.onHideMenu.dispatch(t);\r
+                               if (!e || !DOM.getParent(e.target, '.mceSplitButtonMenu')) {\r
+                                       DOM.removeClass(t.id, 'mceSplitButtonSelected');\r
+                                       Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);\r
+                                       Event.remove(t.id + '_menu', 'keydown', t._keyHandler);\r
+                                       DOM.hide(t.id + '_menu');\r
+                               }\r
 \r
-                       t.isMenuVisible = 0;\r
+                               t.isMenuVisible = 0;\r
+                               t.onHideMenu.dispatch();\r
+                       }\r
                },\r
 \r
                renderMenu : function() {\r
-                       var t = this, m, i = 0, s = t.settings, n, tb, tr, w;\r
+                       var t = this, m, i = 0, s = t.settings, n, tb, tr, w, context;\r
 \r
-                       w = DOM.add(s.menu_container, 'div', {id : t.id + '_menu', 'class' : s['menu_class'] + ' ' + s['class'], style : 'position:absolute;left:0;top:-1000px;'});\r
+                       w = DOM.add(s.menu_container, 'div', {role: 'listbox', id : t.id + '_menu', 'class' : s['menu_class'] + ' ' + s['class'], style : 'position:absolute;left:0;top:-1000px;'});\r
                        m = DOM.add(w, 'div', {'class' : s['class'] + ' mceSplitButtonMenu'});\r
                        DOM.add(m, 'span', {'class' : 'mceMenuLine'});\r
 \r
-                       n = DOM.add(m, 'table', {'class' : 'mceColorSplitMenu'});\r
+                       n = DOM.add(m, 'table', {role: 'presentation', 'class' : 'mceColorSplitMenu'});\r
                        tb = DOM.add(n, 'tbody');\r
 \r
                        // Generate color grid\r
@@ -8652,20 +10371,32 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                }\r
 \r
                                n = DOM.add(tr, 'td');\r
-\r
                                n = DOM.add(n, 'a', {\r
+                                       role : 'option',\r
                                        href : 'javascript:;',\r
                                        style : {\r
                                                backgroundColor : '#' + c\r
                                        },\r
-                                       _mce_color : '#' + c\r
+                                       'title': t.editor.getLang('colors.' + c, c),\r
+                                       'data-mce-color' : '#' + c\r
                                });\r
+\r
+                               if (t.editor.forcedHighContrastMode) {\r
+                                       n = DOM.add(n, 'canvas', { width: 16, height: 16, 'aria-hidden': 'true' });\r
+                                       if (n.getContext && (context = n.getContext("2d"))) {\r
+                                               context.fillStyle = '#' + c;\r
+                                               context.fillRect(0, 0, 16, 16);\r
+                                       } else {\r
+                                               // No point leaving a canvas element around if it's not supported for drawing on anyway.\r
+                                               DOM.remove(n);\r
+                                       }\r
+                               }\r
                        });\r
 \r
                        if (s.more_colors_func) {\r
                                n = DOM.add(tb, 'tr');\r
                                n = DOM.add(n, 'td', {colspan : s.grid_width, 'class' : 'mceMoreColors'});\r
-                               n = DOM.add(n, 'a', {id : t.id + '_more', href : 'javascript:;', onclick : 'return false;', 'class' : 'mceMoreColors'}, s.more_colors_title);\r
+                               n = DOM.add(n, 'a', {role: 'option', id : t.id + '_more', href : 'javascript:;', onclick : 'return false;', 'class' : 'mceMoreColors'}, s.more_colors_title);\r
 \r
                                Event.add(n, 'click', function(e) {\r
                                        s.more_colors_func.call(s.more_colors_scope || this);\r
@@ -8674,13 +10405,25 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        }\r
 \r
                        DOM.addClass(m, 'mceColorSplitMenu');\r
+                       \r
+                       new tinymce.ui.KeyboardNavigation({\r
+                               root: t.id + '_menu',\r
+                               items: DOM.select('a', t.id + '_menu'),\r
+                               onCancel: function() {\r
+                                       t.hideMenu();\r
+                                       t.focus();\r
+                               }\r
+                       });\r
+\r
+                       // Prevent IE from scrolling and hindering click to occur #4019\r
+                       Event.add(t.id + '_menu', 'mousedown', function(e) {return Event.cancel(e);});\r
 \r
                        Event.add(t.id + '_menu', 'click', function(e) {\r
                                var c;\r
 \r
-                               e = e.target;\r
+                               e = DOM.getParent(e.target, 'a', tb);\r
 \r
-                               if (e.nodeName == 'A' && (c = e.getAttribute('_mce_color')))\r
+                               if (e && e.nodeName.toLowerCase() == 'a' && (c = e.getAttribute('data-mce-color')))\r
                                        t.setColor(c);\r
 \r
                                return Event.cancel(e); // Prevent IE auto save warning\r
@@ -8690,13 +10433,17 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                },\r
 \r
                setColor : function(c) {\r
+                       this.displayColor(c);\r
+                       this.hideMenu();\r
+                       this.settings.onselect(c);\r
+               },\r
+               \r
+               displayColor : function(c) {\r
                        var t = this;\r
 \r
                        DOM.setStyle(t.id + '_preview', 'backgroundColor', c);\r
 \r
                        t.value = c;\r
-                       t.hideMenu();\r
-                       t.settings.onselect(c);\r
                },\r
 \r
                postRender : function() {\r
@@ -8717,9 +10464,67 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
        });\r
 })(tinymce);\r
 \r
+(function(tinymce) {\r
+// Shorten class names\r
+var dom = tinymce.DOM, each = tinymce.each, Event = tinymce.dom.Event;\r
+tinymce.create('tinymce.ui.ToolbarGroup:tinymce.ui.Container', {\r
+       renderHTML : function() {\r
+               var t = this, h = [], controls = t.controls, each = tinymce.each, settings = t.settings;\r
+\r
+               h.push('<div id="' + t.id + '" role="group" aria-labelledby="' + t.id + '_voice">');\r
+               //TODO: ACC test this out - adding a role = application for getting the landmarks working well.\r
+               h.push("<span role='application'>");\r
+               h.push('<span id="' + t.id + '_voice" class="mceVoiceLabel" style="display:none;">' + dom.encode(settings.name) + '</span>');\r
+               each(controls, function(toolbar) {\r
+                       h.push(toolbar.renderHTML());\r
+               });\r
+               h.push("</span>");\r
+               h.push('</div>');\r
+\r
+               return h.join('');\r
+       },\r
+       \r
+       focus : function() {\r
+               this.keyNav.focus();\r
+       },\r
+       \r
+       postRender : function() {\r
+               var t = this, items = [];\r
+\r
+               each(t.controls, function(toolbar) {\r
+                       each (toolbar.controls, function(control) {\r
+                               if (control.id) {\r
+                                       items.push(control);\r
+                               }\r
+                       });\r
+               });\r
+\r
+               t.keyNav = new tinymce.ui.KeyboardNavigation({\r
+                       root: t.id,\r
+                       items: items,\r
+                       onCancel: function() {\r
+                               t.editor.focus();\r
+                       },\r
+                       excludeFromTabOrder: !t.settings.tab_focus_toolbar\r
+               });\r
+       },\r
+       \r
+       destroy : function() {\r
+               var self = this;\r
+\r
+               self.parent();\r
+               self.keyNav.destroy();\r
+               Event.clear(self.id);\r
+       }\r
+});\r
+})(tinymce);\r
+\r
+(function(tinymce) {\r
+// Shorten class names\r
+var dom = tinymce.DOM, each = tinymce.each;\r
 tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {\r
        renderHTML : function() {\r
-               var t = this, h = '', c, co, dom = tinymce.DOM, s = t.settings, i, pr, nx, cl;\r
+               var t = this, h = '', c, co, s = t.settings, i, pr, nx, cl;\r
 \r
                cl = t.controls;\r
                for (i=0; i<cl.length; i++) {\r
@@ -8776,9 +10581,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                h += dom.createHTML('td', {'class' : c}, dom.createHTML('span', null, '<!-- IE -->'));\r
 \r
-               return dom.createHTML('table', {id : t.id, 'class' : 'mceToolbar' + (s['class'] ? ' ' + s['class'] : ''), cellpadding : '0', cellspacing : '0', align : t.settings.align || ''}, '<tbody><tr>' + h + '</tr></tbody>');\r
+               return dom.createHTML('table', {id : t.id, 'class' : 'mceToolbar' + (s['class'] ? ' ' + s['class'] : ''), cellpadding : '0', cellspacing : '0', align : t.settings.align || '', role: 'presentation', tabindex: '-1'}, '<tbody><tr>' + h + '</tr></tbody>');\r
        }\r
 });\r
+})(tinymce);\r
 \r
 (function(tinymce) {\r
        var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each;\r
@@ -8794,37 +10600,83 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                },\r
 \r
                get : function(n) {\r
-                       return this.lookup[n];\r
+                       if (this.lookup[n]) {\r
+                               return this.lookup[n].instance;\r
+                       } else {\r
+                               return undefined;\r
+                       }\r
+               },\r
+\r
+               dependencies : function(n) {\r
+                       var result;\r
+                       if (this.lookup[n]) {\r
+                               result = this.lookup[n].dependencies;\r
+                       }\r
+                       return result || [];\r
                },\r
 \r
                requireLangPack : function(n) {\r
                        var s = tinymce.settings;\r
 \r
-                       if (s && s.language)\r
+                       if (s && s.language && s.language_load !== false)\r
                                tinymce.ScriptLoader.add(this.urls[n] + '/langs/' + s.language + '.js');\r
                },\r
 \r
-               add : function(id, o) {\r
+               add : function(id, o, dependencies) {\r
                        this.items.push(o);\r
-                       this.lookup[id] = o;\r
+                       this.lookup[id] = {instance:o, dependencies:dependencies};\r
                        this.onAdd.dispatch(this, id, o);\r
 \r
                        return o;\r
                },\r
+               createUrl: function(baseUrl, dep) {\r
+                       if (typeof dep === "object") {\r
+                               return dep\r
+                       } else {\r
+                               return {prefix: baseUrl.prefix, resource: dep, suffix: baseUrl.suffix};\r
+                       }\r
+               },\r
+\r
+               addComponents: function(pluginName, scripts) {\r
+                       var pluginUrl = this.urls[pluginName];\r
+                       tinymce.each(scripts, function(script){\r
+                               tinymce.ScriptLoader.add(pluginUrl+"/"+script); \r
+                       });\r
+               },\r
 \r
                load : function(n, u, cb, s) {\r
-                       var t = this;\r
+                       var t = this, url = u;\r
+\r
+                       function loadDependencies() {\r
+                               var dependencies = t.dependencies(n);\r
+                               tinymce.each(dependencies, function(dep) {\r
+                                       var newUrl = t.createUrl(u, dep);\r
+                                       t.load(newUrl.resource, newUrl, undefined, undefined);\r
+                               });\r
+                               if (cb) {\r
+                                       if (s) {\r
+                                               cb.call(s);\r
+                                       } else {\r
+                                               cb.call(tinymce.ScriptLoader);\r
+                                       }\r
+                               }\r
+                       }\r
 \r
                        if (t.urls[n])\r
                                return;\r
+                       if (typeof u === "object")\r
+                               url = u.prefix + u.resource + u.suffix;\r
 \r
-                       if (u.indexOf('/') != 0 && u.indexOf('://') == -1)\r
-                               u = tinymce.baseURL + '/' +  u;\r
+                       if (url.indexOf('/') != 0 && url.indexOf('://') == -1)\r
+                               url = tinymce.baseURL + '/' + url;\r
 \r
-                       t.urls[n] = u.substring(0, u.lastIndexOf('/'));\r
+                       t.urls[n] = url.substring(0, url.lastIndexOf('/'));\r
 \r
-                       if (!t.lookup[n])\r
-                               tinymce.ScriptLoader.add(u, cb, s);\r
+                       if (t.lookup[n]) {\r
+                               loadDependencies();\r
+                       } else {\r
+                               tinymce.ScriptLoader.add(url, loadDependencies, s);\r
+                       }\r
                }\r
        });\r
 \r
@@ -9281,7 +11133,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                apply_source_formatting : 1,\r
                                directionality : 'ltr',\r
                                forced_root_block : 'p',\r
-                               valid_elements : '@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u,#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,-blockquote[cite],-table[border|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value],embed[type|width|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo,button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method],input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value|tabindex|accesskey],kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value],q[cite],samp,select[disabled|multiple|name|size],small,textarea[cols|rows|disabled|name|readonly],tt,var,big',\r
                                hidden_input : 1,\r
                                padd_empty_editor : 1,\r
                                render_ui : 1,\r
@@ -9291,7 +11142,15 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                keep_styles : 1,\r
                                fix_table_elements : 1,\r
                                inline_styles : 1,\r
-                               convert_fonts_to_spans : true\r
+                               convert_fonts_to_spans : true,\r
+                               indent : 'simple',\r
+                               indent_before : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr',\r
+                               indent_after : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr',\r
+                               validate : true,\r
+                               entity_encoding : 'named',\r
+                               url_converter : t.convertURL,\r
+                               url_converter_scope : t,\r
+                               ie7_compat : true\r
                        }, s);\r
 \r
                        t.documentBaseURI = new tinymce.util.URI(s.document_base_url || tinymce.documentBaseURL, {\r
@@ -9300,6 +11159,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                        t.baseURI = tinymce.baseURI;\r
 \r
+                       t.contentCSS = [];\r
+\r
                        // Call setup\r
                        t.execCallback('setup', t);\r
                },\r
@@ -9321,10 +11182,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        if (!t.getElement())\r
                                return;\r
 \r
-                       // Is a iPad/iPhone, then skip initialization. We need to sniff here since the\r
-                       // browser says it has contentEditable support but there is no visible caret\r
-                       // We will remove this check ones Apple implements full contentEditable support\r
-                       if (tinymce.isIDevice)\r
+                       // Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff \r
+                       // here since the browser says it has contentEditable support but there is no visible\r
+                       // caret We will remove this check ones Apple implements full contentEditable support\r
+                       if (tinymce.isIDevice && !tinymce.isIOS5)\r
                                return;\r
 \r
                        // Add hidden input for non input elements inside form elements\r
@@ -9389,19 +11250,30 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                        // Load scripts\r
                        function loadScripts() {\r
-                               if (s.language)\r
+                               if (s.language && s.language_load !== false)\r
                                        sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');\r
 \r
                                if (s.theme && s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])\r
                                        ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');\r
 \r
                                each(explode(s.plugins), function(p) {\r
-                                       if (p && p.charAt(0) != '-' && !PluginManager.urls[p]) {\r
-                                               // Skip safari plugin, since it is removed as of 3.3b1\r
-                                               if (p == 'safari')\r
-                                                       return;\r
-\r
-                                               PluginManager.load(p, 'plugins/' + p + '/editor_plugin' + tinymce.suffix + '.js');\r
+                                       if (p &&!PluginManager.urls[p]) {\r
+                                               if (p.charAt(0) == '-') {\r
+                                                       p = p.substr(1, p.length);\r
+                                                       var dependencies = PluginManager.dependencies(p);\r
+                                                       each(dependencies, function(dep) {\r
+                                                               var defaultSettings = {prefix:'plugins/', resource: dep, suffix:'/editor_plugin' + tinymce.suffix + '.js'};\r
+                                                               var dep = PluginManager.createUrl(defaultSettings, dep);\r
+                                                               PluginManager.load(dep.resource, dep);\r
+                                                               \r
+                                                       });\r
+                                               } else {\r
+                                                       // Skip safari plugin, since it is removed as of 3.3b1\r
+                                                       if (p == 'safari') {\r
+                                                               return;\r
+                                                       }\r
+                                                       PluginManager.load(p, {prefix:'plugins/', resource: p, suffix:'/editor_plugin' + tinymce.suffix + '.js'});\r
+                                               }\r
                                        }\r
                                });\r
 \r
@@ -9416,10 +11288,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                },\r
 \r
                init : function() {\r
-                       var n, t = this, s = t.settings, w, h, e = t.getElement(), o, ti, u, bi, bc, re;\r
+                       var n, t = this, s = t.settings, w, h, e = t.getElement(), o, ti, u, bi, bc, re, i, initializedPlugins = [];\r
 \r
                        tinymce.add(t);\r
 \r
+                       s.aria_label = s.aria_label || DOM.getAttrib(e, 'aria-label', t.getLang('aria.rich_text_area'));\r
+\r
                        if (s.theme) {\r
                                s.theme = s.theme.replace(/-/, '');\r
                                o = ThemeManager.get(s.theme);\r
@@ -9428,20 +11302,25 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                if (t.theme.init && s.init_theme)\r
                                        t.theme.init(t, ThemeManager.urls[s.theme] || tinymce.documentBaseURL.replace(/\/$/, ''));\r
                        }\r
-\r
-                       // Create all plugins\r
-                       each(explode(s.plugins.replace(/\-/g, '')), function(p) {\r
+                       function initPlugin(p) {\r
                                var c = PluginManager.get(p), u = PluginManager.urls[p] || tinymce.documentBaseURL.replace(/\/$/, ''), po;\r
-\r
-                               if (c) {\r
+                               if (c && tinymce.inArray(initializedPlugins,p) === -1) {\r
+                                       each(PluginManager.dependencies(p), function(dep){\r
+                                               initPlugin(dep);\r
+                                       });\r
                                        po = new c(t, u);\r
 \r
                                        t.plugins[p] = po;\r
 \r
-                                       if (po.init)\r
+                                       if (po.init) {\r
                                                po.init(t, u);\r
+                                               initializedPlugins.push(p);\r
+                                       }\r
                                }\r
-                       });\r
+                       }\r
+                       \r
+                       // Create all plugins\r
+                       each(explode(s.plugins.replace(/\-/g, '')), initPlugin);\r
 \r
                        // Setup popup CSS path(s)\r
                        if (s.popup_css !== false) {\r
@@ -9457,12 +11336,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        t.controlManager = new tinymce.ControlManager(t);\r
 \r
                        if (s.custom_undo_redo) {\r
-                               // Add initial undo level\r
                                t.onBeforeExecCommand.add(function(ed, cmd, ui, val, a) {\r
-                                       if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo)) {\r
-                                               if (!t.undoManager.hasUndo())\r
-                                                       t.undoManager.add();\r
-                                       }\r
+                                       if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo))\r
+                                               t.undoManager.beforeChange();\r
                                });\r
 \r
                                t.onExecCommand.add(function(ed, cmd, ui, val, a) {\r
@@ -9528,6 +11404,13 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                height : h\r
                        });\r
 \r
+                       // Load specified content CSS last\r
+                       if (s.content_css) {\r
+                               tinymce.each(explode(s.content_css), function(u) {\r
+                                       t.contentCSS.push(t.documentBaseURI.toAbsolute(u));\r
+                               });\r
+                       }\r
+\r
                        h = (o.iframeHeight || h) + (typeof(h) == 'number' ? (o.deltaHeight || 0) : '');\r
                        if (h < 100)\r
                                h = 100;\r
@@ -9539,10 +11422,13 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        if (s.document_base_url != tinymce.documentBaseURL)\r
                                t.iframeHTML += '<base href="' + t.documentBaseURI.getURI() + '" />';\r
 \r
-                       t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=7" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';\r
+                       // IE8 doesn't support carets behind images setting ie7_compat would force IE8+ to run in IE7 compat mode.\r
+                       if (s.ie7_compat)\r
+                               t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=7" />';\r
+                       else\r
+                               t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=edge" />';\r
 \r
-                       if (tinymce.relaxedDomain)\r
-                               t.iframeHTML += '<script type="text/javascript">document.domain = "' + tinymce.relaxedDomain + '";</script>';\r
+                       t.iframeHTML += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';\r
 \r
                        bi = s.body_id || 'tinymce';\r
                        if (bi.indexOf('=') != -1) {\r
@@ -9556,33 +11442,35 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                bc = bc[t.id] || '';\r
                        }\r
 \r
-                       t.iframeHTML += '</head><body id="' + bi + '" class="mceContentBody ' + bc + '"></body></html>';\r
+                       t.iframeHTML += '</head><body id="' + bi + '" class="mceContentBody ' + bc + '"><br></body></html>';\r
 \r
                        // Domain relaxing enabled, then set document domain\r
-                       if (tinymce.relaxedDomain) {\r
+                       if (tinymce.relaxedDomain && (isIE || (tinymce.isOpera && parseFloat(opera.version()) < 11))) {\r
                                // We need to write the contents here in IE since multiple writes messes up refresh button and back button\r
-                               if (isIE || (tinymce.isOpera && parseFloat(opera.version()) >= 9.5))\r
-                                       u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";var ed = window.parent.tinyMCE.get("' + t.id + '");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()';\r
-                               else if (tinymce.isOpera)\r
-                                       u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";document.close();ed.setupIframe();})()';                                  \r
+                               u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";var ed = window.parent.tinyMCE.get("' + t.id + '");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()';                         \r
                        }\r
 \r
                        // Create iframe\r
-                       n = DOM.add(o.iframeContainer, 'iframe', {\r
+                       // TODO: ACC add the appropriate description on this.\r
+                       n = DOM.add(o.iframeContainer, 'iframe', { \r
                                id : t.id + "_ifr",\r
                                src : u || 'javascript:""', // Workaround for HTTPS warning in IE6/7\r
                                frameBorder : '0',\r
+                               allowTransparency : "true",\r
+                               title : s.aria_label,\r
                                style : {\r
                                        width : '100%',\r
-                                       height : h\r
+                                       height : h,\r
+                                       display : 'block' // Important for Gecko to render the iframe correctly\r
                                }\r
                        });\r
 \r
                        t.contentAreaContainer = o.iframeContainer;\r
                        DOM.get(o.editorContainer).style.display = t.orgDisplay;\r
                        DOM.get(t.id).style.display = 'none';\r
+                       DOM.setAttrib(t.id, 'aria-hidden', true);\r
 \r
-                       if (!isIE || !tinymce.relaxedDomain)\r
+                       if (!tinymce.relaxedDomain || !u)\r
                                t.setupIframe();\r
 \r
                        e = n = o = null; // Cleanup\r
@@ -9591,35 +11479,44 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                setupIframe : function() {\r
                        var t = this, s = t.settings, e = DOM.get(t.id), d = t.getDoc(), h, b;\r
 \r
-                       // Setup iframe body\r
-                       if (!isIE || !tinymce.relaxedDomain) {\r
+                       // Setup iframe body\r
+                       if (!isIE || !tinymce.relaxedDomain) {\r
+                               // Fix for a focus bug in FF 3.x where the body element\r
+                               // wouldn't get proper focus if the user clicked on the HTML element\r
+                               if (isGecko && !Range.prototype.getClientRects) { // Detect getClientRects got introduced in FF 4\r
+                                       t.onMouseDown.add(function(ed, e) {\r
+                                               if (e.target.nodeName === "HTML") {\r
+                                                       var body = t.getBody();\r
+\r
+                                                       // Blur the body it's focused but not correctly focused\r
+                                                       body.blur();\r
+\r
+                                                       // Refocus the body after a little while\r
+                                                       setTimeout(function() {\r
+                                                               body.focus();\r
+                                                       }, 0);\r
+                                               }\r
+                                       });\r
+                               }\r
+\r
                                d.open();\r
                                d.write(t.iframeHTML);\r
                                d.close();\r
-                       }\r
 \r
-                       // Design mode needs to be added here Ctrl+A will fail otherwise\r
-                       if (!isIE) {\r
-                               try {\r
-                                       if (!s.readonly)\r
-                                               d.designMode = 'On';\r
-                               } catch (ex) {\r
-                                       // Will fail on Gecko if the editor is placed in an hidden container element\r
-                                       // The design mode will be set ones the editor is focused\r
-                               }\r
+                               if (tinymce.relaxedDomain)\r
+                                       d.domain = tinymce.relaxedDomain;\r
                        }\r
 \r
-                       // IE needs to use contentEditable or it will display non secure items for HTTPS\r
-                       if (isIE) {\r
-                               // It will not steal focus if we hide it while setting contentEditable\r
-                               b = t.getBody();\r
-                               DOM.hide(b);\r
+                       // It will not steal focus while setting contentEditable\r
+                       b = t.getBody();\r
+                       b.disabled = true;\r
 \r
-                               if (!s.readonly)\r
-                                       b.contentEditable = true;\r
+                       if (!s.readonly)\r
+                               b.contentEditable = true;\r
 \r
-                               DOM.show(b);\r
-                       }\r
+                       b.disabled = false;\r
+\r
+                       t.schema = new tinymce.html.Schema(s);\r
 \r
                        t.dom = new tinymce.dom.DOMUtils(t.getDoc(), {\r
                                keep_values : true,\r
@@ -9629,16 +11526,83 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                class_filter : s.class_filter,\r
                                update_styles : 1,\r
                                fix_ie_paragraphs : 1,\r
-                               valid_styles : s.valid_styles\r
+                               schema : t.schema\r
                        });\r
 \r
-                       t.schema = new tinymce.dom.Schema();\r
+                       t.parser = new tinymce.html.DomParser(s, t.schema);\r
 \r
-                       t.serializer = new tinymce.dom.Serializer(extend(s, {\r
-                               valid_elements : s.verify_html === false ? '*[*]' : s.valid_elements,\r
-                               dom : t.dom,\r
-                               schema : t.schema\r
-                       }));\r
+                       // Force anchor names closed, unless the setting "allow_html_in_named_anchor" is explicitly included.\r
+                       if (!t.settings.allow_html_in_named_anchor) {\r
+                               t.parser.addAttributeFilter('name', function(nodes, name) {\r
+                                       var i = nodes.length, sibling, prevSibling, parent, node;\r
+       \r
+                                       while (i--) {\r
+                                               node = nodes[i];\r
+                                               if (node.name === 'a' && node.firstChild) {\r
+                                                       parent = node.parent;\r
+       \r
+                                                       // Move children after current node\r
+                                                       sibling = node.lastChild;\r
+                                                       do {\r
+                                                               prevSibling = sibling.prev;\r
+                                                               parent.insert(sibling, node);\r
+                                                               sibling = prevSibling;\r
+                                                       } while (sibling);\r
+                                               }\r
+                                       }\r
+                               });\r
+                       }\r
+\r
+                       // Convert src and href into data-mce-src, data-mce-href and data-mce-style\r
+                       t.parser.addAttributeFilter('src,href,style', function(nodes, name) {\r
+                               var i = nodes.length, node, dom = t.dom, value, internalName;\r
+\r
+                               while (i--) {\r
+                                       node = nodes[i];\r
+                                       value = node.attr(name);\r
+                                       internalName = 'data-mce-' + name;\r
+\r
+                                       // Add internal attribute if we need to we don't on a refresh of the document\r
+                                       if (!node.attributes.map[internalName]) {       \r
+                                               if (name === "style")\r
+                                                       node.attr(internalName, dom.serializeStyle(dom.parseStyle(value), node.name));\r
+                                               else\r
+                                                       node.attr(internalName, t.convertURL(value, name, node.name));\r
+                                       }\r
+                               }\r
+                       });\r
+\r
+                       // Keep scripts from executing\r
+                       t.parser.addNodeFilter('script', function(nodes, name) {\r
+                               var i = nodes.length;\r
+\r
+                               while (i--)\r
+                                       nodes[i].attr('type', 'mce-text/javascript');\r
+                       });\r
+\r
+                       t.parser.addNodeFilter('#cdata', function(nodes, name) {\r
+                               var i = nodes.length, node;\r
+\r
+                               while (i--) {\r
+                                       node = nodes[i];\r
+                                       node.type = 8;\r
+                                       node.name = '#comment';\r
+                                       node.value = '[CDATA[' + node.value + ']]';\r
+                               }\r
+                       });\r
+\r
+                       t.parser.addNodeFilter('p,h1,h2,h3,h4,h5,h6,div', function(nodes, name) {\r
+                               var i = nodes.length, node, nonEmptyElements = t.schema.getNonEmptyElements();\r
+\r
+                               while (i--) {\r
+                                       node = nodes[i];\r
+\r
+                                       if (node.isEmpty(nonEmptyElements))\r
+                                               node.empty().append(new tinymce.html.Node('br', 1)).shortEnded = true;\r
+                               }\r
+                       });\r
+\r
+                       t.serializer = new tinymce.dom.Serializer(s, t.dom, t.schema);\r
 \r
                        t.selection = new tinymce.dom.Selection(t.dom, t.getWin(), t.serializer);\r
 \r
@@ -9648,18 +11612,18 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        t.formatter.register({\r
                                alignleft : [\r
                                        {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'left'}},\r
-                                       {selector : 'img,table', styles : {'float' : 'left'}}\r
+                                       {selector : 'img,table', collapsed : false, styles : {'float' : 'left'}}\r
                                ],\r
 \r
                                aligncenter : [\r
                                        {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'center'}},\r
-                                       {selector : 'img', styles : {display : 'block', marginLeft : 'auto', marginRight : 'auto'}},\r
-                                       {selector : 'table', styles : {marginLeft : 'auto', marginRight : 'auto'}}\r
+                                       {selector : 'img', collapsed : false, styles : {display : 'block', marginLeft : 'auto', marginRight : 'auto'}},\r
+                                       {selector : 'table', collapsed : false, styles : {marginLeft : 'auto', marginRight : 'auto'}}\r
                                ],\r
 \r
                                alignright : [\r
                                        {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'right'}},\r
-                                       {selector : 'img,table', styles : {'float' : 'right'}}\r
+                                       {selector : 'img,table', collapsed : false, styles : {'float' : 'right'}}\r
                                ],\r
 \r
                                alignfull : [\r
@@ -9667,33 +11631,47 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                ],\r
 \r
                                bold : [\r
-                                       {inline : 'strong'},\r
+                                       {inline : 'strong', remove : 'all'},\r
                                        {inline : 'span', styles : {fontWeight : 'bold'}},\r
-                                       {inline : 'b'}\r
+                                       {inline : 'b', remove : 'all'}\r
                                ],\r
 \r
                                italic : [\r
-                                       {inline : 'em'},\r
+                                       {inline : 'em', remove : 'all'},\r
                                        {inline : 'span', styles : {fontStyle : 'italic'}},\r
-                                       {inline : 'i'}\r
+                                       {inline : 'i', remove : 'all'}\r
                                ],\r
 \r
                                underline : [\r
                                        {inline : 'span', styles : {textDecoration : 'underline'}, exact : true},\r
-                                       {inline : 'u'}\r
+                                       {inline : 'u', remove : 'all'}\r
                                ],\r
 \r
                                strikethrough : [\r
                                        {inline : 'span', styles : {textDecoration : 'line-through'}, exact : true},\r
-                                       {inline : 'u'}\r
+                                       {inline : 'strike', remove : 'all'}\r
                                ],\r
 \r
-                               forecolor : {inline : 'span', styles : {color : '%value'}},\r
-                               hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}},\r
+                               forecolor : {inline : 'span', styles : {color : '%value'}, wrap_links : false},\r
+                               hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}, wrap_links : false},\r
                                fontname : {inline : 'span', styles : {fontFamily : '%value'}},\r
                                fontsize : {inline : 'span', styles : {fontSize : '%value'}},\r
                                fontsize_class : {inline : 'span', attributes : {'class' : '%value'}},\r
                                blockquote : {block : 'blockquote', wrapper : 1, remove : 'all'},\r
+                               subscript : {inline : 'sub'},\r
+                               superscript : {inline : 'sup'},\r
+\r
+                               link : {inline : 'a', selector : 'a', remove : 'all', split : true, deep : true,\r
+                                       onmatch : function(node) {\r
+                                               return true;\r
+                                       },\r
+\r
+                                       onformat : function(elm, fmt, vars) {\r
+                                               each(vars, function(value, key) {\r
+                                                       t.dom.setAttrib(elm, key, value);\r
+                                               });\r
+                                       }\r
+                               },\r
 \r
                                removeformat : [\r
                                        {selector : 'b,strong,em,i,font,u,strike', remove : 'all', split : true, expand : false, block_expand : true, deep : true},\r
@@ -9714,7 +11692,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                        // Pass through\r
                        t.undoManager.onAdd.add(function(um, l) {\r
-                               if (!l.initial)\r
+                               if (um.hasUndo())\r
                                        return t.onChange.dispatch(t, l, um);\r
                        });\r
 \r
@@ -9752,35 +11730,14 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        t.controlManager.onPostRender.dispatch(t, t.controlManager);\r
                        t.onPostRender.dispatch(t);\r
 \r
+                       t.quirks = new tinymce.util.Quirks(this);\r
+\r
                        if (s.directionality)\r
                                t.getBody().dir = s.directionality;\r
 \r
                        if (s.nowrap)\r
                                t.getBody().style.whiteSpace = "nowrap";\r
 \r
-                       if (s.custom_elements) {\r
-                               function handleCustom(ed, o) {\r
-                                       each(explode(s.custom_elements), function(v) {\r
-                                               var n;\r
-\r
-                                               if (v.indexOf('~') === 0) {\r
-                                                       v = v.substring(1);\r
-                                                       n = 'span';\r
-                                               } else\r
-                                                       n = 'div';\r
-\r
-                                               o.content = o.content.replace(new RegExp('<(' + v + ')([^>]*)>', 'g'), '<' + n + ' _mce_name="$1"$2>');\r
-                                               o.content = o.content.replace(new RegExp('</(' + v + ')>', 'g'), '</' + n + '>');\r
-                                       });\r
-                               };\r
-\r
-                               t.onBeforeSetContent.add(handleCustom);\r
-                               t.onPostProcess.add(function(ed, o) {\r
-                                       if (o.set)\r
-                                               handleCustom(ed, o);\r
-                               });\r
-                       }\r
-\r
                        if (s.handle_node_change_callback) {\r
                                t.onNodeChange.add(function(ed, cm, n) {\r
                                        t.execCallback('handle_node_change_callback', t.id, n, -1, -1, true, t.selection.isCollapsed());\r
@@ -9802,16 +11759,22 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                });\r
                        }\r
 \r
-                       if (s.convert_newlines_to_brs) {\r
+                       if (s.protect) {\r
                                t.onBeforeSetContent.add(function(ed, o) {\r
-                                       if (o.initial)\r
-                                               o.content = o.content.replace(/\r?\n/g, '<br />');\r
+                                       if (s.protect) {\r
+                                               each(s.protect, function(pattern) {\r
+                                                       o.content = o.content.replace(pattern, function(str) {\r
+                                                               return '<!--mce:protected ' + escape(str) + '-->';\r
+                                                       });\r
+                                               });\r
+                                       }\r
                                });\r
                        }\r
 \r
-                       if (s.fix_nesting && isIE) {\r
+                       if (s.convert_newlines_to_brs) {\r
                                t.onBeforeSetContent.add(function(ed, o) {\r
-                                       o.content = t._fixNesting(o.content);\r
+                                       if (o.initial)\r
+                                               o.content = o.content.replace(/\r?\n/g, '<br />');\r
                                });\r
                        }\r
 \r
@@ -9908,7 +11871,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                                var pn = n.parentNode;\r
 \r
                                                if (ed.dom.isBlock(pn) && pn.lastChild === n)\r
-                                                       ed.dom.add(pn, 'br', {'_mce_bogus' : 1});\r
+                                                       ed.dom.add(pn, 'br', {'data-mce-bogus' : 1});\r
                                        });\r
                                };\r
 \r
@@ -9918,72 +11881,62 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                });\r
 \r
                                t.onSetContent.add(t.selection.onSetContent.add(fixLinks));\r
-\r
-                               if (!s.readonly) {\r
-                                       try {\r
-                                               // Design mode must be set here once again to fix a bug where\r
-                                               // Ctrl+A/Delete/Backspace didn't work if the editor was added using mceAddControl then removed then added again\r
-                                               d.designMode = 'Off';\r
-                                               d.designMode = 'On';\r
-                                       } catch (ex) {\r
-                                               // Will fail on Gecko if the editor is placed in an hidden container element\r
-                                               // The design mode will be set ones the editor is focused\r
-                                       }\r
-                               }\r
                        }\r
 \r
-                       // A small timeout was needed since firefox will remove. Bug: #1838304\r
-                       setTimeout(function () {\r
-                               if (t.removed)\r
-                                       return;\r
+                       t.load({initial : true, format : 'html'});\r
+                       t.startContent = t.getContent({format : 'raw'});\r
+                       t.undoManager.add();\r
+                       t.initialized = true;\r
 \r
-                               t.load({initial : true, format : (s.cleanup_on_startup ? 'html' : 'raw')});\r
-                               t.startContent = t.getContent({format : 'raw'});\r
-                               t.initialized = true;\r
+                       t.onInit.dispatch(t);\r
+                       t.execCallback('setupcontent_callback', t.id, t.getBody(), t.getDoc());\r
+                       t.execCallback('init_instance_callback', t);\r
+                       t.focus(true);\r
+                       t.nodeChanged({initial : 1});\r
 \r
-                               t.onInit.dispatch(t);\r
-                               t.execCallback('setupcontent_callback', t.id, t.getBody(), t.getDoc());\r
-                               t.execCallback('init_instance_callback', t);\r
-                               t.focus(true);\r
-                               t.nodeChanged({initial : 1});\r
+                       // Load specified content CSS last\r
+                       each(t.contentCSS, function(u) {\r
+                               t.dom.loadCSS(u);\r
+                       });\r
 \r
-                               // Load specified content CSS last\r
-                               if (s.content_css) {\r
-                                       tinymce.each(explode(s.content_css), function(u) {\r
-                                               t.dom.loadCSS(t.documentBaseURI.toAbsolute(u));\r
-                                       });\r
-                               }\r
+                       // Handle auto focus\r
+                       if (s.auto_focus) {\r
+                               setTimeout(function () {\r
+                                       var ed = tinymce.get(s.auto_focus);\r
 \r
-                               // Handle auto focus\r
-                               if (s.auto_focus) {\r
-                                       setTimeout(function () {\r
-                                               var ed = tinymce.get(s.auto_focus);\r
+                                       ed.selection.select(ed.getBody(), 1);\r
+                                       ed.selection.collapse(1);\r
+                                       ed.getBody().focus();\r
+                                       ed.getWin().focus();\r
+                               }, 100);\r
+                       }\r
 \r
-                                               ed.selection.select(ed.getBody(), 1);\r
-                                               ed.selection.collapse(1);\r
-                                               ed.getWin().focus();\r
-                                       }, 100);\r
-                               }\r
-                       }, 1);\r
-       \r
                        e = null;\r
                },\r
 \r
 \r
                focus : function(sf) {\r
-                       var oed, t = this, ce = t.settings.content_editable, ieRng, controlElm, doc = t.getDoc();\r
+                       var oed, t = this, selection = t.selection, ce = t.settings.content_editable, ieRng, controlElm, doc = t.getDoc();\r
 \r
                        if (!sf) {\r
                                // Get selected control element\r
-                               ieRng = t.selection.getRng();\r
+                               ieRng = selection.getRng();\r
                                if (ieRng.item) {\r
                                        controlElm = ieRng.item(0);\r
                                }\r
 \r
+                               t._refreshContentEditable();\r
+                               selection.normalize();\r
+\r
                                // Is not content editable\r
                                if (!ce)\r
                                        t.getWin().focus();\r
 \r
+                               // Focus the body as well since it's contentEditable\r
+                               if (tinymce.isGecko) {\r
+                                       t.getBody().focus();\r
+                               }\r
+\r
                                // Restore selected control element\r
                                // This is needed when for example an image is selected within a\r
                                // layer a call to focus will then remove the control selection\r
@@ -10068,7 +12021,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                },\r
 \r
                nodeChanged : function(o) {\r
-                       var t = this, s = t.selection, n = (isIE ? s.getNode() : s.getStart()) || t.getBody();\r
+                       var t = this, s = t.selection, n = s.getStart() || t.getBody();\r
 \r
                        // Fix for bug #1896577 it seems that this can not be fired while the editor is loading\r
                        if (t.initialized) {\r
@@ -10101,16 +12054,16 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        t.buttons[n] = s;\r
                },\r
 \r
-               addCommand : function(n, f, s) {\r
-                       this.execCommands[n] = {func : f, scope : s || this};\r
+               addCommand : function(name, callback, scope) {\r
+                       this.execCommands[name] = {func : callback, scope : scope || this};\r
                },\r
 \r
-               addQueryStateHandler : function(n, f, s) {\r
-                       this.queryStateCommands[n] = {func : f, scope : s || this};\r
+               addQueryStateHandler : function(name, callback, scope) {\r
+                       this.queryStateCommands[name] = {func : callback, scope : scope || this};\r
                },\r
 \r
-               addQueryValueHandler : function(n, f, s) {\r
-                       this.queryValueCommands[n] = {func : f, scope : s || this};\r
+               addQueryValueHandler : function(name, callback, scope) {\r
+                       this.queryValueCommands[name] = {func : callback, scope : scope || this};\r
                },\r
 \r
                addShortcut : function(pa, desc, cmd_func, sc) {\r
@@ -10213,12 +12166,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                return true;\r
                        }\r
 \r
-                       // Execute global commands\r
-                       if (tinymce.GlobalCommands.execCommand(t, cmd, ui, val)) {\r
-                               t.onExecCommand.dispatch(t, cmd, ui, val, a);\r
-                               return true;\r
-                       }\r
-\r
                        // Editor commands\r
                        if (t.editorCommands.execCommand(cmd, ui, val)) {\r
                                t.onExecCommand.dispatch(t, cmd, ui, val, a);\r
@@ -10350,7 +12297,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                        // Add undo level will trigger onchange event\r
                        if (!o.no_events) {\r
-                               t.undoManager.typing = 0;\r
+                               t.undoManager.typing = false;\r
                                t.undoManager.add();\r
                        }\r
 \r
@@ -10382,66 +12329,87 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        return h;\r
                },\r
 \r
-               setContent : function(h, o) {\r
-                       var t = this;\r
+               setContent : function(content, args) {\r
+                       var self = this, rootNode, body = self.getBody(), forcedRootBlockName;\r
 \r
-                       o = o || {};\r
-                       o.format = o.format || 'html';\r
-                       o.set = true;\r
-                       o.content = h;\r
+                       // Setup args object\r
+                       args = args || {};\r
+                       args.format = args.format || 'html';\r
+                       args.set = true;\r
+                       args.content = content;\r
 \r
-                       if (!o.no_events)\r
-                               t.onBeforeSetContent.dispatch(t, o);\r
+                       // Do preprocessing\r
+                       if (!args.no_events)\r
+                               self.onBeforeSetContent.dispatch(self, args);\r
+\r
+                       content = args.content;\r
 \r
                        // Padd empty content in Gecko and Safari. Commands will otherwise fail on the content\r
                        // It will also be impossible to place the caret in the editor unless there is a BR element present\r
-                       if (!tinymce.isIE && (h.length === 0 || /^\s+$/.test(h))) {\r
-                               o.content = t.dom.setHTML(t.getBody(), '<br _mce_bogus="1" />');\r
-                               o.format = 'raw';\r
-                       }\r
+                       if (!tinymce.isIE && (content.length === 0 || /^\s+$/.test(content))) {\r
+                               forcedRootBlockName = self.settings.forced_root_block;\r
+                               if (forcedRootBlockName)\r
+                                       content = '<' + forcedRootBlockName + '><br data-mce-bogus="1"></' + forcedRootBlockName + '>';\r
+                               else\r
+                                       content = '<br data-mce-bogus="1">';\r
 \r
-                       o.content = t.dom.setHTML(t.getBody(), tinymce.trim(o.content));\r
+                               body.innerHTML = content;\r
+                               self.selection.select(body, true);\r
+                               self.selection.collapse(true);\r
+                               return;\r
+                       }\r
 \r
-                       if (o.format != 'raw' && t.settings.cleanup) {\r
-                               o.getInner = true;\r
-                               o.content = t.dom.setHTML(t.getBody(), t.serializer.serialize(t.getBody(), o));\r
+                       // Parse and serialize the html\r
+                       if (args.format !== 'raw') {\r
+                               content = new tinymce.html.Serializer({}, self.schema).serialize(\r
+                                       self.parser.parse(content)\r
+                               );\r
                        }\r
 \r
-                       if (!o.no_events)\r
-                               t.onSetContent.dispatch(t, o);\r
+                       // Set the new cleaned contents to the editor\r
+                       args.content = tinymce.trim(content);\r
+                       self.dom.setHTML(body, args.content);\r
 \r
-                       return o.content;\r
+                       // Do post processing\r
+                       if (!args.no_events)\r
+                               self.onSetContent.dispatch(self, args);\r
+\r
+                       self.selection.normalize();\r
+\r
+                       return args.content;\r
                },\r
 \r
-               getContent : function(o) {\r
-                       var t = this, h;\r
+               getContent : function(args) {\r
+                       var self = this, content;\r
 \r
-                       o = o || {};\r
-                       o.format = o.format || 'html';\r
-                       o.get = true;\r
+                       // Setup args object\r
+                       args = args || {};\r
+                       args.format = args.format || 'html';\r
+                       args.get = true;\r
 \r
-                       if (!o.no_events)\r
-                               t.onBeforeGetContent.dispatch(t, o);\r
+                       // Do preprocessing\r
+                       if (!args.no_events)\r
+                               self.onBeforeGetContent.dispatch(self, args);\r
 \r
-                       if (o.format != 'raw' && t.settings.cleanup) {\r
-                               o.getInner = true;\r
-                               h = t.serializer.serialize(t.getBody(), o);\r
-                       else\r
-                               h = t.getBody().innerHTML;\r
+                       // Get raw contents or by default the cleaned contents\r
+                       if (args.format == 'raw')\r
+                               content = self.getBody().innerHTML;\r
+                       else\r
+                               content = self.serializer.serialize(self.getBody(), args);\r
 \r
-                       h = h.replace(/^\s*|\s*$/g, '');\r
-                       o.content = h;\r
+                       args.content = tinymce.trim(content);\r
 \r
-                       if (!o.no_events)\r
-                               t.onGetContent.dispatch(t, o);\r
+                       // Do post processing\r
+                       if (!args.no_events)\r
+                               self.onGetContent.dispatch(self, args);\r
 \r
-                       return o.content;\r
+                       return args.content;\r
                },\r
 \r
                isDirty : function() {\r
-                       var t = this;\r
+                       var self = this;\r
 \r
-                       return tinymce.trim(t.startContent) != tinymce.trim(t.getContent({format : 'raw', no_events : 1})) && !t.isNotDirty;\r
+                       return tinymce.trim(self.startContent) != tinymce.trim(self.getContent({format : 'raw', no_events : 1})) && !self.isNotDirty;\r
                },\r
 \r
                getContainer : function() {\r
@@ -10651,16 +12619,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        each(lo, function(v, k) {\r
                                switch (k) {\r
                                        case 'contextmenu':\r
-                                               if (tinymce.isOpera) {\r
-                                                       // Fake contextmenu on Opera\r
-                                                       dom.bind(t.getBody(), 'mousedown', function(e) {\r
-                                                               if (e.ctrlKey) {\r
-                                                                       e.fakeType = 'contextmenu';\r
-                                                                       eventHandler(e);\r
-                                                               }\r
-                                                       });\r
-                                               } else\r
-                                                       dom.bind(t.getBody(), k, eventHandler);\r
+                                               dom.bind(t.getDoc(), k, eventHandler);\r
                                                break;\r
 \r
                                        case 'paste':\r
@@ -10692,7 +12651,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                                        e = e.target;\r
 \r
-                                       if (e.nodeType === 1 && e.nodeName === 'IMG' && (v = e.getAttribute('_mce_src')))\r
+                                       if (e.nodeType === 1 && e.nodeName === 'IMG' && (v = e.getAttribute('data-mce-src')))\r
                                                e.src = t.documentBaseURI.toAbsolute(v);\r
                                });\r
                        }\r
@@ -10703,14 +12662,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                        var t = this, d = t.getDoc(), s = t.settings;\r
 \r
                                        if (isGecko && !s.readonly) {\r
-                                               if (t._isHidden()) {\r
-                                                       try {\r
-                                                               if (!s.content_editable)\r
-                                                                       d.designMode = 'On';\r
-                                                       } catch (ex) {\r
-                                                               // Fails if it's hidden\r
-                                                       }\r
-                                               }\r
+                                               t._refreshContentEditable();\r
 \r
                                                try {\r
                                                        // Try new Gecko method\r
@@ -10733,20 +12685,20 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                t.onMouseDown.add(setOpts);\r
                        }\r
 \r
-                       // Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250\r
-                       // WebKit can't even do simple things like selecting an image\r
-                       // This also fixes so it's possible to select mceItemAnchors\r
-                       if (tinymce.isWebKit) {\r
-                               t.onClick.add(function(ed, e) {\r
-                                       e = e.target;\r
+                       t.onClick.add(function(ed, e) {\r
+                               e = e.target;\r
 \r
-                                       // Needs tobe the setBaseAndExtend or it will fail to select floated images\r
-                                       if (e.nodeName == 'IMG' || (e.nodeName == 'A' && dom.hasClass(e, 'mceItemAnchor'))) {\r
-                                               t.selection.getSel().setBaseAndExtent(e, 0, e, 1);\r
-                                               t.nodeChanged();\r
-                                       }\r
-                               });\r
-                       }\r
+                               // Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250\r
+                               // WebKit can't even do simple things like selecting an image\r
+                               // Needs tobe the setBaseAndExtend or it will fail to select floated images\r
+                               if (tinymce.isWebKit && e.nodeName == 'IMG')\r
+                                       t.selection.getSel().setBaseAndExtent(e, 0, e, 1);\r
+\r
+                               if (e.nodeName == 'A' && dom.hasClass(e, 'mceItemAnchor'))\r
+                                       t.selection.select(e);\r
+\r
+                               t.nodeChanged();\r
+                       });\r
 \r
                        // Add node change handlers\r
                        t.onMouseUp.add(t.nodeChanged);\r
@@ -10758,6 +12710,35 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                        t.nodeChanged();\r
                        });\r
 \r
+\r
+                       // Add block quote deletion handler\r
+                       t.onKeyDown.add(function(ed, e) {\r
+                               // Was the BACKSPACE key pressed?\r
+                               if (e.keyCode != 8)\r
+                                       return;\r
+\r
+                               var n = ed.selection.getRng().startContainer;\r
+                               var offset = ed.selection.getRng().startOffset;\r
+\r
+                               while (n && n.nodeType && n.nodeType != 1 && n.parentNode)\r
+                                       n = n.parentNode;\r
+                                       \r
+                               // Is the cursor at the beginning of a blockquote?\r
+                               if (n && n.parentNode && n.parentNode.tagName === 'BLOCKQUOTE' && n.parentNode.firstChild == n && offset == 0) {\r
+                                       // Remove the blockquote\r
+                                       ed.formatter.toggle('blockquote', null, n.parentNode);\r
+\r
+                                       // Move the caret to the beginning of n\r
+                                       var rng = ed.selection.getRng();\r
+                                       rng.setStart(n, 0);\r
+                                       rng.setEnd(n, 0);\r
+                                       ed.selection.setRng(rng);\r
+                                       ed.selection.collapse(false);\r
+                               }\r
+                       });\r
\r
+\r
+\r
                        // Add reset handler\r
                        t.onReset.add(function() {\r
                                t.setContent(t.startContent, {format : 'raw'});\r
@@ -10779,9 +12760,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                for (i=1; i<=6; i++)\r
                                        t.addShortcut('ctrl+' + i, '', ['FormatBlock', false, 'h' + i]);\r
 \r
-                               t.addShortcut('ctrl+7', '', ['FormatBlock', false, '<p>']);\r
-                               t.addShortcut('ctrl+8', '', ['FormatBlock', false, '<div>']);\r
-                               t.addShortcut('ctrl+9', '', ['FormatBlock', false, '<address>']);\r
+                               t.addShortcut('ctrl+7', '', ['FormatBlock', false, 'p']);\r
+                               t.addShortcut('ctrl+8', '', ['FormatBlock', false, 'div']);\r
+                               t.addShortcut('ctrl+9', '', ['FormatBlock', false, 'address']);\r
 \r
                                function find(e) {\r
                                        var v = null;\r
@@ -10877,27 +12858,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                                cb : cb\r
                                        };\r
                                });\r
-\r
-                               t.onKeyDown.add(function(ed, e) {\r
-                                       switch (e.keyCode) {\r
-                                               case 8:\r
-                                                       // Fix IE control + backspace browser bug\r
-                                                       if (t.selection.getRng().item) {\r
-                                                               ed.dom.remove(t.selection.getRng().item(0));\r
-                                                               return Event.cancel(e);\r
-                                                       }\r
-                                       }\r
-                               });\r
-\r
-                               /*if (t.dom.boxModel) {\r
-                                       t.getBody().style.height = '100%';\r
-\r
-                                       Event.add(t.getWin(), 'resize', function(e) {\r
-                                               var docElm = t.getDoc().documentElement;\r
-\r
-                                               docElm.style.height = (docElm.offsetHeight - 10) + 'px';\r
-                                       });\r
-                               }*/\r
                        }\r
 \r
                        if (tinymce.isOpera) {\r
@@ -10909,7 +12869,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        // Add custom undo/redo handlers\r
                        if (s.custom_undo_redo) {\r
                                function addUndo() {\r
-                                       t.undoManager.typing = 0;\r
+                                       t.undoManager.typing = false;\r
                                        t.undoManager.add();\r
                                };\r
 \r
@@ -10918,65 +12878,52 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                                addUndo();\r
                                });\r
 \r
+                               // Add undo level when contents is drag/dropped within the editor\r
+                               t.dom.bind(t.dom.getRoot(), 'dragend', function(e) {\r
+                                       addUndo();\r
+                               });\r
+\r
                                t.onKeyUp.add(function(ed, e) {\r
-                                       if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45 || e.ctrlKey)\r
+                                       var keyCode = e.keyCode;\r
+\r
+                                       if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 13 || keyCode == 45 || e.ctrlKey)\r
                                                addUndo();\r
                                });\r
 \r
                                t.onKeyDown.add(function(ed, e) {\r
-                                       var rng, parent, bookmark;\r
-\r
-                                       // IE has a really odd bug where the DOM might include an node that doesn't have\r
-                                       // a proper structure. If you try to access nodeValue it would throw an illegal value exception.\r
-                                       // This seems to only happen when you delete contents and it seems to be avoidable if you refresh the element\r
-                                       // after you delete contents from it. See: #3008923\r
-                                       if (isIE && e.keyCode == 46) {\r
-                                               rng = t.selection.getRng();\r
-\r
-                                               if (rng.parentElement) {\r
-                                                       parent = rng.parentElement();\r
-\r
-                                                       // Select next word when ctrl key is used in combo with delete\r
-                                                       if (e.ctrlKey) {\r
-                                                               rng.moveEnd('word', 1);\r
-                                                               rng.select();\r
-                                                       }\r
-\r
-                                                       // Delete contents\r
-                                                       t.selection.getSel().clear();\r
+                                       var keyCode = e.keyCode, sel;\r
 \r
-                                                       // Check if we are within the same parent\r
-                                                       if (rng.parentElement() == parent) {\r
-                                                               bookmark = t.selection.getBookmark();\r
+                                       if (keyCode == 8) {\r
+                                               sel = t.getDoc().selection;\r
 \r
-                                                               try {\r
-                                                                       // Update the HTML and hopefully it will remove the artifacts\r
-                                                                       parent.innerHTML = parent.innerHTML;\r
-                                                               } catch (ex) {\r
-                                                                       // And since it's IE it can sometimes produce an unknown runtime error\r
-                                                               }\r
-\r
-                                                               // Restore the caret position\r
-                                                               t.selection.moveToBookmark(bookmark);\r
-                                                       }\r
+                                               // Fix IE control + backspace browser bug\r
+                                               if (sel && sel.createRange && sel.createRange().item) {\r
+                                                       t.undoManager.beforeChange();\r
+                                                       ed.dom.remove(sel.createRange().item(0));\r
+                                                       addUndo();\r
 \r
-                                                       // Block the default delete behavior since it might be broken\r
-                                                       e.preventDefault();\r
-                                                       return;\r
+                                                       return Event.cancel(e);\r
                                                }\r
                                        }\r
 \r
-                                       // Is caracter positon keys\r
-                                       if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45) {\r
+                                       // Is caracter positon keys left,right,up,down,home,end,pgdown,pgup,enter\r
+                                       if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 13 || keyCode == 45) {\r
+                                               // Add position before enter key is pressed, used by IE since it still uses the default browser behavior\r
+                                               // Todo: Remove this once we normalize enter behavior on IE\r
+                                               if (tinymce.isIE && keyCode == 13)\r
+                                                       t.undoManager.beforeChange();\r
+\r
                                                if (t.undoManager.typing)\r
                                                        addUndo();\r
 \r
                                                return;\r
                                        }\r
 \r
-                                       if (!t.undoManager.typing) {\r
+                                       // If key isn't shift,ctrl,alt,capslock,metakey\r
+                                       if ((keyCode < 16 || keyCode > 20) && keyCode != 224 && keyCode != 91 && !t.undoManager.typing) {\r
+                                               t.undoManager.beforeChange();\r
+                                               t.undoManager.typing = true;\r
                                                t.undoManager.add();\r
-                                               t.undoManager.typing = 1;\r
                                        }\r
                                });\r
 \r
@@ -10985,68 +12932,98 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                                addUndo();\r
                                });\r
                        }\r
-               },\r
 \r
-               _isHidden : function() {\r
-                       var s;\r
-\r
-                       if (!isGecko)\r
-                               return 0;\r
+                       // Fire a nodeChanged when the selection is changed on WebKit this fixes selection issues on iOS5\r
+                       // It only fires the nodeChange event every 50ms since it would other wise update the UI when you type and it hogs the CPU\r
+                       if (tinymce.isWebKit) {\r
+                               dom.bind(t.getDoc(), 'selectionchange', function() {\r
+                                       if (t.selectionTimer) {\r
+                                               clearTimeout(t.selectionTimer);\r
+                                               t.selectionTimer = 0;\r
+                                       }\r
 \r
-                       // Weird, wheres that cursor selection?\r
-                       s = this.selection.getSel();\r
-                       return (!s || !s.rangeCount || s.rangeCount == 0);\r
-               },\r
+                                       t.selectionTimer = window.setTimeout(function() {\r
+                                               t.nodeChanged();\r
+                                       }, 50);\r
+                               });\r
+                       }\r
 \r
-               // Fix for bug #1867292\r
-               _fixNesting : function(s) {\r
-                       var d = [], i;\r
+                       // Bug fix for FireFox keeping styles from end of selection instead of start.\r
+                       if (tinymce.isGecko) {\r
+                               function getAttributeApplyFunction() {\r
+                                       var template = t.dom.getAttribs(t.selection.getStart().cloneNode(false));\r
 \r
-                       s = s.replace(/<(\/)?([^\s>]+)[^>]*?>/g, function(a, b, c) {\r
-                               var e;\r
+                                       return function() {\r
+                                               var target = t.selection.getStart();\r
 \r
-                               // Handle end element\r
-                               if (b === '/') {\r
-                                       if (!d.length)\r
-                                               return '';\r
+                                               if (target !== t.getBody()) {\r
+                                                       t.dom.removeAllAttribs(target);\r
 \r
-                                       if (c !== d[d.length - 1].tag) {\r
-                                               for (i=d.length - 1; i>=0; i--) {\r
-                                                       if (d[i].tag === c) {\r
-                                                               d[i].close = 1;\r
-                                                               break;\r
-                                                       }\r
+                                                       each(template, function(attr) {\r
+                                                               target.setAttributeNode(attr.cloneNode(true));\r
+                                                       });\r
                                                }\r
+                                       };\r
+                               }\r
 \r
-                                               return '';\r
-                                       } else {\r
-                                               d.pop();\r
+                               function isSelectionAcrossElements() {\r
+                                       var s = t.selection;\r
 \r
-                                               if (d.length && d[d.length - 1].close) {\r
-                                                       a = a + '</' + d[d.length - 1].tag + '>';\r
-                                                       d.pop();\r
-                                               }\r
+                                       return !s.isCollapsed() && s.getStart() != s.getEnd();\r
+                               }\r
+\r
+                               t.onKeyPress.add(function(ed, e) {\r
+                                       var applyAttributes;\r
+\r
+                                       if ((e.keyCode == 8 || e.keyCode == 46) && isSelectionAcrossElements()) {\r
+                                               applyAttributes = getAttributeApplyFunction();\r
+                                               t.getDoc().execCommand('delete', false, null);\r
+                                               applyAttributes();\r
+\r
+                                               return Event.cancel(e);\r
                                        }\r
-                               } else {\r
-                                       // Ignore these\r
-                                       if (/^(br|hr|input|meta|img|link|param)$/i.test(c))\r
-                                               return a;\r
+                               });\r
 \r
-                                       // Ignore closed ones\r
-                                       if (/\/>$/.test(a))\r
-                                               return a;\r
+                               t.dom.bind(t.getDoc(), 'cut', function(e) {\r
+                                       var applyAttributes;\r
 \r
-                                       d.push({tag : c}); // Push start element\r
-                               }\r
+                                       if (isSelectionAcrossElements()) {\r
+                                               applyAttributes = getAttributeApplyFunction();\r
+                                               t.onKeyUp.addToTop(Event.cancel, Event);\r
 \r
-                               return a;\r
-                       });\r
+                                               setTimeout(function() {\r
+                                                       applyAttributes();\r
+                                                       t.onKeyUp.remove(Event.cancel, Event);\r
+                                               }, 0);\r
+                                       }\r
+                               });\r
+                       }\r
+               },\r
 \r
-                       // End all open tags\r
-                       for (i=d.length - 1; i>=0; i--)\r
-                               s += '</' + d[i].tag + '>';\r
+               _refreshContentEditable : function() {\r
+                       var self = this, body, parent;\r
 \r
-                       return s;\r
+                       // Check if the editor was hidden and the re-initalize contentEditable mode by removing and adding the body again\r
+                       if (self._isHidden()) {\r
+                               body = self.getBody();\r
+                               parent = body.parentNode;\r
+\r
+                               parent.removeChild(body);\r
+                               parent.appendChild(body);\r
+\r
+                               body.focus();\r
+                       }\r
+               },\r
+\r
+               _isHidden : function() {\r
+                       var s;\r
+\r
+                       if (!isGecko)\r
+                               return 0;\r
+\r
+                       // Weird, wheres that cursor selection?\r
+                       s = this.selection.getSel();\r
+                       return (!s || !s.rangeCount || s.rangeCount == 0);\r
                }\r
        });\r
 })(tinymce);\r
@@ -11060,6 +13037,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        selection = editor.selection,\r
                        commands = {state: {}, exec : {}, value : {}},\r
                        settings = editor.settings,\r
+                       formatter = editor.formatter,\r
                        bookmark;\r
 \r
                function execCommand(command, ui, value) {\r
@@ -11125,11 +13103,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                };\r
 \r
                function isFormatMatch(name) {\r
-                       return editor.formatter.match(name);\r
+                       return formatter.match(name);\r
                };\r
 \r
                function toggleFormat(name, value) {\r
-                       editor.formatter.toggle(name, value ? {value : value} : undefined);\r
+                       formatter.toggle(name, value ? {value : value} : undefined);\r
                };\r
 \r
                function storeSelection(type) {\r
@@ -11189,10 +13167,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                // Remove all other alignments first\r
                                each('left,center,right,full'.split(','), function(name) {\r
                                        if (align != name)\r
-                                               editor.formatter.remove('align' + name);\r
+                                               formatter.remove('align' + name);\r
                                });\r
 \r
                                toggleFormat('align' + align);\r
+                               execCommand('mceRepaint');\r
                        },\r
 \r
                        // Override list commands to fix WebKit bug\r
@@ -11218,7 +13197,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        },\r
 \r
                        // Override commands to use the text formatter engine\r
-                       'Bold,Italic,Underline,Strikethrough' : function(command) {\r
+                       'Bold,Italic,Underline,Strikethrough,Superscript,Subscript' : function(command) {\r
                                toggleFormat(command);\r
                        },\r
 \r
@@ -11245,7 +13224,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        },\r
 \r
                        RemoveFormat : function(command) {\r
-                               editor.formatter.remove(command);\r
+                               formatter.remove(command);\r
                        },\r
 \r
                        mceBlockQuote : function(command) {\r
@@ -11291,7 +13270,133 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        },\r
 \r
                        mceInsertContent : function(command, ui, value) {\r
-                               selection.setContent(value);\r
+                               var parser, serializer, parentNode, rootNode, fragment, args,\r
+                                       marker, nodeRect, viewPortRect, rng, node, node2, bookmarkHtml, viewportBodyElement;\r
+\r
+                               // Setup parser and serializer\r
+                               parser = editor.parser;\r
+                               serializer = new tinymce.html.Serializer({}, editor.schema);\r
+                               bookmarkHtml = '<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';\r
+\r
+                               // Run beforeSetContent handlers on the HTML to be inserted\r
+                               args = {content: value, format: 'html'};\r
+                               selection.onBeforeSetContent.dispatch(selection, args);\r
+                               value = args.content;\r
+\r
+                               // Add caret at end of contents if it's missing\r
+                               if (value.indexOf('{$caret}') == -1)\r
+                                       value += '{$caret}';\r
+\r
+                               // Replace the caret marker with a span bookmark element\r
+                               value = value.replace(/\{\$caret\}/, bookmarkHtml);\r
+\r
+                               // Insert node maker where we will insert the new HTML and get it's parent\r
+                               if (!selection.isCollapsed())\r
+                                       editor.getDoc().execCommand('Delete', false, null);\r
+\r
+                               parentNode = selection.getNode();\r
+\r
+                               // Parse the fragment within the context of the parent node\r
+                               args = {context : parentNode.nodeName.toLowerCase()};\r
+                               fragment = parser.parse(value, args);\r
+\r
+                               // Move the caret to a more suitable location\r
+                               node = fragment.lastChild;\r
+                               if (node.attr('id') == 'mce_marker') {\r
+                                       marker = node;\r
+\r
+                                       for (node = node.prev; node; node = node.walk(true)) {\r
+                                               if (node.type == 3 || !dom.isBlock(node.name)) {\r
+                                                       node.parent.insert(marker, node, node.name === 'br');\r
+                                                       break;\r
+                                               }\r
+                                       }\r
+                               }\r
+\r
+                               // If parser says valid we can insert the contents into that parent\r
+                               if (!args.invalid) {\r
+                                       value = serializer.serialize(fragment);\r
+\r
+                                       // Check if parent is empty or only has one BR element then set the innerHTML of that parent\r
+                                       node = parentNode.firstChild;\r
+                                       node2 = parentNode.lastChild;\r
+                                       if (!node || (node === node2 && node.nodeName === 'BR'))\r
+                                               dom.setHTML(parentNode, value);\r
+                                       else\r
+                                               selection.setContent(value);\r
+                               } else {\r
+                                       // If the fragment was invalid within that context then we need\r
+                                       // to parse and process the parent it's inserted into\r
+\r
+                                       // Insert bookmark node and get the parent\r
+                                       selection.setContent(bookmarkHtml);\r
+                                       parentNode = editor.selection.getNode();\r
+                                       rootNode = editor.getBody();\r
+\r
+                                       // Opera will return the document node when selection is in root\r
+                                       if (parentNode.nodeType == 9)\r
+                                               parentNode = node = rootNode;\r
+                                       else\r
+                                               node = parentNode;\r
+\r
+                                       // Find the ancestor just before the root element\r
+                                       while (node !== rootNode) {\r
+                                               parentNode = node;\r
+                                               node = node.parentNode;\r
+                                       }\r
+\r
+                                       // Get the outer/inner HTML depending on if we are in the root and parser and serialize that\r
+                                       value = parentNode == rootNode ? rootNode.innerHTML : dom.getOuterHTML(parentNode);\r
+                                       value = serializer.serialize(\r
+                                               parser.parse(\r
+                                                       // Need to replace by using a function since $ in the contents would otherwise be a problem\r
+                                                       value.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i, function() {\r
+                                                               return serializer.serialize(fragment);\r
+                                                       })\r
+                                               )\r
+                                       );\r
+\r
+                                       // Set the inner/outer HTML depending on if we are in the root or not\r
+                                       if (parentNode == rootNode)\r
+                                               dom.setHTML(rootNode, value);\r
+                                       else\r
+                                               dom.setOuterHTML(parentNode, value);\r
+                               }\r
+\r
+                               marker = dom.get('mce_marker');\r
+\r
+                               // Scroll range into view scrollIntoView on element can't be used since it will scroll the main view port as well\r
+                               nodeRect = dom.getRect(marker);\r
+                               viewPortRect = dom.getViewPort(editor.getWin());\r
+\r
+                               // Check if node is out side the viewport if it is then scroll to it\r
+                               if ((nodeRect.y + nodeRect.h > viewPortRect.y + viewPortRect.h || nodeRect.y < viewPortRect.y) ||\r
+                                       (nodeRect.x > viewPortRect.x + viewPortRect.w || nodeRect.x < viewPortRect.x)) {\r
+                                       viewportBodyElement = tinymce.isIE ? editor.getDoc().documentElement : editor.getBody();\r
+                                       viewportBodyElement.scrollLeft = nodeRect.x;\r
+                                       viewportBodyElement.scrollTop = nodeRect.y - viewPortRect.h + 25;\r
+                               }\r
+\r
+                               // Move selection before marker and remove it\r
+                               rng = dom.createRng();\r
+\r
+                               // If previous sibling is a text node set the selection to the end of that node\r
+                               node = marker.previousSibling;\r
+                               if (node && node.nodeType == 3) {\r
+                                       rng.setStart(node, node.nodeValue.length);\r
+                               } else {\r
+                                       // If the previous sibling isn't a text node or doesn't exist set the selection before the marker node\r
+                                       rng.setStartBefore(marker);\r
+                                       rng.setEndBefore(marker);\r
+                               }\r
+\r
+                               // Remove the marker node and set the new range\r
+                               dom.remove(marker);\r
+                               selection.setRng(rng);\r
+\r
+                               // Dispatch after event and add any visual elements needed\r
+                               selection.onSetContent.dispatch(selection, args);\r
+                               editor.addVisual();\r
                        },\r
 \r
                        mceInsertRawHTML : function(command, ui, value) {\r
@@ -11342,11 +13447,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        },\r
 \r
                        mceToggleFormat : function(command, ui, value) {\r
-                               editor.formatter.toggle(value);\r
+                               formatter.toggle(value);\r
                        },\r
 \r
                        InsertHorizontalRule : function() {\r
-                               selection.setContent('<hr />');\r
+                               editor.execCommand('mceInsertContent', false, '<hr />');\r
                        },\r
 \r
                        mceToggleVisualAid : function() {\r
@@ -11355,28 +13460,31 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        },\r
 \r
                        mceReplaceContent : function(command, ui, value) {\r
-                               selection.setContent(value.replace(/\{\$selection\}/g, selection.getContent({format : 'text'})));\r
+                               editor.execCommand('mceInsertContent', false, value.replace(/\{\$selection\}/g, selection.getContent({format : 'text'})));\r
                        },\r
 \r
                        mceInsertLink : function(command, ui, value) {\r
-                               var link = dom.getParent(selection.getNode(), 'a');\r
+                               var anchor;\r
 \r
-                               if (tinymce.is(value, 'string'))\r
+                               if (typeof(value) == 'string')\r
                                        value = {href : value};\r
 \r
-                               if (!link) {\r
-                                       execNativeCommand('CreateLink', FALSE, 'javascript:mctmp(0);');\r
-                                       each(dom.select('a[href=javascript:mctmp(0);]'), function(link) {\r
-                                               dom.setAttribs(link, value);\r
-                                       });\r
-                               } else {\r
-                                       if (value.href)\r
-                                               dom.setAttribs(link, value);\r
-                                       else\r
-                                               editor.dom.remove(link, TRUE);\r
+                               anchor = dom.getParent(selection.getNode(), 'a');\r
+\r
+                               // Spaces are never valid in URLs and it's a very common mistake for people to make so we fix it here.\r
+                               value.href = value.href.replace(' ', '%20');\r
+\r
+                               // Remove existing links if there could be child links or that the href isn't specified\r
+                               if (!anchor || !value.href) {\r
+                                       formatter.remove('link');\r
+                               }               \r
+\r
+                               // Apply new link to selection\r
+                               if (value.href) {\r
+                                       formatter.apply('link', value, anchor);\r
                                }\r
                        },\r
-                       \r
+\r
                        selectAll : function() {\r
                                var root = dom.getRoot(), rng = dom.createRng();\r
 \r
@@ -11394,7 +13502,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                return isFormatMatch('align' + command.substring(7));\r
                        },\r
 \r
-                       'Bold,Italic,Underline,Strikethrough' : function(command) {\r
+                       'Bold,Italic,Underline,Strikethrough,Superscript,Subscript' : function(command) {\r
                                return isFormatMatch(command);\r
                        },\r
 \r
@@ -11451,23 +13559,30 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                }\r
        };\r
 })(tinymce);\r
+\r
 (function(tinymce) {\r
        var Dispatcher = tinymce.util.Dispatcher;\r
 \r
        tinymce.UndoManager = function(editor) {\r
-               var self, index = 0, data = [];\r
+               var self, index = 0, data = [], beforeBookmark;\r
 \r
                function getContent() {\r
                        return tinymce.trim(editor.getContent({format : 'raw', no_events : 1}));\r
                };\r
 \r
                return self = {\r
-                       typing : 0,\r
+                       typing : false,\r
 \r
                        onAdd : new Dispatcher(self),\r
+\r
                        onUndo : new Dispatcher(self),\r
+\r
                        onRedo : new Dispatcher(self),\r
 \r
+                       beforeChange : function() {\r
+                               beforeBookmark = editor.selection.getBookmark(2, true);\r
+                       },\r
+\r
                        add : function(level) {\r
                                var i, settings = editor.settings, lastLevel;\r
 \r
@@ -11476,10 +13591,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                                // Add undo level if needed\r
                                lastLevel = data[index];\r
-                               if (lastLevel && lastLevel.content == level.content) {\r
-                                       if (index > 0 || data.length == 1)\r
-                                               return null;\r
-                               }\r
+                               if (lastLevel && lastLevel.content == level.content)\r
+                                       return null;\r
+\r
+                               // Set before bookmark on previous level\r
+                               if (data[index])\r
+                                       data[index].beforeBookmark = beforeBookmark;\r
 \r
                                // Time to compress\r
                                if (settings.custom_undo_redo_levels) {\r
@@ -11496,13 +13613,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                level.bookmark = editor.selection.getBookmark(2, true);\r
 \r
                                // Crop array if needed\r
-                               if (index < data.length - 1) {\r
-                                       // Treat first level as initial\r
-                                       if (index == 0)\r
-                                               data = [];\r
-                                       else\r
-                                               data.length = index + 1;\r
-                               }\r
+                               if (index < data.length - 1)\r
+                                       data.length = index + 1;\r
 \r
                                data.push(level);\r
                                index = data.length - 1;\r
@@ -11518,14 +13630,14 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                                if (self.typing) {\r
                                        self.add();\r
-                                       self.typing = 0;\r
+                                       self.typing = false;\r
                                }\r
 \r
                                if (index > 0) {\r
                                        level = data[--index];\r
 \r
                                        editor.setContent(level.content, {format : 'raw'});\r
-                                       editor.selection.moveToBookmark(level.bookmark);\r
+                                       editor.selection.moveToBookmark(level.beforeBookmark);\r
 \r
                                        self.onUndo.dispatch(self, level);\r
                                }\r
@@ -11550,15 +13662,16 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                        clear : function() {\r
                                data = [];\r
-                               index = self.typing = 0;\r
+                               index = 0;\r
+                               self.typing = false;\r
                        },\r
 \r
                        hasUndo : function() {\r
-                               return index > 0 || self.typing;\r
+                               return index > 0 || this.typing;\r
                        },\r
 \r
                        hasRedo : function() {\r
-                               return index < data.length - 1;\r
+                               return index < data.length - 1 && !this.typing;\r
                        }\r
                };\r
        };\r
@@ -11607,24 +13720,15 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                return rng2.cloneContents().textContent.length == 0;\r
        };\r
 \r
-       function isEmpty(n) {\r
-               n = n.innerHTML;\r
-\r
-               n = n.replace(/<(img|hr|table|input|select|textarea)[ \>]/gi, '-'); // Keep these convert them to - chars\r
-               n = n.replace(/<[^>]+>/g, ''); // Remove all tags\r
-\r
-               return n.replace(/[ \u00a0\t\r\n]+/g, '') == '';\r
-       };\r
-\r
        function splitList(selection, dom, li) {\r
                var listBlock, block;\r
 \r
-               if (isEmpty(li)) {\r
+               if (dom.isEmpty(li)) {\r
                        listBlock = dom.getParent(li, 'ul,ol');\r
 \r
                        if (!dom.getParent(listBlock.parentNode, 'ul,ol')) {\r
                                dom.split(listBlock, li);\r
-                               block = dom.create('p', 0, '<br _mce_bogus="1" />');\r
+                               block = dom.create('p', 0, '<br data-mce-bogus="1" />');\r
                                dom.replace(block, li);\r
                                selection.select(block, 1);\r
                        }\r
@@ -11645,45 +13749,94 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        s.element = elm.toUpperCase();\r
 \r
                        ed.onPreInit.add(t.setup, t);\r
+               },\r
+\r
+               setup : function() {\r
+                       var t = this, ed = t.editor, s = ed.settings, dom = ed.dom, selection = ed.selection, blockElements = ed.schema.getBlockElements();\r
 \r
-                       t.reOpera = new RegExp('(\\u00a0|&#160;|&nbsp;)<\/' + elm + '>', 'gi');\r
-                       t.rePadd = new RegExp('<p( )([^>]+)><\\\/p>|<p( )([^>]+)\\\/>|<p( )([^>]+)>\\s+<\\\/p>|<p><\\\/p>|<p\\\/>|<p>\\s+<\\\/p>'.replace(/p/g, elm), 'gi');\r
-                       t.reNbsp2BR1 = new RegExp('<p( )([^>]+)>[\\s\\u00a0]+<\\\/p>|<p>[\\s\\u00a0]+<\\\/p>'.replace(/p/g, elm), 'gi');\r
-                       t.reNbsp2BR2 = new RegExp('<%p()([^>]+)>(&nbsp;|&#160;)<\\\/%p>|<%p>(&nbsp;|&#160;)<\\\/%p>'.replace(/%p/g, elm), 'gi');\r
-                       t.reBR2Nbsp = new RegExp('<p( )([^>]+)>\\s*<br \\\/>\\s*<\\\/p>|<p>\\s*<br \\\/>\\s*<\\\/p>'.replace(/p/g, elm), 'gi');\r
+                       // Force root blocks\r
+                       if (s.forced_root_block) {\r
+                               function addRootBlocks() {\r
+                                       var node = selection.getStart(), rootNode = ed.getBody(), rng, startContainer, startOffset, endContainer, endOffset, rootBlockNode, tempNode, offset = -0xFFFFFF;\r
 \r
-                       function padd(ed, o) {\r
-                               if (isOpera)\r
-                                       o.content = o.content.replace(t.reOpera, '</' + elm + '>');\r
+                                       if (!node || node.nodeType !== 1)\r
+                                               return;\r
 \r
-                               o.content = tinymce._replace(t.rePadd, '<' + elm + '$1$2$3$4$5$6>\u00a0</' + elm + '>', o.content);\r
+                                       // Check if node is wrapped in block\r
+                                       while (node != rootNode) {\r
+                                               if (blockElements[node.nodeName])\r
+                                                       return;\r
 \r
-                               if (!isIE && !isOpera && o.set) {\r
-                                       // Use &nbsp; instead of BR in padded paragraphs\r
-                                       o.content = o.content.replace(t.reNbsp2BR1, '<' + elm + '$1$2><br /></' + elm + '>');\r
-                                       o.content = o.content.replace(t.reNbsp2BR2, '<' + elm + '$1$2><br /></' + elm + '>');\r
-                               } else\r
-                                       o.content = tinymce._replace(t.reBR2Nbsp, '<' + elm + '$1$2>\u00a0</' + elm + '>', o.content);\r
-                       };\r
+                                               node = node.parentNode;\r
+                                       }\r
 \r
-                       ed.onBeforeSetContent.add(padd);\r
-                       ed.onPostProcess.add(padd);\r
+                                       // Get current selection\r
+                                       rng = selection.getRng();\r
+                                       if (rng.setStart) {\r
+                                               startContainer = rng.startContainer;\r
+                                               startOffset = rng.startOffset;\r
+                                               endContainer = rng.endContainer;\r
+                                               endOffset = rng.endOffset;\r
+                                       } else {\r
+                                               // Force control range into text range\r
+                                               if (rng.item) {\r
+                                                       rng = ed.getDoc().body.createTextRange();\r
+                                                       rng.moveToElementText(rng.item(0));\r
+                                               }\r
 \r
-                       if (s.forced_root_block) {\r
-                               ed.onInit.add(t.forceRoots, t);\r
-                               ed.onSetContent.add(t.forceRoots, t);\r
-                               ed.onBeforeGetContent.add(t.forceRoots, t);\r
-                       }\r
-               },\r
+                                               tmpRng = rng.duplicate();\r
+                                               tmpRng.collapse(true);\r
+                                               startOffset = tmpRng.move('character', offset) * -1;\r
 \r
-               setup : function() {\r
-                       var t = this, ed = t.editor, s = ed.settings, dom = ed.dom, selection = ed.selection;\r
+                                               if (!tmpRng.collapsed) {\r
+                                                       tmpRng = rng.duplicate();\r
+                                                       tmpRng.collapse(false);\r
+                                                       endOffset = (tmpRng.move('character', offset) * -1) - startOffset;\r
+                                               }\r
+                                       }\r
 \r
-                       // Force root blocks when typing and when getting output\r
-                       if (s.forced_root_block) {\r
-                               ed.onBeforeExecCommand.add(t.forceRoots, t);\r
-                               ed.onKeyUp.add(t.forceRoots, t);\r
-                               ed.onPreProcess.add(t.forceRoots, t);\r
+                                       // Wrap non block elements and text nodes\r
+                                       for (node = rootNode.firstChild; node; node) {\r
+                                               if (node.nodeType === 3 || (node.nodeType == 1 && !blockElements[node.nodeName])) {\r
+                                                       if (!rootBlockNode) {\r
+                                                               rootBlockNode = dom.create(s.forced_root_block);\r
+                                                               node.parentNode.insertBefore(rootBlockNode, node);\r
+                                                       }\r
+\r
+                                                       tempNode = node;\r
+                                                       node = node.nextSibling;\r
+                                                       rootBlockNode.appendChild(tempNode);\r
+                                               } else {\r
+                                                       rootBlockNode = null;\r
+                                                       node = node.nextSibling;\r
+                                               }\r
+                                       }\r
+\r
+                                       if (rng.setStart) {\r
+                                               rng.setStart(startContainer, startOffset);\r
+                                               rng.setEnd(endContainer, endOffset);\r
+                                               selection.setRng(rng);\r
+                                       } else {\r
+                                               try {\r
+                                                       rng = ed.getDoc().body.createTextRange();\r
+                                                       rng.moveToElementText(rootNode);\r
+                                                       rng.collapse(true);\r
+                                                       rng.moveStart('character', startOffset);\r
+\r
+                                                       if (endOffset > 0)\r
+                                                               rng.moveEnd('character', endOffset);\r
+\r
+                                                       rng.select();\r
+                                               } catch (ex) {\r
+                                                       // Ignore\r
+                                               }\r
+                                       }\r
+\r
+                                       ed.nodeChanged();\r
+                               };\r
+\r
+                               ed.onKeyUp.add(addRootBlocks);\r
+                               ed.onClick.add(addRootBlocks);\r
                        }\r
 \r
                        if (s.force_br_newlines) {\r
@@ -11746,6 +13899,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                                                                parent.innerHTML = '\uFEFF';\r
 \r
                                                                        selection.select(parent, 1);\r
+                                                                       selection.collapse(true);\r
                                                                        ed.getDoc().execCommand('Delete', false, null);\r
                                                                        t._previousFormats = 0;\r
                                                                }\r
@@ -11800,21 +13954,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                });\r
                        }\r
 \r
-                       // Padd empty inline elements within block elements\r
-                       // For example: <p><strong><em></em></strong></p> becomes <p><strong><em>&nbsp;</em></strong></p>\r
-                       ed.onPreProcess.add(function(ed, o) {\r
-                               each(dom.select('p,h1,h2,h3,h4,h5,h6,div', o.node), function(p) {\r
-                                       if (isEmpty(p)) {\r
-                                               each(dom.select('span,em,strong,b,i', o.node), function(n) {\r
-                                                       if (!n.hasChildNodes()) {\r
-                                                               n.appendChild(ed.getDoc().createTextNode('\u00a0'));\r
-                                                               return FALSE; // Break the loop one padding is enough\r
-                                                       }\r
-                                               });\r
-                                       }\r
-                               });\r
-                       });\r
-\r
                        // IE specific fixes\r
                        if (isIE) {\r
                                // Replaces IE:s auto generated paragraphs with the specified element name\r
@@ -11844,155 +13983,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        }\r
                },\r
 \r
-               find : function(n, t, s) {\r
-                       var ed = this.editor, w = ed.getDoc().createTreeWalker(n, 4, null, FALSE), c = -1;\r
-\r
-                       while (n = w.nextNode()) {\r
-                               c++;\r
-\r
-                               // Index by node\r
-                               if (t == 0 && n == s)\r
-                                       return c;\r
-\r
-                               // Node by index\r
-                               if (t == 1 && c == s)\r
-                                       return n;\r
-                       }\r
-\r
-                       return -1;\r
-               },\r
-\r
-               forceRoots : function(ed, e) {\r
-                       var t = this, ed = t.editor, b = ed.getBody(), d = ed.getDoc(), se = ed.selection, s = se.getSel(), r = se.getRng(), si = -2, ei, so, eo, tr, c = -0xFFFFFF;\r
-                       var nx, bl, bp, sp, le, nl = b.childNodes, i, n, eid;\r
-\r
-                       // Fix for bug #1863847\r
-                       //if (e && e.keyCode == 13)\r
-                       //      return TRUE;\r
-\r
-                       // Wrap non blocks into blocks\r
-                       for (i = nl.length - 1; i >= 0; i--) {\r
-                               nx = nl[i];\r
-\r
-                               // Ignore internal elements\r
-                               if (nx.nodeType === 1 && nx.getAttribute('_mce_type')) {\r
-                                       bl = null;\r
-                                       continue;\r
-                               }\r
-\r
-                               // Is text or non block element\r
-                               if (nx.nodeType === 3 || (!t.dom.isBlock(nx) && nx.nodeType !== 8 && !/^(script|mce:script|style|mce:style)$/i.test(nx.nodeName))) {\r
-                                       if (!bl) {\r
-                                               // Create new block but ignore whitespace\r
-                                               if (nx.nodeType != 3 || /[^\s]/g.test(nx.nodeValue)) {\r
-                                                       // Store selection\r
-                                                       if (si == -2 && r) {\r
-                                                               if (!isIE || r.setStart) {\r
-                                                                       // If selection is element then mark it\r
-                                                                       if (r.startContainer.nodeType == 1 && (n = r.startContainer.childNodes[r.startOffset]) && n.nodeType == 1) {\r
-                                                                               // Save the id of the selected element\r
-                                                                               eid = n.getAttribute("id");\r
-                                                                               n.setAttribute("id", "__mce");\r
-                                                                       } else {\r
-                                                                               // If element is inside body, might not be the case in contentEdiable mode\r
-                                                                               if (ed.dom.getParent(r.startContainer, function(e) {return e === b;})) {\r
-                                                                                       so = r.startOffset;\r
-                                                                                       eo = r.endOffset;\r
-                                                                                       si = t.find(b, 0, r.startContainer);\r
-                                                                                       ei = t.find(b, 0, r.endContainer);\r
-                                                                               }\r
-                                                                       }\r
-                                                               } else {\r
-                                                                       // Force control range into text range\r
-                                                                       if (r.item) {\r
-                                                                               tr = d.body.createTextRange();\r
-                                                                               tr.moveToElementText(r.item(0));\r
-                                                                               r = tr;\r
-                                                                       }\r
-\r
-                                                                       tr = d.body.createTextRange();\r
-                                                                       tr.moveToElementText(b);\r
-                                                                       tr.collapse(1);\r
-                                                                       bp = tr.move('character', c) * -1;\r
-\r
-                                                                       tr = r.duplicate();\r
-                                                                       tr.collapse(1);\r
-                                                                       sp = tr.move('character', c) * -1;\r
-\r
-                                                                       tr = r.duplicate();\r
-                                                                       tr.collapse(0);\r
-                                                                       le = (tr.move('character', c) * -1) - sp;\r
-\r
-                                                                       si = sp - bp;\r
-                                                                       ei = le;\r
-                                                               }\r
-                                                       }\r
-\r
-                                                       // Uses replaceChild instead of cloneNode since it removes selected attribute from option elements on IE\r
-                                                       // See: http://support.microsoft.com/kb/829907\r
-                                                       bl = ed.dom.create(ed.settings.forced_root_block);\r
-                                                       nx.parentNode.replaceChild(bl, nx);\r
-                                                       bl.appendChild(nx);\r
-                                               }\r
-                                       } else {\r
-                                               if (bl.hasChildNodes())\r
-                                                       bl.insertBefore(nx, bl.firstChild);\r
-                                               else\r
-                                                       bl.appendChild(nx);\r
-                                       }\r
-                               } else\r
-                                       bl = null; // Time to create new block\r
-                       }\r
-\r
-                       // Restore selection\r
-                       if (si != -2) {\r
-                               if (!isIE || r.setStart) {\r
-                                       bl = b.getElementsByTagName(ed.settings.element)[0];\r
-                                       r = d.createRange();\r
-\r
-                                       // Select last location or generated block\r
-                                       if (si != -1)\r
-                                               r.setStart(t.find(b, 1, si), so);\r
-                                       else\r
-                                               r.setStart(bl, 0);\r
-\r
-                                       // Select last location or generated block\r
-                                       if (ei != -1)\r
-                                               r.setEnd(t.find(b, 1, ei), eo);\r
-                                       else\r
-                                               r.setEnd(bl, 0);\r
-\r
-                                       if (s) {\r
-                                               s.removeAllRanges();\r
-                                               s.addRange(r);\r
-                                       }\r
-                               } else {\r
-                                       try {\r
-                                               r = s.createRange();\r
-                                               r.moveToElementText(b);\r
-                                               r.collapse(1);\r
-                                               r.moveStart('character', si);\r
-                                               r.moveEnd('character', ei);\r
-                                               r.select();\r
-                                       } catch (ex) {\r
-                                               // Ignore\r
-                                       }\r
-                               }\r
-                       } else if ((!isIE || r.setStart) && (n = ed.dom.get('__mce'))) {\r
-                               // Restore the id of the selected element\r
-                               if (eid)\r
-                                       n.setAttribute('id', eid);\r
-                               else\r
-                                       n.removeAttribute('id');\r
-\r
-                               // Move caret before selected element\r
-                               r = d.createRange();\r
-                               r.setStartBefore(n);\r
-                               r.setEndBefore(n);\r
-                               se.setRng(r);\r
-                       }\r
-               },\r
-\r
                getParentBlock : function(n) {\r
                        var d = this.dom;\r
 \r
@@ -12003,6 +13993,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        var t = this, ed = t.editor, dom = ed.dom, d = ed.getDoc(), se = ed.settings, s = ed.selection.getSel(), r = s.getRangeAt(0), b = d.body;\r
                        var rb, ra, dir, sn, so, en, eo, sb, eb, bn, bef, aft, sc, ec, n, vp = dom.getViewPort(ed.getWin()), y, ch, car;\r
 \r
+                       ed.undoManager.beforeChange();\r
+\r
                        // If root blocks are forced then use Operas default behavior since it's really good\r
 // Removed due to bug: #1853816\r
 //                     if (se.forced_root_block && isOpera)\r
@@ -12064,6 +14056,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                ra.setStart(en, 0);\r
                        }\r
 \r
+                       // If the body is totally empty add a BR element this might happen on webkit\r
+                       if (!d.body.hasChildNodes()) {\r
+                               d.body.appendChild(dom.create('br'));\r
+                       }\r
+\r
                        // Never use body as start or end node\r
                        sn = sn.nodeName == "HTML" ? d.body : sn; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes\r
                        sn = sn.nodeName == "BODY" ? sn.firstChild : sn;\r
@@ -12178,10 +14175,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        if (aft.firstChild && aft.firstChild.nodeName == bn)\r
                                aft.innerHTML = aft.firstChild.innerHTML;\r
 \r
-                       // Padd empty blocks\r
-                       if (isEmpty(bef))\r
-                               bef.innerHTML = '<br />';\r
-\r
                        function appendStyles(e, en) {\r
                                var nl = [], nn, n, i;\r
 \r
@@ -12206,14 +14199,18 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                                nn = nn.appendChild(nl[i]);\r
 \r
                                        // Padd most inner style element\r
-                                       nl[0].innerHTML = isOpera ? '&nbsp;' : '<br />'; // Extra space for Opera so that the caret can move there\r
+                                       nl[0].innerHTML = isOpera ? '\u00a0' : '<br />'; // Extra space for Opera so that the caret can move there\r
                                        return nl[0]; // Move caret to most inner element\r
                                } else\r
-                                       e.innerHTML = isOpera ? '&nbsp;' : '<br />'; // Extra space for Opera so that the caret can move there\r
+                                       e.innerHTML = isOpera ? '\u00a0' : '<br />'; // Extra space for Opera so that the caret can move there\r
                        };\r
+                               \r
+                       // Padd empty blocks\r
+                       if (dom.isEmpty(bef))\r
+                               appendStyles(bef, sn);\r
 \r
                        // Fill empty afterblook with current style\r
-                       if (isEmpty(aft))\r
+                       if (dom.isEmpty(aft))\r
                                car = appendStyles(aft, en);\r
 \r
                        // Opera needs this one backwards for older versions\r
@@ -12229,27 +14226,26 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        aft.normalize();\r
                        bef.normalize();\r
 \r
-                       function first(n) {\r
-                               return d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, FALSE).nextNode() || n;\r
-                       };\r
-\r
                        // Move cursor and scroll into view\r
-                       r = d.createRange();\r
-                       r.selectNodeContents(isGecko ? first(car || aft) : car || aft);\r
-                       r.collapse(1);\r
-                       s.removeAllRanges();\r
-                       s.addRange(r);\r
+                       ed.selection.select(aft, true);\r
+                       ed.selection.collapse(true);\r
 \r
                        // scrollIntoView seems to scroll the parent window in most browsers now including FF 3.0b4 so it's time to stop using it and do it our selfs\r
                        y = ed.dom.getPos(aft).y;\r
-                       ch = aft.clientHeight;\r
+                       //ch = aft.clientHeight;\r
 \r
                        // Is element within viewport\r
-                       if (y < vp.y || y + ch > vp.y + vp.h) {\r
+                       if (y < vp.y || y + 25 > vp.y + vp.h) {\r
                                ed.getWin().scrollTo(0, y < vp.y ? y : y - vp.h + 25); // Needs to be hardcoded to roughly one line of text if a huge text block is broken into two blocks\r
-                               //console.debug('SCROLL!', 'vp.y: ' + vp.y, 'y' + y, 'vp.h' + vp.h, 'clientHeight' + aft.clientHeight, 'yyy: ' + (y < vp.y ? y : y - vp.h + aft.clientHeight));\r
+\r
+                               /*console.debug(\r
+                                       'Element: y=' + y + ', h=' + ch + ', ' +\r
+                                       'Viewport: y=' + vp.y + ", h=" + vp.h + ', bottom=' + (vp.y + vp.h)\r
+                               );*/\r
                        }\r
 \r
+                       ed.undoManager.add();\r
+\r
                        return FALSE;\r
                },\r
 \r
@@ -12464,7 +14460,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                c = new tinymce.ui.NativeListBox(id, s);\r
                        else {\r
                                cls = cc || t._cls.listbox || tinymce.ui.ListBox;\r
-                               c = new cls(id, s);\r
+                               c = new cls(id, s, ed);\r
                        }\r
 \r
                        t.controls[id] = c;\r
@@ -12519,11 +14515,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                        if (s.menu_button) {\r
                                cls = cc || t._cls.menubutton || tinymce.ui.MenuButton;\r
-                               c = new cls(id, s);\r
+                               c = new cls(id, s, ed);\r
                                ed.onMouseDown.add(c.hideMenu, c);\r
                        } else {\r
                                cls = t._cls.button || tinymce.ui.Button;\r
-                               c = new cls(id, s);\r
+                               c = new cls(id, s, ed);\r
                        }\r
 \r
                        return t.add(c);\r
@@ -12566,7 +14562,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                        id = t.prefix + id;\r
                        cls = cc || t._cls.splitbutton || tinymce.ui.SplitButton;\r
-                       c = t.add(new cls(id, s));\r
+                       c = t.add(new cls(id, s, ed));\r
                        ed.onMouseDown.add(c.hideMenu, c);\r
 \r
                        return c;\r
@@ -12606,7 +14602,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                        id = t.prefix + id;\r
                        cls = cc || t._cls.colorsplitbutton || tinymce.ui.ColorSplitButton;\r
-                       c = new cls(id, s);\r
+                       c = new cls(id, s, ed);\r
                        ed.onMouseDown.add(c.hideMenu, c);\r
 \r
                        // Remove the menu element when the editor is removed\r
@@ -12638,13 +14634,25 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                        id = t.prefix + id;\r
                        cls = cc || t._cls.toolbar || tinymce.ui.Toolbar;\r
-                       c = new cls(id, s);\r
+                       c = new cls(id, s, t.editor);\r
 \r
                        if (t.get(id))\r
                                return null;\r
 \r
                        return t.add(c);\r
                },\r
+               \r
+               createToolbarGroup : function(id, s, cc) {\r
+                       var c, t = this, cls;\r
+                       id = t.prefix + id;\r
+                       cls = cc || this._cls.toolbarGroup || tinymce.ui.ToolbarGroup;\r
+                       c = new cls(id, s, t.editor);\r
+                       \r
+                       if (t.get(id))\r
+                               return null;\r
+                       \r
+                       return t.add(c);\r
+               },\r
 \r
                createSeparator : function(cc) {\r
                        var cls = cc || this._cls.separator || tinymce.ui.Separator;\r
@@ -12781,53 +14789,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                }\r
        });\r
 }(tinymce));\r
-(function(tinymce) {\r
-       function CommandManager() {\r
-               var execCommands = {}, queryStateCommands = {}, queryValueCommands = {};\r
-\r
-               function add(collection, cmd, func, scope) {\r
-                       if (typeof(cmd) == 'string')\r
-                               cmd = [cmd];\r
-\r
-                       tinymce.each(cmd, function(cmd) {\r
-                               collection[cmd.toLowerCase()] = {func : func, scope : scope};\r
-                       });\r
-               };\r
-\r
-               tinymce.extend(this, {\r
-                       add : function(cmd, func, scope) {\r
-                               add(execCommands, cmd, func, scope);\r
-                       },\r
-\r
-                       addQueryStateHandler : function(cmd, func, scope) {\r
-                               add(queryStateCommands, cmd, func, scope);\r
-                       },\r
-\r
-                       addQueryValueHandler : function(cmd, func, scope) {\r
-                               add(queryValueCommands, cmd, func, scope);\r
-                       },\r
-\r
-                       execCommand : function(scope, cmd, ui, value, args) {\r
-                               if (cmd = execCommands[cmd.toLowerCase()]) {\r
-                                       if (cmd.func.call(scope || cmd.scope, ui, value, args) !== false)\r
-                                               return true;\r
-                               }\r
-                       },\r
-\r
-                       queryCommandValue : function() {\r
-                               if (cmd = queryValueCommands[cmd.toLowerCase()])\r
-                                       return cmd.func.call(scope || cmd.scope, ui, value, args);\r
-                       },\r
-\r
-                       queryCommandState : function() {\r
-                               if (cmd = queryStateCommands[cmd.toLowerCase()])\r
-                                       return cmd.func.call(scope || cmd.scope, ui, value, args);\r
-                       }\r
-               });\r
-       };\r
-\r
-       tinymce.GlobalCommands = new CommandManager();\r
-})(tinymce);\r
 (function(tinymce) {\r
        tinymce.Formatter = function(ed) {\r
                var formats = {},\r
@@ -12836,7 +14797,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        selection = ed.selection,\r
                        TreeWalker = tinymce.dom.TreeWalker,\r
                        rangeUtils = new tinymce.dom.RangeUtils(dom),\r
-                       isValid = ed.schema.isValid,\r
+                       isValid = ed.schema.isValidChild,\r
                        isBlock = dom.isBlock,\r
                        forcedRootBlock = ed.settings.forced_root_block,\r
                        nodeIndex = dom.nodeIndex,\r
@@ -12905,8 +14866,31 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        }\r
                };\r
 \r
+               var getTextDecoration = function(node) {\r
+                       var decoration;\r
+\r
+                       ed.dom.getParent(node, function(n) {\r
+                               decoration = ed.dom.getStyle(n, 'text-decoration');\r
+                               return decoration && decoration !== 'none';\r
+                       });\r
+\r
+                       return decoration;\r
+               };\r
+\r
+               var processUnderlineAndColor = function(node) {\r
+                       var textDecoration;\r
+                       if (node.nodeType === 1 && node.parentNode && node.parentNode.nodeType === 1) {\r
+                               textDecoration = getTextDecoration(node.parentNode);\r
+                               if (ed.dom.getStyle(node, 'color') && textDecoration) {\r
+                                       ed.dom.setStyle(node, 'text-decoration', textDecoration);\r
+                               } else if (ed.dom.getStyle(node, 'textdecoration') === textDecoration) {\r
+                                       ed.dom.setStyle(node, 'text-decoration', null);\r
+                               }\r
+                       }\r
+               };\r
+\r
                function apply(name, vars, node) {\r
-                       var formatList = get(name), format = formatList[0], bookmark, rng, i;\r
+                       var formatList = get(name), format = formatList[0], bookmark, rng, i, isCollapsed = selection.isCollapsed();\r
 \r
                        function moveStart(rng) {\r
                                var container = rng.startContainer,\r
@@ -12936,6 +14920,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                fmt = fmt || format;\r
 \r
                                if (elm) {\r
+                                       if (fmt.onformat) {\r
+                                               fmt.onformat(elm, fmt, vars, node);\r
+                                       }\r
+\r
                                        each(fmt.styles, function(value, name) {\r
                                                dom.setStyle(elm, name, replaceVars(value, vars));\r
                                        });\r
@@ -12952,8 +14940,89 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                        });\r
                                }\r
                        };\r
+                       function adjustSelectionToVisibleSelection() {\r
+                               function findSelectionEnd(start, end) {\r
+                                       var walker = new TreeWalker(end);\r
+                                       for (node = walker.current(); node; node = walker.prev()) {\r
+                                               if (node.childNodes.length > 1 || node == start) {\r
+                                                       return node;\r
+                                               }\r
+                                       }\r
+                               };\r
+\r
+                               // Adjust selection so that a end container with a end offset of zero is not included in the selection\r
+                               // as this isn't visible to the user.\r
+                               var rng = ed.selection.getRng();\r
+                               var start = rng.startContainer;\r
+                               var end = rng.endContainer;\r
+\r
+                               if (start != end && rng.endOffset == 0) {\r
+                                       var newEnd = findSelectionEnd(start, end);\r
+                                       var endOffset = newEnd.nodeType == 3 ? newEnd.length : newEnd.childNodes.length;\r
+\r
+                                       rng.setEnd(newEnd, endOffset);\r
+                               }\r
+\r
+                               return rng;\r
+                       }\r
+                       \r
+                       function applyStyleToList(node, bookmark, wrapElm, newWrappers, process){\r
+                               var nodes = [], listIndex = -1, list, startIndex = -1, endIndex = -1, currentWrapElm;\r
+                               \r
+                               // find the index of the first child list.\r
+                               each(node.childNodes, function(n, index) {\r
+                                       if (n.nodeName === "UL" || n.nodeName === "OL") {\r
+                                               listIndex = index;\r
+                                               list = n;\r
+                                               return false;\r
+                                       }\r
+                               });\r
+                               \r
+                               // get the index of the bookmarks\r
+                               each(node.childNodes, function(n, index) {\r
+                                       if (n.nodeName === "SPAN" && dom.getAttrib(n, "data-mce-type") == "bookmark") {\r
+                                               if (n.id == bookmark.id + "_start") {\r
+                                                       startIndex = index;\r
+                                               } else if (n.id == bookmark.id + "_end") {\r
+                                                       endIndex = index;\r
+                                               }\r
+                                       }\r
+                               });\r
+                               \r
+                               // if the selection spans across an embedded list, or there isn't an embedded list - handle processing normally\r
+                               if (listIndex <= 0 || (startIndex < listIndex && endIndex > listIndex)) {\r
+                                       each(tinymce.grep(node.childNodes), process);\r
+                                       return 0;\r
+                               } else {\r
+                                       currentWrapElm = wrapElm.cloneNode(FALSE);\r
+                                       \r
+                                       // create a list of the nodes on the same side of the list as the selection\r
+                                       each(tinymce.grep(node.childNodes), function(n, index) {\r
+                                               if ((startIndex < listIndex && index < listIndex) || (startIndex > listIndex && index > listIndex)) {\r
+                                                       nodes.push(n); \r
+                                                       n.parentNode.removeChild(n);\r
+                                               }\r
+                                       });\r
+                                       \r
+                                       // insert the wrapping element either before or after the list.\r
+                                       if (startIndex < listIndex) {\r
+                                               node.insertBefore(currentWrapElm, list);\r
+                                       } else if (startIndex > listIndex) {\r
+                                               node.insertBefore(currentWrapElm, list.nextSibling);\r
+                                       }\r
+                                       \r
+                                       // add the new nodes to the list.\r
+                                       newWrappers.push(currentWrapElm);\r
+\r
+                                       each(nodes, function(node) {\r
+                                               currentWrapElm.appendChild(node);\r
+                                       });\r
 \r
-                       function applyRngStyle(rng) {\r
+                                       return currentWrapElm;\r
+                               }\r
+                       };\r
+                       \r
+                       function applyRngStyle(rng, bookmark) {\r
                                var newWrappers = [], wrapName, wrapElm;\r
 \r
                                // Setup wrapper element\r
@@ -12997,6 +15066,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                                if (format.selector) {\r
                                                        // Look for matching formats\r
                                                        each(formatList, function(format) {\r
+                                                               // Check collapsed state if it exists\r
+                                                               if ('collapsed' in format && format.collapsed !== isCollapsed) {\r
+                                                                       return;\r
+                                                               }\r
+\r
                                                                if (dom.is(node, format.selector) && !isCaretNode(node)) {\r
                                                                        setElementFormat(node, format);\r
                                                                        found = true;\r
@@ -13011,7 +15085,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                                }\r
 \r
                                                // Is it valid to wrap this item\r
-                                               if (isValid(wrapName, nodeName) && isValid(parentName, wrapName)) {\r
+                                               if (isValid(wrapName, nodeName) && isValid(parentName, wrapName) &&\r
+                                                               !(node.nodeType === 3 && node.nodeValue.length === 1 && node.nodeValue.charCodeAt(0) === 65279)) {\r
                                                        // Start wrapping\r
                                                        if (!currentWrapElm) {\r
                                                                // Wrap the node\r
@@ -13021,6 +15096,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                                        }\r
 \r
                                                        currentWrapElm.appendChild(node);\r
+                                               } else if (nodeName == 'li' && bookmark) {\r
+                                                       // Start wrapping - if we are in a list node and have a bookmark, then we will always begin by wrapping in a new element.\r
+                                                       currentWrapElm = applyStyleToList(node, bookmark, wrapElm, newWrappers, process);\r
                                                } else {\r
                                                        // Start a new wrapper for possible children\r
                                                        currentWrapElm = 0;\r
@@ -13036,6 +15114,30 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                        each(nodes, process);\r
                                });\r
 \r
+                               // Wrap links inside as well, for example color inside a link when the wrapper is around the link\r
+                               if (format.wrap_links === false) {\r
+                                       each(newWrappers, function(node) {\r
+                                               function process(node) {\r
+                                                       var i, currentWrapElm, children;\r
+\r
+                                                       if (node.nodeName === 'A') {\r
+                                                               currentWrapElm = wrapElm.cloneNode(FALSE);\r
+                                                               newWrappers.push(currentWrapElm);\r
+\r
+                                                               children = tinymce.grep(node.childNodes);\r
+                                                               for (i = 0; i < children.length; i++)\r
+                                                                       currentWrapElm.appendChild(children[i]);\r
+\r
+                                                               node.appendChild(currentWrapElm);\r
+                                                       }\r
+\r
+                                                       each(tinymce.grep(node.childNodes), process);\r
+                                               };\r
+\r
+                                               process(node);\r
+                                       });\r
+                               }\r
+\r
                                // Cleanup\r
                                each(newWrappers, function(node) {\r
                                        var childCount;\r
@@ -13075,8 +15177,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                                        childCount = getChildCount(node);\r
 \r
-                                       // Remove empty nodes\r
-                                       if (childCount === 0) {\r
+                                       // Remove empty nodes but only if there is multiple wrappers and they are not block\r
+                                       // elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at\r
+                                       if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {\r
                                                dom.remove(node, 1);\r
                                                return;\r
                                        }\r
@@ -13092,6 +15195,19 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                                        // this: <span style="color:red"><b><span style="color:red; font-size:10px">text</span></b></span>\r
                                                        // will become: <span style="color:red"><b><span style="font-size:10px">text</span></b></span>\r
                                                        each(dom.select(format.inline, node), function(child) {\r
+                                                               var parent;\r
+\r
+                                                               // When wrap_links is set to false we don't want\r
+                                                               // to remove the format on children within links\r
+                                                               if (format.wrap_links === false) {\r
+                                                                       parent = child.parentNode;\r
+\r
+                                                                       do {\r
+                                                                               if (parent.nodeName === 'A')\r
+                                                                                       return;\r
+                                                                       } while (parent = parent.parentNode);\r
+                                                               }\r
+\r
                                                                removeFormat(format, vars, child, format.exact ? child : null);\r
                                                        });\r
                                                });\r
@@ -13115,7 +15231,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                                }\r
 \r
                                                // Merge next and previous siblings if they are similar <b>text</b><b>text</b> becomes <b>texttext</b>\r
-                                               if (node) {\r
+                                               if (node && format.merge_siblings !== false) {\r
                                                        node = mergeSiblings(getNonWhiteSpaceSibling(node), node);\r
                                                        node = mergeSiblings(node, getNonWhiteSpaceSibling(node, TRUE));\r
                                                }\r
@@ -13132,10 +15248,20 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                                        applyRngStyle(expandRng(rng, formatList));\r
                                } else {\r
-                                       if (!selection.isCollapsed() || !format.inline) {\r
+                                       if (!isCollapsed || !format.inline || dom.select('td.mceSelected,th.mceSelected').length) {\r
+                                               // Obtain selection node before selection is unselected by applyRngStyle()\r
+                                               var curSelNode = ed.selection.getNode();\r
+\r
                                                // Apply formatting to selection\r
+                                               ed.selection.setRng(adjustSelectionToVisibleSelection());\r
                                                bookmark = selection.getBookmark();\r
-                                               applyRngStyle(expandRng(selection.getRng(TRUE), formatList));\r
+                                               applyRngStyle(expandRng(selection.getRng(TRUE), formatList), bookmark);\r
+\r
+                                               // Colored nodes should be underlined so that the color of the underline matches the text color.\r
+                                               if (format.styles && (format.styles.color || format.styles.textDecoration)) {\r
+                                                       tinymce.walk(curSelNode, processUnderlineAndColor, 'childNodes');\r
+                                                       processUnderlineAndColor(curSelNode);\r
+                                               }\r
 \r
                                                selection.moveToBookmark(bookmark);\r
                                                selection.setRng(moveStart(selection.getRng(TRUE)));\r
@@ -13148,7 +15274,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                function remove(name, vars, node) {\r
                        var formatList = get(name), format = formatList[0], bookmark, i, rng;\r
-\r
                        function moveStart(rng) {\r
                                var container = rng.startContainer,\r
                                        offset = rng.startOffset,\r
@@ -13300,8 +15425,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                                        if (startContainer != endContainer) {\r
                                                // Wrap start/end nodes in span element since these might be cloned/moved\r
-                                               startContainer = wrap(startContainer, 'span', {id : '_start', _mce_type : 'bookmark'});\r
-                                               endContainer = wrap(endContainer, 'span', {id : '_end', _mce_type : 'bookmark'});\r
+                                               startContainer = wrap(startContainer, 'span', {id : '_start', 'data-mce-type' : 'bookmark'});\r
+                                               endContainer = wrap(endContainer, 'span', {id : '_end', 'data-mce-type' : 'bookmark'});\r
 \r
                                                // Split start/end\r
                                                splitToFormatRoot(startContainer);\r
@@ -13324,6 +15449,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                rangeUtils.walk(rng, function(nodes) {\r
                                        each(nodes, function(node) {\r
                                                process(node);\r
+\r
+                                               // Remove parent span if it only contains text-decoration: underline, yet a parent node is also underlined.\r
+                                               if (node.nodeType === 1 && ed.dom.getStyle(node, 'text-decoration') === 'underline' && node.parentNode && getTextDecoration(node.parentNode) === 'underline') {\r
+                                                       removeFormat({'deep': false, 'exact': true, 'inline': 'span', 'styles': {'textDecoration' : 'underline'}}, null, node);\r
+                                               }\r
                                        });\r
                                });\r
                        };\r
@@ -13337,7 +15467,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                return;\r
                        }\r
 \r
-                       if (!selection.isCollapsed() || !format.inline) {\r
+                       if (!selection.isCollapsed() || !format.inline || dom.select('td.mceSelected,th.mceSelected').length) {\r
                                bookmark = selection.getBookmark();\r
                                removeRngStyle(selection.getRng(TRUE));\r
                                selection.moveToBookmark(bookmark);\r
@@ -13353,7 +15483,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                };\r
 \r
                function toggle(name, vars, node) {\r
-                       if (match(name, vars, node))\r
+                       var fmt = get(name);\r
+\r
+                       if (match(name, vars, node) && (!('toggle' in fmt[0]) || fmt[0]['toggle']))\r
                                remove(name, vars, node);\r
                        else\r
                                apply(name, vars, node);\r
@@ -13365,6 +15497,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        function matchItems(node, format, item_name) {\r
                                var key, value, items = format[item_name], i;\r
 \r
+                               // Custom match\r
+                               if (format.onmatch) {\r
+                                       return format.onmatch(node, format, item_name);\r
+                               }\r
+\r
                                // Check all items\r
                                if (items) {\r
                                        // Non indexed object\r
@@ -13617,7 +15754,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        var startContainer = rng.startContainer,\r
                                startOffset = rng.startOffset,\r
                                endContainer = rng.endContainer,\r
-                               endOffset = rng.endOffset, sibling, lastIdx;\r
+                               endOffset = rng.endOffset, sibling, lastIdx, leaf;\r
 \r
                        // This function walks up the tree if there is no siblings before/after the node\r
                        function findParentContainer(container, child_name, sibling_name, root) {\r
@@ -13647,6 +15784,19 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                return container;\r
                        };\r
 \r
+                       // This function walks down the tree to find the leaf at the selection.\r
+                       // The offset is also returned as if node initially a leaf, the offset may be in the middle of the text node.\r
+                       function findLeaf(node, offset) {\r
+                               if (offset === undefined)\r
+                                       offset = node.nodeType === 3 ? node.length : node.childNodes.length;\r
+                               while (node && node.hasChildNodes()) {\r
+                                       node = node.childNodes[offset];\r
+                                       if (node)\r
+                                               offset = node.nodeType === 3 ? node.length : node.childNodes.length;\r
+                               }\r
+                               return { node: node, offset: offset };\r
+                       }\r
+\r
                        // If index based start position then resolve it\r
                        if (startContainer.nodeType == 1 && startContainer.hasChildNodes()) {\r
                                lastIdx = startContainer.childNodes.length - 1;\r
@@ -13672,12 +15822,36 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        if (isBookmarkNode(startContainer))\r
                                startContainer = startContainer.nextSibling || startContainer;\r
 \r
-                       if (isBookmarkNode(endContainer.parentNode))\r
+                       if (isBookmarkNode(endContainer.parentNode)) {\r
+                               endOffset = dom.nodeIndex(endContainer);\r
                                endContainer = endContainer.parentNode;\r
+                       }\r
+\r
+                       if (isBookmarkNode(endContainer) && endContainer.previousSibling) {\r
+                               endContainer = endContainer.previousSibling;\r
+                               endOffset = endContainer.length;\r
+                       }\r
 \r
-                       if (isBookmarkNode(endContainer))\r
-                               endContainer = endContainer.previousSibling || endContainer;\r
+                       if (format[0].inline) {\r
+                               // Avoid applying formatting to a trailing space.\r
+                               leaf = findLeaf(endContainer, endOffset);\r
+                               if (leaf.node) {\r
+                                       while (leaf.node && leaf.offset === 0 && leaf.node.previousSibling)\r
+                                               leaf = findLeaf(leaf.node.previousSibling);\r
 \r
+                                       if (leaf.node && leaf.offset > 0 && leaf.node.nodeType === 3 &&\r
+                                                       leaf.node.nodeValue.charAt(leaf.offset - 1) === ' ') {\r
+\r
+                                               if (leaf.offset > 1) {\r
+                                                       endContainer = leaf.node;\r
+                                                       endContainer.splitText(leaf.offset - 1);\r
+                                               } else if (leaf.node.previousSibling) {\r
+                                                       endContainer = leaf.node.previousSibling;\r
+                                               }\r
+                                       }\r
+                               }\r
+                       }\r
+                       \r
                        // Move start/end point up the tree if the leaves are sharp and if we are in different containers\r
                        // Example * becomes !: !<p><b><i>*text</i><i>text*</i></b></p>!\r
                        // This will reduce the number of wrapper elements that needs to be created\r
@@ -13690,7 +15864,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        // Expand start/end container to matching selector\r
                        if (format[0].selector && format[0].expand !== FALSE && !format[0].inline) {\r
                                function findSelectorEndPoint(container, sibling_name) {\r
-                                       var parents, i, y;\r
+                                       var parents, i, y, curFormat;\r
 \r
                                        if (container.nodeType == 3 && container.nodeValue.length == 0 && container[sibling_name])\r
                                                container = container[sibling_name];\r
@@ -13698,7 +15872,13 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                        parents = getParents(container);\r
                                        for (i = 0; i < parents.length; i++) {\r
                                                for (y = 0; y < format.length; y++) {\r
-                                                       if (dom.is(parents[i], format[y].selector))\r
+                                                       curFormat = format[y];\r
+\r
+                                                       // If collapsed state is set then skip formats that doesn't match that\r
+                                                       if ("collapsed" in curFormat && curFormat.collapsed !== rng.collapsed)\r
+                                                               continue;\r
+\r
+                                                       if (dom.is(parents[i], curFormat.selector))\r
                                                                return parents[i];\r
                                                }\r
                                        }\r
@@ -13808,7 +15988,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                // Remove style attribute if it's empty\r
                                if (stylesModified && dom.getAttrib(node, 'style') == '') {\r
                                        node.removeAttribute('style');\r
-                                       node.removeAttribute('_mce_style');\r
+                                       node.removeAttribute('data-mce-style');\r
                                }\r
 \r
                                // Remove attributes\r
@@ -13849,7 +16029,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                                                // Remove mce prefixed attributes\r
                                                if (MCE_ATTR_RE.test(name))\r
-                                                       node.removeAttribute('_mce_' + name);\r
+                                                       node.removeAttribute('data-mce-' + name);\r
 \r
                                                node.removeAttribute(name);\r
                                        }\r
@@ -13934,7 +16114,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                };\r
 \r
                function isBookmarkNode(node) {\r
-                       return node && node.nodeType == 1 && node.getAttribute('_mce_type') == 'bookmark';\r
+                       return node && node.nodeType == 1 && node.getAttribute('data-mce-type') == 'bookmark';\r
                };\r
 \r
                function mergeSiblings(prev, next) {\r
@@ -14005,7 +16185,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        if (prev && next) {\r
                                function findElementSibling(node, sibling_name) {\r
                                        for (sibling = node; sibling; sibling = sibling[sibling_name]) {\r
-                                               if (sibling.nodeType == 3 && !isWhiteSpaceNode(sibling))\r
+                                               if (sibling.nodeType == 3 && sibling.nodeValue.length !== 0)\r
                                                        return node;\r
 \r
                                                if (sibling.nodeType == 1 && !isBookmarkNode(sibling))\r
@@ -14082,6 +16262,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                // Apply pending formats\r
                                each(pendingFormats.apply.reverse(), function(item) {\r
                                        apply(item.name, item.vars, caret_node);\r
+\r
+                                       // Colored nodes should be underlined so that the color of the underline matches the text color.\r
+                                       if (item.name === 'forecolor' && item.vars.value)\r
+                                               processUnderlineAndColor(caret_node.parentNode);\r
                                });\r
 \r
                                // Remove pending formats\r
@@ -14127,34 +16311,67 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                // Only register listeners once if we need to\r
                                if (!pendingFormats.isListening && hasPending()) {\r
                                        pendingFormats.isListening = true;\r
+                                       function performPendingFormat(node, textNode) {\r
+                                               var rng = dom.createRng();\r
+                                               perform(node);\r
+\r
+                                               rng.setStart(textNode, textNode.nodeValue.length);\r
+                                               rng.setEnd(textNode, textNode.nodeValue.length);\r
+                                               selection.setRng(rng);\r
+                                               ed.nodeChanged();\r
+                                       }\r
+                                       var enterKeyPressed = false;\r
 \r
                                        each('onKeyDown,onKeyUp,onKeyPress,onMouseUp'.split(','), function(event) {\r
                                                ed[event].addToTop(function(ed, e) {\r
+                                                       if (e.keyCode==13 && !e.shiftKey) {\r
+                                                               enterKeyPressed = true;\r
+                                                               return;\r
+                                                       }\r
                                                        // Do we have pending formats and is the selection moved has moved\r
                                                        if (hasPending() && !tinymce.dom.RangeUtils.compareRanges(pendingFormats.lastRng, selection.getRng())) {\r
+                                                               var foundCaret = false;\r
                                                                each(dom.select('font,span'), function(node) {\r
                                                                        var textNode, rng;\r
 \r
                                                                        // Look for marker\r
                                                                        if (isCaretNode(node)) {\r
+                                                                               foundCaret = true;\r
                                                                                textNode = node.firstChild;\r
 \r
-                                                                               if (textNode) {\r
-                                                                                       perform(node);\r
+                                                                               // Find the first text node within node\r
+                                                                               while (textNode && textNode.nodeType != 3)\r
+                                                                                       textNode = textNode.firstChild;\r
 \r
-                                                                                       rng = dom.createRng();\r
-                                                                                       rng.setStart(textNode, textNode.nodeValue.length);\r
-                                                                                       rng.setEnd(textNode, textNode.nodeValue.length);\r
-                                                                                       selection.setRng(rng);\r
-                                                                                       ed.nodeChanged();\r
-                                                                               } else\r
+                                                                               if (textNode) \r
+                                                                                       performPendingFormat(node, textNode);\r
+                                                                               else\r
                                                                                        dom.remove(node);\r
                                                                        }\r
                                                                });\r
+                                                               \r
+                                                               // no caret - so we are \r
+                                                               if (enterKeyPressed && !foundCaret) {\r
+                                                                       var node = selection.getNode();\r
+                                                                       var textNode = node;\r
+\r
+                                                                       // Find the first text node within node\r
+                                                                       while (textNode && textNode.nodeType != 3)\r
+                                                                               textNode = textNode.firstChild;\r
+                                                                       if (textNode) {\r
+                                                                               node=textNode.parentNode;\r
+                                                                               while (!isBlock(node)){\r
+                                                                                       node=node.parentNode;\r
+                                                                               }\r
+                                                                               performPendingFormat(node, textNode);\r
+                                                                       }\r
+                                                               }\r
 \r
                                                                // Always unbind and clear pending styles on keyup\r
-                                                               if (e.type == 'keyup' || e.type == 'mouseup')\r
+                                                               if (e.type == 'keyup' || e.type == 'mouseup') {\r
                                                                        resetPending();\r
+                                                                       enterKeyPressed=false;\r
+                                                               }\r
                                                        }\r
                                                });\r
                                        });\r
@@ -14213,6 +16430,7 @@ tinymce.onAddEditor.add(function(tinymce, ed) {
                };\r
 \r
                ed.onPreProcess.add(convert);\r
+               ed.onSetContent.add(convert);\r
 \r
                ed.onInit.add(function() {\r
                        ed.selection.onSetContent.add(convert);\r