Update from 1.11.x + jquery fixes

pull/2944/head
Julio Montoya 6 years ago
parent 3abd1257e6
commit 73c14d9ab3
  1. 2
      main/admin/add_users_to_usergroup.php
  2. 6
      main/admin/grade_models.php
  3. 2
      main/admin/languages.php
  4. 2
      main/admin/legal_add.php
  5. 2
      main/admin/skill_create.php
  6. 2
      main/admin/skill_edit.php
  7. 2
      main/admin/sub_language.php
  8. 2
      main/admin/user_add.php
  9. 2
      main/admin/user_edit.php
  10. 4
      main/admin/user_list.php
  11. 1
      main/template/default/javascript/editor/elfinder_standalone.html.twig
  12. 2
      main/template/default/social/skills_block.html.twig
  13. 2
      src/CoreBundle/Component/Editor/Editor.php
  14. 2
      src/PageBundle/Resources/views/base_layout.html.twig
  15. 2
      src/ThemeBundle/Resources/views/Document/create.html.twig
  16. 2
      src/ThemeBundle/Resources/views/Editor/elfinder_standalone.html.twig

@ -30,7 +30,7 @@ $tool_name = get_lang('SubscribeUsersToClass');
$htmlHeadXtra[] = ' $htmlHeadXtra[] = '
<script> <script>
$(document).ready( function() { $(function () {
$("#relation").change(function() { $("#relation").change(function() {
window.location = "add_users_to_usergroup.php?id='.$id.'" +"&relation=" + $(this).val(); window.location = "add_users_to_usergroup.php?id='.$id.'" +"&relation=" + $(this).val();
}); });

@ -204,5 +204,9 @@ switch ($action) {
$obj->display(); $obj->display();
break; break;
} }
echo '<script> $(document).ready(function(){ $("input").removeClass("form-control"); }); </script>'; echo '<script>
$(function () {
$("input").removeClass("form-control");
});
</script>';
Display::display_footer(); Display::display_footer();

@ -54,7 +54,7 @@ $msgLang = isset($_SESSION['disabled_languages']) ? 1 : 0;
$disabledLang = isset($_SESSION['disabled_languages']) ? $_SESSION['disabled_languages'] : null; $disabledLang = isset($_SESSION['disabled_languages']) ? $_SESSION['disabled_languages'] : null;
$htmlHeadXtra[] = '<script> $htmlHeadXtra[] = '<script>
$(document).ready(function() { $(function () {
var msgLang = '.$msgLang.'; var msgLang = '.$msgLang.';
var disabledLang = "'.$disabledLang.'" var disabledLang = "'.$disabledLang.'"

@ -187,7 +187,7 @@ $interbreadcrumb[] = ['url' => 'index.php', 'name' => get_lang('PlatformAdmin')]
// the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
$htmlHeadXtra[] = '<script> $htmlHeadXtra[] = '<script>
$(document).ready(function(){ $(function () {
'.$jqueryReady.' '.$jqueryReady.'
}); });
</script>'; </script>';

@ -47,7 +47,7 @@ $jquery_ready_content = $returnParams['jquery_ready_content'];
// the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
if (!empty($jquery_ready_content)) { if (!empty($jquery_ready_content)) {
$htmlHeadXtra[] = '<script> $htmlHeadXtra[] = '<script>
$(document).ready(function(){ $(function () {
'.$jquery_ready_content.' '.$jquery_ready_content.'
}); });
</script>'; </script>';

@ -62,7 +62,7 @@ $jquery_ready_content = $returnParams['jquery_ready_content'];
// in the $(document).ready javascript function // in the $(document).ready javascript function
if (!empty($jquery_ready_content)) { if (!empty($jquery_ready_content)) {
$htmlHeadXtra[] = '<script> $htmlHeadXtra[] = '<script>
$(document).ready(function(){ $(function () {
'.$jquery_ready_content.' '.$jquery_ready_content.'
}); });
</script>'; </script>';

@ -12,7 +12,7 @@ $this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script(); api_protect_admin_script();
$htmlHeadXtra[] = '<script> $htmlHeadXtra[] = '<script>
$(document).ready(function() { $(function () {
$(".save").click(function() { $(".save").click(function() {
var button_name=$(this).attr("name"); var button_name=$(this).attr("name");
var button_array=button_name.split("|"); var button_array=button_name.split("|");

@ -324,7 +324,7 @@ $jquery_ready_content = $returnParams['jquery_ready_content'];
// the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
$htmlHeadXtra[] = '<script> $htmlHeadXtra[] = '<script>
$(document).ready(function(){ $(function () {
'.$jquery_ready_content.' '.$jquery_ready_content.'
}); });
</script>'; </script>';

@ -325,7 +325,7 @@ if ($allowEmailTemplate) {
// the $jqueryReadyContent variable collects all functions that will be load in the // the $jqueryReadyContent variable collects all functions that will be load in the
$htmlHeadXtra[] = '<script> $htmlHeadXtra[] = '<script>
$(document).ready(function(){ $(function () {
'.$jqueryReadyContent.' '.$jqueryReadyContent.'
}); });
</script>'; </script>';

@ -159,7 +159,7 @@ function display_advanced_search_form () {
} }
} }
$(document).ready(function() { $(function () {
var select_val = $("#input_select_extra_data").val(); var select_val = $("#input_select_extra_data").val();
if ( document.getElementById(\'extra_data_text\')) { if ( document.getElementById(\'extra_data_text\')) {
if (select_val != 0) { if (select_val != 0) {
@ -1097,7 +1097,7 @@ $data = $extraField->addElements($form, 0, [], true, false, $variablesToShow);
$htmlHeadXtra[] = ' $htmlHeadXtra[] = '
<script> <script>
$(document).ready(function() { $(function () {
'.$data['jquery_ready_content'].' '.$data['jquery_ready_content'].'
}) })
</script> </script>

@ -0,0 +1 @@
{% extends '@ChamiloTheme/Editor/elfinder_standalone.html.twig' %}

@ -1,7 +1,7 @@
{% import '@ChamiloTheme/Macros/box.html.twig' as macro %} {% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
<script> <script>
jQuery(document).ready(function(){ $(function () {
jQuery('.scrollbar-inner').scrollbar(); jQuery('.scrollbar-inner').scrollbar();
}); });
</script> </script>

@ -157,7 +157,7 @@ class Editor
*/ */
public function getEditorStandAloneTemplate() public function getEditorStandAloneTemplate()
{ {
return 'elfinder_standalone.html.twig'; return 'javascript/editor/elfinder_standalone.html.twig';
} }
/** /**

@ -7,7 +7,7 @@
{% if sonata_page.isEditor and sonata_page.isInlineEditionOn %} {% if sonata_page.isEditor and sonata_page.isInlineEditionOn %}
<!-- CMS specific variables --> <!-- CMS specific variables -->
<script> <script>
jQuery(document).ready(function() { $(function () {
Sonata.Page.init({ Sonata.Page.init({
url: { url: {
block_save_position: '{{ sonata_admin.objectUrl('sonata.page.admin.page', 'edit', page) }}', block_save_position: '{{ sonata_admin.objectUrl('sonata.page.admin.page', 'edit', page) }}',

@ -8,7 +8,7 @@
var $addTagLink = $('<a href="#" class="btn btn-success add_tag_link">Add</a>'); var $addTagLink = $('<a href="#" class="btn btn-success add_tag_link">Add</a>');
var $newLinkLi = $('<li></li>').append($addTagLink); var $newLinkLi = $('<li></li>').append($addTagLink);
jQuery(document).ready(function () { $(function () {
// Get the ul that holds the collection of tags // Get the ul that holds the collection of tags
$collectionHolder = $('ul.tags'); $collectionHolder = $('ul.tags');

@ -19,7 +19,7 @@
return (match && match.length > 1) ? match[1] : ''; return (match && match.length > 1) ? match[1] : '';
} }
$().ready(function() { $(function () {
var winheight = document.documentElement.clientHeight; var winheight = document.documentElement.clientHeight;
var funcNum = getUrlParam('CKEditorFuncNum'); var funcNum = getUrlParam('CKEditorFuncNum');
var elf = $('#elfinder').elfinder({ var elf = $('#elfinder').elfinder({

Loading…
Cancel
Save