Skip to content
Permalink
Browse files

Merge branch 't/13131'

  • Loading branch information...
Reinmar committed Apr 2, 2015
2 parents 7c2d0b5 + a769ee3 commit 0128375165f9181c0ae628a6fd357c0590f0a9d5
Showing with 5 additions and 2 deletions.
  1. +1 −0 CHANGES.md
  2. +4 −2 plugins/codesnippet/plugin.js
@@ -13,6 +13,7 @@ Fixed Issues:
* [#12256](http://dev.ckeditor.com/ticket/12256): Fixed: Basic styles' classes are lost when pasting from MS Word if [basics styles](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-coreStyles_bold) were configured to use classes.
* [#12729](http://dev.ckeditor.com/ticket/12729): Incorrect structure created when merging block into list item on *Backspace* and *Delete*.
* [#13031](http://dev.ckeditor.com/ticket/13031): [Firefox] Fixed: No more line breaks in source view since Firefox 36.
* [#13131](http://dev.ckeditor.com/ticket/13131): Fixed: The [Code Snippet](http://ckeditor.com/addon/codesnippet) plugin cannot be used without the `wysiwygarea` plugin.

Other Changes:

@@ -107,8 +107,10 @@
} );
}

// Note: This will work for framed editor only.
editor.addContentsCss( path + 'lib/highlight/styles/' + editor.config.codeSnippet_theme + '.css' );
// Method is available only if wysiwygarea exists.
if ( editor.addContentsCss ) {
editor.addContentsCss( path + 'lib/highlight/styles/' + editor.config.codeSnippet_theme + '.css' );
}
},

highlighter: function( code, language, callback ) {

0 comments on commit 0128375

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