Skip to content
Snippets Groups Projects
Commit 4aff1cba authored by Laurent's avatar Laurent
Browse files

dev #65510 jquery compat

parent 3cfbf3b4
Branches
Tags
2 merge requests!2366Dev#65510 maj jquery,!2358Dev#65510 maj jquery
Pipeline #2603 passed with stage
in 21 minutes and 27 seconds
......@@ -539,6 +539,7 @@ class NoticeAjaxController extends Zend_Controller_Action {
protected function _sendResponseWithScripts($html) {
Class_ScriptLoader::getInstance()
->loadJQuery()
->addAdminScript('onload_utils')
->addJQueryReady('setupAnchorsTarget();');
......
......@@ -742,8 +742,7 @@ class Class_ScriptLoader {
->loadJQueryUI()
->addAdminScripts(['treeselect/data_selector.js',
'treeselect/treeselect.js'])
->addStyleSheets([URL_ADMIN_JS.'jquery_ui/css/jquery-ui.custom.smoothness.min.css',
URL_ADMIN_JS.'treeselect/treeselect.css']);
->addStyleSheets([URL_ADMIN_JS.'treeselect/treeselect.css']);
}
......
......@@ -23,7 +23,6 @@
class ZendAfi_View_Helper_Admin_Head extends ZendAfi_View_Helper_BaseHelper {
public function Admin_Head() {
$head_scripts = Class_ScriptLoader::newInstance()
->addStyleSheet(URL_ADMIN_JS.'jquery_ui/css/jquery-ui.custom.smoothness.min.css')
->loadJQuery()
->loadJQueryUI()
->loadNotificationJS()
......
......@@ -73,8 +73,8 @@ abstract class ZendAfi_View_Helper_ListeNotices_Abstract extends ZendAfi_View_He
Class_ScriptLoader::getInstance()
->addInlineScript("var resumeAjaxBaseUrl='".$this->view->url(['controller' => 'noticeajax', 'action' => 'resumenotice'],null,true)."';")
->addOPACScript('liste_notices_mur')
->addJQueryReady("scrollToSelectedNoticeInResult(); vignetteHover($('.resultat_recherche .liste_mur .notice[data-id]'));")
->loadPrettyPhoto();
->addJQueryReady("scrollToSelectedNoticeInResult(); vignetteHover($('.resultat_recherche .liste_mur .notice[data-id]'));");
if(Class_AdminVar::isAfficherDispoSurRechercheEnabled())
Class_ScriptLoader::getInstance()
->addInlineScript("var disponibiliteAjaxBaseUrl='".$this->view->url(['controller' => 'noticeajax', 'action' => 'dispo-notice'], null, true)."';")
......
......@@ -57,12 +57,6 @@ class AdminControllerSitoOKTest extends Admin_AbstractControllerTestCase {
function prettyPhotoCssShouldBeInHead() {
$this->assertXPath("//head/link[contains(@href, 'css/prettyPhoto.css')]");
}
/** @test */
function jquerySmoothnessCssShouldBeInHead() {
$this->assertXPath("//head/link[contains(@href, 'jquery_ui/css/jquery-ui.custom.smoothness.min.css')]");
}
}
?>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment