Skip to content
Permalink
Browse files

Merge branch 't/11859'

  • Loading branch information...
adelura committed Apr 29, 2014
2 parents 59a8141 + b9cb948 commit 081cf71310db0810b276548f93afdde1f0b770f7
Showing with 4 additions and 4 deletions.
  1. +1 −0 CHANGES.md
  2. +3 −4 plugins/codesnippet/samples/codesnippet.html
@@ -5,6 +5,7 @@ CKEditor 4 Changelog

Fixed Issues:

* [#11859](http://dev.ckeditor.com/ticket/11859): Fixed: Removed [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin from required in [Code Snippet](http://ckeditor.com/addon/codesnippet) sample.
* [#11754](http://dev.ckeditor.com/ticket/11754): Fixed: Infinite loop in Google Chrome when contents contains not closed attributes.
* [#11848](http://dev.ckeditor.com/ticket/11848): Fixed: [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) throwing an exception in IE, when there was no selection in editor.
* [#11801](http://dev.ckeditor.com/ticket/11801): Fixed: Editor anchors unavailable when linking [Enhanced Image](http://ckeditor.com/addon/image2) widget.
@@ -100,8 +100,7 @@ <h2>Inline editor</h2>

<pre class="samples">
CKEDITOR.inline( 'editable', {
// Note: The Source Dialog plugin is optional.
extraPlugins: '<strong>codesnippet</strong>,sourcedialog'
<strong>extraPlugins: 'codesnippet'</strong>
} );
</pre>

@@ -169,7 +168,7 @@ <h2>Server-side Highlighting and Custom Highlighting Engines</h2>
var config = {
extraPlugins: 'codesnippet',
toolbar: [
[ 'Source', 'Sourcedialog' ], [ 'Undo', 'Redo' ], [ 'Bold', 'Italic', 'Underline' ], [ 'CodeSnippet' ]
[ 'Source' ], [ 'Undo', 'Redo' ], [ 'Bold', 'Italic', 'Underline' ], [ 'CodeSnippet' ]
],
codeSnippet_theme: 'monokai_sublime',
height: 400
@@ -178,7 +177,7 @@ <h2>Server-side Highlighting and Custom Highlighting Engines</h2>
CKEDITOR.replace( 'editor1', config );
CKEDITOR.inline( 'editable', CKEDITOR.tools.extend( {}, config, {
extraPlugins: 'codesnippet,sourcedialog'
extraPlugins: 'codesnippet'
}, true ) );
initThemeChange();

0 comments on commit 081cf71

Please sign in to comment.
You can’t perform that action at this time.