Skip to content

Commit

Permalink
Update Dev JS
Browse files Browse the repository at this point in the history
  • Loading branch information
@sebastienheraud
sebastienheraud committed Jul 11, 2019
1 parent 0a34958 commit 3ec230e
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 12 deletions.
8 changes: 4 additions & 4 deletions administrator/components/com_cck/helpers/helper_include.php
View file
Expand Up @@ -27,7 +27,7 @@ public static function addDependencies( $view, $layout, $tmpl = '' )
// Additional // Additional
switch ( $view ) { switch ( $view ) {
case 'box': case 'box':
JCck::loadjQuery( true, true, array( 'cck.dev-3.17.0.min.js', 'jquery.ui.effects.min.js', 'jquery.json.min.js' ) ); JCck::loadjQuery( true, true, array( 'cck.dev-3.18.0.min.js', 'jquery.ui.effects.min.js', 'jquery.json.min.js' ) );
Helper_Include::addSmoothScrool( 500 ); Helper_Include::addSmoothScrool( 500 );
break; break;
case 'folder': case 'folder':
Expand All @@ -41,7 +41,7 @@ public static function addDependencies( $view, $layout, $tmpl = '' )
break; break;
case 'field': case 'field':
if ( $script === true ) { if ( $script === true ) {
JCck::loadjQuery( true, true, array( 'cck.dev-3.17.0.min.js' ) ); JCck::loadjQuery( true, true, array( 'cck.dev-3.18.0.min.js' ) );
JCck::loadjQueryUI(); JCck::loadjQueryUI();
} }
if ( $tmpl == 'component' ) { if ( $tmpl == 'component' ) {
Expand All @@ -51,7 +51,7 @@ public static function addDependencies( $view, $layout, $tmpl = '' )
case 'type': case 'type':
case 'search': case 'search':
if ( $script === true ) { if ( $script === true ) {
JCck::loadjQuery( true, true, array( 'cck.dev-3.17.0.min.js', 'jquery.biscuit.min.js' ) ); JCck::loadjQuery( true, true, array( 'cck.dev-3.18.0.min.js', 'jquery.biscuit.min.js' ) );
JCck::loadjQueryUI(); JCck::loadjQueryUI();
$doc->addScript( $root.'/media/cck/js/cck.backend-3.17.0.min.js' ); $doc->addScript( $root.'/media/cck/js/cck.backend-3.17.0.min.js' );
$doc->addStyleSheet( $root.'/administrator/components/com_'.CCK_NAME.'/assets/css/ui-construction.css' ); $doc->addStyleSheet( $root.'/administrator/components/com_'.CCK_NAME.'/assets/css/ui-construction.css' );
Expand Down Expand Up @@ -91,7 +91,7 @@ public static function addDependencies( $view, $layout, $tmpl = '' )
require_once JPATH_LIBRARIES.'/cck/joomla/html/cckactionsdropdown.php'; require_once JPATH_LIBRARIES.'/cck/joomla/html/cckactionsdropdown.php';


if ( $view == 'folders' ) { if ( $view == 'folders' ) {
JCck::loadjQuery( true, true, array( 'cck.dev-3.17.0.min.js' ) ); JCck::loadjQuery( true, true, array( 'cck.dev-3.18.0.min.js' ) );
} else { } else {
JCck::loadjQuery(); JCck::loadjQuery();
} }
Expand Down
2 changes: 1 addition & 1 deletion libraries/cck/construction/field/cck.php
View file
Expand Up @@ -41,7 +41,7 @@ protected function getInput()
$lang->load( 'com_cck_default', JPATH_SITE ); $lang->load( 'com_cck_default', JPATH_SITE );


if ( $format != 'raw' ) { if ( $format != 'raw' ) {
JCck::loadjQuery( true, true, array( 'cck.dev-3.17.0.min.js', 'jquery.json.min.js', 'jquery.ui.effects.min.js' ) ); JCck::loadjQuery( true, true, array( 'cck.dev-3.18.0.min.js', 'jquery.json.min.js', 'jquery.ui.effects.min.js' ) );
} }


$config = array( 'asset'=>'', $config = array( 'asset'=>'',
Expand Down
2 changes: 1 addition & 1 deletion libraries/cck/construction/field/cckintegration.php
View file
Expand Up @@ -222,7 +222,7 @@ protected function getInput()
$html[] = '</div></div>'; $html[] = '</div></div>';


// Stuff // Stuff
JCck::loadjQuery( true, true, array( 'cck.dev-3.17.0.min.js', 'jquery.json.min.js', 'jquery.ui.effects.min.js' ) ); JCck::loadjQuery( true, true, array( 'cck.dev-3.18.0.min.js', 'jquery.json.min.js', 'jquery.ui.effects.min.js' ) );
$ajax = '../media/system/images/modal/spinner.gif'; $ajax = '../media/system/images/modal/spinner.gif';
$js = ' $js = '
(function ($){ (function ($){
Expand Down
2 changes: 1 addition & 1 deletion libraries/cck/construction/field/cckjs.php
View file
Expand Up @@ -26,7 +26,7 @@ protected function getInput()
{ {
$format = (string)$this->element['js_format']; $format = (string)$this->element['js_format'];
if ( $format != 'raw' ) { if ( $format != 'raw' ) {
JCck::loadjQuery( true, true, array( 'cck.dev-3.17.0.min.js', 'jquery.json.min.js', 'jquery.ui.effects.min.js' ) ); JCck::loadjQuery( true, true, array( 'cck.dev-3.18.0.min.js', 'jquery.json.min.js', 'jquery.ui.effects.min.js' ) );
} }


return $this->_addScripts( $this->id, array( 'appendTo'=>(string)$this->element['js_appendto'], return $this->_addScripts( $this->id, array( 'appendTo'=>(string)$this->element['js_appendto'],
Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/cck/cck.php
View file
Expand Up @@ -373,7 +373,7 @@ public static function loadjQuery( $noconflict = true, $more = true, $dev = fals


if ( $dev !== false && !( isset( $app->cck_jquery_dev ) && $app->cck_jquery_dev === true ) ) { if ( $dev !== false && !( isset( $app->cck_jquery_dev ) && $app->cck_jquery_dev === true ) ) {
if ( $dev === true ) { if ( $dev === true ) {
$doc->addScript( $root.'/media/cck/js/cck.dev-3.17.0.min.js' ); $doc->addScript( $root.'/media/cck/js/cck.dev-3.18.0.min.js' );
$doc->addScript( $root.'/media/cck/js/jquery.ui.effects.min.js' ); $doc->addScript( $root.'/media/cck/js/jquery.ui.effects.min.js' );
$app->cck_jquery_dev = true; $app->cck_jquery_dev = true;
} elseif ( is_array( $dev ) && count( $dev ) ) { } elseif ( is_array( $dev ) && count( $dev ) ) {
Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/cck/plugin/field/adapter.php
View file
Expand Up @@ -32,7 +32,7 @@ public function render()
return ''; return '';
} }


JCck::loadjQuery( true, true, array( 'cck.dev-3.17.0.min.js' ) ); JCck::loadjQuery( true, true, array( 'cck.dev-3.18.0.min.js' ) );


$config = array( $config = array(
'asset'=>'', 'asset'=>'',
Expand Down
3 changes: 0 additions & 3 deletions media/cck/js/cck.dev-3.17.0.min.js
View file

This file was deleted.

2 changes: 2 additions & 0 deletions media/cck/js/cck.dev-3.18.0.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3ec230e

Please sign in to comment.