diff options
| author | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
|---|---|---|
| committer | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
| commit | 11a40dd1fef6c5b78b054617caba4325f95ee386 (patch) | |
| tree | de2e1d7efd6423ef4d1256dd5c90a972ad172719 /plugins/jqueryui/jqueryui.php | |
| parent | 187fd666aa2f32dedfe544d69b7cb213698197f2 (diff) | |
| parent | ba084313bfc9c7a5a83e0611fe4376543cc1653d (diff) | |
Merge branch 'master' of https://github.com/roundcube/roundcubemail
Conflicts:
plugins/password/config.inc.php.dist
Diffstat (limited to 'plugins/jqueryui/jqueryui.php')
| -rw-r--r-- | plugins/jqueryui/jqueryui.php | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php index 601e16196..2dfa8add1 100644 --- a/plugins/jqueryui/jqueryui.php +++ b/plugins/jqueryui/jqueryui.php @@ -5,7 +5,7 @@ * * Provide the jQuery UI library with according themes. * - * @version 1.9.2 + * @version 1.10.4 * @author Cor Bosman <roundcube@wa.ter.net> * @author Thomas Bruederli <roundcube@gmail.com> * @license GNU GPLv3+ @@ -13,32 +13,31 @@ class jqueryui extends rcube_plugin { public $noajax = true; + public $version = '1.10.4'; private static $features = array(); private static $ui_theme; public function init() { - $version = '1.9.2'; - $rcmail = rcmail::get_instance(); $this->load_config(); // include UI scripts - $this->include_script("js/jquery-ui-$version.custom.min.js"); + $this->include_script("js/jquery-ui-$this->version.custom.min.js"); // include UI stylesheet $skin = $rcmail->config->get('skin'); $ui_map = $rcmail->config->get('jquery_ui_skin_map', array()); - $ui_theme = $ui_map[$skin] ? $ui_map[$skin] : $skin; + $ui_theme = $ui_map[$skin] ?: $skin; self::$ui_theme = $ui_theme; - if (file_exists($this->home . "/themes/$ui_theme/jquery-ui-$version.custom.css")) { - $this->include_stylesheet("themes/$ui_theme/jquery-ui-$version.custom.css"); + if (file_exists($this->home . "/themes/$ui_theme/jquery-ui-$this->version.custom.css")) { + $this->include_stylesheet("themes/$ui_theme/jquery-ui-$this->version.custom.css"); } else { - $this->include_stylesheet("themes/larry/jquery-ui-$version.custom.css"); + $this->include_stylesheet("themes/larry/jquery-ui-$this->version.custom.css"); } if ($ui_theme == 'larry') { |