Merge branch 'MDL-36316-master' of git://github.com/danpoltawski/moodle

This commit is contained in:
Sam Hemelryk 2013-09-16 13:13:41 +12:00
commit cf13da65e1
13 changed files with 142 additions and 73 deletions

View file

@ -34,29 +34,8 @@ class tinymce_texteditor extends texteditor {
* @return bool
*/
public function supported_by_browser() {
if (core_useragent::check_ie_version(6)) {
return true;
}
if (core_useragent::check_gecko_version(20030516)) {
return true;
}
if (core_useragent::check_safari_version(412)) {
return true;
}
if (core_useragent::check_chrome_version(6)) {
return true;
}
if (core_useragent::check_opera_version(9)) {
return true;
}
if (core_useragent::check_safari_ios_version(534)) {
return true;
}
if (core_useragent::check_webkit_version(534)) {
return true;
}
return false;
// We don't support any browsers which it doesn't support.
return true;
}
/**

View file

@ -63,7 +63,7 @@ class tinymce_spellchecker extends editor_tinymce_plugin {
protected function is_legacy_browser() {
// IE8 and IE9 are the only supported browsers that do not have spellchecker.
if (core_useragent::check_ie_version() and !core_useragent::check_ie_version(10)) {
if (core_useragent::is_ie() and !core_useragent::check_ie_version(10)) {
return true;
}
// The rest of browsers supports spellchecking or is horribly outdated and we do not care...