From 57f23360e3fa0976a52de0e83dca3733e6eabeca Mon Sep 17 00:00:00 2001 From: Denys Nosov Date: Tue, 2 May 2017 04:50:31 +0300 Subject: [PATCH] Convert diff --git a/administrator/components/com_cck/views/list/tmpl/default.php b/administrator/components/com_cck/views/list/tmpl/default.php index 806287026..101915efb 100644 --- a/administrator/components/com_cck/views/list/tmpl/default.php +++ b/administrator/components/com_cck/views/list/tmpl/default.php @@ -26,7 +26,7 @@ JFactory::getDocument()->addStyleDeclaration( $css ); ?> -'; - echo ''; + echo ''; + echo ''; } else { $doc->addStyleSheet( $root.'/media/cck/css/cck.validation-3.9.0.css' ); $doc->addScript( $root.'/media/cck/js/cck.validation-3.11.1.min.js' ); diff --git a/components/com_cck/views/form/tmpl/edit.php b/components/com_cck/views/form/tmpl/edit.php index ab9306201..b63fb9394 100644 --- a/components/com_cck/views/form/tmpl/edit.php +++ b/components/com_cck/views/form/tmpl/edit.php @@ -44,7 +44,7 @@ $js = 'if (jQuery("#'.$this->form_id.'").isStillReady() === true) { jQuery("#'.$this->form_id.' input[name=\'config[unique]\']").val("'.$this->unique.'"); JCck.Core.submitForm(task, document.getElementById("'.$this->form_id.'")); }'; } ?> - -'; + return ''; } else { $doc->addScriptDeclaration( $js ); } diff --git a/libraries/cck/construction/field/cckjs.php b/libraries/cck/construction/field/cckjs.php index a88c4665d..613170b3b 100644 --- a/libraries/cck/construction/field/cckjs.php +++ b/libraries/cck/construction/field/cckjs.php @@ -129,7 +129,7 @@ protected function _addScripts( $id, $events, $format ) $js = 'jQuery(document).ready(function($){'.$js.' '.$js2.' '.$js3.'});'; if ( $format == 'raw' ) { - return ''; + return ''; } else { $doc->addScriptDeclaration( $js ); } diff --git a/libraries/cck/construction/field/cckpicker.php b/libraries/cck/construction/field/cckpicker.php index 90f63aa69..79d4dfd88 100644 --- a/libraries/cck/construction/field/cckpicker.php +++ b/libraries/cck/construction/field/cckpicker.php @@ -112,7 +112,7 @@ protected function _addScripts( $id, $params, $format ) $js = 'jQuery(document).ready(function($){'.$js.'});'; if ( $format == 'raw' ) { - return ''; + return ''; } else { $doc->addScriptDeclaration( $js ); } diff --git a/libraries/cck/rendering/rendering.php b/libraries/cck/rendering/rendering.php index caf0f9532..27b599a87 100644 --- a/libraries/cck/rendering/rendering.php +++ b/libraries/cck/rendering/rendering.php @@ -401,7 +401,7 @@ public function finalize() $js = '(function ($){'.$js."\n".'$(document).ready(function(){'.$this->js.'});})(jQuery);'; if ( $tmpl == 'raw' ) { - echo ''; + echo ''; } else { $doc->addScriptDeclaration( $js ); } @@ -410,7 +410,7 @@ public function finalize() $js = '(function ($){$(window).load(function(){'.$this->js2.'});})(jQuery);'; if ( $tmpl == 'raw' ) { - echo ''; + echo ''; } else { $doc->addScriptDeclaration( $js ); } diff --git a/libraries/cms/cck/cck.php b/libraries/cms/cck/cck.php index e05987dbf..d9d2b2707 100644 --- a/libraries/cms/cck/cck.php +++ b/libraries/cms/cck/cck.php @@ -354,7 +354,7 @@ public static function loadjQuery( $noconflict = true, $more = true, $dev = fals } elseif ( is_array( $dev ) && count( $dev ) ) { if ( $app->input->get( 'tmpl' ) == 'raw' ) { foreach ( $dev as $v ) { - echo ''; + echo ''; } } else { foreach ( $dev as $v ) { diff --git a/libraries/cms/cck/dev.php b/libraries/cms/cck/dev.php index bea6d6f04..5d28b9ee4 100644 --- a/libraries/cms/cck/dev.php +++ b/libraries/cms/cck/dev.php @@ -78,7 +78,7 @@ public static function forceStorage( $value = 'none', $allowed = '' ) $js = 'if ( !$("#myid").val() ) { $("#storage").val( "'.$value.'" ); $("#force_storage").val( "1" ); }'; } - echo ''; + echo ''; } public static function getMergedScript( $url ) @@ -359,7 +359,7 @@ public static function initScript( $type, &$elem, $options = array() ) echo ''; } if ( $js || $js2 ) { - echo ''; + echo ''; } return; diff --git a/libraries/cms/cck/dev/tabs.php b/libraries/cms/cck/dev/tabs.php index 4b46c3ce3..72419272e 100644 --- a/libraries/cms/cck/dev/tabs.php +++ b/libraries/cms/cck/dev/tabs.php @@ -41,7 +41,7 @@ public static function open( $selector, $id, $text ) 'active'=>$active, 'title' => $text ) ); - $html .= ''; + $html .= ''; } return $html; @@ -63,7 +63,7 @@ public static function start( $selector, $id, $text, $params ) ) ); $js .= JLayoutHelper::render( 'libraries.cms.html.bootstrap.starttabsetscript', array( 'selector' => $selector ) );; - $html .= ''; + $html .= ''; } return $html; diff --git a/libraries/cms/cck/plugin/field.php b/libraries/cms/cck/plugin/field.php index da3217a2f..d6ef9dbc5 100644 --- a/libraries/cms/cck/plugin/field.php +++ b/libraries/cms/cck/plugin/field.php @@ -1020,7 +1020,7 @@ public static function g_addProcess( $event, $type, &$config, $params, $priority public static function g_addScriptDeclaration( $script ) { if ( JFactory::getApplication()->input->get( 'tmpl' ) == 'raw' ) { - echo ''; + echo ''; } else { JFactory::getDocument()->addScriptDeclaration( 'jQuery(document).ready(function($){'.$script.'});' ); } diff --git a/modules/mod_cck_form/tmpl/default.php b/modules/mod_cck_form/tmpl/default.php index 849aa2222..cb2980a22 100644 --- a/modules/mod_cck_form/tmpl/default.php +++ b/modules/mod_cck_form/tmpl/default.php @@ -20,7 +20,7 @@ $js = 'if (jQuery("#'.$formId.'").isStillReady() === true) { jQuery("#'.$formId.' input[name=\'config[unique]\']").val("'.$formId.'"); JCck.Core.submitForm("save", document.getElementById("'.$formId.'")); }'; } ?> - - -'; - echo ''; + echo ''; + echo ''; } else { $doc->addStyleSheet( self::$path.'assets/css/jscal2.css' ); $doc->addStyleSheet( self::$path.'assets/css/border-radius.css' ); @@ -352,7 +352,7 @@ protected static function _addScripts( $params = array() ) protected static function _addScript( $id, $params = array() ) { $js = ' - '; + echo ''; } else { $doc->addStyleSheet( $s_css ); $doc->addScript( $s_js ); diff --git a/plugins/cck_field/email/tmpl/edit.php b/plugins/cck_field/email/tmpl/edit.php index 8a6a21de5..b83d9dfd0 100644 --- a/plugins/cck_field/email/tmpl/edit.php +++ b/plugins/cck_field/email/tmpl/edit.php @@ -49,7 +49,7 @@ -'; + echo ''; } elseif ( $app->input->get( 'tmpl' ) == 'raw' ) { echo ''; - echo ''; + echo ''; } else { JCck::loadjQuery(); JCck::loadjQueryUI(); diff --git a/plugins/cck_field/group/group.php b/plugins/cck_field/group/group.php index 0e185f457..81dec2780 100644 --- a/plugins/cck_field/group/group.php +++ b/plugins/cck_field/group/group.php @@ -401,7 +401,7 @@ protected static function _getHtml( $field, $group, $i, $size_group, &$config ) if ( $js ) { if ( JFactory::getApplication()->input->get( 'tmpl' ) == 'raw' ) { - echo ''; + echo ''; } else { JFactory::getDocument()->addScriptDeclaration( 'jQuery(document).ready(function($){'.$js.'});' ); } diff --git a/plugins/cck_field/group_x/group_x.php b/plugins/cck_field/group_x/group_x.php index 712ab0d2d..b948c6ee9 100644 --- a/plugins/cck_field/group_x/group_x.php +++ b/plugins/cck_field/group_x/group_x.php @@ -455,7 +455,7 @@ protected static function _addScripts() JCck::loadjQueryUI(); if ( $app->input->get( 'tmpl' ) == 'raw' ) { - echo ''; + echo ''; } else { $doc->addScript( self::$path.'assets/js/script2.js' ); } @@ -498,7 +498,7 @@ protected static function _addScript( $id, $params = array() ) $js .= '});'; if ( $app->input->get( 'tmpl' ) == 'raw' ) { - echo ''; + echo ''; } else { $doc ->addScriptDeclaration( $js ); } @@ -616,7 +616,7 @@ protected static function _getHtmlTable( $field, $group, $i, $size_group, $butto if ( $js ) { if ( $js_format == 'raw' ) { - $html .= ''; + $html .= ''; } else { JFactory::getDocument()->addScriptDeclaration( 'jQuery(document).ready(function($){'.$js.'});' ); } @@ -766,7 +766,7 @@ protected static function _getHtml( $field, $group, $i, $size_group, $buttons, & if ( $js ) { if ( $js_format == 'raw' ) { - $html .= ''; + $html .= ''; } else { JFactory::getDocument()->addScriptDeclaration( 'jQuery(document).ready(function($){'.$js.'});' ); } diff --git a/plugins/cck_field/jform_category/tmpl/edit.php b/plugins/cck_field/jform_category/tmpl/edit.php index 53594dd62..1b62c7789 100644 --- a/plugins/cck_field/jform_category/tmpl/edit.php +++ b/plugins/cck_field/jform_category/tmpl/edit.php @@ -30,7 +30,7 @@ - diff --git a/plugins/cck_field/tabs/tmpl/edit.php b/plugins/cck_field/tabs/tmpl/edit.php index ee20181e5..307fe9e62 100644 --- a/plugins/cck_field/tabs/tmpl/edit.php +++ b/plugins/cck_field/tabs/tmpl/edit.php @@ -33,7 +33,7 @@ -