Merge branch 'master' into major

Conflicts: CHANGES.md
ckeditor · Nov 6, 2013 · dd70588 · dd70588
2 parents 8af211e + bc2a560
commit dd70588
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -72,6 +72,16 @@ New Features:
 * [#7987](https://dev.ckeditor.com/ticket/7987): New [Language](http://ckeditor.com/addon/language) plugin that implements Language toolbar button to support [WCAG 3.1.2 Language of Parts](http://www.w3.org/TR/UNDERSTANDING-WCAG20/meaning-other-lang-id.html).
 * [#10708](http://dev.ckeditor.com/ticket/10708): New [smileys](http://ckeditor.com/addon/smiley).
 
+## CKEditor 4.2.3
+
+Fixed Issues:
+
+* [#10994](http://dev.ckeditor.com/ticket/10994): Fixed: loading external jQuery when opening adapter sample from file.
+* [#10975](http://dev.ckeditor.com/ticket/10975): [IE] Fixed: Error thrown while opening color palette.
+* [#9929](http://dev.ckeditor.com/ticket/9929): [Blink/Webkit] Fixed: A non-breaking space is created once deleted a character and a regular space is typed.
+* [#10963](http://dev.ckeditor.com/ticket/10963): Fixed: JAWS issue with keyboard shortcut for Magicline.
+* [#11096](http://dev.ckeditor.com/ticket/11096): Fixed: TypeError: Object has no method 'is'.
+
 ## CKEditor 4.2.2
 
 Fixed Issues:

diff --git a/core/editable.js b/core/editable.js
@@ -630,9 +630,10 @@
 							// 1. Del/Backspace key before/after table;
 							// 2. Backspace Key after start of table.
 							if ( ( block = path.block ) &&
-								 range[ rtl ? 'checkStartOfBlock' : 'checkEndOfBlock' ]() &&
 								 ( next = block[ rtl ? 'getPrevious' : 'getNext' ]( isNotWhitespace ) ) &&
-								 next.is( 'table' ) )
+								 ( next.type == CKEDITOR.NODE_ELEMENT ) &&
+								 next.is( 'table' ) &&
+								 range[ rtl ? 'checkStartOfBlock' : 'checkEndOfBlock' ]() )
 							{
 								editor.fire( 'saveSnapshot' );
 

diff --git a/plugins/colorbutton/plugin.js b/plugins/colorbutton/plugin.js
@@ -75,6 +75,9 @@ CKEDITOR.plugins.add( 'colorbutton', {
 						path = editor.elementPath( block ),
 						color;
 
+					if ( !path )
+						return;
+
 					// Find the closest block element.
 					block = path.block || path.blockLimit || editor.document.getBody();
 

diff --git a/plugins/magicline/plugin.js b/plugins/magicline/plugin.js
@@ -1784,10 +1784,10 @@
  *		// Changes keystroke to CTRL + ,
  *		CKEDITOR.config.magicline_keystrokePrevious = CKEDITOR.CTRL + 188;
  *
- * @cfg {Number} [magicline_keystrokePrevious=CKEDITOR.CTRL + CKEDITOR.SHIFT + 219 (CTRL + SHIFT + [)]
+ * @cfg {Number} [magicline_keystrokePrevious=CKEDITOR.CTRL + CKEDITOR.SHIFT + 51 (CTRL + SHIFT + 3)]
  * @member CKEDITOR.config
  */
-CKEDITOR.config.magicline_keystrokePrevious = CKEDITOR.CTRL + CKEDITOR.SHIFT + 219; // CTRL + SHIFT + [
+CKEDITOR.config.magicline_keystrokePrevious = CKEDITOR.CTRL + CKEDITOR.SHIFT + 51; // CTRL + SHIFT + 3
 
 /**
  * Defines default keystroke that access the closest unreachable focus space **after**
@@ -1796,10 +1796,10 @@ CKEDITOR.config.magicline_keystrokePrevious = CKEDITOR.CTRL + CKEDITOR.SHIFT + 2
  *		// Changes keystroke to CTRL + .
  *		CKEDITOR.config.magicline_keystrokeNext = CKEDITOR.CTRL + 190;
  *
- * @cfg {Number} [magicline_keystrokeNext=CKEDITOR.CTRL + CKEDITOR.SHIFT + 221 (CTRL + SHIFT + ])]
+ * @cfg {Number} [magicline_keystrokeNext=CKEDITOR.CTRL + CKEDITOR.SHIFT + 52 (CTRL + SHIFT + 4)]
  * @member CKEDITOR.config
  */
-CKEDITOR.config.magicline_keystrokeNext = CKEDITOR.CTRL + CKEDITOR.SHIFT + 221; // CTRL + SHIFT + ]
+CKEDITOR.config.magicline_keystrokeNext = CKEDITOR.CTRL + CKEDITOR.SHIFT + 52; // CTRL + SHIFT + 4
 
 /**
  * Defines a list of attributes that, if assigned to some elements, prevent magicline from being

diff --git a/samples/divreplace.html b/samples/divreplace.html
@@ -13,7 +13,7 @@
 
 		div.editable
 		{
-			border: solid 2px Transparent;
+			border: solid 2px transparent;
 			padding-left: 15px;
 			padding-right: 15px;
 		}

diff --git a/samples/jquery.html b/samples/jquery.html
@@ -7,7 +7,7 @@
 <head>
 	<meta charset="utf-8">
 	<title>jQuery Adapter &mdash; CKEditor Sample</title>
-	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" ></script>
+	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
 	<script src="../ckeditor.js"></script>
 	<script src="../adapters/jquery.js"></script>
 	<link href="sample.css" rel="stylesheet">