diff --git a/assets/js/exercise.js b/assets/js/exercise.js deleted file mode 100644 index c0f9ac58b2..0000000000 --- a/assets/js/exercise.js +++ /dev/null @@ -1,11 +0,0 @@ -// Script to be added in the exercises tool. -import 'jsplumb'; -import 'jquery-ui-touch-punch'; -// import 'xcolor/jquery.xcolor.js'; -import 'signature_pad'; -import '../../public/main/inc/lib/javascript/epiclock/javascript/jquery.dateformat.min.js'; -import '../../public/main/inc/lib/javascript/epiclock/javascript/jquery.epiclock.js'; -import '../../public/main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.js'; -import './annotation' -import '../../public/main/inc/lib/javascript/hotspot/js/hotspot.js'; -import '../../public/main/inc/lib/javascript/d3/jquery.xcolor.js'; diff --git a/assets/js/annotation.js b/assets/js/legacy/annotation.js similarity index 100% rename from assets/js/annotation.js rename to assets/js/legacy/annotation.js diff --git a/assets/js/app.js b/assets/js/legacy/app.js similarity index 100% rename from assets/js/app.js rename to assets/js/legacy/app.js diff --git a/assets/js/document.js b/assets/js/legacy/document.js similarity index 75% rename from assets/js/document.js rename to assets/js/legacy/document.js index b933e12677..3894132d94 100644 --- a/assets/js/document.js +++ b/assets/js/legacy/document.js @@ -1,6 +1,6 @@ /** This JS will be included when loading an HTML in the Document tool */ -import translateHtml from './translatehtml.js'; +import translateHtml from './../translatehtml.js'; document.addEventListener('DOMContentLoaded', function () { translateHtml(); }); diff --git a/assets/js/legacy/exercise.js b/assets/js/legacy/exercise.js new file mode 100644 index 0000000000..357a7c792a --- /dev/null +++ b/assets/js/legacy/exercise.js @@ -0,0 +1,11 @@ +// Script to be added in the exercises tool. +import 'jsplumb'; +import 'jquery-ui-touch-punch'; +// import 'xcolor/jquery.xcolor.js'; +import 'signature_pad'; +import '../../../public/main/inc/lib/javascript/epiclock/javascript/jquery.dateformat.min.js'; +import '../../../public/main/inc/lib/javascript/epiclock/javascript/jquery.epiclock.js'; +import '../../../public/main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.js'; +import './annotation' +import '../../../public/main/inc/lib/javascript/hotspot/js/hotspot.js'; +import '../../../public/main/inc/lib/javascript/d3/jquery.xcolor.js'; diff --git a/assets/js/free-jqgrid.js b/assets/js/legacy/free-jqgrid.js similarity index 100% rename from assets/js/free-jqgrid.js rename to assets/js/legacy/free-jqgrid.js diff --git a/assets/js/lp.js b/assets/js/legacy/lp.js similarity index 100% rename from assets/js/lp.js rename to assets/js/legacy/lp.js diff --git a/assets/js/main.js b/assets/js/legacy/main.js similarity index 100% rename from assets/js/main.js rename to assets/js/legacy/main.js diff --git a/assets/js/vendor.js b/assets/js/legacy/vendor.js similarity index 91% rename from assets/js/vendor.js rename to assets/js/legacy/vendor.js index f27f06e044..6cfeeea1d1 100644 --- a/assets/js/vendor.js +++ b/assets/js/legacy/vendor.js @@ -21,8 +21,8 @@ global.textcomplete = textcomplete; require('chart.js'); require('./annotation.js'); -require('./editor.js'); -import translateHtml from './translatehtml.js'; +require('../editor.js'); +import translateHtml from '../translatehtml.js'; document.addEventListener('DOMContentLoaded', function () { translateHtml(); }); diff --git a/public/documentation/changelog.html b/public/documentation/changelog.html index e6612713ed..bb4af911c4 100644 --- a/public/documentation/changelog.html +++ b/public/documentation/changelog.html @@ -3,11 +3,12 @@ Chamilo Changelog - + + - +