Explorar el Código

Include select2 files in page header #1941

Angel Fernando Quiroz Campos hace 7 años
padre
commit
6a7895eea8

+ 0 - 12
main/admin/skills_wheel.php

@@ -16,18 +16,6 @@ if (api_get_setting('allow_skills_tool') != 'true') {
     api_not_allowed();
 }
 
-$htmlHeadXtra[] = api_get_asset('select2/dist/js/select2.min.js');
-
-$iso = api_get_language_isocode(api_get_interface_language());
-$languageCondition = '';
-
-if (file_exists(api_get_path(SYS_PATH)."web/assets/select2/dist/js/i18n/$iso.js")) {
-    $htmlHeadXtra[]= api_get_asset("select2/dist/js/i18n/$iso.js");
-//    $languageCondition = "language: '$iso',";
-}
-
-$htmlHeadXtra[] = api_get_css(api_get_path(WEB_PATH).'web/assets/select2/dist/css/select2.min.css');
-
 //Adds the JS needed to use the jqgrid
 $htmlHeadXtra[] = api_get_js('d3/d3.v3.5.4.min.js');
 $htmlHeadXtra[] = api_get_js('d3/colorbrewer.js');

+ 2 - 12
main/inc/lib/formvalidator/Element/SelectAjax.php

@@ -20,17 +20,7 @@ class SelectAjax extends HTML_QuickForm_select
      */
     public function toHtml()
     {
-        $html = api_get_asset('select2/dist/js/select2.min.js');
-
         $iso = api_get_language_isocode(api_get_interface_language());
-        $languageCondition = '';
-
-        if (file_exists(api_get_path(SYS_PATH)."web/assets/select2/dist/js/i18n/$iso.js")) {
-            $html .= api_get_asset("select2/dist/js/i18n/$iso.js");
-            $languageCondition = "language: '$iso',";
-        }
-
-        $html .= api_get_css(api_get_path(WEB_PATH).'web/assets/select2/dist/css/select2.min.css');
 
         $formatResult = $this->getAttribute('formatResult');
 
@@ -85,11 +75,11 @@ class SelectAjax extends HTML_QuickForm_select
         $max = $this->getAttribute('maximumSelectionLength');
         $max = !empty($max) ? "maximumSelectionLength: $max, " : '';
 
-        $html .= <<<JS
+        $html = <<<JS
             <script>
                 $(function(){
                     $('#{$this->getAttribute('id')}').select2({
-                        $languageCondition
+                        language: '$iso',
                         placeholder: '$plHolder',
                         allowClear: true,
                         width: '$width',

+ 5 - 2
main/inc/lib/template.lib.php

@@ -588,7 +588,8 @@ class Template
             'bootstrap/dist/css/bootstrap.min.css',
             'jquery.scrollbar/jquery.scrollbar.css',
             'bootstrap-daterangepicker/daterangepicker.css',
-            'bootstrap-select/dist/css/bootstrap-select.min.css'
+            'bootstrap-select/dist/css/bootstrap-select.min.css',
+            'select2/dist/css/select2.min.css'
         ];
 
         foreach ($bowerCSSFiles as $file) {
@@ -746,7 +747,9 @@ class Template
             'jquery.scrollbar/jquery.scrollbar.min.js',
             'readmore-js/readmore.min.js',
             'bootstrap-select/dist/js/bootstrap-select.min.js',
-            $selectLink
+            $selectLink,
+            'select2/dist/js/select2.min.js',
+            "select2/dist/js/i18n/$isoCode.js"
         ];
         if (CHAMILO_LOAD_WYSIWYG == true) {
             $bowerJsFiles[] = 'ckeditor/ckeditor.js';