Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.6.6
[ckeditor.git]
/
_source
/
plugins
/
panel
/
plugin.js
diff --git
a/_source/plugins/panel/plugin.js
b/_source/plugins/panel/plugin.js
index
2f2bc2c
..
07c9c71
100644
(file)
--- a/
_source/plugins/panel/plugin.js
+++ b/
_source/plugins/panel/plugin.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
@@
-156,13
+156,10
@@
CKEDITOR.ui.panel.prototype =
'<html dir="' + dir + '" class="' + className + '_container" lang="' + langCode + '">' +
\r
'<head>' +
\r
'<style>.' + className + '_container{visibility:hidden}</style>' +
\r
'<html dir="' + dir + '" class="' + className + '_container" lang="' + langCode + '">' +
\r
'<head>' +
\r
'<style>.' + className + '_container{visibility:hidden}</style>' +
\r
+ CKEDITOR.tools.buildStyleHtml( this.css ) +
\r
'</head>' +
\r
'<body class="cke_' + dir + ' cke_panel_frame ' + CKEDITOR.env.cssClass + '" style="margin:0;padding:0"' +
\r
' onload="( window.CKEDITOR || window.parent.CKEDITOR ).tools.callFunction(' + onLoad + ');"></body>' +
\r
'</head>' +
\r
'<body class="cke_' + dir + ' cke_panel_frame ' + CKEDITOR.env.cssClass + '" style="margin:0;padding:0"' +
\r
' onload="( window.CKEDITOR || window.parent.CKEDITOR ).tools.callFunction(' + onLoad + ');"></body>' +
\r
- // It looks strange, but for FF2, the styles must go
\r
- // after <body>, so it (body) becames immediatelly
\r
- // available. (#3031)
\r
- CKEDITOR.tools.buildStyleHtml( this.css ) +
\r
'<\/html>';
\r
\r
doc.write( data );
\r
'<\/html>';
\r
\r
doc.write( data );
\r
@@
-227,13
+224,12
@@
CKEDITOR.ui.panel.prototype =
{
\r
var blocks = this._.blocks,
\r
block = blocks[ name ],
\r
{
\r
var blocks = this._.blocks,
\r
block = blocks[ name ],
\r
- current = this._.currentBlock,
\r
- holder = this.forceIFrame ?
\r
- this.document.getById( this.id + '_frame' )
\r
- : this._.holder;
\r
+ current = this._.currentBlock;
\r
\r
\r
- // Disable context menu for block panel.
\r
- holder.getParent().getParent().disableContextMenu();
\r
+ // ARIA role works better in IE on the body element, while on the iframe
\r
+ // for FF. (#8864)
\r
+ var holder = !this.forceIFrame || CKEDITOR.env.ie ?
\r
+ this._.holder : this.document.getById( this.id + '_frame' );
\r
\r
if ( current )
\r
{
\r
\r
if ( current )
\r
{
\r