Factored out the JS for the editor of Routines, Triggers and Events a…

…nd moved it into a namespace.
NenadGajic · Jul 5, 2011 · 55d2358 · 55d2358
1 parent 1bbb2ea
commit 55d2358
Show file tree

Hide file tree

Showing 10 changed files with 360 additions and 358 deletions.
diff --git a/db_events.php b/db_events.php
@@ -17,8 +17,8 @@
  */
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
 $GLOBALS['js_include'][] = 'jquery/timepicker.js';
+$GLOBALS['js_include'][] = 'rte_common.js';
 $GLOBALS['js_include'][] = 'db_events.js';
-$GLOBALS['js_include'][] = 'db_routines.js'; // FIXME
 
 /**
  * Include all other files

diff --git a/db_routines.php b/db_routines.php
@@ -18,6 +18,7 @@
  */
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
 $GLOBALS['js_include'][] = 'jquery/timepicker.js';
+$GLOBALS['js_include'][] = 'rte_common.js';
 $GLOBALS['js_include'][] = 'db_routines.js';
 
 /**

diff --git a/db_triggers.php b/db_triggers.php
@@ -16,8 +16,8 @@
  * Include JavaScript libraries
  */
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'rte_common.js';
 $GLOBALS['js_include'][] = 'db_triggers.js';
-$GLOBALS['js_include'][] = 'db_routines.js'; // FIXME
 
 /**
  * Include all other files

diff --git a/js/db_events.js b/js/db_events.js
@@ -1,2 +1,18 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 
+/**
+ * What type of item the editor is for.
+ */
+RTE.editor = 'event';
+
+/**
+ * Attach Ajax event handlers for the "Change event type"
+ * functionality in the events editor.
+ *
+ * @see $cfg['AjaxEnable']
+ */
+$(document).ready(function () {
+    $('select[name=item_type]').live('change', function() {
+        $('.recurring_event_row, .onetime_event_row').toggle();
+    }); // end $.live()
+}); // end of $(document).ready()
diff --git a/js/db_routines.js b/js/db_routines.js
diff --git a/js/db_triggers.js b/js/db_triggers.js
@@ -1,2 +1,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 
+/**
+ * What type of item the editor is for.
+ */
+RTE.editor = 'trigger';
diff --git a/js/rte_common.js b/js/rte_common.js
diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php
@@ -161,8 +161,7 @@ function PMA_EVN_handleEditor()
             // Show form
             $editor = PMA_EVN_getEditorForm($mode, $operation, $item);
             if ($GLOBALS['is_ajax_request']) {
-                $extra_data = array('title' => $title,
-                                    'editor' => 'event');
+                $extra_data = array('title' => $title);
                 PMA_ajaxResponse($editor, true, $extra_data);
             } else {
                 echo "\n\n<h2>$title</h2>\n\n$editor";

diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
@@ -463,7 +463,6 @@ function PMA_RTN_handleEditor()
             if ($GLOBALS['is_ajax_request']) {
                 $template   = PMA_RTN_getParameterRow();
                 $extra_data = array('title' => $title,
-                                    'editor' => 'routine',
                                     'param_template' => $template,
                                     'type' => $routine['type']);
                 PMA_ajaxResponse($editor, true, $extra_data);

diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php
@@ -163,8 +163,7 @@ function PMA_TRI_handleEditor()
             // Show form
             $editor = PMA_TRI_getEditorForm($mode, $item);
             if ($GLOBALS['is_ajax_request']) {
-                $extra_data = array('title' => $title,
-                                    'editor' => 'trigger');
+                $extra_data = array('title' => $title);
                 PMA_ajaxResponse($editor, true, $extra_data);
             } else {
                 echo "\n\n<h2>$title</h2>\n\n$editor";