Commit 348a1937 authored by Henning Leutz's avatar Henning Leutz 🥋

Merge branch 'dev'

parents a64b60c9 2d8956d6
......@@ -296,6 +296,11 @@ define('controls/workspace/Manager', [
* @param {Object} Column - qui/controls/desktop/Column, Parent Column
*/
appendControlToColumn: function (panelRequire, Column) {
if (!panelRequire) {
console.error('empty appendControlToColumn');
return;
}
require([panelRequire], function (Cls) {
if (QUI.Controls.isControl(Cls)) {
Column.appendChild(Cls);
......@@ -303,6 +308,11 @@ define('controls/workspace/Manager', [
}
Column.appendChild(new Cls());
}, function (err) {
console.error({
err : err,
panelRequire: panelRequire
});
});
},
......@@ -1244,8 +1254,8 @@ define('controls/workspace/Manager', [
var click = function (event) {
var Target = event.target;
if (Target.nodeName !== 'div') {
Target = Target.getParent('div');
if (!Target.hasClass('qui-controls-workspace-panelList-panel')) {
Target = Target.getParent('.qui-controls-workspace-panelList-panel');
}
self.appendControlToColumn(
......
......@@ -46,7 +46,7 @@
"quiqqer\/composer": ">=1.4.2|dev-master|dev-dev",
"quiqqer\/controls": "^1.1.1|dev-master|dev-dev",
"quiqqer\/dashboard": "1.*|dev-master|dev-dev",
"quiqqer\/qui": ">=1|dev-master|dev-dev",
"quiqqer\/qui": ">=1|dev-master|dev-dev|dev-mootools16",
"quiqqer\/qui-php": ">=0.12|dev-master|dev-dev",
"quiqqer\/smarty3": "1.*|dev-master|dev-dev",
"quiqqer\/ckeditor4": "2.*|1.*|dev-master|dev-dev",
......
......@@ -855,6 +855,14 @@ class QUI
}
}
if (self::$Locale->getCurrent() === '') {
$language = self::conf('globals', 'standardLanguage');
if (!empty($language)) {
self::$Locale->setCurrent($language);
}
}
return self::$Locale;
}
......
......@@ -829,7 +829,7 @@ class Rewrite
$Project = false;
}
if ($Project && is_object($Project)) {
if ($Project && \is_object($Project)) {
$this->project = $Project;
return $this->project;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment