Skip to content

Commit ff0947a

Browse files
committed
Merge branch 't/9945'
2 parents 8ad21b6 + 20b65e5 commit ff0947a

File tree

4 files changed

+17
-0
lines changed

4 files changed

+17
-0
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ CKEditor 4 Changelog
1111
* [#10146](http://dev.ckeditor.com/ticket/10146): [Firefox] Empty lines are being removed while config#enterMode is ENTER_BR.
1212
* [#6504](http://dev.ckeditor.com/ticket/6504): Resolved race condition while loading several customConfig files.
1313
* [#10298](http://dev.ckeditor.com/ticket/10298): Data processor breaks attributes containing protected parts.
14+
* [#9945](http://dev.ckeditor.com/ticket/9945): [iOS] Scrolling not possible on iPad.
1415

1516
## CKEditor 4.1.1
1617

core/env.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,9 @@ if ( !CKEDITOR.env ) {
306306
if ( env.air )
307307
env.cssClass += ' cke_browser_air';
308308

309+
if ( env.iOS )
310+
env.cssClass += ' cke_browser_ios';
311+
309312
return env;
310313
})();
311314
}

skins/kama/mainui.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,13 @@ Special outer level classes used in this file:
133133
white-space: normal;
134134
}
135135

136+
/* On iOS we need to manually enable scrolling in the contents block. (#9945) */
137+
.cke_browser_ios .cke_contents
138+
{
139+
overflow-y: auto;
140+
-webkit-overflow-scrolling: touch;
141+
}
142+
136143
/* The resizer is the small UI element that is rendered at the bottom right
137144
part of the editor. It makes is possible to resize the editor UI. */
138145
.cke_resizer

skins/moono/mainui.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,12 @@ Special outer level classes used in this file:
147147
filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#ffebebeb', endColorstr='#cfd1cf');
148148
}
149149

150+
/* On iOS we need to manually enable scrolling in the contents block. (#9945) */
151+
.cke_browser_ios .cke_contents
152+
{
153+
overflow-y: auto;
154+
-webkit-overflow-scrolling: touch;
155+
}
150156

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

0 commit comments

Comments
 (0)