Skip to content

Commit

Permalink
Merge branch 't/12000'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Reinmar
Reinmar committed May 27, 2014
2 parents 026c14e + cb19c7a commit fd15d20
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 19 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CKEditor 4 Changelog
Fixed Issues:

* [#11983](http://dev.ckeditor.com/ticket/11983): Fixed: Clicking a nested widget does not focus it. Additionally, performance of the [`widget.repository.getByElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-getByElement) method has been improved.
* [#12000](http://dev.ckeditor.com/ticket/12000): Fixed: Nested widgets should be initialized on [`editor.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData) and [`nestedEditable.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.nestedEditable-method-setData).
* [#11960](http://dev.ckeditor.com/ticket/11960): [Blink/Webkit] Fixed: The caret should be scrolled into view on *Backspace* and *Delete* (covers only the merging blocks case).
* [#11306](http://dev.ckeditor.com/ticket/11306): [OSX][Blink/Webkit] Fixed: No widget's entries in context menu on widget right-click.
* [#11957](http://dev.ckeditor.com/ticket/11957): Fixed: Alignment labels in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog are not translated.
Expand Down
Binary file added plugins/widget/dev/assets/sample.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 14 additions & 19 deletions plugins/widget/dev/nestedwidgets.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<title>Nested widgets &mdash; CKEditor Sample</title>
<script src="../../../ckeditor.js"></script>
<script src="../../../samples/sample.js"></script>
<script src="../../../dev/console/console.js"></script>
<script src="../../../dev/console/focusconsole.js"></script>
<script src="console.js"></script>
<link rel="stylesheet" href="../../../samples/sample.css">
<link rel="stylesheet" href="../../../contents.css">
<link rel="stylesheet" href="assets/simplebox/contents.css">
Expand All @@ -26,7 +29,7 @@ <h2 class="simplebox-title">Title</h2>
<p><strong>Apollo 11</strong> was the spaceflight that landed the first humans, Americans <a href="http://en.wikipedia.org/wiki/Neil_Armstrong" title="Neil Armstrong">Neil Armstrong</a> and <a href="http://en.wikipedia.org/wiki/Buzz_Aldrin" title="Buzz Aldrin">Buzz Aldrin</a>, on the Moon on [[July 20, 1969, at 20:18 UTC]]. Armstrong became the first to step onto the lunar surface 6 hours later on [[July 21 at 02:56 UTC]].</p>

<figure class="image" style="float: right">
<img alt="The Eagle" src="../../../samples/assets/sample.jpg" width="150" />
<img alt="The Eagle" src="assets/sample.jpg" width="150" />
<figcaption>The Eagle in lunar orbit</figcaption>
</figure>

Expand All @@ -35,7 +38,7 @@ <h2 class="simplebox-title">Title</h2>
<li>Bar!</li>
</ul>

<p>Lorem ipsum dolor [[sit amet]], consectetur adipiscing elit. Curabitur sit amet orci ut nisi adipiscing ultrices. Sed pellentesque iaculis malesuada. Pellentesque scelerisque, purus non porta dictum, neque urna bibendum dolor, eget tristique ipsum metus fringilla dolor. Nullam sed accumsan sapien. Vestibulum in placerat magna. Sed justo lacus, volutpat rhoncus odio luctus, ornare adipiscing mauris. Vivamus erat sem, egestas et lectus eget, varius cursus odio. Duis posuere lacus sit amet urna bibendum, id iaculis eros ultrices. Vestibulum a ultrices ante.</p>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur sit amet orci ut nisi adipiscing ultrices. Sed pellentesque iaculis malesuada. Pellentesque scelerisque, purus non porta dictum, neque urna bibendum dolor, eget tristique ipsum metus fringilla dolor. Nullam sed accumsan sapien. Vestibulum in placerat magna. Sed justo lacus, volutpat rhoncus odio luctus, ornare adipiscing mauris. Vivamus erat sem, egestas et lectus eget, varius cursus odio. Duis posuere lacus sit amet urna bibendum, id iaculis eros ultrices. Vestibulum a ultrices ante.</p>
</div>
</div>

Expand All @@ -48,7 +51,7 @@ <h2 class="simplebox-title">Title</h2>
<div class="simplebox align-center" style="width: 750px">
<h2 class="simplebox-title">Title</h2>
<div class="simplebox-content">
<p><img alt="The Eagle" src="../../../samples/assets/sample.jpg" width="150" style="float: left" /><strong>Apollo 11</strong> was the spaceflight that landed the first humans, Americans <a href="http://en.wikipedia.org/wiki/Neil_Armstrong" title="Neil Armstrong">Neil Armstrong</a> and <a href="http://en.wikipedia.org/wiki/Buzz_Aldrin" title="Buzz Aldrin">Buzz Aldrin</a>, on the Moon on [[July 20, 1969, at 20:18 UTC]]. Armstrong became the first to step onto the lunar surface 6 hours later on [[July 21 at 02:56 UTC]].</p>
<p><img alt="The Eagle" src="assets/sample.jpg" width="150" style="float: left" /><strong>Apollo 11</strong> was the spaceflight that landed the first humans, Americans <a href="http://en.wikipedia.org/wiki/Neil_Armstrong" title="Neil Armstrong">Neil Armstrong</a> and <a href="http://en.wikipedia.org/wiki/Buzz_Aldrin" title="Buzz Aldrin">Buzz Aldrin</a>, on the Moon on [[July 20, 1969, at 20:18 UTC]]. Armstrong became the first to step onto the lunar surface 6 hours later on [[July 21 at 02:56 UTC]].</p>

<ul>
<li>Foo!</li>
Expand All @@ -70,7 +73,7 @@ <h2 class="simplebox-title">Title</h2>
<p><strong>Apollo 11</strong> was the spaceflight that landed the first humans, Americans <a href="http://en.wikipedia.org/wiki/Neil_Armstrong" title="Neil Armstrong">Neil Armstrong</a> and <a href="http://en.wikipedia.org/wiki/Buzz_Aldrin" title="Buzz Aldrin">Buzz Aldrin</a>, on the Moon on [[July 20, 1969, at 20:18 UTC]]. Armstrong became the first to step onto the lunar surface 6 hours later on [[July 21 at 02:56 UTC]].</p>

<figure class="image" style="float: right">
<img alt="The Eagle" src="../../../samples/assets/sample.jpg" width="150" />
<img alt="The Eagle" src="assets/sample.jpg" width="150" />
<figcaption>The Eagle in lunar orbit</figcaption>
</figure>

Expand All @@ -79,7 +82,7 @@ <h2 class="simplebox-title">Title</h2>
<li>Bar!</li>
</ul>

<p>Lorem ipsum dolor [[sit amet]], consectetur adipiscing elit. Curabitur sit amet orci ut nisi adipiscing ultrices. Sed pellentesque iaculis malesuada. Pellentesque scelerisque, purus non porta dictum, neque urna bibendum dolor, eget tristique ipsum metus fringilla dolor. Nullam sed accumsan sapien. Vestibulum in placerat magna. Sed justo lacus, volutpat rhoncus odio luctus, ornare adipiscing mauris. Vivamus erat sem, egestas et lectus eget, varius cursus odio. Duis posuere lacus sit amet urna bibendum, id iaculis eros ultrices. Vestibulum a ultrices ante.</p>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur sit amet orci ut nisi adipiscing ultrices. Sed pellentesque iaculis malesuada. Pellentesque scelerisque, purus non porta dictum, neque urna bibendum dolor, eget tristique ipsum metus fringilla dolor. Nullam sed accumsan sapien. Vestibulum in placerat magna. Sed justo lacus, volutpat rhoncus odio luctus, ornare adipiscing mauris. Vivamus erat sem, egestas et lectus eget, varius cursus odio. Duis posuere lacus sit amet urna bibendum, id iaculis eros ultrices. Vestibulum a ultrices ante.</p>
</div>
</div>

Expand All @@ -92,7 +95,7 @@ <h2 class="simplebox-title">Title</h2>
<div class="simplebox align-center" style="width: 750px">
<h2 class="simplebox-title">Title</h2>
<div class="simplebox-content">
<p><img alt="The Eagle" src="../../../samples/assets/sample.jpg" width="150" style="float: left" /><strong>Apollo 11</strong> was the spaceflight that landed the first humans, Americans <a href="http://en.wikipedia.org/wiki/Neil_Armstrong" title="Neil Armstrong">Neil Armstrong</a> and <a href="http://en.wikipedia.org/wiki/Buzz_Aldrin" title="Buzz Aldrin">Buzz Aldrin</a>, on the Moon on [[July 20, 1969, at 20:18 UTC]]. Armstrong became the first to step onto the lunar surface 6 hours later on [[July 21 at 02:56 UTC]].</p>
<p><img alt="The Eagle" src="assets/sample.jpg" width="150" style="float: left" /><strong>Apollo 11</strong> was the spaceflight that landed the first humans, Americans <a href="http://en.wikipedia.org/wiki/Neil_Armstrong" title="Neil Armstrong">Neil Armstrong</a> and <a href="http://en.wikipedia.org/wiki/Buzz_Aldrin" title="Buzz Aldrin">Buzz Aldrin</a>, on the Moon on [[July 20, 1969, at 20:18 UTC]]. Armstrong became the first to step onto the lunar surface 6 hours later on [[July 21 at 02:56 UTC]].</p>

<ul>
<li>Foo!</li>
Expand All @@ -108,19 +111,6 @@ <h2 class="simplebox-title">Title</h2>
if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 )
CKEDITOR.tools.enableHtml5Elements( document );

CKEDITOR.on( 'instanceCreated', function( evt ) {
var editor = evt.editor;
editor.on( 'pluginsLoaded', function() {
editor.widgets.on( 'instanceCreated', function( evt ) {
if ( evt.data.name == 'simplebox' ) {
evt.data.on( 'ready', function() {
editor.widgets.initOnAll( evt.data.editables.content );
} );
}
} );
} );
} );

CKEDITOR.plugins.addExternal( 'simplebox', 'plugins/widget/dev/assets/simplebox/' );

CKEDITOR.replace( 'editor1', {
Expand All @@ -135,6 +125,11 @@ <h2 class="simplebox-title">Title</h2>
removePlugins: 'forms,bidi'
} );

CKCONSOLE.create( 'widget', { editor: 'editor1' } );
CKCONSOLE.create( 'focus', { editor: 'editor1' } );
CKCONSOLE.create( 'widget', { editor: 'editor2', folded: true } );
CKCONSOLE.create( 'focus', { editor: 'editor2', folded: true } );

</script>
</body>
</html>
3 changes: 3 additions & 0 deletions plugins/widget/plugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,7 @@
* @param {CKEDITOR.dom.element} [container=editor.editable()] The container which will be checked for not
* initialized widgets. Defaults to editor's {@link CKEDITOR.editor#editable editable} element.
* @returns {CKEDITOR.plugins.widget[]} Array of widget instances which have been initialized.
* Note: only first level widgets are returned &ndash; without nested widgets.
*/
initOnAll: function( container ) {
var newWidgets = ( container || this.editor.editable() ).find( '.cke_widget_new' ),
Expand Down Expand Up @@ -1511,6 +1512,8 @@
enterMode: this.enterMode
} );
this.setHtml( data );

this.editor.widgets.initOnAll( this );
},

/**
Expand Down

0 comments on commit fd15d20

Please sign in to comment.