]> git.donarmstrong.com Git - roundcube.git/blobdiff - program/js/tiny_mce/tiny_mce_src.js
Imported Upstream version 0.5
[roundcube.git] / program / js / tiny_mce / tiny_mce_src.js
index 48384991576f30173e4f68eb64106f4634ee87a9..9db8d18fe0c0ce10dbdbf53ec5bda35e5d01796a 100644 (file)
-var tinymce = {\r
-       majorVersion : '3',\r
-       minorVersion : '2.3',\r
-       releaseDate : '2009-04-23',\r
-\r
-       _init : function() {\r
-               var t = this, d = document, w = window, na = navigator, ua = na.userAgent, i, nl, n, base, p, v;\r
-\r
-               // Browser checks\r
-               t.isOpera = w.opera && opera.buildNumber;\r
-               t.isWebKit = /WebKit/.test(ua);\r
-               t.isIE = !t.isWebKit && !t.isOpera && (/MSIE/gi).test(ua) && (/Explorer/gi).test(na.appName);\r
-               t.isIE6 = t.isIE && /MSIE [56]/.test(ua);\r
-               t.isGecko = !t.isWebKit && /Gecko/.test(ua);\r
-               t.isMac = ua.indexOf('Mac') != -1;\r
-               t.isAir = /adobeair/i.test(ua);\r
-\r
-               // TinyMCE .NET webcontrol might be setting the values for TinyMCE\r
-               if (w.tinyMCEPreInit) {\r
-                       t.suffix = tinyMCEPreInit.suffix;\r
-                       t.baseURL = tinyMCEPreInit.base;\r
-                       t.query = tinyMCEPreInit.query;\r
-                       return;\r
-               }\r
+(function(win) {\r
+       var whiteSpaceRe = /^\s*|\s*$/g,\r
+               undefined;\r
 \r
-               // Get suffix and base\r
-               t.suffix = '';\r
+       var tinymce = {\r
+               majorVersion : '3',\r
 \r
-               // If base element found, add that infront of baseURL\r
-               nl = d.getElementsByTagName('base');\r
-               for (i=0; i<nl.length; i++) {\r
-                       if (v = nl[i].href) {\r
-                               // Host only value like http://site.com or http://site.com:8008\r
-                               if (/^https?:\/\/[^\/]+$/.test(v))\r
-                                       v += '/';\r
+               minorVersion : '3.7',\r
 \r
-                               base = v ? v.match(/.*\//)[0] : ''; // Get only directory\r
-                       }\r
-               }\r
+               releaseDate : '2010-06-10',\r
 \r
-               function getBase(n) {\r
-                       if (n.src && /tiny_mce(|_dev|_src|_gzip|_jquery|_prototype).js/.test(n.src)) {\r
-                               if (/_(src|dev)\.js/g.test(n.src))\r
-                                       t.suffix = '_src';\r
+               _init : function() {\r
+                       var t = this, d = document, na = navigator, ua = na.userAgent, i, nl, n, base, p, v;\r
 \r
-                               if ((p = n.src.indexOf('?')) != -1)\r
-                                       t.query = n.src.substring(p + 1);\r
+                       t.isOpera = win.opera && opera.buildNumber;\r
 \r
-                               t.baseURL = n.src.substring(0, n.src.lastIndexOf('/'));\r
+                       t.isWebKit = /WebKit/.test(ua);\r
 \r
-                               // If path to script is relative and a base href was found add that one infront\r
-                               if (base && t.baseURL.indexOf('://') == -1)\r
-                                       t.baseURL = base + t.baseURL;\r
+                       t.isIE = !t.isWebKit && !t.isOpera && (/MSIE/gi).test(ua) && (/Explorer/gi).test(na.appName);\r
 \r
-                               return t.baseURL;\r
-                       }\r
+                       t.isIE6 = t.isIE && /MSIE [56]/.test(ua);\r
 \r
-                       return null;\r
-               };\r
+                       t.isGecko = !t.isWebKit && /Gecko/.test(ua);\r
+\r
+                       t.isMac = ua.indexOf('Mac') != -1;\r
 \r
-               // Check document\r
-               nl = d.getElementsByTagName('script');\r
-               for (i=0; i<nl.length; i++) {\r
-                       if (getBase(nl[i]))\r
+                       t.isAir = /adobeair/i.test(ua);\r
+\r
+                       t.isIDevice = /(iPad|iPhone)/.test(ua);\r
+\r
+                       // TinyMCE .NET webcontrol might be setting the values for TinyMCE\r
+                       if (win.tinyMCEPreInit) {\r
+                               t.suffix = tinyMCEPreInit.suffix;\r
+                               t.baseURL = tinyMCEPreInit.base;\r
+                               t.query = tinyMCEPreInit.query;\r
                                return;\r
-               }\r
+                       }\r
+\r
+                       // Get suffix and base\r
+                       t.suffix = '';\r
+\r
+                       // If base element found, add that infront of baseURL\r
+                       nl = d.getElementsByTagName('base');\r
+                       for (i=0; i<nl.length; i++) {\r
+                               if (v = nl[i].href) {\r
+                                       // Host only value like http://site.com or http://site.com:8008\r
+                                       if (/^https?:\/\/[^\/]+$/.test(v))\r
+                                               v += '/';\r
+\r
+                                       base = v ? v.match(/.*\//)[0] : ''; // Get only directory\r
+                               }\r
+                       }\r
+\r
+                       function getBase(n) {\r
+                               if (n.src && /tiny_mce(|_gzip|_jquery|_prototype)(_dev|_src)?.js/.test(n.src)) {\r
+                                       if (/_(src|dev)\.js/g.test(n.src))\r
+                                               t.suffix = '_src';\r
+\r
+                                       if ((p = n.src.indexOf('?')) != -1)\r
+                                               t.query = n.src.substring(p + 1);\r
+\r
+                                       t.baseURL = n.src.substring(0, n.src.lastIndexOf('/'));\r
+\r
+                                       // If path to script is relative and a base href was found add that one infront\r
+                                       // the src property will always be an absolute one on non IE browsers and IE 8\r
+                                       // so this logic will basically only be executed on older IE versions\r
+                                       if (base && t.baseURL.indexOf('://') == -1 && t.baseURL.indexOf('/') !== 0)\r
+                                               t.baseURL = base + t.baseURL;\r
+\r
+                                       return t.baseURL;\r
+                               }\r
 \r
-               // Check head\r
-               n = d.getElementsByTagName('head')[0];\r
-               if (n) {\r
-                       nl = n.getElementsByTagName('script');\r
+                               return null;\r
+                       };\r
+\r
+                       // Check document\r
+                       nl = d.getElementsByTagName('script');\r
                        for (i=0; i<nl.length; i++) {\r
                                if (getBase(nl[i]))\r
                                        return;\r
                        }\r
-               }\r
 \r
-               return;\r
-       },\r
-\r
-       is : function(o, t) {\r
-               var n = typeof(o);\r
+                       // Check head\r
+                       n = d.getElementsByTagName('head')[0];\r
+                       if (n) {\r
+                               nl = n.getElementsByTagName('script');\r
+                               for (i=0; i<nl.length; i++) {\r
+                                       if (getBase(nl[i]))\r
+                                               return;\r
+                               }\r
+                       }\r
 \r
-               if (!t)\r
-                       return n != 'undefined';\r
+                       return;\r
+               },\r
 \r
-               if (t == 'array' && (o.hasOwnProperty && o instanceof Array))\r
-                       return true;\r
+               is : function(o, t) {\r
+                       if (!t)\r
+                               return o !== undefined;\r
 \r
-               return n == t;\r
-       },\r
+                       if (t == 'array' && (o.hasOwnProperty && o instanceof Array))\r
+                               return true;\r
 \r
+                       return typeof(o) == t;\r
+               },\r
 \r
-       each : function(o, cb, s) {\r
-               var n, l;\r
+               each : function(o, cb, s) {\r
+                       var n, l;\r
 \r
-               if (!o)\r
-                       return 0;\r
+                       if (!o)\r
+                               return 0;\r
 \r
-               s = s || o;\r
+                       s = s || o;\r
 \r
-               if (typeof(o.length) != 'undefined') {\r
-                       // Indexed arrays, needed for Safari\r
-                       for (n=0, l = o.length; n<l; n++) {\r
-                               if (cb.call(s, o[n], n, o) === false)\r
-                                       return 0;\r
-                       }\r
-               } else {\r
-                       // Hashtables\r
-                       for (n in o) {\r
-                               if (o.hasOwnProperty(n)) {\r
+                       if (o.length !== undefined) {\r
+                               // Indexed arrays, needed for Safari\r
+                               for (n=0, l = o.length; n < l; n++) {\r
                                        if (cb.call(s, o[n], n, o) === false)\r
                                                return 0;\r
                                }\r
+                       } else {\r
+                               // Hashtables\r
+                               for (n in o) {\r
+                                       if (o.hasOwnProperty(n)) {\r
+                                               if (cb.call(s, o[n], n, o) === false)\r
+                                                       return 0;\r
+                                       }\r
+                               }\r
                        }\r
-               }\r
 \r
-               return 1;\r
-       },\r
+                       return 1;\r
+               },\r
 \r
-       map : function(a, f) {\r
-               var o = [];\r
 \r
-               tinymce.each(a, function(v) {\r
-                       o.push(f(v));\r
-               });\r
+               map : function(a, f) {\r
+                       var o = [];\r
 \r
-               return o;\r
-       },\r
+                       tinymce.each(a, function(v) {\r
+                               o.push(f(v));\r
+                       });\r
 \r
-       grep : function(a, f) {\r
-               var o = [];\r
+                       return o;\r
+               },\r
 \r
-               tinymce.each(a, function(v) {\r
-                       if (!f || f(v))\r
-                               o.push(v);\r
-               });\r
+               grep : function(a, f) {\r
+                       var o = [];\r
 \r
-               return o;\r
-       },\r
+                       tinymce.each(a, function(v) {\r
+                               if (!f || f(v))\r
+                                       o.push(v);\r
+                       });\r
+\r
+                       return o;\r
+               },\r
 \r
-       inArray : function(a, v) {\r
-               var i, l;\r
+               inArray : function(a, v) {\r
+                       var i, l;\r
 \r
-               if (a) {\r
-                       for (i = 0, l = a.length; i < l; i++) {\r
-                               if (a[i] === v)\r
-                                       return i;\r
+                       if (a) {\r
+                               for (i = 0, l = a.length; i < l; i++) {\r
+                                       if (a[i] === v)\r
+                                               return i;\r
+                               }\r
                        }\r
-               }\r
 \r
-               return -1;\r
-       },\r
-\r
-       extend : function(o, e) {\r
-               var i, a = arguments;\r
+                       return -1;\r
+               },\r
 \r
-               for (i=1; i<a.length; i++) {\r
-                       e = a[i];\r
+               extend : function(o, e) {\r
+                       var i, l, a = arguments;\r
 \r
-                       tinymce.each(e, function(v, n) {\r
-                               if (typeof(v) !== 'undefined')\r
-                                       o[n] = v;\r
-                       });\r
-               }\r
+                       for (i = 1, l = a.length; i < l; i++) {\r
+                               e = a[i];\r
 \r
-               return o;\r
-       },\r
+                               tinymce.each(e, function(v, n) {\r
+                                       if (v !== undefined)\r
+                                               o[n] = v;\r
+                               });\r
+                       }\r
 \r
-       trim : function(s) {\r
-               return (s ? '' + s : '').replace(/^\s*|\s*$/g, '');\r
-       },\r
+                       return o;\r
+               },\r
 \r
 \r
-       create : function(s, p) {\r
-               var t = this, sp, ns, cn, scn, c, de = 0;\r
+               trim : function(s) {\r
+                       return (s ? '' + s : '').replace(whiteSpaceRe, '');\r
+               },\r
 \r
-               // Parse : <prefix> <class>:<super class>\r
-               s = /^((static) )?([\w.]+)(:([\w.]+))?/.exec(s);\r
-               cn = s[3].match(/(^|\.)(\w+)$/i)[2]; // Class name\r
+               create : function(s, p) {\r
+                       var t = this, sp, ns, cn, scn, c, de = 0;\r
 \r
-               // Create namespace for new class\r
-               ns = t.createNS(s[3].replace(/\.\w+$/, ''));\r
+                       // Parse : <prefix> <class>:<super class>\r
+                       s = /^((static) )?([\w.]+)(:([\w.]+))?/.exec(s);\r
+                       cn = s[3].match(/(^|\.)(\w+)$/i)[2]; // Class name\r
 \r
-               // Class already exists\r
-               if (ns[cn])\r
-                       return;\r
+                       // Create namespace for new class\r
+                       ns = t.createNS(s[3].replace(/\.\w+$/, ''));\r
 \r
-               // Make pure static class\r
-               if (s[2] == 'static') {\r
-                       ns[cn] = p;\r
+                       // Class already exists\r
+                       if (ns[cn])\r
+                               return;\r
 \r
-                       if (this.onCreate)\r
-                               this.onCreate(s[2], s[3], ns[cn]);\r
+                       // Make pure static class\r
+                       if (s[2] == 'static') {\r
+                               ns[cn] = p;\r
 \r
-                       return;\r
-               }\r
+                               if (this.onCreate)\r
+                                       this.onCreate(s[2], s[3], ns[cn]);\r
 \r
-               // Create default constructor\r
-               if (!p[cn]) {\r
-                       p[cn] = function() {};\r
-                       de = 1;\r
-               }\r
+                               return;\r
+                       }\r
 \r
-               // Add constructor and methods\r
-               ns[cn] = p[cn];\r
-               t.extend(ns[cn].prototype, p);\r
-\r
-               // Extend\r
-               if (s[5]) {\r
-                       sp = t.resolve(s[5]).prototype;\r
-                       scn = s[5].match(/\.(\w+)$/i)[1]; // Class name\r
-\r
-                       // Extend constructor\r
-                       c = ns[cn];\r
-                       if (de) {\r
-                               // Add passthrough constructor\r
-                               ns[cn] = function() {\r
-                                       return sp[scn].apply(this, arguments);\r
-                               };\r
-                       } else {\r
-                               // Add inherit constructor\r
-                               ns[cn] = function() {\r
-                                       this.parent = sp[scn];\r
-                                       return c.apply(this, arguments);\r
-                               };\r
+                       // Create default constructor\r
+                       if (!p[cn]) {\r
+                               p[cn] = function() {};\r
+                               de = 1;\r
                        }\r
-                       ns[cn].prototype[cn] = ns[cn];\r
 \r
-                       // Add super methods\r
-                       t.each(sp, function(f, n) {\r
-                               ns[cn].prototype[n] = sp[n];\r
-                       });\r
+                       // Add constructor and methods\r
+                       ns[cn] = p[cn];\r
+                       t.extend(ns[cn].prototype, p);\r
 \r
-                       // Add overridden methods\r
-                       t.each(p, function(f, n) {\r
-                               // Extend methods if needed\r
-                               if (sp[n]) {\r
-                                       ns[cn].prototype[n] = function() {\r
-                                               this.parent = sp[n];\r
-                                               return f.apply(this, arguments);\r
+                       // Extend\r
+                       if (s[5]) {\r
+                               sp = t.resolve(s[5]).prototype;\r
+                               scn = s[5].match(/\.(\w+)$/i)[1]; // Class name\r
+\r
+                               // Extend constructor\r
+                               c = ns[cn];\r
+                               if (de) {\r
+                                       // Add passthrough constructor\r
+                                       ns[cn] = function() {\r
+                                               return sp[scn].apply(this, arguments);\r
                                        };\r
                                } else {\r
-                                       if (n != cn)\r
-                                               ns[cn].prototype[n] = f;\r
+                                       // Add inherit constructor\r
+                                       ns[cn] = function() {\r
+                                               this.parent = sp[scn];\r
+                                               return c.apply(this, arguments);\r
+                                       };\r
                                }\r
-                       });\r
-               }\r
+                               ns[cn].prototype[cn] = ns[cn];\r
 \r
-               // Add static methods\r
-               t.each(p['static'], function(f, n) {\r
-                       ns[cn][n] = f;\r
-               });\r
+                               // Add super methods\r
+                               t.each(sp, function(f, n) {\r
+                                       ns[cn].prototype[n] = sp[n];\r
+                               });\r
 \r
-               if (this.onCreate)\r
-                       this.onCreate(s[2], s[3], ns[cn].prototype);\r
-       },\r
+                               // Add overridden methods\r
+                               t.each(p, function(f, n) {\r
+                                       // Extend methods if needed\r
+                                       if (sp[n]) {\r
+                                               ns[cn].prototype[n] = function() {\r
+                                                       this.parent = sp[n];\r
+                                                       return f.apply(this, arguments);\r
+                                               };\r
+                                       } else {\r
+                                               if (n != cn)\r
+                                                       ns[cn].prototype[n] = f;\r
+                                       }\r
+                               });\r
+                       }\r
 \r
-       walk : function(o, f, n, s) {\r
-               s = s || this;\r
+                       // Add static methods\r
+                       t.each(p['static'], function(f, n) {\r
+                               ns[cn][n] = f;\r
+                       });\r
 \r
-               if (o) {\r
-                       if (n)\r
-                               o = o[n];\r
+                       if (this.onCreate)\r
+                               this.onCreate(s[2], s[3], ns[cn].prototype);\r
+               },\r
 \r
-                       tinymce.each(o, function(o, i) {\r
-                               if (f.call(s, o, i, n) === false)\r
-                                       return false;\r
+               walk : function(o, f, n, s) {\r
+                       s = s || this;\r
 \r
-                               tinymce.walk(o, f, n, s);\r
-                       });\r
-               }\r
-       },\r
+                       if (o) {\r
+                               if (n)\r
+                                       o = o[n];\r
 \r
-       createNS : function(n, o) {\r
-               var i, v;\r
+                               tinymce.each(o, function(o, i) {\r
+                                       if (f.call(s, o, i, n) === false)\r
+                                               return false;\r
 \r
-               o = o || window;\r
+                                       tinymce.walk(o, f, n, s);\r
+                               });\r
+                       }\r
+               },\r
 \r
-               n = n.split('.');\r
-               for (i=0; i<n.length; i++) {\r
-                       v = n[i];\r
+               createNS : function(n, o) {\r
+                       var i, v;\r
 \r
-                       if (!o[v])\r
-                               o[v] = {};\r
+                       o = o || win;\r
 \r
-                       o = o[v];\r
-               }\r
+                       n = n.split('.');\r
+                       for (i=0; i<n.length; i++) {\r
+                               v = n[i];\r
 \r
-               return o;\r
-       },\r
+                               if (!o[v])\r
+                                       o[v] = {};\r
 \r
-       resolve : function(n, o) {\r
-               var i, l;\r
+                               o = o[v];\r
+                       }\r
 \r
-               o = o || window;\r
+                       return o;\r
+               },\r
 \r
-               n = n.split('.');\r
-               for (i=0, l = n.length; i<l; i++) {\r
-                       o = o[n[i]];\r
+               resolve : function(n, o) {\r
+                       var i, l;\r
 \r
-                       if (!o)\r
-                               break;\r
-               }\r
+                       o = o || win;\r
 \r
-               return o;\r
-       },\r
+                       n = n.split('.');\r
+                       for (i = 0, l = n.length; i < l; i++) {\r
+                               o = o[n[i]];\r
 \r
-       addUnload : function(f, s) {\r
-               var t = this, w = window;\r
+                               if (!o)\r
+                                       break;\r
+                       }\r
 \r
-               f = {func : f, scope : s || this};\r
+                       return o;\r
+               },\r
 \r
-               if (!t.unloads) {\r
-                       function unload() {\r
-                               var li = t.unloads, o, n;\r
+               addUnload : function(f, s) {\r
+                       var t = this;\r
 \r
-                               if (li) {\r
-                                       // Call unload handlers\r
-                                       for (n in li) {\r
-                                               o = li[n];\r
+                       f = {func : f, scope : s || this};\r
 \r
-                                               if (o && o.func)\r
-                                                       o.func.call(o.scope, 1); // Send in one arg to distinct unload and user destroy\r
-                                       }\r
+                       if (!t.unloads) {\r
+                               function unload() {\r
+                                       var li = t.unloads, o, n;\r
 \r
-                                       // Detach unload function\r
-                                       if (w.detachEvent) {\r
-                                               w.detachEvent('onbeforeunload', fakeUnload);\r
-                                               w.detachEvent('onunload', unload);\r
-                                       } else if (w.removeEventListener)\r
-                                               w.removeEventListener('unload', unload, false);\r
+                                       if (li) {\r
+                                               // Call unload handlers\r
+                                               for (n in li) {\r
+                                                       o = li[n];\r
 \r
-                                       // Destroy references\r
-                                       t.unloads = o = li = w = unload = 0;\r
+                                                       if (o && o.func)\r
+                                                               o.func.call(o.scope, 1); // Send in one arg to distinct unload and user destroy\r
+                                               }\r
 \r
-                                       // Run garbarge collector on IE\r
-                                       if (window.CollectGarbage)\r
-                                               window.CollectGarbage();\r
-                               }\r
-                       };\r
+                                               // Detach unload function\r
+                                               if (win.detachEvent) {\r
+                                                       win.detachEvent('onbeforeunload', fakeUnload);\r
+                                                       win.detachEvent('onunload', unload);\r
+                                               } else if (win.removeEventListener)\r
+                                                       win.removeEventListener('unload', unload, false);\r
 \r
-                       function fakeUnload() {\r
-                               var d = document;\r
+                                               // Destroy references\r
+                                               t.unloads = o = li = w = unload = 0;\r
 \r
-                               // Is there things still loading, then do some magic\r
-                               if (d.readyState == 'interactive') {\r
-                                       function stop() {\r
-                                               // Prevent memory leak\r
-                                               d.detachEvent('onstop', stop);\r
+                                               // Run garbarge collector on IE\r
+                                               if (win.CollectGarbage)\r
+                                                       CollectGarbage();\r
+                                       }\r
+                               };\r
 \r
-                                               // Call unload handler\r
-                                               if (unload)\r
-                                                       unload();\r
+                               function fakeUnload() {\r
+                                       var d = document;\r
 \r
-                                               d = 0;\r
-                                       };\r
+                                       // Is there things still loading, then do some magic\r
+                                       if (d.readyState == 'interactive') {\r
+                                               function stop() {\r
+                                                       // Prevent memory leak\r
+                                                       d.detachEvent('onstop', stop);\r
+\r
+                                                       // Call unload handler\r
+                                                       if (unload)\r
+                                                               unload();\r
 \r
-                                       // Fire unload when the currently loading page is stopped\r
-                                       if (d)\r
-                                               d.attachEvent('onstop', stop);\r
+                                                       d = 0;\r
+                                               };\r
 \r
-                                       // Remove onstop listener after a while to prevent the unload function\r
-                                       // to execute if the user presses cancel in an onbeforeunload\r
-                                       // confirm dialog and then presses the browser stop button\r
-                                       window.setTimeout(function() {\r
+                                               // Fire unload when the currently loading page is stopped\r
                                                if (d)\r
-                                                       d.detachEvent('onstop', stop);\r
-                                       }, 0);\r
-                               }\r
-                       };\r
+                                                       d.attachEvent('onstop', stop);\r
+\r
+                                               // Remove onstop listener after a while to prevent the unload function\r
+                                               // to execute if the user presses cancel in an onbeforeunload\r
+                                               // confirm dialog and then presses the browser stop button\r
+                                               win.setTimeout(function() {\r
+                                                       if (d)\r
+                                                               d.detachEvent('onstop', stop);\r
+                                               }, 0);\r
+                                       }\r
+                               };\r
 \r
-                       // Attach unload handler\r
-                       if (w.attachEvent) {\r
-                               w.attachEvent('onunload', unload);\r
-                               w.attachEvent('onbeforeunload', fakeUnload);\r
-                       } else if (w.addEventListener)\r
-                               w.addEventListener('unload', unload, false);\r
+                               // Attach unload handler\r
+                               if (win.attachEvent) {\r
+                                       win.attachEvent('onunload', unload);\r
+                                       win.attachEvent('onbeforeunload', fakeUnload);\r
+                               } else if (win.addEventListener)\r
+                                       win.addEventListener('unload', unload, false);\r
 \r
-                       // Setup initial unload handler array\r
-                       t.unloads = [f];\r
-               } else\r
-                       t.unloads.push(f);\r
+                               // Setup initial unload handler array\r
+                               t.unloads = [f];\r
+                       } else\r
+                               t.unloads.push(f);\r
 \r
-               return f;\r
-       },\r
+                       return f;\r
+               },\r
 \r
-       removeUnload : function(f) {\r
-               var u = this.unloads, r = null;\r
+               removeUnload : function(f) {\r
+                       var u = this.unloads, r = null;\r
 \r
-               tinymce.each(u, function(o, i) {\r
-                       if (o && o.func == f) {\r
-                               u.splice(i, 1);\r
-                               r = f;\r
-                               return false;\r
-                       }\r
-               });\r
+                       tinymce.each(u, function(o, i) {\r
+                               if (o && o.func == f) {\r
+                                       u.splice(i, 1);\r
+                                       r = f;\r
+                                       return false;\r
+                               }\r
+                       });\r
 \r
-               return r;\r
-       },\r
+                       return r;\r
+               },\r
 \r
-       explode : function(s, d) {\r
-               return s ? tinymce.map(s.split(d || ','), tinymce.trim) : s;\r
-       },\r
+               explode : function(s, d) {\r
+                       return s ? tinymce.map(s.split(d || ','), tinymce.trim) : s;\r
+               },\r
 \r
-       _addVer : function(u) {\r
-               var v;\r
+               _addVer : function(u) {\r
+                       var v;\r
 \r
-               if (!this.query)\r
-                       return u;\r
+                       if (!this.query)\r
+                               return u;\r
 \r
-               v = (u.indexOf('?') == -1 ? '?' : '&') + this.query;\r
+                       v = (u.indexOf('?') == -1 ? '?' : '&') + this.query;\r
 \r
-               if (u.indexOf('#') == -1)\r
-                       return u + v;\r
+                       if (u.indexOf('#') == -1)\r
+                               return u + v;\r
 \r
-               return u.replace('#', v + '#');\r
-       }\r
+                       return u.replace('#', v + '#');\r
+               }\r
 \r
-       };\r
+               };\r
+\r
+       // Initialize the API\r
+       tinymce._init();\r
+\r
+       // Expose tinymce namespace to the global namespace (window)\r
+       win.tinymce = win.tinyMCE = tinymce;\r
+})(window);\r
 \r
-// Required for GZip AJAX loading\r
-window.tinymce = tinymce;\r
 \r
-// Initialize the API\r
-tinymce._init();\r
 tinymce.create('tinymce.util.Dispatcher', {\r
        scope : null,\r
        listeners : null,\r
@@ -476,6 +492,7 @@ tinymce.create('tinymce.util.Dispatcher', {
        }\r
 \r
        });\r
+\r
 (function() {\r
        var each = tinymce.each;\r
 \r
@@ -483,11 +500,14 @@ tinymce.create('tinymce.util.Dispatcher', {
                URI : function(u, s) {\r
                        var t = this, o, a, b;\r
 \r
+                       // Trim whitespace\r
+                       u = tinymce.trim(u);\r
+\r
                        // Default settings\r
                        s = t.settings = s || {};\r
 \r
                        // Strange app protocol or local anchor\r
-                       if (/^(mailto|tel|news|javascript|about):/i.test(u) || /^\s*#/.test(u)) {\r
+                       if (/^(mailto|tel|news|javascript|about|data):/i.test(u) || /^\s*#/.test(u)) {\r
                                t.source = u;\r
                                return;\r
                        }\r
@@ -496,8 +516,8 @@ tinymce.create('tinymce.util.Dispatcher', {
                        if (u.indexOf('/') === 0 && u.indexOf('//') !== 0)\r
                                u = (s.base_uri ? s.base_uri.protocol || 'http' : 'http') + '://mce_host' + u;\r
 \r
-                       // Relative path\r
-                       if (u.indexOf(':/') === -1 && u.indexOf('//') !== 0)\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
 \r
                        // Parse URL (Credits goes to Steave, http://blog.stevenlevithan.com/archives/parseuri)\r
@@ -575,7 +595,7 @@ tinymce.create('tinymce.util.Dispatcher', {
                toAbsolute : function(u, nh) {\r
                        var u = new tinymce.util.URI(u, {base_uri : this});\r
 \r
-                       return u.getURI(this.host == u.host ? nh : 0);\r
+                       return u.getURI(this.host == u.host && this.protocol == u.protocol ? nh : 0);\r
                },\r
 \r
                toRelPath : function(base, path) {\r
@@ -621,7 +641,7 @@ tinymce.create('tinymce.util.Dispatcher', {
                },\r
 \r
                toAbsPath : function(base, path) {\r
-                       var i, nb = 0, o = [], tr;\r
+                       var i, nb = 0, o = [], tr, outPath;\r
 \r
                        // Split paths\r
                        tr = /\/$/.test(path) ? '/' : '';\r
@@ -661,9 +681,19 @@ tinymce.create('tinymce.util.Dispatcher', {
 \r
                        // If /a/b/c or /\r
                        if (i <= 0)\r
-                               return '/' + o.reverse().join('/') + tr;\r
+                               outPath = o.reverse().join('/');\r
+                       else\r
+                               outPath = base.slice(0, i).join('/') + '/' + o.reverse().join('/');\r
+\r
+                       // Add front / if it's needed\r
+                       if (outPath.indexOf('/') !== 0)\r
+                               outPath = '/' + outPath;\r
+\r
+                       // Add traling / if it's needed\r
+                       if (tr && outPath.lastIndexOf('/') !== outPath.length - 1)\r
+                               outPath += tr;\r
 \r
-                       return '/' + base.slice(0, i).join('/') + '/' + o.reverse().join('/') + tr;\r
+                       return outPath;\r
                },\r
 \r
                getURI : function(nh) {\r
@@ -701,9 +731,9 @@ tinymce.create('tinymce.util.Dispatcher', {
 \r
                        return t.source;\r
                }\r
-\r
-               });\r
+       });\r
 })();\r
+\r
 (function() {\r
        var each = tinymce.each;\r
 \r
@@ -772,9 +802,9 @@ tinymce.create('tinymce.util.Dispatcher', {
 \r
                        this.set(n, '', d, p, d);\r
                }\r
-\r
-               });\r
+       });\r
 })();\r
+\r
 tinymce.create('static tinymce.util.JSON', {\r
        serialize : function(o) {\r
                var i, v, s = tinymce.util.JSON.serialize, t;\r
@@ -827,6 +857,7 @@ tinymce.create('static tinymce.util.JSON', {
        }\r
 \r
        });\r
+\r
 tinymce.create('static tinymce.util.XHR', {\r
        send : function(o) {\r
                var x, t, w = window, c = 0;\r
@@ -860,6 +891,8 @@ tinymce.create('static tinymce.util.XHR', {
                        if (o.content_type)\r
                                x.setRequestHeader('Content-Type', o.content_type);\r
 \r
+                       x.setRequestHeader('X-Requested-With', 'XMLHttpRequest');\r
+\r
                        x.send(o.data);\r
 \r
                        function ready() {\r
@@ -881,9 +914,9 @@ tinymce.create('static tinymce.util.XHR', {
                        // Wait for response, onReadyStateChange can not be used since it leaks memory in IE\r
                        t = w.setTimeout(ready, 10);\r
                }\r
-\r
-               }\r
+       }\r
 });\r
+\r
 (function() {\r
        var extend = tinymce.extend, JSON = tinymce.util.JSON, XHR = tinymce.util.XHR;\r
 \r
@@ -935,12 +968,32 @@ tinymce.create('static tinymce.util.XHR', {
                                return new tinymce.util.JSONRequest().send(o);\r
                        }\r
                }\r
-\r
-               });\r
-}());(function(tinymce) {\r
+       });\r
+}());\r
+(function(tinymce) {\r
        // Shorten names\r
-       var each = tinymce.each, is = tinymce.is;\r
-       var isWebKit = tinymce.isWebKit, isIE = tinymce.isIE;\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
+\r
+       function makeMap(str) {\r
+               var map = {}, i;\r
+\r
+               str = str.split(',');\r
+               for (i = str.length; i >= 0; i--)\r
+                       map[str[i]] = 1;\r
+\r
+               return map;\r
+       };\r
 \r
        tinymce.create('tinymce.dom.DOMUtils', {\r
                doc : null,\r
@@ -963,7 +1016,7 @@ tinymce.create('static tinymce.util.XHR', {
                },\r
 \r
                DOMUtils : function(d, s) {\r
-                       var t = this;\r
+                       var t = this, globalStyle;\r
 \r
                        t.doc = d;\r
                        t.win = window;\r
@@ -973,7 +1026,7 @@ tinymce.create('static tinymce.util.XHR', {
                        t.boxModel = !tinymce.isIE || d.compatMode == "CSS1Compat"; \r
                        t.stdMode = d.documentMode === 8;\r
 \r
-                       this.settings = s = tinymce.extend({\r
+                       t.settings = s = tinymce.extend({\r
                                keep_values : false,\r
                                hex_colors : 1,\r
                                process_html : 1\r
@@ -988,6 +1041,16 @@ tinymce.create('static tinymce.util.XHR', {
                                }\r
                        }\r
 \r
+                       // Build styles list\r
+                       if (s.valid_styles) {\r
+                               t._styles = {};\r
+\r
+                               // Convert styles into a rule list\r
+                               each(s.valid_styles, function(value, key) {\r
+                                       t._styles[key] = tinymce.explode(value);\r
+                               });\r
+                       }\r
+\r
                        tinymce.addUnload(t.destroy, t);\r
                },\r
 \r
@@ -1049,10 +1112,6 @@ tinymce.create('static tinymce.util.XHR', {
                        };\r
                },\r
 \r
-               is : function(n, patt) {\r
-                       return tinymce.dom.Sizzle.matches(patt, n.nodeType ? [n] : n).length > 0;\r
-               },\r
-\r
                getParent : function(n, f, r) {\r
                        return this.getParents(n, f, r, false);\r
                },\r
@@ -1111,6 +1170,14 @@ tinymce.create('static tinymce.util.XHR', {
                        return e;\r
                },\r
 \r
+               getNext : function(node, selector) {\r
+                       return this._findSib(node, selector, 'nextSibling');\r
+               },\r
+\r
+               getPrev : function(node, selector) {\r
+                       return this._findSib(node, selector, 'previousSibling');\r
+               },\r
+\r
 \r
                select : function(pa, s) {\r
                        var t = this;\r
@@ -1118,6 +1185,32 @@ tinymce.create('static tinymce.util.XHR', {
                        return tinymce.dom.Sizzle(pa, t.get(s) || t.get(t.settings.root_element) || t.doc, []);\r
                },\r
 \r
+               is : function(n, selector) {\r
+                       var i;\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
+\r
+                               // Simple selector just elements\r
+                               if (simpleSelectorRe.test(selector)) {\r
+                                       selector = selector.toLowerCase().split(/,/);\r
+                                       n = n.nodeName.toLowerCase();\r
+\r
+                                       for (i = selector.length - 1; i >= 0; i--) {\r
+                                               if (selector[i] == n)\r
+                                                       return true;\r
+                                       }\r
+\r
+                                       return false;\r
+                               }\r
+                       }\r
+\r
+                       return tinymce.dom.Sizzle.matches(selector, n.nodeType ? [n] : n).length > 0;\r
+               },\r
+\r
 \r
                add : function(p, n, a, h, c) {\r
                        var t = this;\r
@@ -1159,42 +1252,29 @@ tinymce.create('static tinymce.util.XHR', {
                        return o + ' />';\r
                },\r
 \r
-               remove : function(n, k) {\r
-                       var t = this;\r
-\r
-                       return this.run(n, function(n) {\r
-                               var p, g, i;\r
+               remove : function(node, keep_children) {\r
+                       return this.run(node, function(node) {\r
+                               var parent, child;\r
 \r
-                               p = n.parentNode;\r
+                               parent = node.parentNode;\r
 \r
-                               if (!p)\r
+                               if (!parent)\r
                                        return null;\r
 \r
-                               if (k) {\r
-                                       for (i = n.childNodes.length - 1; i >= 0; i--)\r
-                                               t.insertAfter(n.childNodes[i], n);\r
-\r
-                                       //each(n.childNodes, function(c) {\r
-                                       //      p.insertBefore(c.cloneNode(true), n);\r
-                                       //});\r
-                               }\r
-\r
-                               // Fix IE psuedo leak\r
-                               if (t.fixPsuedoLeaks) {\r
-                                       p = n.cloneNode(true);\r
-                                       k = 'IELeakGarbageBin';\r
-                                       g = t.get(k) || t.add(t.doc.body, 'div', {id : k, style : 'display:none'});\r
-                                       g.appendChild(n);\r
-                                       g.innerHTML = '';\r
-\r
-                                       return p;\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 p.removeChild(n);\r
+                               return parent.removeChild(node);\r
                        });\r
                },\r
 \r
-\r
                setStyle : function(n, na, v) {\r
                        var t = this;\r
 \r
@@ -1236,7 +1316,7 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                                // Force update of the style data\r
                                if (t.settings.update_styles)\r
-                                       t.setAttrib(e, 'mce_style');\r
+                                       t.setAttrib(e, '_mce_style');\r
                        });\r
                },\r
 \r
@@ -1319,9 +1399,9 @@ tinymce.create('static tinymce.util.XHR', {
                                                // 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
+                                                               e.setAttribute('_mce_style', v, 2);\r
                                                        else\r
-                                                               e.removeAttribute('mce_style', 2);\r
+                                                               e.removeAttribute('_mce_style', 2);\r
                                                }\r
 \r
                                                e.style.cssText = v;\r
@@ -1337,13 +1417,13 @@ tinymce.create('static tinymce.util.XHR', {
                                                        if (s.url_converter)\r
                                                                v = s.url_converter.call(s.url_converter_scope || t, v, n, e);\r
 \r
-                                                       t.setAttrib(e, 'mce_' + n, v, 2);\r
+                                                       t.setAttrib(e, '_mce_' + n, v, 2);\r
                                                }\r
 \r
                                                break;\r
                                        \r
                                        case "shape":\r
-                                               e.setAttribute('mce_style', v);\r
+                                               e.setAttribute('_mce_style', v);\r
                                                break;\r
                                }\r
 \r
@@ -1364,7 +1444,6 @@ tinymce.create('static tinymce.util.XHR', {
                        });\r
                },\r
 \r
-\r
                getAttrib : function(e, n, dv) {\r
                        var v, t = this;\r
 \r
@@ -1378,7 +1457,7 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                        // Try the mce variant for these\r
                        if (/^(src|href|style|coords|shape)$/.test(n)) {\r
-                               v = e.getAttribute("mce_" + n);\r
+                               v = e.getAttribute("_mce_" + n);\r
 \r
                                if (v)\r
                                        return v;\r
@@ -1392,14 +1471,26 @@ tinymce.create('static tinymce.util.XHR', {
                        if (!v)\r
                                v = e.getAttribute(n, 2);\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
+\r
+                               return v ? n : '';\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
+\r
                        if (n === 'style') {\r
                                v = v || e.style.cssText;\r
 \r
                                if (v) {\r
-                                       v = t.serializeStyle(t.parseStyle(v));\r
+                                       v = t.serializeStyle(t.parseStyle(v), e.nodeName);\r
 \r
                                        if (t.settings.keep_values && !t._isRes(v))\r
-                                               e.setAttribute('mce_style', v);\r
+                                               e.setAttribute('_mce_style', v);\r
                                }\r
                        }\r
 \r
@@ -1467,7 +1558,7 @@ tinymce.create('static tinymce.util.XHR', {
                                        default:\r
                                                // IE has odd anonymous function for event attributes\r
                                                if (n.indexOf('on') === 0 && v)\r
-                                                       v = ('' + v).replace(/^function\s+anonymous\(\)\s+\{\s+(.*)\s+\}$/, '$1');\r
+                                                       v = ('' + v).replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/, '$1');\r
                                }\r
                        }\r
 \r
@@ -1609,15 +1700,23 @@ tinymce.create('static tinymce.util.XHR', {
                        return o;\r
                },\r
 \r
-               serializeStyle : function(o) {\r
-                       var s = '';\r
+               serializeStyle : function(o, name) {\r
+                       var t = this, s = '';\r
 \r
-                       each(o, function(v, k) {\r
+                       function add(v, k) {\r
                                if (k && v) {\r
-                                       if (tinymce.isGecko && k.indexOf('-moz-') === 0)\r
+                                       // Remove browser specific styles like -moz- or -webkit-\r
+                                       if (k.indexOf('-') === 0)\r
                                                return;\r
 \r
                                        switch (k) {\r
+                                               case 'font-weight':\r
+                                                       // Opera will output bold as 700\r
+                                                       if (v == 700)\r
+                                                               v = 'bold';\r
+\r
+                                                       break;\r
+\r
                                                case 'color':\r
                                                case 'background-color':\r
                                                        v = v.toLowerCase();\r
@@ -1626,27 +1725,54 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                                        s += (s ? ' ' : '') + k + ': ' + v + ';';\r
                                }\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
+\r
+                               each(t._styles[name.toLowerCase()], function(name) {\r
+                                       add(o[name], name);\r
+                               });\r
+                       } else\r
+                               each(o, add);\r
 \r
                        return s;\r
                },\r
 \r
                loadCSS : function(u) {\r
-                       var t = this, d = t.doc;\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
-                               t.add(t.select('head')[0], 'link', {rel : 'stylesheet', href : tinymce._addVer(u)});\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) {\r
+                                       link.onload = function() {\r
+                                               d.recalc();\r
+                                               link.onload = null;\r
+                                       };\r
+                               }\r
+\r
+                               head.appendChild(link);\r
                        });\r
                },\r
 \r
-\r
                addClass : function(e, c) {\r
                        return this.run(e, function(e) {\r
                                var o;\r
@@ -1674,8 +1800,17 @@ tinymce.create('static tinymce.util.XHR', {
                                                re = new RegExp("(^|\\s+)" + c + "(\\s+|$)", "g");\r
 \r
                                        v = e.className.replace(re, ' ');\r
+                                       v = tinymce.trim(v != ' ' ? v : '');\r
 \r
-                                       return e.className = tinymce.trim(v != ' ' ? v : '');\r
+                                       e.className = v;\r
+\r
+                                       // Empty class attr\r
+                                       if (!v) {\r
+                                               e.removeAttribute('class');\r
+                                               e.removeAttribute('className');\r
+                                       }\r
+\r
+                                       return v;\r
                                }\r
 \r
                                return e.className;\r
@@ -1705,7 +1840,6 @@ tinymce.create('static tinymce.util.XHR', {
                        return !e || e.style.display == 'none' || this.getStyle(e, 'display') == 'none';\r
                },\r
 \r
-\r
                uniqueId : function(p) {\r
                        return (!p ? 'mce_' : p) + (this.counter++);\r
                },\r
@@ -1720,6 +1854,10 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                                if (isIE) {\r
                                        function set() {\r
+                                               // Remove all child nodes\r
+                                               while (e.firstChild)\r
+                                                       e.firstChild.removeNode();\r
+\r
                                                try {\r
                                                        // IE will remove comments from the beginning\r
                                                        // unless you padd the contents with something\r
@@ -1729,10 +1867,6 @@ tinymce.create('static tinymce.util.XHR', {
                                                        // 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
-                                                       // Remove all child nodes\r
-                                                       while (e.firstChild)\r
-                                                               e.firstChild.removeNode();\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
@@ -1750,7 +1884,7 @@ tinymce.create('static tinymce.util.XHR', {
                                        // 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
+                                               h = h.replace(/<p><\/p>|<p([^>]+)><\/p>|<p[^\/+]\/>/gi, '<p$1 _mce_keep="true">&nbsp;</p>');\r
 \r
                                        set();\r
 \r
@@ -1761,12 +1895,12 @@ tinymce.create('static tinymce.util.XHR', {
                                                        n = nl[i];\r
 \r
                                                        if (!n.hasChildNodes()) {\r
-                                                               if (!n.mce_keep) {\r
+                                                               if (!n._mce_keep) {\r
                                                                        x = 1; // Is broken\r
                                                                        break;\r
                                                                }\r
 \r
-                                                               n.removeAttribute('mce_keep');\r
+                                                               n.removeAttribute('_mce_keep');\r
                                                        }\r
                                                }\r
                                        }\r
@@ -1775,13 +1909,13 @@ tinymce.create('static tinymce.util.XHR', {
                                        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>/g, '<div $1 mce_tmp="1">');\r
-                                               h = h.replace(/<\/p>/g, '</div>');\r
+                                               h = h.replace(/<p ([^>]+)>|<p>/ig, '<div $1 _mce_tmp="1">');\r
+                                               h = h.replace(/<\/p>/gi, '</div>');\r
 \r
                                                // Set the new HTML with DIVs\r
                                                set();\r
 \r
-                                               // Replace all DIV elements with he mce_tmp attibute back to paragraphs\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
@@ -1790,7 +1924,7 @@ tinymce.create('static tinymce.util.XHR', {
                                                                n = nl[i];\r
 \r
                                                                // Is it a temp div\r
-                                                               if (n.mce_tmp) {\r
+                                                               if (n._mce_tmp) {\r
                                                                        // Create new paragraph\r
                                                                        p = t.doc.createElement('p');\r
 \r
@@ -1798,7 +1932,7 @@ tinymce.create('static tinymce.util.XHR', {
                                                                        n.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi, function(a, b) {\r
                                                                                var v;\r
 \r
-                                                                               if (b !== 'mce_tmp') {\r
+                                                                               if (b !== '_mce_tmp') {\r
                                                                                        v = n.getAttribute(b);\r
 \r
                                                                                        if (!v && b === 'class')\r
@@ -1826,16 +1960,12 @@ tinymce.create('static tinymce.util.XHR', {
                },\r
 \r
                processHTML : function(h) {\r
-                       var t = this, s = t.settings;\r
+                       var t = this, s = t.settings, codeBlocks = [];\r
 \r
                        if (!s.process_html)\r
                                return h;\r
 \r
-                       // Convert strong and em to b and i in FF since it can't handle them\r
-                       if (tinymce.isGecko) {\r
-                               h = h.replace(/<(\/?)strong>|<strong( [^>]+)>/gi, '<$1b$2>');\r
-                               h = h.replace(/<(\/?)em>|<em( [^>]+)>/gi, '<$1i$2>');\r
-                       } else if (isIE) {\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
                        }\r
@@ -1843,10 +1973,10 @@ tinymce.create('static tinymce.util.XHR', {
                        // Fix some issues\r
                        h = h.replace(/<a( )([^>]+)\/>|<a\/>/gi, '<a$1$2></a>'); // Force open\r
 \r
-                       // Store away src and href in mce_src and mce_href since browsers mess them up\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|style/.test(h)) {\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
@@ -1857,69 +1987,92 @@ tinymce.create('static tinymce.util.XHR', {
                                                return s;\r
                                        };\r
 \r
-                                       // Preserve script elements\r
-                                       h = h.replace(/<script([^>]+|)>([\s\S]*?)<\/script>/g, function(v, a, b) {\r
-                                               // Remove prefix and suffix code for script element\r
-                                               b = trim(b);\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 (!a)\r
-                                                       a = ' type="text/javascript"';\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
+\r
+                                                       return '_mce_src="' + url + '"';\r
+                                               });\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
+\r
+                                               return '<mce:script' + attribs + '>' + text + '</mce:script>';\r
+                                       });\r
 \r
-                                               // Wrap contents in a comment\r
-                                               if (b)\r
-                                                       b = '<!--\n' + b + '\n// -->';\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
 \r
-                                               // Output fake element\r
-                                               return '<mce:script' + a + '>' + b + '</mce:script>';\r
+                                               return '<mce:style' + attribs + '>' + text + '</mce:style><style ' + attribs + ' _mce_bogus="1">' + text + '</style>';\r
                                        });\r
 \r
-                                       // Preserve style elements\r
-                                       h = h.replace(/<style([^>]+|)>([\s\S]*?)<\/style>/g, function(v, a, b) {\r
-                                               b = trim(b);\r
-                                               return '<mce:style' + a + '><!--\n' + b + '\n--></mce:style><style' + a + ' mce_bogus="1">' + b + '</style>';\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
 \r
                                h = h.replace(/<!\[CDATA\[([\s\S]+)\]\]>/g, '<!--[CDATA[$1]]-->');\r
 \r
-                               // Process all tags with src, href or style\r
-                               h = h.replace(/<([\w:]+) [^>]*(src|href|style|shape|coords)[^>]*>/gi, function(a, n) {\r
-                                       function handle(m, b, c) {\r
-                                               var u = c;\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
 \r
-                                               // Tag already got a mce_ version\r
-                                               if (a.indexOf('mce_' + b) != -1)\r
-                                                       return m;\r
+                                                       name = name.toLowerCase();\r
+                                                       value = value || val2 || val3 || "";\r
 \r
-                                               if (b == 'style') {\r
-                                                       // No mce_style for elements with these since they might get resized by the user\r
-                                                       if (t._isRes(c))\r
-                                                               return m;\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
 \r
-                                                       if (s.hex_colors) {\r
-                                                               u = u.replace(/rgb\([^\)]+\)/g, function(v) {\r
-                                                                       return t.toHex(v);\r
-                                                               });\r
+                                                               return name + '="' + name + '"';\r
                                                        }\r
 \r
-                                                       if (s.url_converter) {\r
-                                                               u = u.replace(/url\([\'\"]?([^\)\'\"]+)\)/g, function(x, c) {\r
-                                                                       return 'url(' + t.encode(s.url_converter.call(s.url_converter_scope || t, t.decode(c), b, n)) + ')';\r
-                                                               });\r
+                                                       // Is attribute one that needs special treatment\r
+                                                       if (mceAttribs[name] && attrs.indexOf('_mce_' + name) == -1) {\r
+                                                               mceValue = t.decode(value);\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
+\r
+                                                               // Process styles lowercases them and compresses them\r
+                                                               if (name == 'style')\r
+                                                                       mceValue = t.serializeStyle(t.parseStyle(mceValue), name);\r
+\r
+                                                               return name + '="' + value + '"' + ' _mce_' + name + '="' + t.encode(mceValue) + '"';\r
                                                        }\r
-                                               } else if (b != 'coords' && b != 'shape') {\r
-                                                       if (s.url_converter)\r
-                                                               u = t.encode(s.url_converter.call(s.url_converter_scope || t, t.decode(c), b, n));\r
-                                               }\r
 \r
-                                               return ' ' + b + '="' + c + '" mce_' + b + '="' + u + '"';\r
-                                       };\r
+                                                       return match;\r
+                                               }) + end + '>';\r
+                                       });\r
+                               };\r
 \r
-                                       a = a.replace(/ (src|href|style|coords|shape)=[\"]([^\"]+)[\"]/gi, handle); // W3C\r
-                                       a = a.replace(/ (src|href|style|coords|shape)=[\']([^\']+)[\']/gi, handle); // W3C\r
+                               h = processTags(h);\r
 \r
-                                       return a.replace(/ (src|href|style|coords|shape)=([^\s\"\'>]+)/gi, handle); // IE\r
+                               // Restore script blocks\r
+                               h = h.replace(/MCE_SCRIPT:([0-9]+)/g, function(val, idx) {\r
+                                       return codeBlocks[idx];\r
                                });\r
                        }\r
 \r
@@ -1946,25 +2099,41 @@ tinymce.create('static tinymce.util.XHR', {
                setOuterHTML : function(e, h, d) {\r
                        var t = this;\r
 \r
-                       return this.run(e, function(e) {\r
+                       function setHTML(e, h, d) {\r
                                var n, tp;\r
 \r
+                               tp = d.createElement("body");\r
+                               tp.innerHTML = h;\r
+\r
+                               n = tp.lastChild;\r
+                               while (n) {\r
+                                       t.insertAfter(n.cloneNode(true), e);\r
+                                       n = n.previousSibling;\r
+                               }\r
+\r
+                               t.remove(e);\r
+                       };\r
+\r
+                       return this.run(e, function(e) {\r
                                e = t.get(e);\r
-                               d = d || e.ownerDocument || t.doc;\r
-\r
-                               if (isIE && e.nodeType == 1)\r
-                                       e.outerHTML = h;\r
-                               else {\r
-                                       tp = d.createElement("body");\r
-                                       tp.innerHTML = h;\r
-\r
-                                       n = tp.lastChild;\r
-                                       while (n) {\r
-                                               t.insertAfter(n.cloneNode(true), e);\r
-                                               n = n.previousSibling;\r
-                                       }\r
 \r
-                                       t.remove(e);\r
+                               // Only set HTML on elements\r
+                               if (e.nodeType == 1) {\r
+                                       d = d || e.ownerDocument || t.doc;\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
                },\r
@@ -1973,7 +2142,7 @@ tinymce.create('static tinymce.util.XHR', {
                        var e, n, v;\r
 \r
                        // Look for entities to decode\r
-                       if (/&[^;]+;/.test(s)) {\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
@@ -1983,7 +2152,7 @@ tinymce.create('static tinymce.util.XHR', {
                                if (n) {\r
                                        do {\r
                                                v += n.nodeValue;\r
-                                       } while (n.nextSibling);\r
+                                       } while (n = n.nextSibling);\r
                                }\r
 \r
                                return v || s;\r
@@ -1992,58 +2161,39 @@ tinymce.create('static tinymce.util.XHR', {
                        return s;\r
                },\r
 \r
-               encode : function(s) {\r
-                       return s ? ('' + s).replace(/[<>&\"]/g, function (c, b) {\r
-                               switch (c) {\r
-                                       case '&':\r
-                                               return '&amp;';\r
-\r
-                                       case '"':\r
-                                               return '&quot;';\r
-\r
-                                       case '<':\r
-                                               return '&lt;';\r
-\r
-                                       case '>':\r
-                                               return '&gt;';\r
-                               }\r
-\r
-                               return c;\r
-                       }) : s;\r
+               encode : function(str) {\r
+                       return ('' + str).replace(encodeCharsRe, function(chr) {\r
+                               return encodedChars[chr];\r
+                       });\r
                },\r
 \r
+               insertAfter : function(node, reference_node) {\r
+                       reference_node = this.get(reference_node);\r
 \r
-               insertAfter : function(n, r) {\r
-                       var t = this;\r
-\r
-                       r = t.get(r);\r
-\r
-                       return this.run(n, function(n) {\r
-                               var p, ns;\r
+                       return this.run(node, function(node) {\r
+                               var parent, nextSibling;\r
 \r
-                               p = r.parentNode;\r
-                               ns = r.nextSibling;\r
+                               parent = reference_node.parentNode;\r
+                               nextSibling = reference_node.nextSibling;\r
 \r
-                               if (ns)\r
-                                       p.insertBefore(n, ns);\r
+                               if (nextSibling)\r
+                                       parent.insertBefore(node, nextSibling);\r
                                else\r
-                                       p.appendChild(n);\r
+                                       parent.appendChild(node);\r
 \r
-                               return n;\r
+                               return node;\r
                        });\r
                },\r
 \r
-\r
                isBlock : function(n) {\r
                        if (n.nodeType && n.nodeType !== 1)\r
                                return false;\r
 \r
                        n = n.nodeName || n;\r
 \r
-                       return /^(H[1-6]|HR|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TR|TD|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP)$/.test(n);\r
+                       return blockRe.test(n);\r
                },\r
 \r
-\r
                replace : function(n, o, k) {\r
                        var t = this;\r
 \r
@@ -2052,23 +2202,33 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                        return t.run(o, function(o) {\r
                                if (k) {\r
-                                       each(o.childNodes, function(c) {\r
-                                               n.appendChild(c.cloneNode(true));\r
+                                       each(tinymce.grep(o.childNodes), function(c) {\r
+                                               n.appendChild(c);\r
                                        });\r
                                }\r
 \r
-                               // Fix IE psuedo leak for elements since replacing elements if fairly common\r
-                               // Will break parentNode for some unknown reason\r
-                               if (t.fixPsuedoLeaks && o.nodeType === 1) {\r
-                                       o.parentNode.insertBefore(n, o);\r
-                                       t.remove(o);\r
-                                       return n;\r
-                               }\r
-\r
                                return o.parentNode.replaceChild(n, o);\r
                        });\r
                },\r
 \r
+               rename : function(elm, name) {\r
+                       var t = this, newElm;\r
+\r
+                       if (elm.nodeName != name.toUpperCase()) {\r
+                               // Rename block element\r
+                               newElm = t.create(name);\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
+                               // Replace block\r
+                               t.replace(newElm, elm, 1);\r
+                       }\r
+\r
+                       return newElm || elm;\r
+               },\r
 \r
                findCommonAncestor : function(a, b) {\r
                        var ps = a, pe;\r
@@ -2213,9 +2373,13 @@ tinymce.create('static tinymce.util.XHR', {
                                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(/([a-z0-9\:\-_]+)=/gi, function(a, b) {\r
-                                       o.push({specified : 1, nodeName : b});\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
@@ -2227,7 +2391,10 @@ tinymce.create('static tinymce.util.XHR', {
                destroy : function(s) {\r
                        var t = this;\r
 \r
-                       t.win = t.doc = t.root = null;\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
@@ -2240,70 +2407,138 @@ tinymce.create('static tinymce.util.XHR', {
                        return d.createRange ? d.createRange() : new tinymce.dom.Range(this);\r
                },\r
 \r
+               nodeIndex : function(node, normalized) {\r
+                       var idx = 0, lastNodeType, lastNode, nodeType;\r
+\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
+\r
+                                       idx++;\r
+                                       lastNodeType = nodeType;\r
+                               }\r
+                       }\r
+\r
+                       return idx;\r
+               },\r
+\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 sence\r
-                       // but we don't want that in our code since it serves no purpose\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 trimEdge(n, na) {\r
-                               n = n[na];\r
+                       function trim(node) {\r
+                               var i, children = node.childNodes;\r
 \r
-                               if (n && n[na] && n[na].nodeType == 1 && isEmpty(n[na]))\r
-                                       t.remove(n[na]);\r
-                       };\r
+                               if (node.nodeType == 1 && node.getAttribute('_mce_type') == 'bookmark')\r
+                                       return;\r
+\r
+                               for (i = children.length - 1; i >= 0; i--)\r
+                                       trim(children[i]);\r
+\r
+                               if (node.nodeType != 9) {\r
+                                       // Keep non whitespace text nodes\r
+                                       if (node.nodeType == 3 && node.nodeValue.length > 0)\r
+                                               return;\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
+\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
-                       function isEmpty(n) {\r
-                               n = t.getOuterHTML(n);\r
-                               n = n.replace(/<(img|hr|table)/gi, '-'); // Keep these convert them to - chars\r
-                               n = n.replace(/<[^>]+>/g, ''); // Remove all tags\r
+                                       t.remove(node);\r
+                               }\r
 \r
-                               return n.replace(/[ \t\r\n]+|&nbsp;|&#160;/g, '') == '';\r
+                               return node;\r
                        };\r
 \r
                        if (pe && e) {\r
                                // Get before chunk\r
-                               r.setStartBefore(pe);\r
-                               r.setEndBefore(e);\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.setStartAfter(e);\r
-                               r.setEndAfter(pe);\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 chunks and remove parent\r
+                               // Insert before chunk\r
                                pa = pe.parentNode;\r
+                               pa.insertBefore(trim(bef), pe);\r
 \r
-                               // Remove right side edge of the before contents\r
-                               trimEdge(bef, 'lastChild');\r
-\r
-                               if (!isEmpty(bef))\r
-                                       pa.insertBefore(bef, pe);\r
-\r
+                               // Insert middle chunk\r
                                if (re)\r
                                        pa.replaceChild(re, e);\r
                                else\r
                                        pa.insertBefore(e, pe);\r
 \r
-                               // Remove left site edge of the after contents\r
-                               trimEdge(aft, 'firstChild');\r
-\r
-                               if (!isEmpty(aft))\r
-                                       pa.insertBefore(aft, pe);\r
-\r
+                               // Insert after chunk\r
+                               pa.insertBefore(trim(aft), pe);\r
                                t.remove(pe);\r
 \r
                                return re || e;\r
                        }\r
                },\r
 \r
+               bind : function(target, name, func, scope) {\r
+                       var t = this;\r
+\r
+                       if (!t.events)\r
+                               t.events = new tinymce.dom.EventUtils();\r
+\r
+                       return t.events.add(target, name, func, scope || this);\r
+               },\r
+\r
+               unbind : function(target, name, func) {\r
+                       var t = this;\r
+\r
+                       if (!t.events)\r
+                               t.events = new tinymce.dom.EventUtils();\r
+\r
+                       return t.events.remove(target, name, func);\r
+               },\r
+\r
+\r
+               _findSib : function(node, selector, name) {\r
+                       var t = this, f = selector;\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
+\r
+                               // Loop all siblings\r
+                               for (node = node[name]; node; node = node[name]) {\r
+                                       if (f(node))\r
+                                               return node;\r
+                               }\r
+                       }\r
+\r
+                       return null;\r
+               },\r
 \r
                _isRes : function(c) {\r
                        // Is live resizble element\r
@@ -2339,237 +2574,239 @@ tinymce.create('static tinymce.util.XHR', {
                        return s;\r
                }\r
                */\r
+       });\r
 \r
-               });\r
-\r
-       // Setup page DOM\r
        tinymce.DOM = new tinymce.dom.DOMUtils(document, {process_html : 0});\r
 })(tinymce);\r
-(function(ns) {\r
-       // Traverse constants\r
-       var EXTRACT = 0, CLONE = 1, DELETE = 2, extend = tinymce.extend;\r
-\r
-       function indexOf(child, parent) {\r
-               var i, node;\r
-\r
-               if (child.parentNode != parent)\r
-                       return -1;\r
-\r
-               for (node = parent.firstChild, i = 0; node != child; node = node.nextSibling)\r
-                       i++;\r
-\r
-               return i;\r
-       };\r
-\r
-       function nodeIndex(n) {\r
-               var i = 0;\r
-\r
-               while (n.previousSibling) {\r
-                       i++;\r
-                       n = n.previousSibling;\r
-               }\r
-\r
-               return i;\r
-       };\r
-\r
-       function getSelectedNode(container, offset) {\r
-               var child;\r
-\r
-               if (container.nodeType == 3 /* TEXT_NODE */)\r
-                       return container;\r
-\r
-               if (offset < 0)\r
-                       return container;\r
-\r
-               child = container.firstChild;\r
-               while (child != null && offset > 0) {\r
-                       --offset;\r
-                       child = child.nextSibling;\r
-               }\r
-\r
-               if (child != null)\r
-                       return child;\r
-\r
-               return container;\r
-       };\r
 \r
+(function(ns) {\r
        // Range constructor\r
        function Range(dom) {\r
-               var d = dom.doc;\r
-\r
-               extend(this, {\r
-                       dom : dom,\r
-\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
+               extend(t, {\r
                        // Inital states\r
-                       startContainer : d,\r
+                       startContainer : doc,\r
                        startOffset : 0,\r
-                       endContainer : d,\r
+                       endContainer : doc,\r
                        endOffset : 0,\r
-                       collapsed : true,\r
-                       commonAncestorContainer : d,\r
+                       collapsed : TRUE,\r
+                       commonAncestorContainer : doc,\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
+                       END_TO_START : 3,\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
-\r
-       // Add range methods\r
-       extend(Range.prototype, {\r
-               setStart : function(n, o) {\r
-                       this._setEndPoint(true, n, o);\r
-               },\r
 \r
-               setEnd : function(n, o) {\r
-                       this._setEndPoint(false, n, o);\r
-               },\r
+               function setStart(n, o) {\r
+                       _setEndPoint(TRUE, n, o);\r
+               };\r
 \r
-               setStartBefore : function(n) {\r
-                       this.setStart(n.parentNode, nodeIndex(n));\r
-               },\r
+               function setEnd(n, o) {\r
+                       _setEndPoint(FALSE, n, o);\r
+               };\r
 \r
-               setStartAfter : function(n) {\r
-                       this.setStart(n.parentNode, nodeIndex(n) + 1);\r
-               },\r
+               function setStartBefore(n) {\r
+                       setStart(n.parentNode, nodeIndex(n));\r
+               };\r
 \r
-               setEndBefore : function(n) {\r
-                       this.setEnd(n.parentNode, nodeIndex(n));\r
-               },\r
+               function setStartAfter(n) {\r
+                       setStart(n.parentNode, nodeIndex(n) + 1);\r
+               };\r
 \r
-               setEndAfter : function(n) {\r
-                       this.setEnd(n.parentNode, nodeIndex(n) + 1);\r
-               },\r
+               function setEndBefore(n) {\r
+                       setEnd(n.parentNode, nodeIndex(n));\r
+               };\r
 \r
-               collapse : function(ts) {\r
-                       var t = this;\r
+               function setEndAfter(n) {\r
+                       setEnd(n.parentNode, nodeIndex(n) + 1);\r
+               };\r
 \r
+               function collapse(ts) {\r
                        if (ts) {\r
-                               t.endContainer = t.startContainer;\r
-                               t.endOffset = t.startOffset;\r
+                               t[END_CONTAINER] = t[START_CONTAINER];\r
+                               t[END_OFFSET] = t[START_OFFSET];\r
                        } else {\r
-                               t.startContainer = t.endContainer;\r
-                               t.startOffset = t.endOffset;\r
+                               t[START_CONTAINER] = t[END_CONTAINER];\r
+                               t[START_OFFSET] = t[END_OFFSET];\r
                        }\r
 \r
-                       t.collapsed = true;\r
-               },\r
+                       t.collapsed = TRUE;\r
+               };\r
 \r
-               selectNode : function(n) {\r
-                       this.setStartBefore(n);\r
-                       this.setEndAfter(n);\r
-               },\r
+               function selectNode(n) {\r
+                       setStartBefore(n);\r
+                       setEndAfter(n);\r
+               };\r
 \r
-               selectNodeContents : function(n) {\r
-                       this.setStart(n, 0);\r
-                       this.setEnd(n, n.nodeType === 1 ? n.childNodes.length : n.nodeValue.length);\r
-               },\r
+               function selectNodeContents(n) {\r
+                       setStart(n, 0);\r
+                       setEnd(n, n.nodeType === 1 ? n.childNodes.length : n.nodeValue.length);\r
+               };\r
 \r
-               compareBoundaryPoints : function(h, r) {\r
-                       var t = this, sc = t.startContainer, so = t.startOffset, ec = t.endContainer, eo = t.endOffset;\r
+               function compareBoundaryPoints(h, r) {\r
+                       var sc = t[START_CONTAINER], so = t[START_OFFSET], ec = t[END_CONTAINER], eo = t[END_OFFSET];\r
 \r
                        // Check START_TO_START\r
                        if (h === 0)\r
-                               return t._compareBoundaryPoints(sc, so, sc, so);\r
+                               return _compareBoundaryPoints(sc, so, sc, so);\r
 \r
                        // Check START_TO_END\r
                        if (h === 1)\r
-                               return t._compareBoundaryPoints(sc, so, ec, eo);\r
+                               return _compareBoundaryPoints(sc, so, ec, eo);\r
 \r
                        // Check END_TO_END\r
                        if (h === 2)\r
-                               return t._compareBoundaryPoints(ec, eo, ec, eo);\r
+                               return _compareBoundaryPoints(ec, eo, ec, eo);\r
 \r
                        // Check END_TO_START\r
                        if (h === 3)\r
-                               return t._compareBoundaryPoints(ec, eo, sc, so);\r
-               },\r
+                               return _compareBoundaryPoints(ec, eo, sc, so);\r
+               };\r
 \r
-               deleteContents : function() {\r
-                       this._traverse(DELETE);\r
-               },\r
+               function deleteContents() {\r
+                       _traverse(DELETE);\r
+               };\r
 \r
-               extractContents : function() {\r
-                       return this._traverse(EXTRACT);\r
-               },\r
+               function extractContents() {\r
+                       return _traverse(EXTRACT);\r
+               };\r
 \r
-               cloneContents : function() {\r
-                       return this._traverse(CLONE);\r
-               },\r
+               function cloneContents() {\r
+                       return _traverse(CLONE);\r
+               };\r
 \r
-               insertNode : function(n) {\r
-                       var t = this, nn, o;\r
+               function insertNode(n) {\r
+                       var startContainer = this[START_CONTAINER],\r
+                               startOffset = this[START_OFFSET], nn, o;\r
 \r
                        // Node is TEXT_NODE or CDATA\r
-                       if (n.nodeType === 3 || n.nodeType === 4) {\r
-                               nn = t.startContainer.splitText(t.startOffset);\r
-                               t.startContainer.parentNode.insertBefore(n, nn);\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 (t.startContainer.childNodes.length > 0)\r
-                                       o = t.startContainer.childNodes[t.startOffset];\r
+                               if (startContainer.childNodes.length > 0)\r
+                                       o = startContainer.childNodes[startOffset];\r
 \r
-                               t.startContainer.insertBefore(n, o);\r
+                               if (o)\r
+                                       startContainer.insertBefore(n, o);\r
+                               else\r
+                                       startContainer.appendChild(n);\r
                        }\r
-               },\r
+               };\r
 \r
-               surroundContents : function(n) {\r
-                       var t = this, f = t.extractContents();\r
+               function surroundContents(n) {\r
+                       var f = t.extractContents();\r
 \r
                        t.insertNode(n);\r
                        n.appendChild(f);\r
                        t.selectNode(n);\r
-               },\r
-\r
-               cloneRange : function() {\r
-                       var t = this;\r
+               };\r
 \r
-                       return extend(new Range(t.dom), {\r
-                               startContainer : t.startContainer,\r
-                               startOffset : t.startOffset,\r
-                               endContainer : t.endContainer,\r
-                               endOffset : t.endOffset,\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
 \r
-/*\r
-               detach : function() {\r
-                       // Not implemented\r
-               },\r
-*/\r
-               // Internal methods\r
+               // Private methods\r
 \r
-               _isCollapsed : function() {\r
-                       return (this.startContainer == this.endContainer && this.startOffset == this.endOffset);\r
-               },\r
+               function _getSelectedNode(container, offset) {\r
+                       var child;\r
+\r
+                       if (container.nodeType == 3 /* TEXT_NODE */)\r
+                               return container;\r
+\r
+                       if (offset < 0)\r
+                               return container;\r
+\r
+                       child = container.firstChild;\r
+                       while (child && offset > 0) {\r
+                               --offset;\r
+                               child = child.nextSibling;\r
+                       }\r
 \r
-               _compareBoundaryPoints : function (containerA, offsetA, containerB, offsetB) {\r
+                       if (child)\r
+                               return child;\r
+\r
+                       return container;\r
+               };\r
+\r
+               function _isCollapsed() {\r
+                       return (t[START_CONTAINER] == t[END_CONTAINER] && t[START_OFFSET] == t[END_OFFSET]);\r
+               };\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
+                       // 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
+                               if (offsetA == offsetB)\r
                                        return 0; // equal\r
-                               } else if (offsetA < offsetB) {\r
+\r
+                               if (offsetA < offsetB)\r
                                        return -1; // before\r
-                               } else {\r
-                                       return 1; // after\r
-                               }\r
+\r
+                               return 1; // after\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
+                       // 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
+                       while (c && c.parentNode != containerA)\r
                                c = c.parentNode;\r
-                       }\r
+\r
                        if (c) {\r
                                offsetC = 0;\r
                                n = containerA.firstChild;\r
@@ -2579,15 +2816,14 @@ tinymce.create('static tinymce.util.XHR', {
                                        n = n.nextSibling;\r
                                }\r
 \r
-                               if (offsetA <= offsetC) {\r
+                               if (offsetA <= offsetC)\r
                                        return -1; // before\r
-                               } else {\r
-                                       return 1; // after\r
-                               }\r
+\r
+                               return 1; // after\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
+                       // 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
@@ -2603,124 +2839,113 @@ tinymce.create('static tinymce.util.XHR', {
                                        n = n.nextSibling;\r
                                }\r
 \r
-                               if (offsetC < offsetB) {\r
+                               if (offsetC < offsetB)\r
                                        return -1; // before\r
-                               } else {\r
-                                       return 1; // after\r
-                               }\r
+\r
+                               return 1; // after\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
+                       // 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 = this.dom.findCommonAncestor(containerA, containerB);\r
+                       cmnRoot = dom.findCommonAncestor(containerA, containerB);\r
                        childA = containerA;\r
 \r
-                       while (childA && childA.parentNode != cmnRoot) {\r
-                               childA = childA.parentNode;  \r
-                       }\r
+                       while (childA && childA.parentNode != cmnRoot)\r
+                               childA = childA.parentNode;\r
 \r
-                       if (!childA) {\r
+                       if (!childA)\r
                                childA = cmnRoot;\r
-                       }\r
 \r
                        childB = containerB;\r
-                       while (childB && childB.parentNode != cmnRoot) {\r
+                       while (childB && childB.parentNode != cmnRoot)\r
                                childB = childB.parentNode;\r
-                       }\r
 \r
-                       if (!childB) {\r
+                       if (!childB)\r
                                childB = cmnRoot;\r
-                       }\r
 \r
-                       if (childA == childB) {\r
+                       if (childA == childB)\r
                                return 0; // equal\r
-                       }\r
 \r
                        n = cmnRoot.firstChild;\r
                        while (n) {\r
-                               if (n == childA) {\r
+                               if (n == childA)\r
                                        return -1; // before\r
-                               }\r
 \r
-                               if (n == childB) {\r
+                               if (n == childB)\r
                                        return 1; // after\r
-                               }\r
 \r
                                n = n.nextSibling;\r
                        }\r
-               },\r
+               };\r
 \r
-               _setEndPoint : function(st, n, o) {\r
-                       var t = this, ec, sc;\r
+               function _setEndPoint(st, n, o) {\r
+                       var ec, sc;\r
 \r
                        if (st) {\r
-                               t.startContainer = n;\r
-                               t.startOffset = o;\r
+                               t[START_CONTAINER] = n;\r
+                               t[START_OFFSET] = o;\r
                        } else {\r
-                               t.endContainer = n;\r
-                               t.endOffset = o;\r
+                               t[END_CONTAINER] = n;\r
+                               t[END_OFFSET] = o;\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
+                       // 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.endContainer;\r
+                       ec = t[END_CONTAINER];\r
                        while (ec.parentNode)\r
                                ec = ec.parentNode;\r
 \r
-                       sc = t.startContainer;\r
+                       sc = t[START_CONTAINER];\r
                        while (sc.parentNode)\r
                                sc = sc.parentNode;\r
 \r
-                       if (sc != ec) {\r
-                               t.collapse(st);\r
-                       } else {\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
+                       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 (t._compareBoundaryPoints(t.startContainer, t.startOffset, t.endContainer, t.endOffset) > 0)\r
+                               if (_compareBoundaryPoints(t[START_CONTAINER], t[START_OFFSET], t[END_CONTAINER], t[END_OFFSET]) > 0)\r
                                        t.collapse(st);\r
-                       }\r
-\r
-                       t.collapsed = t._isCollapsed();\r
-                       t.commonAncestorContainer = t.dom.findCommonAncestor(t.startContainer, t.endContainer);\r
-               },\r
+                       } else\r
+                               t.collapse(st);\r
 \r
-               // This code is heavily "inspired" by the Apache Xerces implementation. I hope they don't mind. :)\r
+                       t.collapsed = _isCollapsed();\r
+                       t.commonAncestorContainer = dom.findCommonAncestor(t[START_CONTAINER], t[END_CONTAINER]);\r
+               };\r
 \r
-               _traverse : function(how) {\r
-                       var t = this, c, endContainerDepth = 0, startContainerDepth = 0, p, depthDiff, startNode, endNode, sp, ep;\r
+               function _traverse(how) {\r
+                       var c, endContainerDepth = 0, startContainerDepth = 0, p, depthDiff, startNode, endNode, sp, ep;\r
 \r
-                       if (t.startContainer == t.endContainer)\r
-                               return t._traverseSameContainer(how);\r
+                       if (t[START_CONTAINER] == t[END_CONTAINER])\r
+                               return _traverseSameContainer(how);\r
 \r
-                       for (c = t.endContainer, p = c.parentNode; p != null; c = p, p = p.parentNode) {\r
-                               if (p == t.startContainer)\r
-                                       return t._traverseCommonStartContainer(c, how);\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
                                ++endContainerDepth;\r
                        }\r
 \r
-                       for (c = t.startContainer, p = c.parentNode; p != null; c = p, p = p.parentNode) {\r
-                               if (p == t.endContainer)\r
-                                       return t._traverseCommonEndContainer(c, how);\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
                                ++startContainerDepth;\r
                        }\r
 \r
                        depthDiff = startContainerDepth - endContainerDepth;\r
 \r
-                       startNode = t.startContainer;\r
+                       startNode = t[START_CONTAINER];\r
                        while (depthDiff > 0) {\r
                                startNode = startNode.parentNode;\r
                                depthDiff--;\r
                        }\r
 \r
-                       endNode = t.endContainer;\r
+                       endNode = t[END_CONTAINER];\r
                        while (depthDiff < 0) {\r
                                endNode = endNode.parentNode;\r
                                depthDiff++;\r
@@ -2732,47 +2957,47 @@ tinymce.create('static tinymce.util.XHR', {
                                endNode = ep;\r
                        }\r
 \r
-                       return t._traverseCommonAncestors(startNode, endNode, how);\r
-               },\r
+                       return _traverseCommonAncestors(startNode, endNode, how);\r
+               };\r
 \r
-               _traverseSameContainer : function(how) {\r
-                       var t = this, frag, s, sub, n, cnt, sibling, xferNode;\r
+                function _traverseSameContainer(how) {\r
+                       var frag, s, sub, n, cnt, sibling, xferNode;\r
 \r
                        if (how != DELETE)\r
-                               frag = t.dom.doc.createDocumentFragment();\r
+                               frag = doc.createDocumentFragment();\r
 \r
                        // If selection is empty, just return the fragment\r
-                       if (t.startOffset == t.endOffset)\r
+                       if (t[START_OFFSET] == t[END_OFFSET])\r
                                return frag;\r
 \r
                        // Text node needs special case handling\r
-                       if (t.startContainer.nodeType == 3 /* TEXT_NODE */) {\r
+                       if (t[START_CONTAINER].nodeType == 3 /* TEXT_NODE */) {\r
                                // get the substring\r
-                               s = t.startContainer.nodeValue;\r
-                               sub = s.substring(t.startOffset, t.endOffset);\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.startContainer.deleteData(t.startOffset, t.endOffset - t.startOffset);\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
+                                       t.collapse(TRUE);\r
                                }\r
 \r
                                if (how == DELETE)\r
-                                       return null;\r
+                                       return;\r
 \r
-                               frag.appendChild(t.dom.doc.createTextNode(sub));\r
+                               frag.appendChild(doc.createTextNode(sub));\r
                                return frag;\r
                        }\r
 \r
                        // Copy nodes between the start/end offsets.\r
-                       n = getSelectedNode(t.startContainer, t.startOffset);\r
-                       cnt = t.endOffset - t.startOffset;\r
+                       n = _getSelectedNode(t[START_CONTAINER], t[START_OFFSET]);\r
+                       cnt = t[END_OFFSET] - t[START_OFFSET];\r
 \r
                        while (cnt > 0) {\r
                                sibling = n.nextSibling;\r
-                               xferNode = t._traverseFullySelected(n, how);\r
+                               xferNode = _traverseFullySelected(n, how);\r
 \r
                                if (frag)\r
                                        frag.appendChild( xferNode );\r
@@ -2783,31 +3008,31 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                        // Nothing is partially selected, so collapse to start point\r
                        if (how != CLONE)\r
-                               t.collapse(true);\r
+                               t.collapse(TRUE);\r
 \r
                        return frag;\r
-               },\r
+               };\r
 \r
-               _traverseCommonStartContainer : function(endAncestor, how) {\r
-                       var t = this, frag, n, endIdx, cnt, sibling, xferNode;\r
+               function _traverseCommonStartContainer(endAncestor, how) {\r
+                       var frag, n, endIdx, cnt, sibling, xferNode;\r
 \r
                        if (how != DELETE)\r
-                               frag = t.dom.doc.createDocumentFragment();\r
+                               frag = doc.createDocumentFragment();\r
 \r
-                       n = t._traverseRightBoundary(endAncestor, how);\r
+                       n = _traverseRightBoundary(endAncestor, how);\r
 \r
                        if (frag)\r
                                frag.appendChild(n);\r
 \r
-                       endIdx = indexOf(endAncestor, t.startContainer);\r
-                       cnt = endIdx - t.startOffset;\r
+                       endIdx = nodeIndex(endAncestor);\r
+                       cnt = endIdx - t[START_OFFSET];\r
 \r
                        if (cnt <= 0) {\r
-                               // Collapse to just before the endAncestor, which \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
+                                       t.collapse(FALSE);\r
                                }\r
 \r
                                return frag;\r
@@ -2816,7 +3041,7 @@ tinymce.create('static tinymce.util.XHR', {
                        n = endAncestor.previousSibling;\r
                        while (cnt > 0) {\r
                                sibling = n.previousSibling;\r
-                               xferNode = t._traverseFullySelected(n, how);\r
+                               xferNode = _traverseFullySelected(n, how);\r
 \r
                                if (frag)\r
                                        frag.insertBefore(xferNode, frag.firstChild);\r
@@ -2825,34 +3050,34 @@ tinymce.create('static tinymce.util.XHR', {
                                n = sibling;\r
                        }\r
 \r
-                       // Collapse to just before the endAncestor, which \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
+                               t.collapse(FALSE);\r
                        }\r
 \r
                        return frag;\r
-               },\r
+               };\r
 \r
-               _traverseCommonEndContainer : function(startAncestor, how) {\r
-                       var t = this, frag, startIdx, n, cnt, sibling, xferNode;\r
+               function _traverseCommonEndContainer(startAncestor, how) {\r
+                       var frag, startIdx, n, cnt, sibling, xferNode;\r
 \r
                        if (how != DELETE)\r
-                               frag = t.dom.doc.createDocumentFragment();\r
+                               frag = doc.createDocumentFragment();\r
 \r
-                       n = t._traverseLeftBoundary(startAncestor, how);\r
+                       n = _traverseLeftBoundary(startAncestor, how);\r
                        if (frag)\r
                                frag.appendChild(n);\r
 \r
-                       startIdx = indexOf(startAncestor, t.endContainer);\r
+                       startIdx = nodeIndex(startAncestor);\r
                        ++startIdx;  // Because we already traversed it....\r
 \r
-                       cnt = t.endOffset - startIdx;\r
+                       cnt = t[END_OFFSET] - startIdx;\r
                        n = startAncestor.nextSibling;\r
                        while (cnt > 0) {\r
                                sibling = n.nextSibling;\r
-                               xferNode = t._traverseFullySelected(n, how);\r
+                               xferNode = _traverseFullySelected(n, how);\r
 \r
                                if (frag)\r
                                        frag.appendChild(xferNode);\r
@@ -2863,25 +3088,25 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                        if (how != CLONE) {\r
                                t.setStartAfter(startAncestor);\r
-                               t.collapse(true);\r
+                               t.collapse(TRUE);\r
                        }\r
 \r
                        return frag;\r
-               },\r
+               };\r
 \r
-               _traverseCommonAncestors : function(startAncestor, endAncestor, how) {\r
-                       var t = this, n, frag, commonParent, startOffset, endOffset, cnt, sibling, nextSibling;\r
+               function _traverseCommonAncestors(startAncestor, endAncestor, how) {\r
+                       var n, frag, commonParent, startOffset, endOffset, cnt, sibling, nextSibling;\r
 \r
                        if (how != DELETE)\r
-                               frag = t.dom.doc.createDocumentFragment();\r
+                               frag = doc.createDocumentFragment();\r
 \r
-                       n = t._traverseLeftBoundary(startAncestor, how);\r
+                       n = _traverseLeftBoundary(startAncestor, how);\r
                        if (frag)\r
                                frag.appendChild(n);\r
 \r
                        commonParent = startAncestor.parentNode;\r
-                       startOffset = indexOf(startAncestor, commonParent);\r
-                       endOffset = indexOf(endAncestor, commonParent);\r
+                       startOffset = nodeIndex(startAncestor);\r
+                       endOffset = nodeIndex(endAncestor);\r
                        ++startOffset;\r
 \r
                        cnt = endOffset - startOffset;\r
@@ -2889,7 +3114,7 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                        while (cnt > 0) {\r
                                nextSibling = sibling.nextSibling;\r
-                               n = t._traverseFullySelected(sibling, how);\r
+                               n = _traverseFullySelected(sibling, how);\r
 \r
                                if (frag)\r
                                        frag.appendChild(n);\r
@@ -2898,38 +3123,37 @@ tinymce.create('static tinymce.util.XHR', {
                                --cnt;\r
                        }\r
 \r
-                       n = t._traverseRightBoundary(endAncestor, how);\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
+                               t.collapse(TRUE);\r
                        }\r
 \r
                        return frag;\r
-               },\r
+               };\r
 \r
-               _traverseRightBoundary : function(root, how) {\r
-                       var t = this, next = getSelectedNode(t.endContainer, t.endOffset - 1), parent, clonedParent, prevSibling, clonedChild, clonedGrandParent;\r
-                       var isFullySelected = next != t.endContainer;\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 t._traverseNode(next, isFullySelected, false, how);\r
+                               return _traverseNode(next, isFullySelected, FALSE, how);\r
 \r
                        parent = next.parentNode;\r
-                       clonedParent = t._traverseNode(parent, false, false, how);\r
+                       clonedParent = _traverseNode(parent, FALSE, FALSE, how);\r
 \r
-                       while (parent != null) {\r
-                               while (next != null) {\r
+                       while (parent) {\r
+                               while (next) {\r
                                        prevSibling = next.previousSibling;\r
-                                       clonedChild = t._traverseNode(next, isFullySelected, false, how);\r
+                                       clonedChild = _traverseNode(next, isFullySelected, FALSE, how);\r
 \r
                                        if (how != DELETE)\r
                                                clonedParent.insertBefore(clonedChild, clonedParent.firstChild);\r
 \r
-                                       isFullySelected = true;\r
+                                       isFullySelected = TRUE;\r
                                        next = prevSibling;\r
                                }\r
 \r
@@ -2939,37 +3163,33 @@ tinymce.create('static tinymce.util.XHR', {
                                next = parent.previousSibling;\r
                                parent = parent.parentNode;\r
 \r
-                               clonedGrandParent = t._traverseNode(parent, false, false, how);\r
+                               clonedGrandParent = _traverseNode(parent, FALSE, FALSE, how);\r
 \r
                                if (how != DELETE)\r
                                        clonedGrandParent.appendChild(clonedParent);\r
 \r
                                clonedParent = clonedGrandParent;\r
                        }\r
+               };\r
 \r
-                       // should never occur\r
-                       return null;\r
-               },\r
-\r
-               _traverseLeftBoundary : function(root, how) {\r
-                       var t = this, next = getSelectedNode(t.startContainer, t.startOffset);\r
-                       var isFullySelected = next != t.startContainer, parent, clonedParent, nextSibling, clonedChild, clonedGrandParent;\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 t._traverseNode(next, isFullySelected, true, how);\r
+                               return _traverseNode(next, isFullySelected, TRUE, how);\r
 \r
                        parent = next.parentNode;\r
-                       clonedParent = t._traverseNode(parent, false, true, how);\r
+                       clonedParent = _traverseNode(parent, FALSE, TRUE, how);\r
 \r
-                       while (parent != null) {\r
-                               while (next != null) {\r
+                       while (parent) {\r
+                               while (next) {\r
                                        nextSibling = next.nextSibling;\r
-                                       clonedChild = t._traverseNode(next, isFullySelected, true, how);\r
+                                       clonedChild = _traverseNode(next, isFullySelected, TRUE, how);\r
 \r
                                        if (how != DELETE)\r
                                                clonedParent.appendChild(clonedChild);\r
 \r
-                                       isFullySelected = true;\r
+                                       isFullySelected = TRUE;\r
                                        next = nextSibling;\r
                                }\r
 \r
@@ -2979,33 +3199,30 @@ tinymce.create('static tinymce.util.XHR', {
                                next = parent.nextSibling;\r
                                parent = parent.parentNode;\r
 \r
-                               clonedGrandParent = t._traverseNode(parent, false, true, how);\r
+                               clonedGrandParent = _traverseNode(parent, FALSE, TRUE, how);\r
 \r
                                if (how != DELETE)\r
                                        clonedGrandParent.appendChild(clonedParent);\r
 \r
                                clonedParent = clonedGrandParent;\r
                        }\r
+               };\r
 \r
-                       // should never occur\r
-                       return null;\r
-               },\r
-\r
-               _traverseNode : function(n, isFullySelected, isLeft, how) {\r
-                       var t = this, txtValue, newNodeValue, oldNodeValue, offset, newNode;\r
+               function _traverseNode(n, isFullySelected, isLeft, how) {\r
+                       var txtValue, newNodeValue, oldNodeValue, offset, newNode;\r
 \r
                        if (isFullySelected)\r
-                               return t._traverseFullySelected(n, how);\r
+                               return _traverseFullySelected(n, how);\r
 \r
                        if (n.nodeType == 3 /* TEXT_NODE */) {\r
                                txtValue = n.nodeValue;\r
 \r
                                if (isLeft) {\r
-                                       offset = t.startOffset;\r
+                                       offset = t[START_OFFSET];\r
                                        newNodeValue = txtValue.substring(offset);\r
                                        oldNodeValue = txtValue.substring(0, offset);\r
                                } else {\r
-                                       offset = t.endOffset;\r
+                                       offset = t[END_OFFSET];\r
                                        newNodeValue = txtValue.substring(0, offset);\r
                                        oldNodeValue = txtValue.substring(offset);\r
                                }\r
@@ -3014,102 +3231,38 @@ tinymce.create('static tinymce.util.XHR', {
                                        n.nodeValue = oldNodeValue;\r
 \r
                                if (how == DELETE)\r
-                                       return null;\r
+                                       return;\r
 \r
-                               newNode = n.cloneNode(false);\r
+                               newNode = n.cloneNode(FALSE);\r
                                newNode.nodeValue = newNodeValue;\r
 \r
                                return newNode;\r
                        }\r
 \r
                        if (how == DELETE)\r
-                               return null;\r
-\r
-                       return n.cloneNode(false);\r
-               },\r
+                               return;\r
 \r
-               _traverseFullySelected : function(n, how) {\r
-                       var t = this;\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
+                               return how == CLONE ? n.cloneNode(TRUE) : n;\r
 \r
                        n.parentNode.removeChild(n);\r
-                       return null;\r
-               }\r
-       });\r
+               };\r
+       };\r
 \r
        ns.Range = Range;\r
 })(tinymce.dom);\r
+\r
 (function() {\r
        function Selection(selection) {\r
-               var t = this, invisibleChar = '\uFEFF', range, lastIERng;\r
-\r
-               function compareRanges(rng1, rng2) {\r
-                       if (rng1 && rng2) {\r
-                               // Both are control ranges and the selected element matches\r
-                               if (rng1.item && rng2.item && rng1.item(0) === rng2.item(0))\r
-                                       return 1;\r
-\r
-                               // Both are text ranges and the range matches\r
-                               if (rng1.isEqual && rng2.isEqual && rng2.isEqual(rng1))\r
-                                       return 1;\r
-                       }\r
-\r
-                       return 0;\r
-               };\r
+               var t = this, invisibleChar = '\uFEFF', range, lastIERng, dom = selection.dom, TRUE = true, FALSE = false;\r
 \r
+               // Returns a W3C DOM compatible range object by using the IE Range API\r
                function getRange() {\r
-                       var dom = selection.dom, ieRange = selection.getRng(), domRange = dom.createRng(), startPos, endPos, element, sc, ec, collapsed;\r
-\r
-                       function findIndex(element) {\r
-                               var nl = element.parentNode.childNodes, i;\r
-\r
-                               for (i = nl.length - 1; i >= 0; i--) {\r
-                                       if (nl[i] == element)\r
-                                               return i;\r
-                               }\r
-\r
-                               return -1;\r
-                       };\r
-\r
-                       function findEndPoint(start) {\r
-                               var rng = ieRange.duplicate(), parent, i, nl, n, offset = 0, index = 0, pos, tmpRng;\r
-\r
-                               // Insert marker character\r
-                               rng.collapse(start);\r
-                               parent = rng.parentElement();\r
-                               rng.pasteHTML(invisibleChar); // Needs to be a pasteHTML instead of .text = since IE has a bug with nodeValue\r
-\r
-                               // Find marker character\r
-                               nl = parent.childNodes;\r
-                               for (i = 0; i < nl.length; i++) {\r
-                                       n = nl[i];\r
-\r
-                                       // Calculate node index excluding text node fragmentation\r
-                                       if (i > 0 && (n.nodeType !== 3 || nl[i - 1].nodeType !== 3))\r
-                                               index++;\r
-\r
-                                       // If text node then calculate offset\r
-                                       if (n.nodeType === 3) {\r
-                                               // Look for marker\r
-                                               pos = n.nodeValue.indexOf(invisibleChar);\r
-                                               if (pos !== -1) {\r
-                                                       offset += pos;\r
-                                                       break;\r
-                                               }\r
-\r
-                                               offset += n.nodeValue.length;\r
-                                       } else\r
-                                               offset = 0;\r
-                               }\r
-\r
-                               // Remove marker character\r
-                               rng.moveStart('character', -1);\r
-                               rng.text = '';\r
-\r
-                               return {index : index, offset : offset, parent : parent};\r
-                       };\r
+                       var ieRange = selection.getRng(), domRange = dom.createRng(), element, collapsed;\r
 \r
                        // If selection is outside the current document just return an empty range\r
                        element = ieRange.item ? ieRange.item(0) : ieRange.parentElement();\r
@@ -3118,61 +3271,110 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                        // Handle control selection or text selection of a image\r
                        if (ieRange.item || !element.hasChildNodes()) {\r
-                               domRange.setStart(element.parentNode, findIndex(element));\r
+                               domRange.setStart(element.parentNode, dom.nodeIndex(element));\r
                                domRange.setEnd(domRange.startContainer, domRange.startOffset + 1);\r
 \r
                                return domRange;\r
                        }\r
 \r
-                       // Check collapsed state\r
                        collapsed = selection.isCollapsed();\r
 \r
-                       // Find start and end pos index and offset\r
-                       startPos = findEndPoint(true);\r
-                       endPos = findEndPoint(false);\r
+                       function findEndPoint(start) {\r
+                               var marker, container, offset, nodes, startIndex = 0, endIndex, index, parent, checkRng, position;\r
 \r
-                       // Normalize the elements to avoid fragmented dom\r
-                       startPos.parent.normalize();\r
-                       endPos.parent.normalize();\r
+                               // Setup temp range and collapse it\r
+                               checkRng = ieRange.duplicate();\r
+                               checkRng.collapse(start);\r
 \r
-                       // Set start container and offset\r
-                       sc = startPos.parent.childNodes[Math.min(startPos.index, startPos.parent.childNodes.length - 1)];\r
+                               // Create marker and insert it at the end of the endpoints parent\r
+                               marker = dom.create('a');\r
+                               parent = checkRng.parentElement();\r
 \r
-                       if (sc.nodeType != 3)\r
-                               domRange.setStart(startPos.parent, startPos.index);\r
-                       else\r
-                               domRange.setStart(startPos.parent.childNodes[startPos.index], startPos.offset);\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
+                               }\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
+                               }\r
 \r
-                       // Set end container and offset\r
-                       ec = endPos.parent.childNodes[Math.min(endPos.index, endPos.parent.childNodes.length - 1)];\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
 \r
-                       if (ec.nodeType != 3) {\r
-                               if (!collapsed)\r
-                                       endPos.index++;\r
+                               // Setup container\r
+                               container = position > 0 || index == 0 ? marker.nextSibling : marker.previousSibling;\r
 \r
-                               domRange.setEnd(endPos.parent, endPos.index);\r
-                       } else\r
-                               domRange.setEnd(endPos.parent.childNodes[endPos.index], endPos.offset);\r
+                               // Handle element selection\r
+                               if (container.nodeType == 1) {\r
+                                       dom.remove(marker);\r
 \r
-                       // If not collapsed then make sure offsets are valid\r
-                       if (!collapsed) {\r
-                               sc = domRange.startContainer;\r
-                               if (sc.nodeType == 1)\r
-                                       domRange.setStart(sc, Math.min(domRange.startOffset, sc.childNodes.length));\r
+                                       // Find offset and container\r
+                                       offset = dom.nodeIndex(container);\r
+                                       container = container.parentNode;\r
 \r
-                               ec = domRange.endContainer;\r
-                               if (ec.nodeType == 1)\r
-                                       domRange.setEnd(ec, Math.min(domRange.endOffset, ec.childNodes.length));\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
+\r
+                                       dom.remove(marker);\r
+                               }\r
+\r
+                               domRange[start ? 'setStart' : 'setEnd'](container, offset);\r
+                       };\r
+\r
+                       // Find start point\r
+                       findEndPoint(true);\r
 \r
-                       // Restore selection to new range\r
-                       t.addRange(domRange);\r
+                       // Find end point if needed\r
+                       if (!collapsed)\r
+                               findEndPoint();\r
 \r
                        return domRange;\r
                };\r
 \r
                this.addRange = function(rng) {\r
-                       var ieRng, body = selection.dom.doc.body, startPos, endPos, sc, so, ec, eo;\r
+                       var ieRng, ieRng2, doc = selection.dom.doc, body = doc.body, startPos, endPos, sc, so, ec, eo, marker, lastIndex, skipStart, skipEnd;\r
+\r
+                       this.destroy();\r
 \r
                        // Setup some shorter versions\r
                        sc = rng.startContainer;\r
@@ -3181,9 +3383,45 @@ tinymce.create('static tinymce.util.XHR', {
                        eo = rng.endOffset;\r
                        ieRng = body.createTextRange();\r
 \r
-                       // Find element\r
-                       sc = sc.nodeType == 1 ? sc.childNodes[Math.min(so, sc.childNodes.length - 1)] : sc;\r
-                       ec = ec.nodeType == 1 ? ec.childNodes[Math.min(so == eo ? eo : eo - 1, ec.childNodes.length - 1)] : ec;\r
+                       // If document selection move caret to first node in document\r
+                       if (sc == doc || ec == doc) {\r
+                               ieRng = body.createTextRange();\r
+                               ieRng.collapse();\r
+                               ieRng.select();\r
+                               return;\r
+                       }\r
+\r
+                       // If child index resolve it\r
+                       if (sc.nodeType == 1 && sc.hasChildNodes()) {\r
+                               lastIndex = sc.childNodes.length - 1;\r
+\r
+                               // Index is higher that the child count then we need to jump over the start container\r
+                               if (so > lastIndex) {\r
+                                       skipStart = 1;\r
+                                       sc = sc.childNodes[lastIndex];\r
+                               } else\r
+                                       sc = sc.childNodes[so];\r
+\r
+                               // Child was text node then move offset to start of it\r
+                               if (sc.nodeType == 3)\r
+                                       so = 0;\r
+                       }\r
+\r
+                       // If child index resolve it\r
+                       if (ec.nodeType == 1 && ec.hasChildNodes()) {\r
+                               lastIndex = ec.childNodes.length - 1;\r
+\r
+                               if (eo == 0) {\r
+                                       skipEnd = 1;\r
+                                       ec = ec.childNodes[0];\r
+                               } else {\r
+                                       ec = ec.childNodes[Math.min(lastIndex, eo - 1)];\r
+\r
+                                       // Child was text node then move offset to end of text node\r
+                                       if (ec.nodeType == 3)\r
+                                               eo = ec.nodeValue.length;\r
+                               }\r
+                       }\r
 \r
                        // Single element selection\r
                        if (sc == ec && sc.nodeType == 1) {\r
@@ -3203,7 +3441,7 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                                        // If it's only containing a padding remove it so the caret remains\r
                                        if (sc.innerHTML == invisibleChar) {\r
-                                               ieRng.collapse(true);\r
+                                               ieRng.collapse(TRUE);\r
                                                sc.removeChild(sc.firstChild);\r
                                        }\r
                                }\r
@@ -3212,88 +3450,93 @@ tinymce.create('static tinymce.util.XHR', {
                                        ieRng.collapse(eo <= rng.endContainer.childNodes.length - 1);\r
 \r
                                ieRng.select();\r
-\r
+                               ieRng.scrollIntoView();\r
                                return;\r
                        }\r
 \r
-                       function getCharPos(container, offset) {\r
-                               var nodeVal, rng, pos;\r
-\r
-                               if (container.nodeType != 3)\r
-                                       return -1;\r
-\r
-                               nodeVal = container.nodeValue;\r
-                               rng = body.createTextRange();\r
-\r
-                               // Insert marker at offset position\r
-                               container.nodeValue = nodeVal.substring(0, offset) + invisibleChar + nodeVal.substring(offset);\r
-\r
-                               // Find char pos of marker and remove it\r
-                               rng.moveToElementText(container.parentNode);\r
-                               rng.findText(invisibleChar);\r
-                               pos = Math.abs(rng.moveStart('character', -0xFFFFF));\r
-                               container.nodeValue = nodeVal;\r
-\r
-                               return pos;\r
-                       };\r
+                       // Create range and marker\r
+                       ieRng = body.createTextRange();\r
+                       marker = doc.createElement('span');\r
+                       marker.innerHTML = ' ';\r
 \r
-                       // Collapsed range\r
-                       if (rng.collapsed) {\r
-                               pos = getCharPos(sc, so);\r
+                       // Set start of range to startContainer/startOffset\r
+                       if (sc.nodeType == 3) {\r
+                               // Insert marker after/before startContainer\r
+                               if (skipStart)\r
+                                       dom.insertAfter(marker, sc);\r
+                               else\r
+                                       sc.parentNode.insertBefore(marker, sc);\r
 \r
-                               ieRng = body.createTextRange();\r
-                               ieRng.move('character', pos);\r
-                               ieRng.select();\r
+                               // Select marker the caret to offset position\r
+                               ieRng.moveToElementText(marker);\r
+                               marker.parentNode.removeChild(marker);\r
 \r
-                               return;\r
+                               // Move if we need to, moving it 0 characters actually moves it!\r
+                               if (so > 0)\r
+                                       ieRng.move('character', so);\r
                        } else {\r
-                               // If same text container\r
-                               if (sc == ec && sc.nodeType == 3) {\r
-                                       startPos = getCharPos(sc, so);\r
+                               ieRng.moveToElementText(sc);\r
+\r
+                               if (skipStart)\r
+                                       ieRng.collapse(FALSE);\r
+                       }\r
 \r
-                                       ieRng.move('character', startPos);\r
+                       // If same text container then we can do a more simple move\r
+                       if (sc == ec && sc.nodeType == 3) {\r
+                               try {\r
                                        ieRng.moveEnd('character', eo - so);\r
                                        ieRng.select();\r
-\r
-                                       return;\r
+                                       ieRng.scrollIntoView();\r
+                               } catch (ex) {\r
+                                       // Some times a Runtime error of the 800a025e type gets thrown\r
+                                       // especially when the caret is placed before a table.\r
+                                       // This is a somewhat strange location for the caret.\r
+                                       // TODO: Find a better solution for this would possible require a rewrite of the setRng method\r
                                }\r
 \r
-                               // Get caret positions\r
-                               startPos = getCharPos(sc, so);\r
-                               endPos = getCharPos(ec, eo);\r
-                               ieRng = body.createTextRange();\r
-\r
-                               // Move start of range to start character position or start element\r
-                               if (startPos == -1) {\r
-                                       ieRng.moveToElementText(sc);\r
-                                       startPos = 0;\r
-                               } else\r
-                                       ieRng.move('character', startPos);\r
-\r
-                               // Move end of range to end character position or end element\r
-                               tmpRng = body.createTextRange();\r
-\r
-                               if (endPos == -1)\r
-                                       tmpRng.moveToElementText(ec);\r
-                               else\r
-                                       tmpRng.move('character', endPos);\r
+                               return;\r
+                       }\r
 \r
-                               ieRng.setEndPoint('EndToEnd', tmpRng);\r
-                               ieRng.select();\r
+                       // Set end of range to endContainer/endOffset\r
+                       ieRng2 = body.createTextRange();\r
+                       if (ec.nodeType == 3) {\r
+                               // Insert marker after/before startContainer\r
+                               ec.parentNode.insertBefore(marker, ec);\r
 \r
-                               return;\r
+                               // Move selection to end marker and move caret to end offset\r
+                               ieRng2.moveToElementText(marker);\r
+                               marker.parentNode.removeChild(marker);\r
+                               ieRng2.move('character', eo);\r
+                               ieRng.setEndPoint('EndToStart', ieRng2);\r
+                       } else {\r
+                               ieRng2.moveToElementText(ec);\r
+                               ieRng2.collapse(!!skipEnd);\r
+                               ieRng.setEndPoint('EndToEnd', ieRng2);\r
                        }\r
+\r
+                       ieRng.select();\r
+                       ieRng.scrollIntoView();\r
                };\r
 \r
                this.getRangeAt = function() {\r
                        // Setup new range if the cache is empty\r
-                       if (!range || !compareRanges(lastIERng, selection.getRng())) {\r
+                       if (!range || !tinymce.dom.RangeUtils.compareRanges(lastIERng, selection.getRng())) {\r
                                range = getRange();\r
 \r
                                // Store away text range for next call\r
                                lastIERng = selection.getRng();\r
                        }\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
+\r
                        // Return cached range\r
                        return range;\r
                };\r
@@ -3302,12 +3545,86 @@ tinymce.create('static tinymce.util.XHR', {
                        // Destroy cached range and last IE range to avoid memory leaks\r
                        lastIERng = range = null;\r
                };\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
+               if (selection.dom.boxModel) {\r
+                       (function() {\r
+                               var doc = dom.doc, body = doc.body, started, startRng;\r
+\r
+                               // Make HTML element unselectable since we are going to handle selection by hand\r
+                               doc.documentElement.unselectable = TRUE;\r
+\r
+                               // Return range from point or null if it failed\r
+                               function rngFromPoint(x, y) {\r
+                                       var rng = body.createTextRange();\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
+                                       return rng;\r
+                               };\r
+\r
+                               // Fires while the selection is changing\r
+                               function selectionChange(e) {\r
+                                       var pointRng;\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
+                                               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
+                                                       pointRng.select();\r
+                                               }\r
+                                       } else\r
+                                               endSelection();\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
+\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
+\r
+                                               started = 1;\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
+\r
+                                                       startRng.select();\r
+                                               }\r
+                                       }\r
+                               });\r
+                       })();\r
+               }\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
@@ -3316,14 +3633,26 @@ tinymce.create('static tinymce.util.XHR', {
  */\r
 (function(){\r
 \r
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,\r
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,\r
        done = 0,\r
        toString = Object.prototype.toString,\r
-       hasDuplicate = false;\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
-       var origContext = context = context || document;\r
+       context = context || document;\r
+\r
+       var origContext = context;\r
 \r
        if ( context.nodeType !== 1 && context.nodeType !== 9 ) {\r
                return [];\r
@@ -3333,19 +3662,25 @@ var Sizzle = function(selector, context, results, seed) {
                return results;\r
        }\r
 \r
-       var parts = [], m, set, checkSet, check, mode, extra, prune = true, contextXML = isXML(context);\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
-       chunker.lastIndex = 0;\r
-       \r
-       while ( (m = chunker.exec(selector)) !== null ) {\r
-               parts.push( m[1] );\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 = RegExp.rightContext;\r
-                       break;\r
+                       if ( m[2] ) {\r
+                               extra = m[3];\r
+                               break;\r
+                       }\r
                }\r
-       }\r
+       } while ( m );\r
 \r
        if ( parts.length > 1 && origPOS.exec( selector ) ) {\r
                if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {\r
@@ -3358,9 +3693,10 @@ var Sizzle = function(selector, context, results, seed) {
                        while ( parts.length ) {\r
                                selector = parts.shift();\r
 \r
-                               if ( Expr.relative[ selector ] )\r
+                               if ( Expr.relative[ selector ] ) {\r
                                        selector += parts.shift();\r
-\r
+                               }\r
+                               \r
                                set = posProcess( selector, set );\r
                        }\r
                }\r
@@ -3369,12 +3705,12 @@ var Sizzle = function(selector, context, results, seed) {
                // (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
-                       var ret = Sizzle.find( parts.shift(), context, contextXML );\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
-                       var ret = seed ?\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
@@ -3386,7 +3722,8 @@ var Sizzle = function(selector, context, results, seed) {
                        }\r
 \r
                        while ( parts.length ) {\r
-                               var cur = parts.pop(), pop = cur;\r
+                               cur = parts.pop();\r
+                               pop = cur;\r
 \r
                                if ( !Expr.relative[ cur ] ) {\r
                                        cur = "";\r
@@ -3410,20 +3747,20 @@ var Sizzle = function(selector, context, results, seed) {
        }\r
 \r
        if ( !checkSet ) {\r
-               throw "Syntax error, unrecognized expression: " + (cur || selector);\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 ( var i = 0; checkSet[i] != null; i++ ) {\r
-                               if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {\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 ( var i = 0; checkSet[i] != null; i++ ) {\r
+                       for ( i = 0; checkSet[i] != null; i++ ) {\r
                                if ( checkSet[i] && checkSet[i].nodeType === 1 ) {\r
                                        results.push( set[i] );\r
                                }\r
@@ -3443,7 +3780,7 @@ var Sizzle = function(selector, context, results, seed) {
 \r
 Sizzle.uniqueSort = function(results){\r
        if ( sortOrder ) {\r
-               hasDuplicate = false;\r
+               hasDuplicate = baseHasDuplicate;\r
                results.sort(sortOrder);\r
 \r
                if ( hasDuplicate ) {\r
@@ -3454,6 +3791,8 @@ Sizzle.uniqueSort = function(results){
                        }\r
                }\r
        }\r
+\r
+       return results;\r
 };\r
 \r
 Sizzle.matches = function(expr, set){\r
@@ -3461,7 +3800,7 @@ Sizzle.matches = function(expr, set){
 };\r
 \r
 Sizzle.find = function(expr, context, isXML){\r
-       var set, match;\r
+       var set;\r
 \r
        if ( !expr ) {\r
                return [];\r
@@ -3470,8 +3809,9 @@ Sizzle.find = function(expr, context, isXML){
        for ( var i = 0, l = Expr.order.length; i < l; i++ ) {\r
                var type = Expr.order[i], match;\r
                \r
-               if ( (match = Expr.match[ type ].exec( expr )) ) {\r
-                       var left = RegExp.leftContext;\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
@@ -3493,15 +3833,21 @@ Sizzle.find = function(expr, context, isXML){
 \r
 Sizzle.filter = function(expr, set, inplace, not){\r
        var old = expr, result = [], curLoop = set, match, anyFound,\r
-               isXMLFilter = set && set[0] && isXML(set[0]);\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.match[ type ].exec( expr )) != null ) {\r
-                               var filter = Expr.filter[ type ], found, item;\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
-                               if ( curLoop == result ) {\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
@@ -3552,9 +3898,9 @@ Sizzle.filter = function(expr, set, inplace, not){
                }\r
 \r
                // Improper expression\r
-               if ( expr == old ) {\r
+               if ( expr === old ) {\r
                        if ( anyFound == null ) {\r
-                               throw "Syntax error, unrecognized expression: " + expr;\r
+                               Sizzle.error( expr );\r
                        } else {\r
                                break;\r
                        }\r
@@ -3566,18 +3912,23 @@ Sizzle.filter = function(expr, set, inplace, not){
        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\(\)]*)+)\2\))?/\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
@@ -3588,20 +3939,20 @@ var Expr = Sizzle.selectors = {
                }\r
        },\r
        relative: {\r
-               "+": function(checkSet, part, isXML){\r
+               "+": function(checkSet, part){\r
                        var isPartStr = typeof part === "string",\r
                                isTag = isPartStr && !/\W/.test(part),\r
                                isPartStrNotTag = isPartStr && !isTag;\r
 \r
-                       if ( isTag && !isXML ) {\r
-                               part = part.toUpperCase();\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 === part ?\r
+                                       checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?\r
                                                elem || false :\r
                                                elem === part;\r
                                }\r
@@ -3611,22 +3962,23 @@ var Expr = Sizzle.selectors = {
                                Sizzle.filter( part, checkSet, true );\r
                        }\r
                },\r
-               ">": function(checkSet, part, isXML){\r
-                       var isPartStr = typeof part === "string";\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 = isXML ? part : part.toUpperCase();\r
+                               part = part.toLowerCase();\r
 \r
-                               for ( var i = 0, l = checkSet.length; i < l; i++ ) {\r
-                                       var elem = checkSet[i];\r
+                               for ( ; i < l; i++ ) {\r
+                                       elem = checkSet[i];\r
                                        if ( elem ) {\r
                                                var parent = elem.parentNode;\r
-                                               checkSet[i] = parent.nodeName === part ? parent : false;\r
+                                               checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;\r
                                        }\r
                                }\r
                        } else {\r
-                               for ( var i = 0, l = checkSet.length; i < l; i++ ) {\r
-                                       var elem = checkSet[i];\r
+                               for ( ; i < l; i++ ) {\r
+                                       elem = checkSet[i];\r
                                        if ( elem ) {\r
                                                checkSet[i] = isPartStr ?\r
                                                        elem.parentNode :\r
@@ -3640,20 +3992,22 @@ var Expr = Sizzle.selectors = {
                        }\r
                },\r
                "": function(checkSet, part, isXML){\r
-                       var doneName = done++, checkFn = dirCheck;\r
+                       var doneName = done++, checkFn = dirCheck, nodeCheck;\r
 \r
-                       if ( !part.match(/\W/) ) {\r
-                               var nodeCheck = part = isXML ? part : part.toUpperCase();\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;\r
+                       var doneName = done++, checkFn = dirCheck, nodeCheck;\r
 \r
-                       if ( typeof part === "string" && !part.match(/\W/) ) {\r
-                               var nodeCheck = part = isXML ? part : part.toUpperCase();\r
+                       if ( typeof part === "string" && !/\W/.test(part) ) {\r
+                               part = part.toLowerCase();\r
+                               nodeCheck = part;\r
                                checkFn = dirNodeCheck;\r
                        }\r
 \r
@@ -3667,7 +4021,7 @@ var Expr = Sizzle.selectors = {
                                return m ? [m] : [];\r
                        }\r
                },\r
-               NAME: function(match, context, isXML){\r
+               NAME: function(match, context){\r
                        if ( typeof context.getElementsByName !== "undefined" ) {\r
                                var ret = [], results = context.getElementsByName(match[1]);\r
 \r
@@ -3694,9 +4048,10 @@ var Expr = Sizzle.selectors = {
 \r
                        for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {\r
                                if ( elem ) {\r
-                                       if ( not ^ (elem.className && (" " + elem.className + " ").indexOf(match) >= 0) ) {\r
-                                               if ( !inplace )\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
@@ -3709,14 +4064,13 @@ var Expr = Sizzle.selectors = {
                        return match[1].replace(/\\/g, "");\r
                },\r
                TAG: function(match, curLoop){\r
-                       for ( var i = 0; curLoop[i] === false; i++ ){}\r
-                       return curLoop[i] && isXML(curLoop[i]) ? match[1] : match[1].toUpperCase();\r
+                       return match[1].toLowerCase();\r
                },\r
                CHILD: function(match){\r
-                       if ( match[1] == "nth" ) {\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
+                                       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
@@ -3745,7 +4099,7 @@ var Expr = Sizzle.selectors = {
                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 ( match[3].match(chunker).length > 1 || /^\w/.test(match[3]) ) {\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
@@ -3791,7 +4145,7 @@ var Expr = Sizzle.selectors = {
                        return !!Sizzle( match[3], elem ).length;\r
                },\r
                header: function(elem){\r
-                       return /h\d/i.test( elem.nodeName );\r
+                       return (/h\d/i).test( elem.nodeName );\r
                },\r
                text: function(elem){\r
                        return "text" === elem.type;\r
@@ -3818,10 +4172,10 @@ var Expr = Sizzle.selectors = {
                        return "reset" === elem.type;\r
                },\r
                button: function(elem){\r
-                       return "button" === elem.type || elem.nodeName.toUpperCase() === "BUTTON";\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
+                       return (/input|select|textarea|button/i).test(elem.nodeName);\r
                }\r
        },\r
        setFilters: {\r
@@ -3844,10 +4198,10 @@ var Expr = Sizzle.selectors = {
                        return i > match[3] - 0;\r
                },\r
                nth: function(elem, i, match){\r
-                       return match[3] - 0 == i;\r
+                       return match[3] - 0 === i;\r
                },\r
                eq: function(elem, i, match){\r
-                       return match[3] - 0 == i;\r
+                       return match[3] - 0 === i;\r
                }\r
        },\r
        filter: {\r
@@ -3857,17 +4211,19 @@ var Expr = Sizzle.selectors = {
                        if ( filter ) {\r
                                return filter( elem, i, match, array );\r
                        } else if ( name === "contains" ) {\r
-                               return (elem.textContent || elem.innerText || "").indexOf(match[3]) >= 0;\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 i = 0, l = not.length; i < l; i++ ) {\r
-                                       if ( not[i] === elem ) {\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
@@ -3875,20 +4231,26 @@ var Expr = Sizzle.selectors = {
                        switch (type) {\r
                                case 'only':\r
                                case 'first':\r
-                                       while (node = node.previousSibling)  {\r
-                                               if ( node.nodeType === 1 ) return false;\r
+                                       while ( (node = node.previousSibling) )  {\r
+                                               if ( node.nodeType === 1 ) { \r
+                                                       return false; \r
+                                               }\r
+                                       }\r
+                                       if ( type === "first" ) { \r
+                                               return true; \r
                                        }\r
-                                       if ( type == 'first') return true;\r
                                        node = elem;\r
                                case 'last':\r
-                                       while (node = node.nextSibling)  {\r
-                                               if ( node.nodeType === 1 ) return false;\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
+                                       if ( first === 1 && last === 0 ) {\r
                                                return true;\r
                                        }\r
                                        \r
@@ -3906,10 +4268,10 @@ var Expr = Sizzle.selectors = {
                                        }\r
                                        \r
                                        var diff = elem.nodeIndex - last;\r
-                                       if ( first == 0 ) {\r
-                                               return diff == 0;\r
+                                       if ( first === 0 ) {\r
+                                               return diff === 0;\r
                                        } else {\r
-                                               return ( diff % first == 0 && diff / first >= 0 );\r
+                                               return ( diff % first === 0 && diff / first >= 0 );\r
                                        }\r
                        }\r
                },\r
@@ -3917,7 +4279,7 @@ var Expr = Sizzle.selectors = {
                        return elem.nodeType === 1 && elem.getAttribute("id") === match;\r
                },\r
                TAG: function(elem, match){\r
-                       return (match === "*" && elem.nodeType === 1) || elem.nodeName === 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
@@ -3945,7 +4307,7 @@ var Expr = Sizzle.selectors = {
                                !check ?\r
                                value && result !== false :\r
                                type === "!=" ?\r
-                               value != check :\r
+                               value !== check :\r
                                type === "^=" ?\r
                                value.indexOf(check) === 0 :\r
                                type === "$=" ?\r
@@ -3964,14 +4326,18 @@ var Expr = Sizzle.selectors = {
        }\r
 };\r
 \r
-var origPOS = Expr.match.POS;\r
+var origPOS = Expr.match.POS,\r
+       fescape = function(all, num){\r
+               return "\\" + (num - 0 + 1);\r
+       };\r
 \r
 for ( var type in Expr.match ) {\r
-       Expr.match[ type ] = new RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source );\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
 var makeArray = function(array, results) {\r
-       array = Array.prototype.slice.call( array );\r
+       array = Array.prototype.slice.call( array, 0 );\r
 \r
        if ( results ) {\r
                results.push.apply( results, array );\r
@@ -3983,23 +4349,25 @@ var makeArray = function(array, results) {
 \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 );\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 || [];\r
+               var ret = results || [], i = 0;\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 i = 0, l = array.length; i < l; i++ ) {\r
+                               for ( var l = array.length; i < l; i++ ) {\r
                                        ret.push( array[i] );\r
                                }\r
                        } else {\r
-                               for ( var i = 0; array[i]; i++ ) {\r
+                               for ( ; array[i]; i++ ) {\r
                                        ret.push( array[i] );\r
                                }\r
                        }\r
@@ -4013,6 +4381,13 @@ var sortOrder;
 \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
                var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;\r
                if ( ret === 0 ) {\r
                        hasDuplicate = true;\r
@@ -4021,6 +4396,13 @@ if ( document.documentElement.compareDocumentPosition ) {
        };\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
                var ret = a.sourceIndex - b.sourceIndex;\r
                if ( ret === 0 ) {\r
                        hasDuplicate = true;\r
@@ -4029,6 +4411,13 @@ if ( document.documentElement.compareDocumentPosition ) {
        };\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
                var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();\r
                aRange.setStart(a, 0);\r
                aRange.setEnd(a, 0);\r
@@ -4042,12 +4431,32 @@ if ( document.documentElement.compareDocumentPosition ) {
        };\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
+       for ( var i = 0; elems[i]; i++ ) {\r
+               elem = elems[i];\r
+\r
+               // Get the text from text nodes and CDATA nodes\r
+               if ( elem.nodeType === 3 || elem.nodeType === 4 ) {\r
+                       ret += elem.nodeValue;\r
+\r
+               // Traverse everything else, except comment nodes\r
+               } else if ( elem.nodeType !== 8 ) {\r
+                       ret += Sizzle.getText( elem.childNodes );\r
+               }\r
+       }\r
+\r
+       return ret;\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
+               id = "script" + (new Date()).getTime();\r
        form.innerHTML = "<a name='" + id + "'/>";\r
 \r
        // Inject it into the root element, check its status, and remove it quickly\r
@@ -4056,7 +4465,7 @@ if ( document.documentElement.compareDocumentPosition ) {
 \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
+       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
@@ -4071,6 +4480,7 @@ if ( document.documentElement.compareDocumentPosition ) {
        }\r
 \r
        root.removeChild( form );\r
+       root = form = null; // release memory in IE\r
 })();\r
 \r
 (function(){\r
@@ -4111,68 +4521,75 @@ if ( document.documentElement.compareDocumentPosition ) {
                        return elem.getAttribute("href", 2);\r
                };\r
        }\r
+\r
+       div = null; // release memory in IE\r
 })();\r
 \r
-if ( document.querySelectorAll ) (function(){\r
-       var oldSizzle = Sizzle, div = document.createElement("div");\r
-       div.innerHTML = "<p class='TEST'></p>";\r
+if ( document.querySelectorAll ) {\r
+       (function(){\r
+               var oldSizzle = Sizzle, div = document.createElement("div");\r
+               div.innerHTML = "<p class='TEST'></p>";\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
+               // 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
+               Sizzle = function(query, context, extra, seed){\r
+                       context = context || document;\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 && !isXML(context) ) {\r
-                       try {\r
-                               return makeArray( context.querySelectorAll(query), extra );\r
-                       } catch(e){}\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
-       };\r
+                       return oldSizzle(query, context, extra, seed);\r
+               };\r
 \r
-       for ( var prop in oldSizzle ) {\r
-               Sizzle[ prop ] = oldSizzle[ prop ];\r
-       }\r
-})();\r
+               for ( var prop in oldSizzle ) {\r
+                       Sizzle[ prop ] = oldSizzle[ prop ];\r
+               }\r
+\r
+               div = null; // release memory in IE\r
+       })();\r
+}\r
 \r
-if ( document.getElementsByClassName && document.documentElement.getElementsByClassName ) (function(){\r
+(function(){\r
        var div = document.createElement("div");\r
+\r
        div.innerHTML = "<div class='test e'></div><div class='test'></div>";\r
 \r
        // Opera can't find a second classname (in 9.6)\r
-       if ( div.getElementsByClassName("e").length === 0 )\r
+       // Also, make sure that getElementsByClassName actually exists\r
+       if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {\r
                return;\r
+       }\r
 \r
        // Safari caches class attributes, doesn't catch changes (in 3.2)\r
        div.lastChild.className = "e";\r
 \r
-       if ( div.getElementsByClassName("e").length === 1 )\r
+       if ( div.getElementsByClassName("e").length === 1 ) {\r
                return;\r
-\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
+       div = null; // release memory in IE\r
 })();\r
 \r
 function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {\r
-       var sibDir = dir == "previousSibling" && !isXML;\r
        for ( var i = 0, l = checkSet.length; i < l; i++ ) {\r
                var elem = checkSet[i];\r
                if ( elem ) {\r
-                       if ( sibDir && elem.nodeType === 1 ){\r
-                               elem.sizcache = doneName;\r
-                               elem.sizset = i;\r
-                       }\r
                        elem = elem[dir];\r
                        var match = false;\r
 \r
@@ -4187,7 +4604,7 @@ function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
                                        elem.sizset = i;\r
                                }\r
 \r
-                               if ( elem.nodeName === cur ) {\r
+                               if ( elem.nodeName.toLowerCase() === cur ) {\r
                                        match = elem;\r
                                        break;\r
                                }\r
@@ -4201,14 +4618,9 @@ function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
 }\r
 \r
 function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {\r
-       var sibDir = dir == "previousSibling" && !isXML;\r
        for ( var i = 0, l = checkSet.length; i < l; i++ ) {\r
                var elem = checkSet[i];\r
                if ( elem ) {\r
-                       if ( sibDir && elem.nodeType === 1 ) {\r
-                               elem.sizcache = doneName;\r
-                               elem.sizset = i;\r
-                       }\r
                        elem = elem[dir];\r
                        var match = false;\r
 \r
@@ -4243,15 +4655,17 @@ function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
        }\r
 }\r
 \r
-var contains = document.compareDocumentPosition ?  function(a, b){\r
-       return a.compareDocumentPosition(b) & 16;\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
-var isXML = function(elem){\r
-       return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||\r
-               !!elem.ownerDocument && elem.ownerDocument.documentElement.nodeName !== "HTML";\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
 var posProcess = function(selector, context){\r
@@ -4280,18 +4694,30 @@ window.tinymce.dom.Sizzle = Sizzle;
 \r
 })();\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
-       tinymce.create('static tinymce.dom.Event', {\r
-               inits : [],\r
-               events : [],\r
-\r
+       tinymce.create('tinymce.dom.EventUtils', {\r
+               EventUtils : function() {\r
+                       this.inits = [];\r
+                       this.events = [];\r
+               },\r
 \r
                add : function(o, n, f, s) {\r
                        var cb, t = this, el = t.events, r;\r
 \r
+                       if (n instanceof Array) {\r
+                               r = [];\r
+\r
+                               each(n, function(n) {\r
+                                       r.push(t.add(o, n, f, s));\r
+                               });\r
+\r
+                               return r;\r
+                       }\r
+\r
                        // Handle array\r
                        if (o && o.hasOwnProperty && o instanceof Array) {\r
                                r = [];\r
@@ -4311,11 +4737,20 @@ window.tinymce.dom.Sizzle = Sizzle;
 \r
                        // Setup event callback\r
                        cb = function(e) {\r
+                               // Is all events disabled\r
+                               if (t.disabled)\r
+                                       return;\r
+\r
                                e = e || window.event;\r
 \r
-                               // Patch in target in IE it's W3C valid\r
-                               if (e && !e.target && isIE)\r
-                                       e.target = e.srcElement;\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
+                                       // Patch in preventDefault, stopPropagation methods for W3C compatibility\r
+                                       tinymce.extend(e, t._stoppers);\r
+                               }\r
 \r
                                if (!s)\r
                                        return f(e);\r
@@ -4398,12 +4833,12 @@ window.tinymce.dom.Sizzle = Sizzle;
                        }\r
                },\r
 \r
-\r
                cancel : function(e) {\r
                        if (!e)\r
                                return false;\r
 \r
                        this.stop(e);\r
+\r
                        return this.prevent(e);\r
                },\r
 \r
@@ -4425,8 +4860,8 @@ window.tinymce.dom.Sizzle = Sizzle;
                        return false;\r
                },\r
 \r
-               _unload : function() {\r
-                       var t = Event;\r
+               destroy : function() {\r
+                       var t = this;\r
 \r
                        each(t.events, function(e, i) {\r
                                t._remove(e.obj, e.name, e.cfunc);\r
@@ -4461,110 +4896,107 @@ window.tinymce.dom.Sizzle = Sizzle;
                        }\r
                },\r
 \r
-               _pageInit : function() {\r
-                       var e = Event;\r
+               _pageInit : function(win) {\r
+                       var t = this;\r
 \r
                        // Keep it from running more than once\r
-                       if (e.domLoaded)\r
+                       if (t.domLoaded)\r
                                return;\r
 \r
-                       e._remove(window, 'DOMContentLoaded', e._pageInit);\r
-                       e.domLoaded = true;\r
+                       t.domLoaded = true;\r
 \r
-                       each(e.inits, function(c) {\r
+                       each(t.inits, function(c) {\r
                                c();\r
                        });\r
 \r
-                       e.inits = [];\r
+                       t.inits = [];\r
                },\r
 \r
-               _wait : function() {\r
+               _wait : function(win) {\r
+                       var t = this, doc = win.document;\r
+\r
                        // No need since the document is already loaded\r
-                       if (window.tinyMCE_GZ && tinyMCE_GZ.loaded) {\r
-                               Event.domLoaded = 1;\r
+                       if (win.tinyMCE_GZ && tinyMCE_GZ.loaded) {\r
+                               t.domLoaded = 1;\r
                                return;\r
                        }\r
 \r
                        // Use IE method\r
-                       if (document.attachEvent) {\r
-                               document.attachEvent("onreadystatechange", function() {\r
-                                       if (document.readyState === "complete") {\r
-                                               document.detachEvent("onreadystatechange", arguments.callee);\r
-                                               Event._pageInit();\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 (document.documentElement.doScroll && window == window.top) {\r
+                               if (doc.documentElement.doScroll && win == win.top) {\r
                                        (function() {\r
-                                               if (Event.domLoaded)\r
+                                               if (t.domLoaded)\r
                                                        return;\r
 \r
                                                try {\r
                                                        // If IE is used, use the trick by Diego Perini\r
                                                        // http://javascript.nwbox.com/IEContentLoaded/\r
-                                                       document.documentElement.doScroll("left");\r
+                                                       doc.documentElement.doScroll("left");\r
                                                } catch (ex) {\r
                                                        setTimeout(arguments.callee, 0);\r
                                                        return;\r
                                                }\r
 \r
-                                               Event._pageInit();\r
+                                               t._pageInit(win);\r
                                        })();\r
                                }\r
-                       } else if (document.addEventListener)\r
-                               Event._add(window, 'DOMContentLoaded', Event._pageInit, Event);\r
-\r
-                       Event._add(window, 'load', Event._pageInit, Event);\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
 \r
-       // Shorten name\r
-       Event = tinymce.dom.Event;\r
+               _stoppers : {\r
+                       preventDefault :  function() {\r
+                               this.returnValue = false;\r
+                       },\r
 \r
-       // Dispatch DOM content loaded event for IE and Safari\r
-       Event._wait();\r
-       tinymce.addUnload(Event._unload);\r
-})(tinymce);\r
-(function(tinymce) {\r
-       var each = tinymce.each;\r
+                       stopPropagation : function() {\r
+                               this.cancelBubble = true;\r
+                       }\r
+               }\r
+       });\r
 \r
-       tinymce.create('tinymce.dom.Element', {\r
-               Element : function(id, s) {\r
-                       var t = this, dom, el;\r
+       Event = tinymce.dom.Event = new tinymce.dom.EventUtils();\r
 \r
-                       s = s || {};\r
-                       t.id = id;\r
-                       t.dom = dom = s.dom || tinymce.DOM;\r
-                       t.settings = s;\r
+       // Dispatch DOM content loaded event for IE and Safari\r
+       Event._wait(window);\r
 \r
-                       // Only IE leaks DOM references, this is a lot faster\r
-                       if (!tinymce.isIE)\r
-                               el = t.dom.get(t.id);\r
+       tinymce.addUnload(function() {\r
+               Event.destroy();\r
+       });\r
+})(tinymce);\r
 \r
-                       each([\r
-                               'getPos',\r
-                               'getRect',\r
-                               'getParent',\r
-                               'add',\r
-                               'setStyle',\r
-                               'getStyle',\r
-                               'setStyles',\r
-                               'setAttrib',\r
-                               'setAttribs',\r
-                               'getAttrib',\r
-                               'addClass',\r
-                               'removeClass',\r
-                               'hasClass',\r
-                               'getOuterHTML',\r
-                               'setOuterHTML',\r
-                               'remove',\r
-                               'show',\r
-                               'hide',\r
-                               'isHidden',\r
-                               'setHTML',\r
-                               'get'\r
-                       ], function(k) {\r
+(function(tinymce) {\r
+       tinymce.dom.Element = function(id, settings) {\r
+               var t = this, dom, el;\r
+\r
+               t.settings = settings = settings || {};\r
+               t.id = id;\r
+               t.dom = dom = settings.dom || tinymce.DOM;\r
+\r
+               // Only IE leaks DOM references, this is a lot faster\r
+               if (!tinymce.isIE)\r
+                       el = dom.get(t.id);\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
@@ -4576,83 +5008,86 @@ window.tinymce.dom.Sizzle = Sizzle;
 \r
                                        return a;\r
                                };\r
-                       });\r
-               },\r
-\r
-               on : function(n, f, s) {\r
-                       return tinymce.dom.Event.add(this.id, n, f, s);\r
-               },\r
+               });\r
 \r
-               getXY : function() {\r
-                       return {\r
-                               x : parseInt(this.getStyle('left')),\r
-                               y : parseInt(this.getStyle('top'))\r
-                       };\r
-               },\r
+               tinymce.extend(t, {\r
+                       on : function(n, f, s) {\r
+                               return tinymce.dom.Event.add(t.id, n, f, s);\r
+                       },\r
 \r
-               getSize : function() {\r
-                       var n = this.dom.get(this.id);\r
+                       getXY : function() {\r
+                               return {\r
+                                       x : parseInt(t.getStyle('left')),\r
+                                       y : parseInt(t.getStyle('top'))\r
+                               };\r
+                       },\r
 \r
-                       return {\r
-                               w : parseInt(this.getStyle('width') || n.clientWidth),\r
-                               h : parseInt(this.getStyle('height') || n.clientHeight)\r
-                       };\r
-               },\r
+                       getSize : function() {\r
+                               var n = dom.get(t.id);\r
 \r
-               moveTo : function(x, y) {\r
-                       this.setStyles({left : x, top : y});\r
-               },\r
+                               return {\r
+                                       w : parseInt(t.getStyle('width') || n.clientWidth),\r
+                                       h : parseInt(t.getStyle('height') || n.clientHeight)\r
+                               };\r
+                       },\r
 \r
-               moveBy : function(x, y) {\r
-                       var p = this.getXY();\r
+                       moveTo : function(x, y) {\r
+                               t.setStyles({left : x, top : y});\r
+                       },\r
 \r
-                       this.moveTo(p.x + x, p.y + y);\r
-               },\r
+                       moveBy : function(x, y) {\r
+                               var p = t.getXY();\r
 \r
-               resizeTo : function(w, h) {\r
-                       this.setStyles({width : w, height : h});\r
-               },\r
+                               t.moveTo(p.x + x, p.y + y);\r
+                       },\r
 \r
-               resizeBy : function(w, h) {\r
-                       var s = this.getSize();\r
+                       resizeTo : function(w, h) {\r
+                               t.setStyles({width : w, height : h});\r
+                       },\r
 \r
-                       this.resizeTo(s.w + w, s.h + h);\r
-               },\r
+                       resizeBy : function(w, h) {\r
+                               var s = t.getSize();\r
 \r
-               update : function(k) {\r
-                       var t = this, b, dom = t.dom;\r
+                               t.resizeTo(s.w + w, s.h + h);\r
+                       },\r
 \r
-                       if (tinymce.isIE6 && t.settings.blocker) {\r
-                               k = k || '';\r
+                       update : function(k) {\r
+                               var b;\r
 \r
-                               // Ignore getters\r
-                               if (k.indexOf('get') === 0 || k.indexOf('has') === 0 || k.indexOf('is') === 0)\r
-                                       return;\r
+                               if (tinymce.isIE6 && settings.blocker) {\r
+                                       k = k || '';\r
 \r
-                               // Remove blocker on remove\r
-                               if (k == 'remove') {\r
-                                       dom.remove(t.blocker);\r
-                                       return;\r
-                               }\r
+                                       // Ignore getters\r
+                                       if (k.indexOf('get') === 0 || k.indexOf('has') === 0 || k.indexOf('is') === 0)\r
+                                               return;\r
 \r
-                               if (!t.blocker) {\r
-                                       t.blocker = dom.uniqueId();\r
-                                       b = dom.add(t.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
+                                       // Remove blocker on remove\r
+                                       if (k == 'remove') {\r
+                                               dom.remove(t.blocker);\r
+                                               return;\r
+                                       }\r
 \r
-                               dom.setStyle(b, 'left', t.getStyle('left', 1));\r
-                               dom.setStyle(b, 'top', t.getStyle('top', 1));\r
-                               dom.setStyle(b, 'width', t.getStyle('width', 1));\r
-                               dom.setStyle(b, 'height', t.getStyle('height', 1));\r
-                               dom.setStyle(b, 'display', t.getStyle('display', 1));\r
-                               dom.setStyle(b, 'zIndex', parseInt(t.getStyle('zIndex', 1) || 0) - 1);\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
+                                       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
-               }\r
-\r
                });\r
+       };\r
 })(tinymce);\r
+\r
 (function(tinymce) {\r
        function trimNl(s) {\r
                return s.replace(/[\n\r]+/g, '');\r
@@ -4740,23 +5175,27 @@ window.tinymce.dom.Sizzle = Sizzle;
                                h += '<span id="__caret">_</span>';\r
 \r
                                // Delete and insert new node\r
-                               r.deleteContents();\r
-                               r.insertNode(t.getRng().createContextualFragment(h));\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
+                                               r.insertNode(r.createContextualFragment(h));\r
+                                       }\r
+                               }\r
 \r
                                // Move to caret marker\r
                                c = t.dom.get('__caret');\r
-\r
                                // Make sure we wrap it compleatly, Opera fails with a simple select call\r
                                r = d.createRange();\r
                                r.setStartBefore(c);\r
-                               r.setEndAfter(c);\r
+                               r.setEndBefore(c);\r
                                t.setRng(r);\r
 \r
-                               // Delete the marker, and hopefully the caret gets placed in the right location\r
-                               // Removed this since it seems to remove &nbsp; in FF and simply deleting it\r
-                               // doesn't seem to affect the caret position in any browser\r
-                               //d.execCommand('Delete', false, null);\r
-\r
                                // Remove the caret position\r
                                t.dom.remove('__caret');\r
                        } else {\r
@@ -4774,34 +5213,50 @@ window.tinymce.dom.Sizzle = Sizzle;
                },\r
 \r
                getStart : function() {\r
-                       var t = this, r = t.getRng(), e;\r
-\r
-                       if (isIE) {\r
-                               if (r.item)\r
-                                       return r.item(0);\r
-\r
-                               r = r.duplicate();\r
-                               r.collapse(1);\r
-                               e = r.parentElement();\r
+                       var rng = this.getRng(), startElement, parentElement, checkRng, node;\r
+\r
+                       if (rng.duplicate || rng.item) {\r
+                               // Control selection, return first item\r
+                               if (rng.item)\r
+                                       return rng.item(0);\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
 \r
-                               if (e && e.nodeName == 'BODY')\r
-                                       return e.firstChild;\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
 \r
-                               return e;\r
+                               return startElement;\r
                        } else {\r
-                               e = r.startContainer;\r
+                               startElement = rng.startContainer;\r
 \r
-                               if (e.nodeName == 'BODY')\r
-                                       return e.firstChild;\r
+                               if (startElement.nodeType == 1 && startElement.hasChildNodes())\r
+                                       startElement = startElement.childNodes[Math.min(startElement.childNodes.length - 1, rng.startOffset)];\r
 \r
-                               return t.dom.getParent(e, '*');\r
+                               if (startElement && startElement.nodeType == 3)\r
+                                       return startElement.parentNode;\r
+\r
+                               return startElement;\r
                        }\r
                },\r
 \r
                getEnd : function() {\r
-                       var t = this, r = t.getRng(), e;\r
+                       var t = this, r = t.getRng(), e, eo;\r
 \r
-                       if (isIE) {\r
+                       if (r.duplicate || r.item) {\r
                                if (r.item)\r
                                        return r.item(0);\r
 \r
@@ -4810,331 +5265,299 @@ window.tinymce.dom.Sizzle = Sizzle;
                                e = r.parentElement();\r
 \r
                                if (e && e.nodeName == 'BODY')\r
-                                       return e.lastChild;\r
+                                       return e.lastChild || e;\r
 \r
                                return e;\r
                        } else {\r
                                e = r.endContainer;\r
+                               eo = r.endOffset;\r
+\r
+                               if (e.nodeType == 1 && e.hasChildNodes())\r
+                                       e = e.childNodes[eo > 0 ? eo - 1 : eo];\r
 \r
-                               if (e.nodeName == 'BODY')\r
-                                       return e.lastChild;\r
+                               if (e && e.nodeType == 3)\r
+                                       return e.parentNode;\r
 \r
-                               return t.dom.getParent(e, '*');\r
+                               return e;\r
                        }\r
                },\r
 \r
-               getBookmark : function(si) {\r
-                       var t = this, r = t.getRng(), tr, sx, sy, vp = t.dom.getViewPort(t.win), e, sp, bp, le, c = -0xFFFFFF, s, ro = t.dom.getRoot(), wb = 0, wa = 0, nv;\r
-                       sx = vp.x;\r
-                       sy = vp.y;\r
+               getBookmark : function(type, normalized) {\r
+                       var t = this, dom = t.dom, rng, rng2, id, collapsed, name, element, index, chr = '\uFEFF', styles;\r
 \r
-                       // Simple bookmark fast but not as persistent\r
-                       if (si == 'simple')\r
-                               return {rng : r, scrollX : sx, scrollY : sy};\r
+                       function findIndex(name, element) {\r
+                               var index = 0;\r
 \r
-                       // Handle IE\r
-                       if (isIE) {\r
-                               // Control selection\r
-                               if (r.item) {\r
-                                       e = r.item(0);\r
+                               each(dom.select(name), function(node, i) {\r
+                                       if (node == element)\r
+                                               index = i;\r
+                               });\r
 \r
-                                       each(t.dom.select(e.nodeName), function(n, i) {\r
-                                               if (e == n) {\r
-                                                       sp = i;\r
-                                                       return false;\r
-                                               }\r
-                                       });\r
+                               return index;\r
+                       };\r
 \r
-                                       return {\r
-                                               tag : e.nodeName,\r
-                                               index : sp,\r
-                                               scrollX : sx,\r
-                                               scrollY : sy\r
-                                       };\r
-                               }\r
+                       if (type == 2) {\r
+                               function getLocation() {\r
+                                       var rng = t.getRng(true), root = dom.getRoot(), bookmark = {};\r
 \r
-                               // Text selection\r
-                               tr = t.dom.doc.body.createTextRange();\r
-                               tr.moveToElementText(ro);\r
-                               tr.collapse(true);\r
-                               bp = Math.abs(tr.move('character', c));\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
-                               tr = r.duplicate();\r
-                               tr.collapse(true);\r
-                               sp = Math.abs(tr.move('character', c));\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
-                               tr = r.duplicate();\r
-                               tr.collapse(false);\r
-                               le = Math.abs(tr.move('character', c)) - sp;\r
+                                                       point.push(offset);\r
+                                               } else {\r
+                                                       childNodes = container.childNodes;\r
 \r
-                               return {\r
-                                       start : sp - bp,\r
-                                       length : le,\r
-                                       scrollX : sx,\r
-                                       scrollY : sy\r
-                               };\r
-                       }\r
+                                                       if (offset >= childNodes.length && childNodes.length) {\r
+                                                               after = 1;\r
+                                                               offset = Math.max(0, childNodes.length - 1);\r
+                                                       }\r
 \r
-                       // Handle W3C\r
-                       e = t.getNode();\r
-                       s = t.getSel();\r
+                                                       point.push(t.dom.nodeIndex(childNodes[offset], normalized) + after);\r
+                                               }\r
 \r
-                       if (!s)\r
-                               return null;\r
+                                               for (; container && container != root; container = container.parentNode)\r
+                                                       point.push(t.dom.nodeIndex(container, normalized));\r
 \r
-                       // Image selection\r
-                       if (e && e.nodeName == 'IMG') {\r
-                               return {\r
-                                       scrollX : sx,\r
-                                       scrollY : sy\r
-                               };\r
-                       }\r
+                                               return point;\r
+                                       };\r
 \r
-                       // Text selection\r
+                                       bookmark.start = getPoint(rng, true);\r
 \r
-                       function getPos(r, sn, en) {\r
-                               var w = t.dom.doc.createTreeWalker(r, NodeFilter.SHOW_TEXT, null, false), n, p = 0, d = {};\r
+                                       if (!t.isCollapsed())\r
+                                               bookmark.end = getPoint(rng);\r
 \r
-                               while ((n = w.nextNode()) != null) {\r
-                                       if (n == sn)\r
-                                               d.start = p;\r
+                                       return bookmark;\r
+                               };\r
 \r
-                                       if (n == en) {\r
-                                               d.end = p;\r
-                                               return d;\r
-                                       }\r
+                               return getLocation();\r
+                       }\r
 \r
-                                       p += trimNl(n.nodeValue || '').length;\r
-                               }\r
+                       // Handle simple range\r
+                       if (type)\r
+                               return {rng : t.getRng()};\r
 \r
-                               return null;\r
-                       };\r
+                       rng = t.getRng();\r
+                       id = dom.uniqueId();\r
+                       collapsed = tinyMCE.activeEditor.selection.isCollapsed();\r
+                       styles = 'overflow:hidden;line-height:0px';\r
 \r
-                       // Caret or selection\r
-                       if (s.anchorNode == s.focusNode && s.anchorOffset == s.focusOffset) {\r
-                               e = getPos(ro, s.anchorNode, s.focusNode);\r
+                       // Explorer method\r
+                       if (rng.duplicate || rng.item) {\r
+                               // Text selection\r
+                               if (!rng.item) {\r
+                                       rng2 = rng.duplicate();\r
 \r
-                               if (!e)\r
-                                       return {scrollX : sx, scrollY : sy};\r
+                                       // Insert start marker\r
+                                       rng.collapse();\r
+                                       rng.pasteHTML('<span _mce_type="bookmark" id="' + id + '_start" style="' + styles + '">' + chr + '</span>');\r
 \r
-                               // Count whitespace before\r
-                               trimNl(s.anchorNode.nodeValue || '').replace(/^\s+/, function(a) {wb = a.length;});\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
+                                       }\r
+                               } else {\r
+                                       // Control selection\r
+                                       element = rng.item(0);\r
+                                       name = element.nodeName;\r
 \r
-                               return {\r
-                                       start : Math.max(e.start + s.anchorOffset - wb, 0),\r
-                                       end : Math.max(e.end + s.focusOffset - wb, 0),\r
-                                       scrollX : sx,\r
-                                       scrollY : sy,\r
-                                       beg : s.anchorOffset - wb == 0\r
-                               };\r
+                                       return {name : name, index : findIndex(name, element)};\r
+                               }\r
                        } else {\r
-                               e = getPos(ro, r.startContainer, r.endContainer);\r
+                               element = t.getNode();\r
+                               name = element.nodeName;\r
+                               if (name == 'IMG')\r
+                                       return {name : name, index : findIndex(name, element)};\r
 \r
-                               // Count whitespace before start and end container\r
-                               //(r.startContainer.nodeValue || '').replace(/^\s+/, function(a) {wb = a.length;});\r
-                               //(r.endContainer.nodeValue || '').replace(/^\s+/, function(a) {wa = a.length;});\r
+                               // W3C method\r
+                               rng2 = rng.cloneRange();\r
 \r
-                               if (!e)\r
-                                       return {scrollX : sx, scrollY : sy};\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
 \r
-                               return {\r
-                                       start : Math.max(e.start + r.startOffset - wb, 0),\r
-                                       end : Math.max(e.end + r.endOffset - wa, 0),\r
-                                       scrollX : sx,\r
-                                       scrollY : sy,\r
-                                       beg : r.startOffset - wb == 0\r
-                               };\r
+                               rng.collapse(true);\r
+                               rng.insertNode(dom.create('span', {_mce_type : "bookmark", id : id + '_start', style : styles}, chr));\r
                        }\r
-               },\r
 \r
-               moveToBookmark : function(b) {\r
-                       var t = this, r = t.getRng(), s = t.getSel(), ro = t.dom.getRoot(), sd, nvl, nv;\r
+                       t.moveToBookmark({id : id, keep : 1});\r
 \r
-                       function getPos(r, sp, ep) {\r
-                               var w = t.dom.doc.createTreeWalker(r, NodeFilter.SHOW_TEXT, null, false), n, p = 0, d = {}, o, v, wa, wb;\r
+                       return {id : id};\r
+               },\r
 \r
-                               while ((n = w.nextNode()) != null) {\r
-                                       wa = wb = 0;\r
+               moveToBookmark : function(bookmark) {\r
+                       var t = this, dom = t.dom, marker1, marker2, rng, root, startContainer, endContainer, startOffset, endOffset;\r
 \r
-                                       nv = n.nodeValue || '';\r
-                                       //nv.replace(/^\s+[^\s]/, function(a) {wb = a.length - 1;});\r
-                                       //nv.replace(/[^\s]\s+$/, function(a) {wa = a.length - 1;});\r
+                       // Clear selection cache\r
+                       if (t.tridentSel)\r
+                               t.tridentSel.destroy();\r
 \r
-                                       nvl = trimNl(nv).length;\r
-                                       p += nvl;\r
+                       if (bookmark) {\r
+                               if (bookmark.start) {\r
+                                       rng = dom.createRng();\r
+                                       root = dom.getRoot();\r
 \r
-                                       if (p >= sp && !d.startNode) {\r
-                                               o = sp - (p - nvl);\r
+                                       function setEndPoint(start) {\r
+                                               var point = bookmark[start ? 'start' : 'end'], i, node, offset, children;\r
 \r
-                                               // Fix for odd quirk in FF\r
-                                               if (b.beg && o >= nvl)\r
-                                                       continue;\r
+                                               if (point) {\r
+                                                       // Find container node\r
+                                                       for (node = root, i = point.length - 1; i >= 1; i--) {\r
+                                                               children = node.childNodes;\r
 \r
-                                               d.startNode = n;\r
-                                               d.startOffset = o + wb;\r
-                                       }\r
+                                                               if (children.length)\r
+                                                                       node = children[point[i]];\r
+                                                       }\r
 \r
-                                       if (p >= ep) {\r
-                                               d.endNode = n;\r
-                                               d.endOffset = ep - (p - nvl) + wb;\r
-                                               return d;\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
 \r
-                               return null;\r
-                       };\r
+                                       setEndPoint(true);\r
+                                       setEndPoint();\r
 \r
-                       if (!b)\r
-                               return false;\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
 \r
-                       t.win.scrollTo(b.scrollX, b.scrollY);\r
+                                               if (marker) {\r
+                                                       node = marker.parentNode;\r
 \r
-                       // Handle explorer\r
-                       if (isIE) {\r
-                               // Handle simple\r
-                               if (r = b.rng) {\r
-                                       try {\r
-                                               r.select();\r
-                                       } catch (ex) {\r
-                                               // Ignore\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
-                                       return 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
 \r
-                               t.win.focus();\r
+                                                               endContainer = node;\r
+                                                               endOffset = idx;\r
+                                                       }\r
 \r
-                               // Handle control bookmark\r
-                               if (b.tag) {\r
-                                       r = ro.createControlRange();\r
+                                                       if (!keep) {\r
+                                                               prev = marker.previousSibling;\r
+                                                               next = marker.nextSibling;\r
 \r
-                                       each(t.dom.select(b.tag), function(n, i) {\r
-                                               if (i == b.index)\r
-                                                       r.addElement(n);\r
-                                       });\r
-                               } else {\r
-                                       // Try/catch needed since this operation breaks when TinyMCE is placed in hidden divs/tabs\r
-                                       try {\r
-                                               // Incorrect bookmark\r
-                                               if (b.start < 0)\r
-                                                       return true;\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
-                                               r = s.createRange();\r
-                                               r.moveToElementText(ro);\r
-                                               r.collapse(true);\r
-                                               r.moveStart('character', b.start);\r
-                                               r.moveEnd('character', b.length);\r
-                                       } catch (ex2) {\r
-                                               return true;\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
 \r
-                               try {\r
-                                       r.select();\r
-                               } catch (ex) {\r
-                                       // Needed for some odd IE bug #1843306\r
-                               }\r
+                                                               // If siblings are text nodes then merge them\r
+                                                               if (prev && next && prev.nodeType == next.nodeType && prev.nodeType == 3) {\r
+                                                                       idx = prev.nodeValue.length;\r
+                                                                       prev.appendData(next.nodeValue);\r
+                                                                       dom.remove(next);\r
 \r
-                               return true;\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
+                                               }\r
+                                       };\r
 \r
-                       // Handle W3C\r
-                       if (!s)\r
-                               return false;\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
 \r
-                       // Handle simple\r
-                       if (b.rng) {\r
-                               s.removeAllRanges();\r
-                               s.addRange(b.rng);\r
-                       } else {\r
-                               if (is(b.start) && is(b.end)) {\r
-                                       try {\r
-                                               sd = getPos(ro, b.start, b.end);\r
-\r
-                                               if (sd) {\r
-                                                       r = t.dom.doc.createRange();\r
-                                                       r.setStart(sd.startNode, sd.startOffset);\r
-                                                       r.setEnd(sd.endNode, sd.endOffset);\r
-                                                       s.removeAllRanges();\r
-                                                       s.addRange(r);\r
-                                               }\r
+                                               return node;\r
+                                       };\r
 \r
-                                               if (!tinymce.isOpera)\r
-                                                       t.win.focus();\r
-                                       } catch (ex) {\r
-                                               // Ignore\r
-                                       }\r
-                               }\r
+                                       // Restore start/end points\r
+                                       restoreEndPoint('start');\r
+                                       restoreEndPoint('end');\r
+\r
+                                       rng = dom.createRng();\r
+                                       rng.setStart(addBogus(startContainer), startOffset);\r
+                                       rng.setEnd(addBogus(endContainer), endOffset);\r
+                                       t.setRng(rng);\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
-               select : function(n, c) {\r
-                       var t = this, r = t.getRng(), s = t.getSel(), b, fn, ln, d = t.win.document;\r
+               select : function(node, content) {\r
+                       var t = this, dom = t.dom, rng = dom.createRng(), idx;\r
 \r
-                       function find(n, start) {\r
-                               var walker, o;\r
+                       idx = dom.nodeIndex(node);\r
+                       rng.setStart(node.parentNode, idx);\r
+                       rng.setEnd(node.parentNode, idx + 1);\r
 \r
-                               if (n) {\r
-                                       walker = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);\r
-\r
-                                       // Find first/last non empty text node\r
-                                       while (n = walker.nextNode()) {\r
-                                               o = n;\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
-                                               if (tinymce.trim(n.nodeValue).length != 0) {\r
+                                       do {\r
+                                               // Text node\r
+                                               if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {\r
                                                        if (start)\r
-                                                               return n;\r
+                                                               rng.setStart(node, 0);\r
                                                        else\r
-                                                               o = n;\r
-                                               }\r
-                                       }\r
-                               }\r
-\r
-                               return o;\r
-                       };\r
-\r
-                       if (isIE) {\r
-                               try {\r
-                                       b = d.body;\r
+                                                               rng.setEnd(node, node.nodeValue.length);\r
 \r
-                                       if (/^(IMG|TABLE)$/.test(n.nodeName)) {\r
-                                               r = b.createControlRange();\r
-                                               r.addElement(n);\r
-                                       } else {\r
-                                               r = b.createTextRange();\r
-                                               r.moveToElementText(n);\r
-                                       }\r
-\r
-                                       r.select();\r
-                               } catch (ex) {\r
-                                       // Throws illigal agrument in IE some times\r
-                               }\r
-                       } else {\r
-                               if (c) {\r
-                                       fn = find(n, 1) || t.dom.select('br:first', n)[0];\r
-                                       ln = find(n, 0) || t.dom.select('br:last', n)[0];\r
-\r
-                                       if (fn && ln) {\r
-                                               r = d.createRange();\r
+                                                       return;\r
+                                               }\r
 \r
-                                               if (fn.nodeName == 'BR')\r
-                                                       r.setStartBefore(fn);\r
-                                               else\r
-                                                       r.setStart(fn, 0);\r
+                                               // BR element\r
+                                               if (node.nodeName == 'BR') {\r
+                                                       if (start)\r
+                                                               rng.setStartBefore(node);\r
+                                                       else\r
+                                                               rng.setEndBefore(node);\r
 \r
-                                               if (ln.nodeName == 'BR')\r
-                                                       r.setEndBefore(ln);\r
-                                               else\r
-                                                       r.setEnd(ln, ln.nodeValue.length);\r
-                                       } else\r
-                                               r.selectNode(n);\r
-                               } else\r
-                                       r.selectNode(n);\r
+                                                       return;\r
+                                               }\r
+                                       } while (node = (start ? walker.next() : walker.prev()));\r
+                               };\r
 \r
-                               t.setRng(r);\r
+                               setPoint(node, 1);\r
+                               setPoint(node);\r
                        }\r
 \r
-                       return n;\r
+                       t.setRng(rng);\r
+\r
+                       return node;\r
                },\r
 \r
                isCollapsed : function() {\r
@@ -5143,7 +5566,10 @@ window.tinymce.dom.Sizzle = Sizzle;
                        if (!r || r.item)\r
                                return false;\r
 \r
-                       return !s || r.boundingWidth == 0 || r.collapsed;\r
+                       if (r.compareEndPoints)\r
+                               return r.compareEndPoints('StartToEnd', r) === 0;\r
+\r
+                       return !s || r.collapsed;\r
                },\r
 \r
                collapse : function(b) {\r
@@ -5184,20 +5610,32 @@ window.tinymce.dom.Sizzle = Sizzle;
                        // 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 = isIE ? t.win.document.body.createTextRange() : t.win.document.createRange();\r
+                               r = t.win.document.createRange ? t.win.document.createRange() : t.win.document.body.createTextRange();\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
                        return r;\r
                },\r
 \r
                setRng : function(r) {\r
                        var s, t = this;\r
-\r
+                       \r
                        if (!t.tridentSel) {\r
                                s = t.getSel();\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
@@ -5224,33 +5662,36 @@ window.tinymce.dom.Sizzle = Sizzle;
                },\r
 \r
                getNode : function() {\r
-                       var t = this, r = t.getRng(), s = t.getSel(), e;\r
+                       var t = this, rng = t.getRng(), sel = t.getSel(), elm;\r
 \r
-                       if (!isIE) {\r
+                       if (rng.setStart) {\r
                                // Range maybe lost after the editor is made visible again\r
-                               if (!r)\r
+                               if (!rng)\r
                                        return t.dom.getRoot();\r
 \r
-                               e = r.commonAncestorContainer;\r
+                               elm = rng.commonAncestorContainer;\r
 \r
                                // Handle selection a image or other control like element such as anchors\r
-                               if (!r.collapsed) {\r
-                                       // If the anchor node is a element instead of a text node then return this element\r
-                                       if (tinymce.isWebKit && s.anchorNode && s.anchorNode.nodeType == 1) \r
-                                               return s.anchorNode.childNodes[s.anchorOffset]; \r
-\r
-                                       if (r.startContainer == r.endContainer) {\r
-                                               if (r.startOffset - r.endOffset < 2) {\r
-                                                       if (r.startContainer.hasChildNodes())\r
-                                                               e = r.startContainer.childNodes[r.startOffset];\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
+\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
 \r
-                               return t.dom.getParent(e, '*');\r
+                               if (elm && elm.nodeType == 3)\r
+                                       return elm.parentNode;\r
+\r
+                               return elm;\r
                        }\r
 \r
-                       return r.item ? r.item(0) : r.parentElement();\r
+                       return rng.item ? rng.item(0) : rng.parentElement();\r
                },\r
 \r
                getSelectedBlocks : function(st, en) {\r
@@ -5289,9 +5730,9 @@ window.tinymce.dom.Sizzle = Sizzle;
                        if (!s)\r
                                tinymce.removeUnload(t.destroy);\r
                }\r
-\r
-               });\r
+       });\r
 })(tinymce);\r
+\r
 (function(tinymce) {\r
        tinymce.create('tinymce.dom.XMLWriter', {\r
                node : null,\r
@@ -5358,7 +5799,7 @@ window.tinymce.dom.Sizzle = Sizzle;
                },\r
 \r
                writeCDATA : function(v) {\r
-                       this.node.appendChild(this.doc.createCDATA(v));\r
+                       this.node.appendChild(this.doc.createCDATASection(v));\r
                },\r
 \r
                writeComment : function(v) {\r
@@ -5381,9 +5822,9 @@ window.tinymce.dom.Sizzle = Sizzle;
 \r
                        return h;\r
                }\r
-\r
-               });\r
+       });\r
 })(tinymce);\r
+\r
 (function(tinymce) {\r
        tinymce.create('tinymce.dom.StringWriter', {\r
                str : null,\r
@@ -5395,7 +5836,7 @@ window.tinymce.dom.Sizzle = Sizzle;
                StringWriter : function(s) {\r
                        this.settings = tinymce.extend({\r
                                indent_char : ' ',\r
-                               indentation : 1\r
+                               indentation : 0\r
                        }, s);\r
 \r
                        this.reset();\r
@@ -5508,9 +5949,9 @@ window.tinymce.dom.Sizzle = Sizzle;
 \r
                        return true;\r
                }\r
-\r
-               });\r
+       });\r
 })(tinymce);\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
@@ -5540,21 +5981,18 @@ window.tinymce.dom.Sizzle = Sizzle;
                                valid_nodes : 0,\r
                                node_filter : 0,\r
                                attr_filter : 0,\r
-                               invalid_attrs : /^(mce_|_moz_)/,\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
-                               bool_attrs : /(checked|disabled|readonly|selected|nowrap)/,\r
                                valid_elements : '*[*]',\r
                                extended_valid_elements : 0,\r
-                               valid_child_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
-                               font_size_style_values : 0,\r
                                apply_source_formatting : 0,\r
                                indent_mode : 'simple',\r
                                indent_char : '\t',\r
@@ -5565,6 +6003,11 @@ window.tinymce.dom.Sizzle = Sizzle;
                        }, s);\r
 \r
                        t.dom = s.dom;\r
+                       t.schema = s.schema;\r
+\r
+                       // Use raw entities if no entities are defined\r
+                       if (s.entity_encoding == 'named' && !s.entities)\r
+                               s.entity_encoding = 'raw';\r
 \r
                        if (s.remove_redundant_brs) {\r
                                t.onPostProcess.add(function(se, o) {\r
@@ -5628,15 +6071,27 @@ window.tinymce.dom.Sizzle = Sizzle;
 \r
                        if (s.fix_table_elements) {\r
                                t.onPreProcess.add(function(se, o) {\r
-                                       each(t.dom.select('p table', o.node), function(n) {\r
-                                               t.dom.split(t.dom.getParent(n, 'p'), n);\r
-                                       });\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
+\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
+                                       }\r
                                });\r
                        }\r
                },\r
 \r
                setEntities : function(s) {\r
-                       var t = this, a, i, l = {}, re = '', v;\r
+                       var t = this, a, i, l = {}, v;\r
 \r
                        // No need to setup more than once\r
                        if (t.entityLookup)\r
@@ -5654,124 +6109,41 @@ window.tinymce.dom.Sizzle = Sizzle;
                                l[String.fromCharCode(a[i])] = a[i + 1];\r
 \r
                                v = parseInt(a[i]).toString(16);\r
-                               re += '\\u' + '0000'.substring(v.length) + v;\r
-                       }\r
-\r
-                       if (!re) {\r
-                               t.settings.entity_encoding = 'raw';\r
-                               return;\r
                        }\r
 \r
-                       t.entitiesRE = new RegExp('[' + re + ']', 'g');\r
                        t.entityLookup = l;\r
                },\r
 \r
-               setValidChildRules : function(s) {\r
-                       this.childRules = null;\r
-                       this.addValidChildRules(s);\r
+               setRules : function(s) {\r
+                       var t = this;\r
+\r
+                       t._setup();\r
+                       t.rules = {};\r
+                       t.wildRules = [];\r
+                       t.validElements = {};\r
+\r
+                       return t.addRules(s);\r
                },\r
 \r
-               addValidChildRules : function(s) {\r
-                       var t = this, inst, intr, bloc;\r
+               addRules : function(s) {\r
+                       var t = this, dr;\r
 \r
                        if (!s)\r
                                return;\r
 \r
-                       inst = 'A|BR|SPAN|BDO|MAP|OBJECT|IMG|TT|I|B|BIG|SMALL|EM|STRONG|DFN|CODE|Q|SAMP|KBD|VAR|CITE|ABBR|ACRONYM|SUB|SUP|#text|#comment';\r
-                       intr = 'A|BR|SPAN|BDO|OBJECT|APPLET|IMG|MAP|IFRAME|TT|I|B|U|S|STRIKE|BIG|SMALL|FONT|BASEFONT|EM|STRONG|DFN|CODE|Q|SAMP|KBD|VAR|CITE|ABBR|ACRONYM|SUB|SUP|INPUT|SELECT|TEXTAREA|LABEL|BUTTON|#text|#comment';\r
-                       bloc = 'H[1-6]|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TD|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|FORM|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP';\r
+                       t._setup();\r
 \r
                        each(s.split(','), function(s) {\r
-                               var p = s.split(/\[|\]/), re;\r
+                               var p = s.split(/\[|\]/), tn = p[0].split('/'), ra, at, wat, va = [];\r
 \r
-                               s = '';\r
-                               each(p[1].split('|'), function(v) {\r
-                                       if (s)\r
-                                               s += '|';\r
+                               // Extend with default rules\r
+                               if (dr)\r
+                                       at = tinymce.extend([], dr.attribs);\r
 \r
-                                       switch (v) {\r
-                                               case '%itrans':\r
-                                                       v = intr;\r
-                                                       break;\r
-\r
-                                               case '%itrans_na':\r
-                                                       v = intr.substring(2);\r
-                                                       break;\r
-\r
-                                               case '%istrict':\r
-                                                       v = inst;\r
-                                                       break;\r
-\r
-                                               case '%istrict_na':\r
-                                                       v = inst.substring(2);\r
-                                                       break;\r
-\r
-                                               case '%btrans':\r
-                                                       v = bloc;\r
-                                                       break;\r
-\r
-                                               case '%bstrict':\r
-                                                       v = bloc;\r
-                                                       break;\r
-                                       }\r
-\r
-                                       s += v;\r
-                               });\r
-                               re = new RegExp('^(' + s.toLowerCase() + ')$', 'i');\r
-\r
-                               each(p[0].split('/'), function(s) {\r
-                                       t.childRules = t.childRules || {};\r
-                                       t.childRules[s] = re;\r
-                               });\r
-                       });\r
-\r
-                       // Build regex\r
-                       s = '';\r
-                       each(t.childRules, function(v, k) {\r
-                               if (s)\r
-                                       s += '|';\r
-\r
-                               s += k;\r
-                       });\r
-\r
-                       t.parentElementsRE = new RegExp('^(' + s.toLowerCase() + ')$', 'i');\r
-\r
-                       /*console.debug(t.parentElementsRE.toString());\r
-                       each(t.childRules, function(v) {\r
-                               console.debug(v.toString());\r
-                       });*/\r
-               },\r
-\r
-               setRules : function(s) {\r
-                       var t = this;\r
-\r
-                       t._setup();\r
-                       t.rules = {};\r
-                       t.wildRules = [];\r
-                       t.validElements = {};\r
-\r
-                       return t.addRules(s);\r
-               },\r
-\r
-               addRules : function(s) {\r
-                       var t = this, dr;\r
-\r
-                       if (!s)\r
-                               return;\r
-\r
-                       t._setup();\r
-\r
-                       each(s.split(','), function(s) {\r
-                               var p = s.split(/\[|\]/), tn = p[0].split('/'), ra, at, wat, va = [];\r
-\r
-                               // Extend with default rules\r
-                               if (dr)\r
-                                       at = tinymce.extend([], dr.attribs);\r
-\r
-                               // Parse attributes\r
-                               if (p.length > 1) {\r
-                                       each(p[1].split('|'), function(s) {\r
-                                               var ar = {}, i;\r
+                               // Parse attributes\r
+                               if (p.length > 1) {\r
+                                       each(p[1].split('|'), function(s) {\r
+                                               var ar = {}, i;\r
 \r
                                                at = at || [];\r
 \r
@@ -5946,13 +6318,58 @@ window.tinymce.dom.Sizzle = Sizzle;
                },\r
 \r
                serialize : function(n, o) {\r
-                       var h, t = this;\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
+\r
+                                       selected.push(v ? v : null);\r
+                               });\r
+                       }\r
+\r
                        n = n.cloneNode(true);\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
+\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
+\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
+\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
+\r
+                               // set the new document in DOMUtils so createElement etc works\r
+                               oldDoc = t.dom.doc;\r
+                               t.dom.doc = doc;\r
+                       }\r
+\r
                        t.key = '' + (parseInt(t.key) + 1);\r
 \r
                        // Pre process\r
@@ -5963,11 +6380,16 @@ window.tinymce.dom.Sizzle = Sizzle;
 \r
                        // Serialize HTML DOM into a string\r
                        t.writer.reset();\r
+                       t._info = o;\r
                        t._serializeNode(n, o.getInner);\r
 \r
                        // Post process\r
                        o.content = t.writer.getContent();\r
 \r
+                       // Restore the old document if it was changed\r
+                       if (oldDoc)\r
+                               t.dom.doc = oldDoc;\r
+\r
                        if (!o.no_events)\r
                                t.onPostProcess.dispatch(t, o);\r
 \r
@@ -5988,6 +6410,7 @@ window.tinymce.dom.Sizzle = Sizzle;
                                        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
@@ -6040,23 +6463,38 @@ window.tinymce.dom.Sizzle = Sizzle;
                                // Restore the \u00a0 character if raw mode is enabled\r
                                if (s.entity_encoding == 'raw')\r
                                        h = h.replace(/<p>&nbsp;<\/p>|<p([^>]+)>&nbsp;<\/p>/g, '<p$1>\u00a0</p>');\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
                        }\r
 \r
                        o.content = h;\r
                },\r
 \r
-               _serializeNode : function(n, inn) {\r
-                       var t = this, s = t.settings, w = t.writer, hc, el, cn, i, l, a, at, no, v, nn, ru, ar, iv;\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;\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
+                                               if (n.hasAttribute ? n.hasAttribute('_mce_bogus') : n.getAttribute('_mce_bogus'))\r
                                                        return;\r
 \r
-                                               iv = false;\r
+                                               iv = keep = false;\r
                                                hc = n.hasChildNodes();\r
-                                               nn = n.getAttribute('mce_name') || n.nodeName.toLowerCase();\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
@@ -6069,18 +6507,20 @@ window.tinymce.dom.Sizzle = Sizzle;
                                                        nn = nn.substring(4);\r
 \r
                                                // Check if valid\r
-                                               if (!t.validElementsRE.test(nn) || (t.invalidElementsRE && t.invalidElementsRE.test(nn)) || inn) {\r
-                                                       iv = true;\r
-                                                       break;\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
 \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
+                                                               if (n._mce_serialized == t.key)\r
                                                                        return;\r
 \r
-                                                               n.mce_serialized = t.key;\r
+                                                               n._mce_serialized = t.key;\r
                                                        }\r
 \r
                                                        // IE sometimes adds a / infront of the node name\r
@@ -6093,19 +6533,25 @@ window.tinymce.dom.Sizzle = Sizzle;
                                                }\r
 \r
                                                // Check if valid child\r
-                                               if (t.childRules) {\r
-                                                       if (t.parentElementsRE.test(t.elementName)) {\r
-                                                               if (!t.childRules[t.elementName].test(nn)) {\r
-                                                                       iv = true;\r
-                                                                       break;\r
-                                                               }\r
+                                               if (s.validate_children) {\r
+                                                       if (t.elementName && !t.schema.isValid(t.elementName, nn)) {\r
+                                                               iv = true;\r
+                                                               break;\r
                                                        }\r
 \r
                                                        t.elementName = nn;\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
+\r
                                                nn = ru.name || nn;\r
+                                               closed = s.closed.test(nn);\r
 \r
                                                // Skip empty nodes or empty node name in IE\r
                                                if ((!hc && ru.noEmpty) || (isIE && !nn)) {\r
@@ -6163,11 +6609,23 @@ window.tinymce.dom.Sizzle = Sizzle;
                                                        }\r
                                                }\r
 \r
+                                               // Keep type attribute\r
+                                               if (type && keep)\r
+                                                       w.writeAttribute('_mce_type', type);\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
+\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
+                                                               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
@@ -6177,10 +6635,8 @@ window.tinymce.dom.Sizzle = Sizzle;
 \r
                                        case 3: // Text\r
                                                // Check if valid child\r
-                                               if (t.childRules && t.parentElementsRE.test(t.elementName)) {\r
-                                                       if (!t.childRules[t.elementName].test(n.nodeName))\r
-                                                               return;\r
-                                               }\r
+                                               if (s.validate_children && t.elementName && !t.schema.isValid(t.elementName, '#text'))\r
+                                                       return;\r
 \r
                                                return w.writeText(n.nodeValue);\r
 \r
@@ -6193,7 +6649,7 @@ window.tinymce.dom.Sizzle = Sizzle;
                        } else if (n.nodeType == 1)\r
                                hc = n.hasChildNodes();\r
 \r
-                       if (hc) {\r
+                       if (hc && !closed) {\r
                                cn = n.firstChild;\r
 \r
                                while (cn) {\r
@@ -6205,7 +6661,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 \r
                        // Write element end\r
                        if (!iv) {\r
-                               if (hc || !s.closed.test(nn))\r
+                               if (!closed)\r
                                        w.writeFullEndElement();\r
                                else\r
                                        w.writeEndElement();\r
@@ -6273,7 +6729,7 @@ window.tinymce.dom.Sizzle = Sizzle;
                                        t.setEntities(s.entities);\r
                                        l = t.entityLookup;\r
 \r
-                                       h = h.replace(t.entitiesRE, function(a) {\r
+                                       h = h.replace(/[\u007E-\uFFFF]/g, function(a) {\r
                                                var v;\r
 \r
                                                if (v = l[a])\r
@@ -6303,7 +6759,6 @@ window.tinymce.dom.Sizzle = Sizzle;
 \r
                        t.setRules(s.valid_elements);\r
                        t.addRules(s.extended_valid_elements);\r
-                       t.addValidChildRules(s.valid_child_elements);\r
 \r
                        if (s.invalid_elements)\r
                                t.invalidElementsRE = new RegExp('^(' + wildcardToRE(s.invalid_elements.replace(/,/g, '|').toLowerCase()) + ')$');\r
@@ -6326,16 +6781,6 @@ window.tinymce.dom.Sizzle = Sizzle;
 \r
                        v = this.dom.getAttrib(n, na);\r
 \r
-                       // Bool attr\r
-                       if (this.settings.bool_attrs.test(na) && v) {\r
-                               v = ('' + v).toLowerCase();\r
-\r
-                               if (v === 'false' || v === '0')\r
-                                       return null;\r
-\r
-                               v = na;\r
-                       }\r
-\r
                        switch (na) {\r
                                case 'rowspan':\r
                                case 'colspan':\r
@@ -6378,306 +6823,591 @@ window.tinymce.dom.Sizzle = Sizzle;
 \r
                        return v;\r
                }\r
-\r
-               });\r
+       });\r
 })(tinymce);\r
+\r
 (function(tinymce) {\r
-       var each = tinymce.each, Event = tinymce.dom.Event;\r
+       tinymce.dom.ScriptLoader = function(settings) {\r
+               var QUEUED = 0,\r
+                       LOADING = 1,\r
+                       LOADED = 2,\r
+                       states = {},\r
+                       queue = [],\r
+                       scriptLoadedCallbacks = {},\r
+                       queueLoadedCallbacks = [],\r
+                       loading = 0,\r
+                       undefined;\r
+\r
+               function loadScript(url, callback) {\r
+                       var t = this, dom = tinymce.DOM, elm, uri, loc, id;\r
+\r
+                       // Execute callback when script is loaded\r
+                       function done() {\r
+                               dom.remove(id);\r
+\r
+                               if (elm)\r
+                                       elm.onreadystatechange = elm.onload = elm = null;\r
+\r
+                               callback();\r
+                       };\r
 \r
-       tinymce.create('tinymce.dom.ScriptLoader', {\r
-               ScriptLoader : function(s) {\r
-                       this.settings = s || {};\r
-                       this.queue = [];\r
-                       this.lookup = {};\r
-               },\r
+                       id = dom.uniqueId();\r
 \r
-               isDone : function(u) {\r
-                       return this.lookup[u] ? this.lookup[u].state == 2 : 0;\r
-               },\r
+                       if (tinymce.isIE6) {\r
+                               uri = new tinymce.util.URI(url);\r
+                               loc = location;\r
 \r
-               markDone : function(u) {\r
-                       this.lookup[u] = {state : 2, url : u};\r
-               },\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
+                                       tinymce.util.XHR.send({\r
+                                               url : tinymce._addVer(uri.getURI()),\r
+                                               success : function(content) {\r
+                                                       // Create new temp script element\r
+                                                       var script = dom.create('script', {\r
+                                                               type : 'text/javascript'\r
+                                                       });\r
 \r
-               add : function(u, cb, s, pr) {\r
-                       var t = this, lo = t.lookup, o;\r
+                                                       // Evaluate script in global scope\r
+                                                       script.text = content;\r
+                                                       document.getElementsByTagName('head')[0].appendChild(script);\r
+                                                       dom.remove(script);\r
 \r
-                       if (o = lo[u]) {\r
-                               // Is loaded fire callback\r
-                               if (cb && o.state == 2)\r
-                                       cb.call(s || this);\r
+                                                       done();\r
+                                               }\r
+                                       });\r
 \r
-                               return o;\r
+                                       return;\r
+                               }\r
                        }\r
 \r
-                       o = {state : 0, url : u, func : cb, scope : s || this};\r
+                       // Create new script element\r
+                       elm = dom.create('script', {\r
+                               id : id,\r
+                               type : 'text/javascript',\r
+                               src : tinymce._addVer(url)\r
+                       });\r
 \r
-                       if (pr)\r
-                               t.queue.unshift(o);\r
-                       else\r
-                               t.queue.push(o);\r
+                       // Add onload and readystate listeners\r
+                       elm.onload = done;\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
-                       lo[u] = o;\r
+                       // Most browsers support this feature so we report errors\r
+                       // for those at least to help users track their missing plugins etc\r
+                       // todo: Removed since it produced error if the document is unloaded by navigating away, re-add it as an option\r
+                       /*elm.onerror = function() {\r
+                               alert('Failed to load: ' + url);\r
+                       };*/\r
 \r
-                       return o;\r
-               },\r
+                       // Add script to document\r
+                       (document.getElementsByTagName('head')[0] || document.body).appendChild(elm);\r
+               };\r
 \r
-               load : function(u, cb, s) {\r
-                       var t = this, o;\r
+               this.isDone = function(url) {\r
+                       return states[url] == LOADED;\r
+               };\r
 \r
-                       if (o = t.lookup[u]) {\r
-                               // Is loaded fire callback\r
-                               if (cb && o.state == 2)\r
-                                       cb.call(s || t);\r
+               this.markDone = function(url) {\r
+                       states[url] = LOADED;\r
+               };\r
 \r
-                               return o;\r
+               this.add = this.load = function(url, callback, scope) {\r
+                       var item, state = states[url];\r
+\r
+                       // Add url to load queue\r
+                       if (state == undefined) {\r
+                               queue.push(url);\r
+                               states[url] = QUEUED;\r
                        }\r
 \r
-                       function loadScript(u) {\r
-                               if (Event.domLoaded || t.settings.strict_mode) {\r
-                                       tinymce.util.XHR.send({\r
-                                               url : tinymce._addVer(u),\r
-                                               error : t.settings.error,\r
-                                               async : false,\r
-                                               success : function(co) {\r
-                                                       t.eval(co);\r
-                                               }\r
-                                       });\r
-                               } else\r
-                                       document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"></script>');\r
-                       };\r
+                       if (callback) {\r
+                               // Store away callback for later execution\r
+                               if (!scriptLoadedCallbacks[url])\r
+                                       scriptLoadedCallbacks[url] = [];\r
+\r
+                               scriptLoadedCallbacks[url].push({\r
+                                       func : callback,\r
+                                       scope : scope || this\r
+                               });\r
+                       }\r
+               };\r
+\r
+               this.loadQueue = function(callback, scope) {\r
+                       this.loadScripts(queue, callback, scope);\r
+               };\r
 \r
-                       if (!tinymce.is(u, 'string')) {\r
-                               each(u, function(u) {\r
-                                       loadScript(u);\r
+               this.loadScripts = function(scripts, callback, scope) {\r
+                       var loadScripts;\r
+\r
+                       function execScriptLoadedCallbacks(url) {\r
+                               // Execute URL callback functions\r
+                               tinymce.each(scriptLoadedCallbacks[url], function(callback) {\r
+                                       callback.func.call(callback.scope);\r
                                });\r
 \r
-                               if (cb)\r
-                                       cb.call(s || t);\r
-                       } else {\r
-                               loadScript(u);\r
+                               scriptLoadedCallbacks[url] = undefined;\r
+                       };\r
 \r
-                               if (cb)\r
-                                       cb.call(s || t);\r
-                       }\r
-               },\r
+                       queueLoadedCallbacks.push({\r
+                               func : callback,\r
+                               scope : scope || this\r
+                       });\r
 \r
-               loadQueue : function(cb, s) {\r
-                       var t = this;\r
+                       loadScripts = function() {\r
+                               var loadingScripts = tinymce.grep(scripts);\r
+\r
+                               // Current scripts has been handled\r
+                               scripts.length = 0;\r
 \r
-                       if (!t.queueLoading) {\r
-                               t.queueLoading = 1;\r
-                               t.queueCallbacks = [];\r
+                               // Load scripts that needs to be loaded\r
+                               tinymce.each(loadingScripts, function(url) {\r
+                                       // Script is already loaded then execute script callbacks directly\r
+                                       if (states[url] == LOADED) {\r
+                                               execScriptLoadedCallbacks(url);\r
+                                               return;\r
+                                       }\r
 \r
-                               t.loadScripts(t.queue, function() {\r
-                                       t.queueLoading = 0;\r
+                                       // Is script not loading then start loading it\r
+                                       if (states[url] != LOADING) {\r
+                                               states[url] = LOADING;\r
+                                               loading++;\r
 \r
-                                       if (cb)\r
-                                               cb.call(s || t);\r
+                                               loadScript(url, function() {\r
+                                                       states[url] = LOADED;\r
+                                                       loading--;\r
 \r
-                                       each(t.queueCallbacks, function(o) {\r
-                                               o.func.call(o.scope);\r
-                                       });\r
+                                                       execScriptLoadedCallbacks(url);\r
+\r
+                                                       // Load more scripts if they where added by the recently loaded script\r
+                                                       loadScripts();\r
+                                               });\r
+                                       }\r
                                });\r
-                       } else if (cb)\r
-                               t.queueCallbacks.push({func : cb, scope : s || t});\r
-               },\r
 \r
-               eval : function(co) {\r
-                       var w = window;\r
+                               // No scripts are currently loading then execute all pending queue loaded callbacks\r
+                               if (!loading) {\r
+                                       tinymce.each(queueLoadedCallbacks, function(callback) {\r
+                                               callback.func.call(callback.scope);\r
+                                       });\r
 \r
-                       // Evaluate script\r
-                       if (!w.execScript) {\r
-                               try {\r
-                                       eval.call(w, co);\r
-                               } catch (ex) {\r
-                                       eval(co, w); // Firefox 3.0a8\r
+                                       queueLoadedCallbacks.length = 0;\r
                                }\r
-                       } else\r
-                               w.execScript(co); // IE\r
-               },\r
+                       };\r
 \r
-               loadScripts : function(sc, cb, s) {\r
-                       var t = this, lo = t.lookup;\r
+                       loadScripts();\r
+               };\r
+       };\r
 \r
-                       function done(o) {\r
-                               o.state = 2; // Has been loaded\r
+       // Global script loader\r
+       tinymce.ScriptLoader = new tinymce.dom.ScriptLoader();\r
+})(tinymce);\r
 \r
-                               // Run callback\r
-                               if (o.func)\r
-                                       o.func.call(o.scope || t);\r
-                       };\r
+tinymce.dom.TreeWalker = function(start_node, root_node) {\r
+       var node = start_node;\r
 \r
-                       function allDone() {\r
-                               var l;\r
+       function findSibling(node, start_name, sibling_name, shallow) {\r
+               var sibling, parent;\r
 \r
-                               // Check if all files are loaded\r
-                               l = sc.length;\r
-                               each(sc, function(o) {\r
-                                       o = lo[o.url];\r
+               if (node) {\r
+                       // Walk into nodes if it has a start\r
+                       if (!shallow && node[start_name])\r
+                               return node[start_name];\r
 \r
-                                       if (o.state === 2) {// It has finished loading\r
-                                               done(o);\r
-                                               l--;\r
-                                       } else\r
-                                               load(o);\r
-                               });\r
+                       // Return the sibling if it has one\r
+                       if (node != root_node) {\r
+                               sibling = node[sibling_name];\r
+                               if (sibling)\r
+                                       return sibling;\r
 \r
-                               // They are all loaded\r
-                               if (l === 0 && cb) {\r
-                                       cb.call(s || t);\r
-                                       cb = 0;\r
+                               // Walk up the parents to look for siblings\r
+                               for (parent = node.parentNode; parent && parent != root_node; parent = parent.parentNode) {\r
+                                       sibling = parent[sibling_name];\r
+                                       if (sibling)\r
+                                               return sibling;\r
                                }\r
-                       };\r
+                       }\r
+               }\r
+       };\r
 \r
-                       function load(o) {\r
-                               if (o.state > 0)\r
-                                       return;\r
+       this.current = function() {\r
+               return node;\r
+       };\r
 \r
-                               o.state = 1; // Is loading\r
+       this.next = function(shallow) {\r
+               return (node = findSibling(node, 'firstChild', 'nextSibling', shallow));\r
+       };\r
 \r
-                               tinymce.dom.ScriptLoader.loadScript(o.url, function() {\r
-                                       done(o);\r
-                                       allDone();\r
-                               });\r
+       this.prev = function(shallow) {\r
+               return (node = findSibling(node, 'lastChild', 'lastSibling', shallow));\r
+       };\r
+};\r
 \r
-                               /*\r
-                               tinymce.util.XHR.send({\r
-                                       url : o.url,\r
-                                       error : t.settings.error,\r
-                                       success : function(co) {\r
-                                               t.eval(co);\r
-                                               done(o);\r
-                                               allDone();\r
-                                       }\r
-                               });\r
-                               */\r
-                       };\r
+(function() {\r
+       var transitional = {};\r
 \r
-                       each(sc, function(o) {\r
-                               var u = o.url;\r
+       function unpack(lookup, data) {\r
+               var key;\r
 \r
-                               // Add to queue if needed\r
-                               if (!lo[u]) {\r
-                                       lo[u] = o;\r
-                                       t.queue.push(o);\r
-                               } else\r
-                                       o = lo[u];\r
+               function replace(value) {\r
+                       return value.replace(/[A-Z]+/g, function(key) {\r
+                               return replace(lookup[key]);\r
+                       });\r
+               };\r
 \r
-                               // Is already loading or has been loaded\r
-                               if (o.state > 0)\r
-                                       return;\r
+               // Unpack lookup\r
+               for (key in lookup) {\r
+                       if (lookup.hasOwnProperty(key))\r
+                               lookup[key] = replace(lookup[key]);\r
+               }\r
 \r
-                               if (!Event.domLoaded && !t.settings.strict_mode) {\r
-                                       var ix, ol = '';\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
-                                       // Add onload events\r
-                                       if (cb || o.func) {\r
-                                               o.state = 1; // Is loading\r
+                       children = children.split(/\|/);\r
 \r
-                                               ix = tinymce.dom.ScriptLoader._addOnLoad(function() {\r
-                                                       done(o);\r
-                                                       allDone();\r
-                                               });\r
+                       for (i = children.length - 1; i >= 0; i--)\r
+                               map[children[i]] = 1;\r
 \r
-                                               if (tinymce.isIE)\r
-                                                       ol = ' onreadystatechange="';\r
-                                               else\r
-                                                       ol = ' onload="';\r
+                       transitional[name] = map;\r
+               });\r
+       };\r
 \r
-                                               ol += 'tinymce.dom.ScriptLoader._onLoad(this,\'' + u + '\',' + ix + ');"';\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
+       tinymce.dom.Schema = function() {\r
+               var t = this, elements = transitional;\r
+\r
+               t.isValid = function(name, child_name) {\r
+                       var element = elements[name];\r
+\r
+                       return !!(element && (!child_name || element[child_name]));\r
+               };\r
+       };\r
+})();\r
+(function(tinymce) {\r
+       tinymce.dom.RangeUtils = function(dom) {\r
+               var INVISIBLE_CHAR = '\uFEFF';\r
+\r
+               this.walk = function(rng, callback) {\r
+                       var startContainer = rng.startContainer,\r
+                               startOffset = rng.startOffset,\r
+                               endContainer = rng.endContainer,\r
+                               endOffset = rng.endOffset,\r
+                               ancestor, startPoint,\r
+                               endPoint, node, parent, siblings, nodes;\r
+\r
+                       // Handle table cell selection the table plugin enables\r
+                       // you to fake select table cells and perform formatting actions on them\r
+                       nodes = dom.select('td.mceSelected,th.mceSelected');\r
+                       if (nodes.length > 0) {\r
+                               tinymce.each(nodes, function(node) {\r
+                                       callback([node]);\r
+                               });\r
 \r
-                                       document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"' + ol + '></script>');\r
+                               return;\r
+                       }\r
 \r
-                                       if (!o.func)\r
-                                               done(o);\r
-                               } else\r
-                                       load(o);\r
-                       });\r
+                       function collectSiblings(node, name, end_node) {\r
+                               var siblings = [];\r
 \r
-                       allDone();\r
-               },\r
+                               for (; node && node != end_node; node = node[name])\r
+                                       siblings.push(node);\r
 \r
-               // Static methods\r
-               'static' : {\r
-                       _addOnLoad : function(f) {\r
-                               var t = this;\r
+                               return siblings;\r
+                       };\r
 \r
-                               t._funcs = t._funcs || [];\r
-                               t._funcs.push(f);\r
+                       function findEndPoint(node, root) {\r
+                               do {\r
+                                       if (node.parentNode == root)\r
+                                               return node;\r
 \r
-                               return t._funcs.length - 1;\r
-                       },\r
+                                       node = node.parentNode;\r
+                               } while(node);\r
+                       };\r
 \r
-                       _onLoad : function(e, u, ix) {\r
-                               if (!tinymce.isIE || e.readyState == 'complete')\r
-                                       this._funcs[ix].call(this);\r
-                       },\r
+                       function walkBoundary(start_node, end_node, next) {\r
+                               var siblingName = next ? 'nextSibling' : 'previousSibling';\r
 \r
-                       loadScript : function(u, cb) {\r
-                               var id = tinymce.DOM.uniqueId(), e;\r
+                               for (node = start_node, parent = node.parentNode; node && node != end_node; node = parent) {\r
+                                       parent = node.parentNode;\r
+                                       siblings = collectSiblings(node == start_node ? node : node[siblingName], siblingName);\r
 \r
-                               function done() {\r
-                                       Event.clear(id);\r
-                                       tinymce.DOM.remove(id);\r
+                                       if (siblings.length) {\r
+                                               if (!next)\r
+                                                       siblings.reverse();\r
 \r
-                                       if (cb) {\r
-                                               cb.call(document, u);\r
-                                               cb = 0;\r
+                                               callback(siblings);\r
                                        }\r
-                               };\r
+                               }\r
+                       };\r
 \r
-                               if (tinymce.isIE) {\r
-/*                                     Event.add(e, 'readystatechange', function(e) {\r
-                                               if (e.target && e.target.readyState == 'complete')\r
-                                                       done();\r
-                                       });*/\r
+                       // If index based start position then resolve it\r
+                       if (startContainer.nodeType == 1 && startContainer.hasChildNodes())\r
+                               startContainer = startContainer.childNodes[startOffset];\r
 \r
-                                       tinymce.util.XHR.send({\r
-                                               url : tinymce._addVer(u),\r
-                                               async : false,\r
-                                               success : function(co) {\r
-                                                       window.execScript(co);\r
-                                                       done();\r
-                                               }\r
-                                       });\r
-                               } else {\r
-                                       e = tinymce.DOM.create('script', {id : id, type : 'text/javascript', src : tinymce._addVer(u)});\r
-                                       Event.add(e, 'load', done);\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
 \r
-                                       // Check for head or body\r
-                                       (document.getElementsByTagName('head')[0] || document.body).appendChild(e);\r
-                               }\r
+                       // Find common ancestor and end points\r
+                       ancestor = dom.findCommonAncestor(startContainer, endContainer);\r
+\r
+                       // Same container\r
+                       if (startContainer == endContainer)\r
+                               return callback([startContainer]);\r
+\r
+                       // Process left side\r
+                       for (node = startContainer; node; node = node.parentNode) {\r
+                               if (node == endContainer)\r
+                                       return walkBoundary(startContainer, ancestor, true);\r
+\r
+                               if (node == ancestor)\r
+                                       break;\r
                        }\r
-               }\r
 \r
-               });\r
+                       // Process right side\r
+                       for (node = endContainer; node; node = node.parentNode) {\r
+                               if (node == startContainer)\r
+                                       return walkBoundary(endContainer, ancestor);\r
 \r
-       // Global script loader\r
-       tinymce.ScriptLoader = new tinymce.dom.ScriptLoader();\r
-})(tinymce);\r
-(function(tinymce) {\r
-       // Shorten class names\r
-       var DOM = tinymce.DOM, is = tinymce.is;\r
+                               if (node == ancestor)\r
+                                       break;\r
+                       }\r
 \r
-       tinymce.create('tinymce.ui.Control', {\r
-               Control : function(id, s) {\r
-                       this.id = id;\r
-                       this.settings = s = s || {};\r
-                       this.rendered = false;\r
-                       this.onRender = new tinymce.util.Dispatcher(this);\r
-                       this.classPrefix = '';\r
-                       this.scope = s.scope || this;\r
-                       this.disabled = 0;\r
-                       this.active = 0;\r
-               },\r
+                       // Find start/end point\r
+                       startPoint = findEndPoint(startContainer, ancestor) || startContainer;\r
+                       endPoint = findEndPoint(endContainer, ancestor) || endContainer;\r
 \r
-               setDisabled : function(s) {\r
-                       var e;\r
+                       // Walk left leaf\r
+                       walkBoundary(startContainer, startPoint, true);\r
 \r
-                       if (s != this.disabled) {\r
-                               e = DOM.get(this.id);\r
+                       // Walk the middle from start to end point\r
+                       siblings = collectSiblings(\r
+                               startPoint == startContainer ? startPoint : startPoint.nextSibling,\r
+                               'nextSibling',\r
+                               endPoint == endContainer ? endPoint.nextSibling : endPoint\r
+                       );\r
+\r
+                       if (siblings.length)\r
+                               callback(siblings);\r
+\r
+                       // Walk right leaf\r
+                       walkBoundary(endContainer, endPoint);\r
+               };\r
+\r
+               /*              this.split = function(rng) {\r
+                       var startContainer = rng.startContainer,\r
+                               startOffset = rng.startOffset,\r
+                               endContainer = rng.endContainer,\r
+                               endOffset = rng.endOffset;\r
+\r
+                       function splitText(node, offset) {\r
+                               if (offset == node.nodeValue.length)\r
+                                       node.appendData(INVISIBLE_CHAR);\r
+\r
+                               node = node.splitText(offset);\r
+\r
+                               if (node.nodeValue === INVISIBLE_CHAR)\r
+                                       node.nodeValue = '';\r
+\r
+                               return node;\r
+                       };\r
+\r
+                       // Handle single text node\r
+                       if (startContainer == endContainer) {\r
+                               if (startContainer.nodeType == 3) {\r
+                                       if (startOffset != 0)\r
+                                               startContainer = endContainer = splitText(startContainer, startOffset);\r
+\r
+                                       if (endOffset - startOffset != startContainer.nodeValue.length)\r
+                                               splitText(startContainer, endOffset - startOffset);\r
+                               }\r
+                       } else {\r
+                               // Split startContainer text node if needed\r
+                               if (startContainer.nodeType == 3 && startOffset != 0) {\r
+                                       startContainer = splitText(startContainer, startOffset);\r
+                                       startOffset = 0;\r
+                               }\r
+\r
+                               // Split endContainer text node if needed\r
+                               if (endContainer.nodeType == 3 && endOffset != endContainer.nodeValue.length) {\r
+                                       endContainer = splitText(endContainer, endOffset).previousSibling;\r
+                                       endOffset = endContainer.nodeValue.length;\r
+                               }\r
+                       }\r
+\r
+                       return {\r
+                               startContainer : startContainer,\r
+                               startOffset : startOffset,\r
+                               endContainer : endContainer,\r
+                               endOffset : endOffset\r
+                       };\r
+               };\r
+*/\r
+       };\r
+\r
+       tinymce.dom.RangeUtils.compareRanges = function(rng1, rng2) {\r
+               if (rng1 && rng2) {\r
+                       // Compare native IE ranges\r
+                       if (rng1.item || rng1.duplicate) {\r
+                               // Both are control ranges and the selected element matches\r
+                               if (rng1.item && rng2.item && rng1.item(0) === rng2.item(0))\r
+                                       return true;\r
+\r
+                               // Both are text ranges and the range matches\r
+                               if (rng1.isEqual && rng2.isEqual && rng2.isEqual(rng1))\r
+                                       return true;\r
+                       } else {\r
+                               // Compare w3c ranges\r
+                               return rng1.startContainer == rng2.startContainer && rng1.startOffset == rng2.startOffset;\r
+                       }\r
+               }\r
+\r
+               return false;\r
+       };\r
+})(tinymce);\r
+\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
+                       this.id = id;\r
+                       this.settings = s = s || {};\r
+                       this.rendered = false;\r
+                       this.onRender = new tinymce.util.Dispatcher(this);\r
+                       this.classPrefix = '';\r
+                       this.scope = s.scope || this;\r
+                       this.disabled = 0;\r
+                       this.active = 0;\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
@@ -6756,12 +7486,14 @@ window.tinymce.dom.Sizzle = Sizzle;
                destroy : function() {\r
                        tinymce.dom.Event.clear(this.id);\r
                }\r
-\r
-               });\r
-})(tinymce);tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {\r
+       });\r
+})(tinymce);\r
+tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {\r
        Container : function(id, s) {\r
                this.parent(id, s);\r
+\r
                this.controls = [];\r
+\r
                this.lookup = {};\r
        },\r
 \r
@@ -6775,8 +7507,8 @@ window.tinymce.dom.Sizzle = Sizzle;
        get : function(n) {\r
                return this.lookup[n];\r
        }\r
+});\r
 \r
-       });\r
 \r
 tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {\r
        Separator : function(id, s) {\r
@@ -6787,8 +7519,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
        renderHTML : function() {\r
                return tinymce.DOM.createHTML('span', {'class' : this.classPrefix});\r
        }\r
+});\r
 \r
-       });\r
 (function(tinymce) {\r
        var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, walk = tinymce.walk;\r
 \r
@@ -6816,9 +7548,9 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        if (is(t.selected))\r
                                t.setSelected(t.selected);\r
                }\r
-\r
-               });\r
+       });\r
 })(tinymce);\r
+\r
 (function(tinymce) {\r
        var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, walk = tinymce.walk;\r
 \r
@@ -6915,9 +7647,9 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 \r
                        return m;\r
                }\r
-\r
-               });\r
-})(tinymce);(function(tinymce) {\r
+       });\r
+})(tinymce);\r
+(function(tinymce) {\r
        var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, Event = tinymce.dom.Event, Element = tinymce.dom.Element;\r
 \r
        tinymce.create('tinymce.ui.DropMenu:tinymce.ui.Menu', {\r
@@ -7243,9 +7975,9 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 \r
                        DOM.addClass(ro, 'mceLast');\r
                }\r
-\r
-               });\r
-})(tinymce);(function(tinymce) {\r
+       });\r
+})(tinymce);\r
+(function(tinymce) {\r
        var DOM = tinymce.DOM;\r
 \r
        tinymce.create('tinymce.ui.Button:tinymce.ui.Control', {\r
@@ -7276,9 +8008,9 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                        return s.onclick.call(s.scope, e);\r
                        });\r
                }\r
-\r
-               });\r
+       });\r
 })(tinymce);\r
+\r
 (function(tinymce) {\r
        var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;\r
 \r
@@ -7287,11 +8019,17 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        var t = this;\r
 \r
                        t.parent(id, s);\r
+\r
                        t.items = [];\r
+\r
                        t.onChange = new Dispatcher(t);\r
+\r
                        t.onPostRender = new Dispatcher(t);\r
+\r
                        t.onAdd = new Dispatcher(t);\r
+\r
                        t.onRenderMenu = new tinymce.util.Dispatcher(this);\r
+\r
                        t.classPrefix = 'mceListBox';\r
                },\r
 \r
@@ -7420,16 +8158,16 @@ 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" && (e.target.id == t.id + '_text' || e.target.id == t.id + '_open'))\r
-                               return;\r
-\r
-                       if (!e || !DOM.getParent(e.target, '.mceMenu')) {\r
-                               DOM.removeClass(t.id, t.classPrefix + 'Selected');\r
-                               Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);\r
+                       if (t.menu && t.menu.isMenuVisible) {\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
 \r
-                               if (t.menu)\r
+                               if (!e || !DOM.getParent(e.target, '.mceMenu')) {\r
+                                       DOM.removeClass(t.id, t.classPrefix + 'Selected');\r
+                                       Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);\r
                                        t.menu.hideMenu();\r
+                               }\r
                        }\r
                },\r
 \r
@@ -7455,13 +8193,25 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        });\r
 \r
                        each(t.items, function(o) {\r
-                               o.id = DOM.uniqueId();\r
-                               o.onclick = function() {\r
-                                       if (t.settings.onselect(o.value) !== false)\r
-                                               t.select(o.value); // Must be runned after\r
-                               };\r
+                               // No value then treat it as a title\r
+                               if (o.value === undefined) {\r
+                                       m.add({\r
+                                               title : o.title,\r
+                                               'class' : 'mceMenuItemTitle',\r
+                                               onclick : function() {\r
+                                                       if (t.settings.onselect('') !== false)\r
+                                                               t.select(''); // Must be runned after\r
+                                               }\r
+                                       });\r
+                               } else {\r
+                                       o.id = DOM.uniqueId();\r
+                                       o.onclick = function() {\r
+                                               if (t.settings.onselect(o.value) !== false)\r
+                                                       t.select(o.value); // Must be runned after\r
+                                       };\r
 \r
-                               m.add(o);\r
+                                       m.add(o);\r
+                               }\r
                        });\r
 \r
                        t.onRenderMenu.dispatch(t, m);\r
@@ -7472,7 +8222,7 @@ 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(e) {\r
+                       Event.add(t.id + '_text', '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
@@ -7527,10 +8277,11 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        this.parent();\r
 \r
                        Event.clear(this.id + '_text');\r
+                       Event.clear(this.id + '_open');\r
                }\r
-\r
-               });\r
-})(tinymce);(function(tinymce) {\r
+       });\r
+})(tinymce);\r
+(function(tinymce) {\r
        var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;\r
 \r
        tinymce.create('tinymce.ui.NativeListBox:tinymce.ui.ListBox', {\r
@@ -7603,7 +8354,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                },\r
 \r
                getLength : function() {\r
-                       return DOM.get(this.id).options.length - 1;\r
+                       return this.items.length;\r
                },\r
 \r
                renderHTML : function() {\r
@@ -7657,15 +8408,17 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 \r
                        t.onPostRender.dispatch(t, DOM.get(t.id));\r
                }\r
-\r
-               });\r
-})(tinymce);(function(tinymce) {\r
+       });\r
+})(tinymce);\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
+\r
                        this.onRenderMenu = new tinymce.util.Dispatcher(this);\r
+\r
                        s.menu_container = s.menu_container || DOM.doc.body;\r
                },\r
 \r
@@ -7744,9 +8497,9 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                }\r
                        });\r
                }\r
-\r
-               });\r
+       });\r
 })(tinymce);\r
+\r
 (function(tinymce) {\r
        var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;\r
 \r
@@ -7810,9 +8563,9 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        Event.clear(this.id + '_action');\r
                        Event.clear(this.id + '_open');\r
                }\r
-\r
-               });\r
+       });\r
 })(tinymce);\r
+\r
 (function(tinymce) {\r
        var DOM = tinymce.DOM, Event = tinymce.dom.Event, is = tinymce.is, each = tinymce.each;\r
 \r
@@ -7829,6 +8582,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        }, t.settings);\r
 \r
                        t.onShowMenu = new tinymce.util.Dispatcher(t);\r
+\r
                        t.onHideMenu = new tinymce.util.Dispatcher(t);\r
 \r
                        t.value = s.default_color;\r
@@ -7860,6 +8614,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        e = 0;\r
 \r
                        Event.add(DOM.doc, 'mousedown', t.hideMenu, t);\r
+                       t.onShowMenu.dispatch(t);\r
 \r
                        if (t._focused) {\r
                                t._keyHandler = Event.add(t.id + '_menu', 'keydown', function(e) {\r
@@ -7870,8 +8625,6 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                DOM.select('a', t.id + '_menu')[0].focus(); // Select first link\r
                        }\r
 \r
-                       t.onShowMenu.dispatch(t);\r
-\r
                        t.isMenuVisible = 1;\r
                },\r
 \r
@@ -7921,7 +8674,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                        style : {\r
                                                backgroundColor : '#' + c\r
                                        },\r
-                                       mce_color : '#' + c\r
+                                       _mce_color : '#' + c\r
                                });\r
                        });\r
 \r
@@ -7943,7 +8696,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 \r
                                e = e.target;\r
 \r
-                               if (e.nodeName == 'A' && (c = e.getAttribute('mce_color')))\r
+                               if (e.nodeName == 'A' && (c = e.getAttribute('_mce_color')))\r
                                        t.setColor(c);\r
 \r
                                return Event.cancel(e); // Prevent IE auto save warning\r
@@ -7977,9 +8730,9 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        Event.clear(this.id + '_more');\r
                        DOM.remove(this.id + '_menu');\r
                }\r
-\r
-               });\r
+       });\r
 })(tinymce);\r
+\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
@@ -8041,8 +8794,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \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
        }\r
+});\r
 \r
-       });\r
 (function(tinymce) {\r
        var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each;\r
 \r
@@ -8050,6 +8803,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                items : [],\r
                urls : {},\r
                lookup : {},\r
+\r
                onAdd : new Dispatcher(this),\r
 \r
                get : function(n) {\r
@@ -8057,16 +8811,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                },\r
 \r
                requireLangPack : function(n) {\r
-                       var u, s = tinymce.EditorManager.settings;\r
-\r
-                       if (s && s.language) {\r
-                               u = this.urls[n] + '/langs/' + s.language + '.js';\r
+                       var s = tinymce.settings;\r
 \r
-                               if (!tinymce.dom.Event.domLoaded && !s.strict_mode)\r
-                                       tinymce.ScriptLoader.load(u);\r
-                               else\r
-                                       tinymce.ScriptLoader.add(u);\r
-                       }\r
+                       if (s && s.language)\r
+                               tinymce.ScriptLoader.add(this.urls[n] + '/langs/' + s.language + '.js');\r
                },\r
 \r
                add : function(id, o) {\r
@@ -8089,49 +8837,53 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        t.urls[n] = u.substring(0, u.lastIndexOf('/'));\r
                        tinymce.ScriptLoader.add(u, cb, s);\r
                }\r
-\r
-               });\r
+       });\r
 \r
        // Create plugin and theme managers\r
        tinymce.PluginManager = new tinymce.AddOnManager();\r
        tinymce.ThemeManager = new tinymce.AddOnManager();\r
-}(tinymce));(function(tinymce) {\r
+}(tinymce));\r
+\r
+(function(tinymce) {\r
        // Shorten names\r
-       var each = tinymce.each, extend = tinymce.extend, DOM = tinymce.DOM, Event = tinymce.dom.Event, ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager, explode = tinymce.explode;\r
+       var each = tinymce.each, extend = tinymce.extend,\r
+               DOM = tinymce.DOM, Event = tinymce.dom.Event,\r
+               ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager,\r
+               explode = tinymce.explode,\r
+               Dispatcher = tinymce.util.Dispatcher, undefined, instanceCounter = 0;\r
 \r
-       tinymce.create('static tinymce.EditorManager', {\r
-               editors : {},\r
-               i18n : {},\r
-               activeEditor : null,\r
+       // Setup some URLs where the editor API is located and where the document is\r
+       tinymce.documentBaseURL = window.location.href.replace(/[\?#].*$/, '').replace(/[\/\\][^\/]+$/, '');\r
+       if (!/[\/\\]$/.test(tinymce.documentBaseURL))\r
+               tinymce.documentBaseURL += '/';\r
 \r
-               preInit : function() {\r
-                       var t = this, lo = window.location;\r
+       tinymce.baseURL = new tinymce.util.URI(tinymce.documentBaseURL).toAbsolute(tinymce.baseURL);\r
 \r
-                       // Setup some URLs where the editor API is located and where the document is\r
-                       tinymce.documentBaseURL = lo.href.replace(/[\?#].*$/, '').replace(/[\/\\][^\/]+$/, '');\r
-                       if (!/[\/\\]$/.test(tinymce.documentBaseURL))\r
-                               tinymce.documentBaseURL += '/';\r
+       tinymce.baseURI = new tinymce.util.URI(tinymce.baseURL);\r
 \r
-                       tinymce.baseURL = new tinymce.util.URI(tinymce.documentBaseURL).toAbsolute(tinymce.baseURL);\r
-                       tinymce.EditorManager.baseURI = new tinymce.util.URI(tinymce.baseURL);\r
+       // Add before unload listener\r
+       // This was required since IE was leaking memory if you added and removed beforeunload listeners\r
+       // with attachEvent/detatchEvent so this only adds one listener and instances can the attach to the onBeforeUnload event\r
+       tinymce.onBeforeUnload = new Dispatcher(tinymce);\r
 \r
-                       // User specified a document.domain value\r
-                       if (document.domain && lo.hostname != document.domain)\r
-                               tinymce.relaxedDomain = document.domain;\r
+       // Must be on window or IE will leak if the editor is placed in frame or iframe\r
+       Event.add(window, 'beforeunload', function(e) {\r
+               tinymce.onBeforeUnload.dispatch(tinymce, e);\r
+       });\r
 \r
-                       // Add before unload listener\r
-                       // This was required since IE was leaking memory if you added and removed beforeunload listeners\r
-                       // with attachEvent/detatchEvent so this only adds one listener and instances can the attach to the onBeforeUnload event\r
-                       t.onBeforeUnload = new tinymce.util.Dispatcher(t);\r
+       tinymce.onAddEditor = new Dispatcher(tinymce);\r
 \r
-                       // Must be on window or IE will leak if the editor is placed in frame or iframe\r
-                       Event.add(window, 'beforeunload', function(e) {\r
-                               t.onBeforeUnload.dispatch(t, e);\r
-                       });\r
-               },\r
+       tinymce.onRemoveEditor = new Dispatcher(tinymce);\r
+\r
+       tinymce.EditorManager = extend(tinymce, {\r
+               editors : [],\r
+\r
+               i18n : {},\r
+\r
+               activeEditor : null,\r
 \r
                init : function(s) {\r
-                       var t = this, pl, sl = tinymce.ScriptLoader, c, e, el = [], ed;\r
+                       var t = this, pl, sl = tinymce.ScriptLoader, e, el = [], ed;\r
 \r
                        function execCallback(se, n, s) {\r
                                var f = se[n];\r
@@ -8150,87 +8902,17 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                        s = extend({\r
                                theme : "simple",\r
-                               language : "en",\r
-                               strict_loading_mode : document.contentType == 'application/xhtml+xml'\r
+                               language : "en"\r
                        }, s);\r
 \r
                        t.settings = s;\r
 \r
-                       // If page not loaded and strict mode isn't enabled then load them\r
-                       if (!Event.domLoaded && !s.strict_loading_mode) {\r
-                               // Load language\r
-                               if (s.language)\r
-                                       sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');\r
-\r
-                               // Load theme\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
-                               // Load plugins\r
-                               if (s.plugins) {\r
-                                       pl = explode(s.plugins);\r
-\r
-                                       // Load compat2x first\r
-                                       if (tinymce.inArray(pl, 'compat2x') != -1)\r
-                                               PluginManager.load('compat2x', 'plugins/compat2x/editor_plugin' + tinymce.suffix + '.js');\r
-\r
-                                       // Load rest if plugins\r
-                                       each(pl, function(v) {\r
-                                               if (v && v.charAt(0) != '-' && !PluginManager.urls[v]) {\r
-                                                       // Skip safari plugin for other browsers\r
-                                                       if (!tinymce.isWebKit && v == 'safari')\r
-                                                               return;\r
-\r
-                                                       PluginManager.load(v, 'plugins/' + v + '/editor_plugin' + tinymce.suffix + '.js');\r
-                                               }\r
-                                       });\r
-                               }\r
-\r
-                               sl.loadQueue();\r
-                       }\r
-\r
                        // Legacy call\r
                        Event.add(document, 'init', function() {\r
                                var l, co;\r
 \r
                                execCallback(s, 'onpageload');\r
 \r
-                               // Verify that it's a valid browser\r
-                               if (s.browsers) {\r
-                                       l = false;\r
-\r
-                                       each(explode(s.browsers), function(v) {\r
-                                               switch (v) {\r
-                                                       case 'ie':\r
-                                                       case 'msie':\r
-                                                               if (tinymce.isIE)\r
-                                                                       l = true;\r
-                                                               break;\r
-\r
-                                                       case 'gecko':\r
-                                                               if (tinymce.isGecko)\r
-                                                                       l = true;\r
-                                                               break;\r
-\r
-                                                       case 'safari':\r
-                                                       case 'webkit':\r
-                                                               if (tinymce.isWebKit)\r
-                                                                       l = true;\r
-                                                               break;\r
-\r
-                                                       case 'opera':\r
-                                                               if (tinymce.isOpera)\r
-                                                                       l = true;\r
-\r
-                                                               break;\r
-                                               }\r
-                                       });\r
-\r
-                                       // Not a valid one\r
-                                       if (!l)\r
-                                               return;\r
-                               }\r
-\r
                                switch (s.mode) {\r
                                        case "exact":\r
                                                l = s.elements || '';\r
@@ -8242,12 +8924,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                                                        el.push(ed);\r
                                                                        ed.render(1);\r
                                                                } else {\r
-                                                                       c = 0;\r
-\r
                                                                        each(document.forms, function(f) {\r
                                                                                each(f.elements, function(e) {\r
                                                                                        if (e.name === v) {\r
-                                                                                               v = 'mce_editor_' + c;\r
+                                                                                               v = 'mce_editor_' + instanceCounter++;\r
                                                                                                DOM.setAttrib(e, 'id', v);\r
 \r
                                                                                                ed = new tinymce.Editor(v, s);\r
@@ -8293,7 +8973,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                if (s.oninit) {\r
                                        l = co = 0;\r
 \r
-                                       each (el, function(ed) {\r
+                                       each(el, function(ed) {\r
                                                co++;\r
 \r
                                                if (!ed.initialized) {\r
@@ -8317,6 +8997,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                },\r
 \r
                get : function(id) {\r
+                       if (id === undefined)\r
+                               return this.editors;\r
+\r
                        return this.editors[id];\r
                },\r
 \r
@@ -8324,33 +9007,44 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        return this.get(id);\r
                },\r
 \r
-               add : function(e) {\r
-                       this.editors[e.id] = e;\r
-                       this._setActive(e);\r
+               add : function(editor) {\r
+                       var self = this, editors = self.editors;\r
 \r
-                       return e;\r
+                       // Add named and index editor instance\r
+                       editors[editor.id] = editor;\r
+                       editors.push(editor);\r
+\r
+                       self._setActive(editor);\r
+                       self.onAddEditor.dispatch(self, editor);\r
+\r
+\r
+                       return editor;\r
                },\r
 \r
-               remove : function(e) {\r
-                       var t = this;\r
+               remove : function(editor) {\r
+                       var t = this, i, editors = t.editors;\r
 \r
                        // Not in the collection\r
-                       if (!t.editors[e.id])\r
+                       if (!editors[editor.id])\r
                                return null;\r
 \r
-                       delete t.editors[e.id];\r
+                       delete editors[editor.id];\r
 \r
-                       // Select another editor since the active one was removed\r
-                       if (t.activeEditor == e) {\r
-                               each(t.editors, function(e) {\r
-                                       t._setActive(e);\r
-                                       return false; // Break\r
-                               });\r
+                       for (i = 0; i < editors.length; i++) {\r
+                               if (editors[i] == editor) {\r
+                                       editors.splice(i, 1);\r
+                                       break;\r
+                               }\r
                        }\r
 \r
-                       e.destroy();\r
+                       // Select another editor since the active one was removed\r
+                       if (t.activeEditor == editor)\r
+                               t._setActive(editors[0]);\r
+\r
+                       editor.destroy();\r
+                       t.onRemoveEditor.dispatch(t, editor);\r
 \r
-                       return e;\r
+                       return editor;\r
                },\r
 \r
                execCommand : function(c, u, v) {\r
@@ -8463,75 +9157,109 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                // Private methods\r
 \r
-               _setActive : function(e) {\r
-                       this.selectedInstance = this.activeEditor = e;\r
+               _setActive : function(editor) {\r
+                       this.selectedInstance = this.activeEditor = editor;\r
                }\r
-\r
-               });\r
-\r
-       tinymce.EditorManager.preInit();\r
+       });\r
 })(tinymce);\r
 \r
-// Short for editor manager window.tinyMCE is needed when TinyMCE gets loaded though a XHR call\r
-var tinyMCE = window.tinyMCE = tinymce.EditorManager;\r
 (function(tinymce) {\r
-       var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend, Dispatcher = tinymce.util.Dispatcher;\r
-       var each = tinymce.each, isGecko = tinymce.isGecko, isIE = tinymce.isIE, isWebKit = tinymce.isWebKit;\r
-       var is = tinymce.is, ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager, EditorManager = tinymce.EditorManager;\r
-       var inArray = tinymce.inArray, grep = tinymce.grep, explode = tinymce.explode;\r
+       // Shorten these names\r
+       var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend,\r
+               Dispatcher = tinymce.util.Dispatcher, each = tinymce.each, isGecko = tinymce.isGecko,\r
+               isIE = tinymce.isIE, isWebKit = tinymce.isWebKit, is = tinymce.is,\r
+               ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager,\r
+               inArray = tinymce.inArray, grep = tinymce.grep, explode = tinymce.explode;\r
 \r
        tinymce.create('tinymce.Editor', {\r
                Editor : function(id, s) {\r
                        var t = this;\r
 \r
                        t.id = t.editorId = id;\r
+\r
                        t.execCommands = {};\r
                        t.queryStateCommands = {};\r
                        t.queryValueCommands = {};\r
+\r
+                       t.isNotDirty = false;\r
+\r
                        t.plugins = {};\r
 \r
                        // Add events to the editor\r
                        each([\r
                                'onPreInit',\r
+\r
                                'onBeforeRenderUI',\r
+\r
                                'onPostRender',\r
+\r
                                'onInit',\r
+\r
                                'onRemove',\r
+\r
                                'onActivate',\r
+\r
                                'onDeactivate',\r
+\r
                                'onClick',\r
+\r
                                'onEvent',\r
+\r
                                'onMouseUp',\r
+\r
                                'onMouseDown',\r
+\r
                                'onDblClick',\r
+\r
                                'onKeyDown',\r
+\r
                                'onKeyUp',\r
+\r
                                'onKeyPress',\r
+\r
                                'onContextMenu',\r
+\r
                                'onSubmit',\r
+\r
                                'onReset',\r
+\r
                                'onPaste',\r
+\r
                                'onPreProcess',\r
+\r
                                'onPostProcess',\r
+\r
                                'onBeforeSetContent',\r
+\r
                                'onBeforeGetContent',\r
+\r
                                'onSetContent',\r
+\r
                                'onGetContent',\r
+\r
                                'onLoadContent',\r
+\r
                                'onSaveContent',\r
+\r
                                'onNodeChange',\r
+\r
                                'onChange',\r
+\r
                                'onBeforeExecCommand',\r
+\r
                                'onExecCommand',\r
+\r
                                'onUndo',\r
+\r
                                'onRedo',\r
+\r
                                'onVisualAid',\r
+\r
                                'onSetProgressState'\r
                        ], function(e) {\r
                                t[e] = new Dispatcher(t);\r
                        });\r
 \r
-                       // Default editor config\r
                        t.settings = s = extend({\r
                                id : id,\r
                                language : 'en',\r
@@ -8557,16 +9285,14 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                custom_undo_redo_keyboard_shortcuts : 1,\r
                                custom_undo_redo_restore_selection : 1,\r
                                custom_undo_redo : 1,\r
-                               doctype : '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">',\r
+                               doctype : tinymce.isIE6 ? '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">' : '<!DOCTYPE>', // Use old doctype on IE 6 to avoid horizontal scroll\r
                                visual_table_class : 'mceItemTable',\r
                                visual : 1,\r
-                               inline_styles : true,\r
-                               convert_fonts_to_spans : true,\r
                                font_size_style_values : 'xx-small,x-small,small,medium,large,x-large,xx-large',\r
                                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[align],-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=0|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
+                               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
@@ -8575,14 +9301,15 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                indentation : '30px',\r
                                keep_styles : 1,\r
                                fix_table_elements : 1,\r
-                               removeformat_selector : 'span,b,strong,em,i,font,u,strike'\r
+                               inline_styles : 1,\r
+                               convert_fonts_to_spans : true\r
                        }, s);\r
 \r
-                       // Setup URIs\r
                        t.documentBaseURI = new tinymce.util.URI(s.document_base_url || tinymce.documentBaseURL, {\r
                                base_uri : tinyMCE.baseURI\r
                        });\r
-                       t.baseURI = EditorManager.baseURI;\r
+\r
+                       t.baseURI = tinymce.baseURI;\r
 \r
                        // Call setup\r
                        t.execCallback('setup', t);\r
@@ -8599,20 +9326,17 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                return;\r
                        }\r
 \r
-                       // Force strict loading mode if render us called by user and not internally\r
-                       if (!nst) {\r
-                               s.strict_loading_mode = 1;\r
-                               tinyMCE.settings = s;\r
-                       }\r
+                       tinyMCE.settings = s;\r
 \r
                        // Element not found, then skip initialization\r
                        if (!t.getElement())\r
                                return;\r
 \r
-                       if (s.strict_loading_mode) {\r
-                               sl.settings.strict_mode = s.strict_loading_mode;\r
-                               tinymce.DOM.settings.strict = 1;\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
+                               return;\r
 \r
                        // Add hidden input for non input elements inside form elements\r
                        if (!/TEXTAREA|INPUT/i.test(t.getElement().nodeName) && s.hidden_input && DOM.getParent(id, 'form'))\r
@@ -8663,7 +9387,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                                n._mceOldSubmit = n.submit;\r
                                                n.submit = function() {\r
                                                        // Save all instances\r
-                                                       EditorManager.triggerSave();\r
+                                                       tinymce.triggerSave();\r
                                                        t.isNotDirty = 1;\r
 \r
                                                        return t.formElement._mceOldSubmit(t.formElement);\r
@@ -8684,8 +9408,8 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
 \r
                                each(explode(s.plugins), function(p) {\r
                                        if (p && p.charAt(0) != '-' && !PluginManager.urls[p]) {\r
-                                               // Skip safari plugin for other browsers\r
-                                               if (!isWebKit && p == 'safari')\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
@@ -8699,20 +9423,14 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                });\r
                        };\r
 \r
-                       // Load compat2x first\r
-                       if (s.plugins.indexOf('compat2x') != -1) {\r
-                               PluginManager.load('compat2x', 'plugins/compat2x/editor_plugin' + tinymce.suffix + '.js');\r
-                               sl.loadQueue(loadScripts);\r
-                       } else\r
-                               loadScripts();\r
+                       loadScripts();\r
                },\r
 \r
                init : function() {\r
                        var n, t = this, s = t.settings, w, h, e = t.getElement(), o, ti, u, bi, bc, re;\r
 \r
-                       EditorManager.add(t);\r
+                       tinymce.add(t);\r
 \r
-                       // Create theme\r
                        if (s.theme) {\r
                                s.theme = s.theme.replace(/-/, '');\r
                                o = ThemeManager.get(s.theme);\r
@@ -8747,25 +9465,17 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        if (s.popup_css_add)\r
                                s.popup_css += ',' + t.documentBaseURI.toAbsolute(s.popup_css_add);\r
 \r
-                       // Setup control factory\r
                        t.controlManager = new tinymce.ControlManager(t);\r
-                       t.undoManager = new tinymce.UndoManager(t);\r
-\r
-                       // Pass through\r
-                       t.undoManager.onAdd.add(function(um, l) {\r
-                               if (!l.initial)\r
-                                       return t.onChange.dispatch(t, l, um);\r
-                       });\r
-\r
-                       t.undoManager.onUndo.add(function(um, l) {\r
-                               return t.onUndo.dispatch(t, l, um);\r
-                       });\r
-\r
-                       t.undoManager.onRedo.add(function(um, l) {\r
-                               return t.onRedo.dispatch(t, l, um);\r
-                       });\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
+                               });\r
+\r
                                t.onExecCommand.add(function(ed, cmd, ui, val, a) {\r
                                        if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo))\r
                                                t.undoManager.add();\r
@@ -8819,6 +9529,10 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        }\r
 \r
 \r
+                       // User specified a document.domain value\r
+                       if (document.domain && location.hostname != document.domain)\r
+                               tinymce.relaxedDomain = document.domain;\r
+\r
                        // Resize editor\r
                        DOM.setStyles(o.sizeContainer || o.editorContainer, {\r
                                width : w,\r
@@ -8829,8 +9543,14 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        if (h < 100)\r
                                h = 100;\r
 \r
-                       t.iframeHTML = s.doctype + '<html><head xmlns="http://www.w3.org/1999/xhtml"><base href="' + t.documentBaseURI.getURI() + '" />';\r
-                       t.iframeHTML += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';\r
+                       t.iframeHTML = s.doctype + '<html><head xmlns="http://www.w3.org/1999/xhtml">';\r
+\r
+                       // We only need to override paths if we have to\r
+                       // IE has a bug where it remove site absolute urls to relative ones if this is specified\r
+                       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
 \r
                        if (tinymce.relaxedDomain)\r
                                t.iframeHTML += '<script type="text/javascript">document.domain = "' + tinymce.relaxedDomain + '";</script>';\r
@@ -8912,40 +9632,115 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                DOM.show(b);\r
                        }\r
 \r
-                       // Setup objects\r
-                       t.dom = new tinymce.DOM.DOMUtils(t.getDoc(), {\r
+                       t.dom = new tinymce.dom.DOMUtils(t.getDoc(), {\r
                                keep_values : true,\r
                                url_converter : t.convertURL,\r
                                url_converter_scope : t,\r
                                hex_colors : s.force_hex_style_colors,\r
                                class_filter : s.class_filter,\r
                                update_styles : 1,\r
-                               fix_ie_paragraphs : 1\r
+                               fix_ie_paragraphs : 1,\r
+                               valid_styles : s.valid_styles\r
                        });\r
 \r
-                       t.serializer = new tinymce.dom.Serializer({\r
-                               entity_encoding : s.entity_encoding,\r
-                               entities : s.entities,\r
+                       t.schema = new tinymce.dom.Schema();\r
+\r
+                       t.serializer = new tinymce.dom.Serializer(extend(s, {\r
                                valid_elements : s.verify_html === false ? '*[*]' : s.valid_elements,\r
-                               extended_valid_elements : s.extended_valid_elements,\r
-                               valid_child_elements : s.valid_child_elements,\r
-                               invalid_elements : s.invalid_elements,\r
-                               fix_table_elements : s.fix_table_elements,\r
-                               fix_list_elements : s.fix_list_elements,\r
-                               fix_content_duplication : s.fix_content_duplication,\r
-                               convert_fonts_to_spans : s.convert_fonts_to_spans,\r
-                               font_size_classes  : s.font_size_classes,\r
-                               font_size_style_values : s.font_size_style_values,\r
-                               apply_source_formatting : s.apply_source_formatting,\r
-                               remove_linebreaks : s.remove_linebreaks,\r
-                               element_format : s.element_format,\r
-                               dom : t.dom\r
-                       });\r
+                               dom : t.dom,\r
+                               schema : t.schema\r
+                       }));\r
 \r
                        t.selection = new tinymce.dom.Selection(t.dom, t.getWin(), t.serializer);\r
+\r
+                       t.formatter = new tinymce.Formatter(this);\r
+\r
+                       // Register default formats\r
+                       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
+                               ],\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
+                               ],\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
+                               ],\r
+\r
+                               alignfull : [\r
+                                       {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'justify'}}\r
+                               ],\r
+\r
+                               bold : [\r
+                                       {inline : 'strong'},\r
+                                       {inline : 'span', styles : {fontWeight : 'bold'}},\r
+                                       {inline : 'b'}\r
+                               ],\r
+\r
+                               italic : [\r
+                                       {inline : 'em'},\r
+                                       {inline : 'span', styles : {fontStyle : 'italic'}},\r
+                                       {inline : 'i'}\r
+                               ],\r
+\r
+                               underline : [\r
+                                       {inline : 'span', styles : {textDecoration : 'underline'}, exact : true},\r
+                                       {inline : 'u'}\r
+                               ],\r
+\r
+                               strikethrough : [\r
+                                       {inline : 'span', styles : {textDecoration : 'line-through'}, exact : true},\r
+                                       {inline : 'u'}\r
+                               ],\r
+\r
+                               forecolor : {inline : 'span', styles : {color : '%value'}},\r
+                               hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}},\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
+\r
+                               removeformat : [\r
+                                       {selector : 'b,strong,em,i,font,u,strike', remove : 'all', split : true, expand : false, block_expand : true, deep : true},\r
+                                       {selector : 'span', attributes : ['style', 'class'], remove : 'empty', split : true, expand : false, deep : true},\r
+                                       {selector : '*', attributes : ['style', 'class'], split : false, expand : false, deep : true}\r
+                               ]\r
+                       });\r
+\r
+                       // Register default block formats\r
+                       each('p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp'.split(/\s/), function(name) {\r
+                               t.formatter.register(name, {block : name, remove : 'all'});\r
+                       });\r
+\r
+                       // Register user defined formats\r
+                       t.formatter.register(t.settings.formats);\r
+\r
+                       t.undoManager = new tinymce.UndoManager(t);\r
+\r
+                       // Pass through\r
+                       t.undoManager.onAdd.add(function(um, l) {\r
+                               if (!l.initial)\r
+                                       return t.onChange.dispatch(t, l, um);\r
+                       });\r
+\r
+                       t.undoManager.onUndo.add(function(um, l) {\r
+                               return t.onUndo.dispatch(t, l, um);\r
+                       });\r
+\r
+                       t.undoManager.onRedo.add(function(um, l) {\r
+                               return t.onRedo.dispatch(t, l, um);\r
+                       });\r
+\r
                        t.forceBlocks = new tinymce.ForceBlocks(t, {\r
                                forced_root_block : s.forced_root_block\r
                        });\r
+\r
                        t.editorCommands = new tinymce.EditorCommands(t);\r
 \r
                        // Pass through\r
@@ -8974,9 +9769,6 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        if (s.nowrap)\r
                                t.getBody().style.whiteSpace = "nowrap";\r
 \r
-                       if (s.auto_resize)\r
-                               t.onNodeChange.add(t.resizeToContent, t);\r
-\r
                        if (s.custom_elements) {\r
                                function handleCustom(ed, o) {\r
                                        each(explode(s.custom_elements), function(v) {\r
@@ -8988,7 +9780,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                                } 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 + ' _mce_name="$1"$2>');\r
                                                o.content = o.content.replace(new RegExp('</(' + v + ')>', 'g'), '</' + n + '>');\r
                                        });\r
                                };\r
@@ -8996,7 +9788,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                t.onBeforeSetContent.add(handleCustom);\r
                                t.onPostProcess.add(function(ed, o) {\r
                                        if (o.set)\r
-                                               handleCustom(ed, o)\r
+                                               handleCustom(ed, o);\r
                                });\r
                        }\r
 \r
@@ -9071,12 +9863,6 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                };\r
                        }\r
 \r
-                       if (s.convert_fonts_to_spans)\r
-                               t._convertFonts();\r
-\r
-                       if (s.inline_styles)\r
-                               t._convertInlineElements();\r
-\r
                        if (s.cleanup_callback) {\r
                                t.onBeforeSetContent.add(function(ed, o) {\r
                                        o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);\r
@@ -9133,7 +9919,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                                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', {'_mce_bogus' : 1});\r
                                        });\r
                                };\r
 \r
@@ -9164,7 +9950,6 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
 \r
                                t.load({initial : true, format : (s.cleanup_on_startup ? 'html' : 'raw')});\r
                                t.startContent = t.getContent({format : 'raw'});\r
-                               t.undoManager.add({initial : true});\r
                                t.initialized = true;\r
 \r
                                t.onInit.dispatch(t);\r
@@ -9183,7 +9968,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                // Handle auto focus\r
                                if (s.auto_focus) {\r
                                        setTimeout(function () {\r
-                                               var ed = EditorManager.get(s.auto_focus);\r
+                                               var ed = tinymce.get(s.auto_focus);\r
 \r
                                                ed.selection.select(ed.getBody(), 1);\r
                                                ed.selection.collapse(1);\r
@@ -9197,25 +9982,38 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
 \r
 \r
                focus : function(sf) {\r
-                       var oed, t = this, ce = t.settings.content_editable;\r
+                       var oed, t = this, ce = t.settings.content_editable, ieRng, controlElm, doc = t.getDoc();\r
 \r
                        if (!sf) {\r
-                               // Is not content editable or the selection is outside the area in IE\r
-                               // the IE statement is needed to avoid bluring if element selections inside layers since\r
-                               // the layer is like it's own document in IE\r
-                               if (!ce && (!isIE || t.selection.getNode().ownerDocument != t.getDoc()))\r
+                               // Get selected control element\r
+                               ieRng = t.selection.getRng();\r
+                               if (ieRng.item) {\r
+                                       controlElm = ieRng.item(0);\r
+                               }\r
+\r
+                               // Is not content editable\r
+                               if (!ce)\r
                                        t.getWin().focus();\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
+                               if (controlElm && controlElm.ownerDocument == doc) {\r
+                                       ieRng = doc.body.createControlRange();\r
+                                       ieRng.addElement(controlElm);\r
+                                       ieRng.select();\r
+                               }\r
+\r
                        }\r
 \r
-                       if (EditorManager.activeEditor != t) {\r
-                               if ((oed = EditorManager.activeEditor) != null)\r
+                       if (tinymce.activeEditor != t) {\r
+                               if ((oed = tinymce.activeEditor) != null)\r
                                        oed.onDeactivate.dispatch(oed, t);\r
 \r
                                t.onActivate.dispatch(t, oed);\r
                        }\r
 \r
-                       EditorManager._setActive(t);\r
+                       tinymce._setActive(t);\r
                },\r
 \r
                execCallback : function(n) {\r
@@ -9242,7 +10040,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                },\r
 \r
                translate : function(s) {\r
-                       var c = this.settings.language || 'en', i18n = EditorManager.i18n;\r
+                       var c = this.settings.language || 'en', i18n = tinymce.i18n;\r
 \r
                        if (!s)\r
                                return '';\r
@@ -9253,7 +10051,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                },\r
 \r
                getLang : function(n, dv) {\r
-                       return EditorManager.i18n[(this.settings.language || 'en') + '.' + n] || (is(dv) ? dv : '{#' + n + '}');\r
+                       return tinymce.i18n[(this.settings.language || 'en') + '.' + n] || (is(dv) ? dv : '{#' + n + '}');\r
                },\r
 \r
                getParam : function(n, dv, ty) {\r
@@ -9281,14 +10079,26 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                },\r
 \r
                nodeChanged : function(o) {\r
-                       var t = this, s = t.selection, n = s.getNode() || t.getBody();\r
+                       var t = this, s = t.selection, n = (isIE ? s.getNode() : 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
+                               o = o || {};\r
+                               n = isIE && n.ownerDocument != t.getDoc() ? t.getBody() : n; // Fix for IE initial state\r
+\r
+                               // Get parents and add them to object\r
+                               o.parents = [];\r
+                               t.dom.getParent(n, function(node) {\r
+                                       if (node.nodeName == 'BODY')\r
+                                               return true;\r
+\r
+                                       o.parents.push(node);\r
+                               });\r
+\r
                                t.onNodeChange.dispatch(\r
                                        t,\r
                                        o ? o.controlManager || t.controlManager : t.controlManager,\r
-                                       isIE && n.ownerDocument != t.getDoc() ? t.getBody() : n, // Fix for IE initial state\r
+                                       n,\r
                                        s.isCollapsed(),\r
                                        o\r
                                );\r
@@ -9431,7 +10241,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        t.onExecCommand.dispatch(t, cmd, ui, val, a);\r
                },\r
 \r
-               queryCommandState : function(c) {\r
+               queryCommandState : function(cmd) {\r
                        var t = this, o, s;\r
 \r
                        // Is hidden then return undefined\r
@@ -9439,7 +10249,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                return;\r
 \r
                        // Registred commands\r
-                       if (o = t.queryStateCommands[c]) {\r
+                       if (o = t.queryStateCommands[cmd]) {\r
                                s = o.func.call(o.scope);\r
 \r
                                // Fall though on true\r
@@ -9448,13 +10258,13 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        }\r
 \r
                        // Registred commands\r
-                       o = t.editorCommands.queryCommandState(c);\r
+                       o = t.editorCommands.queryCommandState(cmd);\r
                        if (o !== -1)\r
                                return o;\r
 \r
                        // Browser commands\r
                        try {\r
-                               return this.getDoc().queryCommandState(c);\r
+                               return this.getDoc().queryCommandState(cmd);\r
                        } catch (ex) {\r
                                // Fails sometimes see bug: 1896577\r
                        }\r
@@ -9520,12 +10330,6 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        return b;\r
                },\r
 \r
-               resizeToContent : function() {\r
-                       var t = this;\r
-\r
-                       DOM.setStyle(t.id + "_ifr", 'height', t.getBody().scrollHeight);\r
-               },\r
-\r
                load : function(o) {\r
                        var t = this, e = t.getElement(), h;\r
 \r
@@ -9603,7 +10407,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        // 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.content = t.dom.setHTML(t.getBody(), '<br _mce_bogus="1" />');\r
                                o.format = 'raw';\r
                        }\r
 \r
@@ -9772,7 +10576,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        // Clear all execCommand listeners this is required to avoid errors if the editor was removed inside another command\r
                        t.onExecCommand.listeners = [];\r
 \r
-                       EditorManager.remove(t);\r
+                       tinymce.remove(t);\r
                        DOM.remove(e);\r
                },\r
 \r
@@ -9860,33 +10664,33 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                        case 'contextmenu':\r
                                                if (tinymce.isOpera) {\r
                                                        // Fake contextmenu on Opera\r
-                                                       Event.add(t.getBody(), 'mousedown', function(e) {\r
+                                                       t.dom.bind(t.getBody(), 'mousedown', function(e) {\r
                                                                if (e.ctrlKey) {\r
                                                                        e.fakeType = 'contextmenu';\r
                                                                        eventHandler(e);\r
                                                                }\r
                                                        });\r
                                                } else\r
-                                                       Event.add(t.getBody(), k, eventHandler);\r
+                                                       t.dom.bind(t.getBody(), k, eventHandler);\r
                                                break;\r
 \r
                                        case 'paste':\r
-                                               Event.add(t.getBody(), k, function(e) {\r
+                                               t.dom.bind(t.getBody(), k, function(e) {\r
                                                        eventHandler(e);\r
                                                });\r
                                                break;\r
 \r
                                        case 'submit':\r
                                        case 'reset':\r
-                                               Event.add(t.getElement().form || DOM.getParent(t.id, 'form'), k, eventHandler);\r
+                                               t.dom.bind(t.getElement().form || DOM.getParent(t.id, 'form'), k, eventHandler);\r
                                                break;\r
 \r
                                        default:\r
-                                               Event.add(s.content_editable ? t.getBody() : t.getDoc(), k, eventHandler);\r
+                                               t.dom.bind(s.content_editable ? t.getBody() : t.getDoc(), k, eventHandler);\r
                                }\r
                        });\r
 \r
-                       Event.add(s.content_editable ? t.getBody() : (isGecko ? t.getDoc() : t.getWin()), 'focus', function(e) {\r
+                       t.dom.bind(s.content_editable ? t.getBody() : (isGecko ? t.getDoc() : t.getWin()), 'focus', function(e) {\r
                                t.focus(true);\r
                        });\r
 \r
@@ -9899,17 +10703,17 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                        each(ed.dom.select('img'), function(e) {\r
                                                var v;\r
 \r
-                                               if (v = e.getAttribute('mce_src'))\r
+                                               if (v = e.getAttribute('_mce_src'))\r
                                                        e.src = t.documentBaseURI.toAbsolute(v);\r
                                        })\r
                                });*/\r
 \r
-                               Event.add(t.getDoc(), 'DOMNodeInserted', function(e) {\r
+                               t.dom.bind(t.getDoc(), 'DOMNodeInserted', function(e) {\r
                                        var v;\r
 \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('_mce_src')))\r
                                                e.src = t.documentBaseURI.toAbsolute(v);\r
                                });\r
                        }\r
@@ -9950,9 +10754,22 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                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
+\r
+                                       // Needs tobe the setBaseAndExtend or it will fail to select floated images\r
+                                       if (e.nodeName == 'IMG' || (e.nodeName == 'A' && t.dom.hasClass(e, 'mceItemAnchor')))\r
+                                               t.selection.getSel().setBaseAndExtent(e, 0, e, 1);\r
+                               });\r
+                       }\r
+\r
                        // Add node change handlers\r
                        t.onMouseUp.add(t.nodeChanged);\r
-                       t.onClick.add(t.nodeChanged);\r
+                       //t.onClick.add(t.nodeChanged);\r
                        t.onKeyUp.add(function(ed, e) {\r
                                var c = e.keyCode;\r
 \r
@@ -9973,15 +10790,13 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                }\r
 \r
                                // Add default shortcuts for gecko\r
-                               if (isGecko) {\r
-                                       t.addShortcut('ctrl+b', t.getLang('bold_desc'), 'Bold');\r
-                                       t.addShortcut('ctrl+i', t.getLang('italic_desc'), 'Italic');\r
-                                       t.addShortcut('ctrl+u', t.getLang('underline_desc'), 'Underline');\r
-                               }\r
+                               t.addShortcut('ctrl+b', t.getLang('bold_desc'), 'Bold');\r
+                               t.addShortcut('ctrl+i', t.getLang('italic_desc'), 'Italic');\r
+                               t.addShortcut('ctrl+u', t.getLang('underline_desc'), 'Underline');\r
 \r
                                // BlockFormat shortcuts keys\r
                                for (i=1; i<=6; i++)\r
-                                       t.addShortcut('ctrl+' + i, '', ['FormatBlock', false, '<h' + 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
@@ -10041,7 +10856,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        if (tinymce.isIE) {\r
                                // Fix so resize will only update the width and height attributes not the styles of an image\r
                                // It will also block mceItemNoResize items\r
-                               Event.add(t.getDoc(), 'controlselect', function(e) {\r
+                               t.dom.bind(t.getDoc(), 'controlselect', function(e) {\r
                                        var re = t.resizeInfo, cb;\r
 \r
                                        e = e.target;\r
@@ -10051,11 +10866,11 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                                return;\r
 \r
                                        if (re)\r
-                                               Event.remove(re.node, re.ev, re.cb);\r
+                                               t.dom.unbind(re.node, re.ev, re.cb);\r
 \r
                                        if (!t.dom.hasClass(e, 'mceItemNoResize')) {\r
                                                ev = 'resizeend';\r
-                                               cb = Event.add(e, ev, function(e) {\r
+                                               cb = t.dom.bind(e, ev, function(e) {\r
                                                        var v;\r
 \r
                                                        e = e.target;\r
@@ -10072,7 +10887,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                                });\r
                                        } else {\r
                                                ev = 'resizestart';\r
-                                               cb = Event.add(e, 'resizestart', Event.cancel, Event);\r
+                                               cb = t.dom.bind(e, 'resizestart', Event.cancel, Event);\r
                                        }\r
 \r
                                        re = t.resizeInfo = {\r
@@ -10087,7 +10902,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                                case 8:\r
                                                        // Fix IE control + backspace browser bug\r
                                                        if (t.selection.getRng().item) {\r
-                                                               t.selection.getRng().item(0).removeNode();\r
+                                                               ed.dom.remove(t.selection.getRng().item(0));\r
                                                                return Event.cancel(e);\r
                                                        }\r
                                        }\r
@@ -10117,43 +10932,70 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                        t.undoManager.add();\r
                                };\r
 \r
-                               // Add undo level on editor blur\r
-                               if (tinymce.isIE) {\r
-                                       Event.add(t.getWin(), 'blur', function(e) {\r
-                                               var n;\r
+                               t.dom.bind(t.getDoc(), 'focusout', function(e) {\r
+                                       if (!t.removed && t.undoManager.typing)\r
+                                               addUndo();\r
+                               });\r
 \r
-                                               // Check added for fullscreen bug\r
-                                               if (t.selection) {\r
-                                                       n = t.selection.getNode();\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
+                                               addUndo();\r
+                               });\r
 \r
-                                                       // Add undo level is selection was lost to another document\r
-                                                       if (!t.removed && n.ownerDocument && n.ownerDocument != t.getDoc())\r
-                                                               addUndo();\r
-                                               }\r
-                                       });\r
-                               } else {\r
-                                       Event.add(t.getDoc(), 'blur', function() {\r
-                                               if (t.selection && !t.removed)\r
-                                                       addUndo();\r
-                                       });\r
-                               }\r
+                               t.onKeyDown.add(function(ed, e) {\r
+                                       var rng, tmpRng, parent, offset;\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
+                                                       // Get the current caret position within the element\r
+                                                       tmpRng = rng.duplicate();\r
+                                                       tmpRng.moveToElementText(parent);\r
+                                                       tmpRng.setEndPoint('EndToEnd', rng);\r
+                                                       offset = tmpRng.text.length;\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
-                               t.onMouseDown.add(addUndo);\r
+                                                       // Delete contents\r
+                                                       t.selection.getSel().clear();\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
-                                               t.undoManager.typing = 0;\r
-                                               t.undoManager.add();\r
+                                                       // Check if we are within the same parent\r
+                                                       if (rng.parentElement() == parent) {\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
+                                                               tmpRng.moveToElementText(parent);\r
+                                                               tmpRng.collapse();\r
+                                                               tmpRng.move('character', offset);\r
+                                                               tmpRng.select();\r
+                                                       }\r
+\r
+                                                       // Block the default delete behavior since it might be broken\r
+                                                       e.preventDefault();\r
+                                                       return;\r
+                                               }\r
                                        }\r
-                               });\r
 \r
-                               t.onKeyDown.add(function(ed, e) {\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
-                                               if (t.undoManager.typing) {\r
-                                                       t.undoManager.add();\r
-                                                       t.undoManager.typing = 0;\r
-                                               }\r
+                                               if (t.undoManager.typing)\r
+                                                       addUndo();\r
 \r
                                                return;\r
                                        }\r
@@ -10163,137 +11005,14 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                                t.undoManager.typing = 1;\r
                                        }\r
                                });\r
-                       }\r
-               },\r
-\r
-               _convertInlineElements : function() {\r
-                       var t = this, s = t.settings, dom = t.dom, v, e, na, st, sp;\r
-\r
-                       function convert(ed, o) {\r
-                               if (!s.inline_styles)\r
-                                       return;\r
-\r
-                               if (o.get) {\r
-                                       each(t.dom.select('table,u,strike', o.node), function(n) {\r
-                                               switch (n.nodeName) {\r
-                                                       case 'TABLE':\r
-                                                               if (v = dom.getAttrib(n, 'height')) {\r
-                                                                       dom.setStyle(n, 'height', v);\r
-                                                                       dom.setAttrib(n, 'height', '');\r
-                                                               }\r
-                                                               break;\r
-\r
-                                                       case 'U':\r
-                                                       case 'STRIKE':\r
-                                                               //sp = dom.create('span', {style : dom.getAttrib(n, 'style')});\r
-                                                               n.style.textDecoration = n.nodeName == 'U' ? 'underline' : 'line-through';\r
-                                                               dom.setAttrib(n, 'mce_style', '');\r
-                                                               dom.setAttrib(n, 'mce_name', 'span');\r
-                                                               break;\r
-                                               }\r
-                                       });\r
-                               } else if (o.set) {\r
-                                       each(t.dom.select('table,span', o.node).reverse(), function(n) {\r
-                                               if (n.nodeName == 'TABLE') {\r
-                                                       if (v = dom.getStyle(n, 'height'))\r
-                                                               dom.setAttrib(n, 'height', v.replace(/[^0-9%]+/g, ''));\r
-                                               } else {\r
-                                                       // Convert spans to elements\r
-                                                       if (n.style.textDecoration == 'underline')\r
-                                                               na = 'u';\r
-                                                       else if (n.style.textDecoration == 'line-through')\r
-                                                               na = 'strike';\r
-                                                       else\r
-                                                               na = '';\r
 \r
-                                                       if (na) {\r
-                                                               n.style.textDecoration = '';\r
-                                                               dom.setAttrib(n, 'mce_style', '');\r
-\r
-                                                               e = dom.create(na, {\r
-                                                                       style : dom.getAttrib(n, 'style')\r
-                                                               });\r
-\r
-                                                               dom.replace(e, n, 1);\r
-                                                       }\r
-                                               }\r
-                                       });\r
-                               }\r
-                       };\r
-\r
-                       t.onPreProcess.add(convert);\r
-\r
-                       if (!s.cleanup_on_startup) {\r
-                               t.onSetContent.add(function(ed, o) {\r
-                                       if (o.initial)\r
-                                               convert(t, {node : t.getBody(), set : 1});\r
+                               t.onMouseDown.add(function() {\r
+                                       if (t.undoManager.typing)\r
+                                               addUndo();\r
                                });\r
                        }\r
                },\r
 \r
-               _convertFonts : function() {\r
-                       var t = this, s = t.settings, dom = t.dom, fz, fzn, sl, cl;\r
-\r
-                       // No need\r
-                       if (!s.inline_styles)\r
-                               return;\r
-\r
-                       // Font pt values and font size names\r
-                       fz = [8, 10, 12, 14, 18, 24, 36];\r
-                       fzn = ['xx-small', 'x-small','small','medium','large','x-large', 'xx-large'];\r
-\r
-                       if (sl = s.font_size_style_values)\r
-                               sl = explode(sl);\r
-\r
-                       if (cl = s.font_size_classes)\r
-                               cl = explode(cl);\r
-\r
-                       function process(no) {\r
-                               var n, sp, nl, x;\r
-\r
-                               // Keep unit tests happy\r
-                               if (!s.inline_styles)\r
-                                       return;\r
-\r
-                               nl = t.dom.select('font', no);\r
-                               for (x = nl.length - 1; x >= 0; x--) {\r
-                                       n = nl[x];\r
-\r
-                                       sp = dom.create('span', {\r
-                                               style : dom.getAttrib(n, 'style'),\r
-                                               'class' : dom.getAttrib(n, 'class')\r
-                                       });\r
-\r
-                                       dom.setStyles(sp, {\r
-                                               fontFamily : dom.getAttrib(n, 'face'),\r
-                                               color : dom.getAttrib(n, 'color'),\r
-                                               backgroundColor : n.style.backgroundColor\r
-                                       });\r
-\r
-                                       if (n.size) {\r
-                                               if (sl)\r
-                                                       dom.setStyle(sp, 'fontSize', sl[parseInt(n.size) - 1]);\r
-                                               else\r
-                                                       dom.setAttrib(sp, 'class', cl[parseInt(n.size) - 1]);\r
-                                       }\r
-\r
-                                       dom.setAttrib(sp, 'mce_style', '');\r
-                                       dom.replace(sp, n, 1);\r
-                               }\r
-                       };\r
-\r
-                       // Run on cleanup\r
-                       t.onPreProcess.add(function(ed, o) {\r
-                               if (o.get)\r
-                                       process(o.node);\r
-                       });\r
-\r
-                       t.onSetContent.add(function(ed, o) {\r
-                               if (o.initial)\r
-                                       process(o.node);\r
-                       });\r
-               },\r
-\r
                _isHidden : function() {\r
                        var s;\r
 \r
@@ -10355,2543 +11074,3125 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
 \r
                        return s;\r
                }\r
-\r
-               });\r
+       });\r
 })(tinymce);\r
+\r
 (function(tinymce) {\r
-       var each = tinymce.each, isIE = tinymce.isIE, isGecko = tinymce.isGecko, isOpera = tinymce.isOpera, isWebKit = tinymce.isWebKit;\r
+       // Added for compression purposes\r
+       var each = tinymce.each, undefined, TRUE = true, FALSE = false;\r
 \r
-       tinymce.create('tinymce.EditorCommands', {\r
-               EditorCommands : function(ed) {\r
-                       this.editor = ed;\r
-               },\r
+       tinymce.EditorCommands = function(editor) {\r
+               var dom = editor.dom,\r
+                       selection = editor.selection,\r
+                       commands = {state: {}, exec : {}, value : {}},\r
+                       settings = editor.settings,\r
+                       bookmark;\r
 \r
-               execCommand : function(cmd, ui, val) {\r
-                       var t = this, ed = t.editor, f;\r
+               function execCommand(command, ui, value) {\r
+                       var func;\r
 \r
-                       switch (cmd) {\r
-                               // Ignore these\r
-                               case 'mceResetDesignMode':\r
-                               case 'mceBeginUndoLevel':\r
-                                       return true;\r
+                       command = command.toLowerCase();\r
+                       if (func = commands.exec[command]) {\r
+                               func(command, ui, value);\r
+                               return TRUE;\r
+                       }\r
 \r
-                               // Ignore these\r
-                               case 'unlink':\r
-                                       t.UnLink();\r
-                                       return true;\r
+                       return FALSE;\r
+               };\r
 \r
-                               // Bundle these together\r
-                               case 'JustifyLeft':\r
-                               case 'JustifyCenter':\r
-                               case 'JustifyRight':\r
-                               case 'JustifyFull':\r
-                                       t.mceJustify(cmd, cmd.substring(7).toLowerCase());\r
-                                       return true;\r
+               function queryCommandState(command) {\r
+                       var func;\r
 \r
-                               default:\r
-                                       f = this[cmd];\r
+                       command = command.toLowerCase();\r
+                       if (func = commands.state[command])\r
+                               return func(command);\r
 \r
-                                       if (f) {\r
-                                               f.call(this, ui, val);\r
-                                               return true;\r
-                                       }\r
-                       }\r
+                       return -1;\r
+               };\r
 \r
-                       return false;\r
-               },\r
+               function queryCommandValue(command) {\r
+                       var func;\r
+\r
+                       command = command.toLowerCase();\r
+                       if (func = commands.value[command])\r
+                               return func(command);\r
 \r
-               Indent : function() {\r
-                       var ed = this.editor, d = ed.dom, s = ed.selection, e, iv, iu;\r
+                       return FALSE;\r
+               };\r
 \r
-                       // Setup indent level\r
-                       iv = ed.settings.indentation;\r
-                       iu = /[a-z%]+$/i.exec(iv);\r
-                       iv = parseInt(iv);\r
+               function addCommands(command_list, type) {\r
+                       type = type || 'exec';\r
 \r
-                       if (ed.settings.inline_styles && (!this.queryStateInsertUnorderedList() && !this.queryStateInsertOrderedList())) {\r
-                               each(s.getSelectedBlocks(), function(e) {\r
-                                       d.setStyle(e, 'paddingLeft', (parseInt(e.style.paddingLeft || 0) + iv) + iu);\r
+                       each(command_list, function(callback, command) {\r
+                               each(command.toLowerCase().split(','), function(command) {\r
+                                       commands[type][command] = callback;\r
                                });\r
+                       });\r
+               };\r
 \r
-                               return;\r
-                       }\r
+               // Expose public methods\r
+               tinymce.extend(this, {\r
+                       execCommand : execCommand,\r
+                       queryCommandState : queryCommandState,\r
+                       queryCommandValue : queryCommandValue,\r
+                       addCommands : addCommands\r
+               });\r
 \r
-                       ed.getDoc().execCommand('Indent', false, null);\r
+               // Private methods\r
 \r
-                       if (isIE) {\r
-                               d.getParent(s.getNode(), function(n) {\r
-                                       if (n.nodeName == 'BLOCKQUOTE') {\r
-                                               n.dir = n.style.cssText = '';\r
-                                       }\r
-                               });\r
-                       }\r
-               },\r
+               function execNativeCommand(command, ui, value) {\r
+                       if (ui === undefined)\r
+                               ui = FALSE;\r
 \r
-               Outdent : function() {\r
-                       var ed = this.editor, d = ed.dom, s = ed.selection, e, v, iv, iu;\r
+                       if (value === undefined)\r
+                               value = null;\r
 \r
-                       // Setup indent level\r
-                       iv = ed.settings.indentation;\r
-                       iu = /[a-z%]+$/i.exec(iv);\r
-                       iv = parseInt(iv);\r
+                       return editor.getDoc().execCommand(command, ui, value);\r
+               };\r
 \r
-                       if (ed.settings.inline_styles && (!this.queryStateInsertUnorderedList() && !this.queryStateInsertOrderedList())) {\r
-                               each(s.getSelectedBlocks(), function(e) {\r
-                                       v = Math.max(0, parseInt(e.style.paddingLeft || 0) - iv);\r
-                                       d.setStyle(e, 'paddingLeft', v ? v + iu : '');\r
-                               });\r
+               function isFormatMatch(name) {\r
+                       return editor.formatter.match(name);\r
+               };\r
 \r
-                               return;\r
-                       }\r
+               function toggleFormat(name, value) {\r
+                       editor.formatter.toggle(name, value ? {value : value} : undefined);\r
+               };\r
 \r
-                       ed.getDoc().execCommand('Outdent', false, null);\r
-               },\r
+               function storeSelection(type) {\r
+                       bookmark = selection.getBookmark(type);\r
+               };\r
 \r
-/*\r
-               mceSetAttribute : function(u, v) {\r
-                       var ed = this.editor, d = ed.dom, e;\r
+               function restoreSelection() {\r
+                       selection.moveToBookmark(bookmark);\r
+               };\r
 \r
-                       if (e = d.getParent(ed.selection.getNode(), d.isBlock))\r
-                               d.setAttrib(e, v.name, v.value);\r
-               },\r
-*/\r
-               mceSetContent : function(u, v) {\r
-                       this.editor.setContent(v);\r
-               },\r
+               // Add execCommand overrides\r
+               addCommands({\r
+                       // Ignore these, added for compatibility\r
+                       'mceResetDesignMode,mceBeginUndoLevel' : function() {},\r
 \r
-               mceToggleVisualAid : function() {\r
-                       var ed = this.editor;\r
+                       // Add undo manager logic\r
+                       'mceEndUndoLevel,mceAddUndoLevel' : function() {\r
+                               editor.undoManager.add();\r
+                       },\r
 \r
-                       ed.hasVisual = !ed.hasVisual;\r
-                       ed.addVisual();\r
-               },\r
+                       'Cut,Copy,Paste' : function(command) {\r
+                               var doc = editor.getDoc(), failed;\r
 \r
-               mceReplaceContent : function(u, v) {\r
-                       var s = this.editor.selection;\r
+                               // Try executing the native command\r
+                               try {\r
+                                       execNativeCommand(command);\r
+                               } catch (ex) {\r
+                                       // Command failed\r
+                                       failed = TRUE;\r
+                               }\r
 \r
-                       s.setContent(v.replace(/\{\$selection\}/g, s.getContent({format : 'text'})));\r
-               },\r
+                               // Present alert message about clipboard access not being available\r
+                               if (failed || !doc.queryCommandSupported(command)) {\r
+                                       if (tinymce.isGecko) {\r
+                                               editor.windowManager.confirm(editor.getLang('clipboard_msg'), function(state) {\r
+                                                       if (state)\r
+                                                               open('http://www.mozilla.org/editor/midasdemo/securityprefs.html', '_blank');\r
+                                               });\r
+                                       } else\r
+                                               editor.windowManager.alert(editor.getLang('clipboard_no_support'));\r
+                               }\r
+                       },\r
 \r
-               mceInsertLink : function(u, v) {\r
-                       var ed = this.editor, s = ed.selection, e = ed.dom.getParent(s.getNode(), 'a');\r
+                       // Override unlink command\r
+                       unlink : function(command) {\r
+                               if (selection.isCollapsed())\r
+                                       selection.select(selection.getNode());\r
 \r
-                       if (tinymce.is(v, 'string'))\r
-                               v = {href : v};\r
+                               execNativeCommand(command);\r
+                               selection.collapse(FALSE);\r
+                       },\r
 \r
-                       function set(e) {\r
-                               each(v, function(v, k) {\r
-                                       ed.dom.setAttrib(e, k, v);\r
-                               });\r
-                       };\r
+                       // Override justify commands to use the text formatter engine\r
+                       'JustifyLeft,JustifyCenter,JustifyRight,JustifyFull' : function(command) {\r
+                               var align = command.substring(7);\r
 \r
-                       if (!e) {\r
-                               ed.execCommand('CreateLink', false, 'javascript:mctmp(0);');\r
-                               each(ed.dom.select('a[href=javascript:mctmp(0);]'), function(e) {\r
-                                       set(e);\r
+                               // 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
                                });\r
-                       } else {\r
-                               if (v.href)\r
-                                       set(e);\r
-                               else\r
-                                       ed.dom.remove(e, 1);\r
-                       }\r
-               },\r
 \r
-               UnLink : function() {\r
-                       var ed = this.editor, s = ed.selection;\r
+                               toggleFormat('align' + align);\r
+                       },\r
 \r
-                       if (s.isCollapsed())\r
-                               s.select(s.getNode());\r
+                       // Override list commands to fix WebKit bug\r
+                       'InsertUnorderedList,InsertOrderedList' : function(command) {\r
+                               var listElm, listParent;\r
 \r
-                       ed.getDoc().execCommand('unlink', false, null);\r
-                       s.collapse(0);\r
-               },\r
+                               execNativeCommand(command);\r
 \r
-               FontName : function(u, v) {\r
-                       var t = this, ed = t.editor, s = ed.selection, e;\r
+                               // WebKit produces lists within block elements so we need to split them\r
+                               // we will replace the native list creation logic to custom logic later on\r
+                               // TODO: Remove this when the list creation logic is removed\r
+                               listElm = dom.getParent(selection.getNode(), 'ol,ul');\r
+                               if (listElm) {\r
+                                       listParent = listElm.parentNode;\r
 \r
-                       if (!v) {\r
-                               if (s.isCollapsed())\r
-                                       s.select(s.getNode());\r
-                       } else {\r
-                               if (ed.settings.convert_fonts_to_spans)\r
-                                       t._applyInlineStyle('span', {style : {fontFamily : v}});\r
-                               else\r
-                                       ed.getDoc().execCommand('FontName', false, v);\r
-                       }\r
-               },\r
+                                       // If list is within a text block then split that block\r
+                                       if (/^(H[1-6]|P|ADDRESS|PRE)$/.test(listParent.nodeName)) {\r
+                                               storeSelection();\r
+                                               dom.split(listParent, listElm);\r
+                                               restoreSelection();\r
+                                       }\r
+                               }\r
+                       },\r
 \r
-               FontSize : function(u, v) {\r
-                       var ed = this.editor, s = ed.settings, fc, fs;\r
+                       // Override commands to use the text formatter engine\r
+                       'Bold,Italic,Underline,Strikethrough' : function(command) {\r
+                               toggleFormat(command);\r
+                       },\r
 \r
-                       // Use style options instead\r
-                       if (s.convert_fonts_to_spans && v >= 1 && v <= 7) {\r
-                               fs = tinymce.explode(s.font_size_style_values);\r
-                               fc = tinymce.explode(s.font_size_classes);\r
+                       // Override commands to use the text formatter engine\r
+                       'ForeColor,HiliteColor,FontName' : function(command, ui, value) {\r
+                               toggleFormat(command, value);\r
+                       },\r
 \r
-                               if (fc)\r
-                                       v = fc[v - 1] || v;\r
-                               else\r
-                                       v = fs[v - 1] || v;\r
-                       }\r
+                       FontSize : function(command, ui, value) {\r
+                               var fontClasses, fontSizes;\r
 \r
-                       if (v >= 1 && v <= 7)\r
-                               ed.getDoc().execCommand('FontSize', false, v);\r
-                       else\r
-                               this._applyInlineStyle('span', {style : {fontSize : v}});\r
-               },\r
+                               // Convert font size 1-7 to styles\r
+                               if (value >= 1 && value <= 7) {\r
+                                       fontSizes = tinymce.explode(settings.font_size_style_values);\r
+                                       fontClasses = tinymce.explode(settings.font_size_classes);\r
 \r
-               queryCommandValue : function(c) {\r
-                       var f = this['queryValue' + c];\r
+                                       if (fontClasses)\r
+                                               value = fontClasses[value - 1] || value;\r
+                                       else\r
+                                               value = fontSizes[value - 1] || value;\r
+                               }\r
 \r
-                       if (f)\r
-                               return f.call(this, c);\r
+                               toggleFormat(command, value);\r
+                       },\r
 \r
-                       return false;\r
-               },\r
+                       RemoveFormat : function(command) {\r
+                               editor.formatter.remove(command);\r
+                       },\r
 \r
-               queryCommandState : function(cmd) {\r
-                       var f;\r
+                       mceBlockQuote : function(command) {\r
+                               toggleFormat('blockquote');\r
+                       },\r
 \r
-                       switch (cmd) {\r
-                               // Bundle these together\r
-                               case 'JustifyLeft':\r
-                               case 'JustifyCenter':\r
-                               case 'JustifyRight':\r
-                               case 'JustifyFull':\r
-                                       return this.queryStateJustify(cmd, cmd.substring(7).toLowerCase());\r
+                       FormatBlock : function(command, ui, value) {\r
+                               return toggleFormat(value);\r
+                       },\r
 \r
-                               default:\r
-                                       if (f = this['queryState' + cmd])\r
-                                               return f.call(this, cmd);\r
-                       }\r
+                       mceCleanup : function() {\r
+                               var bookmark = selection.getBookmark();\r
 \r
-                       return -1;\r
-               },\r
+                               editor.setContent(editor.getContent({cleanup : TRUE}), {cleanup : TRUE});\r
 \r
-               _queryState : function(c) {\r
-                       try {\r
-                               return this.editor.getDoc().queryCommandState(c);\r
-                       } catch (ex) {\r
-                               // Ignore exception\r
-                       }\r
-               },\r
+                               selection.moveToBookmark(bookmark);\r
+                       },\r
 \r
-               _queryVal : function(c) {\r
-                       try {\r
-                               return this.editor.getDoc().queryCommandValue(c);\r
-                       } catch (ex) {\r
-                               // Ignore exception\r
-                       }\r
-               },\r
+                       mceRemoveNode : function(command, ui, value) {\r
+                               var node = value || selection.getNode();\r
 \r
-               queryValueFontSize : function() {\r
-                       var ed = this.editor, v = 0, p;\r
+                               // Make sure that the body node isn't removed\r
+                               if (node != editor.getBody()) {\r
+                                       storeSelection();\r
+                                       editor.dom.remove(node, TRUE);\r
+                                       restoreSelection();\r
+                               }\r
+                       },\r
 \r
-                       if (p = ed.dom.getParent(ed.selection.getNode(), 'span'))\r
-                               v = p.style.fontSize;\r
+                       mceSelectNodeDepth : function(command, ui, value) {\r
+                               var counter = 0;\r
 \r
-                       if (!v && (isOpera || isWebKit)) {\r
-                               if (p = ed.dom.getParent(ed.selection.getNode(), 'font'))\r
-                                       v = p.size;\r
+                               dom.getParent(selection.getNode(), function(node) {\r
+                                       if (node.nodeType == 1 && counter++ == value) {\r
+                                               selection.select(node);\r
+                                               return FALSE;\r
+                                       }\r
+                               }, editor.getBody());\r
+                       },\r
 \r
-                               return v;\r
-                       }\r
+                       mceSelectNode : function(command, ui, value) {\r
+                               selection.select(value);\r
+                       },\r
 \r
-                       return v || this._queryVal('FontSize');\r
-               },\r
+                       mceInsertContent : function(command, ui, value) {\r
+                               selection.setContent(value);\r
+                       },\r
 \r
-               queryValueFontName : function() {\r
-                       var ed = this.editor, v = 0, p;\r
+                       mceInsertRawHTML : function(command, ui, value) {\r
+                               selection.setContent('tiny_mce_marker');\r
+                               editor.setContent(editor.getContent().replace(/tiny_mce_marker/g, value));\r
+                       },\r
 \r
-                       if (p = ed.dom.getParent(ed.selection.getNode(), 'font'))\r
-                               v = p.face;\r
+                       mceSetContent : function(command, ui, value) {\r
+                               editor.setContent(value);\r
+                       },\r
 \r
-                       if (p = ed.dom.getParent(ed.selection.getNode(), 'span'))\r
-                               v = p.style.fontFamily.replace(/, /g, ',').replace(/[\'\"]/g, '').toLowerCase();\r
+                       'Indent,Outdent' : function(command) {\r
+                               var intentValue, indentUnit, value;\r
 \r
-                       if (!v)\r
-                               v = this._queryVal('FontName');\r
+                               // Setup indent level\r
+                               intentValue = settings.indentation;\r
+                               indentUnit = /[a-z%]+$/i.exec(intentValue);\r
+                               intentValue = parseInt(intentValue);\r
 \r
-                       return v;\r
-               },\r
+                               if (!queryCommandState('InsertUnorderedList') && !queryCommandState('InsertOrderedList')) {\r
+                                       each(selection.getSelectedBlocks(), function(element) {\r
+                                               if (command == 'outdent') {\r
+                                                       value = Math.max(0, parseInt(element.style.paddingLeft || 0) - intentValue);\r
+                                                       dom.setStyle(element, 'paddingLeft', value ? value + indentUnit : '');\r
+                                               } else\r
+                                                       dom.setStyle(element, 'paddingLeft', (parseInt(element.style.paddingLeft || 0) + intentValue) + indentUnit);\r
+                                       });\r
+                               } else\r
+                                       execNativeCommand(command);\r
+                       },\r
 \r
-               mceJustify : function(c, v) {\r
-                       var ed = this.editor, se = ed.selection, n = se.getNode(), nn = n.nodeName, bl, nb, dom = ed.dom, rm;\r
+                       mceRepaint : function() {\r
+                               var bookmark;\r
 \r
-                       if (ed.settings.inline_styles && this.queryStateJustify(c, v))\r
-                               rm = 1;\r
+                               if (tinymce.isGecko) {\r
+                                       try {\r
+                                               storeSelection(TRUE);\r
 \r
-                       bl = dom.getParent(n, ed.dom.isBlock);\r
+                                               if (selection.getSel())\r
+                                                       selection.getSel().selectAllChildren(editor.getBody());\r
 \r
-                       if (nn == 'IMG') {\r
-                               if (v == 'full')\r
-                                       return;\r
+                                               selection.collapse(TRUE);\r
+                                               restoreSelection();\r
+                                       } catch (ex) {\r
+                                               // Ignore\r
+                                       }\r
+                               }\r
+                       },\r
 \r
-                               if (rm) {\r
-                                       if (v == 'center')\r
-                                               dom.setStyle(bl || n.parentNode, 'textAlign', '');\r
+                       mceToggleFormat : function(command, ui, value) {\r
+                               editor.formatter.toggle(value);\r
+                       },\r
 \r
-                                       dom.setStyle(n, 'float', '');\r
-                                       this.mceRepaint();\r
-                                       return;\r
-                               }\r
+                       InsertHorizontalRule : function() {\r
+                               selection.setContent('<hr />');\r
+                       },\r
 \r
-                               if (v == 'center') {\r
-                                       // Do not change table elements\r
-                                       if (bl && /^(TD|TH)$/.test(bl.nodeName))\r
-                                               bl = 0;\r
+                       mceToggleVisualAid : function() {\r
+                               editor.hasVisual = !editor.hasVisual;\r
+                               editor.addVisual();\r
+                       },\r
 \r
-                                       if (!bl || bl.childNodes.length > 1) {\r
-                                               nb = dom.create('p');\r
-                                               nb.appendChild(n.cloneNode(false));\r
+                       mceReplaceContent : function(command, ui, value) {\r
+                               selection.setContent(value.replace(/\{\$selection\}/g, selection.getContent({format : 'text'})));\r
+                       },\r
 \r
-                                               if (bl)\r
-                                                       dom.insertAfter(nb, bl);\r
-                                               else\r
-                                                       dom.insertAfter(nb, n);\r
+                       mceInsertLink : function(command, ui, value) {\r
+                               var link = dom.getParent(selection.getNode(), 'a');\r
 \r
-                                               dom.remove(n);\r
-                                               n = nb.firstChild;\r
-                                               bl = nb;\r
-                                       }\r
+                               if (tinymce.is(value, 'string'))\r
+                                       value = {href : value};\r
 \r
-                                       dom.setStyle(bl, 'textAlign', v);\r
-                                       dom.setStyle(n, 'float', '');\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
-                                       dom.setStyle(n, 'float', v);\r
-                                       dom.setStyle(bl || n.parentNode, 'textAlign', '');\r
+                                       if (value.href)\r
+                                               dom.setAttribs(link, value);\r
+                                       else\r
+                                               editor.dom.remove(link, TRUE);\r
                                }\r
-\r
-                               this.mceRepaint();\r
-                               return;\r
+                       },\r
+                       \r
+                       selectAll : function() {\r
+                               var root = dom.getRoot();\r
+                               var rng = dom.createRng();\r
+                               rng.setStart(root, 0);\r
+                               rng.setEnd(root, root.childNodes.length);\r
+                               editor.selection.setRng(rng);\r
                        }\r
+               });\r
 \r
-                       // Handle the alignment outselfs, less quirks in all browsers\r
-                       if (ed.settings.inline_styles && ed.settings.forced_root_block) {\r
-                               if (rm)\r
-                                       v = '';\r
+               // Add queryCommandState overrides\r
+               addCommands({\r
+                       // Override justify commands\r
+                       'JustifyLeft,JustifyCenter,JustifyRight,JustifyFull' : function(command) {\r
+                               return isFormatMatch('align' + command.substring(7));\r
+                       },\r
 \r
-                               each(se.getSelectedBlocks(dom.getParent(se.getStart(), dom.isBlock), dom.getParent(se.getEnd(), dom.isBlock)), function(e) {\r
-                                       dom.setAttrib(e, 'align', '');\r
-                                       dom.setStyle(e, 'textAlign', v == 'full' ? 'justify' : v);\r
-                               });\r
+                       'Bold,Italic,Underline,Strikethrough' : function(command) {\r
+                               return isFormatMatch(command);\r
+                       },\r
 \r
-                               return;\r
-                       } else if (!rm)\r
-                               ed.getDoc().execCommand(c, false, null);\r
-\r
-                       if (ed.settings.inline_styles) {\r
-                               if (rm) {\r
-                                       dom.getParent(ed.selection.getNode(), function(n) {\r
-                                               if (n.style && n.style.textAlign)\r
-                                                       dom.setStyle(n, 'textAlign', '');\r
-                                       });\r
+                       mceBlockQuote : function() {\r
+                               return isFormatMatch('blockquote');\r
+                       },\r
 \r
-                                       return;\r
+                       Outdent : function() {\r
+                               var node;\r
+\r
+                               if (settings.inline_styles) {\r
+                                       if ((node = dom.getParent(selection.getStart(), dom.isBlock)) && parseInt(node.style.paddingLeft) > 0)\r
+                                               return TRUE;\r
+\r
+                                       if ((node = dom.getParent(selection.getEnd(), dom.isBlock)) && parseInt(node.style.paddingLeft) > 0)\r
+                                               return TRUE;\r
                                }\r
 \r
-                               each(dom.select('*'), function(n) {\r
-                                       var v = n.align;\r
+                               return queryCommandState('InsertUnorderedList') || queryCommandState('InsertOrderedList') || (!settings.inline_styles && !!dom.getParent(selection.getNode(), 'BLOCKQUOTE'));\r
+                       },\r
+\r
+                       'InsertUnorderedList,InsertOrderedList' : function(command) {\r
+                               return dom.getParent(selection.getNode(), command == 'insertunorderedlist' ? 'UL' : 'OL');\r
+                       }\r
+               }, 'state');\r
 \r
-                                       if (v) {\r
-                                               if (v == 'full')\r
-                                                       v = 'justify';\r
+               // Add queryCommandValue overrides\r
+               addCommands({\r
+                       'FontSize,FontName' : function(command) {\r
+                               var value = 0, parent;\r
 \r
-                                               dom.setStyle(n, 'textAlign', v);\r
-                                               dom.setAttrib(n, 'align', '');\r
-                                       }\r
-                               });\r
+                               if (parent = dom.getParent(selection.getNode(), 'span')) {\r
+                                       if (command == 'fontsize')\r
+                                               value = parent.style.fontSize;\r
+                                       else\r
+                                               value = parent.style.fontFamily.replace(/, /g, ',').replace(/[\'\"]/g, '').toLowerCase();\r
+                               }\r
+\r
+                               return value;\r
                        }\r
-               },\r
+               }, 'value');\r
 \r
-               mceSetCSSClass : function(u, v) {\r
-                       this.mceSetStyleInfo(0, {command : 'setattrib', name : 'class', value : v});\r
-               },\r
+               // Add undo manager logic\r
+               if (settings.custom_undo_redo) {\r
+                       addCommands({\r
+                               Undo : function() {\r
+                                       editor.undoManager.undo();\r
+                               },\r
 \r
-               getSelectedElement : function() {\r
-                       var t = this, ed = t.editor, dom = ed.dom, se = ed.selection, r = se.getRng(), r1, r2, sc, ec, so, eo, e, sp, ep, re;\r
+                               Redo : function() {\r
+                                       editor.undoManager.redo();\r
+                               }\r
+                       });\r
+               }\r
+       };\r
+})(tinymce);\r
+(function(tinymce) {\r
+       var Dispatcher = tinymce.util.Dispatcher;\r
 \r
-                       if (se.isCollapsed() || r.item)\r
-                               return se.getNode();\r
+       tinymce.UndoManager = function(editor) {\r
+               var self, index = 0, data = [];\r
 \r
-                       // Setup regexp\r
-                       re = ed.settings.merge_styles_invalid_parents;\r
-                       if (tinymce.is(re, 'string'))\r
-                               re = new RegExp(re, 'i');\r
+               function getContent() {\r
+                       return tinymce.trim(editor.getContent({format : 'raw', no_events : 1}));\r
+               };\r
 \r
-                       if (isIE) {\r
-                               r1 = r.duplicate();\r
-                               r1.collapse(true);\r
-                               sc = r1.parentElement();\r
+               return self = {\r
+                       typing : 0,\r
 \r
-                               r2 = r.duplicate();\r
-                               r2.collapse(false);\r
-                               ec = r2.parentElement();\r
+                       onAdd : new Dispatcher(self),\r
+                       onUndo : new Dispatcher(self),\r
+                       onRedo : new Dispatcher(self),\r
 \r
-                               if (sc != ec) {\r
-                                       r1.move('character', 1);\r
-                                       sc = r1.parentElement();\r
-                               }\r
+                       add : function(level) {\r
+                               var i, settings = editor.settings, lastLevel;\r
 \r
-                               if (sc == ec) {\r
-                                       r1 = r.duplicate();\r
-                                       r1.moveToElementText(sc);\r
+                               level = level || {};\r
+                               level.content = getContent();\r
 \r
-                                       if (r1.compareEndPoints('StartToStart', r) == 0 && r1.compareEndPoints('EndToEnd', r) == 0)\r
-                                               return re && re.test(sc.nodeName) ? null : sc;\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
-                       } else {\r
-                               function getParent(n) {\r
-                                       return dom.getParent(n, '*');\r
-                               };\r
 \r
-                               sc = r.startContainer;\r
-                               ec = r.endContainer;\r
-                               so = r.startOffset;\r
-                               eo = r.endOffset;\r
+                               // Time to compress\r
+                               if (settings.custom_undo_redo_levels) {\r
+                                       if (data.length > settings.custom_undo_redo_levels) {\r
+                                               for (i = 0; i < data.length - 1; i++)\r
+                                                       data[i] = data[i + 1];\r
 \r
-                               if (!r.collapsed) {\r
-                                       if (sc == ec) {\r
-                                               if (so - eo < 2) {\r
-                                                       if (sc.hasChildNodes()) {\r
-                                                               sp = sc.childNodes[so];\r
-                                                               return re && re.test(sp.nodeName) ? null : sp;\r
-                                                       }\r
-                                               }\r
+                                               data.length--;\r
+                                               index = data.length;\r
                                        }\r
                                }\r
 \r
-                               if (sc.nodeType != 3 || ec.nodeType != 3)\r
-                                       return null;\r
-\r
-                               if (so == 0) {\r
-                                       sp = getParent(sc);\r
+                               // Get a non intrusive normalized bookmark\r
+                               level.bookmark = editor.selection.getBookmark(2, true);\r
 \r
-                                       if (sp && sp.firstChild != sc)\r
-                                               sp = null;\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
 \r
-                               if (so == sc.nodeValue.length) {\r
-                                       e = sc.nextSibling;\r
+                               data.push(level);\r
+                               index = data.length - 1;\r
 \r
-                                       if (e && e.nodeType == 1)\r
-                                               sp = sc.nextSibling;\r
-                               }\r
+                               self.onAdd.dispatch(self, level);\r
+                               editor.isNotDirty = 0;\r
 \r
-                               if (eo == 0) {\r
-                                       e = ec.previousSibling;\r
+                               return level;\r
+                       },\r
 \r
-                                       if (e && e.nodeType == 1)\r
-                                               ep = e;\r
+                       undo : function() {\r
+                               var level, i;\r
+\r
+                               if (self.typing) {\r
+                                       self.add();\r
+                                       self.typing = 0;\r
                                }\r
 \r
-                               if (eo == ec.nodeValue.length) {\r
-                                       ep = getParent(ec);\r
+                               if (index > 0) {\r
+                                       level = data[--index];\r
 \r
-                                       if (ep && ep.lastChild != ec)\r
-                                               ep = null;\r
-                               }\r
+                                       editor.setContent(level.content, {format : 'raw'});\r
+                                       editor.selection.moveToBookmark(level.bookmark);\r
 \r
-                               // Same element\r
-                               if (sp == ep)\r
-                                       return re && sp && re.test(sp.nodeName) ? null : sp;\r
-                       }\r
+                                       self.onUndo.dispatch(self, level);\r
+                               }\r
 \r
-                       return null;\r
-               },\r
+                               return level;\r
+                       },\r
 \r
-               mceSetStyleInfo : function(u, v) {\r
-                       var t = this, ed = t.editor, d = ed.getDoc(), dom = ed.dom, e, b, s = ed.selection, nn = v.wrapper || 'span', b = s.getBookmark(), re;\r
+                       redo : function() {\r
+                               var level;\r
 \r
-                       function set(n, e) {\r
-                               if (n.nodeType == 1) {\r
-                                       switch (v.command) {\r
-                                               case 'setattrib':\r
-                                                       return dom.setAttrib(n, v.name, v.value);\r
+                               if (index < data.length - 1) {\r
+                                       level = data[++index];\r
 \r
-                                               case 'setstyle':\r
-                                                       return dom.setStyle(n, v.name, v.value);\r
+                                       editor.setContent(level.content, {format : 'raw'});\r
+                                       editor.selection.moveToBookmark(level.bookmark);\r
 \r
-                                               case 'removeformat':\r
-                                                       return dom.setAttrib(n, 'class', '');\r
-                                       }\r
+                                       self.onRedo.dispatch(self, level);\r
                                }\r
-                       };\r
 \r
-                       // Setup regexp\r
-                       re = ed.settings.merge_styles_invalid_parents;\r
-                       if (tinymce.is(re, 'string'))\r
-                               re = new RegExp(re, 'i');\r
+                               return level;\r
+                       },\r
 \r
-                       // Set style info on selected element\r
-                       if ((e = t.getSelectedElement()) && !ed.settings.force_span_wrappers)\r
-                               set(e, 1);\r
-                       else {\r
-                               // Generate wrappers and set styles on them\r
-                               d.execCommand('FontName', false, '__');\r
-                               each(dom.select('span,font'), function(n) {\r
-                                       var sp, e;\r
+                       clear : function() {\r
+                               data = [];\r
+                               index = self.typing = 0;\r
+                       },\r
 \r
-                                       if (dom.getAttrib(n, 'face') == '__' || n.style.fontFamily === '__') {\r
-                                               sp = dom.create(nn, {mce_new : '1'});\r
+                       hasUndo : function() {\r
+                               return index > 0 || self.typing;\r
+                       },\r
 \r
-                                               set(sp);\r
+                       hasRedo : function() {\r
+                               return index < data.length - 1;\r
+                       }\r
+               };\r
+       };\r
+})(tinymce);\r
 \r
-                                               each (n.childNodes, function(n) {\r
-                                                       sp.appendChild(n.cloneNode(true));\r
-                                               });\r
+(function(tinymce) {\r
+       // Shorten names\r
+       var Event = tinymce.dom.Event,\r
+               isIE = tinymce.isIE,\r
+               isGecko = tinymce.isGecko,\r
+               isOpera = tinymce.isOpera,\r
+               each = tinymce.each,\r
+               extend = tinymce.extend,\r
+               TRUE = true,\r
+               FALSE = false;\r
+\r
+       function cloneFormats(node) {\r
+               var clone, temp, inner;\r
+\r
+               do {\r
+                       if (/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(node.nodeName)) {\r
+                               if (clone) {\r
+                                       temp = node.cloneNode(false);\r
+                                       temp.appendChild(clone);\r
+                                       clone = temp;\r
+                               } else {\r
+                                       clone = inner = node.cloneNode(false);\r
+                               }\r
 \r
-                                               dom.replace(sp, n);\r
-                                       }\r
-                               });\r
+                               clone.removeAttribute('id');\r
                        }\r
+               } while (node = node.parentNode);\r
 \r
-                       // Remove wrappers inside new ones\r
-                       each(dom.select(nn).reverse(), function(n) {\r
-                               var p = n.parentNode;\r
+               if (clone)\r
+                       return {wrapper : clone, inner : inner};\r
+       };\r
 \r
-                               // Check if it's an old span in a new wrapper\r
-                               if (!dom.getAttrib(n, 'mce_new')) {\r
-                                       // Find new wrapper\r
-                                       p = dom.getParent(n, '*[mce_new]');\r
+       // Checks if the selection/caret is at the end of the specified block element\r
+       function isAtEnd(rng, par) {\r
+               var rng2 = par.ownerDocument.createRange();\r
 \r
-                                       if (p)\r
-                                               dom.remove(n, 1);\r
-                               }\r
-                       });\r
+               rng2.setStart(rng.endContainer, rng.endOffset);\r
+               rng2.setEndAfter(par);\r
 \r
-                       // Merge wrappers with parent wrappers\r
-                       each(dom.select(nn).reverse(), function(n) {\r
-                               var p = n.parentNode;\r
+               // Get number of characters to the right of the cursor if it's zero then we are at the end and need to merge the next block element\r
+               return rng2.cloneContents().textContent.length == 0;\r
+       };\r
 \r
-                               if (!p || !dom.getAttrib(n, 'mce_new'))\r
-                                       return;\r
+       function isEmpty(n) {\r
+               n = n.innerHTML;\r
 \r
-                               if (ed.settings.force_span_wrappers && p.nodeName != 'SPAN')\r
-                                       return;\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
-                               // Has parent of the same type and only child\r
-                               if (p.nodeName == nn.toUpperCase() && p.childNodes.length == 1)\r
-                                       return dom.remove(p, 1);\r
+       function splitList(selection, dom, li) {\r
+               var listBlock, block;\r
 \r
-                               // Has parent that is more suitable to have the class and only child\r
-                               if (n.nodeType == 1 && (!re || !re.test(p.nodeName)) && p.childNodes.length == 1) {\r
-                                       set(p); // Set style info on parent instead\r
-                                       dom.setAttrib(n, 'class', '');\r
-                               }\r
-                       });\r
+               if (isEmpty(li)) {\r
+                       listBlock = dom.getParent(li, 'ul,ol');\r
 \r
-                       // Remove empty wrappers\r
-                       each(dom.select(nn).reverse(), function(n) {\r
-                               if (dom.getAttrib(n, 'mce_new') || (dom.getAttribs(n).length <= 1 && n.className === '')) {\r
-                                       if (!dom.getAttrib(n, 'class') && !dom.getAttrib(n, 'style'))\r
-                                               return dom.remove(n, 1);\r
+                       if (!dom.getParent(listBlock.parentNode, 'ul,ol')) {\r
+                               dom.split(listBlock, li);\r
+                               block = dom.create('p', 0, '<br _mce_bogus="1" />');\r
+                               dom.replace(block, li);\r
+                               selection.select(block, 1);\r
+                       }\r
 \r
-                                       dom.setAttrib(n, 'mce_new', ''); // Remove mce_new marker\r
-                               }\r
-                       });\r
+                       return FALSE;\r
+               }\r
 \r
-                       s.moveToBookmark(b);\r
-               },\r
+               return TRUE;\r
+       };\r
 \r
-               queryStateJustify : function(c, v) {\r
-                       var ed = this.editor, n = ed.selection.getNode(), dom = ed.dom;\r
+       tinymce.create('tinymce.ForceBlocks', {\r
+               ForceBlocks : function(ed) {\r
+                       var t = this, s = ed.settings, elm;\r
 \r
-                       if (n && n.nodeName == 'IMG') {\r
-                               if (dom.getStyle(n, 'float') == v)\r
-                                       return 1;\r
+                       t.editor = ed;\r
+                       t.dom = ed.dom;\r
+                       elm = (s.forced_root_block || 'p').toLowerCase();\r
+                       s.element = elm.toUpperCase();\r
 \r
-                               return n.parentNode.style.textAlign == v;\r
-                       }\r
+                       ed.onPreInit.add(t.setup, t);\r
 \r
-                       n = dom.getParent(ed.selection.getStart(), function(n) {\r
-                               return n.nodeType == 1 && n.style.textAlign;\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
 \r
-                       if (v == 'full')\r
-                               v = 'justify';\r
+                       function padd(ed, o) {\r
+                               if (isOpera)\r
+                                       o.content = o.content.replace(t.reOpera, '</' + elm + '>');\r
 \r
-                       if (ed.settings.inline_styles)\r
-                               return (n && n.style.textAlign == v);\r
+                               o.content = o.content.replace(t.rePadd, '<' + elm + '$1$2$3$4$5$6>\u00a0</' + elm + '>');\r
 \r
-                       return this._queryState(c);\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 = o.content.replace(t.reBR2Nbsp, '<' + elm + '$1$2>\u00a0</' + elm + '>');\r
+                       };\r
 \r
-               ForeColor : function(ui, v) {\r
-                       var ed = this.editor;\r
+                       ed.onBeforeSetContent.add(padd);\r
+                       ed.onPostProcess.add(padd);\r
 \r
-                       if (ed.settings.convert_fonts_to_spans) {\r
-                               this._applyInlineStyle('span', {style : {color : v}});\r
-                               return;\r
-                       } else\r
-                               ed.getDoc().execCommand('ForeColor', false, v);\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
 \r
-               HiliteColor : function(ui, val) {\r
-                       var t = this, ed = t.editor, d = ed.getDoc();\r
+               setup : function() {\r
+                       var t = this, ed = t.editor, s = ed.settings, dom = ed.dom, selection = ed.selection;\r
 \r
-                       if (ed.settings.convert_fonts_to_spans) {\r
-                               this._applyInlineStyle('span', {style : {backgroundColor : val}});\r
-                               return;\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
                        }\r
 \r
-                       function set(s) {\r
-                               if (!isGecko)\r
-                                       return;\r
+                       if (s.force_br_newlines) {\r
+                               // Force IE to produce BRs on enter\r
+                               if (isIE) {\r
+                                       ed.onKeyPress.add(function(ed, e) {\r
+                                               var n;\r
 \r
-                               try {\r
-                                       // Try new Gecko method\r
-                                       d.execCommand("styleWithCSS", 0, s);\r
-                               } catch (ex) {\r
-                                       // Use old\r
-                                       d.execCommand("useCSS", 0, !s);\r
+                                               if (e.keyCode == 13 && selection.getNode().nodeName != 'LI') {\r
+                                                       selection.setContent('<br id="__" /> ', {format : 'raw'});\r
+                                                       n = dom.get('__');\r
+                                                       n.removeAttribute('id');\r
+                                                       selection.select(n);\r
+                                                       selection.collapse();\r
+                                                       return Event.cancel(e);\r
+                                               }\r
+                                       });\r
                                }\r
-                       };\r
+                       }\r
 \r
-                       if (isGecko || isOpera) {\r
-                               set(true);\r
-                               d.execCommand('hilitecolor', false, val);\r
-                               set(false);\r
-                       } else\r
-                               d.execCommand('BackColor', false, val);\r
-               },\r
+                       if (s.force_p_newlines) {\r
+                               if (!isIE) {\r
+                                       ed.onKeyPress.add(function(ed, e) {\r
+                                               if (e.keyCode == 13 && !e.shiftKey && !t.insertPara(e))\r
+                                                       Event.cancel(e);\r
+                                       });\r
+                               } else {\r
+                                       // Ungly hack to for IE to preserve the formatting when you press\r
+                                       // enter at the end of a block element with formatted contents\r
+                                       // This logic overrides the browsers default logic with\r
+                                       // custom logic that enables us to control the output\r
+                                       tinymce.addUnload(function() {\r
+                                               t._previousFormats = 0; // Fix IE leak\r
+                                       });\r
 \r
-               FormatBlock : function(ui, val) {\r
-                       var t = this, ed = t.editor, s = ed.selection, dom = ed.dom, bl, nb, b;\r
+                                       ed.onKeyPress.add(function(ed, e) {\r
+                                               t._previousFormats = 0;\r
 \r
-                       function isBlock(n) {\r
-                               return /^(P|DIV|H[1-6]|ADDRESS|BLOCKQUOTE|PRE)$/.test(n.nodeName);\r
-                       };\r
+                                               // Clone the current formats, this will later be applied to the new block contents\r
+                                               if (e.keyCode == 13 && !e.shiftKey && ed.selection.isCollapsed() && s.keep_styles)\r
+                                                       t._previousFormats = cloneFormats(ed.selection.getStart());\r
+                                       });\r
 \r
-                       bl = dom.getParent(s.getNode(), function(n) {\r
-                               return isBlock(n);\r
-                       });\r
+                                       ed.onKeyUp.add(function(ed, e) {\r
+                                               // Let IE break the element and the wrap the new caret location in the previous formats\r
+                                               if (e.keyCode == 13 && !e.shiftKey) {\r
+                                                       var parent = ed.selection.getStart(), fmt = t._previousFormats;\r
 \r
-                       // IE has an issue where it removes the parent div if you change format on the paragrah in <div><p>Content</p></div>\r
-                       // FF and Opera doesn't change parent DIV elements if you switch format\r
-                       if (bl) {\r
-                               if ((isIE && isBlock(bl.parentNode)) || bl.nodeName == 'DIV') {\r
-                                       // Rename block element\r
-                                       nb = ed.dom.create(val);\r
+                                                       // Parent is an empty block\r
+                                                       if (!parent.hasChildNodes()) {\r
+                                                               parent = dom.getParent(parent, dom.isBlock);\r
 \r
-                                       each(dom.getAttribs(bl), function(v) {\r
-                                               dom.setAttrib(nb, v.nodeName, dom.getAttrib(bl, v.nodeName));\r
+                                                               if (parent) {\r
+                                                                       parent.innerHTML = '';\r
+       \r
+                                                                       if (t._previousFormats) {\r
+                                                                               parent.appendChild(fmt.wrapper);\r
+                                                                               fmt.inner.innerHTML = '\uFEFF';\r
+                                                                       } else\r
+                                                                               parent.innerHTML = '\uFEFF';\r
+\r
+                                                                       selection.select(parent, 1);\r
+                                                                       ed.getDoc().execCommand('Delete', false, null);\r
+                                                               }\r
+                                                       }\r
+                                               }\r
                                        });\r
+                               }\r
 \r
-                                       b = s.getBookmark();\r
-                                       dom.replace(nb, bl, 1);\r
-                                       s.moveToBookmark(b);\r
-                                       ed.nodeChanged();\r
-                                       return;\r
+                               if (isGecko) {\r
+                                       ed.onKeyDown.add(function(ed, e) {\r
+                                               if ((e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey)\r
+                                                       t.backspaceDelete(e, e.keyCode == 8);\r
+                                       });\r
                                }\r
                        }\r
 \r
-                       val = ed.settings.forced_root_block ? (val || '<p>') : val;\r
-\r
-                       if (val.indexOf('<') == -1)\r
-                               val = '<' + val + '>';\r
-\r
-                       if (tinymce.isGecko)\r
-                               val = val.replace(/<(div|blockquote|code|dt|dd|dl|samp)>/gi, '$1');\r
+                       // Workaround for missing shift+enter support, http://bugs.webkit.org/show_bug.cgi?id=16973\r
+                       if (tinymce.isWebKit) {\r
+                               function insertBr(ed) {\r
+                                       var rng = selection.getRng(), br, div = dom.create('div', null, ' '), divYPos, vpHeight = dom.getViewPort(ed.getWin()).h;\r
 \r
-                       ed.getDoc().execCommand('FormatBlock', false, val);\r
-               },\r
+                                       // Insert BR element\r
+                                       rng.insertNode(br = dom.create('br'));\r
 \r
-               mceCleanup : function() {\r
-                       var ed = this.editor, s = ed.selection, b = s.getBookmark();\r
-                       ed.setContent(ed.getContent());\r
-                       s.moveToBookmark(b);\r
-               },\r
+                                       // Place caret after BR\r
+                                       rng.setStartAfter(br);\r
+                                       rng.setEndAfter(br);\r
+                                       selection.setRng(rng);\r
 \r
-               mceRemoveNode : function(ui, val) {\r
-                       var ed = this.editor, s = ed.selection, b, n = val || s.getNode();\r
+                                       // Could not place caret after BR then insert an nbsp entity and move the caret\r
+                                       if (selection.getSel().focusNode == br.previousSibling) {\r
+                                               selection.select(dom.insertAfter(dom.doc.createTextNode('\u00a0'), br));\r
+                                               selection.collapse(TRUE);\r
+                                       }\r
 \r
-                       // Make sure that the body node isn't removed\r
-                       if (n == ed.getBody())\r
-                               return;\r
+                                       // Create a temporary DIV after the BR and get the position as it\r
+                                       // seems like getPos() returns 0 for text nodes and BR elements.\r
+                                       dom.insertAfter(div, br);\r
+                                       divYPos = dom.getPos(div).y;\r
+                                       dom.remove(div);\r
 \r
-                       b = s.getBookmark();\r
-                       ed.dom.remove(n, 1);\r
-                       s.moveToBookmark(b);\r
-                       ed.nodeChanged();\r
-               },\r
+                                       // Scroll to new position, scrollIntoView can't be used due to bug: http://bugs.webkit.org/show_bug.cgi?id=16117\r
+                                       if (divYPos > vpHeight) // It is not necessary to scroll if the DIV is inside the view port.\r
+                                               ed.getWin().scrollTo(0, divYPos);\r
+                               };\r
 \r
-               mceSelectNodeDepth : function(ui, val) {\r
-                       var ed = this.editor, s = ed.selection, c = 0;\r
+                               ed.onKeyPress.add(function(ed, e) {\r
+                                       if (e.keyCode == 13 && (e.shiftKey || (s.force_br_newlines && !dom.getParent(selection.getNode(), 'h1,h2,h3,h4,h5,h6,ol,ul')))) {\r
+                                               insertBr(ed);\r
+                                               Event.cancel(e);\r
+                                       }\r
+                               });\r
+                       }\r
 \r
-                       ed.dom.getParent(s.getNode(), function(n) {\r
-                               if (n.nodeType == 1 && c++ == val) {\r
-                                       s.select(n);\r
-                                       ed.nodeChanged();\r
-                                       return false;\r
-                               }\r
-                       }, ed.getBody());\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
-               mceSelectNode : function(u, v) {\r
-                       this.editor.selection.select(v);\r
-               },\r
+                       // IE specific fixes\r
+                       if (isIE) {\r
+                               // Replaces IE:s auto generated paragraphs with the specified element name\r
+                               if (s.element != 'P') {\r
+                                       ed.onKeyPress.add(function(ed, e) {\r
+                                               t.lastElm = selection.getNode().nodeName;\r
+                                       });\r
 \r
-               mceInsertContent : function(ui, val) {\r
-                       this.editor.selection.setContent(val);\r
-               },\r
+                                       ed.onKeyUp.add(function(ed, e) {\r
+                                               var bl, n = selection.getNode(), b = ed.getBody();\r
 \r
-               mceInsertRawHTML : function(ui, val) {\r
-                       var ed = this.editor;\r
+                                               if (b.childNodes.length === 1 && n.nodeName == 'P') {\r
+                                                       n = dom.rename(n, s.element);\r
+                                                       selection.select(n);\r
+                                                       selection.collapse();\r
+                                                       ed.nodeChanged();\r
+                                               } else if (e.keyCode == 13 && !e.shiftKey && t.lastElm != 'P') {\r
+                                                       bl = dom.getParent(n, 'p');\r
 \r
-                       ed.selection.setContent('tiny_mce_marker');\r
-                       ed.setContent(ed.getContent().replace(/tiny_mce_marker/g, val));\r
+                                                       if (bl) {\r
+                                                               dom.rename(bl, s.element);\r
+                                                               ed.nodeChanged();\r
+                                                       }\r
+                                               }\r
+                                       });\r
+                               }\r
+                       }\r
                },\r
 \r
-               mceRepaint : function() {\r
-                       var s, b, e = this.editor;\r
+               find : function(n, t, s) {\r
+                       var ed = this.editor, w = ed.getDoc().createTreeWalker(n, 4, null, FALSE), c = -1;\r
 \r
-                       if (tinymce.isGecko) {\r
-                               try {\r
-                                       s = e.selection;\r
-                                       b = s.getBookmark(true);\r
+                       while (n = w.nextNode()) {\r
+                               c++;\r
 \r
-                                       if (s.getSel())\r
-                                               s.getSel().selectAllChildren(e.getBody());\r
+                               // Index by node\r
+                               if (t == 0 && n == s)\r
+                                       return c;\r
 \r
-                                       s.collapse(true);\r
-                                       s.moveToBookmark(b);\r
-                               } catch (ex) {\r
-                                       // Ignore\r
-                               }\r
+                               // Node by index\r
+                               if (t == 1 && c == s)\r
+                                       return n;\r
                        }\r
-               },\r
-\r
-               queryStateUnderline : function() {\r
-                       var ed = this.editor, n = ed.selection.getNode();\r
-\r
-                       if (n && n.nodeName == 'A')\r
-                               return false;\r
 \r
-                       return this._queryState('Underline');\r
+                       return -1;\r
                },\r
 \r
-               queryStateOutdent : function() {\r
-                       var ed = this.editor, n;\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
-                       if (ed.settings.inline_styles) {\r
-                               if ((n = ed.dom.getParent(ed.selection.getStart(), ed.dom.isBlock)) && parseInt(n.style.paddingLeft) > 0)\r
-                                       return true;\r
-\r
-                               if ((n = ed.dom.getParent(ed.selection.getEnd(), ed.dom.isBlock)) && parseInt(n.style.paddingLeft) > 0)\r
-                                       return true;\r
-                       }\r
-\r
-                       return this.queryStateInsertUnorderedList() || this.queryStateInsertOrderedList() || (!ed.settings.inline_styles && !!ed.dom.getParent(ed.selection.getNode(), 'BLOCKQUOTE'));\r
-               },\r
+                       // Fix for bug #1863847\r
+                       //if (e && e.keyCode == 13)\r
+                       //      return TRUE;\r
 \r
-               queryStateInsertUnorderedList : function() {\r
-                       return this.editor.dom.getParent(this.editor.selection.getNode(), 'UL');\r
-               },\r
+                       // Wrap non blocks into blocks\r
+                       for (i = nl.length - 1; i >= 0; i--) {\r
+                               nx = nl[i];\r
 \r
-               queryStateInsertOrderedList : function() {\r
-                       return this.editor.dom.getParent(this.editor.selection.getNode(), 'OL');\r
-               },\r
+                               // Ignore internal elements\r
+                               if (nx.nodeType === 1 && nx.getAttribute('_mce_type')) {\r
+                                       bl = null;\r
+                                       continue;\r
+                               }\r
 \r
-               queryStatemceBlockQuote : function() {\r
-                       return !!this.editor.dom.getParent(this.editor.selection.getStart(), function(n) {return n.nodeName === 'BLOCKQUOTE';});\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
+                                                                       // 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
-               _applyInlineStyle : function(na, at, op) {\r
-                       var t = this, ed = t.editor, dom = ed.dom, bm, lo = {}, kh, found;\r
+                                                                       tr = d.body.createTextRange();\r
+                                                                       tr.moveToElementText(b);\r
+                                                                       tr.collapse(1);\r
+                                                                       bp = tr.move('character', c) * -1;\r
 \r
-                       na = na.toUpperCase();\r
+                                                                       tr = r.duplicate();\r
+                                                                       tr.collapse(1);\r
+                                                                       sp = tr.move('character', c) * -1;\r
 \r
-                       if (op && op.check_classes && at['class'])\r
-                               op.check_classes.push(at['class']);\r
+                                                                       tr = r.duplicate();\r
+                                                                       tr.collapse(0);\r
+                                                                       le = (tr.move('character', c) * -1) - sp;\r
 \r
-                       function removeEmpty() {\r
-                               each(dom.select(na).reverse(), function(n) {\r
-                                       var c = 0;\r
+                                                                       si = sp - bp;\r
+                                                                       ei = le;\r
+                                                               }\r
+                                                       }\r
 \r
-                                       // Check if there is any attributes\r
-                                       each(dom.getAttribs(n), function(an) {\r
-                                               if (an.nodeName.substring(0, 1) != '_' && dom.getAttrib(n, an.nodeName) != '') {\r
-                                                       //console.log(dom.getOuterHTML(n), dom.getAttrib(n, an.nodeName));\r
-                                                       c++;\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
-                                       });\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
-                                       // No attributes then remove the element and keep the children\r
-                                       if (c == 0)\r
-                                               dom.remove(n, 1);\r
-                               });\r
-                       };\r
+                       // Restore selection\r
+                       if (si != -2) {\r
+                               if (!isIE) {\r
+                                       bl = b.getElementsByTagName(ed.settings.element)[0];\r
+                                       r = d.createRange();\r
 \r
-                       function replaceFonts() {\r
-                               var bm;\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
-                               each(dom.select('span,font'), function(n) {\r
-                                       if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline') {\r
-                                               if (!bm)\r
-                                                       bm = ed.selection.getBookmark();\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
-                                               at._mce_new = '1';\r
-                                               dom.replace(dom.create(na, at), n, 1);\r
+                                       if (s) {\r
+                                               s.removeAllRanges();\r
+                                               s.addRange(r);\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 && (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
-                               // Remove redundant elements\r
-                               each(dom.select(na + '[_mce_new]'), function(n) {\r
-                                       function removeStyle(n) {\r
-                                               if (n.nodeType == 1) {\r
-                                                       each(at.style, function(v, k) {\r
-                                                               dom.setStyle(n, k, '');\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
-                                                       // Remove spans with the same class or marked classes\r
-                                                       if (at['class'] && n.className && op) {\r
-                                                               each(op.check_classes, function(c) {\r
-                                                                       if (dom.hasClass(n, c))\r
-                                                                               dom.removeClass(n, c);\r
-                                                               });\r
-                                                       }\r
-                                               }\r
-                                       };\r
+               getParentBlock : function(n) {\r
+                       var d = this.dom;\r
 \r
-                                       // Remove specified style information from child elements\r
-                                       each(dom.select(na, n), removeStyle);\r
+                       return d.getParent(n, d.isBlock);\r
+               },\r
 \r
-                                       // Remove the specified style information on parent if current node is only child (IE)\r
-                                       if (n.parentNode && n.parentNode.nodeType == 1 && n.parentNode.childNodes.length == 1)\r
-                                               removeStyle(n.parentNode);\r
+               insertPara : function(e) {\r
+                       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
-                                       // Remove the child elements style info if a parent already has it\r
-                                       dom.getParent(n.parentNode, function(pn) {\r
-                                               if (pn.nodeType == 1) {\r
-                                                       if (at.style) {\r
-                                                               each(at.style, function(v, k) {\r
-                                                                       var sv;\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
+//                             return TRUE;\r
 \r
-                                                                       if (!lo[k] && (sv = dom.getStyle(pn, k))) {\r
-                                                                               if (sv === v)\r
-                                                                                       dom.setStyle(n, k, '');\r
+                       // Setup before range\r
+                       rb = d.createRange();\r
 \r
-                                                                               lo[k] = 1;\r
-                                                                       }\r
-                                                               });\r
-                                                       }\r
+                       // If is before the first block element and in body, then move it into first block element\r
+                       rb.setStart(s.anchorNode, s.anchorOffset);\r
+                       rb.collapse(TRUE);\r
 \r
-                                                       // Remove spans with the same class or marked classes\r
-                                                       if (at['class'] && pn.className && op) {\r
-                                                               each(op.check_classes, function(c) {\r
-                                                                       if (dom.hasClass(pn, c))\r
-                                                                               dom.removeClass(n, c);\r
-                                                               });\r
-                                                       }\r
-                                               }\r
+                       // Setup after range\r
+                       ra = d.createRange();\r
 \r
-                                               return false;\r
-                                       });\r
+                       // If is before the first block element and in body, then move it into first block element\r
+                       ra.setStart(s.focusNode, s.focusOffset);\r
+                       ra.collapse(TRUE);\r
 \r
-                                       n.removeAttribute('_mce_new');\r
-                               });\r
+                       // Setup start/end points\r
+                       dir = rb.compareBoundaryPoints(rb.START_TO_END, ra) < 0;\r
+                       sn = dir ? s.anchorNode : s.focusNode;\r
+                       so = dir ? s.anchorOffset : s.focusOffset;\r
+                       en = dir ? s.focusNode : s.anchorNode;\r
+                       eo = dir ? s.focusOffset : s.anchorOffset;\r
 \r
-                               removeEmpty();\r
-                               ed.selection.moveToBookmark(bm);\r
+                       // If selection is in empty table cell\r
+                       if (sn === en && /^(TD|TH)$/.test(sn.nodeName)) {\r
+                               if (sn.firstChild.nodeName == 'BR')\r
+                                       dom.remove(sn.firstChild); // Remove BR\r
 \r
-                               return !!bm;\r
-                       };\r
+                               // Create two new block elements\r
+                               if (sn.childNodes.length == 0) {\r
+                                       ed.dom.add(sn, se.element, null, '<br />');\r
+                                       aft = ed.dom.add(sn, se.element, null, '<br />');\r
+                               } else {\r
+                                       n = sn.innerHTML;\r
+                                       sn.innerHTML = '';\r
+                                       ed.dom.add(sn, se.element, null, n);\r
+                                       aft = ed.dom.add(sn, se.element, null, '<br />');\r
+                               }\r
 \r
-                       // Create inline elements\r
-                       ed.focus();\r
-                       ed.getDoc().execCommand('FontName', false, 'mceinline');\r
-                       replaceFonts();\r
+                               // Move caret into the last one\r
+                               r = d.createRange();\r
+                               r.selectNodeContents(aft);\r
+                               r.collapse(1);\r
+                               ed.selection.setRng(r);\r
 \r
-                       if (kh = t._applyInlineStyle.keyhandler) {\r
-                               ed.onKeyUp.remove(kh);\r
-                               ed.onKeyPress.remove(kh);\r
-                               ed.onKeyDown.remove(kh);\r
-                               ed.onSetContent.remove(t._applyInlineStyle.chandler);\r
+                               return FALSE;\r
                        }\r
 \r
-                       if (ed.selection.isCollapsed()) {\r
-                               // IE will format the current word so this code can't be executed on that browser\r
-                               if (!isIE) {\r
-                                       each(dom.getParents(ed.selection.getNode(), 'span'), function(n) {\r
-                                               each(at.style, function(v, k) {\r
-                                                       var kv;\r
-\r
-                                                       if (kv = dom.getStyle(n, k)) {\r
-                                                               if (kv == v) {\r
-                                                                       dom.setStyle(n, k, '');\r
-                                                                       found = 2;\r
-                                                                       return false;\r
-                                                               }\r
-\r
-                                                               found = 1;\r
-                                                               return false;\r
-                                                       }\r
-                                               });\r
-\r
-                                               if (found)\r
-                                                       return false;\r
-                                       });\r
-\r
-                                       if (found == 2) {\r
-                                               bm = ed.selection.getBookmark();\r
+                       // If the caret is in an invalid location in FF we need to move it into the first block\r
+                       if (sn == b && en == b && b.firstChild && ed.dom.isBlock(b.firstChild)) {\r
+                               sn = en = sn.firstChild;\r
+                               so = eo = 0;\r
+                               rb = d.createRange();\r
+                               rb.setStart(sn, 0);\r
+                               ra = d.createRange();\r
+                               ra.setStart(en, 0);\r
+                       }\r
 \r
-                                               removeEmpty();\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
+                       en = en.nodeName == "HTML" ? d.body : en; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes\r
+                       en = en.nodeName == "BODY" ? en.firstChild : en;\r
 \r
-                                               ed.selection.moveToBookmark(bm);\r
+                       // Get start and end blocks\r
+                       sb = t.getParentBlock(sn);\r
+                       eb = t.getParentBlock(en);\r
+                       bn = sb ? sb.nodeName : se.element; // Get block name to create\r
 \r
-                                               // Node change needs to be detached since the onselect event\r
-                                               // for the select box will run the onclick handler after onselect call. Todo: Add a nicer fix!\r
-                                               window.setTimeout(function() {\r
-                                                       ed.nodeChanged();\r
-                                               }, 1);\r
+                       // Return inside list use default browser behavior\r
+                       if (n = t.dom.getParent(sb, 'li,pre')) {\r
+                               if (n.nodeName == 'LI')\r
+                                       return splitList(ed.selection, t.dom, n);\r
 \r
-                                               return;\r
-                                       }\r
-                               }\r
+                               return TRUE;\r
+                       }\r
 \r
-                               // Start collecting styles\r
-                               t._pendingStyles = tinymce.extend(t._pendingStyles || {}, at.style);\r
+                       // If caption or absolute layers then always generate new blocks within\r
+                       if (sb && (sb.nodeName == 'CAPTION' || /absolute|relative|fixed/gi.test(dom.getStyle(sb, 'position', 1)))) {\r
+                               bn = se.element;\r
+                               sb = null;\r
+                       }\r
 \r
-                               t._applyInlineStyle.chandler = ed.onSetContent.add(function() {\r
-                                       delete t._pendingStyles;\r
-                               });\r
+                       // If caption or absolute layers then always generate new blocks within\r
+                       if (eb && (eb.nodeName == 'CAPTION' || /absolute|relative|fixed/gi.test(dom.getStyle(sb, 'position', 1)))) {\r
+                               bn = se.element;\r
+                               eb = null;\r
+                       }\r
 \r
-                               t._applyInlineStyle.keyhandler = kh = function(e) {\r
-                                       // Use pending styles\r
-                                       if (t._pendingStyles) {\r
-                                               at.style = t._pendingStyles;\r
-                                               delete t._pendingStyles;\r
-                                       }\r
+                       // Use P instead\r
+                       if (/(TD|TABLE|TH|CAPTION)/.test(bn) || (sb && bn == "DIV" && /left|right/gi.test(dom.getStyle(sb, 'float', 1)))) {\r
+                               bn = se.element;\r
+                               sb = eb = null;\r
+                       }\r
 \r
-                                       if (replaceFonts()) {\r
-                                               ed.onKeyDown.remove(t._applyInlineStyle.keyhandler);\r
-                                               ed.onKeyPress.remove(t._applyInlineStyle.keyhandler);\r
-                                       }\r
+                       // Setup new before and after blocks\r
+                       bef = (sb && sb.nodeName == bn) ? sb.cloneNode(0) : ed.dom.create(bn);\r
+                       aft = (eb && eb.nodeName == bn) ? eb.cloneNode(0) : ed.dom.create(bn);\r
 \r
-                                       if (e.type == 'keyup')\r
-                                               ed.onKeyUp.remove(t._applyInlineStyle.keyhandler);\r
-                               };\r
+                       // Remove id from after clone\r
+                       aft.removeAttribute('id');\r
 \r
-                               ed.onKeyDown.add(kh);\r
-                               ed.onKeyPress.add(kh);\r
-                               ed.onKeyUp.add(kh);\r
-                       } else\r
-                               t._pendingStyles = 0;\r
-               }\r
-       });\r
-})(tinymce);(function(tinymce) {\r
-       tinymce.create('tinymce.UndoManager', {\r
-               index : 0,\r
-               data : null,\r
-               typing : 0,\r
+                       // Is header and cursor is at the end, then force paragraph under\r
+                       if (/^(H[1-6])$/.test(bn) && isAtEnd(r, sb))\r
+                               aft = ed.dom.create(se.element);\r
 \r
-               UndoManager : function(ed) {\r
-                       var t = this, Dispatcher = tinymce.util.Dispatcher;\r
+                       // Find start chop node\r
+                       n = sc = sn;\r
+                       do {\r
+                               if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))\r
+                                       break;\r
 \r
-                       t.editor = ed;\r
-                       t.data = [];\r
-                       t.onAdd = new Dispatcher(this);\r
-                       t.onUndo = new Dispatcher(this);\r
-                       t.onRedo = new Dispatcher(this);\r
-               },\r
+                               sc = n;\r
+                       } while ((n = n.previousSibling ? n.previousSibling : n.parentNode));\r
 \r
-               add : function(l) {\r
-                       var t = this, i, ed = t.editor, b, s = ed.settings, la;\r
+                       // Find end chop node\r
+                       n = ec = en;\r
+                       do {\r
+                               if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))\r
+                                       break;\r
 \r
-                       l = l || {};\r
-                       l.content = l.content || ed.getContent({format : 'raw', no_events : 1});\r
+                               ec = n;\r
+                       } while ((n = n.nextSibling ? n.nextSibling : n.parentNode));\r
 \r
-                       // Add undo level if needed\r
-                       l.content = l.content.replace(/^\s*|\s*$/g, '');\r
-                       la = t.data[t.index > 0 && (t.index == 0 || t.index == t.data.length) ? t.index - 1 : t.index];\r
-                       if (!l.initial && la && l.content == la.content)\r
-                               return null;\r
+                       // Place first chop part into before block element\r
+                       if (sc.nodeName == bn)\r
+                               rb.setStart(sc, 0);\r
+                       else\r
+                               rb.setStartBefore(sc);\r
 \r
-                       // Time to compress\r
-                       if (s.custom_undo_redo_levels) {\r
-                               if (t.data.length > s.custom_undo_redo_levels) {\r
-                                       for (i = 0; i < t.data.length - 1; i++)\r
-                                               t.data[i] = t.data[i + 1];\r
+                       rb.setEnd(sn, so);\r
+                       bef.appendChild(rb.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari\r
 \r
-                                       t.data.length--;\r
-                                       t.index = t.data.length;\r
-                               }\r
+                       // Place secnd chop part within new block element\r
+                       try {\r
+                               ra.setEndAfter(ec);\r
+                       } catch(ex) {\r
+                               //console.debug(s.focusNode, s.focusOffset);\r
                        }\r
 \r
-                       if (s.custom_undo_redo_restore_selection && !l.initial)\r
-                               l.bookmark = b = l.bookmark || ed.selection.getBookmark();\r
+                       ra.setStart(en, eo);\r
+                       aft.appendChild(ra.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari\r
 \r
-                       if (t.index < t.data.length)\r
-                               t.index++;\r
+                       // Create range around everything\r
+                       r = d.createRange();\r
+                       if (!sc.previousSibling && sc.parentNode.nodeName == bn) {\r
+                               r.setStartBefore(sc.parentNode);\r
+                       } else {\r
+                               if (rb.startContainer.nodeName == bn && rb.startOffset == 0)\r
+                                       r.setStartBefore(rb.startContainer);\r
+                               else\r
+                                       r.setStart(rb.startContainer, rb.startOffset);\r
+                       }\r
 \r
-                       // Only initial marked undo levels should be allowed as first item\r
-                       // This to workaround a bug with Firefox and the blur event\r
-                       if (t.data.length === 0 && !l.initial)\r
-                               return null;\r
+                       if (!ec.nextSibling && ec.parentNode.nodeName == bn)\r
+                               r.setEndAfter(ec.parentNode);\r
+                       else\r
+                               r.setEnd(ra.endContainer, ra.endOffset);\r
+\r
+                       // Delete and replace it with new block elements\r
+                       r.deleteContents();\r
 \r
-                       // Add level\r
-                       t.data.length = t.index + 1;\r
-                       t.data[t.index++] = l;\r
+                       if (isOpera)\r
+                               ed.getWin().scrollTo(0, vp.y);\r
 \r
-                       if (l.initial)\r
-                               t.index = 0;\r
+                       // Never wrap blocks in blocks\r
+                       if (bef.firstChild && bef.firstChild.nodeName == bn)\r
+                               bef.innerHTML = bef.firstChild.innerHTML;\r
 \r
-                       // Set initial bookmark use first real undo level\r
-                       if (t.data.length == 2 && t.data[0].initial)\r
-                               t.data[0].bookmark = b;\r
+                       if (aft.firstChild && aft.firstChild.nodeName == bn)\r
+                               aft.innerHTML = aft.firstChild.innerHTML;\r
 \r
-                       t.onAdd.dispatch(t, l);\r
-                       ed.isNotDirty = 0;\r
+                       // Padd empty blocks\r
+                       if (isEmpty(bef))\r
+                               bef.innerHTML = '<br />';\r
 \r
-                       //console.dir(t.data);\r
+                       function appendStyles(e, en) {\r
+                               var nl = [], nn, n, i;\r
 \r
-                       return l;\r
-               },\r
+                               e.innerHTML = '';\r
 \r
-               undo : function() {\r
-                       var t = this, ed = t.editor, l = l, i;\r
+                               // Make clones of style elements\r
+                               if (se.keep_styles) {\r
+                                       n = en;\r
+                                       do {\r
+                                               // We only want style specific elements\r
+                                               if (/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(n.nodeName)) {\r
+                                                       nn = n.cloneNode(FALSE);\r
+                                                       dom.setAttrib(nn, 'id', ''); // Remove ID since it needs to be unique\r
+                                                       nl.push(nn);\r
+                                               }\r
+                                       } while (n = n.parentNode);\r
+                               }\r
+\r
+                               // Append style elements to aft\r
+                               if (nl.length > 0) {\r
+                                       for (i = nl.length - 1, nn = e; i >= 0; i--)\r
+                                               nn = nn.appendChild(nl[i]);\r
 \r
-                       if (t.typing) {\r
-                               t.add();\r
-                               t.typing = 0;\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
+                                       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
+                       };\r
+\r
+                       // Fill empty afterblook with current style\r
+                       if (isEmpty(aft))\r
+                               car = appendStyles(aft, en);\r
+\r
+                       // Opera needs this one backwards for older versions\r
+                       if (isOpera && parseFloat(opera.version()) < 9.5) {\r
+                               r.insertNode(bef);\r
+                               r.insertNode(aft);\r
+                       } else {\r
+                               r.insertNode(aft);\r
+                               r.insertNode(bef);\r
                        }\r
 \r
-                       if (t.index > 0) {\r
-                               // If undo on last index then take snapshot\r
-                               if (t.index == t.data.length && t.index > 1) {\r
-                                       i = t.index;\r
-                                       t.typing = 0;\r
+                       // Normalize\r
+                       aft.normalize();\r
+                       bef.normalize();\r
 \r
-                                       if (!t.add())\r
-                                               t.index = i;\r
+                       function first(n) {\r
+                               return d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, FALSE).nextNode() || n;\r
+                       };\r
 \r
-                                       --t.index;\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
 \r
-                               l = t.data[--t.index];\r
-                               ed.setContent(l.content, {format : 'raw'});\r
-                               ed.selection.moveToBookmark(l.bookmark);\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
 \r
-                               t.onUndo.dispatch(t, l);\r
+                       // Is element within viewport\r
+                       if (y < vp.y || y + ch > 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
 \r
-                       return l;\r
+                       return FALSE;\r
                },\r
 \r
-               redo : function() {\r
-                       var t = this, ed = t.editor, l = null;\r
+               backspaceDelete : function(e, bs) {\r
+                       var t = this, ed = t.editor, b = ed.getBody(), dom = ed.dom, n, se = ed.selection, r = se.getRng(), sc = r.startContainer, n, w, tn, walker;\r
 \r
-                       if (t.index < t.data.length - 1) {\r
-                               l = t.data[++t.index];\r
-                               ed.setContent(l.content, {format : 'raw'});\r
-                               ed.selection.moveToBookmark(l.bookmark);\r
+                       // Delete when caret is behind a element doesn't work correctly on Gecko see #3011651\r
+                       if (!bs && r.collapsed && sc.nodeType == 1 && r.startOffset == sc.childNodes.length) {\r
+                               walker = new tinymce.dom.TreeWalker(sc.lastChild, sc);\r
 \r
-                               t.onRedo.dispatch(t, l);\r
+                               // Walk the dom backwards until we find a text node\r
+                               for (n = sc.lastChild; n; n = walker.prev()) {\r
+                                       if (n.nodeType == 3) {\r
+                                               r.setStart(n, n.nodeValue.length);\r
+                                               r.collapse(true);\r
+                                               se.setRng(r);\r
+                                               return;\r
+                                       }\r
+                               }\r
                        }\r
 \r
-                       return l;\r
-               },\r
+                       // The caret sometimes gets stuck in Gecko if you delete empty paragraphs\r
+                       // This workaround removes the element by hand and moves the caret to the previous element\r
+                       if (sc && ed.dom.isBlock(sc) && !/^(TD|TH)$/.test(sc.nodeName) && bs) {\r
+                               if (sc.childNodes.length == 0 || (sc.childNodes.length == 1 && sc.firstChild.nodeName == 'BR')) {\r
+                                       // Find previous block element\r
+                                       n = sc;\r
+                                       while ((n = n.previousSibling) && !ed.dom.isBlock(n)) ;\r
 \r
-               clear : function() {\r
-                       var t = this;\r
+                                       if (n) {\r
+                                               if (sc != b.firstChild) {\r
+                                                       // Find last text node\r
+                                                       w = ed.dom.doc.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, FALSE);\r
+                                                       while (tn = w.nextNode())\r
+                                                               n = tn;\r
 \r
-                       t.data = [];\r
-                       t.index = 0;\r
-                       t.typing = 0;\r
-                       t.add({initial : true});\r
-               },\r
+                                                       // Place caret at the end of last text node\r
+                                                       r = ed.getDoc().createRange();\r
+                                                       r.setStart(n, n.nodeValue ? n.nodeValue.length : 0);\r
+                                                       r.setEnd(n, n.nodeValue ? n.nodeValue.length : 0);\r
+                                                       se.setRng(r);\r
 \r
-               hasUndo : function() {\r
-                       return this.index != 0 || this.typing;\r
-               },\r
+                                                       // Remove the target container\r
+                                                       ed.dom.remove(sc);\r
+                                               }\r
 \r
-               hasRedo : function() {\r
-                       return this.index < this.data.length - 1;\r
+                                               return Event.cancel(e);\r
+                                       }\r
+                               }\r
+                       }\r
                }\r
-\r
-               });\r
+       });\r
 })(tinymce);\r
+\r
 (function(tinymce) {\r
        // Shorten names\r
-       var Event, isIE, isGecko, isOpera, each, extend;\r
-\r
-       Event = tinymce.dom.Event;\r
-       isIE = tinymce.isIE;\r
-       isGecko = tinymce.isGecko;\r
-       isOpera = tinymce.isOpera;\r
-       each = tinymce.each;\r
-       extend = tinymce.extend;\r
-\r
-       function isEmpty(n) {\r
-               n = n.innerHTML;\r
-               n = n.replace(/<\w+ .*?mce_\w+\"?=.*?>/gi, '-'); // Keep tags with mce_ attribs\r
-               n = n.replace(/<(img|hr|table)/gi, '-'); // Keep these convert them to - chars\r
-               n = n.replace(/<[^>]+>/g, ''); // Remove all tags\r
-\r
-               return n.replace(/[ \t\r\n]+/g, '') == '';\r
-       };\r
+       var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, extend = tinymce.extend;\r
 \r
-       tinymce.create('tinymce.ForceBlocks', {\r
-               ForceBlocks : function(ed) {\r
-                       var t = this, s = ed.settings, elm;\r
+       tinymce.create('tinymce.ControlManager', {\r
+               ControlManager : function(ed, s) {\r
+                       var t = this, i;\r
 \r
+                       s = s || {};\r
                        t.editor = ed;\r
-                       t.dom = ed.dom;\r
-                       elm = (s.forced_root_block || 'p').toLowerCase();\r
-                       s.element = elm.toUpperCase();\r
-\r
-                       ed.onPreInit.add(t.setup, t);\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
+                       t.controls = {};\r
+                       t.onAdd = new tinymce.util.Dispatcher(t);\r
+                       t.onPostRender = new tinymce.util.Dispatcher(t);\r
+                       t.prefix = s.prefix || ed.id + '_';\r
+                       t._cls = {};\r
 \r
-                       function padd(ed, o) {\r
-                               if (isOpera)\r
-                                       o.content = o.content.replace(t.reOpera, '</' + elm + '>');\r
+                       t.onPostRender.add(function() {\r
+                               each(t.controls, function(c) {\r
+                                       c.postRender();\r
+                               });\r
+                       });\r
+               },\r
 \r
-                               o.content = o.content.replace(t.rePadd, '<' + elm + '$1$2$3$4$5$6>\u00a0</' + elm + '>');\r
+               get : function(id) {\r
+                       return this.controls[this.prefix + id] || this.controls[id];\r
+               },\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 = o.content.replace(t.reBR2Nbsp, '<' + elm + '$1$2>\u00a0</' + elm + '>');\r
-                       };\r
+               setActive : function(id, s) {\r
+                       var c = null;\r
 \r
-                       ed.onBeforeSetContent.add(padd);\r
-                       ed.onPostProcess.add(padd);\r
+                       if (c = this.get(id))\r
+                               c.setActive(s);\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
+                       return c;\r
                },\r
 \r
-               setup : function() {\r
-                       var t = this, ed = t.editor, s = ed.settings;\r
+               setDisabled : function(id, s) {\r
+                       var c = null;\r
 \r
-                       // Force root blocks when typing and when getting output\r
-                       if (s.forced_root_block) {\r
-                               ed.onKeyUp.add(t.forceRoots, t);\r
-                               ed.onPreProcess.add(t.forceRoots, t);\r
-                       }\r
+                       if (c = this.get(id))\r
+                               c.setDisabled(s);\r
 \r
-                       if (s.force_br_newlines) {\r
-                               // Force IE to produce BRs on enter\r
-                               if (isIE) {\r
-                                       ed.onKeyPress.add(function(ed, e) {\r
-                                               var n, s = ed.selection;\r
+                       return c;\r
+               },\r
 \r
-                                               if (e.keyCode == 13 && s.getNode().nodeName != 'LI') {\r
-                                                       s.setContent('<br id="__" /> ', {format : 'raw'});\r
-                                                       n = ed.dom.get('__');\r
-                                                       n.removeAttribute('id');\r
-                                                       s.select(n);\r
-                                                       s.collapse();\r
-                                                       return Event.cancel(e);\r
-                                               }\r
-                                       });\r
-                               }\r
+               add : function(c) {\r
+                       var t = this;\r
 \r
-                               return;\r
+                       if (c) {\r
+                               t.controls[c.id] = c;\r
+                               t.onAdd.dispatch(c, t);\r
                        }\r
 \r
-                       if (!isIE && s.force_p_newlines) {\r
-/*                             ed.onPreProcess.add(function(ed, o) {\r
-                                       each(ed.dom.select('br', o.node), function(n) {\r
-                                               var p = n.parentNode;\r
+                       return c;\r
+               },\r
 \r
-                                               // Replace <p><br /></p> with <p>&nbsp;</p>\r
-                                               if (p && p.nodeName == 'p' && (p.childNodes.length == 1 || p.lastChild == n)) {\r
-                                                       p.replaceChild(ed.getDoc().createTextNode('\u00a0'), n);\r
-                                               }\r
-                                       });\r
-                               });*/\r
+               createControl : function(n) {\r
+                       var c, t = this, ed = t.editor;\r
 \r
-                               ed.onKeyPress.add(function(ed, e) {\r
-                                       if (e.keyCode == 13 && !e.shiftKey) {\r
-                                               if (!t.insertPara(e))\r
-                                                       Event.cancel(e);\r
-                                       }\r
-                               });\r
+                       each(ed.plugins, function(p) {\r
+                               if (p.createControl) {\r
+                                       c = p.createControl(n, t);\r
 \r
-                               if (isGecko) {\r
-                                       ed.onKeyDown.add(function(ed, e) {\r
-                                               if ((e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey)\r
-                                                       t.backspaceDelete(e, e.keyCode == 8);\r
-                                       });\r
+                                       if (c)\r
+                                               return false;\r
                                }\r
+                       });\r
+\r
+                       switch (n) {\r
+                               case "|":\r
+                               case "separator":\r
+                                       return t.createSeparator();\r
                        }\r
 \r
-                       function ren(rn, na) {\r
-                               var ne = ed.dom.create(na);\r
+                       if (!c && ed.buttons && (c = ed.buttons[n]))\r
+                               return t.createButton(n, c);\r
 \r
-                               each(rn.attributes, function(a) {\r
-                                       if (a.specified && a.nodeValue)\r
-                                               ne.setAttribute(a.nodeName.toLowerCase(), a.nodeValue);\r
-                               });\r
+                       return t.add(c);\r
+               },\r
 \r
-                               each(rn.childNodes, function(n) {\r
-                                       ne.appendChild(n.cloneNode(true));\r
-                               });\r
+               createDropMenu : function(id, s, cc) {\r
+                       var t = this, ed = t.editor, c, bm, v, cls;\r
 \r
-                               rn.parentNode.replaceChild(ne, rn);\r
+                       s = extend({\r
+                               'class' : 'mceDropDown',\r
+                               constrain : ed.settings.constrain_menus\r
+                       }, s);\r
 \r
-                               return ne;\r
-                       };\r
+                       s['class'] = s['class'] + ' ' + ed.getParam('skin') + 'Skin';\r
+                       if (v = ed.getParam('skin_variant'))\r
+                               s['class'] += ' ' + ed.getParam('skin') + 'Skin' + v.substring(0, 1).toUpperCase() + v.substring(1);\r
 \r
-                       // IE specific fixes\r
-                       if (isIE) {\r
-                               // Remove empty inline elements within block elements\r
-                               // For example: <p><strong><em></em></strong></p>\r
-                               ed.onPreProcess.add(function(ed, o) {\r
-                                       each(ed.dom.select('p,h1,h2,h3,h4,h5,h6,div', o.node), function(p) {\r
-                                               if (isEmpty(p))\r
-                                                       p.innerHTML = '';\r
-                                       });\r
+                       id = t.prefix + id;\r
+                       cls = cc || t._cls.dropmenu || tinymce.ui.DropMenu;\r
+                       c = t.controls[id] = new cls(id, s);\r
+                       c.onAddItem.add(function(c, o) {\r
+                               var s = o.settings;\r
+\r
+                               s.title = ed.getLang(s.title, s.title);\r
+\r
+                               if (!s.onclick) {\r
+                                       s.onclick = function(v) {\r
+                                               if (s.cmd)\r
+                                                       ed.execCommand(s.cmd, s.ui || false, s.value);\r
+                                       };\r
+                               }\r
+                       });\r
+\r
+                       ed.onRemove.add(function() {\r
+                               c.destroy();\r
+                       });\r
+\r
+                       // Fix for bug #1897785, #1898007\r
+                       if (tinymce.isIE) {\r
+                               c.onShowMenu.add(function() {\r
+                                       // IE 8 needs focus in order to store away a range with the current collapsed caret location\r
+                                       ed.focus();\r
+\r
+                                       bm = ed.selection.getBookmark(1);\r
                                });\r
 \r
-                               // Replaces IE:s auto generated paragraphs with the specified element name\r
-                               if (s.element != 'P') {\r
-                                       ed.onKeyPress.add(function(ed, e) {\r
-                                               t.lastElm = ed.selection.getNode().nodeName;\r
-                                       });\r
+                               c.onHideMenu.add(function() {\r
+                                       if (bm) {\r
+                                               ed.selection.moveToBookmark(bm);\r
+                                               bm = 0;\r
+                                       }\r
+                               });\r
+                       }\r
 \r
-                                       ed.onKeyUp.add(function(ed, e) {\r
-                                               var bl, sel = ed.selection, n = sel.getNode(), b = ed.getBody();\r
+                       return t.add(c);\r
+               },\r
 \r
-                                               if (b.childNodes.length === 1 && n.nodeName == 'P') {\r
-                                                       n = ren(n, s.element);\r
-                                                       sel.select(n);\r
-                                                       sel.collapse();\r
-                                                       ed.nodeChanged();\r
-                                               } else if (e.keyCode == 13 && !e.shiftKey && t.lastElm != 'P') {\r
-                                                       bl = ed.dom.getParent(n, 'p');\r
+               createListBox : function(id, s, cc) {\r
+                       var t = this, ed = t.editor, cmd, c, cls;\r
 \r
-                                                       if (bl) {\r
-                                                               ren(bl, s.element);\r
-                                                               ed.nodeChanged();\r
-                                                       }\r
-                                               }\r
+                       if (t.get(id))\r
+                               return null;\r
+\r
+                       s.title = ed.translate(s.title);\r
+                       s.scope = s.scope || ed;\r
+\r
+                       if (!s.onselect) {\r
+                               s.onselect = function(v) {\r
+                                       ed.execCommand(s.cmd, s.ui || false, v || s.value);\r
+                               };\r
+                       }\r
+\r
+                       s = extend({\r
+                               title : s.title,\r
+                               'class' : 'mce_' + id,\r
+                               scope : s.scope,\r
+                               control_manager : t\r
+                       }, s);\r
+\r
+                       id = t.prefix + id;\r
+\r
+                       if (ed.settings.use_native_selects)\r
+                               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
+                       }\r
+\r
+                       t.controls[id] = c;\r
+\r
+                       // Fix focus problem in Safari\r
+                       if (tinymce.isWebKit) {\r
+                               c.onPostRender.add(function(c, n) {\r
+                                       // Store bookmark on mousedown\r
+                                       Event.add(n, 'mousedown', function() {\r
+                                               ed.bookmark = ed.selection.getBookmark(1);\r
                                        });\r
-                               }\r
+\r
+                                       // Restore on focus, since it might be lost\r
+                                       Event.add(n, 'focus', function() {\r
+                                               ed.selection.moveToBookmark(ed.bookmark);\r
+                                               ed.bookmark = null;\r
+                                       });\r
+                               });\r
                        }\r
+\r
+                       if (c.hideMenu)\r
+                               ed.onMouseDown.add(c.hideMenu, c);\r
+\r
+                       return t.add(c);\r
                },\r
 \r
-               find : function(n, t, s) {\r
-                       var ed = this.editor, w = ed.getDoc().createTreeWalker(n, 4, null, false), c = -1;\r
+               createButton : function(id, s, cc) {\r
+                       var t = this, ed = t.editor, o, c, cls;\r
 \r
-                       while (n = w.nextNode()) {\r
-                               c++;\r
+                       if (t.get(id))\r
+                               return null;\r
 \r
-                               // Index by node\r
-                               if (t == 0 && n == s)\r
-                                       return c;\r
+                       s.title = ed.translate(s.title);\r
+                       s.label = ed.translate(s.label);\r
+                       s.scope = s.scope || ed;\r
 \r
-                               // Node by index\r
-                               if (t == 1 && c == s)\r
-                                       return n;\r
+                       if (!s.onclick && !s.menu_button) {\r
+                               s.onclick = function() {\r
+                                       ed.execCommand(s.cmd, s.ui || false, s.value);\r
+                               };\r
                        }\r
 \r
-                       return -1;\r
+                       s = extend({\r
+                               title : s.title,\r
+                               'class' : 'mce_' + id,\r
+                               unavailable_prefix : ed.getLang('unavailable', ''),\r
+                               scope : s.scope,\r
+                               control_manager : t\r
+                       }, s);\r
+\r
+                       id = t.prefix + id;\r
+\r
+                       if (s.menu_button) {\r
+                               cls = cc || t._cls.menubutton || tinymce.ui.MenuButton;\r
+                               c = new cls(id, s);\r
+                               ed.onMouseDown.add(c.hideMenu, c);\r
+                       } else {\r
+                               cls = t._cls.button || tinymce.ui.Button;\r
+                               c = new cls(id, s);\r
+                       }\r
+\r
+                       return t.add(c);\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
+               createMenuButton : function(id, s, cc) {\r
+                       s = s || {};\r
+                       s.menu_button = 1;\r
 \r
-                       // Fix for bug #1863847\r
-                       //if (e && e.keyCode == 13)\r
-                       //      return true;\r
+                       return this.createButton(id, s, cc);\r
+               },\r
 \r
-                       // Wrap non blocks into blocks\r
-                       for (i = nl.length - 1; i >= 0; i--) {\r
-                               nx = nl[i];\r
+               createSplitButton : function(id, s, cc) {\r
+                       var t = this, ed = t.editor, cmd, c, cls;\r
 \r
-                               // Is text or non block element\r
-                               if (nx.nodeType == 3 || (!t.dom.isBlock(nx) && nx.nodeType != 8)) {\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
-                                                                       // 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
-                                                                       tr = d.body.createTextRange();\r
-                                                                       tr.moveToElementText(b);\r
-                                                                       tr.collapse(1);\r
-                                                                       bp = tr.move('character', c) * -1;\r
+                       if (t.get(id))\r
+                               return null;\r
 \r
-                                                                       tr = r.duplicate();\r
-                                                                       tr.collapse(1);\r
-                                                                       sp = tr.move('character', c) * -1;\r
+                       s.title = ed.translate(s.title);\r
+                       s.scope = s.scope || ed;\r
 \r
-                                                                       tr = r.duplicate();\r
-                                                                       tr.collapse(0);\r
-                                                                       le = (tr.move('character', c) * -1) - sp;\r
+                       if (!s.onclick) {\r
+                               s.onclick = function(v) {\r
+                                       ed.execCommand(s.cmd, s.ui || false, v || s.value);\r
+                               };\r
+                       }\r
 \r
-                                                                       si = sp - bp;\r
-                                                                       ei = le;\r
-                                                               }\r
-                                                       }\r
+                       if (!s.onselect) {\r
+                               s.onselect = function(v) {\r
+                                       ed.execCommand(s.cmd, s.ui || false, v || s.value);\r
+                               };\r
+                       }\r
 \r
-                                                       bl = ed.dom.create(ed.settings.forced_root_block);\r
-                                                       bl.appendChild(nx.cloneNode(1));\r
-                                                       nx.parentNode.replaceChild(bl, nx);\r
-                                               }\r
-                                       } else {\r
-                                               if (bl.hasChildNodes())\r
-                                                       bl.insertBefore(nx, bl.firstChild);\r
-                                               else\r
-                                                       bl.appendChild(nx);\r
+                       s = extend({\r
+                               title : s.title,\r
+                               'class' : 'mce_' + id,\r
+                               scope : s.scope,\r
+                               control_manager : t\r
+                       }, s);\r
+\r
+                       id = t.prefix + id;\r
+                       cls = cc || t._cls.splitbutton || tinymce.ui.SplitButton;\r
+                       c = t.add(new cls(id, s));\r
+                       ed.onMouseDown.add(c.hideMenu, c);\r
+\r
+                       return c;\r
+               },\r
+\r
+               createColorSplitButton : function(id, s, cc) {\r
+                       var t = this, ed = t.editor, cmd, c, cls, bm;\r
+\r
+                       if (t.get(id))\r
+                               return null;\r
+\r
+                       s.title = ed.translate(s.title);\r
+                       s.scope = s.scope || ed;\r
+\r
+                       if (!s.onclick) {\r
+                               s.onclick = function(v) {\r
+                                       if (tinymce.isIE)\r
+                                               bm = ed.selection.getBookmark(1);\r
+\r
+                                       ed.execCommand(s.cmd, s.ui || false, v || s.value);\r
+                               };\r
+                       }\r
+\r
+                       if (!s.onselect) {\r
+                               s.onselect = function(v) {\r
+                                       ed.execCommand(s.cmd, s.ui || false, v || s.value);\r
+                               };\r
+                       }\r
+\r
+                       s = extend({\r
+                               title : s.title,\r
+                               'class' : 'mce_' + id,\r
+                               'menu_class' : ed.getParam('skin') + 'Skin',\r
+                               scope : s.scope,\r
+                               more_colors_title : ed.getLang('more_colors')\r
+                       }, s);\r
+\r
+                       id = t.prefix + id;\r
+                       cls = cc || t._cls.colorsplitbutton || tinymce.ui.ColorSplitButton;\r
+                       c = new cls(id, s);\r
+                       ed.onMouseDown.add(c.hideMenu, c);\r
+\r
+                       // Remove the menu element when the editor is removed\r
+                       ed.onRemove.add(function() {\r
+                               c.destroy();\r
+                       });\r
+\r
+                       // Fix for bug #1897785, #1898007\r
+                       if (tinymce.isIE) {\r
+                               c.onShowMenu.add(function() {\r
+                                       // IE 8 needs focus in order to store away a range with the current collapsed caret location\r
+                                       ed.focus();\r
+                                       bm = ed.selection.getBookmark(1);\r
+                               });\r
+\r
+                               c.onHideMenu.add(function() {\r
+                                       if (bm) {\r
+                                               ed.selection.moveToBookmark(bm);\r
+                                               bm = 0;\r
                                        }\r
+                               });\r
+                       }\r
+\r
+                       return t.add(c);\r
+               },\r
+\r
+               createToolbar : function(id, s, cc) {\r
+                       var c, t = this, cls;\r
+\r
+                       id = t.prefix + id;\r
+                       cls = cc || t._cls.toolbar || tinymce.ui.Toolbar;\r
+                       c = new cls(id, s);\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
+\r
+                       return new cls();\r
+               },\r
+\r
+               setControlType : function(n, c) {\r
+                       return this._cls[n.toLowerCase()] = c;\r
+               },\r
+       \r
+               destroy : function() {\r
+                       each(this.controls, function(c) {\r
+                               c.destroy();\r
+                       });\r
+\r
+                       this.controls = null;\r
+               }\r
+       });\r
+})(tinymce);\r
+\r
+(function(tinymce) {\r
+       var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each, isIE = tinymce.isIE, isOpera = tinymce.isOpera;\r
+\r
+       tinymce.create('tinymce.WindowManager', {\r
+               WindowManager : function(ed) {\r
+                       var t = this;\r
+\r
+                       t.editor = ed;\r
+                       t.onOpen = new Dispatcher(t);\r
+                       t.onClose = new Dispatcher(t);\r
+                       t.params = {};\r
+                       t.features = {};\r
+               },\r
+\r
+               open : function(s, p) {\r
+                       var t = this, f = '', x, y, mo = t.editor.settings.dialog_type == 'modal', w, sw, sh, vp = tinymce.DOM.getViewPort(), u;\r
+\r
+                       // Default some options\r
+                       s = s || {};\r
+                       p = p || {};\r
+                       sw = isOpera ? vp.w : screen.width; // Opera uses windows inside the Opera window\r
+                       sh = isOpera ? vp.h : screen.height;\r
+                       s.name = s.name || 'mc_' + new Date().getTime();\r
+                       s.width = parseInt(s.width || 320);\r
+                       s.height = parseInt(s.height || 240);\r
+                       s.resizable = true;\r
+                       s.left = s.left || parseInt(sw / 2.0) - (s.width / 2.0);\r
+                       s.top = s.top || parseInt(sh / 2.0) - (s.height / 2.0);\r
+                       p.inline = false;\r
+                       p.mce_width = s.width;\r
+                       p.mce_height = s.height;\r
+                       p.mce_auto_focus = s.auto_focus;\r
+\r
+                       if (mo) {\r
+                               if (isIE) {\r
+                                       s.center = true;\r
+                                       s.help = false;\r
+                                       s.dialogWidth = s.width + 'px';\r
+                                       s.dialogHeight = s.height + 'px';\r
+                                       s.scroll = s.scrollbars || false;\r
+                               }\r
+                       }\r
+\r
+                       // Build features string\r
+                       each(s, function(v, k) {\r
+                               if (tinymce.is(v, 'boolean'))\r
+                                       v = v ? 'yes' : 'no';\r
+\r
+                               if (!/^(name|url)$/.test(k)) {\r
+                                       if (isIE && mo)\r
+                                               f += (f ? ';' : '') + k + ':' + v;\r
+                                       else\r
+                                               f += (f ? ',' : '') + k + '=' + v;\r
+                               }\r
+                       });\r
+\r
+                       t.features = s;\r
+                       t.params = p;\r
+                       t.onOpen.dispatch(t, s, p);\r
+\r
+                       u = s.url || s.file;\r
+                       u = tinymce._addVer(u);\r
+\r
+                       try {\r
+                               if (isIE && mo) {\r
+                                       w = 1;\r
+                                       window.showModalDialog(u, window, f);\r
                                } else\r
-                                       bl = null; // Time to create new block\r
+                                       w = window.open(u, s.name, f);\r
+                       } catch (ex) {\r
+                               // Ignore\r
                        }\r
 \r
-                       // Restore selection\r
-                       if (si != -2) {\r
-                               if (!isIE) {\r
-                                       bl = b.getElementsByTagName(ed.settings.element)[0];\r
-                                       r = d.createRange();\r
+                       if (!w)\r
+                               alert(t.editor.getLang('popup_blocked'));\r
+               },\r
+\r
+               close : function(w) {\r
+                       w.close();\r
+                       this.onClose.dispatch(this);\r
+               },\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
+               createInstance : function(cl, a, b, c, d, e) {\r
+                       var f = tinymce.resolve(cl);\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
+                       return new f(a, b, c, d, e);\r
+               },\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 && (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
+               confirm : function(t, cb, s, w) {\r
+                       w = w || window;\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
+                       cb.call(s || this, w.confirm(this._decode(this.editor.getLang(t, t))));\r
                },\r
 \r
-               getParentBlock : function(n) {\r
-                       var d = this.dom;\r
+               alert : function(tx, cb, s, w) {\r
+                       var t = this;\r
 \r
-                       return d.getParent(n, d.isBlock);\r
+                       w = w || window;\r
+                       w.alert(t._decode(t.editor.getLang(tx, tx)));\r
+\r
+                       if (cb)\r
+                               cb.call(s || t);\r
                },\r
 \r
-               insertPara : function(e) {\r
-                       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
+               resizeBy : function(dw, dh, win) {\r
+                       win.resizeBy(dw, dh);\r
+               },\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
-//                             return true;\r
+               // Internal functions\r
 \r
-                       // Setup before range\r
-                       rb = d.createRange();\r
+               _decode : function(s) {\r
+                       return tinymce.DOM.decode(s).replace(/\\n/g, '\n');\r
+               }\r
+       });\r
+}(tinymce));\r
+(function(tinymce) {\r
+       function CommandManager() {\r
+               var execCommands = {}, queryStateCommands = {}, queryValueCommands = {};\r
 \r
-                       // If is before the first block element and in body, then move it into first block element\r
-                       rb.setStart(s.anchorNode, s.anchorOffset);\r
-                       rb.collapse(true);\r
+               function add(collection, cmd, func, scope) {\r
+                       if (typeof(cmd) == 'string')\r
+                               cmd = [cmd];\r
 \r
-                       // Setup after range\r
-                       ra = d.createRange();\r
+                       tinymce.each(cmd, function(cmd) {\r
+                               collection[cmd.toLowerCase()] = {func : func, scope : scope};\r
+                       });\r
+               };\r
 \r
-                       // If is before the first block element and in body, then move it into first block element\r
-                       ra.setStart(s.focusNode, s.focusOffset);\r
-                       ra.collapse(true);\r
+               tinymce.extend(this, {\r
+                       add : function(cmd, func, scope) {\r
+                               add(execCommands, cmd, func, scope);\r
+                       },\r
 \r
-                       // Setup start/end points\r
-                       dir = rb.compareBoundaryPoints(rb.START_TO_END, ra) < 0;\r
-                       sn = dir ? s.anchorNode : s.focusNode;\r
-                       so = dir ? s.anchorOffset : s.focusOffset;\r
-                       en = dir ? s.focusNode : s.anchorNode;\r
-                       eo = dir ? s.focusOffset : s.anchorOffset;\r
+                       addQueryStateHandler : function(cmd, func, scope) {\r
+                               add(queryStateCommands, cmd, func, scope);\r
+                       },\r
 \r
-                       // If selection is in empty table cell\r
-                       if (sn === en && /^(TD|TH)$/.test(sn.nodeName)) {\r
-                               dom.remove(sn.firstChild); // Remove BR\r
+                       addQueryValueHandler : function(cmd, func, scope) {\r
+                               add(queryValueCommands, cmd, func, scope);\r
+                       },\r
 \r
-                               // Create two new block elements\r
-                               ed.dom.add(sn, se.element, null, '<br />');\r
-                               aft = ed.dom.add(sn, se.element, null, '<br />');\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
-                               // Move caret into the last one\r
-                               r = d.createRange();\r
-                               r.selectNodeContents(aft);\r
-                               r.collapse(1);\r
-                               ed.selection.setRng(r);\r
+                       queryCommandValue : function() {\r
+                               if (cmd = queryValueCommands[cmd.toLowerCase()])\r
+                                       return cmd.func.call(scope || cmd.scope, ui, value, args);\r
+                       },\r
 \r
-                               return false;\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
-                       // If the caret is in an invalid location in FF we need to move it into the first block\r
-                       if (sn == b && en == b && b.firstChild && ed.dom.isBlock(b.firstChild)) {\r
-                               sn = en = sn.firstChild;\r
-                               so = eo = 0;\r
-                               rb = d.createRange();\r
-                               rb.setStart(sn, 0);\r
-                               ra = d.createRange();\r
-                               ra.setStart(en, 0);\r
-                       }\r
+       tinymce.GlobalCommands = new CommandManager();\r
+})(tinymce);\r
+(function(tinymce) {\r
+       tinymce.Formatter = function(ed) {\r
+               var formats = {},\r
+                       each = tinymce.each,\r
+                       dom = ed.dom,\r
+                       selection = ed.selection,\r
+                       TreeWalker = tinymce.dom.TreeWalker,\r
+                       rangeUtils = new tinymce.dom.RangeUtils(dom),\r
+                       isValid = ed.schema.isValid,\r
+                       isBlock = dom.isBlock,\r
+                       forcedRootBlock = ed.settings.forced_root_block,\r
+                       nodeIndex = dom.nodeIndex,\r
+                       INVISIBLE_CHAR = '\uFEFF',\r
+                       MCE_ATTR_RE = /^(src|href|style)$/,\r
+                       FALSE = false,\r
+                       TRUE = true,\r
+                       undefined,\r
+                       pendingFormats = {apply : [], remove : []};\r
+\r
+               function isArray(obj) {\r
+                       return obj instanceof Array;\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
-                       en = en.nodeName == "HTML" ? d.body : en; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes\r
-                       en = en.nodeName == "BODY" ? en.firstChild : en;\r
+               function getParents(node, selector) {\r
+                       return dom.getParents(node, selector, dom.getRoot());\r
+               };\r
 \r
-                       // Get start and end blocks\r
-                       sb = t.getParentBlock(sn);\r
-                       eb = t.getParentBlock(en);\r
-                       bn = sb ? sb.nodeName : se.element; // Get block name to create\r
+               function isCaretNode(node) {\r
+                       return node.nodeType === 1 && (node.face === 'mceinline' || node.style.fontFamily === 'mceinline');\r
+               };\r
 \r
-                       // Return inside list use default browser behavior\r
-                       if (t.dom.getParent(sb, 'ol,ul,pre'))\r
-                               return true;\r
+               // Public functions\r
 \r
-                       // If caption or absolute layers then always generate new blocks within\r
-                       if (sb && (sb.nodeName == 'CAPTION' || /absolute|relative|fixed/gi.test(dom.getStyle(sb, 'position', 1)))) {\r
-                               bn = se.element;\r
-                               sb = null;\r
-                       }\r
+               function get(name) {\r
+                       return name ? formats[name] : formats;\r
+               };\r
 \r
-                       // If caption or absolute layers then always generate new blocks within\r
-                       if (eb && (eb.nodeName == 'CAPTION' || /absolute|relative|fixed/gi.test(dom.getStyle(sb, 'position', 1)))) {\r
-                               bn = se.element;\r
-                               eb = null;\r
-                       }\r
+               function register(name, format) {\r
+                       if (name) {\r
+                               if (typeof(name) !== 'string') {\r
+                                       each(name, function(format, name) {\r
+                                               register(name, format);\r
+                                       });\r
+                               } else {\r
+                                       // Force format into array and add it to internal collection\r
+                                       format = format.length ? format : [format];\r
+\r
+                                       each(format, function(format) {\r
+                                               // Set deep to false by default on selector formats this to avoid removing\r
+                                               // alignment on images inside paragraphs when alignment is changed on paragraphs\r
+                                               if (format.deep === undefined)\r
+                                                       format.deep = !format.selector;\r
+\r
+                                               // Default to true\r
+                                               if (format.split === undefined)\r
+                                                       format.split = !format.selector || format.inline;\r
+\r
+                                               // Default to true\r
+                                               if (format.remove === undefined && format.selector && !format.inline)\r
+                                                       format.remove = 'none';\r
+\r
+                                               // Mark format as a mixed format inline + block level\r
+                                               if (format.selector && format.inline) {\r
+                                                       format.mixed = true;\r
+                                                       format.block_expand = true;\r
+                                               }\r
 \r
-                       // Use P instead\r
-                       if (/(TD|TABLE|TH|CAPTION)/.test(bn) || (sb && bn == "DIV" && /left|right/gi.test(dom.getStyle(sb, 'float', 1)))) {\r
-                               bn = se.element;\r
-                               sb = eb = null;\r
+                                               // Split classes if needed\r
+                                               if (typeof(format.classes) === 'string')\r
+                                                       format.classes = format.classes.split(/\s+/);\r
+                                       });\r
+\r
+                                       formats[name] = format;\r
+                               }\r
                        }\r
+               };\r
 \r
-                       // Setup new before and after blocks\r
-                       bef = (sb && sb.nodeName == bn) ? sb.cloneNode(0) : ed.dom.create(bn);\r
-                       aft = (eb && eb.nodeName == bn) ? eb.cloneNode(0) : ed.dom.create(bn);\r
+               function apply(name, vars, node) {\r
+                       var formatList = get(name), format = formatList[0], bookmark, rng, i;\r
 \r
-                       // Remove id from after clone\r
-                       aft.removeAttribute('id');\r
+                       function moveStart(rng) {\r
+                               var container = rng.startContainer,\r
+                                       offset = rng.startOffset,\r
+                                       walker, node;\r
 \r
-                       // Is header and cursor is at the end, then force paragraph under\r
-                       if (/^(H[1-6])$/.test(bn) && sn.nodeValue && so == sn.nodeValue.length)\r
-                               aft = ed.dom.create(se.element);\r
+                               // Move startContainer/startOffset in to a suitable node\r
+                               if (container.nodeType == 1 || container.nodeValue === "") {\r
+                                       container = container.nodeType == 1 ? container.childNodes[offset] : container;\r
 \r
-                       // Find start chop node\r
-                       n = sc = sn;\r
-                       do {\r
-                               if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))\r
-                                       break;\r
+                                       // Might fail if the offset is behind the last element in it's container\r
+                                       if (container) {\r
+                                               walker = new TreeWalker(container, container.parentNode);\r
+                                               for (node = walker.current(); node; node = walker.next()) {\r
+                                                       if (node.nodeType == 3 && !isWhiteSpaceNode(node)) {\r
+                                                               rng.setStart(node, 0);\r
+                                                               break;\r
+                                                       }\r
+                                               }\r
+                                       }\r
+                               }\r
 \r
-                               sc = n;\r
-                       } while ((n = n.previousSibling ? n.previousSibling : n.parentNode));\r
+                               return rng;\r
+                       };\r
 \r
-                       // Find end chop node\r
-                       n = ec = en;\r
-                       do {\r
-                               if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))\r
-                                       break;\r
+                       function setElementFormat(elm, fmt) {\r
+                               fmt = fmt || format;\r
 \r
-                               ec = n;\r
-                       } while ((n = n.nextSibling ? n.nextSibling : n.parentNode));\r
+                               if (elm) {\r
+                                       each(fmt.styles, function(value, name) {\r
+                                               dom.setStyle(elm, name, replaceVars(value, vars));\r
+                                       });\r
 \r
-                       // Place first chop part into before block element\r
-                       if (sc.nodeName == bn)\r
-                               rb.setStart(sc, 0);\r
-                       else\r
-                               rb.setStartBefore(sc);\r
+                                       each(fmt.attributes, function(value, name) {\r
+                                               dom.setAttrib(elm, name, replaceVars(value, vars));\r
+                                       });\r
 \r
-                       rb.setEnd(sn, so);\r
-                       bef.appendChild(rb.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari\r
+                                       each(fmt.classes, function(value) {\r
+                                               value = replaceVars(value, vars);\r
 \r
-                       // Place secnd chop part within new block element\r
-                       try {\r
-                               ra.setEndAfter(ec);\r
-                       } catch(ex) {\r
-                               //console.debug(s.focusNode, s.focusOffset);\r
-                       }\r
+                                               if (!dom.hasClass(elm, value))\r
+                                                       dom.addClass(elm, value);\r
+                                       });\r
+                               }\r
+                       };\r
 \r
-                       ra.setStart(en, eo);\r
-                       aft.appendChild(ra.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari\r
+                       function applyRngStyle(rng) {\r
+                               var newWrappers = [], wrapName, wrapElm;\r
 \r
-                       // Create range around everything\r
-                       r = d.createRange();\r
-                       if (!sc.previousSibling && sc.parentNode.nodeName == bn) {\r
-                               r.setStartBefore(sc.parentNode);\r
-                       } else {\r
-                               if (rb.startContainer.nodeName == bn && rb.startOffset == 0)\r
-                                       r.setStartBefore(rb.startContainer);\r
-                               else\r
-                                       r.setStart(rb.startContainer, rb.startOffset);\r
-                       }\r
+                               // Setup wrapper element\r
+                               wrapName = format.inline || format.block;\r
+                               wrapElm = dom.create(wrapName);\r
+                               setElementFormat(wrapElm);\r
 \r
-                       if (!ec.nextSibling && ec.parentNode.nodeName == bn)\r
-                               r.setEndAfter(ec.parentNode);\r
-                       else\r
-                               r.setEnd(ra.endContainer, ra.endOffset);\r
+                               rangeUtils.walk(rng, function(nodes) {\r
+                                       var currentWrapElm;\r
 \r
-                       // Delete and replace it with new block elements\r
-                       r.deleteContents();\r
+                                       function process(node) {\r
+                                               var nodeName = node.nodeName.toLowerCase(), parentName = node.parentNode.nodeName.toLowerCase(), found;\r
 \r
-                       if (isOpera)\r
-                               ed.getWin().scrollTo(0, vp.y);\r
+                                               // Stop wrapping on br elements\r
+                                               if (isEq(nodeName, 'br')) {\r
+                                                       currentWrapElm = 0;\r
+\r
+                                                       // Remove any br elements when we wrap things\r
+                                                       if (format.block)\r
+                                                               dom.remove(node);\r
+\r
+                                                       return;\r
+                                               }\r
+\r
+                                               // If node is wrapper type\r
+                                               if (format.wrapper && matchNode(node, name, vars)) {\r
+                                                       currentWrapElm = 0;\r
+                                                       return;\r
+                                               }\r
+\r
+                                               // Can we rename the block\r
+                                               if (format.block && !format.wrapper && isTextBlock(nodeName)) {\r
+                                                       node = dom.rename(node, wrapName);\r
+                                                       setElementFormat(node);\r
+                                                       newWrappers.push(node);\r
+                                                       currentWrapElm = 0;\r
+                                                       return;\r
+                                               }\r
 \r
-                       // Never wrap blocks in blocks\r
-                       if (bef.firstChild && bef.firstChild.nodeName == bn)\r
-                               bef.innerHTML = bef.firstChild.innerHTML;\r
+                                               // Handle selector patterns\r
+                                               if (format.selector) {\r
+                                                       // Look for matching formats\r
+                                                       each(formatList, function(format) {\r
+                                                               if (dom.is(node, format.selector) && !isCaretNode(node)) {\r
+                                                                       setElementFormat(node, format);\r
+                                                                       found = true;\r
+                                                               }\r
+                                                       });\r
 \r
-                       if (aft.firstChild && aft.firstChild.nodeName == bn)\r
-                               aft.innerHTML = aft.firstChild.innerHTML;\r
+                                                       // Continue processing if a selector match wasn't found and a inline element is defined\r
+                                                       if (!format.inline || found) {\r
+                                                               currentWrapElm = 0;\r
+                                                               return;\r
+                                                       }\r
+                                               }\r
 \r
-                       // Padd empty blocks\r
-                       if (isEmpty(bef))\r
-                               bef.innerHTML = '<br />';\r
+                                               // Is it valid to wrap this item\r
+                                               if (isValid(wrapName, nodeName) && isValid(parentName, wrapName)) {\r
+                                                       // Start wrapping\r
+                                                       if (!currentWrapElm) {\r
+                                                               // Wrap the node\r
+                                                               currentWrapElm = wrapElm.cloneNode(FALSE);\r
+                                                               node.parentNode.insertBefore(currentWrapElm, node);\r
+                                                               newWrappers.push(currentWrapElm);\r
+                                                       }\r
 \r
-                       function appendStyles(e, en) {\r
-                               var nl = [], nn, n, i;\r
+                                                       currentWrapElm.appendChild(node);\r
+                                               } else {\r
+                                                       // Start a new wrapper for possible children\r
+                                                       currentWrapElm = 0;\r
 \r
-                               e.innerHTML = '';\r
+                                                       each(tinymce.grep(node.childNodes), process);\r
 \r
-                               // Make clones of style elements\r
-                               if (se.keep_styles) {\r
-                                       n = en;\r
-                                       do {\r
-                                               // We only want style specific elements\r
-                                               if (/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(n.nodeName)) {\r
-                                                       nn = n.cloneNode(false);\r
-                                                       dom.setAttrib(nn, 'id', ''); // Remove ID since it needs to be unique\r
-                                                       nl.push(nn);\r
+                                                       // End the last wrapper\r
+                                                       currentWrapElm = 0;\r
                                                }\r
-                                       } while (n = n.parentNode);\r
-                               }\r
+                                       };\r
 \r
-                               // Append style elements to aft\r
-                               if (nl.length > 0) {\r
-                                       for (i = nl.length - 1, nn = e; i >= 0; i--)\r
-                                               nn = nn.appendChild(nl[i]);\r
+                                       // Process siblings from range\r
+                                       each(nodes, process);\r
+                               });\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
-                                       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
-                       };\r
+                               // Cleanup\r
+                               each(newWrappers, function(node) {\r
+                                       var childCount;\r
 \r
-                       // Fill empty afterblook with current style\r
-                       if (isEmpty(aft))\r
-                               car = appendStyles(aft, en);\r
+                                       function getChildCount(node) {\r
+                                               var count = 0;\r
 \r
-                       // Opera needs this one backwards for older versions\r
-                       if (isOpera && parseFloat(opera.version()) < 9.5) {\r
-                               r.insertNode(bef);\r
-                               r.insertNode(aft);\r
-                       } else {\r
-                               r.insertNode(aft);\r
-                               r.insertNode(bef);\r
-                       }\r
+                                               each(node.childNodes, function(node) {\r
+                                                       if (!isWhiteSpaceNode(node) && !isBookmarkNode(node))\r
+                                                               count++;\r
+                                               });\r
 \r
-                       // Normalize\r
-                       aft.normalize();\r
-                       bef.normalize();\r
+                                               return count;\r
+                                       };\r
 \r
-                       function first(n) {\r
-                               return d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false).nextNode() || n;\r
-                       };\r
+                                       function mergeStyles(node) {\r
+                                               var child, clone;\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
+                                               each(node.childNodes, function(node) {\r
+                                                       if (node.nodeType == 1 && !isBookmarkNode(node) && !isCaretNode(node)) {\r
+                                                               child = node;\r
+                                                               return FALSE; // break loop\r
+                                                       }\r
+                                               });\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
+                                               // If child was found and of the same type as the current node\r
+                                               if (child && matchName(child, format)) {\r
+                                                       clone = child.cloneNode(FALSE);\r
+                                                       setElementFormat(clone);\r
 \r
-                       // Is element within viewport\r
-                       if (y < vp.y || y + ch > 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
+                                                       dom.replace(clone, node, TRUE);\r
+                                                       dom.remove(child, 1);\r
+                                               }\r
 \r
-                       return false;\r
-               },\r
+                                               return clone || node;\r
+                                       };\r
 \r
-               backspaceDelete : function(e, bs) {\r
-                       var t = this, ed = t.editor, b = ed.getBody(), n, se = ed.selection, r = se.getRng(), sc = r.startContainer, n, w, tn;\r
+                                       childCount = getChildCount(node);\r
 \r
-                       // The caret sometimes gets stuck in Gecko if you delete empty paragraphs\r
-                       // This workaround removes the element by hand and moves the caret to the previous element\r
-                       if (sc && ed.dom.isBlock(sc) && !/^(TD|TH)$/.test(sc.nodeName) && bs) {\r
-                               if (sc.childNodes.length == 0 || (sc.childNodes.length == 1 && sc.firstChild.nodeName == 'BR')) {\r
-                                       // Find previous block element\r
-                                       n = sc;\r
-                                       while ((n = n.previousSibling) && !ed.dom.isBlock(n)) ;\r
+                                       // Remove empty nodes\r
+                                       if (childCount === 0) {\r
+                                               dom.remove(node, 1);\r
+                                               return;\r
+                                       }\r
 \r
-                                       if (n) {\r
-                                               if (sc != b.firstChild) {\r
-                                                       // Find last text node\r
-                                                       w = ed.dom.doc.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);\r
-                                                       while (tn = w.nextNode())\r
-                                                               n = tn;\r
+                                       if (format.inline || format.wrapper) {\r
+                                               // Merges the current node with it's children of similar type to reduce the number of elements\r
+                                               if (!format.exact && childCount === 1)\r
+                                                       node = mergeStyles(node);\r
+\r
+                                               // Remove/merge children\r
+                                               each(formatList, function(format) {\r
+                                                       // Merge all children of similar type will move styles from child to parent\r
+                                                       // 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
+                                                               removeFormat(format, vars, child, format.exact ? child : null);\r
+                                                       });\r
+                                               });\r
 \r
-                                                       // Place caret at the end of last text node\r
-                                                       r = ed.getDoc().createRange();\r
-                                                       r.setStart(n, n.nodeValue ? n.nodeValue.length : 0);\r
-                                                       r.setEnd(n, n.nodeValue ? n.nodeValue.length : 0);\r
-                                                       se.setRng(r);\r
+                                               // Remove child if direct parent is of same type\r
+                                               if (matchNode(node.parentNode, name, vars)) {\r
+                                                       dom.remove(node, 1);\r
+                                                       node = 0;\r
+                                                       return TRUE;\r
+                                               }\r
 \r
-                                                       // Remove the target container\r
-                                                       ed.dom.remove(sc);\r
+                                               // Look for parent with similar style format\r
+                                               if (format.merge_with_parents) {\r
+                                                       dom.getParent(node.parentNode, function(parent) {\r
+                                                               if (matchNode(parent, name, vars)) {\r
+                                                                       dom.remove(node, 1);\r
+                                                                       node = 0;\r
+                                                                       return TRUE;\r
+                                                               }\r
+                                                       });\r
                                                }\r
 \r
-                                               return Event.cancel(e);\r
+                                               // Merge next and previous siblings if they are similar <b>text</b><b>text</b> becomes <b>texttext</b>\r
+                                               if (node) {\r
+                                                       node = mergeSiblings(getNonWhiteSpaceSibling(node), node);\r
+                                                       node = mergeSiblings(node, getNonWhiteSpaceSibling(node, TRUE));\r
+                                               }\r
                                        }\r
+                               });\r
+                       };\r
+\r
+                       if (format) {\r
+                               if (node) {\r
+                                       rng = dom.createRng();\r
+\r
+                                       rng.setStartBefore(node);\r
+                                       rng.setEndAfter(node);\r
+\r
+                                       applyRngStyle(expandRng(rng, formatList));\r
+                               } else {\r
+                                       if (!selection.isCollapsed() || !format.inline) {\r
+                                               // Apply formatting to selection\r
+                                               bookmark = selection.getBookmark();\r
+                                               applyRngStyle(expandRng(selection.getRng(TRUE), formatList));\r
+\r
+                                               selection.moveToBookmark(bookmark);\r
+                                               selection.setRng(moveStart(selection.getRng(TRUE)));\r
+                                               ed.nodeChanged();\r
+                                       } else\r
+                                               performCaretAction('apply', name, vars);\r
                                }\r
                        }\r
+               };\r
 \r
-                       // Gecko generates BR elements here and there, we don't like those so lets remove them\r
-                       function handler(e) {\r
-                               var pr;\r
-\r
-                               e = e.target;\r
+               function remove(name, vars, node) {\r
+                       var formatList = get(name), format = formatList[0], bookmark, i, rng;\r
 \r
-                               // A new BR was created in a block element, remove it\r
-                               if (e && e.parentNode && e.nodeName == 'BR' && (n = t.getParentBlock(e))) {\r
-                                       pr = e.previousSibling;\r
+                       // Merges the styles for each node\r
+                       function process(node) {\r
+                               var children, i, l;\r
 \r
-                                       Event.remove(b, 'DOMNodeInserted', handler);\r
+                               // Grab the children first since the nodelist might be changed\r
+                               children = tinymce.grep(node.childNodes);\r
 \r
-                                       // Is there whitespace at the end of the node before then we might need the pesky BR\r
-                                       // to place the caret at a correct location see bug: #2013943\r
-                                       if (pr && pr.nodeType == 3 && /\s+$/.test(pr.nodeValue))\r
-                                               return;\r
+                               // Process current node\r
+                               for (i = 0, l = formatList.length; i < l; i++) {\r
+                                       if (removeFormat(formatList[i], vars, node, node))\r
+                                               break;\r
+                               }\r
 \r
-                                       // Only remove BR elements that got inserted in the middle of the text\r
-                                       if (e.previousSibling || e.nextSibling)\r
-                                               ed.dom.remove(e);\r
+                               // Process the children\r
+                               if (format.deep) {\r
+                                       for (i = 0, l = children.length; i < l; i++)\r
+                                               process(children[i]);\r
                                }\r
                        };\r
 \r
-                       // Listen for new nodes\r
-                       Event._add(b, 'DOMNodeInserted', handler);\r
+                       function findFormatRoot(container) {\r
+                               var formatRoot;\r
 \r
-                       // Remove listener\r
-                       window.setTimeout(function() {\r
-                               Event._remove(b, 'DOMNodeInserted', handler);\r
-                       }, 1);\r
-               }\r
-       });\r
-})(tinymce);\r
-(function(tinymce) {\r
-       // Shorten names\r
-       var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, extend = tinymce.extend;\r
+                               // Find format root\r
+                               each(getParents(container.parentNode).reverse(), function(parent) {\r
+                                       var format;\r
 \r
-       tinymce.create('tinymce.ControlManager', {\r
-               ControlManager : function(ed, s) {\r
-                       var t = this, i;\r
+                                       // Find format root element\r
+                                       if (!formatRoot && parent.id != '_start' && parent.id != '_end') {\r
+                                               // Is the node matching the format we are looking for\r
+                                               format = matchNode(parent, name, vars);\r
+                                               if (format && format.split !== false)\r
+                                                       formatRoot = parent;\r
+                                       }\r
+                               });\r
 \r
-                       s = s || {};\r
-                       t.editor = ed;\r
-                       t.controls = {};\r
-                       t.onAdd = new tinymce.util.Dispatcher(t);\r
-                       t.onPostRender = new tinymce.util.Dispatcher(t);\r
-                       t.prefix = s.prefix || ed.id + '_';\r
-                       t._cls = {};\r
+                               return formatRoot;\r
+                       };\r
 \r
-                       t.onPostRender.add(function() {\r
-                               each(t.controls, function(c) {\r
-                                       c.postRender();\r
-                               });\r
-                       });\r
-               },\r
+                       function wrapAndSplit(format_root, container, target, split) {\r
+                               var parent, clone, lastClone, firstClone, i, formatRootParent;\r
 \r
-               get : function(id) {\r
-                       return this.controls[this.prefix + id] || this.controls[id];\r
-               },\r
+                               // Format root found then clone formats and split it\r
+                               if (format_root) {\r
+                                       formatRootParent = format_root.parentNode;\r
 \r
-               setActive : function(id, s) {\r
-                       var c = null;\r
+                                       for (parent = container.parentNode; parent && parent != formatRootParent; parent = parent.parentNode) {\r
+                                               clone = parent.cloneNode(FALSE);\r
 \r
-                       if (c = this.get(id))\r
-                               c.setActive(s);\r
+                                               for (i = 0; i < formatList.length; i++) {\r
+                                                       if (removeFormat(formatList[i], vars, clone, clone)) {\r
+                                                               clone = 0;\r
+                                                               break;\r
+                                                       }\r
+                                               }\r
 \r
-                       return c;\r
-               },\r
+                                               // Build wrapper node\r
+                                               if (clone) {\r
+                                                       if (lastClone)\r
+                                                               clone.appendChild(lastClone);\r
 \r
-               setDisabled : function(id, s) {\r
-                       var c = null;\r
+                                                       if (!firstClone)\r
+                                                               firstClone = clone;\r
 \r
-                       if (c = this.get(id))\r
-                               c.setDisabled(s);\r
+                                                       lastClone = clone;\r
+                                               }\r
+                                       }\r
 \r
-                       return c;\r
-               },\r
+                                       // Never split block elements if the format is mixed\r
+                                       if (split && (!format.mixed || !isBlock(format_root)))\r
+                                               container = dom.split(format_root, container);\r
 \r
-               add : function(c) {\r
-                       var t = this;\r
+                                       // Wrap container in cloned formats\r
+                                       if (lastClone) {\r
+                                               target.parentNode.insertBefore(lastClone, target);\r
+                                               firstClone.appendChild(target);\r
+                                       }\r
+                               }\r
 \r
-                       if (c) {\r
-                               t.controls[c.id] = c;\r
-                               t.onAdd.dispatch(c, t);\r
-                       }\r
+                               return container;\r
+                       };\r
 \r
-                       return c;\r
-               },\r
+                       function splitToFormatRoot(container) {\r
+                               return wrapAndSplit(findFormatRoot(container), container, container, true);\r
+                       };\r
 \r
-               createControl : function(n) {\r
-                       var c, t = this, ed = t.editor;\r
+                       function unwrap(start) {\r
+                               var node = dom.get(start ? '_start' : '_end'),\r
+                                       out = node[start ? 'firstChild' : 'lastChild'];\r
 \r
-                       each(ed.plugins, function(p) {\r
-                               if (p.createControl) {\r
-                                       c = p.createControl(n, t);\r
+                               // If the end is placed within the start the result will be removed\r
+                               // So this checks if the out node is a bookmark node if it is it\r
+                               // checks for another more suitable node\r
+                               if (isBookmarkNode(out))\r
+                                       out = out[start ? 'firstChild' : 'lastChild'];\r
 \r
-                                       if (c)\r
-                                               return false;\r
+                               dom.remove(node, true);\r
+\r
+                               return out;\r
+                       };\r
+\r
+                       function removeRngStyle(rng) {\r
+                               var startContainer, endContainer;\r
+\r
+                               rng = expandRng(rng, formatList, TRUE);\r
+\r
+                               if (format.split) {\r
+                                       startContainer = getContainer(rng, TRUE);\r
+                                       endContainer = getContainer(rng);\r
+\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
+\r
+                                               // Split start/end\r
+                                               splitToFormatRoot(startContainer);\r
+                                               splitToFormatRoot(endContainer);\r
+\r
+                                               // Unwrap start/end to get real elements again\r
+                                               startContainer = unwrap(TRUE);\r
+                                               endContainer = unwrap();\r
+                                       } else\r
+                                               startContainer = endContainer = splitToFormatRoot(startContainer);\r
+\r
+                                       // Update range positions since they might have changed after the split operations\r
+                                       rng.startContainer = startContainer.parentNode;\r
+                                       rng.startOffset = nodeIndex(startContainer);\r
+                                       rng.endContainer = endContainer.parentNode;\r
+                                       rng.endOffset = nodeIndex(endContainer) + 1;\r
                                }\r
-                       });\r
 \r
-                       switch (n) {\r
-                               case "|":\r
-                               case "separator":\r
-                                       return t.createSeparator();\r
-                       }\r
+                               // Remove items between start/end\r
+                               rangeUtils.walk(rng, function(nodes) {\r
+                                       each(nodes, function(node) {\r
+                                               process(node);\r
+                                       });\r
+                               });\r
+                       };\r
 \r
-                       if (!c && ed.buttons && (c = ed.buttons[n]))\r
-                               return t.createButton(n, c);\r
+                       // Handle node\r
+                       if (node) {\r
+                               rng = dom.createRng();\r
+                               rng.setStartBefore(node);\r
+                               rng.setEndAfter(node);\r
+                               removeRngStyle(rng);\r
+                               return;\r
+                       }\r
 \r
-                       return t.add(c);\r
-               },\r
+                       if (!selection.isCollapsed() || !format.inline) {\r
+                               bookmark = selection.getBookmark();\r
+                               removeRngStyle(selection.getRng(TRUE));\r
+                               selection.moveToBookmark(bookmark);\r
+                               ed.nodeChanged();\r
+                       } else\r
+                               performCaretAction('remove', name, vars);\r
+               };\r
 \r
-               createDropMenu : function(id, s, cc) {\r
-                       var t = this, ed = t.editor, c, bm, v, cls;\r
+               function toggle(name, vars, node) {\r
+                       if (match(name, vars, node))\r
+                               remove(name, vars, node);\r
+                       else\r
+                               apply(name, vars, node);\r
+               };\r
 \r
-                       s = extend({\r
-                               'class' : 'mceDropDown',\r
-                               constrain : ed.settings.constrain_menus\r
-                       }, s);\r
+               function matchNode(node, name, vars, similar) {\r
+                       var formatList = get(name), format, i, classes;\r
 \r
-                       s['class'] = s['class'] + ' ' + ed.getParam('skin') + 'Skin';\r
-                       if (v = ed.getParam('skin_variant'))\r
-                               s['class'] += ' ' + ed.getParam('skin') + 'Skin' + v.substring(0, 1).toUpperCase() + v.substring(1);\r
+                       function matchItems(node, format, item_name) {\r
+                               var key, value, items = format[item_name], i;\r
 \r
-                       id = t.prefix + id;\r
-                       cls = cc || t._cls.dropmenu || tinymce.ui.DropMenu;\r
-                       c = t.controls[id] = new cls(id, s);\r
-                       c.onAddItem.add(function(c, o) {\r
-                               var s = o.settings;\r
+                               // Check all items\r
+                               if (items) {\r
+                                       // Non indexed object\r
+                                       if (items.length === undefined) {\r
+                                               for (key in items) {\r
+                                                       if (items.hasOwnProperty(key)) {\r
+                                                               if (item_name === 'attributes')\r
+                                                                       value = dom.getAttrib(node, key);\r
+                                                               else\r
+                                                                       value = getStyle(node, key);\r
 \r
-                               s.title = ed.getLang(s.title, s.title);\r
+                                                               if (similar && !value && !format.exact)\r
+                                                                       return;\r
 \r
-                               if (!s.onclick) {\r
-                                       s.onclick = function(v) {\r
-                                               ed.execCommand(s.cmd, s.ui || false, s.value);\r
-                                       };\r
+                                                               if ((!similar || format.exact) && !isEq(value, replaceVars(items[key], vars)))\r
+                                                                       return;\r
+                                                       }\r
+                                               }\r
+                                       } else {\r
+                                               // Only one match needed for indexed arrays\r
+                                               for (i = 0; i < items.length; i++) {\r
+                                                       if (item_name === 'attributes' ? dom.getAttrib(node, items[i]) : getStyle(node, items[i]))\r
+                                                               return format;\r
+                                               }\r
+                                       }\r
                                }\r
-                       });\r
-\r
-                       ed.onRemove.add(function() {\r
-                               c.destroy();\r
-                       });\r
 \r
-                       // Fix for bug #1897785, #1898007\r
-                       if (tinymce.isIE) {\r
-                               c.onShowMenu.add(function() {\r
-                                       // IE 8 needs focus in order to store away a range with the current collapsed caret location\r
-                                       ed.focus();\r
+                               return format;\r
+                       };\r
 \r
-                                       bm = ed.selection.getBookmark(1);\r
-                               });\r
+                       if (formatList && node) {\r
+                               // Check each format in list\r
+                               for (i = 0; i < formatList.length; i++) {\r
+                                       format = formatList[i];\r
+\r
+                                       // Name name, attributes, styles and classes\r
+                                       if (matchName(node, format) && matchItems(node, format, 'attributes') && matchItems(node, format, 'styles')) {\r
+                                               // Match classes\r
+                                               if (classes = format.classes) {\r
+                                                       for (i = 0; i < classes.length; i++) {\r
+                                                               if (!dom.hasClass(node, classes[i]))\r
+                                                                       return;\r
+                                                       }\r
+                                               }\r
 \r
-                               c.onHideMenu.add(function() {\r
-                                       if (bm) {\r
-                                               ed.selection.moveToBookmark(bm);\r
-                                               bm = 0;\r
+                                               return format;\r
                                        }\r
-                               });\r
+                               }\r
                        }\r
+               };\r
 \r
-                       return t.add(c);\r
-               },\r
-\r
-               createListBox : function(id, s, cc) {\r
-                       var t = this, ed = t.editor, cmd, c, cls;\r
+               function match(name, vars, node) {\r
+                       var startNode, i;\r
 \r
-                       if (t.get(id))\r
-                               return null;\r
+                       function matchParents(node) {\r
+                               // Find first node with similar format settings\r
+                               node = dom.getParent(node, function(node) {\r
+                                       return !!matchNode(node, name, vars, true);\r
+                               });\r
 \r
-                       s.title = ed.translate(s.title);\r
-                       s.scope = s.scope || ed;\r
+                               // Do an exact check on the similar format element\r
+                               return matchNode(node, name, vars);\r
+                       };\r
 \r
-                       if (!s.onselect) {\r
-                               s.onselect = function(v) {\r
-                                       ed.execCommand(s.cmd, s.ui || false, v || s.value);\r
-                               };\r
-                       }\r
+                       // Check specified node\r
+                       if (node)\r
+                               return matchParents(node);\r
 \r
-                       s = extend({\r
-                               title : s.title,\r
-                               'class' : 'mce_' + id,\r
-                               scope : s.scope,\r
-                               control_manager : t\r
-                       }, s);\r
+                       // Check pending formats\r
+                       if (selection.isCollapsed()) {\r
+                               for (i = pendingFormats.apply.length - 1; i >= 0; i--) {\r
+                                       if (pendingFormats.apply[i].name == name)\r
+                                               return true;\r
+                               }\r
 \r
-                       id = t.prefix + id;\r
+                               for (i = pendingFormats.remove.length - 1; i >= 0; i--) {\r
+                                       if (pendingFormats.remove[i].name == name)\r
+                                               return false;\r
+                               }\r
 \r
-                       if (ed.settings.use_native_selects)\r
-                               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
+                               return matchParents(selection.getNode());\r
                        }\r
 \r
-                       t.controls[id] = c;\r
-\r
-                       // Fix focus problem in Safari\r
-                       if (tinymce.isWebKit) {\r
-                               c.onPostRender.add(function(c, n) {\r
-                                       // Store bookmark on mousedown\r
-                                       Event.add(n, 'mousedown', function() {\r
-                                               ed.bookmark = ed.selection.getBookmark('simple');\r
-                                       });\r
+                       // Check selected node\r
+                       node = selection.getNode();\r
+                       if (matchParents(node))\r
+                               return TRUE;\r
 \r
-                                       // Restore on focus, since it might be lost\r
-                                       Event.add(n, 'focus', function() {\r
-                                               ed.selection.moveToBookmark(ed.bookmark);\r
-                                               ed.bookmark = null;\r
-                                       });\r
-                               });\r
+                       // Check start node if it's different\r
+                       startNode = selection.getStart();\r
+                       if (startNode != node) {\r
+                               if (matchParents(startNode))\r
+                                       return TRUE;\r
                        }\r
 \r
-                       if (c.hideMenu)\r
-                               ed.onMouseDown.add(c.hideMenu, c);\r
+                       return FALSE;\r
+               };\r
 \r
-                       return t.add(c);\r
-               },\r
+               function matchAll(names, vars) {\r
+                       var startElement, matchedFormatNames = [], checkedMap = {}, i, ni, name;\r
 \r
-               createButton : function(id, s, cc) {\r
-                       var t = this, ed = t.editor, o, c, cls;\r
+                       // If the selection is collapsed then check pending formats\r
+                       if (selection.isCollapsed()) {\r
+                               for (ni = 0; ni < names.length; ni++) {\r
+                                       // If the name is to be removed, then stop it from being added\r
+                                       for (i = pendingFormats.remove.length - 1; i >= 0; i--) {\r
+                                               name = names[ni];\r
 \r
-                       if (t.get(id))\r
-                               return null;\r
+                                               if (pendingFormats.remove[i].name == name) {\r
+                                                       checkedMap[name] = true;\r
+                                                       break;\r
+                                               }\r
+                                       }\r
+                               }\r
 \r
-                       s.title = ed.translate(s.title);\r
-                       s.label = ed.translate(s.label);\r
-                       s.scope = s.scope || ed;\r
+                               // If the format is to be applied\r
+                               for (i = pendingFormats.apply.length - 1; i >= 0; i--) {\r
+                                       for (ni = 0; ni < names.length; ni++) {\r
+                                               name = names[ni];\r
 \r
-                       if (!s.onclick && !s.menu_button) {\r
-                               s.onclick = function() {\r
-                                       ed.execCommand(s.cmd, s.ui || false, s.value);\r
-                               };\r
+                                               if (!checkedMap[name] && pendingFormats.apply[i].name == name) {\r
+                                                       checkedMap[name] = true;\r
+                                                       matchedFormatNames.push(name);\r
+                                               }\r
+                                       }\r
+                               }\r
                        }\r
 \r
-                       s = extend({\r
-                               title : s.title,\r
-                               'class' : 'mce_' + id,\r
-                               unavailable_prefix : ed.getLang('unavailable', ''),\r
-                               scope : s.scope,\r
-                               control_manager : t\r
-                       }, s);\r
-\r
-                       id = t.prefix + id;\r
+                       // Check start of selection for formats\r
+                       startElement = selection.getStart();\r
+                       dom.getParent(startElement, function(node) {\r
+                               var i, name;\r
 \r
-                       if (s.menu_button) {\r
-                               cls = cc || t._cls.menubutton || tinymce.ui.MenuButton;\r
-                               c = new cls(id, s);\r
-                               ed.onMouseDown.add(c.hideMenu, c);\r
-                       } else {\r
-                               cls = t._cls.button || tinymce.ui.Button;\r
-                               c = new cls(id, s);\r
-                       }\r
+                               for (i = 0; i < names.length; i++) {\r
+                                       name = names[i];\r
 \r
-                       return t.add(c);\r
-               },\r
+                                       if (!checkedMap[name] && matchNode(node, name, vars)) {\r
+                                               checkedMap[name] = true;\r
+                                               matchedFormatNames.push(name);\r
+                                       }\r
+                               }\r
+                       });\r
 \r
-               createMenuButton : function(id, s, cc) {\r
-                       s = s || {};\r
-                       s.menu_button = 1;\r
+                       return matchedFormatNames;\r
+               };\r
 \r
-                       return this.createButton(id, s, cc);\r
-               },\r
+               function canApply(name) {\r
+                       var formatList = get(name), startNode, parents, i, x, selector;\r
 \r
-               createSplitButton : function(id, s, cc) {\r
-                       var t = this, ed = t.editor, cmd, c, cls;\r
+                       if (formatList) {\r
+                               startNode = selection.getStart();\r
+                               parents = getParents(startNode);\r
 \r
-                       if (t.get(id))\r
-                               return null;\r
+                               for (x = formatList.length - 1; x >= 0; x--) {\r
+                                       selector = formatList[x].selector;\r
 \r
-                       s.title = ed.translate(s.title);\r
-                       s.scope = s.scope || ed;\r
+                                       // Format is not selector based, then always return TRUE\r
+                                       if (!selector)\r
+                                               return TRUE;\r
 \r
-                       if (!s.onclick) {\r
-                               s.onclick = function(v) {\r
-                                       ed.execCommand(s.cmd, s.ui || false, v || s.value);\r
-                               };\r
+                                       for (i = parents.length - 1; i >= 0; i--) {\r
+                                               if (dom.is(parents[i], selector))\r
+                                                       return TRUE;\r
+                                       }\r
+                               }\r
                        }\r
 \r
-                       if (!s.onselect) {\r
-                               s.onselect = function(v) {\r
-                                       ed.execCommand(s.cmd, s.ui || false, v || s.value);\r
-                               };\r
-                       }\r
+                       return FALSE;\r
+               };\r
 \r
-                       s = extend({\r
-                               title : s.title,\r
-                               'class' : 'mce_' + id,\r
-                               scope : s.scope,\r
-                               control_manager : t\r
-                       }, s);\r
+               // Expose to public\r
+               tinymce.extend(this, {\r
+                       get : get,\r
+                       register : register,\r
+                       apply : apply,\r
+                       remove : remove,\r
+                       toggle : toggle,\r
+                       match : match,\r
+                       matchAll : matchAll,\r
+                       matchNode : matchNode,\r
+                       canApply : canApply\r
+               });\r
 \r
-                       id = t.prefix + id;\r
-                       cls = cc || t._cls.splitbutton || tinymce.ui.SplitButton;\r
-                       c = t.add(new cls(id, s));\r
-                       ed.onMouseDown.add(c.hideMenu, c);\r
+               // Private functions\r
 \r
-                       return c;\r
-               },\r
+               function matchName(node, format) {\r
+                       // Check for inline match\r
+                       if (isEq(node, format.inline))\r
+                               return TRUE;\r
 \r
-               createColorSplitButton : function(id, s, cc) {\r
-                       var t = this, ed = t.editor, cmd, c, cls, bm;\r
+                       // Check for block match\r
+                       if (isEq(node, format.block))\r
+                               return TRUE;\r
 \r
-                       if (t.get(id))\r
-                               return null;\r
+                       // Check for selector match\r
+                       if (format.selector)\r
+                               return dom.is(node, format.selector);\r
+               };\r
 \r
-                       s.title = ed.translate(s.title);\r
-                       s.scope = s.scope || ed;\r
+               function isEq(str1, str2) {\r
+                       str1 = str1 || '';\r
+                       str2 = str2 || '';\r
 \r
-                       if (!s.onclick) {\r
-                               s.onclick = function(v) {\r
-                                       if (tinymce.isIE)\r
-                                               bm = ed.selection.getBookmark(1);\r
-       \r
-                                       ed.execCommand(s.cmd, s.ui || false, v || s.value);\r
-                               };\r
-                       }\r
+                       str1 = '' + (str1.nodeName || str1);\r
+                       str2 = '' + (str2.nodeName || str2);\r
 \r
-                       if (!s.onselect) {\r
-                               s.onselect = function(v) {\r
-                                       ed.execCommand(s.cmd, s.ui || false, v || s.value);\r
-                               };\r
-                       }\r
+                       return str1.toLowerCase() == str2.toLowerCase();\r
+               };\r
 \r
-                       s = extend({\r
-                               title : s.title,\r
-                               'class' : 'mce_' + id,\r
-                               'menu_class' : ed.getParam('skin') + 'Skin',\r
-                               scope : s.scope,\r
-                               more_colors_title : ed.getLang('more_colors')\r
-                       }, s);\r
+               function getStyle(node, name) {\r
+                       var styleVal = dom.getStyle(node, name);\r
 \r
-                       id = t.prefix + id;\r
-                       cls = cc || t._cls.colorsplitbutton || tinymce.ui.ColorSplitButton;\r
-                       c = new cls(id, s);\r
-                       ed.onMouseDown.add(c.hideMenu, c);\r
+                       // Force the format to hex\r
+                       if (name == 'color' || name == 'backgroundColor')\r
+                               styleVal = dom.toHex(styleVal);\r
 \r
-                       // Remove the menu element when the editor is removed\r
-                       ed.onRemove.add(function() {\r
-                               c.destroy();\r
-                       });\r
+                       // Opera will return bold as 700\r
+                       if (name == 'fontWeight' && styleVal == 700)\r
+                               styleVal = 'bold';\r
 \r
-                       // Fix for bug #1897785, #1898007\r
-                       if (tinymce.isIE) {\r
-                               c.onHideMenu.add(function() {\r
-                                       if (bm) {\r
-                                               ed.selection.moveToBookmark(bm);\r
-                                               bm = 0;\r
-                                       }\r
+                       return '' + styleVal;\r
+               };\r
+\r
+               function replaceVars(value, vars) {\r
+                       if (typeof(value) != "string")\r
+                               value = value(vars);\r
+                       else if (vars) {\r
+                               value = value.replace(/%(\w+)/g, function(str, name) {\r
+                                       return vars[name] || str;\r
                                });\r
                        }\r
 \r
-                       return t.add(c);\r
-               },\r
-\r
-               createToolbar : function(id, s, cc) {\r
-                       var c, t = this, cls;\r
-\r
-                       id = t.prefix + id;\r
-                       cls = cc || t._cls.toolbar || tinymce.ui.Toolbar;\r
-                       c = new cls(id, s);\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
+                       return value;\r
+               };\r
 \r
-                       return new cls();\r
-               },\r
+               function isWhiteSpaceNode(node) {\r
+                       return node && node.nodeType === 3 && /^([\s\r\n]+|)$/.test(node.nodeValue);\r
+               };\r
 \r
-               setControlType : function(n, c) {\r
-                       return this._cls[n.toLowerCase()] = c;\r
-               },\r
+               function wrap(node, name, attrs) {\r
+                       var wrapper = dom.create(name, attrs);\r
 \r
-               destroy : function() {\r
-                       each(this.controls, function(c) {\r
-                               c.destroy();\r
-                       });\r
+                       node.parentNode.insertBefore(wrapper, node);\r
+                       wrapper.appendChild(node);\r
 \r
-                       this.controls = null;\r
-               }\r
+                       return wrapper;\r
+               };\r
 \r
-               });\r
-})(tinymce);\r
-(function(tinymce) {\r
-       var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each, isIE = tinymce.isIE, isOpera = tinymce.isOpera;\r
+               function expandRng(rng, format, remove) {\r
+                       var startContainer = rng.startContainer,\r
+                               startOffset = rng.startOffset,\r
+                               endContainer = rng.endContainer,\r
+                               endOffset = rng.endOffset, sibling, lastIdx;\r
 \r
-       tinymce.create('tinymce.WindowManager', {\r
-               WindowManager : function(ed) {\r
-                       var t = this;\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
+                               var parent, child;\r
 \r
-                       t.editor = ed;\r
-                       t.onOpen = new Dispatcher(t);\r
-                       t.onClose = new Dispatcher(t);\r
-                       t.params = {};\r
-                       t.features = {};\r
-               },\r
+                               root = root || dom.getRoot();\r
 \r
-               open : function(s, p) {\r
-                       var t = this, f = '', x, y, mo = t.editor.settings.dialog_type == 'modal', w, sw, sh, vp = tinymce.DOM.getViewPort(), u;\r
+                               for (;;) {\r
+                                       // Check if we can move up are we at root level or body level\r
+                                       parent = container.parentNode;\r
 \r
-                       // Default some options\r
-                       s = s || {};\r
-                       p = p || {};\r
-                       sw = isOpera ? vp.w : screen.width; // Opera uses windows inside the Opera window\r
-                       sh = isOpera ? vp.h : screen.height;\r
-                       s.name = s.name || 'mc_' + new Date().getTime();\r
-                       s.width = parseInt(s.width || 320);\r
-                       s.height = parseInt(s.height || 240);\r
-                       s.resizable = true;\r
-                       s.left = s.left || parseInt(sw / 2.0) - (s.width / 2.0);\r
-                       s.top = s.top || parseInt(sh / 2.0) - (s.height / 2.0);\r
-                       p.inline = false;\r
-                       p.mce_width = s.width;\r
-                       p.mce_height = s.height;\r
-                       p.mce_auto_focus = s.auto_focus;\r
+                                       // Stop expanding on block elements or root depending on format\r
+                                       if (parent == root || (!format[0].block_expand && isBlock(parent)))\r
+                                               return container;\r
 \r
-                       if (mo) {\r
-                               if (isIE) {\r
-                                       s.center = true;\r
-                                       s.help = false;\r
-                                       s.dialogWidth = s.width + 'px';\r
-                                       s.dialogHeight = s.height + 'px';\r
-                                       s.scroll = s.scrollbars || false;\r
-                               }\r
-                       }\r
+                                       for (sibling = parent[child_name]; sibling && sibling != container; sibling = sibling[sibling_name]) {\r
+                                               if (sibling.nodeType == 1 && !isBookmarkNode(sibling))\r
+                                                       return container;\r
 \r
-                       // Build features string\r
-                       each(s, function(v, k) {\r
-                               if (tinymce.is(v, 'boolean'))\r
-                                       v = v ? 'yes' : 'no';\r
+                                               if (sibling.nodeType == 3 && !isWhiteSpaceNode(sibling))\r
+                                                       return container;\r
+                                       }\r
 \r
-                               if (!/^(name|url)$/.test(k)) {\r
-                                       if (isIE && mo)\r
-                                               f += (f ? ';' : '') + k + ':' + v;\r
-                                       else\r
-                                               f += (f ? ',' : '') + k + '=' + v;\r
+                                       container = container.parentNode;\r
                                }\r
-                       });\r
 \r
-                       t.features = s;\r
-                       t.params = p;\r
-                       t.onOpen.dispatch(t, s, p);\r
+                               return container;\r
+                       };\r
 \r
-                       u = s.url || s.file;\r
-                       u = tinymce._addVer(u);\r
+                       // If index based start position then resolve it\r
+                       if (startContainer.nodeType == 1 && startContainer.hasChildNodes()) {\r
+                               lastIdx = startContainer.childNodes.length - 1;\r
+                               startContainer = startContainer.childNodes[startOffset > lastIdx ? lastIdx : startOffset];\r
 \r
-                       try {\r
-                               if (isIE && mo) {\r
-                                       w = 1;\r
-                                       window.showModalDialog(u, window, f);\r
-                               } else\r
-                                       w = window.open(u, s.name, f);\r
-                       } catch (ex) {\r
-                               // Ignore\r
+                               if (startContainer.nodeType == 3)\r
+                                       startOffset = 0;\r
                        }\r
 \r
-                       if (!w)\r
-                               alert(t.editor.getLang('popup_blocked'));\r
-               },\r
+                       // If index based end position then resolve it\r
+                       if (endContainer.nodeType == 1 && endContainer.hasChildNodes()) {\r
+                               lastIdx = endContainer.childNodes.length - 1;\r
+                               endContainer = endContainer.childNodes[endOffset > lastIdx ? lastIdx : endOffset - 1];\r
 \r
-               close : function(w) {\r
-                       w.close();\r
-                       this.onClose.dispatch(this);\r
-               },\r
+                               if (endContainer.nodeType == 3)\r
+                                       endOffset = endContainer.nodeValue.length;\r
+                       }\r
 \r
-               createInstance : function(cl, a, b, c, d, e) {\r
-                       var f = tinymce.resolve(cl);\r
+                       // Exclude bookmark nodes if possible\r
+                       if (isBookmarkNode(startContainer.parentNode))\r
+                               startContainer = startContainer.parentNode;\r
 \r
-                       return new f(a, b, c, d, e);\r
-               },\r
+                       if (isBookmarkNode(startContainer))\r
+                               startContainer = startContainer.nextSibling || startContainer;\r
 \r
-               confirm : function(t, cb, s, w) {\r
-                       w = w || window;\r
+                       if (isBookmarkNode(endContainer.parentNode))\r
+                               endContainer = endContainer.parentNode;\r
 \r
-                       cb.call(s || this, w.confirm(this._decode(this.editor.getLang(t, t))));\r
-               },\r
+                       if (isBookmarkNode(endContainer))\r
+                               endContainer = endContainer.previousSibling || endContainer;\r
 \r
-               alert : function(tx, cb, s, w) {\r
-                       var t = this;\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
+                       // Move start point up the tree\r
+                       if (format[0].inline || format[0].block_expand) {\r
+                               startContainer = findParentContainer(startContainer, 'firstChild', 'nextSibling');\r
+                               endContainer = findParentContainer(endContainer, 'lastChild', 'previousSibling');\r
+                       }\r
 \r
-                       w = w || window;\r
-                       w.alert(t._decode(t.editor.getLang(tx, tx)));\r
+                       // 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
 \r
-                       if (cb)\r
-                               cb.call(s || t);\r
-               },\r
+                                       if (container.nodeType == 3 && container.nodeValue.length == 0 && container[sibling_name])\r
+                                               container = container[sibling_name];\r
 \r
-               // Internal functions\r
+                                       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
+                                                               return parents[i];\r
+                                               }\r
+                                       }\r
 \r
-               _decode : function(s) {\r
-                       return tinymce.DOM.decode(s).replace(/\\n/g, '\n');\r
-               }\r
+                                       return container;\r
+                               };\r
 \r
-               });\r
-}(tinymce));(function(tinymce) {\r
-       tinymce.CommandManager = function() {\r
-               var execCommands = {}, queryStateCommands = {}, queryValueCommands = {};\r
+                               // Find new startContainer/endContainer if there is better one\r
+                               startContainer = findSelectorEndPoint(startContainer, 'previousSibling');\r
+                               endContainer = findSelectorEndPoint(endContainer, 'nextSibling');\r
+                       }\r
 \r
-               function add(collection, cmd, func, scope) {\r
-                       if (typeof(cmd) == 'string')\r
-                               cmd = [cmd];\r
+                       // Expand start/end container to matching block element or text node\r
+                       if (format[0].block || format[0].selector) {\r
+                               function findBlockEndPoint(container, sibling_name, sibling_name2) {\r
+                                       var node;\r
 \r
-                       tinymce.each(cmd, function(cmd) {\r
-                               collection[cmd.toLowerCase()] = {func : func, scope : scope};\r
-                       });\r
-               };\r
+                                       // Expand to block of similar type\r
+                                       if (!format[0].wrapper)\r
+                                               node = dom.getParent(container, format[0].block);\r
 \r
-               tinymce.extend(this, {\r
-                       add : function(cmd, func, scope) {\r
-                               add(execCommands, cmd, func, scope);\r
-                       },\r
+                                       // Expand to first wrappable block element or any block element\r
+                                       if (!node)\r
+                                               node = dom.getParent(container.nodeType == 3 ? container.parentNode : container, isBlock);\r
 \r
-                       addQueryStateHandler : function(cmd, func, scope) {\r
-                               add(queryStateCommands, cmd, func, scope);\r
-                       },\r
+                                       // Exclude inner lists from wrapping\r
+                                       if (node && format[0].wrapper)\r
+                                               node = getParents(node, 'ul,ol').reverse()[0] || node;\r
 \r
-                       addQueryValueHandler : function(cmd, func, scope) {\r
-                               add(queryValueCommands, cmd, func, scope);\r
-                       },\r
+                                       // Didn't find a block element look for first/last wrappable element\r
+                                       if (!node) {\r
+                                               node = container;\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
+                                               while (node[sibling_name] && !isBlock(node[sibling_name])) {\r
+                                                       node = node[sibling_name];\r
+\r
+                                                       // Break on BR but include it will be removed later on\r
+                                                       // we can't remove it now since we need to check if it can be wrapped\r
+                                                       if (isEq(node, 'br'))\r
+                                                               break;\r
+                                               }\r
+                                       }\r
+\r
+                                       return node || container;\r
+                               };\r
+\r
+                               // Find new startContainer/endContainer if there is better one\r
+                               startContainer = findBlockEndPoint(startContainer, 'previousSibling');\r
+                               endContainer = findBlockEndPoint(endContainer, 'nextSibling');\r
+\r
+                               // Non block element then try to expand up the leaf\r
+                               if (format[0].block) {\r
+                                       if (!isBlock(startContainer))\r
+                                               startContainer = findParentContainer(startContainer, 'firstChild', 'nextSibling');\r
+\r
+                                       if (!isBlock(endContainer))\r
+                                               endContainer = findParentContainer(endContainer, 'lastChild', 'previousSibling');\r
                                }\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
+                       // Setup index for startContainer\r
+                       if (startContainer.nodeType == 1) {\r
+                               startOffset = nodeIndex(startContainer);\r
+                               startContainer = startContainer.parentNode;\r
+                       }\r
 \r
-                       queryCommandState : function() {\r
-                               if (cmd = queryStateCommands[cmd.toLowerCase()])\r
-                                       return cmd.func.call(scope || cmd.scope, ui, value, args);\r
+                       // Setup index for endContainer\r
+                       if (endContainer.nodeType == 1) {\r
+                               endOffset = nodeIndex(endContainer) + 1;\r
+                               endContainer = endContainer.parentNode;\r
                        }\r
-               });\r
-       };\r
 \r
-       tinymce.GlobalCommands = new tinymce.CommandManager();\r
-})(tinymce);(function(tinymce) {\r
-       function processRange(dom, start, end, callback) {\r
-               var ancestor, n, startPoint, endPoint, sib;\r
+                       // Return new range like object\r
+                       return {\r
+                               startContainer : startContainer,\r
+                               startOffset : startOffset,\r
+                               endContainer : endContainer,\r
+                               endOffset : endOffset\r
+                       };\r
+               }\r
 \r
-               function findEndPoint(n, c) {\r
-                       do {\r
-                               if (n.parentNode == c)\r
-                                       return n;\r
+               function removeFormat(format, vars, node, compare_node) {\r
+                       var i, attrs, stylesModified;\r
 \r
-                               n = n.parentNode;\r
-                       } while(n);\r
-               };\r
+                       // Check if node matches format\r
+                       if (!matchName(node, format))\r
+                               return FALSE;\r
 \r
-               function process(n) {\r
-                       callback(n);\r
-                       tinymce.walk(n, callback, 'childNodes');\r
-               };\r
+                       // Should we compare with format attribs and styles\r
+                       if (format.remove != 'all') {\r
+                               // Remove styles\r
+                               each(format.styles, function(value, name) {\r
+                                       value = replaceVars(value, vars);\r
 \r
-               // Find common ancestor and end points\r
-               ancestor = dom.findCommonAncestor(start, end);\r
-               startPoint = findEndPoint(start, ancestor) || start;\r
-               endPoint = findEndPoint(end, ancestor) || end;\r
+                                       // Indexed array\r
+                                       if (typeof(name) === 'number') {\r
+                                               name = value;\r
+                                               compare_node = 0;\r
+                                       }\r
 \r
-               // Process left leaf\r
-               for (n = start; n && n != startPoint; n = n.parentNode) {\r
-                       for (sib = n.nextSibling; sib; sib = sib.nextSibling)\r
-                               process(sib);\r
-               }\r
+                                       if (!compare_node || isEq(getStyle(compare_node, name), value))\r
+                                               dom.setStyle(node, name, '');\r
 \r
-               // Process middle from start to end point\r
-               if (startPoint != endPoint) {\r
-                       for (n = startPoint.nextSibling; n && n != endPoint; n = n.nextSibling)\r
-                               process(n);\r
-               } else\r
-                       process(startPoint);\r
-\r
-               // Process right leaf\r
-               for (n = end; n && n != endPoint; n = n.parentNode) {\r
-                       for (sib = n.previousSibling; sib; sib = sib.previousSibling)\r
-                               process(sib);\r
-               }\r
-       };\r
+                                       stylesModified = 1;\r
+                               });\r
+\r
+                               // Remove style attribute if it's empty\r
+                               if (stylesModified && dom.getAttrib(node, 'style') == '') {\r
+                                       node.removeAttribute('style');\r
+                                       node.removeAttribute('_mce_style');\r
+                               }\r
 \r
-       tinymce.GlobalCommands.add('RemoveFormat', function() {\r
-               var ed = this, dom = ed.dom, s = ed.selection, r = s.getRng(1), nodes = [], bm, start, end, sc, so, ec, eo, n;\r
+                               // Remove attributes\r
+                               each(format.attributes, function(value, name) {\r
+                                       var valueOut;\r
 \r
-               function findFormatRoot(n) {\r
-                       var sp;\r
+                                       value = replaceVars(value, vars);\r
 \r
-                       dom.getParent(n, function(n) {\r
-                               if (dom.is(n, ed.getParam('removeformat_selector')))\r
-                                       sp = n;\r
+                                       // Indexed array\r
+                                       if (typeof(name) === 'number') {\r
+                                               name = value;\r
+                                               compare_node = 0;\r
+                                       }\r
 \r
-                               return dom.isBlock(n);\r
-                       }, ed.getBody());\r
+                                       if (!compare_node || isEq(dom.getAttrib(compare_node, name), value)) {\r
+                                               // Keep internal classes\r
+                                               if (name == 'class') {\r
+                                                       value = dom.getAttrib(node, name);\r
+                                                       if (value) {\r
+                                                               // Build new class value where everything is removed except the internal prefixed classes\r
+                                                               valueOut = '';\r
+                                                               each(value.split(/\s+/), function(cls) {\r
+                                                                       if (/mce\w+/.test(cls))\r
+                                                                               valueOut += (valueOut ? ' ' : '') + cls;\r
+                                                               });\r
 \r
-                       return sp;\r
-               };\r
+                                                               // We got some internal classes left\r
+                                                               if (valueOut) {\r
+                                                                       dom.setAttrib(node, name, valueOut);\r
+                                                                       return;\r
+                                                               }\r
+                                                       }\r
+                                               }\r
 \r
-               function collect(n) {\r
-                       if (dom.is(n, ed.getParam('removeformat_selector')))\r
-                               nodes.push(n);\r
-               };\r
+                                               // IE6 has a bug where the attribute doesn't get removed correctly\r
+                                               if (name == "class")\r
+                                                       node.removeAttribute('className');\r
 \r
-               function walk(n) {\r
-                       collect(n);\r
-                       tinymce.walk(n, collect, 'childNodes');\r
-               };\r
+                                               // Remove mce prefixed attributes\r
+                                               if (MCE_ATTR_RE.test(name))\r
+                                                       node.removeAttribute('_mce_' + name);\r
 \r
-               bm = s.getBookmark();\r
-               sc = r.startContainer;\r
-               ec = r.endContainer;\r
-               so = r.startOffset;\r
-               eo = r.endOffset;\r
-               sc = sc.nodeType == 1 ? sc.childNodes[Math.min(so, sc.childNodes.length - 1)] : sc;\r
-               ec = ec.nodeType == 1 ? ec.childNodes[Math.min(so == eo ? eo : eo - 1, ec.childNodes.length - 1)] : ec;\r
+                                               node.removeAttribute(name);\r
+                                       }\r
+                               });\r
 \r
-               // Same container\r
-               if (sc == ec) { // TEXT_NODE\r
-                       start = findFormatRoot(sc);\r
+                               // Remove classes\r
+                               each(format.classes, function(value) {\r
+                                       value = replaceVars(value, vars);\r
 \r
-                       // Handle single text node\r
-                       if (sc.nodeType == 3) {\r
-                               if (start && start.nodeType == 1) { // ELEMENT\r
-                                       n = sc.splitText(so);\r
-                                       n.splitText(eo - so);\r
-                                       dom.split(start, n);\r
+                                       if (!compare_node || dom.hasClass(compare_node, value))\r
+                                               dom.removeClass(node, value);\r
+                               });\r
 \r
-                                       s.moveToBookmark(bm);\r
+                               // Check for non internal attributes\r
+                               attrs = dom.getAttribs(node);\r
+                               for (i = 0; i < attrs.length; i++) {\r
+                                       if (attrs[i].nodeName.indexOf('_') !== 0)\r
+                                               return FALSE;\r
                                }\r
+                       }\r
 \r
-                               return;\r
+                       // Remove the inline child if it's empty for example <b> or <span>\r
+                       if (format.remove != 'none') {\r
+                               removeNode(node, format);\r
+                               return TRUE;\r
                        }\r
+               };\r
 \r
-                       // Handle single element\r
-                       walk(dom.split(start, sc) || sc);\r
-               } else {\r
-                       // Find start/end format root\r
-                       start = findFormatRoot(sc);\r
-                       end = findFormatRoot(ec);\r
+               function removeNode(node, format) {\r
+                       var parentNode = node.parentNode, rootBlockElm;\r
+\r
+                       if (format.block) {\r
+                               if (!forcedRootBlock) {\r
+                                       function find(node, next, inc) {\r
+                                               node = getNonWhiteSpaceSibling(node, next, inc);\r
+\r
+                                               return !node || (node.nodeName == 'BR' || isBlock(node));\r
+                                       };\r
 \r
-                       // Split start text node\r
-                       if (start) {\r
-                               if (sc.nodeType == 3) { // TEXT\r
-                                       // Since IE doesn't support white space nodes in the DOM we need to\r
-                                       // add this invisible character so that the splitText function can split the contents\r
-                                       if (so == sc.nodeValue.length)\r
-                                               sc.nodeValue += '\uFEFF'; // Yet another pesky IE fix\r
+                                       // Append BR elements if needed before we remove the block\r
+                                       if (isBlock(node) && !isBlock(parentNode)) {\r
+                                               if (!find(node, FALSE) && !find(node.firstChild, TRUE, 1))\r
+                                                       node.insertBefore(dom.create('br'), node.firstChild);\r
 \r
-                                       sc = sc.splitText(so);\r
+                                               if (!find(node, TRUE) && !find(node.lastChild, FALSE, 1))\r
+                                                       node.appendChild(dom.create('br'));\r
+                                       }\r
+                               } else {\r
+                                       // Wrap the block in a forcedRootBlock if we are at the root of document\r
+                                       if (parentNode == dom.getRoot()) {\r
+                                               if (!format.list_block || !isEq(node, format.list_block)) {\r
+                                                       each(tinymce.grep(node.childNodes), function(node) {\r
+                                                               if (isValid(forcedRootBlock, node.nodeName.toLowerCase())) {\r
+                                                                       if (!rootBlockElm)\r
+                                                                               rootBlockElm = wrap(node, forcedRootBlock);\r
+                                                                       else\r
+                                                                               rootBlockElm.appendChild(node);\r
+                                                               } else\r
+                                                                       rootBlockElm = 0;\r
+                                                       });\r
+                                               }\r
+                                       }\r
                                }\r
                        }\r
 \r
-                       // Split end text node\r
-                       if (end) {\r
-                               if (ec.nodeType == 3) // TEXT\r
-                                       ec.splitText(eo);\r
-                       }\r
+                       // Never remove nodes that isn't the specified inline element if a selector is specified too\r
+                       if (format.selector && format.inline && !isEq(format.inline, node))\r
+                               return;\r
 \r
-                       // If the start and end format root is the same then we need to wrap\r
-                       // the end node in a span since the split calls might change the reference\r
-                       // Example: <p><b><em>x[yz<span>---</span>12]3</em></b></p>\r
-                       if (start && start == end)\r
-                               dom.replace(dom.create('span', {id : '__end'}, ec.cloneNode(true)), ec);\r
+                       dom.remove(node, 1);\r
+               };\r
 \r
-                       // Split all start containers down to the format root\r
-                       if (start)\r
-                               start = dom.split(start, sc);\r
-                       else\r
-                               start = sc;\r
+               function getNonWhiteSpaceSibling(node, next, inc) {\r
+                       if (node) {\r
+                               next = next ? 'nextSibling' : 'previousSibling';\r
 \r
-                       // If there is a span wrapper use that one instead\r
-                       if (n = dom.get('__end')) {\r
-                               ec = n;\r
-                               end = findFormatRoot(ec);\r
+                               for (node = inc ? node : node[next]; node; node = node[next]) {\r
+                                       if (node.nodeType == 1 || !isWhiteSpaceNode(node))\r
+                                               return node;\r
+                               }\r
                        }\r
+               };\r
 \r
-                       // Split all end containers down to the format root\r
-                       if (end)\r
-                               end = dom.split(end, ec);\r
-                       else\r
-                               end = ec;\r
+               function isBookmarkNode(node) {\r
+                       return node && node.nodeType == 1 && node.getAttribute('_mce_type') == 'bookmark';\r
+               };\r
 \r
-                       // Collect nodes in between\r
-                       processRange(dom, start, end, collect);\r
+               function mergeSiblings(prev, next) {\r
+                       var marker, sibling, tmpSibling;\r
 \r
-                       // Remove invisible character for IE workaround if we find it\r
-                       if (sc.nodeValue == '\uFEFF')\r
-                               sc.nodeValue = '';\r
+                       function compareElements(node1, node2) {\r
+                               // Not the same name\r
+                               if (node1.nodeName != node2.nodeName)\r
+                                       return FALSE;\r
 \r
-                       // Process start/end container elements\r
-                       walk(ec);\r
-                       walk(sc);\r
-               }\r
+                               function getAttribs(node) {\r
+                                       var attribs = {};\r
 \r
-               // Remove all collected nodes\r
-               tinymce.each(nodes, function(n) {\r
-                       dom.remove(n, 1);\r
-               });\r
+                                       each(dom.getAttribs(node), function(attr) {\r
+                                               var name = attr.nodeName.toLowerCase();\r
 \r
-               // Remove leftover wrapper\r
-               dom.remove('__end', 1);\r
+                                               // Don't compare internal attributes or style\r
+                                               if (name.indexOf('_') !== 0 && name !== 'style')\r
+                                                       attribs[name] = dom.getAttrib(node, name);\r
+                                       });\r
 \r
-               s.moveToBookmark(bm);\r
-       });\r
-})(tinymce);\r
-(function(tinymce) {\r
-       tinymce.GlobalCommands.add('mceBlockQuote', function() {\r
-               var ed = this, s = ed.selection, dom = ed.dom, sb, eb, n, bm, bq, r, bq2, i, nl;\r
+                                       return attribs;\r
+                               };\r
 \r
-               function getBQ(e) {\r
-                       return dom.getParent(e, function(n) {return n.nodeName === 'BLOCKQUOTE';});\r
-               };\r
+                               function compareObjects(obj1, obj2) {\r
+                                       var value, name;\r
 \r
-               // Get start/end block\r
-               sb = dom.getParent(s.getStart(), dom.isBlock);\r
-               eb = dom.getParent(s.getEnd(), dom.isBlock);\r
+                                       for (name in obj1) {\r
+                                               // Obj1 has item obj2 doesn't have\r
+                                               if (obj1.hasOwnProperty(name)) {\r
+                                                       value = obj2[name];\r
 \r
-               // Remove blockquote(s)\r
-               if (bq = getBQ(sb)) {\r
-                       if (sb != eb || sb.childNodes.length > 1 || (sb.childNodes.length == 1 && sb.firstChild.nodeName != 'BR'))\r
-                               bm = s.getBookmark();\r
+                                                       // Obj2 doesn't have obj1 item\r
+                                                       if (value === undefined)\r
+                                                               return FALSE;\r
 \r
-                       // Move all elements after the end block into new bq\r
-                       if (getBQ(eb)) {\r
-                               bq2 = bq.cloneNode(false);\r
+                                                       // Obj2 item has a different value\r
+                                                       if (obj1[name] != value)\r
+                                                               return FALSE;\r
 \r
-                               while (n = eb.nextSibling)\r
-                                       bq2.appendChild(n.parentNode.removeChild(n));\r
-                       }\r
+                                                       // Delete similar value\r
+                                                       delete obj2[name];\r
+                                               }\r
+                                       }\r
+\r
+                                       // Check if obj 2 has something obj 1 doesn't have\r
+                                       for (name in obj2) {\r
+                                               // Obj2 has item obj1 doesn't have\r
+                                               if (obj2.hasOwnProperty(name))\r
+                                                       return FALSE;\r
+                                       }\r
 \r
-                       // Add new bq after\r
-                       if (bq2)\r
-                               dom.insertAfter(bq2, bq);\r
+                                       return TRUE;\r
+                               };\r
 \r
-                       // Move all selected blocks after the current bq\r
-                       nl = s.getSelectedBlocks(sb, eb);\r
-                       for (i = nl.length - 1; i >= 0; i--) {\r
-                               dom.insertAfter(nl[i], bq);\r
-                       }\r
+                               // Attribs are not the same\r
+                               if (!compareObjects(getAttribs(node1), getAttribs(node2)))\r
+                                       return FALSE;\r
 \r
-                       // Empty bq, then remove it\r
-                       if (/^\s*$/.test(bq.innerHTML))\r
-                               dom.remove(bq, 1); // Keep children so boomark restoration works correctly\r
+                               // Styles are not the same\r
+                               if (!compareObjects(dom.parseStyle(dom.getAttrib(node1, 'style')), dom.parseStyle(dom.getAttrib(node2, 'style'))))\r
+                                       return FALSE;\r
 \r
-                       // Empty bq, then remote it\r
-                       if (bq2 && /^\s*$/.test(bq2.innerHTML))\r
-                               dom.remove(bq2, 1); // Keep children so boomark restoration works correctly\r
+                               return TRUE;\r
+                       };\r
 \r
-                       if (!bm) {\r
-                               // Move caret inside empty block element\r
-                               if (!tinymce.isIE) {\r
-                                       r = ed.getDoc().createRange();\r
-                                       r.setStart(sb, 0);\r
-                                       r.setEnd(sb, 0);\r
-                                       s.setRng(r);\r
-                               } else {\r
-                                       s.select(sb);\r
-                                       s.collapse(0);\r
+                       // Check if next/prev exists and that they are elements\r
+                       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
+                                                       return node;\r
 \r
-                                       // IE misses the empty block some times element so we must move back the caret\r
-                                       if (dom.getParent(s.getStart(), dom.isBlock) != sb) {\r
-                                               r = s.getRng();\r
-                                               r.move('character', -1);\r
-                                               r.select();\r
+                                               if (sibling.nodeType == 1 && !isBookmarkNode(sibling))\r
+                                                       return sibling;\r
                                        }\r
-                               }\r
-                       } else\r
-                               ed.selection.moveToBookmark(bm);\r
 \r
-                       return;\r
-               }\r
+                                       return node;\r
+                               };\r
 \r
-               // Since IE can start with a totally empty document we need to add the first bq and paragraph\r
-               if (tinymce.isIE && !sb && !eb) {\r
-                       ed.getDoc().execCommand('Indent');\r
-                       n = getBQ(s.getNode());\r
-                       n.style.margin = n.dir = ''; // IE adds margin and dir to bq\r
-                       return;\r
-               }\r
+                               // If previous sibling is empty then jump over it\r
+                               prev = findElementSibling(prev, 'previousSibling');\r
+                               next = findElementSibling(next, 'nextSibling');\r
+\r
+                               // Compare next and previous nodes\r
+                               if (compareElements(prev, next)) {\r
+                                       // Append nodes between\r
+                                       for (sibling = prev.nextSibling; sibling && sibling != next;) {\r
+                                               tmpSibling = sibling;\r
+                                               sibling = sibling.nextSibling;\r
+                                               prev.appendChild(tmpSibling);\r
+                                       }\r
 \r
-               if (!sb || !eb)\r
-                       return;\r
+                                       // Remove next node\r
+                                       dom.remove(next);\r
 \r
-               // If empty paragraph node then do not use bookmark\r
-               if (sb != eb || sb.childNodes.length > 1 || (sb.childNodes.length == 1 && sb.firstChild.nodeName != 'BR'))\r
-                       bm = s.getBookmark();\r
+                                       // Move children into prev node\r
+                                       each(tinymce.grep(next.childNodes), function(node) {\r
+                                               prev.appendChild(node);\r
+                                       });\r
 \r
-               // Move selected block elements into a bq\r
-               tinymce.each(s.getSelectedBlocks(getBQ(s.getStart()), getBQ(s.getEnd())), function(e) {\r
-                       // Found existing BQ add to this one\r
-                       if (e.nodeName == 'BLOCKQUOTE' && !bq) {\r
-                               bq = e;\r
-                               return;\r
+                                       return prev;\r
+                               }\r
                        }\r
 \r
-                       // No BQ found, create one\r
-                       if (!bq) {\r
-                               bq = dom.create('blockquote');\r
-                               e.parentNode.insertBefore(bq, e);\r
+                       return next;\r
+               };\r
+\r
+               function isTextBlock(name) {\r
+                       return /^(h[1-6]|p|div|pre|address|dl|dt|dd)$/.test(name);\r
+               };\r
+\r
+               function getContainer(rng, start) {\r
+                       var container, offset, lastIdx;\r
+\r
+                       container = rng[start ? 'startContainer' : 'endContainer'];\r
+                       offset = rng[start ? 'startOffset' : 'endOffset'];\r
+\r
+                       if (container.nodeType == 1) {\r
+                               lastIdx = container.childNodes.length - 1;\r
+\r
+                               if (!start && offset)\r
+                                       offset--;\r
+\r
+                               container = container.childNodes[offset > lastIdx ? lastIdx : offset];\r
                        }\r
 \r
-                       // Add children from existing BQ\r
-                       if (e.nodeName == 'BLOCKQUOTE' && bq) {\r
-                               n = e.firstChild;\r
+                       return container;\r
+               };\r
 \r
-                               while (n) {\r
-                                       bq.appendChild(n.cloneNode(true));\r
-                                       n = n.nextSibling;\r
-                               }\r
+               function performCaretAction(type, name, vars) {\r
+                       var i, currentPendingFormats = pendingFormats[type],\r
+                               otherPendingFormats = pendingFormats[type == 'apply' ? 'remove' : 'apply'];\r
 \r
-                               dom.remove(e);\r
-                               return;\r
+                       function hasPending() {\r
+                               return pendingFormats.apply.length || pendingFormats.remove.length;\r
+                       };\r
+\r
+                       function resetPending() {\r
+                               pendingFormats.apply = [];\r
+                               pendingFormats.remove = [];\r
+                       };\r
+\r
+                       function perform(caret_node) {\r
+                               // Apply pending formats\r
+                               each(pendingFormats.apply.reverse(), function(item) {\r
+                                       apply(item.name, item.vars, caret_node);\r
+                               });\r
+\r
+                               // Remove pending formats\r
+                               each(pendingFormats.remove.reverse(), function(item) {\r
+                                       remove(item.name, item.vars, caret_node);\r
+                               });\r
+\r
+                               dom.remove(caret_node, 1);\r
+                               resetPending();\r
+                       };\r
+\r
+                       // Check if it already exists then ignore it\r
+                       for (i = currentPendingFormats.length - 1; i >= 0; i--) {\r
+                               if (currentPendingFormats[i].name == name)\r
+                                       return;\r
                        }\r
 \r
-                       // Add non BQ element to BQ\r
-                       bq.appendChild(dom.remove(e));\r
-               });\r
+                       currentPendingFormats.push({name : name, vars : vars});\r
 \r
-               if (!bm) {\r
-                       // Move caret inside empty block element\r
-                       if (!tinymce.isIE) {\r
-                               r = ed.getDoc().createRange();\r
-                               r.setStart(sb, 0);\r
-                               r.setEnd(sb, 0);\r
-                               s.setRng(r);\r
-                       } else {\r
-                               s.select(sb);\r
-                               s.collapse(1);\r
+                       // Check if it's in the other type, then remove it\r
+                       for (i = otherPendingFormats.length - 1; i >= 0; i--) {\r
+                               if (otherPendingFormats[i].name == name)\r
+                                       otherPendingFormats.splice(i, 1);\r
                        }\r
-               } else\r
-                       s.moveToBookmark(bm);\r
-       });\r
-})(tinymce);\r
-(function(tinymce) {\r
-       tinymce.each(['Cut', 'Copy', 'Paste'], function(cmd) {\r
-               tinymce.GlobalCommands.add(cmd, function() {\r
-                       var ed = this, doc = ed.getDoc();\r
 \r
-                       try {\r
-                               doc.execCommand(cmd, false, null);\r
+                       // Pending apply or remove formats\r
+                       if (hasPending()) {\r
+                               ed.getDoc().execCommand('FontName', false, 'mceinline');\r
+                               pendingFormats.lastRng = selection.getRng();\r
 \r
-                               // On WebKit the command will just be ignored if it's not enabled\r
-                               if (!doc.queryCommandSupported(cmd))\r
-                                       throw 'Error';\r
-                       } catch (ex) {\r
-                               ed.windowManager.alert(ed.getLang('clipboard_no_support'));\r
+                               // IE will convert the current word\r
+                               each(dom.select('font,span'), function(node) {\r
+                                       var bookmark;\r
+\r
+                                       if (isCaretNode(node)) {\r
+                                               bookmark = selection.getBookmark();\r
+                                               perform(node);\r
+                                               selection.moveToBookmark(bookmark);\r
+                                               ed.nodeChanged();\r
+                                       }\r
+                               });\r
+\r
+                               // Only register listeners once if we need to\r
+                               if (!pendingFormats.isListening && hasPending()) {\r
+                                       pendingFormats.isListening = true;\r
+\r
+                                       each('onKeyDown,onKeyUp,onKeyPress,onMouseUp'.split(','), function(event) {\r
+                                               ed[event].addToTop(function(ed, e) {\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
+                                                               each(dom.select('font,span'), function(node) {\r
+                                                                       var textNode, rng;\r
+\r
+                                                                       // Look for marker\r
+                                                                       if (isCaretNode(node)) {\r
+                                                                               textNode = node.firstChild;\r
+\r
+                                                                               if (textNode) {\r
+                                                                                       perform(node);\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
+                                                                                       dom.remove(node);\r
+                                                                       }\r
+                                                               });\r
+\r
+                                                               // Always unbind and clear pending styles on keyup\r
+                                                               if (e.type == 'keyup' || e.type == 'mouseup')\r
+                                                                       resetPending();\r
+                                                       }\r
+                                               });\r
+                                       });\r
+                               }\r
                        }\r
-               });\r
-       });\r
+               };\r
+       };\r
 })(tinymce);\r
-(function(tinymce) {\r
-       tinymce.GlobalCommands.add('InsertHorizontalRule', function() {\r
-               if (tinymce.isOpera)\r
-                       return this.getDoc().execCommand('InsertHorizontalRule', false, '');\r
 \r
-               this.selection.setContent('<hr />');\r
-       });\r
-})(tinymce);\r
-(function() {\r
-       var cmds = tinymce.GlobalCommands;\r
+tinymce.onAddEditor.add(function(tinymce, ed) {\r
+       var filters, fontSizes, dom, settings = ed.settings;\r
 \r
-       cmds.add(['mceEndUndoLevel', 'mceAddUndoLevel'], function() {\r
-               this.undoManager.add();\r
-       });\r
+       if (settings.inline_styles) {\r
+               fontSizes = tinymce.explode(settings.font_size_style_values);\r
 \r
-       cmds.add('Undo', function() {\r
-               var ed = this;\r
+               function replaceWithSpan(node, styles) {\r
+                       dom.replace(dom.create('span', {\r
+                               style : styles\r
+                       }), node, 1);\r
+               };\r
 \r
-               if (ed.settings.custom_undo_redo) {\r
-                       ed.undoManager.undo();\r
-                       ed.nodeChanged();\r
-                       return true;\r
-               }\r
+               filters = {\r
+                       font : function(dom, node) {\r
+                               replaceWithSpan(node, {\r
+                                       backgroundColor : node.style.backgroundColor,\r
+                                       color : node.color,\r
+                                       fontFamily : node.face,\r
+                                       fontSize : fontSizes[parseInt(node.size) - 1]\r
+                               });\r
+                       },\r
 \r
-               return false; // Run browser command\r
-       });\r
+                       u : function(dom, node) {\r
+                               replaceWithSpan(node, {\r
+                                       textDecoration : 'underline'\r
+                               });\r
+                       },\r
 \r
-       cmds.add('Redo', function() {\r
-               var ed = this;\r
+                       strike : function(dom, node) {\r
+                               replaceWithSpan(node, {\r
+                                       textDecoration : 'line-through'\r
+                               });\r
+                       }\r
+               };\r
 \r
-               if (ed.settings.custom_undo_redo) {\r
-                       ed.undoManager.redo();\r
-                       ed.nodeChanged();\r
-                       return true;\r
-               }\r
+               function convert(editor, params) {\r
+                       dom = editor.dom;\r
+\r
+                       if (settings.convert_fonts_to_spans) {\r
+                               tinymce.each(dom.select('font,u,strike', params.node), function(node) {\r
+                                       filters[node.nodeName.toLowerCase()](ed.dom, node);\r
+                               });\r
+                       }\r
+               };\r
+\r
+               ed.onPreProcess.add(convert);\r
+\r
+               ed.onInit.add(function() {\r
+                       ed.selection.onSetContent.add(convert);\r
+               });\r
+       }\r
+});\r
 \r
-               return false; // Run browser command\r
-       });\r
-})();\r