]> git.donarmstrong.com Git - roundcube.git/blobdiff - program/js/tiny_mce/tiny_mce_src.js
Imported Upstream version 0.3
[roundcube.git] / program / js / tiny_mce / tiny_mce_src.js
index a4fa1a61ed889c554fef0879b45027e4307836c8..48384991576f30173e4f68eb64106f4634ee87a9 100644 (file)
@@ -1,27 +1,25 @@
-\r
-/* file:jscripts/tiny_mce/classes/tinymce.js */\r
-\r
 var tinymce = {\r
        majorVersion : '3',\r
-       minorVersion : '0.6.2',\r
-       releaseDate : '2008-04-07',\r
+       minorVersion : '2.3',\r
+       releaseDate : '2009-04-23',\r
 \r
        _init : function() {\r
-               var t = this, ua = navigator.userAgent, i, nl, n, base;\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 = window.opera && opera.buildNumber;\r
+               t.isOpera = w.opera && opera.buildNumber;\r
                t.isWebKit = /WebKit/.test(ua);\r
-               t.isOldWebKit = t.isWebKit && !window.getSelection().getRangeAt;\r
-               t.isIE = !t.isWebKit && !t.isOpera && (/MSIE/gi).test(ua) && (/Explorer/gi).test(navigator.appName);\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 (window.tinyMCEPreInit) {\r
+               if (w.tinyMCEPreInit) {\r
                        t.suffix = tinyMCEPreInit.suffix;\r
                        t.baseURL = tinyMCEPreInit.base;\r
+                       t.query = tinyMCEPreInit.query;\r
                        return;\r
                }\r
 \r
@@ -29,10 +27,15 @@ var tinymce = {
                t.suffix = '';\r
 \r
                // If base element found, add that infront of baseURL\r
-               nl = document.getElementsByTagName('base');\r
+               nl = d.getElementsByTagName('base');\r
                for (i=0; i<nl.length; i++) {\r
-                       if (nl[i].href)\r
-                               base = nl[i].href;\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
@@ -40,6 +43,9 @@ var tinymce = {
                                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
@@ -53,14 +59,14 @@ var tinymce = {
                };\r
 \r
                // Check document\r
-               nl = document.getElementsByTagName('script');\r
+               nl = d.getElementsByTagName('script');\r
                for (i=0; i<nl.length; i++) {\r
                        if (getBase(nl[i]))\r
                                return;\r
                }\r
 \r
                // Check head\r
-               n = document.getElementsByTagName('head')[0];\r
+               n = d.getElementsByTagName('head')[0];\r
                if (n) {\r
                        nl = n.getElementsByTagName('script');\r
                        for (i=0; i<nl.length; i++) {\r
@@ -78,13 +84,12 @@ var tinymce = {
                if (!t)\r
                        return n != 'undefined';\r
 \r
-               if (t == 'array' && (o instanceof Array))\r
+               if (t == 'array' && (o.hasOwnProperty && o instanceof Array))\r
                        return true;\r
 \r
                return n == t;\r
        },\r
 \r
-       // #if !jquery\r
 \r
        each : function(o, cb, s) {\r
                var n, l;\r
@@ -166,7 +171,6 @@ var tinymce = {
                return (s ? '' + s : '').replace(/^\s*|\s*$/g, '');\r
        },\r
 \r
-       // #endif\r
 \r
        create : function(s, p) {\r
                var t = this, sp, ns, cn, scn, c, de = 0;\r
@@ -303,40 +307,74 @@ var tinymce = {
        },\r
 \r
        addUnload : function(f, s) {\r
-               var t = this, w = window, unload;\r
+               var t = this, w = window;\r
 \r
                f = {func : f, scope : s || this};\r
 \r
                if (!t.unloads) {\r
-                       unload = function() {\r
+                       function unload() {\r
                                var li = t.unloads, o, n;\r
 \r
-                               // Call unload handlers\r
-                               for (n in li) {\r
-                                       o = li[n];\r
+                               if (li) {\r
+                                       // Call unload handlers\r
+                                       for (n in li) {\r
+                                               o = li[n];\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
+\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
 \r
-                                       if (o && o.func)\r
-                                               o.func.call(o.scope, 1); // Send in one arg to distinct unload and user destroy\r
+                                       // Destroy references\r
+                                       t.unloads = o = li = w = unload = 0;\r
+\r
+                                       // Run garbarge collector on IE\r
+                                       if (window.CollectGarbage)\r
+                                               window.CollectGarbage();\r
                                }\r
+                       };\r
+\r
+                       function fakeUnload() {\r
+                               var d = document;\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
-                               // Detach unload function\r
-                               if (w.detachEvent)\r
-                                       w.detachEvent('onunload', unload);\r
-                               else if (w.removeEventListener)\r
-                                       w.removeEventListener('unload', unload, false);\r
+                                               // Call unload handler\r
+                                               if (unload)\r
+                                                       unload();\r
 \r
-                               // Destroy references\r
-                               o = li = w = unload = null;\r
+                                               d = 0;\r
+                                       };\r
+\r
+                                       // Fire unload when the currently loading page is stopped\r
+                                       if (d)\r
+                                               d.attachEvent('onstop', stop);\r
 \r
-                               // Run garbarge collector on IE\r
-                               if (window.CollectGarbage)\r
-                                       window.CollectGarbage();\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
+                                               if (d)\r
+                                                       d.detachEvent('onstop', stop);\r
+                                       }, 0);\r
+                               }\r
                        };\r
 \r
                        // Attach unload handler\r
-                       if (w.attachEvent)\r
+                       if (w.attachEvent) {\r
                                w.attachEvent('onunload', unload);\r
-                       else if (w.addEventListener)\r
+                               w.attachEvent('onbeforeunload', fakeUnload);\r
+                       } else if (w.addEventListener)\r
                                w.addEventListener('unload', unload, false);\r
 \r
                        // Setup initial unload handler array\r
@@ -362,7 +400,21 @@ var tinymce = {
        },\r
 \r
        explode : function(s, d) {\r
-               return tinymce.map(s.split(d || ','), tinymce.trim);\r
+               return s ? tinymce.map(s.split(d || ','), tinymce.trim) : s;\r
+       },\r
+\r
+       _addVer : function(u) {\r
+               var v;\r
+\r
+               if (!this.query)\r
+                       return u;\r
+\r
+               v = (u.indexOf('?') == -1 ? '?' : '&') + this.query;\r
+\r
+               if (u.indexOf('#') == -1)\r
+                       return u + v;\r
+\r
+               return u.replace('#', v + '#');\r
        }\r
 \r
        };\r
@@ -372,15 +424,6 @@ window.tinymce = tinymce;
 \r
 // Initialize the API\r
 tinymce._init();\r
-\r
-/* file:jscripts/tiny_mce/classes/adapter/jquery/adapter.js */\r
-\r
-\r
-/* file:jscripts/tiny_mce/classes/adapter/prototype/adapter.js */\r
-\r
-\r
-/* file:jscripts/tiny_mce/classes/util/Dispatcher.js */\r
-\r
 tinymce.create('tinymce.util.Dispatcher', {\r
        scope : null,\r
        listeners : null,\r
@@ -433,9 +476,6 @@ tinymce.create('tinymce.util.Dispatcher', {
        }\r
 \r
        });\r
-\r
-/* file:jscripts/tiny_mce/classes/util/URI.js */\r
-\r
 (function() {\r
        var each = tinymce.each;\r
 \r
@@ -447,7 +487,7 @@ tinymce.create('tinymce.util.Dispatcher', {
                        s = t.settings = s || {};\r
 \r
                        // Strange app protocol or local anchor\r
-                       if (/^(mailto|news|javascript|about):/i.test(u) || /^\s*#/.test(u)) {\r
+                       if (/^(mailto|tel|news|javascript|about):/i.test(u) || /^\s*#/.test(u)) {\r
                                t.source = u;\r
                                return;\r
                        }\r
@@ -457,7 +497,7 @@ tinymce.create('tinymce.util.Dispatcher', {
                                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
+                       if (u.indexOf(':/') === -1 && u.indexOf('//') !== 0)\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
@@ -510,6 +550,9 @@ tinymce.create('tinymce.util.Dispatcher', {
                toRelative : function(u) {\r
                        var t = this, o;\r
 \r
+                       if (u === "./")\r
+                               return u;\r
+\r
                        u = new tinymce.util.URI(u, {base_uri : t});\r
 \r
                        // Not on same domain/port or protocol\r
@@ -536,7 +579,7 @@ tinymce.create('tinymce.util.Dispatcher', {
                },\r
 \r
                toRelPath : function(base, path) {\r
-                       var items, bp = 0, out = '', i;\r
+                       var items, bp = 0, out = '', i, l;\r
 \r
                        // Split the paths\r
                        base = base.substring(0, base.lastIndexOf('/'));\r
@@ -544,7 +587,7 @@ tinymce.create('tinymce.util.Dispatcher', {
                        items = path.split('/');\r
 \r
                        if (base.length >= items.length) {\r
-                               for (i = 0; i < base.length; i++) {\r
+                               for (i = 0, l = base.length; i < l; i++) {\r
                                        if (i >= items.length || base[i] != items[i]) {\r
                                                bp = i + 1;\r
                                                break;\r
@@ -553,7 +596,7 @@ tinymce.create('tinymce.util.Dispatcher', {
                        }\r
 \r
                        if (base.length < items.length) {\r
-                               for (i = 0; i < items.length; i++) {\r
+                               for (i = 0, l = items.length; i < l; i++) {\r
                                        if (i >= base.length || base[i] != items[i]) {\r
                                                bp = i + 1;\r
                                                break;\r
@@ -564,10 +607,10 @@ tinymce.create('tinymce.util.Dispatcher', {
                        if (bp == 1)\r
                                return path;\r
 \r
-                       for (i = 0; i < base.length - (bp - 1); i++)\r
+                       for (i = 0, l = base.length - (bp - 1); i < l; i++)\r
                                out += "../";\r
 \r
-                       for (i = bp - 1; i < items.length; i++) {\r
+                       for (i = bp - 1, l = items.length; i < l; i++) {\r
                                if (i != bp - 1)\r
                                        out += "/" + items[i];\r
                                else\r
@@ -578,9 +621,10 @@ tinymce.create('tinymce.util.Dispatcher', {
                },\r
 \r
                toAbsPath : function(base, path) {\r
-                       var i, nb = 0, o = [];\r
+                       var i, nb = 0, o = [], tr;\r
 \r
                        // Split paths\r
+                       tr = /\/$/.test(path) ? '/' : '';\r
                        base = base.split('/');\r
                        path = path.split('/');\r
 \r
@@ -617,9 +661,9 @@ tinymce.create('tinymce.util.Dispatcher', {
 \r
                        // If /a/b/c or /\r
                        if (i <= 0)\r
-                               return '/' + o.reverse().join('/');\r
+                               return '/' + o.reverse().join('/') + tr;\r
 \r
-                       return '/' + base.slice(0, i).join('/') + '/' + o.reverse().join('/');\r
+                       return '/' + base.slice(0, i).join('/') + '/' + o.reverse().join('/') + tr;\r
                },\r
 \r
                getURI : function(nh) {\r
@@ -660,9 +704,6 @@ tinymce.create('tinymce.util.Dispatcher', {
 \r
                });\r
 })();\r
-\r
-/* file:jscripts/tiny_mce/classes/util/Cookie.js */\r
-\r
 (function() {\r
        var each = tinymce.each;\r
 \r
@@ -734,9 +775,6 @@ tinymce.create('tinymce.util.Dispatcher', {
 \r
                });\r
 })();\r
-\r
-/* file:jscripts/tiny_mce/classes/util/JSON.js */\r
-\r
 tinymce.create('static tinymce.util.JSON', {\r
        serialize : function(o) {\r
                var i, v, s = tinymce.util.JSON.serialize, t;\r
@@ -749,7 +787,7 @@ tinymce.create('static tinymce.util.JSON', {
                if (t == 'string') {\r
                        v = '\bb\tt\nn\ff\rr\""\'\'\\\\';\r
 \r
-                       return '"' + o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'])/g, function(a, b) {\r
+                       return '"' + o.replace(/([\u0080-\uFFFF\x00-\x1f\"])/g, function(a, b) {\r
                                i = v.indexOf(b);\r
 \r
                                if (i + 1)\r
@@ -762,7 +800,7 @@ tinymce.create('static tinymce.util.JSON', {
                }\r
 \r
                if (t == 'object') {\r
-                       if (o instanceof Array) {\r
+                       if (o.hasOwnProperty && o instanceof Array) {\r
                                        for (i=0, v = '['; i<o.length; i++)\r
                                                v += (i > 0 ? ',' : '') + s(o[i]);\r
 \r
@@ -789,9 +827,6 @@ tinymce.create('static tinymce.util.JSON', {
        }\r
 \r
        });\r
-\r
-/* file:jscripts/tiny_mce/classes/util/XHR.js */\r
-\r
 tinymce.create('static tinymce.util.XHR', {\r
        send : function(o) {\r
                var x, t, w = window, c = 0;\r
@@ -827,26 +862,28 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                        x.send(o.data);\r
 \r
-                       // Wait for response, onReadyStateChange can not be used since it leaks memory in IE\r
-                       t = w.setInterval(function() {\r
-                               if (x.readyState == 4 || c++ > 10000) {\r
-                                       w.clearInterval(t);\r
-\r
+                       function ready() {\r
+                               if (!o.async || x.readyState == 4 || c++ > 10000) {\r
                                        if (o.success && c < 10000 && x.status == 200)\r
                                                o.success.call(o.success_scope, '' + x.responseText, x, o);\r
                                        else if (o.error)\r
                                                o.error.call(o.error_scope, c > 10000 ? 'TIMED_OUT' : 'GENERAL', x, o);\r
 \r
                                        x = null;\r
-                               }\r
-                       }, 10);\r
+                               } else\r
+                                       w.setTimeout(ready, 10);\r
+                       };\r
+\r
+                       // Syncronous request\r
+                       if (!o.async)\r
+                               return ready();\r
+\r
+                       // 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
-/* file:jscripts/tiny_mce/classes/util/JSONRequest.js */\r
-\r
 (function() {\r
        var extend = tinymce.extend, JSON = tinymce.util.JSON, XHR = tinymce.util.XHR;\r
 \r
@@ -900,10 +937,7 @@ tinymce.create('static tinymce.util.XHR', {
                }\r
 \r
                });\r
-}());\r
-/* file:jscripts/tiny_mce/classes/dom/DOMUtils.js */\r
-\r
-(function() {\r
+}());(function(tinymce) {\r
        // Shorten names\r
        var each = tinymce.each, is = tinymce.is;\r
        var isWebKit = tinymce.isWebKit, isIE = tinymce.isIE;\r
@@ -912,12 +946,21 @@ tinymce.create('static tinymce.util.XHR', {
                doc : null,\r
                root : null,\r
                files : null,\r
-               listeners : {},\r
                pixelStyles : /^(top|left|bottom|right|width|height|borderWidth)$/,\r
-               cache : {},\r
-               idPattern : /^#[\w]+$/,\r
-               elmPattern : /^[\w_*]+$/,\r
-               elmClassPattern : /^([\w_]*)\.([\w_]+)$/,\r
+               props : {\r
+                       "for" : "htmlFor",\r
+                       "class" : "className",\r
+                       className : "className",\r
+                       checked : "checked",\r
+                       disabled : "disabled",\r
+                       maxlength : "maxLength",\r
+                       readonly : "readOnly",\r
+                       selected : "selected",\r
+                       value : "value",\r
+                       id : "id",\r
+                       name : "name",\r
+                       type : "type"\r
+               },\r
 \r
                DOMUtils : function(d, s) {\r
                        var t = this;\r
@@ -971,10 +1014,24 @@ tinymce.create('static tinymce.util.XHR', {
                },\r
 \r
                getRect : function(e) {\r
-                       var p, t = this, w, h;\r
+                       var p, t = this, sr;\r
 \r
                        e = t.get(e);\r
                        p = t.getPos(e);\r
+                       sr = t.getSize(e);\r
+\r
+                       return {\r
+                               x : p.x,\r
+                               y : p.y,\r
+                               w : sr.w,\r
+                               h : sr.h\r
+                       };\r
+               },\r
+\r
+               getSize : function(e) {\r
+                       var t = this, w, h;\r
+\r
+                       e = t.get(e);\r
                        w = t.getStyle(e, 'width');\r
                        h = t.getStyle(e, 'height');\r
 \r
@@ -987,62 +1044,62 @@ tinymce.create('static tinymce.util.XHR', {
                                h = 0;\r
 \r
                        return {\r
-                               x : p.x,\r
-                               y : p.y,\r
                                w : parseInt(w) || e.offsetWidth || e.clientWidth,\r
                                h : parseInt(h) || e.offsetHeight || e.clientHeight\r
                        };\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
-                       var na, se = this.settings;\r
+                       return this.getParents(n, f, r, false);\r
+               },\r
 \r
-                       n = this.get(n);\r
+               getParents : function(n, f, r, c) {\r
+                       var t = this, na, se = t.settings, o = [];\r
+\r
+                       n = t.get(n);\r
+                       c = c === undefined;\r
 \r
                        if (se.strict_root)\r
-                               r = r || this.getRoot();\r
+                               r = r || t.getRoot();\r
 \r
                        // Wrap node name as func\r
                        if (is(f, 'string')) {\r
-                               na = f.toUpperCase();\r
-\r
-                               f = function(n) {\r
-                                       var s = false;\r
-\r
-                                       // Any element\r
-                                       if (n.nodeType == 1 && na === '*') {\r
-                                               s = true;\r
-                                               return false;\r
-                                       }\r
+                               na = f;\r
 \r
-                                       each(na.split(','), function(v) {\r
-                                               if (n.nodeType == 1 && ((se.strict && n.nodeName.toUpperCase() == v) || n.nodeName == v)) {\r
-                                                       s = true;\r
-                                                       return false; // Break loop\r
-                                               }\r
-                                       });\r
-\r
-                                       return s;\r
-                               };\r
+                               if (f === '*') {\r
+                                       f = function(n) {return n.nodeType == 1;};\r
+                               } else {\r
+                                       f = function(n) {\r
+                                               return t.is(n, na);\r
+                                       };\r
+                               }\r
                        }\r
 \r
                        while (n) {\r
-                               if (n == r)\r
-                                       return null;\r
+                               if (n == r || !n.nodeType || n.nodeType === 9)\r
+                                       break;\r
 \r
-                               if (f(n))\r
-                                       return n;\r
+                               if (!f || f(n)) {\r
+                                       if (c)\r
+                                               o.push(n);\r
+                                       else\r
+                                               return n;\r
+                               }\r
 \r
                                n = n.parentNode;\r
                        }\r
 \r
-                       return null;\r
+                       return c ? o : null;\r
                },\r
 \r
                get : function(e) {\r
                        var n;\r
 \r
-                       if (this.doc && typeof(e) == 'string') {\r
+                       if (e && this.doc && typeof(e) == 'string') {\r
                                n = e;\r
                                e = this.doc.getElementById(e);\r
 \r
@@ -1054,169 +1111,13 @@ tinymce.create('static tinymce.util.XHR', {
                        return e;\r
                },\r
 \r
-               // #if !jquery\r
 \r
                select : function(pa, s) {\r
-                       var t = this, cs, c, pl, o = [], x, i, l, n;\r
-\r
-                       s = t.get(s) || t.doc;\r
-\r
-                       // Look for native support and use that if it's found\r
-                       if (s.querySelectorAll) {\r
-                               // Element scope then use temp id\r
-                               // We need to do this to be compatible with other implementations\r
-                               // See bug report: http://bugs.webkit.org/show_bug.cgi?id=17461\r
-                               if (s != t.doc) {\r
-                                       i = s.id;\r
-                                       s.id = '_mc_tmp';\r
-                                       pa = '#_mc_tmp ' + pa;\r
-                               }\r
-\r
-                               // Select elements\r
-                               l = tinymce.grep(s.querySelectorAll(pa));\r
-\r
-                               // Restore old id\r
-                               s.id = i;\r
-\r
-                               return l;\r
-                       }\r
-\r
-                       if (t.settings.strict) {\r
-                               function get(s, n) {\r
-                                       return s.getElementsByTagName(n.toLowerCase());\r
-                               };\r
-                       } else {\r
-                               function get(s, n) {\r
-                                       return s.getElementsByTagName(n);\r
-                               };\r
-                       }\r
-\r
-                       // Simple element pattern. For example: "p" or "*"\r
-                       if (t.elmPattern.test(pa)) {\r
-                               x = get(s, pa);\r
-\r
-                               for (i = 0, l = x.length; i<l; i++)\r
-                                       o.push(x[i]);\r
-\r
-                               return o;\r
-                       }\r
-\r
-                       // Simple class pattern. For example: "p.class" or ".class"\r
-                       if (t.elmClassPattern.test(pa)) {\r
-                               pl = t.elmClassPattern.exec(pa);\r
-                               x = get(s, pl[1] || '*');\r
-                               c = ' ' + pl[2] + ' ';\r
-\r
-                               for (i = 0, l = x.length; i<l; i++) {\r
-                                       n = x[i];\r
-\r
-                                       if (n.className && (' ' + n.className + ' ').indexOf(c) !== -1)\r
-                                               o.push(n);\r
-                               }\r
-\r
-                               return o;\r
-                       }\r
-\r
-                       function collect(n) {\r
-                               if (!n.mce_save) {\r
-                                       n.mce_save = 1;\r
-                                       o.push(n);\r
-                               }\r
-                       };\r
-\r
-                       function collectIE(n) {\r
-                               if (!n.getAttribute('mce_save')) {\r
-                                       n.setAttribute('mce_save', '1');\r
-                                       o.push(n);\r
-                               }\r
-                       };\r
-\r
-                       function find(n, f, r) {\r
-                               var i, l, nl = get(r, n);\r
-\r
-                               for (i = 0, l = nl.length; i < l; i++)\r
-                                       f(nl[i]);\r
-                       };\r
-\r
-                       each(pa.split(','), function(v, i) {\r
-                               v = tinymce.trim(v);\r
-\r
-                               // Simple element pattern, most common in TinyMCE\r
-                               if (t.elmPattern.test(v)) {\r
-                                       each(get(s, v), function(n) {\r
-                                               collect(n);\r
-                                       });\r
-\r
-                                       return;\r
-                               }\r
-\r
-                               // Simple element pattern with class, fairly common in TinyMCE\r
-                               if (t.elmClassPattern.test(v)) {\r
-                                       x = t.elmClassPattern.exec(v);\r
-\r
-                                       each(get(s, x[1]), function(n) {\r
-                                               if (t.hasClass(n, x[2]))\r
-                                                       collect(n);\r
-                                       });\r
-\r
-                                       return;\r
-                               }\r
-\r
-                               if (!(cs = t.cache[pa])) {\r
-                                       cs = 'x=(function(cf, s) {';\r
-                                       pl = v.split(' ');\r
-\r
-                                       each(pl, function(v) {\r
-                                               var p = /^([\w\\*]+)?(?:#([\w\\]+))?(?:\.([\w\\\.]+))?(?:\[\@([\w\\]+)([\^\$\*!]?=)([\w\\]+)\])?(?:\:([\w\\]+))?/i.exec(v);\r
-\r
-                                               // Find elements\r
-                                               p[1] = p[1] || '*';\r
-                                               cs += 'find("' + p[1] + '", function(n) {';\r
-\r
-                                               // Check id\r
-                                               if (p[2])\r
-                                                       cs += 'if (n.id !== "' + p[2] + '") return;';\r
-\r
-                                               // Check classes\r
-                                               if (p[3]) {\r
-                                                       cs += 'var c = " " + n.className + " ";';\r
-                                                       cs += 'if (';\r
-                                                       c = '';\r
-                                                       each(p[3].split('.'), function(v) {\r
-                                                               if (v)\r
-                                                                       c += (c ? '||' : '') + 'c.indexOf(" ' + v + ' ") === -1';\r
-                                                       });\r
-                                                       cs += c + ') return;';\r
-                                               }\r
-                                       });\r
-\r
-                                       cs += 'cf(n);';\r
-\r
-                                       for (i = pl.length - 1; i >= 0; i--)\r
-                                               cs += '}, ' + (i ? 'n' : 's') + ');';\r
-\r
-                                       cs += '})';\r
-\r
-                                       // Compile CSS pattern function\r
-                                       t.cache[pa] = cs = eval(cs);\r
-                               }\r
-\r
-                               // Run selector function\r
-                               cs(isIE ? collectIE : collect, s);\r
-                       });\r
-\r
-                       // Cleanup\r
-                       each(o, function(n) {\r
-                               if (isIE)\r
-                                       n.removeAttribute('mce_save');\r
-                               else\r
-                                       delete n.mce_save;\r
-                       });\r
+                       var t = this;\r
 \r
-                       return o;\r
+                       return tinymce.dom.Sizzle(pa, t.get(s) || t.get(t.settings.root_element) || t.doc, []);\r
                },\r
 \r
-               // #endif\r
 \r
                add : function(p, n, a, h, c) {\r
                        var t = this;\r
@@ -1225,19 +1126,7 @@ tinymce.create('static tinymce.util.XHR', {
                                var e, k;\r
 \r
                                e = is(n, 'string') ? t.doc.createElement(n) : n;\r
-\r
-                               if (a) {\r
-                                       for (k in a) {\r
-                                               if (a.hasOwnProperty(k) && !is(a[k], 'object'))\r
-                                                       t.setAttrib(e, k, '' + a[k]);\r
-                                       }\r
-\r
-                                       if (a.style && !is(a.style, 'string')) {\r
-                                               each(a.style, function(v, n) {\r
-                                                       t.setStyle(e, n, v);\r
-                                               });\r
-                                       }\r
-                               }\r
+                               t.setAttribs(e, a);\r
 \r
                                if (h) {\r
                                        if (h.nodeType)\r
@@ -1271,8 +1160,10 @@ tinymce.create('static tinymce.util.XHR', {
                },\r
 \r
                remove : function(n, k) {\r
+                       var t = this;\r
+\r
                        return this.run(n, function(n) {\r
-                               var p, g;\r
+                               var p, g, i;\r
 \r
                                p = n.parentNode;\r
 \r
@@ -1280,24 +1171,29 @@ tinymce.create('static tinymce.util.XHR', {
                                        return null;\r
 \r
                                if (k) {\r
-                                       each (n.childNodes, function(c) {\r
-                                               p.insertBefore(c.cloneNode(true), n);\r
-                                       });\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 (isIE) {\r
+                               if (t.fixPsuedoLeaks) {\r
                                        p = n.cloneNode(true);\r
-                                       n.outerHTML = '';\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
-                               }*/\r
+                               }\r
 \r
                                return p.removeChild(n);\r
                        });\r
                },\r
 \r
-               // #if !jquery\r
 \r
                setStyle : function(n, na, v) {\r
                        var t = this;\r
@@ -1399,6 +1295,10 @@ tinymce.create('static tinymce.util.XHR', {
                setAttrib : function(e, n, v) {\r
                        var t = this;\r
 \r
+                       // Whats the point\r
+                       if (!e || !n)\r
+                               return;\r
+\r
                        // Strict XML mode\r
                        if (t.settings.strict)\r
                                n = n.toLowerCase();\r
@@ -1408,8 +1308,17 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                                switch (n) {\r
                                        case "style":\r
+                                               if (!is(v, 'string')) {\r
+                                                       each(v, function(v, n) {\r
+                                                               t.setStyle(e, n, v);\r
+                                                       });\r
+\r
+                                                       return;\r
+                                               }\r
+\r
+                                               // No mce_style for elements with these since they might get resized by the user\r
                                                if (s.keep_values) {\r
-                                                       if (v)\r
+                                                       if (v && !t._isRes(v))\r
                                                                e.setAttribute('mce_style', v, 2);\r
                                                        else\r
                                                                e.removeAttribute('mce_style', 2);\r
@@ -1432,6 +1341,10 @@ tinymce.create('static tinymce.util.XHR', {
                                                }\r
 \r
                                                break;\r
+                                       \r
+                                       case "shape":\r
+                                               e.setAttribute('mce_style', v);\r
+                                               break;\r
                                }\r
 \r
                                if (is(v) && v !== null && v.length !== 0)\r
@@ -1451,59 +1364,43 @@ tinymce.create('static tinymce.util.XHR', {
                        });\r
                },\r
 \r
-               // #endif\r
 \r
                getAttrib : function(e, n, dv) {\r
                        var v, t = this;\r
 \r
                        e = t.get(e);\r
 \r
-                       if (!e)\r
+                       if (!e || e.nodeType !== 1)\r
                                return false;\r
 \r
                        if (!is(dv))\r
-                               dv = "";\r
+                               dv = '';\r
 \r
                        // Try the mce variant for these\r
-                       if (/^(src|href|style|coords)$/.test(n)) {\r
+                       if (/^(src|href|style|coords|shape)$/.test(n)) {\r
                                v = e.getAttribute("mce_" + n);\r
 \r
                                if (v)\r
                                        return v;\r
                        }\r
 \r
-                       v = e.getAttribute(n, 2);\r
-\r
-                       if (!v) {\r
-                               switch (n) {\r
-                                       case 'class':\r
-                                               v = e.className;\r
-                                               break;\r
-\r
-                                       default:\r
-                                               // Fix for IE crash Bug: #1884376 probably due to invalid DOM structure\r
-                                               if (isIE && n === 'name' && e.nodeName === 'A') {\r
-                                                       v = e.name;\r
-                                                       break;\r
-                                               }\r
-\r
-                                               v = e.attributes[n];\r
-                                               v = v && is(v.nodeValue) ? v.nodeValue : v;\r
-                               }\r
+                       if (isIE && t.props[n]) {\r
+                               v = e[t.props[n]];\r
+                               v = v && v.nodeValue ? v.nodeValue : v;\r
                        }\r
 \r
-                       switch (n) {\r
-                               case 'style':\r
-                                       v = v || e.style.cssText;\r
+                       if (!v)\r
+                               v = e.getAttribute(n, 2);\r
 \r
-                                       if (v) {\r
-                                               v = t.serializeStyle(t.parseStyle(v));\r
+                       if (n === 'style') {\r
+                               v = v || e.style.cssText;\r
 \r
-                                               if (t.settings.keep_values)\r
-                                                       e.setAttribute('mce_style', v);\r
-                                       }\r
+                               if (v) {\r
+                                       v = t.serializeStyle(t.parseStyle(v));\r
 \r
-                                       break;\r
+                                       if (t.settings.keep_values && !t._isRes(v))\r
+                                               e.setAttribute('mce_style', v);\r
+                               }\r
                        }\r
 \r
                        // Remove Apple and WebKit stuff\r
@@ -1523,7 +1420,18 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                                        case 'size':\r
                                                // IE returns +0 as default value for size\r
-                                               if (v === '+0')\r
+                                               if (v === '+0' || v === 20 || v === 0)\r
+                                                       v = '';\r
+\r
+                                               break;\r
+\r
+                                       case 'width':\r
+                                       case 'height':\r
+                                       case 'vspace':\r
+                                       case 'checked':\r
+                                       case 'disabled':\r
+                                       case 'readonly':\r
+                                               if (v === 0)\r
                                                        v = '';\r
 \r
                                                break;\r
@@ -1535,13 +1443,23 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                                                break;\r
 \r
+                                       case 'maxlength':\r
                                        case 'tabindex':\r
-                                               // IE returns 32768 as default value\r
-                                               if (v === 32768)\r
+                                               // IE returns default value\r
+                                               if (v === 32768 || v === 2147483647 || v === '32768')\r
                                                        v = '';\r
 \r
                                                break;\r
 \r
+                                       case 'multiple':\r
+                                       case 'compact':\r
+                                       case 'noshade':\r
+                                       case 'nowrap':\r
+                                               if (v === 65535)\r
+                                                       return n;\r
+\r
+                                               return dv;\r
+\r
                                        case 'shape':\r
                                                v = v.toLowerCase();\r
                                                break;\r
@@ -1553,44 +1471,40 @@ tinymce.create('static tinymce.util.XHR', {
                                }\r
                        }\r
 \r
-                       return (v && v != '') ? '' + v : dv;\r
+                       return (v !== undefined && v !== null && v !== '') ? '' + v : dv;\r
                },\r
 \r
-               getPos : function(n) {\r
+               getPos : function(n, ro) {\r
                        var t = this, x = 0, y = 0, e, d = t.doc, r;\r
 \r
                        n = t.get(n);\r
+                       ro = ro || d.body;\r
 \r
-                       // Use getBoundingClientRect on IE, Opera has it but it's not perfect\r
-                       if (n && isIE) {\r
-                               n = n.getBoundingClientRect();\r
-                               e = t.boxModel ? d.documentElement : d.body;\r
-                               x = t.getStyle(t.select('html')[0], 'borderWidth'); // Remove border\r
-                               x = (x == 'medium' || t.boxModel && !t.isIE6) && 2 || x;\r
-                               n.top += t.win.self != t.win.top ? 2 : 0; // IE adds some strange extra cord if used in a frameset\r
+                       if (n) {\r
+                               // Use getBoundingClientRect on IE, Opera has it but it's not perfect\r
+                               if (isIE && !t.stdMode) {\r
+                                       n = n.getBoundingClientRect();\r
+                                       e = t.boxModel ? d.documentElement : d.body;\r
+                                       x = t.getStyle(t.select('html')[0], 'borderWidth'); // Remove border\r
+                                       x = (x == 'medium' || t.boxModel && !t.isIE6) && 2 || x;\r
+                                       n.top += t.win.self != t.win.top ? 2 : 0; // IE adds some strange extra cord if used in a frameset\r
 \r
-                               return {x : n.left + e.scrollLeft - x, y : n.top + e.scrollTop - x};\r
-                       }\r
+                                       return {x : n.left + e.scrollLeft - x, y : n.top + e.scrollTop - x};\r
+                               }\r
 \r
-                       r = n;\r
-                       while (r) {\r
-                               x += r.offsetLeft || 0;\r
-                               y += r.offsetTop || 0;\r
-                               r = r.offsetParent;\r
-                       }\r
+                               r = n;\r
+                               while (r && r != ro && r.nodeType) {\r
+                                       x += r.offsetLeft || 0;\r
+                                       y += r.offsetTop || 0;\r
+                                       r = r.offsetParent;\r
+                               }\r
 \r
-                       r = n;\r
-                       while (r) {\r
-                               // Opera 9.25 bug fix, fixed in 9.50\r
-                               if (!/^table-row|inline.*/i.test(t.getStyle(r, "display", 1))) {\r
+                               r = n.parentNode;\r
+                               while (r && r != ro && r.nodeType) {\r
                                        x -= r.scrollLeft || 0;\r
                                        y -= r.scrollTop || 0;\r
+                                       r = r.parentNode;\r
                                }\r
-\r
-                               r = r.parentNode;\r
-\r
-                               if (r == d.body)\r
-                                       break;\r
                        }\r
 \r
                        return {x : x, y : y};\r
@@ -1652,10 +1566,13 @@ tinymce.create('static tinymce.util.XHR', {
                                delete o[c];\r
                        };\r
 \r
+                       st = st.replace(/&(#?[a-z0-9]+);/g, '&$1_MCE_SEMI_'); // Protect entities\r
+\r
                        each(st.split(';'), function(v) {\r
                                var sv, ur = [];\r
 \r
                                if (v) {\r
+                                       v = v.replace(/_MCE_SEMI_/g, ';'); // Restore entities\r
                                        v = v.replace(/url\([^\)]+\)/g, function(v) {ur.push(v);return 'url(' + ur.length + ')';});\r
                                        v = v.split(':');\r
                                        sv = tinymce.trim(v[1]);\r
@@ -1667,7 +1584,7 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                                        if (s.url_converter) {\r
                                                sv = sv.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g, function(x, c) {\r
-                                                       return 'url(' + t.encode(s.url_converter.call(s.url_converter_scope || t, t.decode(c), 'style', null)) + ')';\r
+                                                       return 'url(' + s.url_converter.call(s.url_converter_scope || t, t.decode(c), 'style', null) + ')';\r
                                                });\r
                                        }\r
 \r
@@ -1697,6 +1614,9 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                        each(o, function(v, k) {\r
                                if (k && v) {\r
+                                       if (tinymce.isGecko && k.indexOf('-moz-') === 0)\r
+                                               return;\r
+\r
                                        switch (k) {\r
                                                case 'color':\r
                                                case 'background-color':\r
@@ -1722,11 +1642,10 @@ tinymce.create('static tinymce.util.XHR', {
                                        return;\r
 \r
                                t.files[u] = true;\r
-                               t.add(t.select('head')[0], 'link', {rel : 'stylesheet', href : u});\r
+                               t.add(t.select('head')[0], 'link', {rel : 'stylesheet', href : tinymce._addVer(u)});\r
                        });\r
                },\r
 \r
-               // #if !jquery\r
 \r
                addClass : function(e, c) {\r
                        return this.run(e, function(e) {\r
@@ -1783,10 +1702,9 @@ tinymce.create('static tinymce.util.XHR', {
                isHidden : function(e) {\r
                        e = this.get(e);\r
 \r
-                       return e.style.display == 'none' || this.getStyle(e, 'display') == 'none';\r
+                       return !e || e.style.display == 'none' || this.getStyle(e, 'display') == 'none';\r
                },\r
 \r
-               // #endif\r
 \r
                uniqueId : function(p) {\r
                        return (!p ? 'mce_' : p) + (this.counter++);\r
@@ -1857,7 +1775,7 @@ 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 ([^>]+)>|<p>/g, '<div $1 mce_tmp="1">');\r
                                                h = h.replace(/<\/p>/g, '</div>');\r
 \r
                                                // Set the new HTML with DIVs\r
@@ -1917,6 +1835,9 @@ tinymce.create('static tinymce.util.XHR', {
                        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
+                               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
 \r
                        // Fix some issues\r
@@ -1924,16 +1845,46 @@ tinymce.create('static tinymce.util.XHR', {
 \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 in comments for serialization purposes\r
-                               if (h.indexOf('<script') !== -1) {\r
-                                       h = h.replace(/<script>/g, '<script type="text/javascript">');\r
-                                       h = h.replace(/<script(|[^>]+)>(\s*<!--|\/\/\s*<\[CDATA\[)?[\r\n]*/g, '<mce:script$1><!--\n');\r
-                                       h = h.replace(/\s*(\/\/\s*-->|\/\/\s*]]>)?<\/script>/g, '\n// --></mce:script>');\r
-                                       h = h.replace(/<mce:script(|[^>]+)><!--\n\/\/ --><\/mce:script>/g, '<mce:script$1></mce:script>');\r
+                               // Wrap scripts and styles in comments for serialization purposes\r
+                               if (/<script|style/.test(h)) {\r
+                                       function trim(s) {\r
+                                               // Remove prefix and suffix code for element\r
+                                               s = s.replace(/(<!--\[CDATA\[|\]\]-->)/g, '\n');\r
+                                               s = s.replace(/^[\r\n]*|[\r\n]*$/g, '');\r
+                                               s = s.replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g, '');\r
+                                               s = s.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g, '');\r
+\r
+                                               return s;\r
+                                       };\r
+\r
+                                       // 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
+                                               // Force type attribute\r
+                                               if (!a)\r
+                                                       a = ' type="text/javascript"';\r
+\r
+                                               // Wrap contents in a comment\r
+                                               if (b)\r
+                                                       b = '<!--\n' + b + '\n// -->';\r
+\r
+                                               // Output fake element\r
+                                               return '<mce:script' + a + '>' + b + '</mce:script>';\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
+                                       });\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|coords)[^>]*>/gi, function(a, n) {\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
 \r
@@ -1942,9 +1893,9 @@ tinymce.create('static tinymce.util.XHR', {
                                                        return m;\r
 \r
                                                if (b == 'style') {\r
-                                                       // Why did I need this one?\r
-                                                       //if (isIE)\r
-                                                       //      u = t.serializeStyle(t.parseStyle(u));\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
 \r
                                                        if (s.hex_colors) {\r
                                                                u = u.replace(/rgb\([^\)]+\)/g, function(v) {\r
@@ -1957,7 +1908,7 @@ tinymce.create('static tinymce.util.XHR', {
                                                                        return 'url(' + t.encode(s.url_converter.call(s.url_converter_scope || t, t.decode(c), b, n)) + ')';\r
                                                                });\r
                                                        }\r
-                                               } else if (b != 'coords') {\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
@@ -1965,10 +1916,10 @@ tinymce.create('static tinymce.util.XHR', {
                                                return ' ' + b + '="' + c + '" mce_' + b + '="' + u + '"';\r
                                        };\r
 \r
-                                       a = a.replace(/ (src|href|style|coords)=[\"]([^\"]+)[\"]/gi, handle); // W3C\r
-                                       a = a.replace(/ (src|href|style|coords)=[\']([^\']+)[\']/gi, handle); // W3C\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
 \r
-                                       return a.replace(/ (src|href|style|coords)=([^\s\"\'>]+)/gi, handle); // IE\r
+                                       return a.replace(/ (src|href|style|coords|shape)=([^\s\"\'>]+)/gi, handle); // IE\r
                                });\r
                        }\r
 \r
@@ -1983,7 +1934,7 @@ tinymce.create('static tinymce.util.XHR', {
                        if (!e)\r
                                return null;\r
 \r
-                       if (isIE)\r
+                       if (e.outerHTML !== undefined)\r
                                return e.outerHTML;\r
 \r
                        d = (e.ownerDocument || this.doc).createElement("body");\r
@@ -2019,15 +1970,23 @@ tinymce.create('static tinymce.util.XHR', {
                },\r
 \r
                decode : function(s) {\r
-                       var e;\r
+                       var e, n, v;\r
 \r
                        // Look for entities to decode\r
                        if (/&[^;]+;/.test(s)) {\r
                                // Decode the entities using a div element not super efficient but less code\r
                                e = this.doc.createElement("div");\r
                                e.innerHTML = s;\r
+                               n = e.firstChild;\r
+                               v = '';\r
+\r
+                               if (n) {\r
+                                       do {\r
+                                               v += n.nodeValue;\r
+                                       } while (n.nextSibling);\r
+                               }\r
 \r
-                               return !e.firstChild ? s : e.firstChild.nodeValue;\r
+                               return v || s;\r
                        }\r
 \r
                        return s;\r
@@ -2053,7 +2012,6 @@ tinymce.create('static tinymce.util.XHR', {
                        }) : s;\r
                },\r
 \r
-               // #if !jquery\r
 \r
                insertAfter : function(n, r) {\r
                        var t = this;\r
@@ -2075,7 +2033,6 @@ tinymce.create('static tinymce.util.XHR', {
                        });\r
                },\r
 \r
-               // #endif\r
 \r
                isBlock : function(n) {\r
                        if (n.nodeType && n.nodeType !== 1)\r
@@ -2083,16 +2040,17 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                        n = n.nodeName || n;\r
 \r
-                       return /^(H[1-6]|HR|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TD|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|FORM|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP)$/.test(n);\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
                },\r
 \r
-               // #if !jquery\r
 \r
                replace : function(n, o, k) {\r
+                       var t = this;\r
+\r
                        if (is(o, 'array'))\r
                                n = n.cloneNode(true);\r
 \r
-                       return this.run(o, function(o) {\r
+                       return t.run(o, function(o) {\r
                                if (k) {\r
                                        each(o.childNodes, function(c) {\r
                                                n.appendChild(c.cloneNode(true));\r
@@ -2100,9 +2058,10 @@ tinymce.create('static tinymce.util.XHR', {
                                }\r
 \r
                                // Fix IE psuedo leak for elements since replacing elements if fairly common\r
-                               if (isIE && o.nodeType === 1) {\r
+                               // Will break parentNode for some unknown reason\r
+                               if (t.fixPsuedoLeaks && o.nodeType === 1) {\r
                                        o.parentNode.insertBefore(n, o);\r
-                                       o.outerHTML = '';\r
+                                       t.remove(o);\r
                                        return n;\r
                                }\r
 \r
@@ -2110,7 +2069,27 @@ tinymce.create('static tinymce.util.XHR', {
                        });\r
                },\r
 \r
-               // #endif\r
+\r
+               findCommonAncestor : function(a, b) {\r
+                       var ps = a, pe;\r
+\r
+                       while (ps) {\r
+                               pe = b;\r
+\r
+                               while (pe && ps != pe)\r
+                                       pe = pe.parentNode;\r
+\r
+                               if (ps == pe)\r
+                                       break;\r
+\r
+                               ps = ps.parentNode;\r
+                       }\r
+\r
+                       if (!ps && a.ownerDocument)\r
+                               return a.ownerDocument.documentElement;\r
+\r
+                       return ps;\r
+               },\r
 \r
                toHex : function(s) {\r
                        var c = /^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(s);\r
@@ -2195,7 +2174,7 @@ tinymce.create('static tinymce.util.XHR', {
                        var t = this, o;\r
 \r
                        if (t.doc && typeof(e) === 'string')\r
-                               e = t.doc.getElementById(e);\r
+                               e = t.get(e);\r
 \r
                        if (!e)\r
                                return false;\r
@@ -2253,47 +2232,2055 @@ tinymce.create('static tinymce.util.XHR', {
                        // Manual destroy then remove unload handler\r
                        if (!s)\r
                                tinymce.removeUnload(t.destroy);\r
-               }\r
+               },\r
 \r
-               /*\r
-               walk : function(n, f, s) {\r
-                       var d = this.doc, w;\r
+               createRng : function() {\r
+                       var d = this.doc;\r
 \r
-                       if (d.createTreeWalker) {\r
-                               w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);\r
+                       return d.createRange ? d.createRange() : new tinymce.dom.Range(this);\r
+               },\r
 \r
-                               while ((n = w.nextNode()) != null)\r
-                                       f.call(s || this, n);\r
-                       } else\r
-                               tinymce.walk(n, f, 'childNodes', s);\r
-               }\r
-               */\r
+               split : function(pe, e, re) {\r
+                       var t = this, r = t.createRng(), bef, aft, pa;\r
 \r
-               /*\r
-               toRGB : function(s) {\r
-                       var c = /^\s*?#([0-9A-F]{2})([0-9A-F]{1,2})([0-9A-F]{2})?\s*?$/.exec(s);\r
+                       // 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
+                       // 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
 \r
-                       if (c) {\r
-                               // #FFF -> #FFFFFF\r
-                               if (!is(c[3]))\r
-                                       c[3] = c[2] = c[1];\r
+                               if (n && n[na] && n[na].nodeType == 1 && isEmpty(n[na]))\r
+                                       t.remove(n[na]);\r
+                       };\r
 \r
-                               return "rgb(" + parseInt(c[1], 16) + "," + parseInt(c[2], 16) + "," + parseInt(c[3], 16) + ")";\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
+\r
+                               return n.replace(/[ \t\r\n]+|&nbsp;|&#160;/g, '') == '';\r
+                       };\r
+\r
+                       if (pe && e) {\r
+                               // Get before chunk\r
+                               r.setStartBefore(pe);\r
+                               r.setEndBefore(e);\r
+                               bef = r.extractContents();\r
+\r
+                               // Get after chunk\r
+                               r = t.createRng();\r
+                               r.setStartAfter(e);\r
+                               r.setEndAfter(pe);\r
+                               aft = r.extractContents();\r
+\r
+                               // Insert chunks and remove parent\r
+                               pa = pe.parentNode;\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
+                               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
+                               t.remove(pe);\r
+\r
+                               return re || e;\r
+                       }\r
+               },\r
+\r
+\r
+               _isRes : function(c) {\r
+                       // Is live resizble element\r
+                       return /^(top|left|bottom|right|width|height)/i.test(c) || /;\s*(top|left|bottom|right|width|height)/i.test(c);\r
+               }\r
+\r
+               /*\r
+               walk : function(n, f, s) {\r
+                       var d = this.doc, w;\r
+\r
+                       if (d.createTreeWalker) {\r
+                               w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);\r
+\r
+                               while ((n = w.nextNode()) != null)\r
+                                       f.call(s || this, n);\r
+                       } else\r
+                               tinymce.walk(n, f, 'childNodes', s);\r
+               }\r
+               */\r
+\r
+               /*\r
+               toRGB : function(s) {\r
+                       var c = /^\s*?#([0-9A-F]{2})([0-9A-F]{1,2})([0-9A-F]{2})?\s*?$/.exec(s);\r
+\r
+                       if (c) {\r
+                               // #FFF -> #FFFFFF\r
+                               if (!is(c[3]))\r
+                                       c[3] = c[2] = c[1];\r
+\r
+                               return "rgb(" + parseInt(c[1], 16) + "," + parseInt(c[2], 16) + "," + parseInt(c[3], 16) + ")";\r
+                       }\r
+\r
+                       return s;\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
+       // Range constructor\r
+       function Range(dom) {\r
+               var d = dom.doc;\r
+\r
+               extend(this, {\r
+                       dom : dom,\r
+\r
+                       // Inital states\r
+                       startContainer : d,\r
+                       startOffset : 0,\r
+                       endContainer : d,\r
+                       endOffset : 0,\r
+                       collapsed : true,\r
+                       commonAncestorContainer : d,\r
+\r
+                       // Range constants\r
+                       START_TO_START : 0,\r
+                       START_TO_END : 1,\r
+                       END_TO_END : 2,\r
+                       END_TO_START : 3\r
+               });\r
+       };\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
+\r
+               setStartBefore : function(n) {\r
+                       this.setStart(n.parentNode, nodeIndex(n));\r
+               },\r
+\r
+               setStartAfter : function(n) {\r
+                       this.setStart(n.parentNode, nodeIndex(n) + 1);\r
+               },\r
+\r
+               setEndBefore : function(n) {\r
+                       this.setEnd(n.parentNode, nodeIndex(n));\r
+               },\r
+\r
+               setEndAfter : function(n) {\r
+                       this.setEnd(n.parentNode, nodeIndex(n) + 1);\r
+               },\r
+\r
+               collapse : function(ts) {\r
+                       var t = this;\r
+\r
+                       if (ts) {\r
+                               t.endContainer = t.startContainer;\r
+                               t.endOffset = t.startOffset;\r
+                       } else {\r
+                               t.startContainer = t.endContainer;\r
+                               t.startOffset = t.endOffset;\r
+                       }\r
+\r
+                       t.collapsed = true;\r
+               },\r
+\r
+               selectNode : function(n) {\r
+                       this.setStartBefore(n);\r
+                       this.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
+\r
+               compareBoundaryPoints : function(h, r) {\r
+                       var t = this, sc = t.startContainer, so = t.startOffset, ec = t.endContainer, eo = t.endOffset;\r
+\r
+                       // Check START_TO_START\r
+                       if (h === 0)\r
+                               return t._compareBoundaryPoints(sc, so, sc, so);\r
+\r
+                       // Check START_TO_END\r
+                       if (h === 1)\r
+                               return t._compareBoundaryPoints(sc, so, ec, eo);\r
+\r
+                       // Check END_TO_END\r
+                       if (h === 2)\r
+                               return t._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
+\r
+               deleteContents : function() {\r
+                       this._traverse(DELETE);\r
+               },\r
+\r
+               extractContents : function() {\r
+                       return this._traverse(EXTRACT);\r
+               },\r
+\r
+               cloneContents : function() {\r
+                       return this._traverse(CLONE);\r
+               },\r
+\r
+               insertNode : function(n) {\r
+                       var t = this, 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
+                       } else {\r
+                               // Insert element node\r
+                               if (t.startContainer.childNodes.length > 0)\r
+                                       o = t.startContainer.childNodes[t.startOffset];\r
+\r
+                               t.startContainer.insertBefore(n, o);\r
+                       }\r
+               },\r
+\r
+               surroundContents : function(n) {\r
+                       var t = this, 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
+                       return extend(new Range(t.dom), {\r
+                               startContainer : t.startContainer,\r
+                               startOffset : t.startOffset,\r
+                               endContainer : t.endContainer,\r
+                               endOffset : t.endOffset,\r
+                               collapsed : t.collapsed,\r
+                               commonAncestorContainer : t.commonAncestorContainer\r
+                       });\r
+               },\r
+\r
+/*\r
+               detach : function() {\r
+                       // Not implemented\r
+               },\r
+*/\r
+               // Internal methods\r
+\r
+               _isCollapsed : function() {\r
+                       return (this.startContainer == this.endContainer && this.startOffset == this.endOffset);\r
+               },\r
+\r
+               _compareBoundaryPoints : function (containerA, offsetA, containerB, offsetB) {\r
+                       var c, offsetC, n, cmnRoot, childA, childB;\r
+\r
+                       // In the first case the boundary-points have the same container. A is before B \r
+                       // if its offset is less than the offset of B, A is equal to B if its offset is \r
+                       // equal to the offset of B, and A is after B if its offset is greater than the \r
+                       // offset of B.\r
+                       if (containerA == containerB) {\r
+                               if (offsetA == offsetB) {\r
+                                       return 0; // equal\r
+                               } else if (offsetA < offsetB) {\r
+                                       return -1; // before\r
+                               } else {\r
+                                       return 1; // after\r
+                               }\r
+                       }\r
+\r
+                       // In the second case a child node C of the container of A is an ancestor \r
+                       // container of B. In this case, A is before B if the offset of A is less than or \r
+                       // equal to the index of the child node C and A is after B otherwise.\r
+                       c = containerB;\r
+                       while (c && c.parentNode != containerA) {\r
+                               c = c.parentNode;\r
+                       }\r
+                       if (c) {\r
+                               offsetC = 0;\r
+                               n = containerA.firstChild;\r
+\r
+                               while (n != c && offsetC < offsetA) {\r
+                                       offsetC++;\r
+                                       n = n.nextSibling;\r
+                               }\r
+\r
+                               if (offsetA <= offsetC) {\r
+                                       return -1; // before\r
+                               } else {\r
+                                       return 1; // after\r
+                               }\r
+                       }\r
+\r
+                       // In the third case a child node C of the container of B is an ancestor container \r
+                       // of A. In this case, A is before B if the index of the child node C is less than \r
+                       // the offset of B and A is after B otherwise.\r
+                       c = containerA;\r
+                       while (c && c.parentNode != containerB) {\r
+                               c = c.parentNode;\r
+                       }\r
+\r
+                       if (c) {\r
+                               offsetC = 0;\r
+                               n = containerB.firstChild;\r
+\r
+                               while (n != c && offsetC < offsetB) {\r
+                                       offsetC++;\r
+                                       n = n.nextSibling;\r
+                               }\r
+\r
+                               if (offsetC < offsetB) {\r
+                                       return -1; // before\r
+                               } else {\r
+                                       return 1; // after\r
+                               }\r
+                       }\r
+\r
+                       // In the fourth case, none of three other cases hold: the containers of A and B \r
+                       // are siblings or descendants of sibling nodes. In this case, A is before B if \r
+                       // the container of A is before the container of B in a pre-order traversal of the\r
+                       // Ranges' context tree and A is after B otherwise.\r
+                       cmnRoot = this.dom.findCommonAncestor(containerA, containerB);\r
+                       childA = containerA;\r
+\r
+                       while (childA && childA.parentNode != cmnRoot) {\r
+                               childA = childA.parentNode;  \r
+                       }\r
+\r
+                       if (!childA) {\r
+                               childA = cmnRoot;\r
+                       }\r
+\r
+                       childB = containerB;\r
+                       while (childB && childB.parentNode != cmnRoot) {\r
+                               childB = childB.parentNode;\r
+                       }\r
+\r
+                       if (!childB) {\r
+                               childB = cmnRoot;\r
+                       }\r
+\r
+                       if (childA == childB) {\r
+                               return 0; // equal\r
+                       }\r
+\r
+                       n = cmnRoot.firstChild;\r
+                       while (n) {\r
+                               if (n == childA) {\r
+                                       return -1; // before\r
+                               }\r
+\r
+                               if (n == childB) {\r
+                                       return 1; // after\r
+                               }\r
+\r
+                               n = n.nextSibling;\r
+                       }\r
+               },\r
+\r
+               _setEndPoint : function(st, n, o) {\r
+                       var t = this, ec, sc;\r
+\r
+                       if (st) {\r
+                               t.startContainer = n;\r
+                               t.startOffset = o;\r
+                       } else {\r
+                               t.endContainer = n;\r
+                               t.endOffset = 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
+                       // 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
+                       while (ec.parentNode)\r
+                               ec = ec.parentNode;\r
+\r
+                       sc = t.startContainer;\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
+                               // position.\r
+                               if (t._compareBoundaryPoints(t.startContainer, t.startOffset, t.endContainer, t.endOffset) > 0)\r
+                                       t.collapse(st);\r
+                       }\r
+\r
+                       t.collapsed = t._isCollapsed();\r
+                       t.commonAncestorContainer = t.dom.findCommonAncestor(t.startContainer, t.endContainer);\r
+               },\r
+\r
+               // This code is heavily "inspired" by the Apache Xerces implementation. I hope they don't mind. :)\r
+\r
+               _traverse : function(how) {\r
+                       var t = this, c, endContainerDepth = 0, startContainerDepth = 0, p, depthDiff, startNode, endNode, sp, ep;\r
+\r
+                       if (t.startContainer == t.endContainer)\r
+                               return t._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
+\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
+\r
+                               ++startContainerDepth;\r
+                       }\r
+\r
+                       depthDiff = startContainerDepth - endContainerDepth;\r
+\r
+                       startNode = t.startContainer;\r
+                       while (depthDiff > 0) {\r
+                               startNode = startNode.parentNode;\r
+                               depthDiff--;\r
+                       }\r
+\r
+                       endNode = t.endContainer;\r
+                       while (depthDiff < 0) {\r
+                               endNode = endNode.parentNode;\r
+                               depthDiff++;\r
+                       }\r
+\r
+                       // ascend the ancestor hierarchy until we have a common parent.\r
+                       for (sp = startNode.parentNode, ep = endNode.parentNode; sp != ep; sp = sp.parentNode, ep = ep.parentNode) {\r
+                               startNode = sp;\r
+                               endNode = ep;\r
+                       }\r
+\r
+                       return t._traverseCommonAncestors(startNode, endNode, how);\r
+               },\r
+\r
+               _traverseSameContainer : function(how) {\r
+                       var t = this, frag, s, sub, n, cnt, sibling, xferNode;\r
+\r
+                       if (how != DELETE)\r
+                               frag = t.dom.doc.createDocumentFragment();\r
+\r
+                       // If selection is empty, just return the fragment\r
+                       if (t.startOffset == t.endOffset)\r
+                               return frag;\r
+\r
+                       // Text node needs special case handling\r
+                       if (t.startContainer.nodeType == 3 /* TEXT_NODE */) {\r
+                               // get the substring\r
+                               s = t.startContainer.nodeValue;\r
+                               sub = s.substring(t.startOffset, t.endOffset);\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
+\r
+                                       // Nothing is partially selected, so collapse to start point\r
+                                       t.collapse(true);\r
+                               }\r
+\r
+                               if (how == DELETE)\r
+                                       return null;\r
+\r
+                               frag.appendChild(t.dom.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
+\r
+                       while (cnt > 0) {\r
+                               sibling = n.nextSibling;\r
+                               xferNode = t._traverseFullySelected(n, how);\r
+\r
+                               if (frag)\r
+                                       frag.appendChild( xferNode );\r
+\r
+                               --cnt;\r
+                               n = sibling;\r
+                       }\r
+\r
+                       // Nothing is partially selected, so collapse to start point\r
+                       if (how != CLONE)\r
+                               t.collapse(true);\r
+\r
+                       return frag;\r
+               },\r
+\r
+               _traverseCommonStartContainer : function(endAncestor, how) {\r
+                       var t = this, frag, n, endIdx, cnt, sibling, xferNode;\r
+\r
+                       if (how != DELETE)\r
+                               frag = t.dom.doc.createDocumentFragment();\r
+\r
+                       n = t._traverseRightBoundary(endAncestor, how);\r
+\r
+                       if (frag)\r
+                               frag.appendChild(n);\r
+\r
+                       endIdx = indexOf(endAncestor, t.startContainer);\r
+                       cnt = endIdx - t.startOffset;\r
+\r
+                       if (cnt <= 0) {\r
+                               // Collapse to just before the endAncestor, which \r
+                               // is partially selected.\r
+                               if (how != CLONE) {\r
+                                       t.setEndBefore(endAncestor);\r
+                                       t.collapse(false);\r
+                               }\r
+\r
+                               return frag;\r
+                       }\r
+\r
+                       n = endAncestor.previousSibling;\r
+                       while (cnt > 0) {\r
+                               sibling = n.previousSibling;\r
+                               xferNode = t._traverseFullySelected(n, how);\r
+\r
+                               if (frag)\r
+                                       frag.insertBefore(xferNode, frag.firstChild);\r
+\r
+                               --cnt;\r
+                               n = sibling;\r
+                       }\r
+\r
+                       // Collapse to just before the endAncestor, which \r
+                       // is partially selected.\r
+                       if (how != CLONE) {\r
+                               t.setEndBefore(endAncestor);\r
+                               t.collapse(false);\r
+                       }\r
+\r
+                       return frag;\r
+               },\r
+\r
+               _traverseCommonEndContainer : function(startAncestor, how) {\r
+                       var t = this, frag, startIdx, n, cnt, sibling, xferNode;\r
+\r
+                       if (how != DELETE)\r
+                               frag = t.dom.doc.createDocumentFragment();\r
+\r
+                       n = t._traverseLeftBoundary(startAncestor, how);\r
+                       if (frag)\r
+                               frag.appendChild(n);\r
+\r
+                       startIdx = indexOf(startAncestor, t.endContainer);\r
+                       ++startIdx;  // Because we already traversed it....\r
+\r
+                       cnt = t.endOffset - startIdx;\r
+                       n = startAncestor.nextSibling;\r
+                       while (cnt > 0) {\r
+                               sibling = n.nextSibling;\r
+                               xferNode = t._traverseFullySelected(n, how);\r
+\r
+                               if (frag)\r
+                                       frag.appendChild(xferNode);\r
+\r
+                               --cnt;\r
+                               n = sibling;\r
+                       }\r
+\r
+                       if (how != CLONE) {\r
+                               t.setStartAfter(startAncestor);\r
+                               t.collapse(true);\r
+                       }\r
+\r
+                       return frag;\r
+               },\r
+\r
+               _traverseCommonAncestors : function(startAncestor, endAncestor, how) {\r
+                       var t = this, n, frag, commonParent, startOffset, endOffset, cnt, sibling, nextSibling;\r
+\r
+                       if (how != DELETE)\r
+                               frag = t.dom.doc.createDocumentFragment();\r
+\r
+                       n = t._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;\r
+\r
+                       cnt = endOffset - startOffset;\r
+                       sibling = startAncestor.nextSibling;\r
+\r
+                       while (cnt > 0) {\r
+                               nextSibling = sibling.nextSibling;\r
+                               n = t._traverseFullySelected(sibling, how);\r
+\r
+                               if (frag)\r
+                                       frag.appendChild(n);\r
+\r
+                               sibling = nextSibling;\r
+                               --cnt;\r
+                       }\r
+\r
+                       n = t._traverseRightBoundary(endAncestor, how);\r
+\r
+                       if (frag)\r
+                               frag.appendChild(n);\r
+\r
+                       if (how != CLONE) {\r
+                               t.setStartAfter(startAncestor);\r
+                               t.collapse(true);\r
+                       }\r
+\r
+                       return frag;\r
+               },\r
+\r
+               _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
+\r
+                       if (next == root)\r
+                               return t._traverseNode(next, isFullySelected, false, how);\r
+\r
+                       parent = next.parentNode;\r
+                       clonedParent = t._traverseNode(parent, false, false, how);\r
+\r
+                       while (parent != null) {\r
+                               while (next != null) {\r
+                                       prevSibling = next.previousSibling;\r
+                                       clonedChild = t._traverseNode(next, isFullySelected, false, how);\r
+\r
+                                       if (how != DELETE)\r
+                                               clonedParent.insertBefore(clonedChild, clonedParent.firstChild);\r
+\r
+                                       isFullySelected = true;\r
+                                       next = prevSibling;\r
+                               }\r
+\r
+                               if (parent == root)\r
+                                       return clonedParent;\r
+\r
+                               next = parent.previousSibling;\r
+                               parent = parent.parentNode;\r
+\r
+                               clonedGrandParent = t._traverseNode(parent, false, false, how);\r
+\r
+                               if (how != DELETE)\r
+                                       clonedGrandParent.appendChild(clonedParent);\r
+\r
+                               clonedParent = clonedGrandParent;\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
+\r
+                       if (next == root)\r
+                               return t._traverseNode(next, isFullySelected, true, how);\r
+\r
+                       parent = next.parentNode;\r
+                       clonedParent = t._traverseNode(parent, false, true, how);\r
+\r
+                       while (parent != null) {\r
+                               while (next != null) {\r
+                                       nextSibling = next.nextSibling;\r
+                                       clonedChild = t._traverseNode(next, isFullySelected, true, how);\r
+\r
+                                       if (how != DELETE)\r
+                                               clonedParent.appendChild(clonedChild);\r
+\r
+                                       isFullySelected = true;\r
+                                       next = nextSibling;\r
+                               }\r
+\r
+                               if (parent == root)\r
+                                       return clonedParent;\r
+\r
+                               next = parent.nextSibling;\r
+                               parent = parent.parentNode;\r
+\r
+                               clonedGrandParent = t._traverseNode(parent, false, true, how);\r
+\r
+                               if (how != DELETE)\r
+                                       clonedGrandParent.appendChild(clonedParent);\r
+\r
+                               clonedParent = clonedGrandParent;\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
+\r
+                       if (isFullySelected)\r
+                               return t._traverseFullySelected(n, how);\r
+\r
+                       if (n.nodeType == 3 /* TEXT_NODE */) {\r
+                               txtValue = n.nodeValue;\r
+\r
+                               if (isLeft) {\r
+                                       offset = t.startOffset;\r
+                                       newNodeValue = txtValue.substring(offset);\r
+                                       oldNodeValue = txtValue.substring(0, offset);\r
+                               } else {\r
+                                       offset = t.endOffset;\r
+                                       newNodeValue = txtValue.substring(0, offset);\r
+                                       oldNodeValue = txtValue.substring(offset);\r
+                               }\r
+\r
+                               if (how != CLONE)\r
+                                       n.nodeValue = oldNodeValue;\r
+\r
+                               if (how == DELETE)\r
+                                       return null;\r
+\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
+\r
+               _traverseFullySelected : function(n, how) {\r
+                       var t = this;\r
+\r
+                       if (how != DELETE)\r
+                               return how == CLONE ? n.cloneNode(true) : n;\r
+\r
+                       n.parentNode.removeChild(n);\r
+                       return null;\r
+               }\r
+       });\r
+\r
+       ns.Range = Range;\r
+})(tinymce.dom);\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
+\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
+\r
+                       // If selection is outside the current document just return an empty range\r
+                       element = ieRange.item ? ieRange.item(0) : ieRange.parentElement();\r
+                       if (element.ownerDocument != dom.doc)\r
+                               return domRange;\r
+\r
+                       // Handle control selection or text selection of a image\r
+                       if (ieRange.item || !element.hasChildNodes()) {\r
+                               domRange.setStart(element.parentNode, findIndex(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
+\r
+                       // Normalize the elements to avoid fragmented dom\r
+                       startPos.parent.normalize();\r
+                       endPos.parent.normalize();\r
+\r
+                       // Set start container and offset\r
+                       sc = startPos.parent.childNodes[Math.min(startPos.index, startPos.parent.childNodes.length - 1)];\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
+\r
+                       // Set end container and offset\r
+                       ec = endPos.parent.childNodes[Math.min(endPos.index, endPos.parent.childNodes.length - 1)];\r
+\r
+                       if (ec.nodeType != 3) {\r
+                               if (!collapsed)\r
+                                       endPos.index++;\r
+\r
+                               domRange.setEnd(endPos.parent, endPos.index);\r
+                       } else\r
+                               domRange.setEnd(endPos.parent.childNodes[endPos.index], endPos.offset);\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
+\r
+                               ec = domRange.endContainer;\r
+                               if (ec.nodeType == 1)\r
+                                       domRange.setEnd(ec, Math.min(domRange.endOffset, ec.childNodes.length));\r
+                       }\r
+\r
+                       // Restore selection to new range\r
+                       t.addRange(domRange);\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
+\r
+                       // Setup some shorter versions\r
+                       sc = rng.startContainer;\r
+                       so = rng.startOffset;\r
+                       ec = rng.endContainer;\r
+                       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
+\r
+                       // Single element selection\r
+                       if (sc == ec && sc.nodeType == 1) {\r
+                               // Make control selection for some elements\r
+                               if (/^(IMG|TABLE)$/.test(sc.nodeName) && so != eo) {\r
+                                       ieRng = body.createControlRange();\r
+                                       ieRng.addElement(sc);\r
+                               } else {\r
+                                       ieRng = body.createTextRange();\r
+\r
+                                       // Padd empty elements with invisible character\r
+                                       if (!sc.hasChildNodes() && sc.canHaveHTML)\r
+                                               sc.innerHTML = invisibleChar;\r
+\r
+                                       // Select element contents\r
+                                       ieRng.moveToElementText(sc);\r
+\r
+                                       // If it's only containing a padding remove it so the caret remains\r
+                                       if (sc.innerHTML == invisibleChar) {\r
+                                               ieRng.collapse(true);\r
+                                               sc.removeChild(sc.firstChild);\r
+                                       }\r
+                               }\r
+\r
+                               if (so == eo)\r
+                                       ieRng.collapse(eo <= rng.endContainer.childNodes.length - 1);\r
+\r
+                               ieRng.select();\r
+\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
+\r
+                       // Collapsed range\r
+                       if (rng.collapsed) {\r
+                               pos = getCharPos(sc, so);\r
+\r
+                               ieRng = body.createTextRange();\r
+                               ieRng.move('character', pos);\r
+                               ieRng.select();\r
+\r
+                               return;\r
+                       } else {\r
+                               // If same text container\r
+                               if (sc == ec && sc.nodeType == 3) {\r
+                                       startPos = getCharPos(sc, so);\r
+\r
+                                       ieRng.move('character', startPos);\r
+                                       ieRng.moveEnd('character', eo - so);\r
+                                       ieRng.select();\r
+\r
+                                       return;\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
+\r
+                               ieRng.setEndPoint('EndToEnd', tmpRng);\r
+                               ieRng.select();\r
+\r
+                               return;\r
+                       }\r
+               };\r
+\r
+               this.getRangeAt = function() {\r
+                       // Setup new range if the cache is empty\r
+                       if (!range || !compareRanges(lastIERng, selection.getRng())) {\r
+                               range = getRange();\r
+\r
+                               // Store away text range for next call\r
+                               lastIERng = selection.getRng();\r
+                       }\r
+\r
+                       // Return cached range\r
+                       return range;\r
+               };\r
+\r
+               this.destroy = function() {\r
+                       // Destroy cached range and last IE range to avoid memory leaks\r
+                       lastIERng = range = null;\r
+               };\r
+       };\r
+\r
+       // Expose the selection object\r
+       tinymce.dom.TridentSelection = Selection;\r
+})();\r
+\r
+/*\r
+ * Sizzle CSS Selector Engine - v1.0\r
+ *  Copyright 2009, The Dojo Foundation\r
+ *  Released under the MIT, BSD, and GPL Licenses.\r
+ *  More information: http://sizzlejs.com/\r
+ */\r
+(function(){\r
+\r
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,\r
+       done = 0,\r
+       toString = Object.prototype.toString,\r
+       hasDuplicate = false;\r
+\r
+var Sizzle = function(selector, context, results, seed) {\r
+       results = results || [];\r
+       var origContext = context = context || document;\r
+\r
+       if ( context.nodeType !== 1 && context.nodeType !== 9 ) {\r
+               return [];\r
+       }\r
+       \r
+       if ( !selector || typeof selector !== "string" ) {\r
+               return results;\r
+       }\r
+\r
+       var parts = [], m, set, checkSet, check, mode, extra, prune = true, contextXML = isXML(context);\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
+               \r
+               if ( m[2] ) {\r
+                       extra = RegExp.rightContext;\r
+                       break;\r
+               }\r
+       }\r
+\r
+       if ( parts.length > 1 && origPOS.exec( selector ) ) {\r
+               if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {\r
+                       set = posProcess( parts[0] + parts[1], context );\r
+               } else {\r
+                       set = Expr.relative[ parts[0] ] ?\r
+                               [ context ] :\r
+                               Sizzle( parts.shift(), context );\r
+\r
+                       while ( parts.length ) {\r
+                               selector = parts.shift();\r
+\r
+                               if ( Expr.relative[ selector ] )\r
+                                       selector += parts.shift();\r
+\r
+                               set = posProcess( selector, set );\r
+                       }\r
+               }\r
+       } else {\r
+               // Take a shortcut and set the context if the root selector is an ID\r
+               // (but not if it'll be faster if the inner selector is an ID)\r
+               if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&\r
+                               Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {\r
+                       var 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
+                               { expr: parts.pop(), set: makeArray(seed) } :\r
+                               Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );\r
+                       set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;\r
+\r
+                       if ( parts.length > 0 ) {\r
+                               checkSet = makeArray(set);\r
+                       } else {\r
+                               prune = false;\r
+                       }\r
+\r
+                       while ( parts.length ) {\r
+                               var cur = parts.pop(), pop = cur;\r
+\r
+                               if ( !Expr.relative[ cur ] ) {\r
+                                       cur = "";\r
+                               } else {\r
+                                       pop = parts.pop();\r
+                               }\r
+\r
+                               if ( pop == null ) {\r
+                                       pop = context;\r
+                               }\r
+\r
+                               Expr.relative[ cur ]( checkSet, pop, contextXML );\r
+                       }\r
+               } else {\r
+                       checkSet = parts = [];\r
+               }\r
+       }\r
+\r
+       if ( !checkSet ) {\r
+               checkSet = set;\r
+       }\r
+\r
+       if ( !checkSet ) {\r
+               throw "Syntax error, unrecognized expression: " + (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
+                                       results.push( set[i] );\r
+                               }\r
+                       }\r
+               } else {\r
+                       for ( var i = 0; checkSet[i] != null; i++ ) {\r
+                               if ( checkSet[i] && checkSet[i].nodeType === 1 ) {\r
+                                       results.push( set[i] );\r
+                               }\r
+                       }\r
+               }\r
+       } else {\r
+               makeArray( checkSet, results );\r
+       }\r
+\r
+       if ( extra ) {\r
+               Sizzle( extra, origContext, results, seed );\r
+               Sizzle.uniqueSort( results );\r
+       }\r
+\r
+       return results;\r
+};\r
+\r
+Sizzle.uniqueSort = function(results){\r
+       if ( sortOrder ) {\r
+               hasDuplicate = false;\r
+               results.sort(sortOrder);\r
+\r
+               if ( hasDuplicate ) {\r
+                       for ( var i = 1; i < results.length; i++ ) {\r
+                               if ( results[i] === results[i-1] ) {\r
+                                       results.splice(i--, 1);\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+};\r
+\r
+Sizzle.matches = function(expr, set){\r
+       return Sizzle(expr, null, null, set);\r
+};\r
+\r
+Sizzle.find = function(expr, context, isXML){\r
+       var set, match;\r
+\r
+       if ( !expr ) {\r
+               return [];\r
+       }\r
+\r
+       for ( var i = 0, l = Expr.order.length; i < l; i++ ) {\r
+               var type = Expr.order[i], match;\r
+               \r
+               if ( (match = Expr.match[ type ].exec( expr )) ) {\r
+                       var left = RegExp.leftContext;\r
+\r
+                       if ( left.substr( left.length - 1 ) !== "\\" ) {\r
+                               match[1] = (match[1] || "").replace(/\\/g, "");\r
+                               set = Expr.find[ type ]( match, context, isXML );\r
+                               if ( set != null ) {\r
+                                       expr = expr.replace( Expr.match[ type ], "" );\r
+                                       break;\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       if ( !set ) {\r
+               set = context.getElementsByTagName("*");\r
+       }\r
+\r
+       return {set: set, expr: expr};\r
+};\r
+\r
+Sizzle.filter = function(expr, set, inplace, not){\r
+       var old = expr, result = [], curLoop = set, match, anyFound,\r
+               isXMLFilter = set && set[0] && 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
+                               anyFound = false;\r
+\r
+                               if ( curLoop == result ) {\r
+                                       result = [];\r
+                               }\r
+\r
+                               if ( Expr.preFilter[ type ] ) {\r
+                                       match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );\r
+\r
+                                       if ( !match ) {\r
+                                               anyFound = found = true;\r
+                                       } else if ( match === true ) {\r
+                                               continue;\r
+                                       }\r
+                               }\r
+\r
+                               if ( match ) {\r
+                                       for ( var i = 0; (item = curLoop[i]) != null; i++ ) {\r
+                                               if ( item ) {\r
+                                                       found = filter( item, match, i, curLoop );\r
+                                                       var pass = not ^ !!found;\r
+\r
+                                                       if ( inplace && found != null ) {\r
+                                                               if ( pass ) {\r
+                                                                       anyFound = true;\r
+                                                               } else {\r
+                                                                       curLoop[i] = false;\r
+                                                               }\r
+                                                       } else if ( pass ) {\r
+                                                               result.push( item );\r
+                                                               anyFound = true;\r
+                                                       }\r
+                                               }\r
+                                       }\r
+                               }\r
+\r
+                               if ( found !== undefined ) {\r
+                                       if ( !inplace ) {\r
+                                               curLoop = result;\r
+                                       }\r
+\r
+                                       expr = expr.replace( Expr.match[ type ], "" );\r
+\r
+                                       if ( !anyFound ) {\r
+                                               return [];\r
+                                       }\r
+\r
+                                       break;\r
+                               }\r
+                       }\r
+               }\r
+\r
+               // Improper expression\r
+               if ( expr == old ) {\r
+                       if ( anyFound == null ) {\r
+                               throw "Syntax error, unrecognized expression: " + expr;\r
+                       } else {\r
+                               break;\r
+                       }\r
+               }\r
+\r
+               old = expr;\r
+       }\r
+\r
+       return curLoop;\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
+       },\r
+       attrMap: {\r
+               "class": "className",\r
+               "for": "htmlFor"\r
+       },\r
+       attrHandle: {\r
+               href: function(elem){\r
+                       return elem.getAttribute("href");\r
+               }\r
+       },\r
+       relative: {\r
+               "+": function(checkSet, part, isXML){\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
+                       }\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
+                                               elem || false :\r
+                                               elem === part;\r
+                               }\r
+                       }\r
+\r
+                       if ( isPartStrNotTag ) {\r
+                               Sizzle.filter( part, checkSet, true );\r
+                       }\r
+               },\r
+               ">": function(checkSet, part, isXML){\r
+                       var isPartStr = typeof part === "string";\r
+\r
+                       if ( isPartStr && !/\W/.test(part) ) {\r
+                               part = isXML ? part : part.toUpperCase();\r
+\r
+                               for ( var i = 0, l = checkSet.length; i < l; i++ ) {\r
+                                       var elem = checkSet[i];\r
+                                       if ( elem ) {\r
+                                               var parent = elem.parentNode;\r
+                                               checkSet[i] = parent.nodeName === part ? parent : false;\r
+                                       }\r
+                               }\r
+                       } else {\r
+                               for ( var i = 0, l = checkSet.length; i < l; i++ ) {\r
+                                       var elem = checkSet[i];\r
+                                       if ( elem ) {\r
+                                               checkSet[i] = isPartStr ?\r
+                                                       elem.parentNode :\r
+                                                       elem.parentNode === part;\r
+                                       }\r
+                               }\r
+\r
+                               if ( isPartStr ) {\r
+                                       Sizzle.filter( part, checkSet, true );\r
+                               }\r
+                       }\r
+               },\r
+               "": function(checkSet, part, isXML){\r
+                       var doneName = done++, checkFn = dirCheck;\r
+\r
+                       if ( !part.match(/\W/) ) {\r
+                               var nodeCheck = part = isXML ? part : part.toUpperCase();\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
+\r
+                       if ( typeof part === "string" && !part.match(/\W/) ) {\r
+                               var nodeCheck = part = isXML ? part : part.toUpperCase();\r
+                               checkFn = dirNodeCheck;\r
+                       }\r
+\r
+                       checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);\r
+               }\r
+       },\r
+       find: {\r
+               ID: function(match, context, isXML){\r
+                       if ( typeof context.getElementById !== "undefined" && !isXML ) {\r
+                               var m = context.getElementById(match[1]);\r
+                               return m ? [m] : [];\r
+                       }\r
+               },\r
+               NAME: function(match, context, isXML){\r
+                       if ( typeof context.getElementsByName !== "undefined" ) {\r
+                               var ret = [], results = context.getElementsByName(match[1]);\r
+\r
+                               for ( var i = 0, l = results.length; i < l; i++ ) {\r
+                                       if ( results[i].getAttribute("name") === match[1] ) {\r
+                                               ret.push( results[i] );\r
+                                       }\r
+                               }\r
+\r
+                               return ret.length === 0 ? null : ret;\r
+                       }\r
+               },\r
+               TAG: function(match, context){\r
+                       return context.getElementsByTagName(match[1]);\r
+               }\r
+       },\r
+       preFilter: {\r
+               CLASS: function(match, curLoop, inplace, result, not, isXML){\r
+                       match = " " + match[1].replace(/\\/g, "") + " ";\r
+\r
+                       if ( isXML ) {\r
+                               return match;\r
+                       }\r
+\r
+                       for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {\r
+                               if ( elem ) {\r
+                                       if ( not ^ (elem.className && (" " + elem.className + " ").indexOf(match) >= 0) ) {\r
+                                               if ( !inplace )\r
+                                                       result.push( elem );\r
+                                       } else if ( inplace ) {\r
+                                               curLoop[i] = false;\r
+                                       }\r
+                               }\r
+                       }\r
+\r
+                       return false;\r
+               },\r
+               ID: function(match){\r
+                       return match[1].replace(/\\/g, "");\r
+               },\r
+               TAG: function(match, curLoop){\r
+                       for ( var i = 0; curLoop[i] === false; i++ ){}\r
+                       return curLoop[i] && isXML(curLoop[i]) ? match[1] : match[1].toUpperCase();\r
+               },\r
+               CHILD: function(match){\r
+                       if ( match[1] == "nth" ) {\r
+                               // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'\r
+                               var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(\r
+                                       match[2] == "even" && "2n" || match[2] == "odd" && "2n+1" ||\r
+                                       !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);\r
+\r
+                               // calculate the numbers (first)n+(last) including if they are negative\r
+                               match[2] = (test[1] + (test[2] || 1)) - 0;\r
+                               match[3] = test[3] - 0;\r
+                       }\r
+\r
+                       // TODO: Move to normal caching system\r
+                       match[0] = done++;\r
+\r
+                       return match;\r
+               },\r
+               ATTR: function(match, curLoop, inplace, result, not, isXML){\r
+                       var name = match[1].replace(/\\/g, "");\r
+                       \r
+                       if ( !isXML && Expr.attrMap[name] ) {\r
+                               match[1] = Expr.attrMap[name];\r
+                       }\r
+\r
+                       if ( match[2] === "~=" ) {\r
+                               match[4] = " " + match[4] + " ";\r
+                       }\r
+\r
+                       return match;\r
+               },\r
+               PSEUDO: function(match, curLoop, inplace, result, not){\r
+                       if ( match[1] === "not" ) {\r
+                               // If we're dealing with a complex expression, or a simple one\r
+                               if ( match[3].match(chunker).length > 1 || /^\w/.test(match[3]) ) {\r
+                                       match[3] = Sizzle(match[3], null, null, curLoop);\r
+                               } else {\r
+                                       var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);\r
+                                       if ( !inplace ) {\r
+                                               result.push.apply( result, ret );\r
+                                       }\r
+                                       return false;\r
+                               }\r
+                       } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {\r
+                               return true;\r
+                       }\r
+                       \r
+                       return match;\r
+               },\r
+               POS: function(match){\r
+                       match.unshift( true );\r
+                       return match;\r
+               }\r
+       },\r
+       filters: {\r
+               enabled: function(elem){\r
+                       return elem.disabled === false && elem.type !== "hidden";\r
+               },\r
+               disabled: function(elem){\r
+                       return elem.disabled === true;\r
+               },\r
+               checked: function(elem){\r
+                       return elem.checked === true;\r
+               },\r
+               selected: function(elem){\r
+                       // Accessing this property makes selected-by-default\r
+                       // options in Safari work properly\r
+                       elem.parentNode.selectedIndex;\r
+                       return elem.selected === true;\r
+               },\r
+               parent: function(elem){\r
+                       return !!elem.firstChild;\r
+               },\r
+               empty: function(elem){\r
+                       return !elem.firstChild;\r
+               },\r
+               has: function(elem, i, match){\r
+                       return !!Sizzle( match[3], elem ).length;\r
+               },\r
+               header: function(elem){\r
+                       return /h\d/i.test( elem.nodeName );\r
+               },\r
+               text: function(elem){\r
+                       return "text" === elem.type;\r
+               },\r
+               radio: function(elem){\r
+                       return "radio" === elem.type;\r
+               },\r
+               checkbox: function(elem){\r
+                       return "checkbox" === elem.type;\r
+               },\r
+               file: function(elem){\r
+                       return "file" === elem.type;\r
+               },\r
+               password: function(elem){\r
+                       return "password" === elem.type;\r
+               },\r
+               submit: function(elem){\r
+                       return "submit" === elem.type;\r
+               },\r
+               image: function(elem){\r
+                       return "image" === elem.type;\r
+               },\r
+               reset: function(elem){\r
+                       return "reset" === elem.type;\r
+               },\r
+               button: function(elem){\r
+                       return "button" === elem.type || elem.nodeName.toUpperCase() === "BUTTON";\r
+               },\r
+               input: function(elem){\r
+                       return /input|select|textarea|button/i.test(elem.nodeName);\r
+               }\r
+       },\r
+       setFilters: {\r
+               first: function(elem, i){\r
+                       return i === 0;\r
+               },\r
+               last: function(elem, i, match, array){\r
+                       return i === array.length - 1;\r
+               },\r
+               even: function(elem, i){\r
+                       return i % 2 === 0;\r
+               },\r
+               odd: function(elem, i){\r
+                       return i % 2 === 1;\r
+               },\r
+               lt: function(elem, i, match){\r
+                       return i < match[3] - 0;\r
+               },\r
+               gt: function(elem, i, match){\r
+                       return i > match[3] - 0;\r
+               },\r
+               nth: function(elem, i, match){\r
+                       return match[3] - 0 == i;\r
+               },\r
+               eq: function(elem, i, match){\r
+                       return match[3] - 0 == i;\r
+               }\r
+       },\r
+       filter: {\r
+               PSEUDO: function(elem, match, i, array){\r
+                       var name = match[1], filter = Expr.filters[ name ];\r
+\r
+                       if ( filter ) {\r
+                               return filter( elem, i, match, array );\r
+                       } else if ( name === "contains" ) {\r
+                               return (elem.textContent || elem.innerText || "").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
+                                               return false;\r
+                                       }\r
+                               }\r
+\r
+                               return true;\r
+                       }\r
+               },\r
+               CHILD: function(elem, match){\r
+                       var type = match[1], node = elem;\r
+                       switch (type) {\r
+                               case 'only':\r
+                               case 'first':\r
+                                       while (node = node.previousSibling)  {\r
+                                               if ( node.nodeType === 1 ) return false;\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
+                                       }\r
+                                       return true;\r
+                               case 'nth':\r
+                                       var first = match[2], last = match[3];\r
+\r
+                                       if ( first == 1 && last == 0 ) {\r
+                                               return true;\r
+                                       }\r
+                                       \r
+                                       var doneName = match[0],\r
+                                               parent = elem.parentNode;\r
+       \r
+                                       if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {\r
+                                               var count = 0;\r
+                                               for ( node = parent.firstChild; node; node = node.nextSibling ) {\r
+                                                       if ( node.nodeType === 1 ) {\r
+                                                               node.nodeIndex = ++count;\r
+                                                       }\r
+                                               } \r
+                                               parent.sizcache = doneName;\r
+                                       }\r
+                                       \r
+                                       var diff = elem.nodeIndex - last;\r
+                                       if ( first == 0 ) {\r
+                                               return diff == 0;\r
+                                       } else {\r
+                                               return ( diff % first == 0 && diff / first >= 0 );\r
+                                       }\r
+                       }\r
+               },\r
+               ID: function(elem, match){\r
+                       return elem.nodeType === 1 && elem.getAttribute("id") === match;\r
+               },\r
+               TAG: function(elem, match){\r
+                       return (match === "*" && elem.nodeType === 1) || elem.nodeName === match;\r
+               },\r
+               CLASS: function(elem, match){\r
+                       return (" " + (elem.className || elem.getAttribute("class")) + " ")\r
+                               .indexOf( match ) > -1;\r
+               },\r
+               ATTR: function(elem, match){\r
+                       var name = match[1],\r
+                               result = Expr.attrHandle[ name ] ?\r
+                                       Expr.attrHandle[ name ]( elem ) :\r
+                                       elem[ name ] != null ?\r
+                                               elem[ name ] :\r
+                                               elem.getAttribute( name ),\r
+                               value = result + "",\r
+                               type = match[2],\r
+                               check = match[4];\r
+\r
+                       return result == null ?\r
+                               type === "!=" :\r
+                               type === "=" ?\r
+                               value === check :\r
+                               type === "*=" ?\r
+                               value.indexOf(check) >= 0 :\r
+                               type === "~=" ?\r
+                               (" " + value + " ").indexOf(check) >= 0 :\r
+                               !check ?\r
+                               value && result !== false :\r
+                               type === "!=" ?\r
+                               value != check :\r
+                               type === "^=" ?\r
+                               value.indexOf(check) === 0 :\r
+                               type === "$=" ?\r
+                               value.substr(value.length - check.length) === check :\r
+                               type === "|=" ?\r
+                               value === check || value.substr(0, check.length + 1) === check + "-" :\r
+                               false;\r
+               },\r
+               POS: function(elem, match, i, array){\r
+                       var name = match[2], filter = Expr.setFilters[ name ];\r
+\r
+                       if ( filter ) {\r
+                               return filter( elem, i, match, array );\r
+                       }\r
+               }\r
+       }\r
+};\r
+\r
+var origPOS = Expr.match.POS;\r
+\r
+for ( var type in Expr.match ) {\r
+       Expr.match[ type ] = new RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source );\r
+}\r
+\r
+var makeArray = function(array, results) {\r
+       array = Array.prototype.slice.call( array );\r
+\r
+       if ( results ) {\r
+               results.push.apply( results, array );\r
+               return results;\r
+       }\r
+       \r
+       return array;\r
+};\r
+\r
+// Perform a simple check to determine if the browser is capable of\r
+// converting a NodeList to an array using builtin methods.\r
+try {\r
+       Array.prototype.slice.call( document.documentElement.childNodes );\r
+\r
+// Provide a fallback method if it does not work\r
+} catch(e){\r
+       makeArray = function(array, results) {\r
+               var ret = results || [];\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
+                                       ret.push( array[i] );\r
+                               }\r
+                       } else {\r
+                               for ( var i = 0; array[i]; i++ ) {\r
+                                       ret.push( array[i] );\r
+                               }\r
+                       }\r
+               }\r
+\r
+               return ret;\r
+       };\r
+}\r
+\r
+var sortOrder;\r
+\r
+if ( document.documentElement.compareDocumentPosition ) {\r
+       sortOrder = function( a, b ) {\r
+               var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;\r
+               if ( ret === 0 ) {\r
+                       hasDuplicate = true;\r
+               }\r
+               return ret;\r
+       };\r
+} else if ( "sourceIndex" in document.documentElement ) {\r
+       sortOrder = function( a, b ) {\r
+               var ret = a.sourceIndex - b.sourceIndex;\r
+               if ( ret === 0 ) {\r
+                       hasDuplicate = true;\r
+               }\r
+               return ret;\r
+       };\r
+} else if ( document.createRange ) {\r
+       sortOrder = function( a, b ) {\r
+               var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();\r
+               aRange.setStart(a, 0);\r
+               aRange.setEnd(a, 0);\r
+               bRange.setStart(b, 0);\r
+               bRange.setEnd(b, 0);\r
+               var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);\r
+               if ( ret === 0 ) {\r
+                       hasDuplicate = true;\r
+               }\r
+               return ret;\r
+       };\r
+}\r
+\r
+// Check to see if the browser returns elements by name when\r
+// querying by getElementById (and provide a workaround)\r
+(function(){\r
+       // We're going to inject a fake input element with a specified name\r
+       var form = document.createElement("div"),\r
+               id = "script" + (new Date).getTime();\r
+       form.innerHTML = "<a name='" + id + "'/>";\r
+\r
+       // Inject it into the root element, check its status, and remove it quickly\r
+       var root = document.documentElement;\r
+       root.insertBefore( form, root.firstChild );\r
+\r
+       // The workaround has to do additional checks after a getElementById\r
+       // Which slows things down for other browsers (hence the branching)\r
+       if ( !!document.getElementById( id ) ) {\r
+               Expr.find.ID = function(match, context, isXML){\r
+                       if ( typeof context.getElementById !== "undefined" && !isXML ) {\r
+                               var m = context.getElementById(match[1]);\r
+                               return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];\r
+                       }\r
+               };\r
+\r
+               Expr.filter.ID = function(elem, match){\r
+                       var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");\r
+                       return elem.nodeType === 1 && node && node.nodeValue === match;\r
+               };\r
+       }\r
+\r
+       root.removeChild( form );\r
+})();\r
+\r
+(function(){\r
+       // Check to see if the browser returns only elements\r
+       // when doing getElementsByTagName("*")\r
+\r
+       // Create a fake element\r
+       var div = document.createElement("div");\r
+       div.appendChild( document.createComment("") );\r
+\r
+       // Make sure no comments are found\r
+       if ( div.getElementsByTagName("*").length > 0 ) {\r
+               Expr.find.TAG = function(match, context){\r
+                       var results = context.getElementsByTagName(match[1]);\r
+\r
+                       // Filter out possible comments\r
+                       if ( match[1] === "*" ) {\r
+                               var tmp = [];\r
+\r
+                               for ( var i = 0; results[i]; i++ ) {\r
+                                       if ( results[i].nodeType === 1 ) {\r
+                                               tmp.push( results[i] );\r
+                                       }\r
+                               }\r
+\r
+                               results = tmp;\r
+                       }\r
+\r
+                       return results;\r
+               };\r
+       }\r
+\r
+       // Check to see if an attribute returns normalized href attributes\r
+       div.innerHTML = "<a href='#'></a>";\r
+       if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&\r
+                       div.firstChild.getAttribute("href") !== "#" ) {\r
+               Expr.attrHandle.href = function(elem){\r
+                       return elem.getAttribute("href", 2);\r
+               };\r
+       }\r
+})();\r
+\r
+if ( document.querySelectorAll ) (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
+       \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
+               \r
+               return oldSizzle(query, context, extra, seed);\r
+       };\r
+\r
+       for ( var prop in oldSizzle ) {\r
+               Sizzle[ prop ] = oldSizzle[ prop ];\r
+       }\r
+})();\r
+\r
+if ( document.getElementsByClassName && document.documentElement.getElementsByClassName ) (function(){\r
+       var div = document.createElement("div");\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
+               return;\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
+               return;\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
+\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
+                       while ( elem ) {\r
+                               if ( elem.sizcache === doneName ) {\r
+                                       match = checkSet[elem.sizset];\r
+                                       break;\r
+                               }\r
+\r
+                               if ( elem.nodeType === 1 && !isXML ){\r
+                                       elem.sizcache = doneName;\r
+                                       elem.sizset = i;\r
+                               }\r
+\r
+                               if ( elem.nodeName === cur ) {\r
+                                       match = elem;\r
+                                       break;\r
+                               }\r
+\r
+                               elem = elem[dir];\r
+                       }\r
 \r
-                       return s;\r
+                       checkSet[i] = match;\r
                }\r
-               */\r
+       }\r
+}\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
+                       while ( elem ) {\r
+                               if ( elem.sizcache === doneName ) {\r
+                                       match = checkSet[elem.sizset];\r
+                                       break;\r
+                               }\r
 \r
-               });\r
+                               if ( elem.nodeType === 1 ) {\r
+                                       if ( !isXML ) {\r
+                                               elem.sizcache = doneName;\r
+                                               elem.sizset = i;\r
+                                       }\r
+                                       if ( typeof cur !== "string" ) {\r
+                                               if ( elem === cur ) {\r
+                                                       match = true;\r
+                                                       break;\r
+                                               }\r
 \r
-       // Setup page DOM\r
-       tinymce.DOM = new tinymce.dom.DOMUtils(document, {process_html : 0});\r
-})();\r
+                                       } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {\r
+                                               match = elem;\r
+                                               break;\r
+                                       }\r
+                               }\r
+\r
+                               elem = elem[dir];\r
+                       }\r
+\r
+                       checkSet[i] = match;\r
+               }\r
+       }\r
+}\r
+\r
+var 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
+};\r
+\r
+var posProcess = function(selector, context){\r
+       var tmpSet = [], later = "", match,\r
+               root = context.nodeType ? [context] : context;\r
+\r
+       // Position selectors must be done after the filter\r
+       // And so must :not(positional) so we move all PSEUDOs to the end\r
+       while ( (match = Expr.match.PSEUDO.exec( selector )) ) {\r
+               later += match[0];\r
+               selector = selector.replace( Expr.match.PSEUDO, "" );\r
+       }\r
 \r
-/* file:jscripts/tiny_mce/classes/dom/Event.js */\r
+       selector = Expr.relative[selector] ? selector + "*" : selector;\r
 \r
-(function() {\r
+       for ( var i = 0, l = root.length; i < l; i++ ) {\r
+               Sizzle( selector, root[i], tmpSet );\r
+       }\r
+\r
+       return Sizzle.filter( later, tmpSet );\r
+};\r
+\r
+// EXPOSE\r
+\r
+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
@@ -2301,13 +4288,12 @@ tinymce.create('static tinymce.util.XHR', {
                inits : [],\r
                events : [],\r
 \r
-               // #if !jquery\r
 \r
                add : function(o, n, f, s) {\r
                        var cb, t = this, el = t.events, r;\r
 \r
                        // Handle array\r
-                       if (o && o instanceof Array) {\r
+                       if (o && o.hasOwnProperty && o instanceof Array) {\r
                                r = [];\r
 \r
                                each(o, function(o) {\r
@@ -2369,7 +4355,7 @@ tinymce.create('static tinymce.util.XHR', {
                        var t = this, a = t.events, s = false, r;\r
 \r
                        // Handle array\r
-                       if (o && o instanceof Array) {\r
+                       if (o && o.hasOwnProperty && o instanceof Array) {\r
                                r = [];\r
 \r
                                each(o, function(o) {\r
@@ -2412,7 +4398,6 @@ tinymce.create('static tinymce.util.XHR', {
                        }\r
                },\r
 \r
-               // #endif\r
 \r
                cancel : function(e) {\r
                        if (!e)\r
@@ -2479,6 +4464,10 @@ tinymce.create('static tinymce.util.XHR', {
                _pageInit : function() {\r
                        var e = Event;\r
 \r
+                       // Keep it from running more than once\r
+                       if (e.domLoaded)\r
+                               return;\r
+\r
                        e._remove(window, 'DOMContentLoaded', e._pageInit);\r
                        e.domLoaded = true;\r
 \r
@@ -2490,33 +4479,42 @@ tinymce.create('static tinymce.util.XHR', {
                },\r
 \r
                _wait : function() {\r
-                       var t;\r
-\r
                        // No need since the document is already loaded\r
-                       if (window.tinyMCE_GZ && tinyMCE_GZ.loaded)\r
+                       if (window.tinyMCE_GZ && tinyMCE_GZ.loaded) {\r
+                               Event.domLoaded = 1;\r
                                return;\r
+                       }\r
 \r
-                       if (isIE && document.location.protocol != 'https:') {\r
-                               // Fake DOMContentLoaded on IE\r
-                               document.write('<script id=__ie_onload defer src=\'javascript:""\';><\/script>');\r
-                               DOM.get("__ie_onload").onreadystatechange = function() {\r
-                                       if (this.readyState == "complete") {\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
-                                               DOM.get("__ie_onload").onreadystatechange = null; // Prevent leak\r
                                        }\r
-                               };\r
-                       } else {\r
-                               Event._add(window, 'DOMContentLoaded', Event._pageInit, Event);\r
+                               });\r
+\r
+                               if (document.documentElement.doScroll && window == window.top) {\r
+                                       (function() {\r
+                                               if (Event.domLoaded)\r
+                                                       return;\r
 \r
-                               if (isIE || isWebKit) {\r
-                                       t = setInterval(function() {\r
-                                               if (/loaded|complete/.test(document.readyState)) {\r
-                                                       clearInterval(t);\r
-                                                       Event._pageInit();\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
+                                               } catch (ex) {\r
+                                                       setTimeout(arguments.callee, 0);\r
+                                                       return;\r
                                                }\r
-                                       }, 10);\r
+\r
+                                               Event._pageInit();\r
+                                       })();\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
 \r
                });\r
@@ -2527,11 +4525,8 @@ tinymce.create('static tinymce.util.XHR', {
        // Dispatch DOM content loaded event for IE and Safari\r
        Event._wait();\r
        tinymce.addUnload(Event._unload);\r
-})();\r
-\r
-/* file:jscripts/tiny_mce/classes/dom/Element.js */\r
-\r
-(function() {\r
+})(tinymce);\r
+(function(tinymce) {\r
        var each = tinymce.each;\r
 \r
        tinymce.create('tinymce.dom.Element', {\r
@@ -2571,22 +4566,15 @@ tinymce.create('static tinymce.util.XHR', {
                                'get'\r
                        ], function(k) {\r
                                t[k] = function() {\r
-                                       var a = arguments, o;\r
-\r
-                                       // Opera fails\r
-                                       if (tinymce.isOpera) {\r
-                                               a = [id];\r
+                                       var a = [id], i;\r
 \r
-                                               each(arguments, function(v) {\r
-                                                       a.push(v);\r
-                                               });\r
-                                       } else\r
-                                               Array.prototype.unshift.call(a, el || id);\r
+                                       for (i = 0; i < arguments.length; i++)\r
+                                               a.push(arguments[i]);\r
 \r
-                                       o = dom[k].apply(dom, a);\r
+                                       a = dom[k].apply(dom, a);\r
                                        t.update(k);\r
 \r
-                                       return o;\r
+                                       return a;\r
                                };\r
                        });\r
                },\r
@@ -2664,11 +4652,12 @@ tinymce.create('static tinymce.util.XHR', {
                }\r
 \r
                });\r
-})();\r
-\r
-/* file:jscripts/tiny_mce/classes/dom/Selection.js */\r
+})(tinymce);\r
+(function(tinymce) {\r
+       function trimNl(s) {\r
+               return s.replace(/[\n\r]+/g, '');\r
+       };\r
 \r
-(function() {\r
        // Shorten names\r
        var is = tinymce.is, isIE = tinymce.isIE, each = tinymce.each;\r
 \r
@@ -2680,6 +4669,20 @@ tinymce.create('static tinymce.util.XHR', {
                        t.win = win;\r
                        t.serializer = serializer;\r
 \r
+                       // Add events\r
+                       each([\r
+                               'onBeforeSetContent',\r
+                               'onBeforeGetContent',\r
+                               'onSetContent',\r
+                               'onGetContent'\r
+                       ], function(e) {\r
+                               t[e] = new tinymce.util.Dispatcher(t);\r
+                       });\r
+\r
+                       // No W3C Range support\r
+                       if (!t.win.getSelection)\r
+                               t.tridentSel = new tinymce.dom.TridentSelection(t);\r
+\r
                        // Prevent leaks\r
                        tinymce.addUnload(t.destroy, t);\r
                },\r
@@ -2691,6 +4694,7 @@ tinymce.create('static tinymce.util.XHR', {
                        wb = wa = '';\r
                        s.get = true;\r
                        s.format = s.format || 'html';\r
+                       t.onBeforeGetContent.dispatch(t, s);\r
 \r
                        if (s.format == 'text')\r
                                return t.isCollapsed() ? '' : (r.text || (se.toString ? se.toString() : ''));\r
@@ -2714,45 +4718,59 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                        s.getInner = true;\r
 \r
-                       return t.isCollapsed() ? '' : wb + t.serializer.serialize(e, s) + wa;\r
+                       s.content = t.isCollapsed() ? '' : wb + t.serializer.serialize(e, s) + wa;\r
+                       t.onGetContent.dispatch(t, s);\r
+\r
+                       return s.content;\r
                },\r
 \r
                setContent : function(h, s) {\r
-                       var t = this, r = t.getRng(), d;\r
+                       var t = this, r = t.getRng(), c, d = t.win.document;\r
 \r
                        s = s || {format : 'html'};\r
                        s.set = true;\r
-                       h = t.dom.processHTML(h);\r
+                       h = s.content = t.dom.processHTML(h);\r
+\r
+                       // Dispatch before set content event\r
+                       t.onBeforeSetContent.dispatch(t, s);\r
+                       h = s.content;\r
 \r
                        if (r.insertNode) {\r
-                               d = t.win.document;\r
-\r
-                               // Gecko has a bug where if you insert &nbsp; using InsertHTML it will insert a space instead\r
-                               // So we simply check if the input is HTML or text and then insert text using the insertNode method\r
-                               if (tinymce.isGecko && h.indexOf('<') == -1) {\r
-                                       r.deleteContents();\r
-                                       r.insertNode(t.getRng().createContextualFragment(h + '<span id="__caret">_</span>'));\r
-                                       t.select(t.dom.get('__caret'));\r
-                                       t.getRng().deleteContents();\r
-                                       return;\r
-                               }\r
+                               // Make caret marker since insertNode places the caret in the beginning of text after insert\r
+                               h += '<span id="__caret">_</span>';\r
 \r
-                               // Use insert HTML if it exists (places cursor after content)\r
-                               try {\r
-                                       // This might fail with an exception see bug #1893736\r
-                                       if (d.queryCommandEnabled('InsertHTML'))\r
-                                               return d.execCommand('InsertHTML', false, h);\r
-                               } catch (ex) {\r
-                                       // Use old school method\r
-                                       r.deleteContents();\r
-                                       r.insertNode(t.getRng().createContextualFragment(h));\r
-                               }\r
+                               // Delete and insert new node\r
+                               r.deleteContents();\r
+                               r.insertNode(t.getRng().createContextualFragment(h));\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
+                               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
-                               if (r.item)\r
-                                       r.item(0).outerHTML = h;\r
-                               else\r
-                                       r.pasteHTML(h);\r
+                               if (r.item) {\r
+                                       // Delete content and get caret text selection\r
+                                       d.execCommand('Delete', false, null);\r
+                                       r = t.getRng();\r
+                               }\r
+\r
+                               r.pasteHTML(h);\r
                        }\r
+\r
+                       // Dispatch set content event\r
+                       t.onSetContent.dispatch(t, s);\r
                },\r
 \r
                getStart : function() {\r
@@ -2766,7 +4784,7 @@ tinymce.create('static tinymce.util.XHR', {
                                r.collapse(1);\r
                                e = r.parentElement();\r
 \r
-                               if (e.nodeName == 'BODY')\r
+                               if (e && e.nodeName == 'BODY')\r
                                        return e.firstChild;\r
 \r
                                return e;\r
@@ -2776,7 +4794,7 @@ tinymce.create('static tinymce.util.XHR', {
                                if (e.nodeName == 'BODY')\r
                                        return e.firstChild;\r
 \r
-                               return t.dom.getParent(e, function(n) {return n.nodeType == 1;});\r
+                               return t.dom.getParent(e, '*');\r
                        }\r
                },\r
 \r
@@ -2791,7 +4809,7 @@ tinymce.create('static tinymce.util.XHR', {
                                r.collapse(0);\r
                                e = r.parentElement();\r
 \r
-                               if (e.nodeName == 'BODY')\r
+                               if (e && e.nodeName == 'BODY')\r
                                        return e.lastChild;\r
 \r
                                return e;\r
@@ -2801,7 +4819,7 @@ tinymce.create('static tinymce.util.XHR', {
                                if (e.nodeName == 'BODY')\r
                                        return e.lastChild;\r
 \r
-                               return t.dom.getParent(e, function(n) {return n.nodeType == 1;});\r
+                               return t.dom.getParent(e, '*');\r
                        }\r
                },\r
 \r
@@ -2886,7 +4904,7 @@ tinymce.create('static tinymce.util.XHR', {
                                                return d;\r
                                        }\r
 \r
-                                       p += tinymce.trim(n.nodeValue || '').length;\r
+                                       p += trimNl(n.nodeValue || '').length;\r
                                }\r
 \r
                                return null;\r
@@ -2900,7 +4918,7 @@ tinymce.create('static tinymce.util.XHR', {
                                        return {scrollX : sx, scrollY : sy};\r
 \r
                                // Count whitespace before\r
-                               (s.anchorNode.nodeValue || '').replace(/^\s+/, function(a) {wb = a.length;});\r
+                               trimNl(s.anchorNode.nodeValue || '').replace(/^\s+/, function(a) {wb = a.length;});\r
 \r
                                return {\r
                                        start : Math.max(e.start + s.anchorOffset - wb, 0),\r
@@ -2913,8 +4931,8 @@ tinymce.create('static tinymce.util.XHR', {
                                e = getPos(ro, r.startContainer, r.endContainer);\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
+                               //(r.startContainer.nodeValue || '').replace(/^\s+/, function(a) {wb = a.length;});\r
+                               //(r.endContainer.nodeValue || '').replace(/^\s+/, function(a) {wa = a.length;});\r
 \r
                                if (!e)\r
                                        return {scrollX : sx, scrollY : sy};\r
@@ -2939,10 +4957,10 @@ tinymce.create('static tinymce.util.XHR', {
                                        wa = wb = 0;\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
+                                       //nv.replace(/^\s+[^\s]/, function(a) {wb = a.length - 1;});\r
+                                       //nv.replace(/[^\s]\s+$/, function(a) {wa = a.length - 1;});\r
 \r
-                                       nvl = tinymce.trim(nv).length;\r
+                                       nvl = trimNl(nv).length;\r
                                        p += nvl;\r
 \r
                                        if (p >= sp && !d.startNode) {\r
@@ -3053,19 +5071,24 @@ tinymce.create('static tinymce.util.XHR', {
                select : function(n, c) {\r
                        var t = this, r = t.getRng(), s = t.getSel(), b, fn, ln, d = t.win.document;\r
 \r
-                       function first(n) {\r
-                               return n ? d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false).nextNode() : null;\r
-                       };\r
+                       function find(n, start) {\r
+                               var walker, o;\r
 \r
-                       function last(n) {\r
-                               var c, o, w;\r
+                               if (n) {\r
+                                       walker = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);\r
 \r
-                               if (!n)\r
-                                       return null;\r
+                                       // Find first/last non empty text node\r
+                                       while (n = walker.nextNode()) {\r
+                                               o = n;\r
 \r
-                               w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);\r
-                               while (c = w.nextNode())\r
-                                       o = c;\r
+                                               if (tinymce.trim(n.nodeValue).length != 0) {\r
+                                                       if (start)\r
+                                                               return n;\r
+                                                       else\r
+                                                               o = n;\r
+                                               }\r
+                                       }\r
+                               }\r
 \r
                                return o;\r
                        };\r
@@ -3088,14 +5111,21 @@ tinymce.create('static tinymce.util.XHR', {
                                }\r
                        } else {\r
                                if (c) {\r
-                                       fn = first(n);\r
-                                       ln = last(n);\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
-                                               //console.debug(fn, ln);\r
                                                r = d.createRange();\r
-                                               r.setStart(fn, 0);\r
-                                               r.setEnd(ln, ln.nodeValue.length);\r
+\r
+                                               if (fn.nodeName == 'BR')\r
+                                                       r.setStartBefore(fn);\r
+                                               else\r
+                                                       r.setStart(fn, 0);\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
@@ -3113,7 +5143,7 @@ tinymce.create('static tinymce.util.XHR', {
                        if (!r || r.item)\r
                                return false;\r
 \r
-                       return !s || r.boundingWidth == 0 || s.isCollapsed;\r
+                       return !s || r.boundingWidth == 0 || r.collapsed;\r
                },\r
 \r
                collapse : function(b) {\r
@@ -3136,11 +5166,15 @@ tinymce.create('static tinymce.util.XHR', {
                        return w.getSelection ? w.getSelection() : w.document.selection;\r
                },\r
 \r
-               getRng : function() {\r
-                       var t = this, s = t.getSel(), r;\r
+               getRng : function(w3c) {\r
+                       var t = this, s, r;\r
+\r
+                       // Found tridentSel object then we need to use that one\r
+                       if (w3c && t.tridentSel)\r
+                               return t.tridentSel.getRangeAt(0);\r
 \r
                        try {\r
-                               if (s)\r
+                               if (s = t.getSel())\r
                                        r = s.rangeCount > 0 ? s.getRangeAt(0) : (s.createRange ? s.createRange() : t.win.document.createRange());\r
                        } catch (ex) {\r
                                // IE throws unspecified error here if TinyMCE is placed in a frame/iframe\r
@@ -3156,16 +5190,23 @@ tinymce.create('static tinymce.util.XHR', {
                },\r
 \r
                setRng : function(r) {\r
-                       var s;\r
+                       var s, t = this;\r
 \r
-                       if (!isIE) {\r
-                               s = this.getSel();\r
+                       if (!t.tridentSel) {\r
+                               s = t.getSel();\r
 \r
                                if (s) {\r
                                        s.removeAllRanges();\r
                                        s.addRange(r);\r
                                }\r
                        } else {\r
+                               // Is W3C Range\r
+                               if (r.cloneRange) {\r
+                                       t.tridentSel.addRange(r);\r
+                                       return;\r
+                               }\r
+\r
+                               // Is IE specific range\r
                                try {\r
                                        r.select();\r
                                } catch (ex) {\r
@@ -3194,38 +5235,64 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                                // Handle selection a image or other control like element such as anchors\r
                                if (!r.collapsed) {\r
-                                       if (r.startContainer == r.endContainer || (tinymce.isWebKit && r.startContainer == r.endContainer.parentNode)) {\r
-                                               if (r.startOffset - r.endOffset < 2 || tinymce.isWebKit) {\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
                                                }\r
                                        }\r
                                }\r
 \r
-                               return t.dom.getParent(e, function(n) {\r
-                                       return n.nodeType == 1;\r
-                               });\r
+                               return t.dom.getParent(e, '*');\r
                        }\r
 \r
                        return r.item ? r.item(0) : r.parentElement();\r
                },\r
 \r
+               getSelectedBlocks : function(st, en) {\r
+                       var t = this, dom = t.dom, sb, eb, n, bl = [];\r
+\r
+                       sb = dom.getParent(st || t.getStart(), dom.isBlock);\r
+                       eb = dom.getParent(en || t.getEnd(), dom.isBlock);\r
+\r
+                       if (sb)\r
+                               bl.push(sb);\r
+\r
+                       if (sb && eb && sb != eb) {\r
+                               n = sb;\r
+\r
+                               while ((n = n.nextSibling) && n != eb) {\r
+                                       if (dom.isBlock(n))\r
+                                               bl.push(n);\r
+                               }\r
+                       }\r
+\r
+                       if (eb && sb != eb)\r
+                               bl.push(eb);\r
+\r
+                       return bl;\r
+               },\r
+\r
                destroy : function(s) {\r
                        var t = this;\r
 \r
                        t.win = null;\r
 \r
+                       if (t.tridentSel)\r
+                               t.tridentSel.destroy();\r
+\r
                        // Manual destroy then remove unload handler\r
                        if (!s)\r
                                tinymce.removeUnload(t.destroy);\r
                }\r
 \r
                });\r
-})();\r
-\r
-/* file:jscripts/tiny_mce/classes/dom/XMLWriter.js */\r
-\r
-(function() {\r
+})(tinymce);\r
+(function(tinymce) {\r
        tinymce.create('tinymce.dom.XMLWriter', {\r
                node : null,\r
 \r
@@ -3295,7 +5362,11 @@ tinymce.create('static tinymce.util.XHR', {
                },\r
 \r
                writeComment : function(v) {\r
-                       this.node.appendChild(this.doc.createComment(v));\r
+                       // Fix for bug #2035694\r
+                       if (tinymce.isIE)\r
+                               v = v.replace(/^\-|\-$/g, ' ');\r
+\r
+                       this.node.appendChild(this.doc.createComment(v.replace(/\-\-/g, ' ')));\r
                },\r
 \r
                getContent : function() {\r
@@ -3312,11 +5383,8 @@ tinymce.create('static tinymce.util.XHR', {
                }\r
 \r
                });\r
-})();\r
-\r
-/* file:jscripts/tiny_mce/classes/dom/StringWriter.js */\r
-\r
-(function() {\r
+})(tinymce);\r
+(function(tinymce) {\r
        tinymce.create('tinymce.dom.StringWriter', {\r
                str : null,\r
                tags : null,\r
@@ -3442,29 +5510,11 @@ tinymce.create('static tinymce.util.XHR', {
                }\r
 \r
                });\r
-})();\r
-\r
-/* file:jscripts/tiny_mce/classes/dom/Serializer.js */\r
-\r
-(function() {\r
+})(tinymce);\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
 \r
-       // Returns only attribites that have values not all attributes in IE\r
-       function getIEAtts(n) {\r
-               var o = [];\r
-\r
-               // Object will throw exception in IE\r
-               if (n.nodeName == 'OBJECT')\r
-                       return n.attributes;\r
-\r
-               n.cloneNode(false).outerHTML.replace(/([a-z0-9\:\-_]+)=/gi, function(a, b) {\r
-                       o.push({specified : 1, nodeName : b});\r
-               });\r
-\r
-               return o;\r
-       };\r
-\r
        function wildcardToRE(s) {\r
                return s.replace(/([?+*])/g, '.$1');\r
        };\r
@@ -3477,16 +5527,11 @@ tinymce.create('static tinymce.util.XHR', {
                        t.onPreProcess = new Dispatcher(t);\r
                        t.onPostProcess = new Dispatcher(t);\r
 \r
-                       if (tinymce.relaxedDomain && tinymce.isGecko) {\r
-                               // Gecko has a bug where we can't create a new XML document if domain relaxing is used\r
+                       try {\r
+                               t.writer = new tinymce.dom.XMLWriter();\r
+                       } catch (ex) {\r
+                               // IE might throw exception if ActiveX is disabled so we then switch to the slightly slower StringWriter\r
                                t.writer = new tinymce.dom.StringWriter();\r
-                       } else {\r
-                               try {\r
-                                       t.writer = new tinymce.dom.XMLWriter();\r
-                               } catch (ex) {\r
-                                       // IE might throw exception if ActiveX is disabled so we then switch to the slightly slower StringWriter\r
-                                       t.writer = new tinymce.dom.StringWriter();\r
-                               }\r
                        }\r
 \r
                        // Default settings\r
@@ -3496,14 +5541,15 @@ tinymce.create('static tinymce.util.XHR', {
                                node_filter : 0,\r
                                attr_filter : 0,\r
                                invalid_attrs : /^(mce_|_moz_)/,\r
-                               closed : /(br|hr|input|meta|img|link|param)/,\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 : 0,\r
+                               fix_table_elements : 1,\r
                                fix_list_elements : true,\r
                                fix_content_duplication : true,\r
                                convert_fonts_to_spans : false,\r
@@ -3513,11 +5559,33 @@ tinymce.create('static tinymce.util.XHR', {
                                indent_mode : 'simple',\r
                                indent_char : '\t',\r
                                indent_levels : 1,\r
-                               remove_linebreaks : 1\r
+                               remove_linebreaks : 1,\r
+                               remove_redundant_brs : 1,\r
+                               element_format : 'xhtml'\r
                        }, s);\r
 \r
                        t.dom = s.dom;\r
 \r
+                       if (s.remove_redundant_brs) {\r
+                               t.onPostProcess.add(function(se, o) {\r
+                                       // Remove single BR at end of block elements since they get rendered\r
+                                       o.content = o.content.replace(/(<br \/>\s*)+<\/(p|h[1-6]|div|li)>/gi, function(a, b, c) {\r
+                                               // Check if it's a single element\r
+                                               if (/^<br \/>\s*<\//.test(a))\r
+                                                       return '</' + c + '>';\r
+\r
+                                               return a;\r
+                                       });\r
+                               });\r
+                       }\r
+\r
+                       // Remove XHTML element endings i.e. produce crap :) XHTML is better\r
+                       if (s.element_format == 'html') {\r
+                               t.onPostProcess.add(function(se, o) {\r
+                                       o.content = o.content.replace(/<([^>]+) \/>/g, '<$1>');\r
+                               });\r
+                       }\r
+\r
                        if (s.fix_list_elements) {\r
                                t.onPreProcess.add(function(se, o) {\r
                                        var nl, x, a = ['ol', 'ul'], i, n, p, r = /^(OL|UL)$/, np;\r
@@ -3560,41 +5628,8 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                        if (s.fix_table_elements) {\r
                                t.onPreProcess.add(function(se, o) {\r
-                                       each(t.dom.select('table', o.node), function(e) {\r
-                                               var pa = t.dom.getParent(e, 'H1,H2,H3,H4,H5,H6,P'), pa2, n, tm, pl = [], i, ns;\r
-\r
-                                               if (pa) {\r
-                                                       pa2 = pa.cloneNode(false);\r
-\r
-                                                       pl.push(e);\r
-                                                       for (n = e; n = n.parentNode;) {\r
-                                                               pl.push(n);\r
-\r
-                                                               if (n == pa)\r
-                                                                       break;\r
-                                                       }\r
-\r
-                                                       tm = pa2;\r
-                                                       for (i = pl.length - 1; i >= 0; i--) {\r
-                                                               if (i == pl.length - 1) {\r
-                                                                       while (ns = pl[i - 1].nextSibling)\r
-                                                                               tm.appendChild(ns.parentNode.removeChild(ns));\r
-                                                               } else {\r
-                                                                       n = pl[i].cloneNode(false);\r
-\r
-                                                                       if (i != 0) {\r
-                                                                               while (ns = pl[i - 1].nextSibling)\r
-                                                                                       n.appendChild(ns.parentNode.removeChild(ns));\r
-                                                                       }\r
-\r
-                                                                       tm = tm.appendChild(n);\r
-                                                               }\r
-                                                       }\r
-\r
-                                                       e = t.dom.insertAfter(e.parentNode.removeChild(e), pa);\r
-                                                       t.dom.insertAfter(e, pa);\r
-                                                       t.dom.insertAfter(pa2, e);\r
-                                               }\r
+                                       each(t.dom.select('p table', o.node), function(n) {\r
+                                               t.dom.split(t.dom.getParent(n, 'p'), n);\r
                                        });\r
                                });\r
                        }\r
@@ -3945,43 +5980,25 @@ tinymce.create('static tinymce.util.XHR', {
                // Internal functions\r
 \r
                _postProcess : function(o) {\r
-                       var t = this, s = t.settings, h = o.content, sc = [], p, l;\r
+                       var t = this, s = t.settings, h = o.content, sc = [], p;\r
 \r
                        if (o.format == 'html') {\r
                                // Protect some elements\r
                                p = t._protect({\r
                                        content : h,\r
                                        patterns : [\r
-                                               /(<script[^>]*>)(.*?)(<\/script>)/g,\r
-                                               /(<style[^>]*>)(.*?)(<\/style>)/g,\r
-                                               /(<pre[^>]*>)(.*?)(<\/pre>)/g\r
+                                               {pattern : /(<script[^>]*>)(.*?)(<\/script>)/g},\r
+                                               {pattern : /(<style[^>]*>)(.*?)(<\/style>)/g},\r
+                                               {pattern : /(<pre[^>]*>)(.*?)(<\/pre>)/g, encode : 1},\r
+                                               {pattern : /(<!--\[CDATA\[)(.*?)(\]\]-->)/g}\r
                                        ]\r
                                });\r
 \r
                                h = p.content;\r
 \r
                                // Entity encode\r
-                               if (s.entity_encoding !== 'raw') {\r
-                                       if (s.entity_encoding.indexOf('named') != -1) {\r
-                                               t.setEntities(s.entities);\r
-                                               l = t.entityLookup;\r
-\r
-                                               h = h.replace(t.entitiesRE, function(a) {\r
-                                                       var v;\r
-\r
-                                                       if (v = l[a])\r
-                                                               a = '&' + v + ';';\r
-\r
-                                                       return a;\r
-                                               });\r
-                                       }\r
-\r
-                                       if (s.entity_encoding.indexOf('numeric') != -1) {\r
-                                               h = h.replace(/[\u007E-\uFFFF]/g, function(a) {\r
-                                                       return '&#' + a.charCodeAt(0) + ';';\r
-                                               });\r
-                                       }\r
-                               }\r
+                               if (s.entity_encoding !== 'raw')\r
+                                       h = t._encode(h);\r
 \r
                                // Use BR instead of &nbsp; padded P elements inside editor and use <p>&nbsp;</p> outside editor\r
 /*                             if (o.set)\r
@@ -4017,6 +6034,9 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                                h = t._unprotect(h, p);\r
 \r
+                               // Restore CDATA sections\r
+                               h = h.replace(/<!--\[CDATA\[([\s\S]+)\]\]-->/g, '<![CDATA[$1]]>');\r
+\r
                                // 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
@@ -4124,7 +6144,7 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                                                // Add wild attributes\r
                                                if (ru.validAttribsRE) {\r
-                                                       at = isIE ? getIEAtts(n) : n.attributes;\r
+                                                       at = t.dom.getAttribs(n);\r
                                                        for (i=at.length-1; i>-1; i--) {\r
                                                                no = at[i];\r
 \r
@@ -4144,8 +6164,14 @@ tinymce.create('static tinymce.util.XHR', {
                                                }\r
 \r
                                                // Padd empty nodes with a &nbsp;\r
-                                               if (!hc && ru.padd)\r
-                                                       w.writeText('\u00a0');\r
+                                               if (ru.padd) {\r
+                                                       // If it has only one bogus child, padd it anyway workaround for <td><br /></td> bug\r
+                                                       if (hc && (cn = n.firstChild) && cn.nodeType === 1 && n.childNodes.length === 1) {\r
+                                                               if (cn.hasAttribute ? cn.hasAttribute('mce_bogus') : cn.getAttribute('mce_bogus'))\r
+                                                                       w.writeText('\u00a0');\r
+                                                       } else if (!hc)\r
+                                                               w.writeText('\u00a0'); // No children then padd it\r
+                                               }\r
 \r
                                                break;\r
 \r
@@ -4187,6 +6213,8 @@ tinymce.create('static tinymce.util.XHR', {
                },\r
 \r
                _protect : function(o) {\r
+                       var t = this;\r
+\r
                        o.items = o.items || [];\r
 \r
                        function enc(s) {\r
@@ -4212,8 +6240,13 @@ tinymce.create('static tinymce.util.XHR', {
                        };\r
 \r
                        each(o.patterns, function(p) {\r
-                               o.content = dec(enc(o.content).replace(p, function(x, a, b, c) {\r
-                                       o.items.push(dec(b));\r
+                               o.content = dec(enc(o.content).replace(p.pattern, function(x, a, b, c) {\r
+                                       b = dec(b);\r
+\r
+                                       if (p.encode)\r
+                                               b = t._encode(b);\r
+\r
+                                       o.items.push(b);\r
                                        return a + '<!--mce:' + (o.items.length - 1) + '-->' + c;\r
                                }));\r
                        });\r
@@ -4231,6 +6264,35 @@ tinymce.create('static tinymce.util.XHR', {
                        return h;\r
                },\r
 \r
+               _encode : function(h) {\r
+                       var t = this, s = t.settings, l;\r
+\r
+                       // Entity encode\r
+                       if (s.entity_encoding !== 'raw') {\r
+                               if (s.entity_encoding.indexOf('named') != -1) {\r
+                                       t.setEntities(s.entities);\r
+                                       l = t.entityLookup;\r
+\r
+                                       h = h.replace(t.entitiesRE, function(a) {\r
+                                               var v;\r
+\r
+                                               if (v = l[a])\r
+                                                       a = '&' + v + ';';\r
+\r
+                                               return a;\r
+                                       });\r
+                               }\r
+\r
+                               if (s.entity_encoding.indexOf('numeric') != -1) {\r
+                                       h = h.replace(/[\u007E-\uFFFF]/g, function(a) {\r
+                                               return '&#' + a.charCodeAt(0) + ';';\r
+                                       });\r
+                               }\r
+                       }\r
+\r
+                       return h;\r
+               },\r
+\r
                _setup : function() {\r
                        var t = this, s = this.settings;\r
 \r
@@ -4244,7 +6306,7 @@ tinymce.create('static tinymce.util.XHR', {
                        t.addValidChildRules(s.valid_child_elements);\r
 \r
                        if (s.invalid_elements)\r
-                               t.invalidElementsRE = new RegExp('^(' + wildcardToRE(s.invalid_elements.replace(',', '|').toLowerCase()) + ')$');\r
+                               t.invalidElementsRE = new RegExp('^(' + wildcardToRE(s.invalid_elements.replace(/,/g, '|').toLowerCase()) + ')$');\r
 \r
                        if (s.attrib_value_filter)\r
                                t.attribValueFilter = s.attribValueFilter;\r
@@ -4264,6 +6326,16 @@ tinymce.create('static tinymce.util.XHR', {
 \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
@@ -4308,12 +6380,9 @@ tinymce.create('static tinymce.util.XHR', {
                }\r
 \r
                });\r
-})();\r
-\r
-/* file:jscripts/tiny_mce/classes/dom/ScriptLoader.js */\r
-\r
-(function() {\r
-       var each = tinymce.each;\r
+})(tinymce);\r
+(function(tinymce) {\r
+       var each = tinymce.each, Event = tinymce.dom.Event;\r
 \r
        tinymce.create('tinymce.dom.ScriptLoader', {\r
                ScriptLoader : function(s) {\r
@@ -4365,9 +6434,9 @@ tinymce.create('static tinymce.util.XHR', {
                        }\r
 \r
                        function loadScript(u) {\r
-                               if (tinymce.dom.Event.domLoaded || t.settings.strict_mode) {\r
+                               if (Event.domLoaded || t.settings.strict_mode) {\r
                                        tinymce.util.XHR.send({\r
-                                               url : u,\r
+                                               url : tinymce._addVer(u),\r
                                                error : t.settings.error,\r
                                                async : false,\r
                                                success : function(co) {\r
@@ -4375,7 +6444,7 @@ tinymce.create('static tinymce.util.XHR', {
                                                }\r
                                        });\r
                                } else\r
-                                       document.write('<script type="text/javascript" src="' + u + '"></script>');\r
+                                       document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"></script>');\r
                        };\r
 \r
                        if (!tinymce.is(u, 'string')) {\r
@@ -4467,6 +6536,12 @@ tinymce.create('static tinymce.util.XHR', {
 \r
                                o.state = 1; // Is loading\r
 \r
+                               tinymce.dom.ScriptLoader.loadScript(o.url, function() {\r
+                                       done(o);\r
+                                       allDone();\r
+                               });\r
+\r
+                               /*\r
                                tinymce.util.XHR.send({\r
                                        url : o.url,\r
                                        error : t.settings.error,\r
@@ -4476,6 +6551,7 @@ tinymce.create('static tinymce.util.XHR', {
                                                allDone();\r
                                        }\r
                                });\r
+                               */\r
                        };\r
 \r
                        each(sc, function(o) {\r
@@ -4492,7 +6568,7 @@ tinymce.create('static tinymce.util.XHR', {
                                if (o.state > 0)\r
                                        return;\r
 \r
-                               if (!tinymce.dom.Event.domLoaded && !t.settings.strict_mode) {\r
+                               if (!Event.domLoaded && !t.settings.strict_mode) {\r
                                        var ix, ol = '';\r
 \r
                                        // Add onload events\r
@@ -4512,7 +6588,7 @@ tinymce.create('static tinymce.util.XHR', {
                                                ol += 'tinymce.dom.ScriptLoader._onLoad(this,\'' + u + '\',' + ix + ');"';\r
                                        }\r
 \r
-                                       document.write('<script type="text/javascript" src="' + u + '"' + ol + '></script>');\r
+                                       document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"' + ol + '></script>');\r
 \r
                                        if (!o.func)\r
                                                done(o);\r
@@ -4537,6 +6613,42 @@ tinymce.create('static tinymce.util.XHR', {
                        _onLoad : function(e, u, ix) {\r
                                if (!tinymce.isIE || e.readyState == 'complete')\r
                                        this._funcs[ix].call(this);\r
+                       },\r
+\r
+                       loadScript : function(u, cb) {\r
+                               var id = tinymce.DOM.uniqueId(), e;\r
+\r
+                               function done() {\r
+                                       Event.clear(id);\r
+                                       tinymce.DOM.remove(id);\r
+\r
+                                       if (cb) {\r
+                                               cb.call(document, u);\r
+                                               cb = 0;\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
+\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
+\r
+                                       // Check for head or body\r
+                                       (document.getElementsByTagName('head')[0] || document.body).appendChild(e);\r
+                               }\r
                        }\r
                }\r
 \r
@@ -4544,11 +6656,8 @@ tinymce.create('static tinymce.util.XHR', {
 \r
        // Global script loader\r
        tinymce.ScriptLoader = new tinymce.dom.ScriptLoader();\r
-})();\r
-\r
-/* file:jscripts/tiny_mce/classes/ui/Control.js */\r
-\r
-(function() {\r
+})(tinymce);\r
+(function(tinymce) {\r
        // Shorten class names\r
        var DOM = tinymce.DOM, is = tinymce.is;\r
 \r
@@ -4649,10 +6758,7 @@ tinymce.create('static tinymce.util.XHR', {
                }\r
 \r
                });\r
-})();\r
-/* file:jscripts/tiny_mce/classes/ui/Container.js */\r
-\r
-tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {\r
+})(tinymce);tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {\r
        Container : function(id, s) {\r
                this.parent(id, s);\r
                this.controls = [];\r
@@ -4672,9 +6778,6 @@ tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {
 \r
        });\r
 \r
-\r
-/* file:jscripts/tiny_mce/classes/ui/Separator.js */\r
-\r
 tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {\r
        Separator : function(id, s) {\r
                this.parent(id, s);\r
@@ -4686,10 +6789,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
        }\r
 \r
        });\r
-\r
-/* file:jscripts/tiny_mce/classes/ui/MenuItem.js */\r
-\r
-(function() {\r
+(function(tinymce) {\r
        var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, walk = tinymce.walk;\r
 \r
        tinymce.create('tinymce.ui.MenuItem:tinymce.ui.Control', {\r
@@ -4718,11 +6818,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                }\r
 \r
                });\r
-})();\r
-\r
-/* file:jscripts/tiny_mce/classes/ui/Menu.js */\r
-\r
-(function() {\r
+})(tinymce);\r
+(function(tinymce) {\r
        var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, walk = tinymce.walk;\r
 \r
        tinymce.create('tinymce.ui.Menu:tinymce.ui.MenuItem', {\r
@@ -4820,10 +6917,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                }\r
 \r
                });\r
-})();\r
-/* file:jscripts/tiny_mce/classes/ui/DropMenu.js */\r
-\r
-(function() {\r
+})(tinymce);(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
@@ -4842,9 +6936,6 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        this.onShowMenu = new tinymce.util.Dispatcher(this);\r
                        this.onHideMenu = new tinymce.util.Dispatcher(this);\r
                        this.classPrefix = 'mceMenu';\r
-\r
-                       // Fix for odd IE bug: #1903622\r
-                       this.fixIE = tinymce.isIE && DOM.win.top != DOM.win;\r
                },\r
 \r
                createMenu : function(s) {\r
@@ -4934,12 +7025,12 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        t.element.update();\r
 \r
                        t.isMenuVisible = 1;\r
-                       t.mouseClickFunc = Event.add(co, t.fixIE ? 'mousedown' : 'click', function(e) {\r
+                       t.mouseClickFunc = Event.add(co, 'click', function(e) {\r
                                var m;\r
 \r
                                e = e.target;\r
 \r
-                               if (e && (e = DOM.getParent(e, 'TR')) && !DOM.hasClass(e, cp + 'ItemSub')) {\r
+                               if (e && (e = DOM.getParent(e, 'tr')) && !DOM.hasClass(e, cp + 'ItemSub')) {\r
                                        m = t.items[e.id];\r
 \r
                                        if (m.isDisabled())\r
@@ -4966,7 +7057,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                        var m, r, mi;\r
 \r
                                        e = e.target;\r
-                                       if (e && (e = DOM.getParent(e, 'TR'))) {\r
+                                       if (e && (e = DOM.getParent(e, 'tr'))) {\r
                                                m = t.items[e.id];\r
 \r
                                                if (t.lastMenu)\r
@@ -4991,6 +7082,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        if (s.keyboard_focus) {\r
                                Event.add(co, 'keydown', t._keyHandler, t);\r
                                DOM.select('a', 'menu_' + t.id)[0].focus(); // Select first link\r
+                               t._focusIdx = 0;\r
                        }\r
                },\r
 \r
@@ -5001,7 +7093,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                return;\r
 \r
                        Event.remove(co, 'mouseover', t.mouseOverFunc);\r
-                       Event.remove(co, t.fixIE ? 'mousedown' : 'click', t.mouseClickFunc);\r
+                       Event.remove(co, 'click', t.mouseClickFunc);\r
                        Event.remove(co, 'keydown', t._keyHandler);\r
                        DOM.hide(co);\r
                        t.isMenuVisible = 0;\r
@@ -5079,13 +7171,36 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                // Internal functions\r
 \r
                _keyHandler : function(e) {\r
-                       // Accessibility feature\r
-                       if (e.keyCode == 27)\r
-                               this.hideMenu();\r
+                       var t = this, kc = e.keyCode;\r
+\r
+                       function focus(d) {\r
+                               var i = t._focusIdx + d, e = DOM.select('a', 'menu_' + t.id)[i];\r
+\r
+                               if (e) {\r
+                                       t._focusIdx = i;\r
+                                       e.focus();\r
+                               }\r
+                       };\r
+\r
+                       switch (kc) {\r
+                               case 38:\r
+                                       focus(-1); // Select first link\r
+                                       return;\r
+\r
+                               case 40:\r
+                                       focus(1);\r
+                                       return;\r
+\r
+                               case 13:\r
+                                       return;\r
+\r
+                               case 27:\r
+                                       return this.hideMenu();\r
+                       }\r
                },\r
 \r
                _add : function(tb, o) {\r
-                       var n, s = o.settings, a, ro, it, cp = this.classPrefix;\r
+                       var n, s = o.settings, a, ro, it, cp = this.classPrefix, ic;\r
 \r
                        if (s.separator) {\r
                                ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'ItemSeparator'});\r
@@ -5103,7 +7218,12 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 \r
                        DOM.addClass(it, s['class']);\r
 //                     n = DOM.add(n, 'span', {'class' : 'item'});\r
-                       DOM.add(n, 'span', {'class' : 'mceIcon' + (s.icon ? ' mce_' + s.icon : '')});\r
+\r
+                       ic = DOM.add(n, 'span', {'class' : 'mceIcon' + (s.icon ? ' mce_' + s.icon : '')});\r
+\r
+                       if (s.icon_src)\r
+                               DOM.add(ic, 'img', {src : s.icon_src});\r
+\r
                        n = DOM.add(n, s.element || 'span', {'class' : 'mceText', title : o.settings.title}, o.settings.title);\r
 \r
                        if (o.settings.style)\r
@@ -5125,10 +7245,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                }\r
 \r
                });\r
-})();\r
-/* file:jscripts/tiny_mce/classes/ui/Button.js */\r
-\r
-(function() {\r
+})(tinymce);(function(tinymce) {\r
        var DOM = tinymce.DOM;\r
 \r
        tinymce.create('tinymce.ui.Button:tinymce.ui.Control', {\r
@@ -5138,12 +7255,15 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                },\r
 \r
                renderHTML : function() {\r
-                       var cp = this.classPrefix, s = this.settings, h = '<a id="' + this.id + '" href="javascript:;" class="' + cp + ' ' + cp + 'Enabled ' + s['class'] + '" onmousedown="return false;" onclick="return false;" title="' + DOM.encode(s.title) + '">';\r
+                       var cp = this.classPrefix, s = this.settings, h, l;\r
+\r
+                       l = DOM.encode(s.label || '');\r
+                       h = '<a id="' + this.id + '" href="javascript:;" class="' + cp + ' ' + cp + 'Enabled ' + s['class'] + (l ? ' ' + cp + 'Labeled' : '') +'" onmousedown="return false;" onclick="return false;" title="' + DOM.encode(s.title) + '">';\r
 \r
                        if (s.image)\r
-                               h += '<img class="mceIcon" src="' + s.image + '" /></a>';\r
+                               h += '<img class="mceIcon" src="' + s.image + '" />' + l + '</a>';\r
                        else\r
-                               h += '<span class="mceIcon ' + s['class'] + '"></span></a>';\r
+                               h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '') + '</a>';\r
 \r
                        return h;\r
                },\r
@@ -5158,11 +7278,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                }\r
 \r
                });\r
-})();\r
-\r
-/* file:jscripts/tiny_mce/classes/ui/ListBox.js */\r
-\r
-(function() {\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.ListBox:tinymce.ui.Control', {\r
@@ -5178,34 +7295,57 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        t.classPrefix = 'mceListBox';\r
                },\r
 \r
-               select : function(v) {\r
-                       var t = this, e, fv;\r
+               select : function(va) {\r
+                       var t = this, fv, f;\r
 \r
-                       // Do we need to do something?\r
-                       if (v != t.selectedValue) {\r
-                               e = DOM.get(t.id + '_text');\r
-                               t.selectedValue = v;\r
+                       if (va == undefined)\r
+                               return t.selectByIndex(-1);\r
+\r
+                       // Is string or number make function selector\r
+                       if (va && va.call)\r
+                               f = va;\r
+                       else {\r
+                               f = function(v) {\r
+                                       return v == va;\r
+                               };\r
+                       }\r
 \r
+                       // Do we need to do something?\r
+                       if (va != t.selectedValue) {\r
                                // Find item\r
-                               each(t.items, function(o) {\r
-                                       if (o.value == v) {\r
-                                               DOM.setHTML(e, DOM.encode(o.title));\r
+                               each(t.items, function(o, i) {\r
+                                       if (f(o.value)) {\r
                                                fv = 1;\r
+                                               t.selectByIndex(i);\r
                                                return false;\r
                                        }\r
                                });\r
 \r
-                               // If no item was found then present title\r
-                               if (!fv) {\r
+                               if (!fv)\r
+                                       t.selectByIndex(-1);\r
+                       }\r
+               },\r
+\r
+               selectByIndex : function(idx) {\r
+                       var t = this, e, o;\r
+\r
+                       if (idx != t.selectedIndex) {\r
+                               e = DOM.get(t.id + '_text');\r
+                               o = t.items[idx];\r
+\r
+                               if (o) {\r
+                                       t.selectedValue = o.value;\r
+                                       t.selectedIndex = idx;\r
+                                       DOM.setHTML(e, DOM.encode(o.title));\r
+                                       DOM.removeClass(e, 'mceTitle');\r
+                               } else {\r
                                        DOM.setHTML(e, DOM.encode(t.settings.title));\r
                                        DOM.addClass(e, 'mceTitle');\r
-                                       e = 0;\r
-                                       return;\r
-                               } else\r
-                                       DOM.removeClass(e, 'mceTitle');\r
-                       }\r
+                                       t.selectedValue = t.selectedIndex = null;\r
+                               }\r
 \r
-                       e = 0;\r
+                               e = 0;\r
+                       }\r
                },\r
 \r
                add : function(n, v, o) {\r
@@ -5242,6 +7382,9 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        if (t.isDisabled() || t.items.length == 0)\r
                                return;\r
 \r
+                       if (t.menu && t.menu.isMenuVisible)\r
+                               return t.hideMenu();\r
+\r
                        if (!t.isMenuRendered) {\r
                                t.renderMenu();\r
                                t.isMenuRendered = true;\r
@@ -5253,7 +7396,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        m = t.menu;\r
                        m.settings.offset_x = p2.x;\r
                        m.settings.offset_y = p2.y;\r
-                       m.settings.keyboard_focus = t._focused;\r
+                       m.settings.keyboard_focus = !tinymce.isOpera; // Opera is buggy when it comes to auto focus\r
 \r
                        // Select in menu\r
                        if (t.oldID)\r
@@ -5270,12 +7413,18 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 \r
                        Event.add(DOM.doc, 'mousedown', t.hideMenu, t);\r
                        DOM.addClass(t.id, t.classPrefix + 'Selected');\r
+\r
+                       //DOM.get(t.id + '_text').focus();\r
                },\r
 \r
                hideMenu : function(e) {\r
                        var t = this;\r
 \r
-                       if (!e || !DOM.getParent(e.target, function(n) {return DOM.hasClass(n, 'mceMenu');})) {\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
 \r
@@ -5298,8 +7447,12 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 \r
                        m.add({\r
                                title : t.settings.title,\r
-                               'class' : 'mceMenuItemTitle'\r
-                       }).setDisabled(1);\r
+                               'class' : 'mceMenuItemTitle',\r
+                               onclick : function() {\r
+                                       if (t.settings.onselect('') !== false)\r
+                                               t.select(''); // Must be runned after\r
+                               }\r
+                       });\r
 \r
                        each(t.items, function(o) {\r
                                o.id = DOM.uniqueId();\r
@@ -5319,8 +7472,40 @@ 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() {t._focused = 1;});\r
-                       Event.add(t.id + '_text', 'blur', function() {t._focused = 0;});\r
+                       Event.add(t.id + '_text', 'focus', function(e) {\r
+                               if (!t._focused) {\r
+                                       t.keyDownHandler = Event.add(t.id + '_text', 'keydown', function(e) {\r
+                                               var idx = -1, v, kc = e.keyCode;\r
+\r
+                                               // Find current index\r
+                                               each(t.items, function(v, i) {\r
+                                                       if (t.selectedValue == v.value)\r
+                                                               idx = i;\r
+                                               });\r
+\r
+                                               // Move up/down\r
+                                               if (kc == 38)\r
+                                                       v = t.items[idx - 1];\r
+                                               else if (kc == 40)\r
+                                                       v = t.items[idx + 1];\r
+                                               else if (kc == 13) {\r
+                                                       // Fake select on enter\r
+                                                       v = t.selectedValue;\r
+                                                       t.selectedValue = null; // Needs to be null to fake change\r
+                                                       t.settings.onselect(v);\r
+                                                       return Event.cancel(e);\r
+                                               }\r
+\r
+                                               if (v) {\r
+                                                       t.hideMenu();\r
+                                                       t.select(v.value);\r
+                                               }\r
+                                       });\r
+                               }\r
+\r
+                               t._focused = 1;\r
+                       });\r
+                       Event.add(t.id + '_text', 'blur', function() {Event.remove(t.id + '_text', 'keydown', t.keyDownHandler); t._focused = 0;});\r
 \r
                        // Old IE doesn't have hover on all elements\r
                        if (tinymce.isIE6 || !DOM.boxModel) {\r
@@ -5345,10 +7530,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                }\r
 \r
                });\r
-})();\r
-/* file:jscripts/tiny_mce/classes/ui/NativeListBox.js */\r
-\r
-(function() {\r
+})(tinymce);(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
@@ -5365,18 +7547,40 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        return DOM.get(this.id).disabled;\r
                },\r
 \r
-               select : function(v) {\r
-                       var e = DOM.get(this.id), ol = e.options;\r
+               select : function(va) {\r
+                       var t = this, fv, f;\r
 \r
-                       v = '' + (v || '');\r
+                       if (va == undefined)\r
+                               return t.selectByIndex(-1);\r
 \r
-                       e.selectedIndex = 0;\r
-                       each(ol, function(o, i) {\r
-                               if (o.value == v) {\r
-                                       e.selectedIndex = i;\r
-                                       return false;\r
-                               }\r
-                       });\r
+                       // Is string or number make function selector\r
+                       if (va && va.call)\r
+                               f = va;\r
+                       else {\r
+                               f = function(v) {\r
+                                       return v == va;\r
+                               };\r
+                       }\r
+\r
+                       // Do we need to do something?\r
+                       if (va != t.selectedValue) {\r
+                               // Find item\r
+                               each(t.items, function(o, i) {\r
+                                       if (f(o.value)) {\r
+                                               fv = 1;\r
+                                               t.selectByIndex(i);\r
+                                               return false;\r
+                                       }\r
+                               });\r
+\r
+                               if (!fv)\r
+                                       t.selectByIndex(-1);\r
+                       }\r
+               },\r
+\r
+               selectByIndex : function(idx) {\r
+                       DOM.get(this.id).selectedIndex = idx + 1;\r
+                       this.selectedValue = this.items[idx] ? this.items[idx].value : null;\r
                },\r
 \r
                add : function(n, v, a) {\r
@@ -5422,12 +7626,14 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                        t.rendered = true;\r
 \r
                        function onChange(e) {\r
-                               var v = e.target.options[e.target.selectedIndex].value;\r
+                               var v = t.items[e.target.selectedIndex - 1];\r
 \r
-                               t.onChange.dispatch(t, v);\r
+                               if (v && (v = v.value)) {\r
+                                       t.onChange.dispatch(t, v);\r
 \r
-                               if (t.settings.onselect)\r
-                                       t.settings.onselect(v);\r
+                                       if (t.settings.onselect)\r
+                                               t.settings.onselect(v);\r
+                               }\r
                        };\r
 \r
                        Event.add(t.id, 'change', onChange);\r
@@ -5453,10 +7659,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                }\r
 \r
                });\r
-})();\r
-/* file:jscripts/tiny_mce/classes/ui/MenuButton.js */\r
-\r
-(function() {\r
+})(tinymce);(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
@@ -5477,6 +7680,9 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                t.isMenuRendered = true;\r
                        }\r
 \r
+                       if (t.isMenuVisible)\r
+                               return t.hideMenu();\r
+\r
                        p1 = DOM.getPos(t.settings.menu_container);\r
                        p2 = DOM.getPos(e);\r
 \r
@@ -5490,6 +7696,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 \r
                        Event.add(DOM.doc, 'mousedown', t.hideMenu, t);\r
                        t.setState('Selected', 1);\r
+\r
+                       t.isMenuVisible = 1;\r
                },\r
 \r
                renderMenu : function() {\r
@@ -5510,12 +7718,18 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                hideMenu : function(e) {\r
                        var t = this;\r
 \r
-                       if (!e || !DOM.getParent(e.target, function(n) {return DOM.hasClass(n, 'mceMenu');})) {\r
+                       // Prevent double toogles by canceling the mouse click event to the button\r
+                       if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id || e.id === t.id + '_open';}))\r
+                               return;\r
+\r
+                       if (!e || !DOM.getParent(e.target, '.mceMenu')) {\r
                                t.setState('Selected', 0);\r
                                Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);\r
                                if (t.menu)\r
                                        t.menu.hideMenu();\r
                        }\r
+\r
+                       t.isMenuVisible = 0;\r
                },\r
 \r
                postRender : function() {\r
@@ -5532,11 +7746,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                }\r
 \r
                });\r
-})();\r
-\r
-/* file:jscripts/tiny_mce/classes/ui/SplitButton.js */\r
-\r
-(function() {\r
+})(tinymce);\r
+(function(tinymce) {\r
        var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;\r
 \r
        tinymce.create('tinymce.ui.SplitButton:tinymce.ui.MenuButton', {\r
@@ -5601,11 +7812,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                }\r
 \r
                });\r
-})();\r
-\r
-/* file:jscripts/tiny_mce/classes/ui/ColorSplitButton.js */\r
-\r
-(function() {\r
+})(tinymce);\r
+(function(tinymce) {\r
        var DOM = tinymce.DOM, Event = tinymce.dom.Event, is = tinymce.is, each = tinymce.each;\r
 \r
        tinymce.create('tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton', {\r
@@ -5620,6 +7828,9 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                default_color : '#888888'\r
                        }, t.settings);\r
 \r
+                       t.onShowMenu = new tinymce.util.Dispatcher(t);\r
+                       t.onHideMenu = new tinymce.util.Dispatcher(t);\r
+\r
                        t.value = s.default_color;\r
                },\r
 \r
@@ -5634,6 +7845,9 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                                t.isMenuRendered = true;\r
                        }\r
 \r
+                       if (t.isMenuVisible)\r
+                               return t.hideMenu();\r
+\r
                        e = DOM.get(t.id);\r
                        DOM.show(t.id + '_menu');\r
                        DOM.addClass(e, 'mceSplitButtonSelected');\r
@@ -5655,17 +7869,29 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 \r
                                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
                hideMenu : function(e) {\r
                        var t = this;\r
 \r
-                       if (!e || !DOM.getParent(e.target, function(n) {return DOM.hasClass(n, 'mceSplitButtonMenu');})) {\r
+                       // Prevent double toogles by canceling the mouse click event to the button\r
+                       if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id + '_open';}))\r
+                               return;\r
+\r
+                       if (!e || !DOM.getParent(e.target, '.mceSplitButtonMenu')) {\r
                                DOM.removeClass(t.id, 'mceSplitButtonSelected');\r
                                Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);\r
                                Event.remove(t.id + '_menu', 'keydown', t._keyHandler);\r
                                DOM.hide(t.id + '_menu');\r
                        }\r
+\r
+                       t.onHideMenu.dispatch(t);\r
+\r
+                       t.isMenuVisible = 0;\r
                },\r
 \r
                renderMenu : function() {\r
@@ -5719,6 +7945,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 \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
                        });\r
 \r
                        return w;\r
@@ -5739,6 +7967,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 \r
                        t.parent();\r
                        DOM.add(id + '_action', 'div', {id : id + '_preview', 'class' : 'mceColorPreview'});\r
+                       DOM.setStyle(t.id + '_preview', 'backgroundColor', t.value);\r
                },\r
 \r
                destroy : function() {\r
@@ -5750,10 +7979,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
                }\r
 \r
                });\r
-})();\r
-\r
-/* file:jscripts/tiny_mce/classes/ui/Toolbar.js */\r
-\r
+})(tinymce);\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
@@ -5817,10 +8043,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
        }\r
 \r
        });\r
-\r
-/* file:jscripts/tiny_mce/classes/AddOnManager.js */\r
-\r
-(function() {\r
+(function(tinymce) {\r
        var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each;\r
 \r
        tinymce.create('tinymce.AddOnManager', {\r
@@ -5834,18 +8057,15 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                },\r
 \r
                requireLangPack : function(n) {\r
-                       var u, s;\r
+                       var u, s = tinymce.EditorManager.settings;\r
 \r
-                       if (tinymce.EditorManager.settings) {\r
-                               u = this.urls[n] + '/langs/' + tinymce.EditorManager.settings.language + '.js';\r
-                               s = tinymce.EditorManager.settings;\r
+                       if (s && s.language) {\r
+                               u = this.urls[n] + '/langs/' + s.language + '.js';\r
 \r
-                               if (s) {\r
-                                       if (!tinymce.dom.Event.domLoaded && !s.strict_mode)\r
-                                               tinymce.ScriptLoader.load(u);\r
-                                       else\r
-                                               tinymce.ScriptLoader.add(u);\r
-                               }\r
+                               if (!tinymce.dom.Event.domLoaded && !s.strict_mode)\r
+                                       tinymce.ScriptLoader.load(u);\r
+                               else\r
+                                       tinymce.ScriptLoader.add(u);\r
                        }\r
                },\r
 \r
@@ -5875,10 +8095,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
        // Create plugin and theme managers\r
        tinymce.PluginManager = new tinymce.AddOnManager();\r
        tinymce.ThemeManager = new tinymce.AddOnManager();\r
-}());\r
-/* file:jscripts/tiny_mce/classes/EditorManager.js */\r
-\r
-(function() {\r
+}(tinymce));(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
 \r
@@ -5898,9 +8115,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                        tinymce.baseURL = new tinymce.util.URI(tinymce.documentBaseURL).toAbsolute(tinymce.baseURL);\r
                        tinymce.EditorManager.baseURI = new tinymce.util.URI(tinymce.baseURL);\r
 \r
-                       // Setup document domain\r
-                       if (tinymce.EditorManager.baseURI.host != lo.hostname && lo.hostname)\r
-                               document.domain = tinymce.relaxedDomain = lo.hostname.replace(/.*\.(.+\..+)$/, '$1');\r
+                       // User specified a document.domain value\r
+                       if (document.domain && lo.hostname != document.domain)\r
+                               tinymce.relaxedDomain = document.domain;\r
 \r
                        // Add before unload listener\r
                        // This was required since IE was leaking memory if you added and removed beforeunload listeners\r
@@ -5914,7 +8131,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                },\r
 \r
                init : function(s) {\r
-                       var t = this, pl, sl = tinymce.ScriptLoader, c;\r
+                       var t = this, pl, sl = tinymce.ScriptLoader, c, e, el = [], ed;\r
 \r
                        function execCallback(se, n, s) {\r
                                var f = se[n];\r
@@ -6020,9 +8237,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                                                if(l.length > 0) {\r
                                                        each(explode(l), function(v) {\r
-                                                               if (DOM.get(v))\r
-                                                                       new tinymce.Editor(v, s).render(1);\r
-                                                               else {\r
+                                                               if (DOM.get(v)) {\r
+                                                                       ed = new tinymce.Editor(v, s);\r
+                                                                       el.push(ed);\r
+                                                                       ed.render(1);\r
+                                                               } else {\r
                                                                        c = 0;\r
 \r
                                                                        each(document.forms, function(f) {\r
@@ -6030,7 +8249,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                                                                        if (e.name === v) {\r
                                                                                                v = 'mce_editor_' + c;\r
                                                                                                DOM.setAttrib(e, 'id', v);\r
-                                                                                               new tinymce.Editor(v, s).render(1);\r
+\r
+                                                                                               ed = new tinymce.Editor(v, s);\r
+                                                                                               el.push(ed);\r
+                                                                                               ed.render(1);\r
                                                                                        }\r
                                                                                });\r
                                                                        });\r
@@ -6042,7 +8264,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                        case "textareas":\r
                                        case "specific_textareas":\r
                                                function hasClass(n, c) {\r
-                                                       return new RegExp('\\b' + c + '\\b', 'g').test(n.className);\r
+                                                       return c.constructor === RegExp ? c.test(n.className) : DOM.hasClass(n, c);\r
                                                };\r
 \r
                                                each(DOM.select('textarea'), function(v) {\r
@@ -6050,13 +8272,18 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                                                return;\r
 \r
                                                        if (!s.editor_selector || hasClass(v, s.editor_selector)) {\r
-                                                               v.id = v.id || v.name;\r
+                                                               // Can we use the name\r
+                                                               e = DOM.get(v.name);\r
+                                                               if (!v.id && !e)\r
+                                                                       v.id = v.name;\r
 \r
                                                                // Generate unique name if missing or already exists\r
                                                                if (!v.id || t.get(v.id))\r
                                                                        v.id = DOM.uniqueId();\r
 \r
-                                                               new tinymce.Editor(v.id, s).render(1);\r
+                                                               ed = new tinymce.Editor(v.id, s);\r
+                                                               el.push(ed);\r
+                                                               ed.render(1);\r
                                                        }\r
                                                });\r
                                                break;\r
@@ -6066,7 +8293,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                                if (s.oninit) {\r
                                        l = co = 0;\r
 \r
-                                       each (t.editors, function(ed) {\r
+                                       each (el, function(ed) {\r
                                                co++;\r
 \r
                                                if (!ed.initialized) {\r
@@ -6137,7 +8364,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                                case "mceAddEditor":\r
                                case "mceAddControl":\r
-                                       new tinymce.Editor(v, t.settings).render();\r
+                                       if (!t.get(v))\r
+                                               new tinymce.Editor(v, t.settings).render();\r
+\r
                                        return true;\r
 \r
                                case "mceAddFrameControl":\r
@@ -6170,7 +8399,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 \r
                                case "mceRemoveEditor":\r
                                case "mceRemoveControl":\r
-                                       ed.remove();\r
+                                       if (ed)\r
+                                               ed.remove();\r
+\r
                                        return true;\r
 \r
                                case 'mceToggleEditor':\r
@@ -6239,14 +8470,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
                });\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
-\r
-/* file:jscripts/tiny_mce/classes/Editor.js */\r
-\r
-(function() {\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
@@ -6338,13 +8566,16 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                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,-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|_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],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[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
                                hidden_input : 1,\r
                                padd_empty_editor : 1,\r
                                render_ui : 1,\r
                                init_theme : 1,\r
                                force_p_newlines : 1,\r
-                               indentation : '30px'\r
+                               indentation : '30px',\r
+                               keep_styles : 1,\r
+                               fix_table_elements : 1,\r
+                               removeformat_selector : 'span,b,strong,em,i,font,u,strike'\r
                        }, s);\r
 \r
                        // Setup URIs\r
@@ -6387,11 +8618,12 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        if (!/TEXTAREA|INPUT/i.test(t.getElement().nodeName) && s.hidden_input && DOM.getParent(id, 'form'))\r
                                DOM.insertAfter(DOM.create('input', {type : 'hidden', name : id}), id);\r
 \r
-                       t.windowManager = new tinymce.WindowManager(t);\r
+                       if (tinymce.WindowManager)\r
+                               t.windowManager = new tinymce.WindowManager(t);\r
 \r
                        if (s.encoding == 'xml') {\r
                                t.onGetContent.add(function(ed, o) {\r
-                                       if (o.get)\r
+                                       if (o.save)\r
                                                o.content = DOM.encode(o.content);\r
                                });\r
                        }\r
@@ -6407,7 +8639,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
 \r
                        if (s.add_unload_trigger) {\r
                                t._beforeUnload = tinyMCE.onBeforeUnload.add(function() {\r
-                                       if (t.initialized && !t.destroyed)\r
+                                       if (t.initialized && !t.destroyed && !t.isHidden())\r
                                                t.save({format : 'raw', no_events : true});\r
                                });\r
                        }\r
@@ -6434,7 +8666,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                                        EditorManager.triggerSave();\r
                                                        t.isNotDirty = 1;\r
 \r
-                                                       return this._mceOldSubmit(this);\r
+                                                       return t.formElement._mceOldSubmit(t.formElement);\r
                                                };\r
                                        }\r
 \r
@@ -6447,7 +8679,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                if (s.language)\r
                                        sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');\r
 \r
-                               if (s.theme.charAt(0) != '-' && !ThemeManager.urls[s.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
                                each(explode(s.plugins), function(p) {\r
@@ -6462,20 +8694,6 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
 \r
                                // Init when que is loaded\r
                                sl.loadQueue(function() {\r
-                                       if (s.ask) {\r
-                                               function ask() {\r
-                                                       t.windowManager.confirm(t.getLang('edit_confirm'), function(s) {\r
-                                                               if (s)\r
-                                                                       t.init();\r
-                                                               else\r
-                                                                       Event.remove(t.id, 'focus', ask);\r
-                                                       });\r
-                                               };\r
-\r
-                                               Event.add(t.id, 'focus', ask);\r
-                                               return;\r
-                                       }\r
-\r
                                        if (!t.removed)\r
                                                t.init();\r
                                });\r
@@ -6495,12 +8713,14 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        EditorManager.add(t);\r
 \r
                        // Create theme\r
-                       s.theme = s.theme.replace(/-/, '');\r
-                       o = ThemeManager.get(s.theme);\r
-                       t.theme = new o();\r
+                       if (s.theme) {\r
+                               s.theme = s.theme.replace(/-/, '');\r
+                               o = ThemeManager.get(s.theme);\r
+                               t.theme = new o();\r
 \r
-                       if (t.theme.init && s.init_theme)\r
-                               t.theme.init(t, ThemeManager.urls[s.theme] || tinymce.documentBaseURL.replace(/\/$/, ''));\r
+                               if (t.theme.init && s.init_theme)\r
+                                       t.theme.init(t, ThemeManager.urls[s.theme] || tinymce.documentBaseURL.replace(/\/$/, ''));\r
+                       }\r
 \r
                        // Create all plugins\r
                        each(explode(s.plugins.replace(/\-/g, '')), function(p) {\r
@@ -6517,10 +8737,12 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        });\r
 \r
                        // Setup popup CSS path(s)\r
-                       if (s.popup_css)\r
-                               s.popup_css = t.documentBaseURI.toAbsolute(s.popup_css);\r
-                       else\r
-                               s.popup_css = t.baseURI.toAbsolute("themes/" + s.theme + "/skins/" + s.skin + "/dialog.css");\r
+                       if (s.popup_css !== false) {\r
+                               if (s.popup_css)\r
+                                       s.popup_css = t.documentBaseURI.toAbsolute(s.popup_css);\r
+                               else\r
+                                       s.popup_css = t.baseURI.toAbsolute("themes/" + s.theme + "/skins/" + s.skin + "/dialog.css");\r
+                       }\r
 \r
                        if (s.popup_css_add)\r
                                s.popup_css += ',' + t.documentBaseURI.toAbsolute(s.popup_css_add);\r
@@ -6531,7 +8753,8 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
 \r
                        // Pass through\r
                        t.undoManager.onAdd.add(function(um, l) {\r
-                               return t.onChange.dispatch(t, l, um);\r
+                               if (!l.initial)\r
+                                       return t.onChange.dispatch(t, l, um);\r
                        });\r
 \r
                        t.undoManager.onUndo.add(function(um, l) {\r
@@ -6572,8 +8795,8 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
 \r
                        // Measure box\r
                        if (s.render_ui) {\r
-                               w = s.width || e.style.width || e.clientWidth;\r
-                               h = s.height || e.style.height || e.clientHeight;\r
+                               w = s.width || e.style.width || e.offsetWidth;\r
+                               h = s.height || e.style.height || e.offsetHeight;\r
                                t.orgDisplay = e.style.display;\r
                                re = /^[0-9\.]+(|px)$/i;\r
 \r
@@ -6595,18 +8818,18 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                t.editorContainer = o.editorContainer;\r
                        }\r
 \r
-                       \r
+\r
                        // Resize editor\r
                        DOM.setStyles(o.sizeContainer || o.editorContainer, {\r
                                width : w,\r
                                height : h\r
                        });\r
 \r
-                       h = (o.iframeHeight || h) + ((h + '').indexOf('%') == -1 ? (o.deltaHeight || 0) : '');\r
+                       h = (o.iframeHeight || h) + (typeof(h) == 'number' ? (o.deltaHeight || 0) : '');\r
                        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() + '"></base>';\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
 \r
                        if (tinymce.relaxedDomain)\r
@@ -6629,7 +8852,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        // Domain relaxing enabled, then set document domain\r
                        if (tinymce.relaxedDomain) {\r
                                // We need to write the contents here in IE since multiple writes messes up refresh button and back button\r
-                               if (isIE)\r
+                               if (isIE || (tinymce.isOpera && parseFloat(opera.version()) >= 9.5))\r
                                        u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";var ed = window.parent.tinyMCE.get("' + t.id + '");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()';\r
                                else if (tinymce.isOpera)\r
                                        u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";document.close();ed.setupIframe();})()';                                  \r
@@ -6650,16 +8873,10 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        DOM.get(o.editorContainer).style.display = t.orgDisplay;\r
                        DOM.get(t.id).style.display = 'none';\r
 \r
-                       // Safari 2.x requires us to wait for the load event and load a real HTML doc\r
-                       if (tinymce.isOldWebKit) {\r
-                               Event.add(n, 'load', t.setupIframe, t);\r
-                               n.src = tinymce.baseURL + '/plugins/safari/blank.htm';\r
-                       } else {\r
-                               if (!isIE || !tinymce.relaxedDomain)\r
-                                       t.setupIframe();\r
+                       if (!isIE || !tinymce.relaxedDomain)\r
+                               t.setupIframe();\r
 \r
-                               e = n = o = null; // Cleanup\r
-                       }\r
+                       e = n = o = null; // Cleanup\r
                },\r
 \r
                setupIframe : function() {\r
@@ -6675,7 +8892,8 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        // Design mode needs to be added here Ctrl+A will fail otherwise\r
                        if (!isIE) {\r
                                try {\r
-                                       d.designMode = 'On';\r
+                                       if (!s.readonly)\r
+                                               d.designMode = 'On';\r
                                } catch (ex) {\r
                                        // Will fail on Gecko if the editor is placed in an hidden container element\r
                                        // The design mode will be set ones the editor is focused\r
@@ -6687,7 +8905,10 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                // It will not steal focus if we hide it while setting contentEditable\r
                                b = t.getBody();\r
                                DOM.hide(b);\r
-                               b.contentEditable = true;\r
+\r
+                               if (!s.readonly)\r
+                                       b.contentEditable = true;\r
+\r
                                DOM.show(b);\r
                        }\r
 \r
@@ -6717,6 +8938,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                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
 \r
@@ -6740,7 +8962,8 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        if (!s.gecko_spellcheck)\r
                                t.getBody().spellcheck = 0;\r
 \r
-                       t._addEvents();\r
+                       if (!s.readonly)\r
+                               t._addEvents();\r
 \r
                        t.controlManager.onPostRender.dispatch(t, t.controlManager);\r
                        t.onPostRender.dispatch(t);\r
@@ -6890,30 +9113,47 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                });\r
                        }\r
 \r
+                       // Add visual aids when new contents is added\r
                        t.onSetContent.add(function() {\r
-                               // Safari needs some time, it will crash the browser when a link is created otherwise\r
-                               // I think this crash issue is resolved in the latest 3.0.4\r
-                               //window.setTimeout(function() {\r
-                                       t.addVisual(t.getBody());\r
-                               //}, 1);\r
+                               t.addVisual(t.getBody());\r
                        });\r
 \r
                        // Remove empty contents\r
                        if (s.padd_empty_editor) {\r
                                t.onPostProcess.add(function(ed, o) {\r
-                                       o.content = o.content.replace(/^<p>(&nbsp;|#160;|\s|\u00a0)<\/p>$/, '');\r
+                                       o.content = o.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/, '');\r
                                });\r
                        }\r
 \r
                        if (isGecko) {\r
-                               try {\r
-                                       // Design mode must be set here once again to fix a bug where\r
-                                       // Ctrl+A/Delete/Backspace didn't work if the editor was added using mceAddControl then removed then added again\r
-                                       d.designMode = 'Off';\r
-                                       d.designMode = 'On';\r
-                               } catch (ex) {\r
-                                       // Will fail on Gecko if the editor is placed in an hidden container element\r
-                                       // The design mode will be set ones the editor is focused\r
+                               // Fix gecko link bug, when a link is placed at the end of block elements there is\r
+                               // no way to move the caret behind the link. This fix adds a bogus br element after the link\r
+                               function fixLinks(ed, o) {\r
+                                       each(ed.dom.select('a'), function(n) {\r
+                                               var pn = n.parentNode;\r
+\r
+                                               if (ed.dom.isBlock(pn) && pn.lastChild === n)\r
+                                                       ed.dom.add(pn, 'br', {'mce_bogus' : 1});\r
+                                       });\r
+                               };\r
+\r
+                               t.onExecCommand.add(function(ed, cmd) {\r
+                                       if (cmd === 'CreateLink')\r
+                                               fixLinks(ed);\r
+                               });\r
+\r
+                               t.onSetContent.add(t.selection.onSetContent.add(fixLinks));\r
+\r
+                               if (!s.readonly) {\r
+                                       try {\r
+                                               // Design mode must be set here once again to fix a bug where\r
+                                               // Ctrl+A/Delete/Backspace didn't work if the editor was added using mceAddControl then removed then added again\r
+                                               d.designMode = 'Off';\r
+                                               d.designMode = 'On';\r
+                                       } catch (ex) {\r
+                                               // Will fail on Gecko if the editor is placed in an hidden container element\r
+                                               // The design mode will be set ones the editor is focused\r
+                                       }\r
                                }\r
                        }\r
 \r
@@ -6955,14 +9195,18 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        e = null;\r
                },\r
 \r
-               \r
+\r
                focus : function(sf) {\r
-                       var oed, t = this;\r
+                       var oed, t = this, ce = t.settings.content_editable;\r
 \r
                        if (!sf) {\r
-                               t.getWin().focus();\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
+                                       t.getWin().focus();\r
 \r
-                                                       }\r
+                       }\r
 \r
                        if (EditorManager.activeEditor != t) {\r
                                if ((oed = EditorManager.activeEditor) != null)\r
@@ -6998,7 +9242,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                },\r
 \r
                translate : function(s) {\r
-                       var c = this.settings.language, i18n = EditorManager.i18n;\r
+                       var c = this.settings.language || 'en', i18n = EditorManager.i18n;\r
 \r
                        if (!s)\r
                                return '';\r
@@ -7009,7 +9253,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                },\r
 \r
                getLang : function(n, dv) {\r
-                       return EditorManager.i18n[this.settings.language + '.' + n] || (is(dv) ? dv : '{#' + n + '}');\r
+                       return EditorManager.i18n[(this.settings.language || 'en') + '.' + n] || (is(dv) ? dv : '{#' + n + '}');\r
                },\r
 \r
                getParam : function(n, dv, ty) {\r
@@ -7125,7 +9369,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                },\r
 \r
                execCommand : function(cmd, ui, val, a) {\r
-                       var t = this, s = 0, o;\r
+                       var t = this, s = 0, o, st;\r
 \r
                        if (!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(cmd) && (!a || !a.skip_focus))\r
                                t.focus();\r
@@ -7135,7 +9379,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        if (o.terminate)\r
                                return false;\r
 \r
-                       // Comamnd callback\r
+                       // Command callback\r
                        if (t.execCallback('execcommand_callback', t.id, t.selection.getNode(), cmd, ui, val)) {\r
                                t.onExecCommand.dispatch(t, cmd, ui, val, a);\r
                                return true;\r
@@ -7143,9 +9387,13 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
 \r
                        // Registred commands\r
                        if (o = t.execCommands[cmd]) {\r
-                               s = o.func.call(o.scope, ui, val);\r
-                               t.onExecCommand.dispatch(t, cmd, ui, val, a);\r
-                               return s;\r
+                               st = o.func.call(o.scope, ui, val);\r
+\r
+                               // Fall through on true\r
+                               if (st !== true) {\r
+                                       t.onExecCommand.dispatch(t, cmd, ui, val, a);\r
+                                       return st;\r
+                               }\r
                        }\r
 \r
                        // Plugin commands\r
@@ -7161,7 +9409,13 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                return true;\r
 \r
                        // Theme commands\r
-                       if (t.theme.execCommand && t.theme.execCommand(cmd, ui, val)) {\r
+                       if (t.theme && t.theme.execCommand && t.theme.execCommand(cmd, ui, val)) {\r
+                               t.onExecCommand.dispatch(t, cmd, ui, val, a);\r
+                               return true;\r
+                       }\r
+\r
+                       // Execute global commands\r
+                       if (tinymce.GlobalCommands.execCommand(t, cmd, ui, val)) {\r
                                t.onExecCommand.dispatch(t, cmd, ui, val, a);\r
                                return true;\r
                        }\r
@@ -7178,15 +9432,20 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                },\r
 \r
                queryCommandState : function(c) {\r
-                       var t = this, o;\r
+                       var t = this, o, s;\r
 \r
                        // Is hidden then return undefined\r
                        if (t._isHidden())\r
                                return;\r
 \r
                        // Registred commands\r
-                       if (o = t.queryStateCommands[c])\r
-                               return o.func.call(o.scope);\r
+                       if (o = t.queryStateCommands[c]) {\r
+                               s = o.func.call(o.scope);\r
+\r
+                               // Fall though on true\r
+                               if (s !== true)\r
+                                       return s;\r
+                       }\r
 \r
                        // Registred commands\r
                        o = t.editorCommands.queryCommandState(c);\r
@@ -7202,15 +9461,20 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                },\r
 \r
                queryCommandValue : function(c) {\r
-                       var t = this, o;\r
+                       var t = this, o, s;\r
 \r
                        // Is hidden then return undefined\r
                        if (t._isHidden())\r
                                return;\r
 \r
                        // Registred commands\r
-                       if (o = t.queryValueCommands[c])\r
-                               return o.func.call(o.scope);\r
+                       if (o = t.queryValueCommands[c]) {\r
+                               s = o.func.call(o.scope);\r
+\r
+                               // Fall though on true\r
+                               if (s !== true)\r
+                                       return s;\r
+                       }\r
 \r
                        // Registred commands\r
                        o = t.editorCommands.queryCommandValue(c);\r
@@ -7265,29 +9529,38 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                load : function(o) {\r
                        var t = this, e = t.getElement(), h;\r
 \r
-                       o = o || {};\r
-                       o.load = true;\r
+                       if (e) {\r
+                               o = o || {};\r
+                               o.load = true;\r
 \r
-                       h = t.setContent(is(e.value) ? e.value : e.innerHTML, o);\r
-                       o.element = e;\r
+                               // Double encode existing entities in the value\r
+                               h = t.setContent(is(e.value) ? e.value : e.innerHTML, o);\r
+                               o.element = e;\r
 \r
-                       if (!o.no_events)\r
-                               t.onLoadContent.dispatch(t, o);\r
+                               if (!o.no_events)\r
+                                       t.onLoadContent.dispatch(t, o);\r
 \r
-                       o.element = e = null;\r
+                               o.element = e = null;\r
 \r
-                       return h;\r
+                               return h;\r
+                       }\r
                },\r
 \r
                save : function(o) {\r
                        var t = this, e = t.getElement(), h, f;\r
 \r
-                       if (!t.initialized)\r
+                       if (!e || !t.initialized)\r
                                return;\r
 \r
                        o = o || {};\r
                        o.save = true;\r
 \r
+                       // Add undo level will trigger onchange event\r
+                       if (!o.no_events) {\r
+                               t.undoManager.typing = 0;\r
+                               t.undoManager.add();\r
+                       }\r
+\r
                        o.element = e;\r
                        h = o.content = t.getContent(o);\r
 \r
@@ -7330,7 +9603,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" />', 1);\r
+                               o.content = t.dom.setHTML(t.getBody(), '<br mce_bogus="1" />');\r
                                o.format = 'raw';\r
                        }\r
 \r
@@ -7364,8 +9637,10 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                h = t.getBody().innerHTML;\r
 \r
                        h = h.replace(/^\s*|\s*$/g, '');\r
-                       o = {content : h};\r
-                       t.onGetContent.dispatch(t, o);\r
+                       o.content = h;\r
+\r
+                       if (!o.no_events)\r
+                               t.onGetContent.dispatch(t, o);\r
 \r
                        return o.content;\r
                },\r
@@ -7513,7 +9788,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                tinyMCE.onBeforeUnload.remove(t._beforeUnload);\r
 \r
                                // Manual destroy\r
-                               if (t.theme.destroy)\r
+                               if (t.theme && t.theme.destroy)\r
                                        t.theme.destroy();\r
 \r
                                // Destroy controls, selection and dom\r
@@ -7522,8 +9797,14 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                t.dom.destroy();\r
 \r
                                // Remove all events\r
-                               Event.clear(t.getWin());\r
-                               Event.clear(t.getDoc());\r
+\r
+                               // Don't clear the window or document if content editable\r
+                               // is enabled since other instances might still be present\r
+                               if (!t.settings.content_editable) {\r
+                                       Event.clear(t.getWin());\r
+                                       Event.clear(t.getDoc());\r
+                               }\r
+\r
                                Event.clear(t.getBody());\r
                                Event.clear(t.formElement);\r
                        }\r
@@ -7579,37 +9860,19 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                        case 'contextmenu':\r
                                                if (tinymce.isOpera) {\r
                                                        // Fake contextmenu on Opera\r
-                                                       Event.add(t.getDoc(), 'mousedown', function(e) {\r
+                                                       Event.add(t.getBody(), 'mousedown', function(e) {\r
                                                                if (e.ctrlKey) {\r
                                                                        e.fakeType = 'contextmenu';\r
                                                                        eventHandler(e);\r
                                                                }\r
                                                        });\r
                                                } else\r
-                                                       Event.add(t.getDoc(), k, eventHandler);\r
+                                                       Event.add(t.getBody(), k, eventHandler);\r
                                                break;\r
 \r
                                        case 'paste':\r
                                                Event.add(t.getBody(), k, function(e) {\r
-                                                       var tx, h, el, r;\r
-\r
-                                                       // Get plain text data\r
-                                                       if (e.clipboardData)\r
-                                                               tx = e.clipboardData.getData('text/plain');\r
-                                                       else if (tinymce.isIE)\r
-                                                               tx = t.getWin().clipboardData.getData('Text');\r
-\r
-                                                       // Get HTML data\r
-                                                       /*if (tinymce.isIE) {\r
-                                                               el = DOM.add(DOM.doc.body, 'div', {style : 'visibility:hidden;overflow:hidden;position:absolute;width:1px;height:1px'});\r
-                                                               r = DOM.doc.body.createTextRange();\r
-                                                               r.moveToElementText(el);\r
-                                                               r.execCommand('Paste');\r
-                                                               h = el.innerHTML;\r
-                                                               DOM.remove(el);\r
-                                                       }*/\r
-\r
-                                                       eventHandler(e, {text : tx, html : h});\r
+                                                       eventHandler(e);\r
                                                });\r
                                                break;\r
 \r
@@ -7627,7 +9890,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                t.focus(true);\r
                        });\r
 \r
-                       \r
+\r
                        // Fixes bug where a specified document_base_uri could result in broken images\r
                        // This will also fix drag drop of images in Gecko\r
                        if (tinymce.isGecko) {\r
@@ -7656,7 +9919,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                function setOpts() {\r
                                        var t = this, d = t.getDoc(), s = t.settings;\r
 \r
-                                       if (isGecko) {\r
+                                       if (isGecko && !s.readonly) {\r
                                                if (t._isHidden()) {\r
                                                        try {\r
                                                                if (!s.content_editable)\r
@@ -7672,7 +9935,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                                } catch (ex) {\r
                                                        // Use old method\r
                                                        if (!t._isHidden())\r
-                                                               d.execCommand("useCSS", 0, true);\r
+                                                               try {d.execCommand("useCSS", 0, true);} catch (ex) {}\r
                                                }\r
 \r
                                                if (!s.table_inline_editing)\r
@@ -7688,95 +9951,19 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        }\r
 \r
                        // Add node change handlers\r
-                       t.onMouseUp.add(t.nodeChanged);\r
-                       t.onClick.add(t.nodeChanged);\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.keyCode == 46 || e.keyCode == 8 || e.ctrlKey)\r
-                                       t.nodeChanged();\r
-                       });\r
-\r
-                       // Add reset handler\r
-                       t.onReset.add(function() {\r
-                               t.setContent(t.startContent, {format : 'raw'});\r
-                       });\r
-\r
-                       if (t.getParam('tab_focus')) {\r
-                               function tabCancel(ed, e) {\r
-                                       if (e.keyCode === 9)\r
-                                               return Event.cancel(e);\r
-                               };\r
-\r
-                               function tabHandler(ed, e) {\r
-                                       var x, i, f, el, v;\r
-\r
-                                       function find(d) {\r
-                                               f = DOM.getParent(ed.id, 'form');\r
-                                               el = f.elements;\r
-\r
-                                               if (f) {\r
-                                                       each(el, function(e, i) {\r
-                                                               if (e.id == ed.id) {\r
-                                                                       x = i;\r
-                                                                       return false;\r
-                                                               }\r
-                                                       });\r
-\r
-                                                       if (d > 0) {\r
-                                                               for (i = x + 1; i < el.length; i++) {\r
-                                                                       if (el[i].type != 'hidden')\r
-                                                                               return el[i];\r
-                                                               }\r
-                                                       } else {\r
-                                                               for (i = x - 1; i >= 0; i--) {\r
-                                                                       if (el[i].type != 'hidden')\r
-                                                                               return el[i];\r
-                                                               }\r
-                                                       }\r
-                                               }\r
-\r
-                                               return null;\r
-                                       };\r
-\r
-                                       if (e.keyCode === 9) {\r
-                                               v = explode(ed.getParam('tab_focus'));\r
-\r
-                                               if (v.length == 1) {\r
-                                                       v[1] = v[0];\r
-                                                       v[0] = ':prev';\r
-                                               }\r
-\r
-                                               // Find element to focus\r
-                                               if (e.shiftKey) {\r
-                                                       if (v[0] == ':prev')\r
-                                                               el = find(-1);\r
-                                                       else\r
-                                                               el = DOM.get(v[0]);\r
-                                               } else {\r
-                                                       if (v[1] == ':next')\r
-                                                               el = find(1);\r
-                                                       else\r
-                                                               el = DOM.get(v[1]);\r
-                                               }\r
-\r
-                                               if (el) {\r
-                                                       if (ed = EditorManager.get(el.id || el.name))\r
-                                                               ed.focus();\r
-                                                       else\r
-                                                               window.setTimeout(function() {window.focus();el.focus();}, 10);\r
-\r
-                                                       return Event.cancel(e);\r
-                                               }\r
-                                       }\r
-                               };\r
+                       t.onMouseUp.add(t.nodeChanged);\r
+                       t.onClick.add(t.nodeChanged);\r
+                       t.onKeyUp.add(function(ed, e) {\r
+                               var c = e.keyCode;\r
 \r
-                               t.onKeyUp.add(tabCancel);\r
+                               if ((c >= 33 && c <= 36) || (c >= 37 && c <= 40) || c == 13 || c == 45 || c == 46 || c == 8 || (tinymce.isMac && (c == 91 || c == 93)) || e.ctrlKey)\r
+                                       t.nodeChanged();\r
+                       });\r
 \r
-                               if (isGecko) {\r
-                                       t.onKeyPress.add(tabHandler);\r
-                                       t.onKeyDown.add(tabCancel);\r
-                               } else\r
-                                       t.onKeyDown.add(tabHandler);\r
-                       }\r
+                       // Add reset handler\r
+                       t.onReset.add(function() {\r
+                               t.setContent(t.startContent, {format : 'raw'});\r
+                       });\r
 \r
                        // Add shortcuts\r
                        if (s.custom_shortcuts) {\r
@@ -7807,7 +9994,9 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                                return v;\r
 \r
                                        each(t.shortcuts, function(o) {\r
-                                               if (o.ctrl != e.ctrlKey && (!tinymce.isMac || o.ctrl == e.metaKey))\r
+                                               if (tinymce.isMac && o.ctrl != e.metaKey)\r
+                                                       return;\r
+                                               else if (!tinymce.isMac && o.ctrl != e.ctrlKey)\r
                                                        return;\r
 \r
                                                if (o.alt != e.altKey)\r
@@ -7856,7 +10045,6 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                        var re = t.resizeInfo, cb;\r
 \r
                                        e = e.target;\r
-                                       e.removeAttribute('mce_style'); // Remove this one since it might change\r
 \r
                                        // Don't do this action for non image elements\r
                                        if (e.nodeName !== 'IMG')\r
@@ -7904,6 +10092,16 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                                        }\r
                                        }\r
                                });\r
+\r
+                               /*if (t.dom.boxModel) {\r
+                                       t.getBody().style.height = '100%';\r
+\r
+                                       Event.add(t.getWin(), 'resize', function(e) {\r
+                                               var docElm = t.getDoc().documentElement;\r
+\r
+                                               docElm.style.height = (docElm.offsetHeight - 10) + 'px';\r
+                                       });\r
+                               }*/\r
                        }\r
 \r
                        if (tinymce.isOpera) {\r
@@ -7987,15 +10185,15 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
 \r
                                                        case 'U':\r
                                                        case 'STRIKE':\r
-                                                               sp = dom.create('span', {style : dom.getAttrib(n, 'style')});\r
-                                                               sp.style.textDecoration = n.nodeName == 'U' ? 'underline' : 'line-through';\r
-                                                               dom.setAttrib(sp, 'mce_style', '');\r
-                                                               dom.replace(sp, n, 1);\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), function(n) {\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
@@ -8026,8 +10224,9 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        t.onPreProcess.add(convert);\r
 \r
                        if (!s.cleanup_on_startup) {\r
-                               t.onInit.add(function() {\r
-                                       convert(t, {node : t.getBody(), set : 1});\r
+                               t.onSetContent.add(function(ed, o) {\r
+                                       if (o.initial)\r
+                                               convert(t, {node : t.getBody(), set : 1});\r
                                });\r
                        }\r
                },\r
@@ -8049,104 +10248,49 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        if (cl = s.font_size_classes)\r
                                cl = explode(cl);\r
 \r
-                       function convertToFonts(no) {\r
-                               var n, f, nl, x, i, v, st;\r
+                       function process(no) {\r
+                               var n, sp, nl, x;\r
 \r
-                               // Convert spans to fonts on non WebKit browsers\r
-                               if (tinymce.isWebKit || !s.inline_styles)\r
+                               // Keep unit tests happy\r
+                               if (!s.inline_styles)\r
                                        return;\r
 \r
-                               nl = t.dom.select('span', no);\r
+                               nl = t.dom.select('font', no);\r
                                for (x = nl.length - 1; x >= 0; x--) {\r
                                        n = nl[x];\r
 \r
-                                       f = dom.create('font', {\r
-                                               color : dom.toHex(dom.getStyle(n, 'color')),\r
-                                               face : dom.getStyle(n, 'fontFamily'),\r
+                                       sp = dom.create('span', {\r
                                                style : dom.getAttrib(n, 'style'),\r
                                                'class' : dom.getAttrib(n, 'class')\r
                                        });\r
 \r
-                                       // Clear color and font family\r
-                                       st = f.style;\r
-                                       if (st.color || st.fontFamily) {\r
-                                               st.color = st.fontFamily = '';\r
-                                               dom.setAttrib(f, 'mce_style', ''); // Remove cached style data\r
-                                       }\r
-\r
-                                       if (sl) {\r
-                                               i = inArray(sl, dom.getStyle(n, 'fontSize'));\r
-\r
-                                               if (i != -1) {\r
-                                                       dom.setAttrib(f, 'size', '' + (i + 1 || 1));\r
-                                                       f.style.fontSize = '';\r
-                                               }\r
-                                       } else if (cl) {\r
-                                               i = inArray(cl, dom.getAttrib(n, 'class'));\r
-                                               v = dom.getStyle(n, 'fontSize');\r
-\r
-                                               if (i == -1 && v.indexOf('pt') > 0)\r
-                                                       i = inArray(fz, parseInt(v));\r
-\r
-                                               if (i == -1)\r
-                                                       i = inArray(fzn, v);\r
-\r
-                                               if (i != -1) {\r
-                                                       dom.setAttrib(f, 'size', '' + (i + 1 || 1));\r
-                                                       f.style.fontSize = '';\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 (f.color || f.face || f.size) {\r
-                                               f.style.fontFamily = '';\r
-                                               dom.setAttrib(f, 'mce_style', '');\r
-                                               dom.replace(f, n, 1);\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
-                                       f = n = null;\r
+                                       dom.setAttrib(sp, 'mce_style', '');\r
+                                       dom.replace(sp, n, 1);\r
                                }\r
                        };\r
 \r
-                       // Run on setup\r
-                       t.onSetContent.add(function(ed, o) {\r
-                               convertToFonts(ed.getBody());\r
-                       });\r
-\r
                        // Run on cleanup\r
                        t.onPreProcess.add(function(ed, o) {\r
-                               var n, sp, nl, x;\r
-\r
-                               // Keep unit tests happy\r
-                               if (!s.inline_styles)\r
-                                       return;\r
-\r
-                               if (o.get) {\r
-                                       nl = t.dom.select('font', o.node);\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
+                               if (o.get)\r
+                                       process(o.node);\r
+                       });\r
 \r
-                                               dom.setAttrib(sp, 'mce_style', '');\r
-                                               dom.replace(sp, n, 1);\r
-                                       }\r
-                               }\r
+                       t.onSetContent.add(function(ed, o) {\r
+                               if (o.initial)\r
+                                       process(o.node);\r
                        });\r
                },\r
 \r
@@ -8213,11 +10357,8 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                }\r
 \r
                });\r
-})();\r
-\r
-/* file:jscripts/tiny_mce/classes/EditorCommands.js */\r
-\r
-(function() {\r
+})(tinymce);\r
+(function(tinymce) {\r
        var each = tinymce.each, isIE = tinymce.isIE, isGecko = tinymce.isGecko, isOpera = tinymce.isOpera, isWebKit = tinymce.isWebKit;\r
 \r
        tinymce.create('tinymce.EditorCommands', {\r
@@ -8229,23 +10370,6 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        var t = this, ed = t.editor, f;\r
 \r
                        switch (cmd) {\r
-                               case 'Cut':\r
-                               case 'Copy':\r
-                               case 'Paste':\r
-                                       try {\r
-                                               ed.getDoc().execCommand(cmd, ui, val);\r
-                                       } catch (ex) {\r
-                                               if (isGecko) {\r
-                                                       ed.windowManager.confirm(ed.getLang('clipboard_msg'), function(s) {\r
-                                                               if (s)\r
-                                                                       window.open('http://www.mozilla.org/editor/midasdemo/securityprefs.html', 'mceExternal');\r
-                                                       });\r
-                                               } else\r
-                                                       ed.windowManager.alert(ed.getLang('clipboard_no_support'));\r
-                                       }\r
-\r
-                                       return true;\r
-\r
                                // Ignore these\r
                                case 'mceResetDesignMode':\r
                                case 'mceBeginUndoLevel':\r
@@ -8264,11 +10388,6 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                        t.mceJustify(cmd, cmd.substring(7).toLowerCase());\r
                                        return true;\r
 \r
-                               case 'mceEndUndoLevel':\r
-                               case 'mceAddUndoLevel':\r
-                                       ed.undoManager.add();\r
-                                       return true;\r
-\r
                                default:\r
                                        f = this[cmd];\r
 \r
@@ -8290,7 +10409,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        iv = parseInt(iv);\r
 \r
                        if (ed.settings.inline_styles && (!this.queryStateInsertUnorderedList() && !this.queryStateInsertOrderedList())) {\r
-                               each(this._getSelectedBlocks(), function(e) {\r
+                               each(s.getSelectedBlocks(), function(e) {\r
                                        d.setStyle(e, 'paddingLeft', (parseInt(e.style.paddingLeft || 0) + iv) + iu);\r
                                });\r
 \r
@@ -8317,7 +10436,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        iv = parseInt(iv);\r
 \r
                        if (ed.settings.inline_styles && (!this.queryStateInsertUnorderedList() && !this.queryStateInsertOrderedList())) {\r
-                               each(this._getSelectedBlocks(), function(e) {\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
@@ -8328,13 +10447,14 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        ed.getDoc().execCommand('Outdent', false, null);\r
                },\r
 \r
+/*\r
                mceSetAttribute : function(u, v) {\r
                        var ed = this.editor, d = ed.dom, e;\r
 \r
                        if (e = d.getParent(ed.selection.getNode(), d.isBlock))\r
                                d.setAttrib(e, v.name, v.value);\r
                },\r
-\r
+*/\r
                mceSetContent : function(u, v) {\r
                        this.editor.setContent(v);\r
                },\r
@@ -8353,7 +10473,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                },\r
 \r
                mceInsertLink : function(u, v) {\r
-                       var ed = this.editor, e = ed.dom.getParent(ed.selection.getNode(), 'A');\r
+                       var ed = this.editor, s = ed.selection, e = ed.dom.getParent(s.getNode(), 'a');\r
 \r
                        if (tinymce.is(v, 'string'))\r
                                v = {href : v};\r
@@ -8366,9 +10486,8 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
 \r
                        if (!e) {\r
                                ed.execCommand('CreateLink', false, 'javascript:mctmp(0);');\r
-                               each(ed.dom.select('a'), function(e) {\r
-                                       if (e.href == 'javascript:mctmp(0);')\r
-                                               set(e);\r
+                               each(ed.dom.select('a[href=javascript:mctmp(0);]'), function(e) {\r
+                                       set(e);\r
                                });\r
                        } else {\r
                                if (v.href)\r
@@ -8394,10 +10513,32 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        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
 \r
-                               t.RemoveFormat();\r
-                       } else\r
-                               ed.getDoc().execCommand('FontName', false, v);\r
+               FontSize : function(u, v) {\r
+                       var ed = this.editor, s = ed.settings, fc, fs;\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
+\r
+                               if (fc)\r
+                                       v = fc[v - 1] || v;\r
+                               else\r
+                                       v = fs[v - 1] || v;\r
+                       }\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
 \r
                queryCommandValue : function(c) {\r
@@ -8447,22 +10588,28 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                queryValueFontSize : function() {\r
                        var ed = this.editor, v = 0, p;\r
 \r
-                       if (isOpera || isWebKit) {\r
-                               if (p = ed.dom.getParent(ed.selection.getNode(), 'FONT'))\r
+                       if (p = ed.dom.getParent(ed.selection.getNode(), 'span'))\r
+                               v = p.style.fontSize;\r
+\r
+                       if (!v && (isOpera || isWebKit)) {\r
+                               if (p = ed.dom.getParent(ed.selection.getNode(), 'font'))\r
                                        v = p.size;\r
 \r
                                return v;\r
                        }\r
 \r
-                       return this._queryVal('FontSize');\r
+                       return v || this._queryVal('FontSize');\r
                },\r
 \r
                queryValueFontName : function() {\r
                        var ed = this.editor, v = 0, p;\r
 \r
-                       if (p = ed.dom.getParent(ed.selection.getNode(), 'FONT'))\r
+                       if (p = ed.dom.getParent(ed.selection.getNode(), 'font'))\r
                                v = p.face;\r
 \r
+                       if (p = ed.dom.getParent(ed.selection.getNode(), 'span'))\r
+                               v = p.style.fontFamily.replace(/, /g, ',').replace(/[\'\"]/g, '').toLowerCase();\r
+\r
                        if (!v)\r
                                v = this._queryVal('FontName');\r
 \r
@@ -8483,7 +10630,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
 \r
                                if (rm) {\r
                                        if (v == 'center')\r
-                                               dom.setStyle(n.parentNode, 'textAlign', '');\r
+                                               dom.setStyle(bl || n.parentNode, 'textAlign', '');\r
 \r
                                        dom.setStyle(n, 'float', '');\r
                                        this.mceRepaint();\r
@@ -8492,7 +10639,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
 \r
                                if (v == 'center') {\r
                                        // Do not change table elements\r
-                                       if (/^(TD|TH)$/.test(bl.nodeName))\r
+                                       if (bl && /^(TD|TH)$/.test(bl.nodeName))\r
                                                bl = 0;\r
 \r
                                        if (!bl || bl.childNodes.length > 1) {\r
@@ -8513,7 +10660,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                        dom.setStyle(n, 'float', '');\r
                                } else {\r
                                        dom.setStyle(n, 'float', v);\r
-                                       dom.setStyle(n.parentNode, 'textAlign', '');\r
+                                       dom.setStyle(bl || n.parentNode, 'textAlign', '');\r
                                }\r
 \r
                                this.mceRepaint();\r
@@ -8525,7 +10672,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                if (rm)\r
                                        v = '';\r
 \r
-                               each(this._getSelectedBlocks(dom.getParent(se.getStart(), dom.isBlock), dom.getParent(se.getEnd(), dom.isBlock)), function(e) {\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
@@ -8596,7 +10743,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                }\r
                        } else {\r
                                function getParent(n) {\r
-                                       return dom.getParent(n, function(n) {return n.nodeType == 1;});\r
+                                       return dom.getParent(n, '*');\r
                                };\r
 \r
                                sc = r.startContainer;\r
@@ -8654,27 +10801,6 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        return null;\r
                },\r
 \r
-               InsertHorizontalRule : function() {\r
-                       // Fix for Gecko <hr size="1" /> issue and IE bug rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");\r
-                       if (isGecko || isIE)\r
-                               this.editor.selection.setContent('<hr />');\r
-                       else\r
-                               this.editor.getDoc().execCommand('InsertHorizontalRule', false, '');\r
-               },\r
-\r
-               RemoveFormat : function() {\r
-                       var t = this, ed = t.editor, s = ed.selection, b;\r
-\r
-                       // Safari breaks tables\r
-                       if (isWebKit)\r
-                               s.setContent(s.getContent({format : 'raw'}).replace(/(<(span|b|i|strong|em|strike) [^>]+>|<(span|b|i|strong|em|strike)>|<\/(span|b|i|strong|em|strike)>|)/g, ''), {format : 'raw'});\r
-                       else\r
-                               ed.getDoc().execCommand('RemoveFormat', false, null);\r
-\r
-                       t.mceSetStyleInfo(0, {command : 'removeformat'});\r
-                       ed.addVisual();\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
 \r
@@ -8699,12 +10825,12 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                re = new RegExp(re, 'i');\r
 \r
                        // Set style info on selected element\r
-                       if (e = t.getSelectedElement())\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(isWebKit ? dom.select('span') : dom.select('font'), function(n) {\r
+                               each(dom.select('span,font'), function(n) {\r
                                        var sp, e;\r
 \r
                                        if (dom.getAttrib(n, 'face') == '__' || n.style.fontFamily === '__') {\r
@@ -8728,9 +10854,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                // 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, function(n) {\r
-                                               return n.nodeType == 1 && dom.getAttrib(n, 'mce_new');\r
-                                       });\r
+                                       p = dom.getParent(n, '*[mce_new]');\r
 \r
                                        if (p)\r
                                                dom.remove(n, 1);\r
@@ -8744,6 +10868,9 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                if (!p || !dom.getAttrib(n, 'mce_new'))\r
                                        return;\r
 \r
+                               if (ed.settings.force_span_wrappers && p.nodeName != 'SPAN')\r
+                                       return;\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
@@ -8791,9 +10918,24 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        return this._queryState(c);\r
                },\r
 \r
+               ForeColor : function(ui, v) {\r
+                       var ed = this.editor;\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
+               },\r
+\r
                HiliteColor : function(ui, val) {\r
                        var t = this, ed = t.editor, d = ed.getDoc();\r
 \r
+                       if (ed.settings.convert_fonts_to_spans) {\r
+                               this._applyInlineStyle('span', {style : {backgroundColor : val}});\r
+                               return;\r
+                       }\r
+\r
                        function set(s) {\r
                                if (!isGecko)\r
                                        return;\r
@@ -8815,33 +10957,37 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                                d.execCommand('BackColor', false, val);\r
                },\r
 \r
-               Undo : function() {\r
-                       var ed = this.editor;\r
+               FormatBlock : function(ui, val) {\r
+                       var t = this, ed = t.editor, s = ed.selection, dom = ed.dom, bl, nb, b;\r
 \r
-                       if (ed.settings.custom_undo_redo) {\r
-                               ed.undoManager.undo();\r
-                               ed.nodeChanged();\r
-                       } else\r
-                               ed.getDoc().execCommand('Undo', false, null);\r
-               },\r
+                       function isBlock(n) {\r
+                               return /^(P|DIV|H[1-6]|ADDRESS|BLOCKQUOTE|PRE)$/.test(n.nodeName);\r
+                       };\r
 \r
-               Redo : function() {\r
-                       var ed = this.editor;\r
+                       bl = dom.getParent(s.getNode(), function(n) {\r
+                               return isBlock(n);\r
+                       });\r
 \r
-                       if (ed.settings.custom_undo_redo) {\r
-                               ed.undoManager.redo();\r
-                               ed.nodeChanged();\r
-                       } else\r
-                               ed.getDoc().execCommand('Redo', false, null);\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
 \r
-               FormatBlock : function(ui, val) {\r
-                       var t = this, ed = t.editor;\r
+                                       each(dom.getAttribs(bl), function(v) {\r
+                                               dom.setAttrib(nb, v.nodeName, dom.getAttrib(bl, v.nodeName));\r
+                                       });\r
 \r
-                       val = ed.settings.forced_root_block ? (val || '<p>') : val;\r
+                                       b = s.getBookmark();\r
+                                       dom.replace(nb, bl, 1);\r
+                                       s.moveToBookmark(b);\r
+                                       ed.nodeChanged();\r
+                                       return;\r
+                               }\r
+                       }\r
 \r
-                       if (/^(P|DIV|H[1-6]|ADDRESS|BLOCKQUOTE|PRE)$/.test(ed.selection.getNode().nodeName))\r
-                               t.mceRemoveNode();\r
+                       val = ed.settings.forced_root_block ? (val || '<p>') : val;\r
 \r
                        if (val.indexOf('<') == -1)\r
                                val = '<' + val + '>';\r
@@ -8918,7 +11064,7 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                },\r
 \r
                queryStateUnderline : function() {\r
-                       var ed = this.editor, n;\r
+                       var ed = this.editor, n = ed.selection.getNode();\r
 \r
                        if (n && n.nodeName == 'A')\r
                                return false;\r
@@ -8935,10 +11081,9 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
 \r
                                if ((n = ed.dom.getParent(ed.selection.getEnd(), ed.dom.isBlock)) && parseInt(n.style.paddingLeft) > 0)\r
                                        return true;\r
-                       } else\r
-                               return !!ed.dom.getParent(ed.selection.getNode(), 'BLOCKQUOTE');\r
+                       }\r
 \r
-                       return this.queryStateInsertUnorderedList() || this.queryStateInsertOrderedList();\r
+                       return this.queryStateInsertUnorderedList() || this.queryStateInsertOrderedList() || (!ed.settings.inline_styles && !!ed.dom.getParent(ed.selection.getNode(), 'BLOCKQUOTE'));\r
                },\r
 \r
                queryStateInsertUnorderedList : function() {\r
@@ -8953,345 +11098,322 @@ var tinyMCE = window.tinyMCE = tinymce.EditorManager;
                        return !!this.editor.dom.getParent(this.editor.selection.getStart(), function(n) {return n.nodeName === 'BLOCKQUOTE';});\r
                },\r
 \r
-               mceBlockQuote : function() {\r
-                       var t = this, ed = t.editor, s = ed.selection, dom = ed.dom, sb, eb, n, bm, bq, r, bq2, i, nl;\r
+               _applyInlineStyle : function(na, at, op) {\r
+                       var t = this, ed = t.editor, dom = ed.dom, bm, lo = {}, kh, found;\r
 \r
-                       function getBQ(e) {\r
-                               return dom.getParent(e, function(n) {return n.nodeName === 'BLOCKQUOTE';});\r
-                       };\r
-\r
-                       // Get start/end block\r
-                       sb = dom.getParent(s.getStart(), dom.isBlock);\r
-                       eb = dom.getParent(s.getEnd(), dom.isBlock);\r
+                       na = na.toUpperCase();\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
+                       if (op && op.check_classes && at['class'])\r
+                               op.check_classes.push(at['class']);\r
 \r
-                               // Move all elements after the end block into new bq\r
-                               if (getBQ(eb)) {\r
-                                       bq2 = bq.cloneNode(false);\r
-\r
-                                       while (n = eb.nextSibling)\r
-                                               bq2.appendChild(n.parentNode.removeChild(n));\r
-                               }\r
+                       function removeEmpty() {\r
+                               each(dom.select(na).reverse(), function(n) {\r
+                                       var c = 0;\r
 \r
-                               // Add new bq after\r
-                               if (bq2)\r
-                                       dom.insertAfter(bq2, bq);\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
+                                               }\r
+                                       });\r
 \r
-                               // Move all selected blocks after the current bq\r
-                               nl = t._getSelectedBlocks(sb, eb);\r
-                               for (i = nl.length - 1; i >= 0; i--) {\r
-                                       dom.insertAfter(nl[i], bq);\r
-                               }\r
+                                       // No attributes then remove the element and keep the children\r
+                                       if (c == 0)\r
+                                               dom.remove(n, 1);\r
+                               });\r
+                       };\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
+                       function replaceFonts() {\r
+                               var bm;\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
+                               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
 \r
-                               if (!bm) {\r
-                                       // Move caret inside empty block element\r
-                                       if (!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
-\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
-                                               }\r
+                                               at._mce_new = '1';\r
+                                               dom.replace(dom.create(na, at), n, 1);\r
                                        }\r
-                               } else\r
-                                       t.editor.selection.moveToBookmark(bm);\r
+                               });\r
 \r
-                               return;\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
 \r
-                       // Since IE can start with a totally empty document we need to add the first bq and paragraph\r
-                       if (isIE && !sb && !eb) {\r
-                               t.editor.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
+                                                       // 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
 \r
-                       if (!sb || !eb)\r
-                               return;\r
+                                       // Remove specified style information from child elements\r
+                                       each(dom.select(na, n), removeStyle);\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
+                                       // 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
 \r
-                       // Move selected block elements into a bq\r
-                       each(t._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
-                               }\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
 \r
-                               // No BQ found, create one\r
-                               if (!bq) {\r
-                                       bq = dom.create('blockquote');\r
-                                       e.parentNode.insertBefore(bq, e);\r
-                               }\r
+                                                                       if (!lo[k] && (sv = dom.getStyle(pn, k))) {\r
+                                                                               if (sv === v)\r
+                                                                                       dom.setStyle(n, k, '');\r
 \r
-                               // Add children from existing BQ\r
-                               if (e.nodeName == 'BLOCKQUOTE' && bq) {\r
-                                       n = e.firstChild;\r
+                                                                               lo[k] = 1;\r
+                                                                       }\r
+                                                               });\r
+                                                       }\r
 \r
-                                       while (n) {\r
-                                               bq.appendChild(n.cloneNode(true));\r
-                                               n = n.nextSibling;\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
 \r
-                                       dom.remove(e);\r
-                                       return;\r
-                               }\r
+                                               return false;\r
+                                       });\r
 \r
-                               // Add non BQ element to BQ\r
-                               bq.appendChild(dom.remove(e));\r
-                       });\r
+                                       n.removeAttribute('_mce_new');\r
+                               });\r
 \r
-                       if (!bm) {\r
-                               // Move caret inside empty block element\r
-                               if (!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
-                               }\r
-                       } else\r
-                               s.moveToBookmark(bm);\r
-               },\r
-/*\r
-               _mceBlockQuote : function() {\r
-                       var t = this, s = t.editor.selection, b = s.getBookmark(), bq, dom = t.editor.dom;\r
+                               removeEmpty();\r
+                               ed.selection.moveToBookmark(bm);\r
 \r
-                       function findBQ(e) {\r
-                               return dom.getParent(e, function(n) {return n.nodeName === 'BLOCKQUOTE';});\r
+                               return !!bm;\r
                        };\r
 \r
-                       // Remove blockquote(s)\r
-                       if (findBQ(s.getStart())) {\r
-                               each(t._getSelectedBlocks(findBQ(s.getStart()), findBQ(s.getEnd())), function(e) {\r
-                                       // Found BQ lets remove it\r
-                                       if (e.nodeName == 'BLOCKQUOTE')\r
-                                               dom.remove(e, 1);\r
-                               });\r
+                       // Create inline elements\r
+                       ed.focus();\r
+                       ed.getDoc().execCommand('FontName', false, 'mceinline');\r
+                       replaceFonts();\r
 \r
-                               t.editor.selection.moveToBookmark(b);\r
-                               return;\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
                        }\r
 \r
-                       each(t._getSelectedBlocks(findBQ(s.getStart()), findBQ(s.getEnd())), function(e) {\r
-                               var n;\r
-\r
-                               // Found existing BQ add to this one\r
-                               if (e.nodeName == 'BLOCKQUOTE' && !bq) {\r
-                                       bq = e;\r
-                                       return;\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
-                               // No BQ found, create one\r
-                               if (!bq) {\r
-                                       bq = dom.create('blockquote');\r
-                                       e.parentNode.insertBefore(bq, e);\r
-                               }\r
+                                                               found = 1;\r
+                                                               return false;\r
+                                                       }\r
+                                               });\r
 \r
-                               // Add children from existing BQ\r
-                               if (e.nodeName == 'BLOCKQUOTE' && bq) {\r
-                                       n = e.firstChild;\r
+                                               if (found)\r
+                                                       return false;\r
+                                       });\r
 \r
-                                       while (n) {\r
-                                               bq.appendChild(n.cloneNode(true));\r
-                                               n = n.nextSibling;\r
-                                       }\r
+                                       if (found == 2) {\r
+                                               bm = ed.selection.getBookmark();\r
 \r
-                                       dom.remove(e);\r
+                                               removeEmpty();\r
 \r
-                                       return;\r
-                               }\r
+                                               ed.selection.moveToBookmark(bm);\r
 \r
-                               // Add non BQ element to BQ\r
-                               bq.appendChild(dom.remove(e));\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
 \r
-                       t.editor.selection.moveToBookmark(b);\r
-               },\r
-*/\r
-               _getSelectedBlocks : function(st, en) {\r
-                       var ed = this.editor, dom = ed.dom, s = ed.selection, sb, eb, n, bl = [];\r
+                                               return;\r
+                                       }\r
+                               }\r
 \r
-                       sb = dom.getParent(st || s.getStart(), dom.isBlock);\r
-                       eb = dom.getParent(en || s.getEnd(), dom.isBlock);\r
+                               // Start collecting styles\r
+                               t._pendingStyles = tinymce.extend(t._pendingStyles || {}, at.style);\r
 \r
-                       if (sb)\r
-                               bl.push(sb);\r
+                               t._applyInlineStyle.chandler = ed.onSetContent.add(function() {\r
+                                       delete t._pendingStyles;\r
+                               });\r
 \r
-                       if (sb && eb && sb != eb) {\r
-                               n = sb;\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
 \r
-                               while ((n = n.nextSibling) && n != eb) {\r
-                                       if (dom.isBlock(n))\r
-                                               bl.push(n);\r
-                               }\r
-                       }\r
+                                       if (replaceFonts()) {\r
+                                               ed.onKeyDown.remove(t._applyInlineStyle.keyhandler);\r
+                                               ed.onKeyPress.remove(t._applyInlineStyle.keyhandler);\r
+                                       }\r
 \r
-                       if (eb && sb != eb)\r
-                               bl.push(eb);\r
+                                       if (e.type == 'keyup')\r
+                                               ed.onKeyUp.remove(t._applyInlineStyle.keyhandler);\r
+                               };\r
 \r
-                       return bl;\r
+                               ed.onKeyDown.add(kh);\r
+                               ed.onKeyPress.add(kh);\r
+                               ed.onKeyUp.add(kh);\r
+                       } else\r
+                               t._pendingStyles = 0;\r
                }\r
        });\r
-})();\r
+})(tinymce);(function(tinymce) {\r
+       tinymce.create('tinymce.UndoManager', {\r
+               index : 0,\r
+               data : null,\r
+               typing : 0,\r
 \r
+               UndoManager : function(ed) {\r
+                       var t = this, Dispatcher = tinymce.util.Dispatcher;\r
 \r
-/* file:jscripts/tiny_mce/classes/UndoManager.js */\r
-\r
-tinymce.create('tinymce.UndoManager', {\r
-       index : 0,\r
-       data : null,\r
-       typing : 0,\r
-\r
-       UndoManager : function(ed) {\r
-               var t = this, Dispatcher = tinymce.util.Dispatcher;\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
+                       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
 \r
-       add : function(l) {\r
-               var t = this, i, ed = t.editor, b, s = ed.settings, la;\r
+               add : function(l) {\r
+                       var t = this, i, ed = t.editor, b, s = ed.settings, la;\r
 \r
-               l = l || {};\r
-               l.content = l.content || ed.getContent({format : 'raw', no_events : 1});\r
+                       l = l || {};\r
+                       l.content = l.content || ed.getContent({format : 'raw', no_events : 1});\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 - 1 : 0];\r
-               if (!l.initial && la && l.content == la.content)\r
-                       return null;\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
 \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
+                       // 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
 \r
-                               t.data.length--;\r
-                               t.index = t.data.length;\r
+                                       t.data.length--;\r
+                                       t.index = t.data.length;\r
+                               }\r
                        }\r
-               }\r
 \r
-               if (s.custom_undo_redo_restore_selection && !l.initial)\r
-                       l.bookmark = b = l.bookmark || ed.selection.getBookmark();\r
+                       if (s.custom_undo_redo_restore_selection && !l.initial)\r
+                               l.bookmark = b = l.bookmark || ed.selection.getBookmark();\r
 \r
-               if (t.index < t.data.length && t.data[t.index].initial)\r
-                       t.index++;\r
+                       if (t.index < t.data.length)\r
+                               t.index++;\r
 \r
-               // Add level\r
-               t.data.length = t.index + 1;\r
-               t.data[t.index++] = l;\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
 \r
-               if (l.initial)\r
-                       t.index = 0;\r
+                       // Add level\r
+                       t.data.length = t.index + 1;\r
+                       t.data[t.index++] = l;\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 (l.initial)\r
+                               t.index = 0;\r
 \r
-               t.onAdd.dispatch(t, l);\r
-               ed.isNotDirty = 0;\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
 \r
-               //console.dir(t.data);\r
+                       t.onAdd.dispatch(t, l);\r
+                       ed.isNotDirty = 0;\r
 \r
-               return l;\r
-       },\r
+                       //console.dir(t.data);\r
 \r
-       undo : function() {\r
-               var t = this, ed = t.editor, l = l, i;\r
+                       return l;\r
+               },\r
 \r
-               if (t.typing) {\r
-                       t.add();\r
-                       t.typing = 0;\r
-               }\r
+               undo : function() {\r
+                       var t = this, ed = t.editor, l = l, i;\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
+                       if (t.typing) {\r
+                               t.add();\r
                                t.typing = 0;\r
+                       }\r
 \r
-                               if (!t.add())\r
-                                       t.index = i;\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
 \r
-                               --t.index;\r
-                       }\r
+                                       if (!t.add())\r
+                                               t.index = i;\r
 \r
-                       l = t.data[--t.index];\r
-                       ed.setContent(l.content, {format : 'raw'});\r
-                       ed.selection.moveToBookmark(l.bookmark);\r
+                                       --t.index;\r
+                               }\r
 \r
-                       t.onUndo.dispatch(t, l);\r
-               }\r
+                               l = t.data[--t.index];\r
+                               ed.setContent(l.content, {format : 'raw'});\r
+                               ed.selection.moveToBookmark(l.bookmark);\r
 \r
-               return l;\r
-       },\r
+                               t.onUndo.dispatch(t, l);\r
+                       }\r
 \r
-       redo : function() {\r
-               var t = this, ed = t.editor, l = null;\r
+                       return l;\r
+               },\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
+               redo : function() {\r
+                       var t = this, ed = t.editor, l = null;\r
 \r
-                       t.onRedo.dispatch(t, l);\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
 \r
-               return l;\r
-       },\r
+                               t.onRedo.dispatch(t, l);\r
+                       }\r
 \r
-       clear : function() {\r
-               var t = this;\r
+                       return l;\r
+               },\r
 \r
-               t.data = [];\r
-               t.index = 0;\r
-               t.typing = 0;\r
-               t.add({initial : true});\r
-       },\r
+               clear : function() {\r
+                       var t = this;\r
 \r
-       hasUndo : function() {\r
-               return this.index != 0 || this.typing;\r
-       },\r
+                       t.data = [];\r
+                       t.index = 0;\r
+                       t.typing = 0;\r
+                       t.add({initial : true});\r
+               },\r
 \r
-       hasRedo : function() {\r
-               return this.index < this.data.length - 1;\r
-       }\r
+               hasUndo : function() {\r
+                       return this.index != 0 || this.typing;\r
+               },\r
 \r
-       });\r
-/* file:jscripts/tiny_mce/classes/ForceBlocks.js */\r
+               hasRedo : function() {\r
+                       return this.index < this.data.length - 1;\r
+               }\r
 \r
-(function() {\r
+               });\r
+})(tinymce);\r
+(function(tinymce) {\r
        // Shorten names\r
        var Event, isIE, isGecko, isOpera, each, extend;\r
 \r
@@ -9302,6 +11424,15 @@ tinymce.create('tinymce.UndoManager', {
        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
+\r
        tinymce.create('tinymce.ForceBlocks', {\r
                ForceBlocks : function(ed) {\r
                        var t = this, s = ed.settings, elm;\r
@@ -9316,9 +11447,8 @@ tinymce.create('tinymce.UndoManager', {
                        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.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.reTrailBr = new RegExp('\\s*<br \\/>\\s*<\\\/p>'.replace(/p/g, elm), 'gi');\r
 \r
                        function padd(ed, o) {\r
                                if (isOpera)\r
@@ -9330,10 +11460,8 @@ tinymce.create('tinymce.UndoManager', {
                                        // 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
+                               } else\r
                                        o.content = o.content.replace(t.reBR2Nbsp, '<' + elm + '$1$2>\u00a0</' + elm + '>');\r
-                                       o.content = o.content.replace(t.reTrailBr, '</' + elm + '>');\r
-                               }\r
                        };\r
 \r
                        ed.onBeforeSetContent.add(padd);\r
@@ -9419,29 +11547,41 @@ tinymce.create('tinymce.UndoManager', {
                                return ne;\r
                        };\r
 \r
-                       // Replaces IE:s auto generated paragraphs with the specified element name\r
-                       if (isIE && s.element != 'P') {\r
-                               ed.onKeyPress.add(function(ed, e) {\r
-                                       t.lastElm = ed.selection.getNode().nodeName;\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
                                });\r
 \r
-                               ed.onKeyUp.add(function(ed, e) {\r
-                                       var bl, sel = ed.selection, n = sel.getNode(), b = ed.getBody();\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
 \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
+                                       ed.onKeyUp.add(function(ed, e) {\r
+                                               var bl, sel = ed.selection, n = sel.getNode(), b = ed.getBody();\r
 \r
-                                               if (bl) {\r
-                                                       ren(bl, s.element);\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
+\r
+                                                       if (bl) {\r
+                                                               ren(bl, s.element);\r
+                                                               ed.nodeChanged();\r
+                                                       }\r
                                                }\r
-                                       }\r
-                               });\r
+                                       });\r
+                               }\r
                        }\r
                },\r
 \r
@@ -9465,11 +11605,11 @@ tinymce.create('tinymce.UndoManager', {
 \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;\r
+                       var nx, bl, bp, sp, le, nl = b.childNodes, i, n, eid;\r
 \r
                        // Fix for bug #1863847\r
-                       if (e && e.keyCode == 13)\r
-                               return true;\r
+                       //if (e && e.keyCode == 13)\r
+                       //      return true;\r
 \r
                        // Wrap non blocks into blocks\r
                        for (i = nl.length - 1; i >= 0; i--) {\r
@@ -9483,10 +11623,20 @@ tinymce.create('tinymce.UndoManager', {
                                                        // Store selection\r
                                                        if (si == -2 && r) {\r
                                                                if (!isIE) {\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
+                                                                       // 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
@@ -9523,7 +11673,7 @@ tinymce.create('tinymce.UndoManager', {
                        // Restore selection\r
                        if (si != -2) {\r
                                if (!isIE) {\r
-                                       bl = d.getElementsByTagName(ed.settings.element)[0];\r
+                                       bl = b.getElementsByTagName(ed.settings.element)[0];\r
                                        r = d.createRange();\r
 \r
                                        // Select last location or generated block\r
@@ -9554,6 +11704,18 @@ tinymce.create('tinymce.UndoManager', {
                                                // 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
+                               // 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
@@ -9564,16 +11726,8 @@ tinymce.create('tinymce.UndoManager', {
                },\r
 \r
                insertPara : function(e) {\r
-                       var t = this, ed = t.editor, 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 = ed.dom.getViewPort(ed.getWin()), y, ch;\r
-\r
-                       function isEmpty(n) {\r
-                               n = n.innerHTML;\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 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
                        // If root blocks are forced then use Operas default behavior since it's really good\r
 // Removed due to bug: #1853816\r
@@ -9601,6 +11755,23 @@ tinymce.create('tinymce.UndoManager', {
                        en = dir ? s.focusNode : s.anchorNode;\r
                        eo = dir ? s.focusOffset : s.anchorOffset;\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
+\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
+\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
+                               return false;\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
@@ -9623,23 +11794,23 @@ tinymce.create('tinymce.UndoManager', {
                        bn = sb ? sb.nodeName : se.element; // Get block name to create\r
 \r
                        // Return inside list use default browser behavior\r
-                       if (t.dom.getParent(sb, function(n) { return /OL|UL|PRE/.test(n.nodeName); }))\r
+                       if (t.dom.getParent(sb, 'ol,ul,pre'))\r
                                return true;\r
 \r
                        // If caption or absolute layers then always generate new blocks within\r
-                       if (sb && (sb.nodeName == 'CAPTION' || /absolute|relative|static/gi.test(sb.style.position))) {\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
                        // If caption or absolute layers then always generate new blocks within\r
-                       if (eb && (eb.nodeName == 'CAPTION' || /absolute|relative|static/gi.test(eb.style.position))) {\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
                        // Use P instead\r
-                       if (/(TD|TABLE|TH|CAPTION)/.test(bn) || (sb && bn == "DIV" && /left|right/gi.test(sb.style.cssFloat))) {\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
@@ -9725,11 +11896,42 @@ tinymce.create('tinymce.UndoManager', {
                        if (isEmpty(bef))\r
                                bef.innerHTML = '<br />';\r
 \r
+                       function appendStyles(e, en) {\r
+                               var nl = [], nn, n, i;\r
+\r
+                               e.innerHTML = '';\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
+                                               }\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
+                                       // 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
-                               aft.innerHTML = isOpera ? '&nbsp;' : '<br />'; // Extra space for Opera so that the caret can move there\r
+                               car = appendStyles(aft, en);\r
 \r
-                       // Opera needs this one backwards\r
-                       if (isOpera) {\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
@@ -9741,9 +11943,13 @@ tinymce.create('tinymce.UndoManager', {
                        aft.normalize();\r
                        bef.normalize();\r
 \r
+                       function first(n) {\r
+                               return d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false).nextNode() || n;\r
+                       };\r
+\r
                        // Move cursor and scroll into view\r
                        r = d.createRange();\r
-                       r.selectNodeContents(aft);\r
+                       r.selectNodeContents(isGecko ? first(car || aft) : car || aft);\r
                        r.collapse(1);\r
                        s.removeAllRanges();\r
                        s.addRange(r);\r
@@ -9754,7 +11960,7 @@ tinymce.create('tinymce.UndoManager', {
 \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 + ch);\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
@@ -9796,12 +12002,21 @@ tinymce.create('tinymce.UndoManager', {
 \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
 \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
+\r
                                        Event.remove(b, 'DOMNodeInserted', handler);\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
+\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
@@ -9817,11 +12032,8 @@ tinymce.create('tinymce.UndoManager', {
                        }, 1);\r
                }\r
        });\r
-})();\r
-\r
-/* file:jscripts/tiny_mce/classes/ControlManager.js */\r
-\r
-(function() {\r
+})(tinymce);\r
+(function(tinymce) {\r
        // Shorten names\r
        var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, extend = tinymce.extend;\r
 \r
@@ -9935,17 +12147,17 @@ tinymce.create('tinymce.UndoManager', {
                        // Fix for bug #1897785, #1898007\r
                        if (tinymce.isIE) {\r
                                c.onShowMenu.add(function() {\r
-                                       var s = ed.selection, n = s.getNode();\r
+                                       // IE 8 needs focus in order to store away a range with the current collapsed caret location\r
+                                       ed.focus();\r
 \r
-                                       if (n.nodeName == 'IMG')\r
-                                               bm = s.getBookmark();\r
-                                       else\r
-                                               bm = 0;\r
+                                       bm = ed.selection.getBookmark(1);\r
                                });\r
 \r
                                c.onHideMenu.add(function() {\r
-                                       if (bm)\r
+                                       if (bm) {\r
                                                ed.selection.moveToBookmark(bm);\r
+                                               bm = 0;\r
+                                       }\r
                                });\r
                        }\r
 \r
@@ -10014,6 +12226,7 @@ tinymce.create('tinymce.UndoManager', {
                                return null;\r
 \r
                        s.title = ed.translate(s.title);\r
+                       s.label = ed.translate(s.label);\r
                        s.scope = s.scope || ed;\r
 \r
                        if (!s.onclick && !s.menu_button) {\r
@@ -10044,11 +12257,11 @@ tinymce.create('tinymce.UndoManager', {
                        return t.add(c);\r
                },\r
 \r
-               createMenuButton : function(id, s) {\r
+               createMenuButton : function(id, s, cc) {\r
                        s = s || {};\r
                        s.menu_button = 1;\r
 \r
-                       return this.createButton(id, s);\r
+                       return this.createButton(id, s, cc);\r
                },\r
 \r
                createSplitButton : function(id, s, cc) {\r
@@ -10088,7 +12301,7 @@ tinymce.create('tinymce.UndoManager', {
                },\r
 \r
                createColorSplitButton : function(id, s, cc) {\r
-                       var t = this, ed = t.editor, cmd, c, cls;\r
+                       var t = this, ed = t.editor, cmd, c, cls, bm;\r
 \r
                        if (t.get(id))\r
                                return null;\r
@@ -10098,6 +12311,9 @@ tinymce.create('tinymce.UndoManager', {
 \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
@@ -10126,6 +12342,16 @@ tinymce.create('tinymce.UndoManager', {
                                c.destroy();\r
                        });\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
+                               });\r
+                       }\r
+\r
                        return t.add(c);\r
                },\r
 \r
@@ -10161,11 +12387,8 @@ tinymce.create('tinymce.UndoManager', {
                }\r
 \r
                });\r
-})();\r
-\r
-/* file:jscripts/tiny_mce/classes/WindowManager.js */\r
-\r
-(function() {\r
+})(tinymce);\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
@@ -10205,8 +12428,7 @@ tinymce.create('tinymce.UndoManager', {
                                        s.dialogWidth = s.width + 'px';\r
                                        s.dialogHeight = s.height + 'px';\r
                                        s.scroll = s.scrollbars || false;\r
-                               } else\r
-                                       s.modal = s.alwaysRaised = s.dialog = s.centerscreen = s.dependent = true;\r
+                               }\r
                        }\r
 \r
                        // Build features string\r
@@ -10227,13 +12449,12 @@ tinymce.create('tinymce.UndoManager', {
                        t.onOpen.dispatch(t, s, p);\r
 \r
                        u = s.url || s.file;\r
-                       if (tinymce.relaxedDomain)\r
-                               u += (u.indexOf('?') == -1 ? '?' : '&') + 'mce_rdomain=' + tinymce.relaxedDomain;\r
+                       u = tinymce._addVer(u);\r
 \r
                        try {\r
                                if (isIE && mo) {\r
                                        w = 1;\r
-                                       window.showModalDialog(s.url || s.file, window, f);\r
+                                       window.showModalDialog(u, window, f);\r
                                } else\r
                                        w = window.open(u, s.name, f);\r
                        } catch (ex) {\r
@@ -10255,14 +12476,17 @@ tinymce.create('tinymce.UndoManager', {
                        return new f(a, b, c, d, e);\r
                },\r
 \r
-               confirm : function(t, cb, s) {\r
-                       cb.call(s || this, confirm(this._decode(this.editor.getLang(t, t))));\r
+               confirm : function(t, cb, s, w) {\r
+                       w = w || window;\r
+\r
+                       cb.call(s || this, w.confirm(this._decode(this.editor.getLang(t, t))));\r
                },\r
 \r
-               alert : function(tx, cb, s) {\r
+               alert : function(tx, cb, s, w) {\r
                        var t = this;\r
-       \r
-                       alert(t._decode(t.editor.getLang(tx, tx)));\r
+\r
+                       w = w || window;\r
+                       w.alert(t._decode(t.editor.getLang(tx, tx)));\r
 \r
                        if (cb)\r
                                cb.call(s || t);\r
@@ -10275,4 +12499,399 @@ tinymce.create('tinymce.UndoManager', {
                }\r
 \r
                });\r
-}());
\ No newline at end of file
+}(tinymce));(function(tinymce) {\r
+       tinymce.CommandManager = function() {\r
+               var execCommands = {}, queryStateCommands = {}, queryValueCommands = {};\r
+\r
+               function add(collection, cmd, func, scope) {\r
+                       if (typeof(cmd) == 'string')\r
+                               cmd = [cmd];\r
+\r
+                       tinymce.each(cmd, function(cmd) {\r
+                               collection[cmd.toLowerCase()] = {func : func, scope : scope};\r
+                       });\r
+               };\r
+\r
+               tinymce.extend(this, {\r
+                       add : function(cmd, func, scope) {\r
+                               add(execCommands, cmd, func, scope);\r
+                       },\r
+\r
+                       addQueryStateHandler : function(cmd, func, scope) {\r
+                               add(queryStateCommands, cmd, func, scope);\r
+                       },\r
+\r
+                       addQueryValueHandler : function(cmd, func, scope) {\r
+                               add(queryValueCommands, cmd, func, scope);\r
+                       },\r
+\r
+                       execCommand : function(scope, cmd, ui, value, args) {\r
+                               if (cmd = execCommands[cmd.toLowerCase()]) {\r
+                                       if (cmd.func.call(scope || cmd.scope, ui, value, args) !== false)\r
+                                               return true;\r
+                               }\r
+                       },\r
+\r
+                       queryCommandValue : function() {\r
+                               if (cmd = queryValueCommands[cmd.toLowerCase()])\r
+                                       return cmd.func.call(scope || cmd.scope, ui, value, args);\r
+                       },\r
+\r
+                       queryCommandState : function() {\r
+                               if (cmd = queryStateCommands[cmd.toLowerCase()])\r
+                                       return cmd.func.call(scope || cmd.scope, ui, value, args);\r
+                       }\r
+               });\r
+       };\r
+\r
+       tinymce.GlobalCommands = new tinymce.CommandManager();\r
+})(tinymce);(function(tinymce) {\r
+       function processRange(dom, start, end, callback) {\r
+               var ancestor, n, startPoint, endPoint, sib;\r
+\r
+               function findEndPoint(n, c) {\r
+                       do {\r
+                               if (n.parentNode == c)\r
+                                       return n;\r
+\r
+                               n = n.parentNode;\r
+                       } while(n);\r
+               };\r
+\r
+               function process(n) {\r
+                       callback(n);\r
+                       tinymce.walk(n, callback, 'childNodes');\r
+               };\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
+\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
+\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
+\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
+\r
+               function findFormatRoot(n) {\r
+                       var sp;\r
+\r
+                       dom.getParent(n, function(n) {\r
+                               if (dom.is(n, ed.getParam('removeformat_selector')))\r
+                                       sp = n;\r
+\r
+                               return dom.isBlock(n);\r
+                       }, ed.getBody());\r
+\r
+                       return sp;\r
+               };\r
+\r
+               function collect(n) {\r
+                       if (dom.is(n, ed.getParam('removeformat_selector')))\r
+                               nodes.push(n);\r
+               };\r
+\r
+               function walk(n) {\r
+                       collect(n);\r
+                       tinymce.walk(n, collect, 'childNodes');\r
+               };\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
+\r
+               // Same container\r
+               if (sc == ec) { // TEXT_NODE\r
+                       start = findFormatRoot(sc);\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
+\r
+                                       s.moveToBookmark(bm);\r
+                               }\r
+\r
+                               return;\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
+\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
+\r
+                                       sc = sc.splitText(so);\r
+                               }\r
+                       }\r
+\r
+                       // Split end text node\r
+                       if (end) {\r
+                               if (ec.nodeType == 3) // TEXT\r
+                                       ec.splitText(eo);\r
+                       }\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
+\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
+\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
+                       }\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
+\r
+                       // Collect nodes in between\r
+                       processRange(dom, start, end, collect);\r
+\r
+                       // Remove invisible character for IE workaround if we find it\r
+                       if (sc.nodeValue == '\uFEFF')\r
+                               sc.nodeValue = '';\r
+\r
+                       // Process start/end container elements\r
+                       walk(ec);\r
+                       walk(sc);\r
+               }\r
+\r
+               // Remove all collected nodes\r
+               tinymce.each(nodes, function(n) {\r
+                       dom.remove(n, 1);\r
+               });\r
+\r
+               // Remove leftover wrapper\r
+               dom.remove('__end', 1);\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
+\r
+               function getBQ(e) {\r
+                       return dom.getParent(e, function(n) {return n.nodeName === 'BLOCKQUOTE';});\r
+               };\r
+\r
+               // Get start/end block\r
+               sb = dom.getParent(s.getStart(), dom.isBlock);\r
+               eb = dom.getParent(s.getEnd(), dom.isBlock);\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
+\r
+                       // Move all elements after the end block into new bq\r
+                       if (getBQ(eb)) {\r
+                               bq2 = bq.cloneNode(false);\r
+\r
+                               while (n = eb.nextSibling)\r
+                                       bq2.appendChild(n.parentNode.removeChild(n));\r
+                       }\r
+\r
+                       // Add new bq after\r
+                       if (bq2)\r
+                               dom.insertAfter(bq2, bq);\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
+\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
+\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
+\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
+\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
+                                       }\r
+                               }\r
+                       } else\r
+                               ed.selection.moveToBookmark(bm);\r
+\r
+                       return;\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
+\r
+               if (!sb || !eb)\r
+                       return;\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
+\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
+                       }\r
+\r
+                       // No BQ found, create one\r
+                       if (!bq) {\r
+                               bq = dom.create('blockquote');\r
+                               e.parentNode.insertBefore(bq, e);\r
+                       }\r
+\r
+                       // Add children from existing BQ\r
+                       if (e.nodeName == 'BLOCKQUOTE' && bq) {\r
+                               n = e.firstChild;\r
+\r
+                               while (n) {\r
+                                       bq.appendChild(n.cloneNode(true));\r
+                                       n = n.nextSibling;\r
+                               }\r
+\r
+                               dom.remove(e);\r
+                               return;\r
+                       }\r
+\r
+                       // Add non BQ element to BQ\r
+                       bq.appendChild(dom.remove(e));\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(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
+\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
+                       }\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
+\r
+       cmds.add(['mceEndUndoLevel', 'mceAddUndoLevel'], function() {\r
+               this.undoManager.add();\r
+       });\r
+\r
+       cmds.add('Undo', function() {\r
+               var ed = this;\r
+\r
+               if (ed.settings.custom_undo_redo) {\r
+                       ed.undoManager.undo();\r
+                       ed.nodeChanged();\r
+                       return true;\r
+               }\r
+\r
+               return false; // Run browser command\r
+       });\r
+\r
+       cmds.add('Redo', function() {\r
+               var ed = this;\r
+\r
+               if (ed.settings.custom_undo_redo) {\r
+                       ed.undoManager.redo();\r
+                       ed.nodeChanged();\r
+                       return true;\r
+               }\r
+\r
+               return false; // Run browser command\r
+       });\r
+})();\r