Skip to content
Permalink
Browse files

Merge branch 't/11809'

  • Loading branch information...
adelura committed May 7, 2014
2 parents 8c6d5e4 + f33a21b commit ca6b0cde73a5e87fe6d3dc3a3b7f007bc222c368
Showing with 17 additions and 9 deletions.
  1. +2 −2 CHANGES.md
  2. +4 −0 contents.css
  3. +3 −3 plugins/codesnippet/samples/codesnippet.html
  4. +8 −4 samples/sample.css
@@ -4,8 +4,8 @@ CKEditor 4 Changelog
## CKEditor 4.4.1

Fixed Issues:

* [#11223](http://dev.ckeditor.com/ticket/11223): Fixeed issue when [Protected Source](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-protectedSource) was not working in the title element.
* [#11809](http://dev.ckeditor.com/ticket/11809): Set indentation to four spaces in [Code Snippet](http://ckeditor.com/addon/codesnippet) sample.
* [#11223](http://dev.ckeditor.com/ticket/11223): Fixed: issue when [Protected Source](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-protectedSource) was not working in the title element.
* [#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.
@@ -93,6 +93,10 @@ pre
{
white-space: pre-wrap; /* CSS 2.1 */
word-wrap: break-word; /* IE7 */
-moz-tab-size: 4;
-o-tab-size: 4;
-webkit-tab-size: 4;
tab-size: 4;
}

.marker
@@ -44,9 +44,9 @@ <h1 class="samples">
<p>
Select theme: <select id="select"></select>
</p>
<p>
The CKEditor instance below was created by using the following configuration settings:
</p>
<p>
The CKEditor instance below was created by using the following configuration settings:
</p>

<pre class="samples" id="sampleConfig">
CKEDITOR.replace( 'editor1', {
@@ -18,6 +18,14 @@ input, textarea, select, option, optgroup, button, td, th
font-size: 100%;
}

pre
{
-moz-tab-size: 4;
-o-tab-size: 4;
-webkit-tab-size: 4;
tab-size: 4;
}

pre, code, kbd, samp, tt
{
font-family: monospace,monospace;
@@ -165,10 +173,6 @@ pre.samples
padding: 0.25em;
white-space: pre-wrap; /* CSS 2.1 */
word-wrap: break-word; /* IE7 */
-moz-tab-size: 4;
-o-tab-size: 4;
-webkit-tab-size: 4;
tab-size: 4;
}

#footer

0 comments on commit ca6b0cd

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