Ne charge pas JQUERY / UI dans les popups: plus rapide et corrige des disfonctionnements

library/Class/ScriptLoader.php

@@ -149,6 +149,9 @@ class Class_ScriptLoader {
 	 * @return ScriptLoader
 	 */
 	public function loadJQuery() {
+		if ($this->isAjax())
+			return $this;
+
 		return $this->addScript(JQUERY);
 	}
 
@@ -200,6 +203,9 @@ class Class_ScriptLoader {
 	 * @return ScriptLoader
 	 */
 	public function loadJQueryUI() {
+		if ($this->isAjax())
+			return $this;
+
 		return $this
 			->addScript(JQUERYUI)
 			->addStyleSheet(URL_ADMIN_JS.'jquery_ui/css/jquery-ui.custom.smoothness.min.css');
@@ -581,6 +587,14 @@ class Class_ScriptLoader {
 	}
 
 
+	/**
+	 * @return bool
+	 */
+	public function isAjax() {
+		return $this->_jquery_ready_mode == self::MODE_AJAX;
+	}
+
+
 	/**
 	 * @return ScriptLoader
 	 */

library/ZendAfi/View/Helper/DatePicker.php

@@ -39,7 +39,7 @@ class ZendAfi_View_Helper_DatePicker extends ZendAfi_View_Helper_BaseHelper {
 		Class_ScriptLoader::getInstance()
 			->addJQueryReady('$.datepicker.setDefaults($.datepicker.regional["' . (($locale == 'en_US') ? '' : 'fr' ). '"]);
 												$("#date'.$name.'").datepicker('.json_encode($options).');')
-			->addAdminScript('jquery_ui/jquery-ui-i18n.min');
+			->addAdminScript('jquery_ui/i18n/jquery-ui-i18n.min');
 
 
 		$value = $this->formatDate($varDate, $locale);

library/ZendAfi/View/Helper/DomaineSelect.php

@@ -24,7 +24,6 @@ class ZendAfi_View_Helper_DomaineSelect extends ZendAfi_View_Helper_BaseHelper {
 	 * @param item user of Trait_HasManyDomaines
 	 */
 	public function domaineSelect($item) {
-		xdebug_break();
 		return $this->view->treeSelect('',
 																	 str_replace(';','-',$item->getDomaineIds()),
 																	 true,

tests/application/modules/admin/controllers/CmsControllerTest.php

@@ -567,11 +567,28 @@ class CmsControllerArticleConcertEditRenderPopupActionTest extends CmsController
 															 '//td//div[contains(@onclick, "initializeAjaxFormSubmit")]');
 	}
 
+
 	/** @test */
 	public function tagPreviewArticleShouldNotHaveRenderPopupInLink() {
 		$this->_xpath->assertXPath($this->_json->content,
 															 '//a[contains(@href, "cms/articleview/id/4?iframe=true")]');
 	}
+
+
+	/** @test */
+	public function contentShouldNotContainsJQuery() {
+		$this->_xpath->assertNotXPath($this->_json->content,
+																	'//script[contains(@src, "'.JQUERY.'")]');	
+	}
+
+
+	/** @test */
+	public function contentShouldNotContainsJQueryUI() {
+		$this->_xpath->assertNotXPath($this->_json->content,
+																	'//script[contains(@src, "'.JQUERYUI.'")]',
+																	$this->_json->content);	
+	}
+
 }