From 419c090fd964feade488e82b36b4c77e65140a75 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Sun, 26 Jan 2014 10:10:43 -0500 Subject: [PATCH] Update to jQuery UI 1.9.2 (without themes) --- plugins/jqueryui/jqueryui.php | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php index 69b9ca1..73daa5d 100644 --- a/plugins/jqueryui/jqueryui.php +++ b/plugins/jqueryui/jqueryui.php @@ -5,9 +5,10 @@ * * Provide the jQuery UI library with according themes. * - * @version 1.8.18 + * @version 1.9.2 * @author Cor Bosman <roundcube@wa.ter.net> * @author Thomas Bruederli <roundcube@gmail.com> + * @license GNU GPLv3+ */ class jqueryui extends rcube_plugin { @@ -15,7 +16,7 @@ public function init() { - $version = '1.8.18'; + $version = '1.9.2'; $rcmail = rcmail::get_instance(); $this->load_config(); @@ -24,7 +25,7 @@ $this->include_script("js/jquery-ui-$version.custom.min.js"); // include UI stylesheet - $skin = $rcmail->config->get('skin', 'default'); + $skin = $rcmail->config->get('skin'); $ui_map = $rcmail->config->get('jquery_ui_skin_map', array()); $ui_theme = $ui_map[$skin] ? $ui_map[$skin] : $skin; @@ -32,7 +33,22 @@ $this->include_stylesheet("themes/$ui_theme/jquery-ui-$version.custom.css"); } else { - $this->include_stylesheet("themes/default/jquery-ui-$version.custom.css"); + $this->include_stylesheet("themes/larry/jquery-ui-$version.custom.css"); + } + + if ($ui_theme == 'larry') { + // patch dialog position function in order to fully fit the close button into the window + $rcmail->output->add_script("jQuery.extend(jQuery.ui.dialog.prototype.options.position, { + using: function(pos) { + var me = jQuery(this), + offset = me.css(pos).offset(), + topOffset = offset.top - 12; + if (topOffset < 0) + me.css('top', pos.top - topOffset); + if (offset.left + me.outerWidth() + 12 > jQuery(window).width()) + me.css('left', pos.left - 12); + } + });", 'foot'); } // jquery UI localization -- Gitblit v1.9.1