rich 1.0.3 → 1.1.0

data/vendor/assets/ckeditor/ckeditor/_source/plugins/placeholder/lang/it.js

@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'placeholder', 'it',
+{
+	placeholder :
+	{
+		title		: 'Proprietà segnaposto',
+		toolbar		: 'Crea segnaposto',
+		text		: 'Testo segnaposto',
+		edit		: 'Modifica segnaposto',
+		textMissing	: 'Il segnaposto deve contenere del testo.'
+	}
+});

data/vendor/assets/ckeditor/ckeditor/_source/plugins/placeholder/lang/nb.js

@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'placeholder', 'nb',
+{
+	placeholder :
+	{
+		title		: 'Egenskaper for plassholder',
+		toolbar		: 'Opprett plassholder',
+		text		: 'Tekst for plassholder',
+		edit		: 'Rediger plassholder',
+		textMissing	: 'Plassholderen må inneholde tekst.'
+	}
+});

data/vendor/assets/ckeditor/ckeditor/_source/plugins/placeholder/lang/nl.js

@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'placeholder', 'nl',
+{
+	placeholder :
+	{
+		title		: 'Eigenschappen placeholder',
+		toolbar		: 'Placeholder aanmaken',
+		text		: 'Placeholder tekst',
+		edit		: 'Placeholder wijzigen',
+		textMissing	: 'De placeholder moet tekst bevatten.'
+	}
+});

data/vendor/assets/ckeditor/ckeditor/_source/plugins/placeholder/lang/no.js

@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'placeholder', 'no',
+{
+	placeholder :
+	{
+		title		: 'Egenskaper for plassholder',
+		toolbar		: 'Opprett plassholder',
+		text		: 'Tekst for plassholder',
+		edit		: 'Rediger plassholder',
+		textMissing	: 'Plassholderen må inneholde tekst.'
+	}
+});

data/vendor/assets/ckeditor/ckeditor/_source/plugins/placeholder/lang/pl.js

@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'placeholder', 'pl',
+{
+	placeholder :
+	{
+		title		: 'Właściwości wypełniacza',
+		toolbar		: 'Utwórz wypełniacz',
+		text		: 'Tekst wypełnienia',
+		edit		: 'Edytuj wypełnienie',
+		textMissing	: 'Wypełnienie musi posiadać jakiś tekst.'
+	}
+});

data/vendor/assets/ckeditor/ckeditor/_source/plugins/placeholder/lang/tr.js

@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'placeholder', 'tr',
+{
+	placeholder :
+	{
+		title		: 'Yer tutucu özellikleri',
+		toolbar		: 'Yer tutucu oluşturun',
+		text		: 'Yer tutucu metini',
+		edit		: 'Yer tutucuyu düzenle',
+		textMissing	: 'Yer tutucu metin içermelidir.'
+	}
+});

data/vendor/assets/ckeditor/ckeditor/_source/plugins/placeholder/lang/ug.js

@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'placeholder', 'ug',
+{
+	placeholder :
+	{
+		title		: 'ئورۇن بەلگە خاسلىقى',
+		toolbar		: 'ئورۇن بەلگە قۇر',
+		text		: 'ئورۇن بەلگە تېكىستى',
+		edit		: 'ئورۇن بەلگە تەھرىر',
+		textMissing	: 'ئورۇن بەلگىسىدە چوقۇم تېكىست بولۇشى لازىم'
+	}
+});

data/vendor/assets/ckeditor/ckeditor/_source/plugins/placeholder/lang/uk.js

@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'placeholder', 'uk',
+{
+	placeholder :
+	{
+		title		: 'Налаштування Заповнювача',
+		toolbar		: 'Створити Заповнювач',
+		text		: 'Текст Заповнювача',
+		edit		: 'Редагувати Заповнювач',
+		textMissing	: 'Заповнювач повинен містити текст.'
+	}
+});

data/vendor/assets/ckeditor/ckeditor/_source/plugins/placeholder/lang/vi.js

@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'placeholder', 'vi',
+{
+	placeholder :
+	{
+		title		: 'Thuộc tính đặt chỗ',
+		toolbar		: 'Tạo đặt chỗ',
+		text		: 'Văn bản đặt chỗ',
+		edit		: 'Edit Placeholder', // MISSING
+		textMissing	: 'The placeholder must contain text.' // MISSING
+	}
+});

data/vendor/assets/ckeditor/ckeditor/_source/plugins/placeholder/lang/zh-cn.js

@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'placeholder', 'zh-cn',
+{
+	placeholder :
+	{
+		title		: '占位符属性',
+		toolbar		: '创建占位符',
+		text		: '占位符文字',
+		edit		: '编辑占位符',
+		textMissing	: '占位符必需包含有文字'
+	}
+});

data/vendor/assets/ckeditor/ckeditor/_source/plugins/placeholder/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -14,7 +14,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	CKEDITOR.plugins.add( 'placeholder',
 	{
 		requires : [ 'dialog' ],
-		lang : [ 'en', 'he' ],
+		lang : [ 'bg', 'cs', 'cy', 'da', 'de', 'el', 'en', 'eo', 'et', 'fa', 'fi', 'fr', 'he', 'hr', 'it', 'nb', 'nl', 'no', 'pl', 'tr', 'ug', 'uk', 'vi', 'zh-cn' ],
 		init : function( editor )
 		{
 			var lang = editor.lang.placeholder;

data/vendor/assets/ckeditor/ckeditor/_source/plugins/popup/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -49,8 +49,13 @@ CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
 
 		try
 		{
-			popupWindow.moveTo( left, top );
-			popupWindow.resizeTo( width, height );
+			// Chrome 18 is problematic, but it's not really needed here (#8855).
+			var ua = navigator.userAgent.toLowerCase();
+			if ( ua.indexOf( ' chrome/18' ) == -1 )
+			{
+				popupWindow.moveTo( left, top );
+				popupWindow.resizeTo( width, height );
+			}
 			popupWindow.focus();
 			popupWindow.location.href = url;
 		}

data/vendor/assets/ckeditor/ckeditor/_source/plugins/preview/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/vendor/assets/ckeditor/ckeditor/_source/plugins/print/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/vendor/assets/ckeditor/ckeditor/_source/plugins/removeformat/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/vendor/assets/ckeditor/ckeditor/_source/plugins/resize/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -44,7 +44,8 @@ CKEDITOR.plugins.add( 'resize',
 				if ( resizeVertical )
 					height =  Math.max( config.resize_minHeight, Math.min( internalHeight, config.resize_maxHeight ) );
 
-				editor.resize( width, height );
+				// DO NOT impose fixed size with single direction resize. (#6308)
+				editor.resize( resizeHorizontal ? width : null, height );
 			}
 
 			function dragEndHandler ( evt )

data/vendor/assets/ckeditor/ckeditor/_source/plugins/richcombo/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/vendor/assets/ckeditor/ckeditor/_source/plugins/save/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/vendor/assets/ckeditor/ckeditor/_source/plugins/scayt/dialogs/options.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/vendor/assets/ckeditor/ckeditor/_source/plugins/scayt/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/vendor/assets/ckeditor/ckeditor/_source/plugins/selection/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -162,11 +162,54 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		var fillingChar = doc && doc.removeCustomData( 'cke-fillingChar' );
 		if ( fillingChar )
 		{
+			var bm,
+			sel = doc.getSelection().getNative(),
+			// Be error proof.
+			range = sel && sel.type != 'None' && sel.getRangeAt( 0 );
+
+			// Text selection position might get mangled by
+			// subsequent dom modification, save it now for restoring. (#8617)
+			if ( fillingChar.getLength() > 1
+				 && range && range.intersectsNode( fillingChar.$ ) )
+			{
+				bm = [ sel.anchorOffset, sel.focusOffset ];
+
+				// Anticipate the offset change brought by the removed char.
+				var startAffected = sel.anchorNode == fillingChar.$ && sel.anchorOffset > 0,
+					endAffected = sel.focusNode == fillingChar.$ && sel.focusOffset > 0;
+				startAffected && bm[ 0 ]--;
+				endAffected && bm[ 1 ]--;
+
+				// Revert the bookmark order on reverse selection.
+				isReversedSelection( sel ) && bm.unshift( bm.pop() );
+			}
+
 			// We can't simply remove the filling node because the user
 			// will actually enlarge it when typing, so we just remove the
 			// invisible char from it.
 			fillingChar.setText( fillingChar.getText().replace( /\u200B/g, '' ) );
-			fillingChar = 0;
+
+			// Restore the bookmark.
+			if ( bm )
+			{
+				var rng = sel.getRangeAt( 0 );
+				rng.setStart( rng.startContainer, bm[ 0 ] );
+				rng.setEnd( rng.startContainer, bm[ 1 ] );
+				sel.removeAllRanges();
+				sel.addRange( rng );
+			}
+		}
+	}
+
+	function isReversedSelection( sel )
+	{
+		if ( !sel.isCollapsed )
+		{
+			var range = sel.getRangeAt( 0 );
+			// Potentially alter an reversed selection range.
+			range.setStart( sel.anchorNode, sel.anchorOffset );
+			range.setEnd( sel.focusNode, sel.focusOffset );
+			return range.collapsed;
 		}
 	}
 
@@ -180,20 +223,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			{
 				editor.on( 'selectionChange', function() { checkFillingChar( editor.document ); } );
 				editor.on( 'beforeSetMode', function() { removeFillingChar( editor.document ); } );
-				editor.on( 'key', function( e )
-					{
-						// Remove the filling char before some keys get
-						// executed, so they'll not get blocked by it.
-						switch ( e.data.keyCode )
-						{
-							case 13 :	// ENTER
-							case CKEDITOR.SHIFT + 13 :	// SHIFT-ENTER
-							case 37 :	// LEFT-ARROW
-							case 39 :	// RIGHT-ARROW
-							case 8 :	// BACKSPACE
-								removeFillingChar( editor.document );
-						}
-					}, null, null, 10 );
 
 				var fillingCharBefore,
 					resetSelection;
@@ -264,29 +293,22 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								if ( evt.data.$.srcElement.nodeName != 'BODY' )
 									return;
 
-								// If we have saved a range, restore it at this
+								// Give the priority to locked selection since it probably
+								// reflects the actual situation, besides locked selection
+								// could be interfered because of text nodes normalizing.
+								// (#6083, #6987)
+								var lockedSelection = doc.getCustomData( 'cke_locked_selection' );
+								if ( lockedSelection )
+								{
+									lockedSelection.unlock( 1 );
+									lockedSelection.lock();
+								}
+								// Then check ff we have saved a range, restore it at this
 								// point.
-								if ( savedRange )
+								else if ( savedRange && restoreEnabled )
 								{
-									if ( restoreEnabled )
-									{
-										// Well not break because of this.
-										try
-										{
-											savedRange.select();
-										}
-										catch (e)
-										{}
-
-										// Update locked selection because of the normalized text nodes. (#6083, #6987)
-										var lockedSelection = doc.getCustomData( 'cke_locked_selection' );
-										if ( lockedSelection )
-										{
-											lockedSelection.unlock();
-											lockedSelection.lock();
-										}
-									}
-
+									// Well not break because of this.
+									try { savedRange.select(); } catch (e) {}
 									savedRange = null;
 								}
 							});
@@ -311,20 +333,21 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								restoreEnabled = 1;
 							});
 
-						// IE before version 8 will leave cursor blinking inside the document after
-						// editor blurred unless we clean up the selection. (#4716)
-						if ( CKEDITOR.env.ie && CKEDITOR.env.version < 8 )
+						// [IE] Iframe will still keep the selection when blurred, if
+						// focus is moved onto a non-editing host, e.g. link or button, but
+						// it becomes a problem for the object type selection, since the resizer
+						// handler attached on it will mark other part of the UI, especially
+						// for the dialog. (#8157)
+						// [IE<8] Even worse For old IEs, the cursor will not vanish even if
+						// the selection has been moved to another text input in some cases. (#4716)
+						//
+						// Now the range restore is disabled, so we simply force IE to clean
+						// up the selection before blur.
+						CKEDITOR.env.ie && editor.on( 'blur', function()
 						{
-							editor.on( 'blur', function( evt )
-							{
-								// Try/Catch to avoid errors if the editor is hidden. (#6375)
-								try
-								{
-									editor.document && editor.document.$.selection.empty();
-								}
-								catch (e) {}
-							});
-						}
+							// Error proof when the editor is not visible. (#6375)
+							try{ doc.$.selection.empty(); } catch ( er){}
+						});
 
 						// Listening on document element ensures that
 						// scrollbar is included. (#5280)
@@ -341,20 +364,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							restoreEnabled = 1;
 						});
 
-						// In IE6/7 the blinking cursor appears, but contents are
-						// not editable. (#5634)
-						if ( CKEDITOR.env.ie && ( CKEDITOR.env.ie7Compat || CKEDITOR.env.version < 8 || CKEDITOR.env.quirks ) )
-						{
-							// The 'click' event is not fired when clicking the
-							// scrollbars, so we can use it to check whether
-							// the empty space following <body> has been clicked.
-							html.on( 'click', function( evt )
-							{
-								if ( evt.data.getTarget().getName() == 'html' )
-									editor.getSelection().getRanges()[ 0 ].select();
-							});
-						}
-
 						var scroll;
 						// IE fires the "selectionchange" event when clicking
 						// inside a selection. We don't want to capture that.
@@ -399,6 +408,80 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								saveSelection();
 							});
 
+						// When content doc is in standards mode, IE doesn't focus the editor when
+						// clicking at the region below body (on html element) content, we emulate
+						// the normal behavior on old IEs. (#1659, #7932)
+						if ( ( CKEDITOR.env.ie7Compat || CKEDITOR.env.ie6Compat )
+							 && doc.$.compatMode != 'BackCompat' )
+						{
+							html.on( 'mousedown', function( evt )
+							{
+								evt = evt.data.$;
+
+								// Expand the text range along with mouse move.
+								function onHover( evt )
+								{
+									evt = evt.data.$;
+									if ( textRng )
+									{
+										// Read the current cursor.
+										var rngEnd = body.$.createTextRange();
+										rngEnd.moveToPoint( evt.x, evt.y );
+
+										// Handle drag directions.
+										textRng.setEndPoint(
+											textRng.compareEndPoints( 'StartToStart', rngEnd ) < 0 ?
+											'EndToEnd' :
+											'StartToStart',
+											rngEnd );
+
+										// Update selection with new range.
+										textRng.select();
+									}
+								}
+
+								// We're sure that the click happens at the region
+								// below body, but not on scrollbar.
+								if ( evt.y < html.$.clientHeight
+									 && evt.y > body.$.offsetTop + body.$.clientHeight
+									 && evt.x < html.$.clientWidth )
+								{
+									// Start to build the text range.
+									var textRng = body.$.createTextRange();
+									textRng.moveToPoint( evt.x, evt.y );
+									textRng.select();
+
+									html.on( 'mousemove', onHover );
+
+									html.on( 'mouseup', function( evt )
+									{
+										html.removeListener( 'mousemove', onHover );
+										evt.removeListener();
+										textRng.select();
+										textRng = null;
+									} );
+								}
+							});
+						}
+
+						// It's much simpler for IE8, we just need to reselect the reported range.
+						if ( CKEDITOR.env.ie8 )
+						{
+							html.on( 'mouseup', function( evt )
+							{
+								// The event is not fired when clicking on the scrollbars,
+								// so we can safely check the following to understand
+								// whether the empty space following <body> has been clicked.
+								if ( evt.data.getTarget().getName() == 'html' )
+								{
+									var sel = CKEDITOR.document.$.selection,
+										range = sel.createRange();
+									// The selection range is reported on host, but actually it should applies to the content doc.
+									if ( sel.type != 'None' && range.parentElement().ownerDocument == doc.$ )
+										range.select();
+								}
+							} );
+						}
 
 						// IE is the only to provide the "selectionchange"
 						// event.
@@ -465,6 +548,31 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						doc.on( 'keyup', checkSelectionChangeTimeout, editor );
 						doc.on( 'selectionchange', checkSelectionChangeTimeout, editor );
 					}
+
+					if ( CKEDITOR.env.webkit )
+					{
+						doc.on( 'keydown', function( evt )
+						{
+							var key = evt.data.getKey();
+							// Remove the filling char before some keys get
+							// executed, so they'll not get blocked by it.
+							switch ( key )
+							{
+								case 13 :	// ENTER
+								case 33 :	// PAGEUP
+								case 34 :	// PAGEDOWN
+								case 35 :	// HOME
+								case 36 :	// END
+								case 37 :	// LEFT-ARROW
+								case 39 :	// RIGHT-ARROW
+								case 8 :	// BACKSPACE
+								case 45 :	// INS
+								case 46 :	// DEl
+									removeFillingChar( editor.document );
+							}
+
+						}, null, null, 10 );
+					}
 				});
 
 			// Clear the cached range path before unload. (#7174)
@@ -573,10 +681,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		 */
 		if ( CKEDITOR.env.ie )
 		{
-			var range = this.getNative().createRange();
-			if ( !range
-				|| ( range.item && range.item(0).ownerDocument != this.document.$ )
-				|| ( range.parentElement && range.parentElement().ownerDocument != this.document.$ ) )
+			// Avoid breaking because of it. (#8836)
+			try
+			{
+				var range = this.getNative().createRange();
+				if ( !range ||
+					 ( range.item && range.item( 0 ).ownerDocument != this.document.$ ) ||
+					 ( range.parentElement && range.parentElement().ownerDocument != this.document.$ ) )
+				{
+					throw 0;
+				}
+			}
+			catch ( e )
 			{
 				this.isInvalid = true;
 			}
@@ -737,7 +853,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							endIndex = siblings.length - 1,
 							index = -1,
 							position,
-							distance;
+							distance,
+							container;
 
 						// Binary search over all element childs to test the range to see whether
 						// range is right on the boundary of one element.
@@ -758,12 +875,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								// e.g. <p>text<br />^<br /></p> (#7433)
 								if ( CKEDITOR.env.ie9Compat && child.tagName == 'BR' )
 								{
-									var bmId = 'cke_range_marker';
-									range.execCommand( 'CreateBookmark', false, bmId );
-									child = doc.getElementsByName( bmId )[ 0 ];
-									var offset = getNodeIndex( child );
-									parent.removeChild( child );
-									return { container : parent, offset : offset };
+									// "Fall back" to w3c selection.
+									var sel = doc.defaultView.getSelection();
+									return { container : sel[ start ? 'anchorNode' : 'focusNode' ],
+										offset : sel[ start ? 'anchorOffset' : 'focusOffset' ] };
 								}
 								else
 									return { container : parent, offset : getNodeIndex( child ) };
@@ -790,7 +905,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							{
 								child = siblings[ siblings.length - 1 ];
 
-								if ( child.nodeType == CKEDITOR.NODE_ELEMENT )
+								if ( child.nodeType != CKEDITOR.NODE_TEXT )
 									return { container : parent, offset : siblings.length };
 								else
 									return { container : child, offset : child.nodeValue.length };
@@ -798,10 +913,17 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 							// Start the measuring until distance overflows, meanwhile count the text nodes.
 							var i = siblings.length;
-							while ( distance > 0 )
-								distance -= siblings[ --i ].nodeValue.length;
+							while ( distance > 0 && i > 0 )
+							{
+								sibling = siblings[ --i ];
+								if ( sibling.nodeType == CKEDITOR.NODE_TEXT )
+								{
+									container = sibling;
+									distance -= sibling.nodeValue.length;
+								}
+							}
 
-							return  { container : siblings[ i ], offset : -distance };
+							return  { container : container, offset : -distance };
 						}
 						// Test range was one offset beyond OR behind the anchored text node.
 						else
@@ -826,7 +948,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								try
 								{
 									sibling = child[ position > 0 ? 'previousSibling' : 'nextSibling' ];
-									distance -= sibling.nodeValue.length;
+									if ( sibling.nodeType == CKEDITOR.NODE_TEXT )
+									{
+										distance -= sibling.nodeValue.length;
+										container = sibling;
+									}
 									child = sibling;
 								}
 								// Measurement in IE could be somtimes wrong because of <select> element. (#4611)
@@ -836,7 +962,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								}
 							}
 
-							return { container : child, offset : position > 0 ? -distance : child.nodeValue.length + distance };
+							return { container : container, offset : position > 0 ? -distance : container.nodeValue.length + distance };
 						}
 					};
 
@@ -1157,7 +1283,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 					for ( var t in tags )
 					{
-						if ( root = ancestor.getAscendant( t, 1 ) )
+						if ( ( root = ancestor.getAscendant( t, 1 ) ) )
 							break;
 					}