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.2
[ckeditor.git]
/
_source
/
plugins
/
panel
/
plugin.js
diff --git
a/_source/plugins/panel/plugin.js
b/_source/plugins/panel/plugin.js
index
212a05f
..
2f2bc2c
100644
(file)
--- a/
_source/plugins/panel/plugin.js
+++ b/
_source/plugins/panel/plugin.js
@@
-137,6
+137,13
@@
CKEDITOR.ui.panel.prototype =
langCode = parentDiv.getParent().getAttribute( 'lang' ),
\r
doc = iframe.getFrameDocument();
\r
\r
langCode = parentDiv.getParent().getAttribute( 'lang' ),
\r
doc = iframe.getFrameDocument();
\r
\r
+ // Make it scrollable on iOS. (#8308)
\r
+ CKEDITOR.env.iOS && parentDiv.setStyles(
\r
+ {
\r
+ 'overflow' : 'scroll',
\r
+ '-webkit-overflow-scrolling' : 'touch'
\r
+ });
\r
+
\r
var onLoad = CKEDITOR.tools.addFunction( CKEDITOR.tools.bind( function( ev )
\r
{
\r
this.isLoaded = true;
\r
var onLoad = CKEDITOR.tools.addFunction( CKEDITOR.tools.bind( function( ev )
\r
{
\r
this.isLoaded = true;
\r
@@
-245,16
+252,6
@@
CKEDITOR.ui.panel.prototype =
\r
this._.onKeyDown = block.onKeyDown && CKEDITOR.tools.bind( block.onKeyDown, block );
\r
\r
\r
this._.onKeyDown = block.onKeyDown && CKEDITOR.tools.bind( block.onKeyDown, block );
\r
\r
- block.onMark = function( item )
\r
- {
\r
- holder.setAttribute( 'aria-activedescendant', item.getId() + '_option' );
\r
- };
\r
-
\r
- block.onUnmark = function()
\r
- {
\r
- holder.removeAttribute( 'aria-activedescendant' );
\r
- };
\r
-
\r
block.show();
\r
\r
return block;
\r
block.show();
\r
\r
return block;
\r
@@
-380,11
+377,12
@@
CKEDITOR.ui.panel.block = CKEDITOR.tools.createClass(
return false;
\r
\r
case 'click' :
\r
return false;
\r
\r
case 'click' :
\r
+ case 'mouseup' :
\r
index = this._.focusIndex;
\r
link = index >= 0 && this.element.getElementsByTag( 'a' ).getItem( index );
\r
\r
if ( link )
\r
index = this._.focusIndex;
\r
link = index >= 0 && this.element.getElementsByTag( 'a' ).getItem( index );
\r
\r
if ( link )
\r
- link.$.click ? link.$.click() : link.$.onclick();
\r
+ link.$[ keyAction ] ? link.$[ keyAction ]() : link.$[ 'on' + keyAction ]();
\r
\r
return false;
\r
}
\r
\r
return false;
\r
}
\r