Internal: Fix js libs: ckeditor, daterangepicker

assets/css/app.scss

@@ -13,16 +13,12 @@
 @import "~bootstrap/scss/bootstrap";
 //@import "~@coreui/coreui/scss/coreui";
 @import "~@fortawesome/fontawesome-free/css/all.css";
-//@import '~chosen-js/chosen.css';
 @import '~cropper/dist/cropper.css';
 @import '~flag-icon-css/sass/flag-icon.scss';
 @import "~fullcalendar/dist/fullcalendar.css";
-//@import "~pace-js-amd-fix/themes/blue/pace-theme-minimal.css";
-//
 @import "~select2/dist/css/select2.css";
-//@import "~bootstrap-daterangepicker/daterangepicker.css";
+@import "~bootstrap-daterangepicker/daterangepicker.css";
 @import "~bootstrap-select/sass/bootstrap-select";
-//
 //@import '~pretty-checkbox/src/pretty-checkbox.scss';
 //@import '~jquery-ui/themes/base/all.css';
 @import "scss/index";

assets/js/app.js

@@ -11,11 +11,14 @@ window.$ = $;
 Routing.setRoutingData(routes);
 
 const locale = document.querySelector('html').lang;
+const moment = require('moment');
+global.moment = moment;
 
+import('bootstrap-daterangepicker');
 import('bootstrap');
 import('webpack-jquery-ui');
 import('webpack-jquery-ui/css');
-
+require('select2');
 import('./vendor');
 import('./main');
 require('webpack-jquery-ui');

assets/js/vendor.js

@@ -1,8 +1,3 @@
-const moment = import('moment');
-global.moment = moment;
-
-// JS is equivalent to the normal 'bootstrap' package
-// no need to set this to a variable, just require it
 
 //require('@coreui/coreui/dist/js/coreui.min.js');
 //require('chosen-js');
@@ -10,17 +5,16 @@ require('mediaelement');
 // require('pace-js-amd-fix');
 require('multiselect-two-sides');
 require('@fortawesome/fontawesome-free');
-
 require('qtip2');
 require('image-map-resizer/js/imageMapResizer.js');
 require('cropper');
 require('jquery-ui-timepicker-addon/dist/jquery-ui-timepicker-addon');
 require('blueimp-file-upload');
-require('select2');
+import('select2');
 require('timeago');
 require('sweetalert2');
 require('bootstrap-select');
-require('bootstrap-daterangepicker');
+import('bootstrap-daterangepicker');
 require('fullcalendar/dist/fullcalendar.js');
 require('fullcalendar/dist/gcal.js');
 require('fullcalendar/dist/locale-all.js');
@@ -38,10 +32,3 @@ global.textcomplete = textcomplete;
 
 require('chart.js');
 require('./annotation.js');
-
-// require('video.js');
-
-// doesn't work with webpack added directly in /public/libs folder
-/*
-require('ckeditor');
-*/

composer.json

@@ -173,7 +173,7 @@
         "symfony/profiler-pack": "*",
         "symfony/test-pack": "*",
         "symplify/easy-coding-standard": "^8.0",
-        "vimeo/psalm": "^3.10"
+        "vimeo/psalm": "^3.14"
     },
     "scripts": {
         "analyse": [
@@ -185,8 +185,7 @@
             "assets:install %PUBLIC_DIR%": "symfony-cmd"
         },
         "post-install-cmd": [
-            "@auto-scripts",
-            "@install-ckeditor"
+            "@auto-scripts"
         ],
         "post-update-cmd": [
             "@auto-scripts"

package.json

@@ -52,6 +52,7 @@
     "pace-js-amd-fix": "^1.0.5",
     "perfect-scrollbar": "^1.4",
     "portal-vue": "^2.1.7",
+    "postcss-prefix-selector": "^1.7.2",
     "pretty-checkbox": "^3.0.3",
     "pwstrength-bootstrap": "^3.0.5",
     "qtip2": "^3.0.3",

public/main/inc/lib/pear/HTML/QuickForm/textarea.php

@@ -215,7 +215,7 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
             case FormValidator::LAYOUT_HORIZONTAL:
                 return '
                 <div class="row mb-3 {error_class}">
-                    <label {label-for} class="col-sm-'.$size[0].' col-form-label" >
+                    <label class="col-sm-'.$size[0].' col-form-label" >
                         <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
                         {label}
                     </label>

src/CoreBundle/Component/Editor/CkEditor/CkEditor.php

@@ -21,7 +21,7 @@ class CkEditor extends Editor
      */
     public function createHtml($value)
     {
-        $html = '<textarea id="'.$this->getTextareaId().'" name="'.$this->getName().'" class="ckeditor">
+        $html = '<textarea id="'.$this->getTextareaId().'" name="'.$this->getName().'" >
                  '.$value.'
                  </textarea>';
         $html .= $this->editorReplace();
@@ -70,9 +70,12 @@ class CkEditor extends Editor
         $javascript = $this->toJavascript($config);
 
         return "<script>
+            $(function () {
                CKEDITOR.replace('".$this->getTextareaId()."',
                    $javascript
                );
+           });
+
            </script>";
     }
 

src/CoreBundle/Resources/views/Layout/head.html.twig

@@ -38,10 +38,11 @@
 {% endblock %}
 
 {# app.js is generated using the file webpack.config.js and using yarn read /assets/README.md for more info #}
+
+<script src="{{ url('home') ~ 'build/libs/ckeditor/ckeditor.js' }}"></script>
 <script src="{{ url('home') ~ 'build/runtime.js' }}"></script>
 <script src="{{ url('home') ~ 'build/app.js' }}"></script>
 {#{{ encore_entry_script_tags('app') }}#}
-<script src="{{ url('home') ~ 'build/ckeditor/ckeditor.js' }}"></script>
 {# Add third party js libraries that can't be loaded using webpack #}
 {#<script src="{{ asset('libs/readmore-js/readmore.js') }}"></script>#}
 <script src="{{ url('home') ~ 'build/libs/js-cookie/src/js.cookie.js' }}"></script>

webpack.config.js

@@ -1,5 +1,5 @@
 var Encore = require('@symfony/webpack-encore');
-
+const prefixer = require('postcss-prefix-selector')
 const CopyPlugin = require('copy-webpack-plugin');
 //const FileManagerPlugin = require('filemanager-webpack-plugin');
 //var dotEnv = require('dotenv');
@@ -46,6 +46,11 @@ Encore
     .enableSassLoader()
     .enableVueLoader(function (options) {}, {runtimeCompilerBuild: false})
     .autoProvidejQuery()
+    /*.enablePostCssLoader(function (options) {
+        options.config = {
+            path: 'postcss.config.js'
+        }
+    })*/
     .copyFiles([
         {
             from: './node_modules/multiselect-two-sides/dist/js',
@@ -67,11 +72,11 @@ Encore
             pattern: /(js.cookie.js)$/,
             to: 'libs/js-cookie/src/js.cookie.js'
         },
-        {from: './node_modules/ckeditor/', to: 'ckeditor/[path][name].[ext]', pattern: /\.(js|css)$/, includeSubdirectories: false},
-        {from: './node_modules/ckeditor/adapters', to: 'ckeditor/adapters/[path][name].[ext]'},
-        {from: './node_modules/ckeditor/lang', to: 'ckeditor/lang/[path][name].[ext]'},
-        {from: './node_modules/ckeditor/plugins', to: 'ckeditor/plugins/[path][name].[ext]'},
-        {from: './node_modules/ckeditor/skins', to: 'ckeditor/skins/[path][name].[ext]'},
+        {from: './node_modules/ckeditor/', to: 'libs/ckeditor/[path][name].[ext]', pattern: /\.(js|css)$/, includeSubdirectories: false},
+        {from: './node_modules/ckeditor/adapters', to: 'libs/ckeditor/adapters/[path][name].[ext]'},
+        {from: './node_modules/ckeditor/lang', to: 'libs/ckeditor/lang/[path][name].[ext]'},
+        {from: './node_modules/ckeditor/plugins', to: 'libs/ckeditor/plugins/[path][name].[ext]'},
+        {from: './node_modules/ckeditor/skins', to: 'libs/ckeditor/skins/[path][name].[ext]'},
         /*,
         {
             from: './node_modules/mathjax/',
@@ -128,6 +133,7 @@ Encore.addPlugin(new CopyPlugin({
     }
 ));
 
+
 // Encore.addPlugin(new CopyPlugin([{
 //     from: 'assets/css/themes/' + theme + '/images',
 //     to: 'css/themes/' + theme + '/images'

yarn.lock

@@ -4639,11 +4639,6 @@ chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chosen-js@^1.8.7:
-  version "1.8.7"
-  resolved "https://registry.yarnpkg.com/chosen-js/-/chosen-js-1.8.7.tgz#9bfa5597f5081d602ff4ae904af9aef33265bb1d"
-  integrity sha512-eVdrZJ2U5ISdObkgsi0od5vIJdLwq1P1Xa/Vj/mgxkMZf14DlgobfB6nrlFi3kW4kkvKLsKk4NDqZj1MU1DCpw==
-
 chownr@^1.1.1, chownr@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -11538,6 +11533,13 @@ postcss-ordered-values@^4.1.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-prefix-selector@^1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/postcss-prefix-selector/-/postcss-prefix-selector-1.7.2.tgz#3adeed903985734298f19d8f5e0b657f9d90d43c"
+  integrity sha512-ddmzjWNmGs7E/nyolJ021/Gk6oBLRQLyyXKGV4Mu+Y0gquo+XlXSDP0/Y2J8C/cad/GLyftf2H0XtuDFQZxN3w==
+  dependencies:
+    postcss "^7.0.0"
+
 postcss-reduce-initial@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df"