MDL-40648 Make sure the button is added in the correct row

previously code expected to find the button in particular row but the tinymce setting may change the buttons' layout

diff --git a/lib/editor/tinymce/plugins/dragmath/lib.php b/lib/editor/tinymce/plugins/dragmath/lib.php
index d4b8ac7..84699f7 100644 (file)
--- a/lib/editor/tinymce/plugins/dragmath/lib.php
+++ b/lib/editor/tinymce/plugins/dragmath/lib.php
@@ -38,8 +38,13 @@ class tinymce_dragmath extends editor_tinymce_plugin {
             }
         }
 
-        // Add button before 'nonbreaking' in advancedbuttons3.
-        $this->add_button_before($params, 3, 'dragmath', 'nonbreaking');
+        if ($row = $this->find_button($params, 'nonbreaking')) {
+            // Add button before 'nonbreaking'.
+            $this->add_button_before($params, $row, 'dragmath', 'nonbreaking');
+        } else {
+            // If 'nonbreaking' is not found, add button in the end of the last row:
+            $this->add_button_after($params, $this->count_button_rows($params), 'dragmath');
+        }
 
         // Add JS file, which uses default name.
         $this->add_js_plugin($params);

diff --git a/lib/editor/tinymce/plugins/moodleemoticon/lib.php b/lib/editor/tinymce/plugins/moodleemoticon/lib.php
index c2751a5..047196a 100644 (file)
--- a/lib/editor/tinymce/plugins/moodleemoticon/lib.php
+++ b/lib/editor/tinymce/plugins/moodleemoticon/lib.php
@@ -39,8 +39,13 @@ class tinymce_moodleemoticon extends editor_tinymce_plugin {
             }
         }
 
-        // Add button after 'image' in advancedbuttons3.
-        $this->add_button_after($params, 3, 'moodleemoticon', 'image');
+        if ($row = $this->find_button($params, 'image')) {
+            // Add button after 'image'.
+            $this->add_button_after($params, $row, 'moodleemoticon', 'image');
+        } else {
+            // If 'image' is not found, add button in the end of the last row.
+            $this->add_button_after($params, $this->count_button_rows($params), 'moodleemoticon');
+        }
 
         // Add JS file, which uses default name.
         $this->add_js_plugin($params);

diff --git a/lib/editor/tinymce/plugins/moodlemedia/lib.php b/lib/editor/tinymce/plugins/moodlemedia/lib.php
index 83141fe..05bce05 100644 (file)
--- a/lib/editor/tinymce/plugins/moodlemedia/lib.php
+++ b/lib/editor/tinymce/plugins/moodlemedia/lib.php
@@ -37,14 +37,17 @@ class tinymce_moodlemedia extends editor_tinymce_plugin {
             }
         }
 
-        // Add button after emoticon button in advancedbuttons1.
-        $added = $this->add_button_after($params, 1, 'moodlemedia', 'moodleemoticon', false);
-
-        // Note: We know that the emoticon button has already been added, if it
-        // exists, because I set the sort order higher for this. So, if no
-        // emoticon, add after 'image'.
-        if (!$added) {
-            $this->add_button_after($params, 1, 'moodlemedia', 'image');
+        if ($row = $this->find_button($params, 'moodleemoticon')) {
+            // Add button after 'moodleemoticon' icon.
+            $this->add_button_after($params, $row, 'moodlemedia', 'moodleemoticon');
+        } else if ($row = $this->find_button($params, 'image')) {
+            // Note: We know that the plugin emoticon button has already been added
+            // if it is enabled because this plugin has higher sortorder.
+            // Otherwise add after 'image'.
+            $this->add_button_after($params, $row, 'moodlemedia', 'image');
+        } else {
+            // Add this button in the end of the first row (by default 'image' button should be in the first row).
+            $this->add_button_after($params, 1, 'moodlemedia');
         }
 
         // Add JS file, which uses default name.

diff --git a/lib/editor/tinymce/plugins/moodlenolink/lib.php b/lib/editor/tinymce/plugins/moodlenolink/lib.php
index b400f81..d80f172 100644 (file)
--- a/lib/editor/tinymce/plugins/moodlenolink/lib.php
+++ b/lib/editor/tinymce/plugins/moodlenolink/lib.php
@@ -30,8 +30,13 @@ class tinymce_moodlenolink extends editor_tinymce_plugin {
     protected function update_init_params(array &$params, context $context,
             array $options = null) {
 
-        // Add button after 'unlink' in advancedbuttons1.
-        $this->add_button_after($params, 1, 'moodlenolink', 'unlink');
+        if ($row = $this->find_button($params, 'unlink')) {
+            // Add button after 'unlink'.
+            $this->add_button_after($params, $row, 'moodlenolink', 'unlink');
+        } else {
+            // Add this button in the end of the first row (by default 'unlink' button should be in the first row).
+            $this->add_button_after($params, 1, 'moodlenolink');
+        }
 
         // Add JS file, which uses default name.
         $this->add_js_plugin($params);

diff --git a/lib/editor/tinymce/plugins/spellchecker/lib.php b/lib/editor/tinymce/plugins/spellchecker/lib.php
index 3f85665..54a8f48 100644 (file)
--- a/lib/editor/tinymce/plugins/spellchecker/lib.php
+++ b/lib/editor/tinymce/plugins/spellchecker/lib.php
@@ -42,8 +42,10 @@ class tinymce_spellchecker extends editor_tinymce_plugin {
             // Prevent the built-in spell checker in Firefox, Safari and other sane browsers.
             unset($params['gecko_spellcheck']);
 
-            // Add button after code button in advancedbuttons3.
-            $added = $this->add_button_after($params, 3, 'spellchecker', 'code', false);
+            if ($row = $this->find_button($params, 'code')) {
+                // Add button after 'code'.
+                $this->add_button_after($params, $row, 'spellchecker', 'code');
+            }
 
             // Add JS file, which uses default name.
             $this->add_js_plugin($params);