Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 't/9945'
  • Loading branch information
oleq committed May 29, 2013
2 parents 8ad21b6 + 20b65e5 commit ff0947a
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -11,6 +11,7 @@ CKEditor 4 Changelog
* [#10146](http://dev.ckeditor.com/ticket/10146): [Firefox] Empty lines are being removed while config#enterMode is ENTER_BR.
* [#6504](http://dev.ckeditor.com/ticket/6504): Resolved race condition while loading several customConfig files.
* [#10298](http://dev.ckeditor.com/ticket/10298): Data processor breaks attributes containing protected parts.
* [#9945](http://dev.ckeditor.com/ticket/9945): [iOS] Scrolling not possible on iPad.

## CKEditor 4.1.1

Expand Down
3 changes: 3 additions & 0 deletions core/env.js
Expand Up @@ -306,6 +306,9 @@ if ( !CKEDITOR.env ) {
if ( env.air )
env.cssClass += ' cke_browser_air';

if ( env.iOS )
env.cssClass += ' cke_browser_ios';

return env;
})();
}
Expand Down
7 changes: 7 additions & 0 deletions skins/kama/mainui.css
Expand Up @@ -133,6 +133,13 @@ Special outer level classes used in this file:
white-space: normal;
}

/* On iOS we need to manually enable scrolling in the contents block. (#9945) */
.cke_browser_ios .cke_contents
{
overflow-y: auto;
-webkit-overflow-scrolling: touch;
}

/* The resizer is the small UI element that is rendered at the bottom right
part of the editor. It makes is possible to resize the editor UI. */
.cke_resizer
Expand Down
6 changes: 6 additions & 0 deletions skins/moono/mainui.css
Expand Up @@ -147,6 +147,12 @@ Special outer level classes used in this file:
filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#ffebebeb', endColorstr='#cfd1cf');
}

/* On iOS we need to manually enable scrolling in the contents block. (#9945) */
.cke_browser_ios .cke_contents
{
overflow-y: auto;
-webkit-overflow-scrolling: touch;
}

/* The resizer is the small UI element that is rendered at the bottom right
part of the editor. It makes is possible to resize the editor UI. */
Expand Down

0 comments on commit ff0947a

Please sign in to comment.