Skip to content
Permalink
Browse files

migrate jquery in back office

  • Loading branch information
matthieu-rolland committed Aug 22, 2019
1 parent d27e28f commit 1313961bc8c3990ea42f31ae9a69eb29d64c2c0b
@@ -291,7 +291,9 @@ public static function getMediaPath($mediaUri, $cssMediaType = null)
*
* @param mixed $version
*
* @return string
* @return array
*
* @deprecated 1.7.7
*/
public static function getJqueryPath($version = null, $folder = null, $minifier = true)
{
@@ -771,6 +773,12 @@ public static function addJsDefL($params, $content, $smarty = null, &$repeat = f
}
}
/**
* @param $output
* @return string|string[]|null
*
* @deprecated 1.7.7
*/
public static function deferInlineScripts($output)
{
/* Try to enqueue in js_files inline scripts with src but without conditionnal comments */
@@ -2701,7 +2701,10 @@ public function setMedia($isNewTheme = false)
$this->addCSS(__PS_BASE_URI__ . $this->admin_webpath . '/themes/' . $this->bo_theme . '/css/vendor/titatoggle-min.css', 'all', 0);
$this->addCSS(__PS_BASE_URI__ . $this->admin_webpath . '/themes/' . $this->bo_theme . '/public/theme.css', 'all', 0);
$this->addJquery();
// add Jquery 3 and its migration script
$this->addJs(_PS_JS_DIR_ . 'jquery/jquery-3.4.1.min.js');
$this->addJs(_PS_JS_DIR_ . 'jquery/jquery-migrate-3.1.0.min.js');
$this->addJqueryPlugin(array('scrollTo', 'alerts', 'chosen', 'autosize', 'fancybox'));
$this->addJqueryPlugin('growl', null, false);
$this->addJqueryUI(array('ui.slider', 'ui.datepicker'));
@@ -535,6 +535,8 @@ public function removeJS($js_uri, $check_path = true)
* @param string|null $version jQuery library version
* @param string|null $folder jQuery file folder
* @param bool $minifier if set tot true, a minified version will be included
*
* @deprecated 1.7.7
*/
public function addJquery($version = null, $folder = null, $minifier = true)
{

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more.

@@ -76,4 +76,3 @@ Feature: Manufacturer management
Scenario: Deleting multiple manufacturers in bulk action
When I delete manufacturers: "baller, rocket" using bulk action
Then manufacturers: "baller, rocket" should be deleted

0 comments on commit 1313961

Please sign in to comment.
You can’t perform that action at this time.