MDL-40766 Smarter positioning of tinymce button

diff --git a/lib/editor/tinymce/plugins/managefiles/lib.php b/lib/editor/tinymce/plugins/managefiles/lib.php
index 701dcd8..7de1edb 100644 (file)
--- a/lib/editor/tinymce/plugins/managefiles/lib.php
+++ b/lib/editor/tinymce/plugins/managefiles/lib.php
@@ -53,12 +53,15 @@ class tinymce_managefiles extends editor_tinymce_plugin {
             }
         }
 
-        // Add button after moodlemedia button in advancedbuttons3.
-        $added = $this->add_button_after($params, 3, 'managefiles', 'moodlemedia', false);
-
-        // So, if no moodlemedia, add after 'image'.
-        if (!$added) {
-            $this->add_button_after($params, 3, 'managefiles', 'image');
+        if ($row = $this->find_button($params, 'moodlemedia')) {
+            // Add button after 'moodlemedia' button.
+            $this->add_button_after($params, $row, 'managefiles', 'moodlemedia');
+        } else if ($row = $this->find_button($params, 'image')) {
+            // If 'moodlemedia' is not found add after 'image'.
+            $this->add_button_after($params, $row, 'managefiles', 'image');
+        } else {
+            // OTherwise add button in the end of the last row.
+            $this->add_button_after($params, $this->count_button_rows($params), 'managefiles');
         }
 
         // Add JS file, which uses default name.

diff --git a/lib/editor/tinymce/plugins/managefiles/version.php b/lib/editor/tinymce/plugins/managefiles/version.php
index 331f869..b2a4222 100644 (file)
--- a/lib/editor/tinymce/plugins/managefiles/version.php
+++ b/lib/editor/tinymce/plugins/managefiles/version.php
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2013071600;  // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2012120300;  // Required Moodle version.
+$plugin->version   = 2013071900.01;  // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2013071900.01;  // Required Moodle version.
 $plugin->component = 'tinymce_managefiles';  // Full name of the plugin (used for diagnostics).