Merge branch 'dev'

qui/controls/Control.md

@@ -28,7 +28,7 @@ require(['qui/controls/Control'], function(Control)
 
 ## Ein Control einfügen
 
-mit _.inject()_ kann das Control in den DOM Baum eibgefügt werden.
+mit _.inject()_ kann das Control in den DOM Baum eingefügt werden.
 
 ```javascript
 

qui/controls/desktop/Panel.js

@@ -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, '');
@@ -279,16 +279,20 @@ define('qui/controls/desktop/Panel', [
 
             this.fireEvent('resizeBegin', [this]);
 
-            if (this.getAttribute('header') === false) {
-                this.$Header.setStyle('display', 'none');
-            } else {
-                this.$Header.setStyle('display', null);
+            if (this.$Header) {
+                if (this.getAttribute('header') === false) {
+                    this.$Header.setStyle('display', 'none');
+                } else {
+                    this.$Header.setStyle('display', null);
+                }
             }
 
-            if (this.getAttribute('footer') === false) {
-                this.$Footer.setStyle('display', 'none');
-            } else {
-                this.$Footer.setStyle('display', null);
+            if (this.$Footer) {
+                if (this.getAttribute('footer') === false) {
+                    this.$Footer.setStyle('display', 'none');
+                } else {
+                    this.$Footer.setStyle('display', null);
+                }
             }
 
             if (this.getButtonBar().count()) {
@@ -322,9 +326,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 +849,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;

qui/controls/elements/Select.js

@@ -259,6 +259,23 @@ define('qui/controls/elements/Select', [
             }
         },
 
+        /**
+         * Import input value string to the select
+         *
+         * @param {String} value
+         */
+        importValue: function (value) {
+            if (typeOf(value) !== 'string') {
+                return;
+            }
+
+            value = value.split(',');
+
+            for (var i = 0, len = value.length; i < len; i++) {
+                this.addItem(value[i]);
+            }
+        },
+
         /**
          * Refresh the display
          */

qui/controls/toolbar/Bar.js

@@ -673,12 +673,12 @@ define('qui/controls/toolbar/Bar', [
             var self = this,
                 type = typeOf(Itm);
 
-            if (!QUI.Controls.isControl(Itm)) {
+            if (type === 'element') {
+                Itm.inject(this.Tabs);
                 return this;
             }
 
-            if (type === 'element') {
-                Itm.inject(this.Tabs);
+            if (!QUI.Controls.isControl(Itm)) {
                 return this;
             }