Minor - update docs, comment readmore js (not working with jquery3)

assets/js/app.js

@@ -1,13 +1,15 @@
+// Load symfony routes in order to use it in a js
 const routes = require('../../public/js/fos_js_routes.json');
 import Routing from '../../vendor/friendsofsymfony/jsrouting-bundle/Resources/public/js/router.min.js';
+Routing.setRoutingData(routes);
+
 import 'image-map-resizer';
 import 'jquery.scrollbar';
 import 'jquery-ui/ui/widgets/datepicker';
 import 'jquery-ui/ui/widgets/tooltip';
 import 'chosen-js';
 
-Routing.setRoutingData(routes);
+// @todo rework url naming
-
 var homePublicUrl = Routing.generate('home') + 'public/';
 var legacyIndex = Routing.generate('legacy_index');
 var mainUrl = Routing.generate('legacy_main', {'name' : '/'});
@@ -28,9 +30,21 @@ var connect_lang = 'ChatConnected';
 var disconnect_lang = 'ChatDisconnected';
 
 $(function() {
-
+    var isInCourse = $("body").data("in-course");
-    addMainEvent(window, 'unload', courseLogout ,false);
+    if (isInCourse == true) {
-
+        var courseCode = $("body").data("course-code");
+        var logOutUrl = webAjax + 'course.ajax.php?a=course_logout&cidReq=' + courseCode;
+        function courseLogout() {
+            $.ajax({
+                async: false,
+                url: logOutUrl,
+                success: function (data) {
+                    return 1;
+                }
+            });
+        }
+        addMainEvent(window, 'unload', courseLogout ,false);
+    }
     $("#open-view-list").click(function(){
         $("#student-list-work").fadeIn(300);
     });
@@ -308,14 +322,14 @@ $(function() {
 
     var more = 'see more';
     var close = 'close';
-
+    // readmore dont work with jquery3
-    $('.list-teachers').readmore({
+    // $('.list-teachers').readmore({
-        speed: 75,
+    //     speed: 75,
-        moreLink: '<a href="#">' + more + '</a>',
+    //     moreLink: '<a href="#">' + more + '</a>',
-        lessLink: '<a href="#">' + close + '</a>',
+    //     lessLink: '<a href="#">' + close + '</a>',
-        collapsedHeight: 35,
+    //     collapsedHeight: 35,
-        blockCSS: 'display: block; width: 100%;'
+    //     blockCSS: 'display: block; width: 100%;'
-    });
+    // });
 
     $('.star-rating li a').on('click', function(event) {
         var id = $(this).parents('ul').attr('id');

assets/js/vendor.js

@@ -30,15 +30,14 @@ require('bootstrap-select/dist/css/bootstrap-select.css');
 require('flag-icon-css/css/flag-icon.css');
 require("bootstrap-daterangepicker");
 require("bootstrap-daterangepicker/daterangepicker.scss");
-
+//require("readmore-js");
 
 // doesn't work with webpack added directly in /public/libs folder
 /*
 require("fullcalendar");
 require("pwstrength-bootstrap");
-require ("readmore-js");
+
 require("js-cookie");
 require("jquery-ui-timepicker-addon");
-//require("bootstrap-daterangepicker");
 require("ckeditor");
 */

src/ThemeBundle/Resources/views/Layout/legacy_js.html.twig

@@ -0,0 +1,5 @@
+{# Files that can't be loaded using webpack #}
+
+<script src="{{ asset('libs/ckeditor/ckeditor.js') }}"></script>
+{#<script src="{{ asset('libs/readmore-js/readmore.js') }}"></script>#}
+<script src="{{ asset('libs/js-cookie/src/js.cookie.js') }}"></script>

webpack.config.js

@@ -14,11 +14,11 @@ Encore
          //resolveUrlLoader: false
      })
     .enableLessLoader()
-    .autoProvidejQuery()
+    .autoProvidejQuery() // not needed because in window.jQuery we set the $
-    // read main.js     -> output as public/build/vendor.js
+    // Reads the "assets/js/vendor.js" file and it will generate the file public/build/vendor.js file
     .addEntry('vendor', './assets/js/vendor.js')
     .addEntry('app', './assets/js/app.js')
-    // read main.scss -> output as web/build/css/base.css
+    // Reads app.scss -> output as web/build/css/base.css
     .addStyleEntry('css/app', './assets/css/app.scss')
     .addStyleEntry('css/editor', './assets/css/editor.css')
     .addStyleEntry('css/print', './assets/css/print.css')
@@ -66,8 +66,7 @@ var themes = [
 
 // Add Chamilo themes
 themes.forEach(function (theme) {
-    Encore
+    Encore.addStyleEntry('css/themes/'+theme+'/default', './assets/css/themes/'+theme+'/default.css')
-        .addStyleEntry('css/themes/'+theme+'/default', './assets/css/themes/'+theme+'/default.css')
     ;
 
     // Copy images from themes into public/build