Skip to content
Code-Schnipsel Gruppen Projekte
Commit cde3fa63 erstellt von Patrick Müller's avatar Patrick Müller
Dateien durchsuchen

Merge branch 'dev'

Übergeordnete be519da5 008180e3
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
1 Merge Request!63Update 'next-2.x' with latest changes from 'main'
......@@ -86,23 +86,23 @@ define('qui/controls/desktop/Panel', [
this.Loader = new Loader();
this.$Elm = null;
this.$Header = null;
this.$Title = null;
this.$Footer = null;
this.$Elm = null;
this.$Header = null;
this.$Title = null;
this.$Footer = null;
this.$Content = null;
this.$Buttons = null;
this.$Categories = null;
this.$Breadcrumb = null;
this.$Buttons = null;
this.$Categories = null;
this.$Breadcrumb = null;
this.$ContextMenu = null;
this.$CloseButton = null;
this.$ButtonBar = null;
this.$CategoryBar = null;
this.$ButtonBar = null;
this.$CategoryBar = null;
this.$BreadcrumbBar = null;
this.$ActiveCat = null;
this.$Dropable = null;
this.$ActiveCat = null;
this.$Dropable = null;
this.addEvents({
onDestroy : this.$onDestroy,
......@@ -154,18 +154,18 @@ define('qui/controls/desktop/Panel', [
},
html: '<div class="qui-panel-header box"></div>' +
'<div class="qui-panel-buttons box"></div>' +
'<div class="qui-panel-categories box"></div>' +
'<div class="qui-panel-content box"></div>' +
'<div class="qui-panel-footer box"></div>'
'<div class="qui-panel-buttons box"></div>' +
'<div class="qui-panel-categories box"></div>' +
'<div class="qui-panel-content box"></div>' +
'<div class="qui-panel-footer box"></div>'
});
this.Loader.inject(this.$Elm);
this.$Header = this.$Elm.getElement('.qui-panel-header');
this.$Footer = this.$Elm.getElement('.qui-panel-footer');
this.$Content = this.$Elm.getElement('.qui-panel-content');
this.$Buttons = this.$Elm.getElement('.qui-panel-buttons');
this.$Header = this.$Elm.getElement('.qui-panel-header');
this.$Footer = this.$Elm.getElement('.qui-panel-footer');
this.$Content = this.$Elm.getElement('.qui-panel-content');
this.$Buttons = this.$Elm.getElement('.qui-panel-buttons');
this.$Categories = this.$Elm.getElement('.qui-panel-categories');
if (this.getAttribute('breadcrumb')) {
......@@ -248,8 +248,8 @@ define('qui/controls/desktop/Panel', [
var path = this.getAttribute('icon');
if (Utils.isFontAwesomeClass(path)) {
var css = this.$Icon.className;
var FA_RX = new RegExp('\\bfa-\\S+', 'g');
var css = this.$Icon.className;
var FA_RX = new RegExp('\\bfa-\\S+', 'g');
var ICON_RX = new RegExp('\\bicon-\\S+', 'g');
css = css.replace(ICON_RX, '');
......@@ -322,9 +322,9 @@ define('qui/controls/desktop/Panel', [
}
content_height = content_height -
buttonsSize.y - 2 -
this.$Footer.getSize().y - 1 -
this.$Header.getSize().y;
buttonsSize.y - 2 -
this.$Footer.getSize().y - 1 -
this.$Header.getSize().y;
if (this.$Breadcrumb) {
content_height = content_height - this.$Breadcrumb.getSize().y;
......@@ -845,7 +845,11 @@ define('qui/controls/desktop/Panel', [
if (!this.$BreadcrumbBar) {
this.$BreadcrumbBar = new BreadcrumbBar({
name: 'panel-breadcrumb-' + this.getId()
}).inject(this.$Breadcrumb);
});
if (this.$Breadcrumb) {
this.$BreadcrumbBar.inject(this.$Breadcrumb);
}
}
return this.$BreadcrumbBar;
......
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren