Merge branch 'dev'

qui/classes/DOM.js

@@ -53,21 +53,6 @@ define('qui/classes/DOM', function () {
             this.fireEvent('init', [this]);
         },
 
-        /**
-         * If this.TYPE is set, this.Type will be return
-         *
-         * @method qui/classes/DOM#$family
-         * @return {String} Type of the Object
-         * @ignore
-         */
-        $family: function () {
-            if (typeof this.Type !== 'undefined') {
-                return this.Type;
-            }
-
-            return typeOf(this);
-        },
-
         /**
          * Get the Unique ID from the Object
          *
@@ -89,6 +74,10 @@ define('qui/classes/DOM', function () {
          * @return {String} The type of the object
          */
         getType: function () {
+            if (typeof this.Type !== 'undefined') {
+                return this.Type;
+            }
+
             return typeOf(this);
         },
 

qui/classes/QUI.js

@@ -13,6 +13,45 @@
  * @event onError : if there is an error
  * @event onResize : globale window resize event
  */
+
+// workaround for typeof() function because of mootools 1.4 / 1.5 to 1.6
+window.typeOf = function (i) {
+    "use strict";
+
+    if (i === null || i === undefined) {
+        return "null";
+    }
+
+    if (typeof i.getType === 'function') {
+        return i.getType();
+    }
+
+    if (typeof i.$family === 'function') {
+        return i.$family();
+    }
+
+    if (i.nodeName) {
+        if (i.nodeType === 1) {
+            return "element";
+        }
+
+        if (i.nodeType === 3) {
+            return (/\S/).test(i.nodeValue) ? "textnode" : "whitespace";
+        }
+    } else {
+        if (typeof i.length == "number") {
+            if (i.callee) {
+                return "arguments";
+            }
+            if ("item" in i) {
+                return "collection";
+            }
+        }
+    }
+
+    return typeof i;
+};
+
 define('qui/classes/QUI', [
 
     'require',

qui/classes/utils/DragDrop.js

@@ -5,8 +5,6 @@
  * @module qui/classes/utils/DragDrop
  * @author www.pcsg.de (Henning Leutz)
  *
- * @require qui/classes/DOM
- *
  * @event onStart [ this, Dragable, event ]
  * @event onStop [ this, Dragable ]
  * @event onDrag [ this, Element, Droppable, event ]
@@ -234,7 +232,8 @@ define('qui/classes/utils/DragDrop', ['qui/classes/DOM'], function (DOM) {
                 limit: limit
 
             }).start({
-                page: {
+                target: Elm,
+                page  : {
                     x: mx,
                     y: my
                 }

qui/controls/Control.js

@@ -472,13 +472,13 @@ define('qui/controls/Control', [
             var Sheet = new Element('div', {
                 'class': 'qui-sheet qui-box',
                 html   : '<div class="qui-sheet-content box"></div>' +
-                '<div class="qui-sheet-buttons box">' +
-                '<div class="qui-sheet-buttons-back qui-button btn-white">' +
-                '<span>' +
-                Locale.get('qui/controls/Control', 'btn.back') +
-                '</span>' +
-                '</div>' +
-                '</div>',
+                    '<div class="qui-sheet-buttons box">' +
+                    '<div class="qui-sheet-buttons-back qui-button btn-white">' +
+                    '<span>' +
+                    Locale.get('qui/controls/Control', 'btn.back') +
+                    '</span>' +
+                    '</div>' +
+                    '</div>',
                 styles : {
                     display: 'none',
                     left   : -20,