diff options
Diffstat (limited to 'sources/plugins/htmlwriter')
| -rw-r--r-- | sources/plugins/htmlwriter/plugin.js | 7 | ||||
| -rw-r--r-- | sources/plugins/htmlwriter/samples/outputforflash.html | 4 | ||||
| -rw-r--r-- | sources/plugins/htmlwriter/samples/outputhtml.html | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/sources/plugins/htmlwriter/plugin.js b/sources/plugins/htmlwriter/plugin.js index 063c966..61d6ac6 100644 --- a/sources/plugins/htmlwriter/plugin.js +++ b/sources/plugins/htmlwriter/plugin.js | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /** | 1 | /** |
| 2 | * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved. | 2 | * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved. |
| 3 | * For licensing, see LICENSE.md or http://ckeditor.com/license | 3 | * For licensing, see LICENSE.md or http://ckeditor.com/license |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| @@ -69,7 +69,7 @@ CKEDITOR.htmlWriter = CKEDITOR.tools.createClass( { | |||
| 69 | 69 | ||
| 70 | this._.indent = 0; | 70 | this._.indent = 0; |
| 71 | this._.indentation = ''; | 71 | this._.indentation = ''; |
| 72 | // Indicate preformatted block context status. (#5789) | 72 | // Indicate preformatted block context status. (http://dev.ckeditor.com/ticket/5789) |
| 73 | this._.inPre = 0; | 73 | this._.inPre = 0; |
| 74 | this._.rules = {}; | 74 | this._.rules = {}; |
| 75 | 75 | ||
| @@ -180,7 +180,7 @@ CKEDITOR.htmlWriter = CKEDITOR.tools.createClass( { | |||
| 180 | 180 | ||
| 181 | if ( typeof attValue == 'string' ) { | 181 | if ( typeof attValue == 'string' ) { |
| 182 | this.forceSimpleAmpersand && ( attValue = attValue.replace( /&/g, '&' ) ); | 182 | this.forceSimpleAmpersand && ( attValue = attValue.replace( /&/g, '&' ) ); |
| 183 | // Browsers don't always escape special character in attribute values. (#4683, #4719). | 183 | // Browsers don't always escape special character in attribute values. (http://dev.ckeditor.com/ticket/4683, http://dev.ckeditor.com/ticket/4719). |
| 184 | attValue = CKEDITOR.tools.htmlEncodeAttr( attValue ); | 184 | attValue = CKEDITOR.tools.htmlEncodeAttr( attValue ); |
| 185 | } | 185 | } |
| 186 | 186 | ||
| @@ -289,6 +289,7 @@ CKEDITOR.htmlWriter = CKEDITOR.tools.createClass( { | |||
| 289 | this._.indentation = ''; | 289 | this._.indentation = ''; |
| 290 | this._.afterCloser = 0; | 290 | this._.afterCloser = 0; |
| 291 | this._.inPre = 0; | 291 | this._.inPre = 0; |
| 292 | this._.needsSpace = 0; | ||
| 292 | }, | 293 | }, |
| 293 | 294 | ||
| 294 | /** | 295 | /** |
diff --git a/sources/plugins/htmlwriter/samples/outputforflash.html b/sources/plugins/htmlwriter/samples/outputforflash.html index a4318f3..f72616d 100644 --- a/sources/plugins/htmlwriter/samples/outputforflash.html +++ b/sources/plugins/htmlwriter/samples/outputforflash.html | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- | 2 | <!-- |
| 3 | Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved. | 3 | Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved. |
| 4 | For licensing, see LICENSE.md or http://ckeditor.com/license | 4 | For licensing, see LICENSE.md or http://ckeditor.com/license |
| 5 | --> | 5 | --> |
| 6 | <html> | 6 | <html> |
| @@ -275,7 +275,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license | |||
| 275 | CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a> | 275 | CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a> |
| 276 | </p> | 276 | </p> |
| 277 | <p id="copy"> | 277 | <p id="copy"> |
| 278 | Copyright © 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico | 278 | Copyright © 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico |
| 279 | Knabben. All rights reserved. | 279 | Knabben. All rights reserved. |
| 280 | </p> | 280 | </p> |
| 281 | </div> | 281 | </div> |
diff --git a/sources/plugins/htmlwriter/samples/outputhtml.html b/sources/plugins/htmlwriter/samples/outputhtml.html index f7123a1..a433025 100644 --- a/sources/plugins/htmlwriter/samples/outputhtml.html +++ b/sources/plugins/htmlwriter/samples/outputhtml.html | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- | 2 | <!-- |
| 3 | Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved. | 3 | Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved. |
| 4 | For licensing, see LICENSE.md or http://ckeditor.com/license | 4 | For licensing, see LICENSE.md or http://ckeditor.com/license |
| 5 | --> | 5 | --> |
| 6 | <html> | 6 | <html> |
| @@ -216,7 +216,7 @@ CKEDITOR.replace( '<em>textarea_id</em>', { | |||
| 216 | CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a> | 216 | CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a> |
| 217 | </p> | 217 | </p> |
| 218 | <p id="copy"> | 218 | <p id="copy"> |
| 219 | Copyright © 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico | 219 | Copyright © 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico |
| 220 | Knabben. All rights reserved. | 220 | Knabben. All rights reserved. |
| 221 | </p> | 221 | </p> |
| 222 | </div> | 222 | </div> |