MDL-19817 Migrated choose_from_menu to the new $OUTPUT->select_menu() function

diff --git a/mod/wiki/admin.php b/mod/wiki/admin.php
index f419048109811f988702de24c3849a7ad2306cae..73cead33b7cad331462ea842d74060eeff337b13 100644 (file)
--- a/mod/wiki/admin.php
+++ b/mod/wiki/admin.php
@@ -285,7 +285,12 @@
         while(list($key,$val)=each($wiki_list)) {
           $wiki_admin_list[$key."&action=$action"]=$val;
         }
-        choose_from_menu($wiki_admin_list, "wikiselect", $selected, "choose", $script);
+        $selectmenu = new moodle_select_menu();
+        $selectmenu->options = $wiki_admin_list;
+        $selectmenu->name = 'wikiselect';
+        $selectmenu->selectedvalue = $selected;
+        $selectmenu->add_action('change', 'go_to_wiki');
+        echo $OUTPUT->select_menu($selectmenu);
         echo '</td>';
         echo '</tr></table>';
         echo '</fieldset></form>';

diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index dbc4ef710e6851dd98fe0d05d91f3d7df6e1ad35..785ea9c19635f2e3a3838f92dc2c220190cd0e7e 100644 (file)
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -300,8 +300,12 @@
 
         echo '<td class="sideblockheading">'
             .get_string('otherwikis', 'wiki').':&nbsp;&nbsp;';
-        $script = 'self.location=getElementById(\'otherwikis\').wikiselect.options[getElementById(\'otherwikis\').wikiselect.selectedIndex].value';
-        choose_from_menu($wiki_list, "wikiselect", $selected, "choose", $script);
+        $selectmenu = new moodle_select_menu();
+        $selectmenu->options = $wiki_list;
+        $selectmenu->name = 'wikiselect';
+        $selectmenu->selectedvalue = $selected;
+        $selectmenu->add_action('change', 'go_to_wiki');
+        echo $OUTPUT->select_menu($selectmenu);
         echo '</td>';
         echo '</tr></table>';
         echo '</form>';

diff --git a/mod/wiki/wiki.js b/mod/wiki/wiki.js
new file mode 100644 (file)
index 0000000..db737d0
--- /dev/null
+++ b/mod/wiki/wiki.js
@@ -0,0 +1,3 @@
+function go_to_wiki(e, args) {
+    self.location = e.target.value;
+}