From 0ac97084faa3d0114b8cb6d69332dfa47b6edfb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Sun, 7 Apr 2013 18:18:01 +0200
Subject: [PATCH 1/2] MDL-34674 use browser built-in spell checking in all
 browsers except < IE10

---
 error/index.php                                     |  2 +-
 lib/adminlib.php                                    |  4 ++--
 lib/deprecatedlib.php                               |  2 +-
 .../spellchecker/lang/en/tinymce_spellchecker.php   |  2 +-
 lib/editor/tinymce/plugins/spellchecker/lib.php     | 13 +++++++++++++
 lib/form/editor.php                                 |  2 +-
 mod/assignment/lib.php                              |  4 ++--
 mod/data/field/textarea/field.class.php             |  2 +-
 user/addnote.php                                    |  2 +-
 user/groupaddnote.php                               |  2 +-
 10 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/error/index.php b/error/index.php
index 0e57570747d..6798a48f475 100644
--- a/error/index.php
+++ b/error/index.php
@@ -60,7 +60,7 @@
 ?>
         <p><?php echo get_string('pleasereport', 'error'); ?>
         <p><form action="<?php echo $CFG->wwwroot ?>/error/index.php" method="post">
-           <textarea rows="3" cols="50" name="text" id="text"></textarea><br />
+           <textarea rows="3" cols="50" name="text" id="text" spellcheck="true"></textarea><br />
            <input type="hidden" name="referer" value="<?php p($httpreferer) ?>">
            <input type="hidden" name="requested" value="<?php p($requesturi) ?>">
            <input type="submit" value="<?php echo get_string('sendmessage', 'error'); ?>">
diff --git a/lib/adminlib.php b/lib/adminlib.php
index 3156374c2df..71c244ce055 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -1920,7 +1920,7 @@ class admin_setting_configtextarea extends admin_setting_configtext {
         }
 
         return format_admin_setting($this, $this->visiblename,
-        '<div class="form-textarea" ><textarea rows="'. $this->rows .'" cols="'. $this->cols .'" id="'. $this->get_id() .'" name="'. $this->get_full_name() .'">'. s($data) .'</textarea></div>',
+        '<div class="form-textarea" ><textarea rows="'. $this->rows .'" cols="'. $this->cols .'" id="'. $this->get_id() .'" name="'. $this->get_full_name() .'" spellcheck="true">'. s($data) .'</textarea></div>',
         $this->description, true, '', $defaultinfo, $query);
     }
 }
@@ -1966,7 +1966,7 @@ class admin_setting_confightmleditor extends admin_setting_configtext {
         $editor->use_editor($this->get_id(), array('noclean'=>true));
 
         return format_admin_setting($this, $this->visiblename,
-        '<div class="form-textarea"><textarea rows="'. $this->rows .'" cols="'. $this->cols .'" id="'. $this->get_id() .'" name="'. $this->get_full_name() .'">'. s($data) .'</textarea></div>',
+        '<div class="form-textarea"><textarea rows="'. $this->rows .'" cols="'. $this->cols .'" id="'. $this->get_id() .'" name="'. $this->get_full_name() .'" spellcheck="true">'. s($data) .'</textarea></div>',
         $this->description, true, '', $defaultinfo, $query);
     }
 }
diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index 8022c44df6f..7a94b59effc 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -1909,7 +1909,7 @@ function print_textarea($usehtmleditor, $rows, $cols, $width, $height, $name, $v
         $editorclass = '';
     }
 
-    $str .= "\n".'<textarea class="form-textarea" id="'. $id .'" name="'. $name .'" rows="'. $rows .'" cols="'. $cols .'">'."\n";
+    $str .= "\n".'<textarea class="form-textarea" id="'. $id .'" name="'. $name .'" rows="'. $rows .'" cols="'. $cols .'" spellcheck="true">'."\n";
     if ($usehtmleditor) {
         $str .= htmlspecialchars($value); // needed for editing of cleaned text!
     } else {
diff --git a/lib/editor/tinymce/plugins/spellchecker/lang/en/tinymce_spellchecker.php b/lib/editor/tinymce/plugins/spellchecker/lang/en/tinymce_spellchecker.php
index 117ac455624..ca651ea26cd 100644
--- a/lib/editor/tinymce/plugins/spellchecker/lang/en/tinymce_spellchecker.php
+++ b/lib/editor/tinymce/plugins/spellchecker/lang/en/tinymce_spellchecker.php
@@ -22,6 +22,6 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'Check spelling';
+$string['pluginname'] = 'Legacy spell checker';
 
 /* This plugin abuses strings from the standard TinyMCE spellchecker plugin, there is no need to duplicate them here. */
diff --git a/lib/editor/tinymce/plugins/spellchecker/lib.php b/lib/editor/tinymce/plugins/spellchecker/lib.php
index b4f51180013..3f856656693 100644
--- a/lib/editor/tinymce/plugins/spellchecker/lib.php
+++ b/lib/editor/tinymce/plugins/spellchecker/lib.php
@@ -32,6 +32,10 @@ class tinymce_spellchecker extends editor_tinymce_plugin {
             array $options = null) {
         global $CFG;
 
+        if (!$this->is_legacy_browser()) {
+            return;
+        }
+
         // Check at least one language is supported.
         $spelllanguagelist = $this->get_config('spelllanguagelist', '');
         if ($spelllanguagelist !== '') {
@@ -48,4 +52,13 @@ class tinymce_spellchecker extends editor_tinymce_plugin {
             $params['spellchecker_languages'] = $spelllanguagelist;
         }
     }
+
+    protected function is_legacy_browser() {
+        // IE8 and IE9 are the only supported browsers that do not have spellchecker.
+        if (check_browser_version('MSIE', 5) and !check_browser_version('MSIE', 10)) {
+            return true;
+        }
+        // The rest of browsers supports spellchecking or is horribly outdated and we do not care...
+        return false;
+    }
 }
diff --git a/lib/form/editor.php b/lib/form/editor.php
index e3e23aa0561..f2003d2af0b 100644
--- a/lib/form/editor.php
+++ b/lib/form/editor.php
@@ -383,7 +383,7 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
         if (!is_null($this->getAttribute('onblur')) && !is_null($this->getAttribute('onchange'))) {
             $editorrules = ' onblur="'.htmlspecialchars($this->getAttribute('onblur')).'" onchange="'.htmlspecialchars($this->getAttribute('onchange')).'"';
         }
-        $str .= '<div><textarea id="'.$id.'" name="'.$elname.'[text]" rows="'.$rows.'" cols="'.$cols.'"';
+        $str .= '<div><textarea id="'.$id.'" name="'.$elname.'[text]" rows="'.$rows.'" cols="'.$cols.'" spellcheck="true"';
         $classes = array();
         if (isset($this->_options['collapsed']) && $this->_options['collapsed']) {
             $this->_options['collapsible'] = 1;
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 7bd8064743a..8ea3937027f 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -1521,7 +1521,7 @@ class assignment_base {
                             } else if ($quickgrade) {
                                 $comment = '<div id="com'.$auser->id.'">'
                                          . '<textarea tabindex="'.$tabindex++.'" name="submissioncomment['.$auser->id.']" id="submissioncomment'
-                                         . $auser->id.'" rows="2" cols="20">'.($auser->submissioncomment).'</textarea></div>';
+                                         . $auser->id.'" rows="2" cols="20" spellcheck="true">'.($auser->submissioncomment).'</textarea></div>';
                             } else {
                                 $comment = '<div id="com'.$auser->id.'">'.shorten_text(strip_tags($auser->submissioncomment),15).'</div>';
                             }
@@ -1549,7 +1549,7 @@ class assignment_base {
                             } else if ($quickgrade) {
                                 $comment = '<div id="com'.$auser->id.'">'
                                          . '<textarea tabindex="'.$tabindex++.'" name="submissioncomment['.$auser->id.']" id="submissioncomment'
-                                         . $auser->id.'" rows="2" cols="20">'.($auser->submissioncomment).'</textarea></div>';
+                                         . $auser->id.'" rows="2" cols="20" spellcheck="true">'.($auser->submissioncomment).'</textarea></div>';
                             } else {
                                 $comment = '<div id="com'.$auser->id.'">&nbsp;</div>';
                             }
diff --git a/mod/data/field/textarea/field.class.php b/mod/data/field/textarea/field.class.php
index 847bae1a6bd..3fc7a711f07 100644
--- a/mod/data/field/textarea/field.class.php
+++ b/mod/data/field/textarea/field.class.php
@@ -125,7 +125,7 @@ class data_field_textarea extends data_field_base {
         }
         $editor->use_editor($field, $options, $fpoptions);
         $str .= '<input type="hidden" name="'.$field.'_itemid" value="'.$draftitemid.'" />';
-        $str .= '<div><textarea id="'.$field.'" name="'.$field.'" rows="'.$this->field->param3.'" cols="'.$this->field->param2.'">'.s($text).'</textarea></div>';
+        $str .= '<div><textarea id="'.$field.'" name="'.$field.'" rows="'.$this->field->param3.'" cols="'.$this->field->param2.'" spellcheck="true">'.s($text).'</textarea></div>';
         $str .= '<div><label class="accesshide" for="' . $field . '_content1">' . get_string('format') . '</label>';
         $str .= '<select id="' . $field . '_content1" name="'.$field.'_content1">';
         foreach ($formats as $key=>$desc) {
diff --git a/user/addnote.php b/user/addnote.php
index a39a17d4958..75f06ab113d 100644
--- a/user/addnote.php
+++ b/user/addnote.php
@@ -109,7 +109,7 @@ foreach ($users as $k => $v) {
     $checkbox .= html_writer::select($state_names, 'states[' . $k . ']', empty($states[$k]) ? NOTES_STATE_PUBLIC : $states[$k], false, array('id' => 'menustates'));
     $table->data[] = array(
         '<input type="hidden" name="userid['.$k.']" value="'.$v.'" />'. fullname($user, true),
-        '<textarea name="contents['. $k . ']" rows="2" cols="40">' . strip_tags(@$contents[$k]) . '</textarea>',
+        '<textarea name="contents['. $k . ']" rows="2" cols="40" spellcheck="true">' . strip_tags(@$contents[$k]) . '</textarea>',
         $checkbox
     );
 }
diff --git a/user/groupaddnote.php b/user/groupaddnote.php
index 69fdfb11348..3d63e65f36f 100644
--- a/user/groupaddnote.php
+++ b/user/groupaddnote.php
@@ -112,7 +112,7 @@ echo get_string('users'). ': ' . implode(', ', $userlist) . '.';
 echo '</p>';
 
 echo '<p>' . get_string('content', 'notes');
-echo '<br /><textarea name="content" rows="5" cols="50">' . strip_tags(@$content) . '</textarea></p>';
+echo '<br /><textarea name="content" rows="5" cols="50" spellcheck="true">' . strip_tags(@$content) . '</textarea></p>';
 
 echo '<p>';
 echo html_writer::label(get_string('publishstate', 'notes'), 'menustate');

From ca117d1e5b28129b5304742ec33d07c76bf94c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Fri, 12 Apr 2013 14:35:30 +0200
Subject: [PATCH 2/2] MDL-34674 add CTRL+right click hint to tinymce context
 menus

---
 .../ctrlhelp/lang/en/tinymce_ctrlhelp.php     | 28 +++++++++++++++
 lib/editor/tinymce/plugins/ctrlhelp/lib.php   | 35 +++++++++++++++++++
 .../plugins/ctrlhelp/tinymce/editor_plugin.js | 23 ++++++++++++
 .../tinymce/plugins/ctrlhelp/version.php      | 29 +++++++++++++++
 lib/pluginlib.php                             |  2 +-
 5 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 lib/editor/tinymce/plugins/ctrlhelp/lang/en/tinymce_ctrlhelp.php
 create mode 100644 lib/editor/tinymce/plugins/ctrlhelp/lib.php
 create mode 100644 lib/editor/tinymce/plugins/ctrlhelp/tinymce/editor_plugin.js
 create mode 100644 lib/editor/tinymce/plugins/ctrlhelp/version.php

diff --git a/lib/editor/tinymce/plugins/ctrlhelp/lang/en/tinymce_ctrlhelp.php b/lib/editor/tinymce/plugins/ctrlhelp/lang/en/tinymce_ctrlhelp.php
new file mode 100644
index 00000000000..8c346445bb0
--- /dev/null
+++ b/lib/editor/tinymce/plugins/ctrlhelp/lang/en/tinymce_ctrlhelp.php
@@ -0,0 +1,28 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Strings for CTRL+Right click helper.
+ *
+ * @package   tinymce_ctrlhelp
+ * @copyright 2013 Petr Skoda {@link http://skodak.org}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+$string['pluginname'] = 'CTRL+right click helper';
+
+/* All lang strings used from TinyMCE JavaScript code must be named 'pluginname:stringname', no need to create langs/en_dlg.js */
+$string['ctrlhelp:desc'] = 'CTRL + right click for more options';
diff --git a/lib/editor/tinymce/plugins/ctrlhelp/lib.php b/lib/editor/tinymce/plugins/ctrlhelp/lib.php
new file mode 100644
index 00000000000..97fc7116fae
--- /dev/null
+++ b/lib/editor/tinymce/plugins/ctrlhelp/lib.php
@@ -0,0 +1,35 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * CTRL + right click helper
+ *
+ * @package   tinymce_ctrlhelp
+ * @copyright 2013 Petr Skoda {@link http://skodak.org}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class tinymce_ctrlhelp extends editor_tinymce_plugin {
+    protected function update_init_params(array &$params, context $context, array $options = null) {
+        $this->add_js_plugin($params);
+    }
+
+    protected function get_sort_order() {
+        // We want this plugin to register as the last one in the context menu.
+        return 66666;
+    }
+}
diff --git a/lib/editor/tinymce/plugins/ctrlhelp/tinymce/editor_plugin.js b/lib/editor/tinymce/plugins/ctrlhelp/tinymce/editor_plugin.js
new file mode 100644
index 00000000000..9a2e5ec4169
--- /dev/null
+++ b/lib/editor/tinymce/plugins/ctrlhelp/tinymce/editor_plugin.js
@@ -0,0 +1,23 @@
+(function() {
+    tinymce.create('tinymce.plugins.CtrlHelpPlugin', {
+
+        init : function(ed, url) {
+            ed.onContextMenu.add(function(ed, e) {
+                var m = ed.plugins.contextmenu._menu;
+                m.add({title : 'ctrlhelp.desc', icon : '', cmd : ''});
+            });
+        },
+
+        getInfo : function() {
+            return {
+                longname :  'Moodle CTRL + right click helper plugin',
+                author :    'Petr Skoda',
+                authorurl : 'http://skodak.org/',
+                infourl :   'http://moodle.org',
+                version :   '1.0'
+            };
+        }
+    });
+
+    tinymce.PluginManager.add('ctrlhelp', tinymce.plugins.CtrlHelpPlugin);
+})();
diff --git a/lib/editor/tinymce/plugins/ctrlhelp/version.php b/lib/editor/tinymce/plugins/ctrlhelp/version.php
new file mode 100644
index 00000000000..e4d582bcb4f
--- /dev/null
+++ b/lib/editor/tinymce/plugins/ctrlhelp/version.php
@@ -0,0 +1,29 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * CTRL + right click helper.
+ *
+ * @package   tinymce_ctrlhelp
+ * @copyright 2013 Petr Skoda {@link http://skodak.org}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$plugin->version   = 2013041200;
+$plugin->requires  = 2013041100;
+$plugin->component = 'tinymce_ctrlhelp';
diff --git a/lib/pluginlib.php b/lib/pluginlib.php
index de23503162f..d1aabf7328f 100644
--- a/lib/pluginlib.php
+++ b/lib/pluginlib.php
@@ -597,7 +597,7 @@ class plugin_manager {
             ),
 
             'tinymce' => array(
-                'dragmath', 'moodleemoticon', 'moodleimage', 'moodlemedia', 'moodlenolink', 'spellchecker',
+                'ctrlhelp', 'dragmath', 'moodleemoticon', 'moodleimage', 'moodlemedia', 'moodlenolink', 'spellchecker',
             ),
 
             'theme' => array(