iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

- remove code for backward compatibility (jquery ui effect + template variable)

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@21818 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2013-03-24 06:49:06 +00:00
parent ea10c19ac5
commit 87ed74afd9
2 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/template.class.php
View File

@@ -46,7 +46,7 @@ class Template {
const COMBINED_CSS_TAG = '<!-- COMBINED_CSS -->';
var $css_by_priority = array();
var $picture_buttons = array();
var $index_buttons = array();
@@ -602,13 +602,6 @@ class Template {
}
}
// TEMP in 2.5 for backward compatibility
if(!empty($params['require']))
{
$params['require'] = str_replace('jquery.effects.', 'jquery.ui.effect-', $params['require'] );
$params['require'] = str_replace('jquery.effects', 'jquery.ui.effect', $params['require'] );
}
$this->scriptLoader->add( $params['id'], $load,
empty($params['require']) ? array() : explode( ',', $params['require'] ),
@$params['path'],
@@ -692,13 +685,6 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
if ( !empty($content) )
{ // second call
// TEMP in 2.5 for backward compatibility
if(!empty($params['require']))
{
$params['require'] = str_replace('jquery.effects.', 'jquery.ui.effect-', $params['require'] );
$params['require'] = str_replace('jquery.effects', 'jquery.ui.effect', $params['require'] );
}
$this->scriptLoader->add_inline(
$content,
empty($params['require']) ? array() : explode(',', $params['require'])
@@ -874,17 +860,17 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
}
return $themeconfs[$dir];
}
function add_picture_button($content, $rank)
{
$this->picture_buttons[$rank][] = $content;
}
function add_index_button($content, $rank)
{
$this->index_buttons[$rank][] = $content;
}
function parse_picture_buttons()
{
if (!empty($this->picture_buttons))
@@ -895,7 +881,7 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
$this->concat('PLUGIN_PICTURE_ACTIONS', $content);
}
}
function parse_index_buttons()
{
if (!empty($this->index_buttons))
@@ -906,7 +892,7 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
$this->concat('PLUGIN_INDEX_ACTIONS', $content);
}
}
}