merge

client/src/app.js

@@ -691,6 +691,14 @@ class App {
             if (!className) {
                 const module = this.metadata.get(`scopes.${name}.module`);
 
+                if (!/^[A-Za-z0-9]+$/.test(name)) {
+                    console.error(`Bad controller name ${name}.`);
+
+                    this.baseController.error404();
+
+                    return;
+                }
+
                 className = Utils.composeClassName(module, name, 'controllers');
             }
 

client/src/loader.js

@@ -763,7 +763,7 @@
                     }
 
                     console.warn(`Could not obtain ${id}.`);
-                });
+                }, errorCallback);
 
                 return;
             }
@@ -792,9 +792,10 @@
          * @private
          * @param {string} url
          * @param {function} callback
+         * @param {function|null} [errorCallback]
          * @return {Promise}
          */
-        _addScript(url, callback) {
+        _addScript(url, callback, errorCallback = null) {
             const script = document.createElement('script');
 
             script.src = url;
@@ -802,6 +803,10 @@
 
             script.addEventListener('error', e => {
                 console.error(`Could not load script '${url}'.`, e);
+
+                if (errorCallback) {
+                    errorCallback();
+                }
             });
 
             document.head.appendChild(script);

client/src/ui/app-init.js

@@ -112,8 +112,14 @@ function uiAppInit() {
 
         const $dashletBody = $(target).closest('.dashlet-body');
 
-        if ($dashletBody.length) {
-            const $body = $dashletBody;
+        const fixPosition = e.target.parentElement.classList.contains('fix-position');
+
+        if ($dashletBody.length || fixPosition) {
+            let $body = $dashletBody;
+
+            if (fixPosition) {
+                $body = $(window);
+            }
 
             $(target).removeClass('dropup');
 
@@ -152,10 +158,10 @@ function uiAppInit() {
                 right: 'auto',
             });
 
-            return;
+            //return;
         }
 
-        if (e.target.parentElement.classList.contains('fix-overflow')) {
+        /*if (e.target.parentElement.classList.contains('fix-overflow')) {
             $(target).removeClass('dropup');
 
             const isRight = e.target.classList.contains('pull-right');
@@ -187,7 +193,7 @@ function uiAppInit() {
                 left: left,
                 right: 'auto',
             });
-        }
+        }*/
     });
 }