Merged moving of spellcheck button

diff --git a/lib/editor/htmlarea.php b/lib/editor/htmlarea.php
index d6392c43e4346318bf2bb23ddcef408c150ab9f1..5741678be6b0df59803e8188d6a19a92632ca75e 100644 (file)
--- a/lib/editor/htmlarea.php
+++ b/lib/editor/htmlarea.php
@@ -145,10 +145,11 @@ HTMLArea.Config = function () {
           "insertorderedlist", "insertunorderedlist", "outdent", "indent", "separator",
           "forecolor", "hilitecolor", "separator",
           "inserthorizontalrule", "createanchor", "createlink", "unlink", "insertimage", "inserttable",
-          "insertsmile", "insertchar", "separator", "htmlmode", "separator", "popupeditor"<?php
-          if(!empty($CFG->aspellpath) && !empty($CFG->editorspelling)) {
-              echo ",\"spellcheck\"";
-          }?> ]
+          "insertsmile", "insertchar", 
+          <?php if (!empty($CFG->aspellpath) && !empty($CFG->editorspelling)) { 
+              echo '"separator","spellcheck",';
+            } ?> 
+          "separator", "htmlmode", "separator", "popupeditor"]
     ];
 
     this.fontname = {
@@ -225,10 +226,10 @@ HTMLArea.Config = function () {
         clean: [ "Clean Word HTML", "ed_wordclean.gif", false, function(e) {e.execCommand("killword"); }],
         lefttoright: [ "Direction left to right", "ed_left_to_right.gif", false, function(e) {e.execCommand("lefttoright");} ],
         righttoleft: [ "Direction right to left", "ed_right_to_left.gif", false, function(e) {e.execCommand("righttoleft");} ],
-        insertsmile: ["Insert Smiley", "em.icon.smile.gif", false, function(e) {e.execCommand("insertsmile");} ],
-        <?php if(!empty($CFG->aspellpath) && !empty($CFG->editorspelling)) {
-            echo "spellcheck: [\"Spell-check\", \"spell-check.gif\", false, spellClickHandler ],\n";
+        <?php if (!empty($CFG->aspellpath) && !empty($CFG->editorspelling)) {
+            echo 'spellcheck: ["Spell-check", "spell-check.gif", false, spellClickHandler ],'."\n";
         }?>
+        insertsmile: ["Insert Smiley", "em.icon.smile.gif", false, function(e) {e.execCommand("insertsmile");} ],
         insertchar: [ "Insert Char", "icon_ins_char.gif", false, function(e) {e.execCommand("insertchar");} ]
     };