23 			// Safari will crash if the build in createlink command is used

    46 			// Safari CreateLink command will not work correctly on images that is aligned

    24 /*			ed.addCommand('CreateLink', function(u, v) {

    47 			ed.addCommand('CreateLink', function(u, v) {

    25 				ed.execCommand("mceInsertContent", false, '<a href="' + dom.encode(v) + '">' + ed.selection.getContent() + '</a>');

    48 				var n = ed.selection.getNode(), dom = ed.dom, a;

    26 			});*/

    49 

    50 				if (n && (/^(left|right)$/i.test(dom.getStyle(n, 'float', 1)) || /^(left|right)$/i.test(dom.getAttrib(n, 'align')))) {

    51 					a = dom.create('a', {href : v}, n.cloneNode());

    52 					n.parentNode.replaceChild(a, n);

    53 					ed.selection.select(a);

    54 				} else

    55 					ed.getDoc().execCommand("CreateLink", false, v);

    56 			});

    49 				var h, b;

    79 				var h, b, r, n, s;

    57 					if (b.childNodes.length == 1 && !/<(img|hr)/.test(h) && tinymce.trim(h.replace(/<[^>]+>/g, '')).length == 0)

    88 					if (b.childNodes.length == 1 && !/<(img|hr)/.test(h) && tinymce.trim(h.replace(/<[^>]+>/g, '')).length == 0) {

    58 						ed.setContent('', {format : 'raw'});

    89 						// Inject paragrah and bogus br

    90 						ed.setContent('<p><br mce_bogus="1" /></p>', {format : 'raw'});

    91 

    92 						// Move caret before bogus br

    93 						n = b.firstChild;

    94 						r = s.getRng();

    95 						r.setStart(n, 0);

    96 						r.setEnd(n, 0);

    97 						s.setRng(r);

    98 					}

    75 				ed.getBody().innerHTML = ed.getBody().innerHTML.replace(/mce_marker/g, v + '<span id="_mce_tmp">XX</span>');

   115 				ed.getBody().innerHTML = ed.getBody().innerHTML.replace(/mce_marker/g, ed.dom.processHTML(v) + '<span id="_mce_tmp">XX</span>');

    82 				if (e.keyCode == 13 && (e.shiftKey || ed.settings.force_br_newlines && ed.selection.getNode().nodeName != 'LI')) {

   121 				var se, li, lic, r1, r2, n, sel, doc, be, af, pa;

    83 					t._insertBR(ed);

   122 

    84 					Event.cancel(e);

   123 				if (e.keyCode == 13) {

   124 					sel = ed.selection;

   125 					se = sel.getNode();

   126 

   127 					// Workaround for missing shift+enter support, http://bugs.webkit.org/show_bug.cgi?id=16973

   128 					if (e.shiftKey || ed.settings.force_br_newlines && se.nodeName != 'LI') {

   129 						t._insertBR(ed);

   130 						Event.cancel(e);

   131 					}

   132 

   133 					// Workaround for DIV elements produced by Safari

   134 					if (li = dom.getParent(se, 'LI')) {

   135 						lic = dom.getParent(li, 'OL,UL');

   136 						doc = ed.getDoc();

   137 

   138 						pa = dom.create('p');

   139 						dom.add(pa, 'br', {mce_bogus : "1"});

   140 

   141 						if (isEmpty(doc, li)) {

   142 							// If list in list then use browser default behavior

   143 							if (n = dom.getParent(lic.parentNode, 'LI,OL,UL'))

   144 								return;

   145 

   146 							n = dom.getParent(lic, 'p,h1,h2,h3,h4,h5,h6,div') || lic;

   147 

   148 							// Create range from the start of block element to the list item

   149 							r1 = doc.createRange();

   150 							r1.setStartBefore(n);

   151 							r1.setEndBefore(li);

   152 

   153 							// Create range after the list to the end of block element

   154 							r2 = doc.createRange();

   155 							r2.setStartAfter(li);

   156 							r2.setEndAfter(n);

   157 

   158 							be = r1.cloneContents();

   159 							af = r2.cloneContents();

   160 

   161 							if (!isEmpty(doc, af))

   162 								dom.insertAfter(af, n);

   163 

   164 							dom.insertAfter(pa, n);

   165 

   166 							if (!isEmpty(doc, be))

   167 								dom.insertAfter(be, n);

   168 

   169 							dom.remove(n);

   170 

   171 							n = pa.firstChild;

   172 							r1 = doc.createRange();

   173 							r1.setStartBefore(n);

   174 							r1.setEndBefore(n);

   175 							sel.setRng(r1);

   176 

   177 							return Event.cancel(e);

   178 						}

   179 					}

    88 			// Safari returns incorrect values

   183 			// Safari doesn't place lists outside block elements

    89 			ed.addQueryValueHandler('FontSize', function(u, v) {

   184 			ed.onExecCommand.add(function(ed, cmd) {

    90 				var e, v;

   185 				var sel, dom, bl, bm;

    91 

   186 

    92 				// Check for the real font size at the start of selection

   187 				if (cmd == 'InsertUnorderedList' || cmd == 'InsertOrderedList') {

    93 				if ((e = ed.dom.getParent(ed.selection.getStart(), 'span')) && (v = e.style.fontSize))

   188 					sel = ed.selection;

    94 					return tinymce.inArray(t.namedFontSizes, v) + 1;

   189 					dom = ed.dom;

    95 

   190 

    96 				// Check for the real font size at the end of selection

   191 					if (bl = dom.getParent(sel.getNode(), function(n) {return /^(H[1-6]|P|ADDRESS|PRE)$/.test(n.nodeName);})) {

    97 				if ((e = ed.dom.getParent(ed.selection.getEnd(), 'span')) && (v = e.style.fontSize))

   192 						bm = sel.getBookmark();

    98 					return tinymce.inArray(t.namedFontSizes, v) + 1;

   193 						dom.remove(bl, 1);

    99 

   194 						sel.moveToBookmark(bm);

   100 				// Return default value it's better than nothing right!

   195 					}

   101 				return ed.getDoc().queryCommandValue('FontSize');

   196 				}

   102 			});

   103 

   104 			// Safari returns incorrect values

   105 			ed.addQueryValueHandler('FontName', function(u, v) {

   106 				var e, v;

   107 

   108 				// Check for the real font name at the start of selection

   109 				if ((e = ed.dom.getParent(ed.selection.getStart(), 'span')) && (v = e.style.fontFamily))

   110 					return v.replace(/, /g, ',');

   111 

   112 				// Check for the real font name at the end of selection

   113 				if ((e = ed.dom.getParent(ed.selection.getEnd(), 'span')) && (v = e.style.fontFamily))

   114 					return v.replace(/, /g, ',');

   115 

   116 				// Return default value it's better than nothing right!

   117 				return ed.getDoc().queryCommandValue('FontName');