Move init to head

diff --git a/plugins/edit-calendar.php b/plugins/edit-calendar.php
index b3867f66bcab8cb6f27289dbcab1d944cc57a334..bb1d69e46781a139a889ee3685473b13b689f71a 100644 (file)
--- a/plugins/edit-calendar.php
+++ b/plugins/edit-calendar.php
@@ -15,26 +15,25 @@ class AdminerEditCalendar {
        * @param string text to append before first calendar usage
        * @param string path to language file, %s stands for language code
        */
-       function AdminerEditCalendar($prepend = "<script type='text/javascript' src='jquery-ui/jquery.js'></script>\n<script type='text/javascript' src='jquery-ui/jquery-ui.js'></script>\n<script type='text/javascript' src='jquery-ui/jquery-ui-timepicker-addon.js'></script>\n<link rel='stylesheet' type='text/css' href='jquery-ui/jquery-ui.css'>\n", $langPath = "jquery-ui/i18n/jquery.ui.datepicker-%s.js") { //! insert <link> by JavaScript to achieve HTML validity
+       function AdminerEditCalendar($prepend = "<script type='text/javascript' src='jquery-ui/jquery.js'></script>\n<script type='text/javascript' src='jquery-ui/jquery-ui.js'></script>\n<script type='text/javascript' src='jquery-ui/jquery-ui-timepicker-addon.js'></script>\n<link rel='stylesheet' type='text/css' href='jquery-ui/jquery-ui.css'>\n", $langPath = "jquery-ui/i18n/jquery.ui.datepicker-%s.js") {
                $this->prepend = $prepend;
                $this->langPath = $langPath;
        }
        
+       function head() {
+               echo $this->prepend;
+               if ($this->langPath && function_exists('get_lang')) { // since Adminer 3.2.0
+                       $lang = get_lang();
+                       $lang = ($lang == "zh" ? "zh-CN" : ($lang == "zh-tw" ? "zh-TW" : $lang));
+                       if ($lang != "en" && file_exists(sprintf($this->langPath, $lang))) {
+                               printf("<script type='text/javascript' src='$this->langPath'></script>\n", $lang);
+                               echo "<script type='text/javascript'>jQuery(function () { jQuery.timepicker.setDefaults(jQuery.datepicker.regional['$lang']); });</script>\n";
+                       }
+               }
+       }
+       
        function editInput($table, $field, $attrs, $value) {
-               static $calendar = false;
                if (ereg("date|time", $field["type"])) {
-                       if (!$calendar) {
-                               $calendar = true;
-                               echo $this->prepend;
-                               if ($this->langPath && function_exists('get_lang')) { // since Adminer 3.2.0
-                                       $lang = get_lang();
-                                       $lang = ($lang == "zh" ? "zh-CN" : ($lang == "zh-tw" ? "zh-TW" : $lang));
-                                       if ($lang != "en" && file_exists(sprintf($this->langPath, $lang))) {
-                                               printf("<script type='text/javascript' src='$this->langPath'></script>\n", $lang);
-                                               echo "<script type='text/javascript'>jQuery(function () { jQuery.timepicker.setDefaults(jQuery.datepicker.regional['$lang']); });</script>\n";
-                                       }
-                               }
-                       }
                        $dateFormat = "changeYear: true, dateFormat: 'yy-mm-dd'"; //! yy-mm-dd regional
                        $timeFormat = "showSecond: true, timeFormat: 'hh:mm:ss'";
                        return "<input id='fields-" . h($field["field"]) . "' value='" . h($value) . "'" . ($maxlength ? " maxlength='$maxlength'" : "") . "$attrs><script type='text/javascript'>jQuery(function () { jQuery('#fields-" . js_escape($field["field"]) . "')."

diff --git a/plugins/tinymce.php b/plugins/tinymce.php
index 7e33ee0da84f39a39a455abbbdc09672da248b8b..d5caa377b007d393ac164012c791f8a5491dabb7 100644 (file)
--- a/plugins/tinymce.php
+++ b/plugins/tinymce.php
@@ -43,7 +43,6 @@ tinyMCE.init({
 });
 </script>
 <?php
-               return true;
        }
        
        function selectVal(&$val, $link, $field) {