Skip to content
Permalink
Browse files

Merge branch 't/12812'

  • Loading branch information...
Reinmar committed Jan 14, 2015
2 parents 058a2e4 + a065e87 commit 33557ff3c3ba7a396678b6ecdef6f8363e5f726c
@@ -7,6 +7,7 @@ Fixed Issues:

* [#12157](http://dev.ckeditor.com/ticket/12157): Fixed: Lost text formatting when pressing `tab` when [tabSpaces](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-tabSpaces) config option was greater than zero.
* [#12777](http://dev.ckeditor.com/ticket/12777): Fixed: The `table-layout` CSS property should be reset by skins. Thanks to [vita10gy](https://github.com/vita10gy)!
* [#12812](http://dev.ckeditor.com/ticket/12812): Fixed: A uncaught security exception is thrown when [lineutils](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.lineutils) are used in an inline editor loaded in a cross-domain iframe. Thanks to [Vitaliy Zurian](https://github.com/thecatontheflat)!
* [#12747](http://dev.ckeditor.com/ticket/12747): [IE8-10] Fixed: Opening a drop-down for a specific selection when editor is maximized results in incorrect drop-down panel position.
* [#12735](http://dev.ckeditor.com/ticket/12735): Fixed: [`Config.fillEmptyBlocks`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fillEmptyBlocks) should only apply when outputting data.
* [#12750](http://dev.ckeditor.com/ticket/12750): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword): strikethrough and underscore should have the same color as font.
@@ -59,8 +59,9 @@
win: editor.window
}, def, true );

this.frame = this.win.getFrame();
this.inline = this.editable.isInline();
if ( !this.inline )
this.frame = this.win.getFrame();
this.target = this[ this.inline ? 'editable' : 'doc' ];
}

@@ -931,4 +932,4 @@
locator: Locator,
liner: Liner
};
} )();
} )();
@@ -108,6 +108,21 @@
assert.isTrue( CKEDITOR.tools.isEmpty( liner.visible ), 'Line removed from visible.' );
assert.isFalse( line2.isVisible(), 'Line hidden in DOM.' );
assert.areSame( 2, CKEDITOR.tools.objectKeys( liner.hidden ).length, 'Line moved to hidden.' );
},

// #12812
'test the constructor does not access window\'s parent frame in case of inline editor': function() {
bender.editorBot.create( {
creator: 'inline',
name: 'inline1'
}, function( bot ) {
var editor = bot.editor,
spy = sinon.spy( editor.window, 'getFrame' ),
liner = new CKEDITOR.plugins.lineutils.liner( editor );

assert.isFalse( spy.called, 'the editor.window.getFrame() was not called' );
assert.isFalse( 'frame' in liner, 'liner.frame was not set' );
} );
}
} );
} )();
@@ -0,0 +1 @@
<iframe src="http://sub.ckeditor.dev:1030%TEST_DIR%/_assets/inlineeditor.html" width="800" height="400"></iframe>
@@ -0,0 +1,15 @@
@bender-tags: lineutils, 4.4.7, tc
@bender-ui: collapsed
@bender-ckeditor-plugins: floatingspace, image2

**Note:** You must have the `sub.ckeditor.dev` subdomain configured.

Steps:

1. Focus the editor.
1. Try to drag the image using the drag handler.

Expected:

1. Line marking the drop position should appear when dragging.
1. After releasing the mouse button the widget should be moved.
@@ -0,0 +1,43 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Foo</title>
<script src="/apps/ckeditor/ckeditor.js"></script>
<script>
if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 )
CKEDITOR.tools.enableHtml5Elements( document );
</script>
<style>
img
{
background: #FA0;
}
figure, figcaption
{
display: block;
}
</style>
</head>
<body>
<!-- Margin is to make space for the floating toolbar... ;( -->
<div contenteditable="true" id="editor" style="margin-top: 50px">
<p>Editor contents</p>
<figure class="image">
<img alt="The Eagle" src="data:image/gif;base64,R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw==" style="width: 200px" />
<figcaption>Caption</figcaption>
</figure>
<p>Editor contents</p>
</div>

<script>
CKEDITOR.disableAutoInline = true;
CKEDITOR.inline( 'editor', {
extraPlugins: 'image2',
toolbar: [ [ 'Image' ] ]
} );
</script>
</body>

0 comments on commit 33557ff

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