Skip to content

Commit f59504d

Browse files
ReinmarReinmar
committed
Merge branch 't/11739_input'
2 parents 20906e2 + d205995 commit f59504d

File tree

12 files changed

+1467
-220
lines changed

12 files changed

+1467
-220
lines changed

‎CHANGES.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ Fixed Issues:
77

88
* [#12268](http://dev.ckeditor.com/ticket/12268): Cleanup of UI Color YUI styles. Thanks to [CasherWest](https://github.com/CasherWest)!
99
* [#12263](http://dev.ckeditor.com/ticket/12263): Fixed: Paste from Word filter does not normalize semicolons style text properly. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
10-
* [#10916](http://dev.ckeditor.com/ticket/10916): Fixed Magicline icon in RTL environments.
10+
* [#12243](http://dev.ckeditor.com/ticket/12243): Fixed: Text formatting lost while pasting from Word. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
11+
* [#111739](http://dev.ckeditor.com/ticket/11739): Fixed: `keypress` listeners should not be used in the undo manager. We made a complete rewrite of keyboard handling in the undo manager. We fixed many small issues, among others:
12+
* [#10926](http://dev.ckeditor.com/ticket/10926): [Chrome@Android] Fixed: Typing does not record snapshots and does not fire the [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event.
13+
* [#11611](http://dev.ckeditor.com/ticket/11611): [FF] Fixed: The [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event is fired when pressing arrow keys.
14+
* [#12219](http://dev.ckeditor.com/ticket/12219): [Safari] Fixed: Some modifications of [`UndoManager.locked`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.undo.UndoManager-property-locked) property violates strict mode in the undo plugin.
15+
* [#10916](http://dev.ckeditor.com/ticket/10916): Fixed: Magicline icon in RTL environments.
1116
* [#11970](http://dev.ckeditor.com/ticket/11970): Fixed: CKEditor paste event not fired when pasting with SHIFT+INS in IE.
1217
* [#12111](http://dev.ckeditor.com/ticket/12111): Fixed: Linked image attributes are not read when opening the image dialog by doubleclick.
1318
* [#10030](http://dev.ckeditor.com/ticket/10030): [IE] Fixed: Prevented "Unspecified Error" thrown in various cases when IE8-9 does not allow access to `document.activeElement`.
14-
* [#12243](http://dev.ckeditor.com/ticket/12243): Fixed: Text formatting lost while pasting from Word. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
1519
* [#12273](http://dev.ckeditor.com/ticket/12273): Fixed: Applying block style in description list breaks it.
1620
* [#12281](http://dev.ckeditor.com/ticket/12281): Fixed: Minor syntax issue in CSS files.
1721
* [#12178](http://dev.ckeditor.com/ticket/12178): [Blink/Webkit] Fixed: Iterator does not return block if selection is located at the end of it.
@@ -429,7 +433,7 @@ New Features:
429433
* [#8244](http://dev.ckeditor.com/ticket/8244): Use *(Shift+)Tab* to indent and outdent lists.
430434
* [#10281](http://dev.ckeditor.com/ticket/10281): The [jQuery Adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) is now available. Several jQuery-related issues fixed: [#8261](http://dev.ckeditor.com/ticket/8261), [#9077](http://dev.ckeditor.com/ticket/9077), [#8710](http://dev.ckeditor.com/ticket/8710), [#8530](http://dev.ckeditor.com/ticket/8530), [#9019](http://dev.ckeditor.com/ticket/9019), [#6181](http://dev.ckeditor.com/ticket/6181), [#7876](http://dev.ckeditor.com/ticket/7876), [#6906](http://dev.ckeditor.com/ticket/6906).
431435
* [#10042](http://dev.ckeditor.com/ticket/10042): Introduced [`config.title`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title) setting to change the human-readable title of the editor.
432-
* [#9794](http://dev.ckeditor.com/ticket/9794): Added [`editor.onChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event.
436+
* [#9794](http://dev.ckeditor.com/ticket/9794): Added [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event.
433437
* [#9923](http://dev.ckeditor.com/ticket/9923): HiDPI support in the editor UI. HiDPI icons for [Moono skin](http://ckeditor.com/addon/moono) added.
434438
* [#8031](http://dev.ckeditor.com/ticket/8031): Handle `required` attributes on `<textarea>` elements &mdash; introduced [`editor.required`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-required) event.
435439
* [#10280](http://dev.ckeditor.com/ticket/10280): Ability to replace `<textarea>` elements with the inline editor.

‎plugins/undo/dev/snapshot.html

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<!DOCTYPE html>
2+
<!--
3+
Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
4+
For licensing, see LICENSE.md or http://ckeditor.com/license
5+
-->
6+
<html>
7+
<head>
8+
<meta charset="utf-8">
9+
<title>Replace Textarea by Code &mdash; CKEditor Sample</title>
10+
<script src="../../../ckeditor.js"></script>
11+
<link href="../../../samples/sample.css" rel="stylesheet">
12+
</head>
13+
<body>
14+
<h1 class="samples">
15+
<a href="../../../samples/index.html">CKEditor Samples</a> &raquo; Replace Textarea Elements Using JavaScript Code
16+
</h1>
17+
<form action="sample_posteddata.php" method="post">
18+
<div class="description">
19+
<p>
20+
This editor is using an <code>&lt;iframe&gt;</code> element-based editing area, provided by the <strong>Wysiwygarea</strong> plugin.
21+
</p>
22+
<pre class="samples">
23+
CKEDITOR.replace( '<em>textarea_id</em>' )
24+
</pre>
25+
</div>
26+
<textarea cols="80" id="editor1" name="editor1" rows="10">
27+
&lt;p&gt;Apollo 11&lt;/p&gt;
28+
&lt;p&gt;111 222 333 444 555 666 777&lt;/p&gt;
29+
</textarea>
30+
<p>
31+
<input type="submit" value="Submit">
32+
</p>
33+
</form>
34+
<div id="footer">
35+
<hr>
36+
<p>
37+
CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
38+
</p>
39+
<p id="copy">
40+
Copyright &copy; 2003-2014, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
41+
Knabben. All rights reserved.
42+
</p>
43+
</div>
44+
<div id="debugConsole">
45+
<div>Snapshots: <strong id="debugSnapshotsCount">0</strong></div>
46+
<div>Typing: <strong id="debugTypingVal">false</strong></div>
47+
</div>
48+
<div id="undoControls">
49+
<a onclick="CKEDITOR.instances.editor1.execCommand('undo');" href="#">&lt; Undo</a>
50+
<a onclick="CKEDITOR.instances.editor1.execCommand('redo');" href="#">Redo &gt;</a>
51+
</div>
52+
<script type="text/javascript">
53+
var snapCount = document.getElementById( 'debugSnapshotsCount' ),
54+
typingTracer = document.getElementById( 'debugTypingVal' ),
55+
updateTypingTracer = function() {
56+
typingTracer.innerHTML = String( CKEDITOR.instances.editor1.undoManager.typing );
57+
},
58+
updateSnapshotCounter = function() {
59+
if ( !CKEDITOR && CKEDITOR.instances.editor1 )
60+
return;
61+
62+
snapCount.innerHTML = CKEDITOR.instances.editor1.undoManager.snapshots.length;
63+
updateTypingTracer();
64+
};
65+
66+
CKEDITOR.replace( 'editor1', {
67+
toolbar: [ [ 'Source', 'Bold', 'Italic' ] ,[ 'Undo' ], [ 'Redo' ] ],
68+
on: {
69+
instanceReady: function( evt ) {
70+
CKEDITOR.instances.editor1.focus();
71+
},
72+
change: function( evt ) {
73+
updateSnapshotCounter();
74+
}
75+
}
76+
} );
77+
78+
window.setInterval( updateSnapshotCounter, 700 );
79+
</script>
80+
<style type="text/css">
81+
#debugConsole { clear: both; }
82+
#undoControls { clear: both; }
83+
#undoControls a { padding: 25px 50px; font-size: 19px; margin-right: 15px; outline: 2px solid gray; display: block; float: left; text-decoration: none; }
84+
</style>
85+
</body>
86+
</html>

0 commit comments

Comments
 (0)