@qooxdoo/framework 7.0.0-beta.6 → 7.0.0

package/source/class/qx/test/ui/layout/Grid.js

@@ -16,15 +16,11 @@
 
 ************************************************************************ */
 
-qx.Class.define("qx.test.ui.layout.Grid",
-{
-  extend : qx.dev.unit.TestCase,
+qx.Class.define("qx.test.ui.layout.Grid", {
+  extend: qx.dev.unit.TestCase,
 
-  members :
-  {
-
-    setUp : function()
-    {
+  members: {
+    setUp() {
       this._gridWidget = new qx.test.ui.layout.LayoutItem(100, 50);
       this._gridLayout = new qx.ui.layout.Grid();
       this._gridWidget.setLayout(this._gridLayout);
@@ -33,30 +29,23 @@ qx.Class.define("qx.test.ui.layout.Grid",
       this.root.add(this._gridWidget);
     },
 
-
-    tearDown : function()
-    {
+    tearDown() {
       this.root.dispose();
       this._gridWidget.dispose();
       this._gridLayout.dispose();
     },
 
-
-    flush : function() {
+    flush() {
       qx.ui.core.queue.Manager.flush();
     },
 
-
-    assertSize : function(layoutItem, width, height)
-    {
+    assertSize(layoutItem, width, height) {
       this.flush();
       this.assertEquals(width, layoutItem.bounds.width);
       this.assertEquals(height, layoutItem.bounds.height);
     },
 
-
-    _getFixedWidget : function()
-    {
+    _getFixedWidget() {
       var widget = new qx.test.ui.layout.LayoutItem(200, 100);
       widget.set({
         allowGrowX: false,
@@ -64,22 +53,22 @@ qx.Class.define("qx.test.ui.layout.Grid",
         allowGrowY: false,
         allowShrinkY: false
       });
+
       return widget;
     },
 
-
-    testRowSpanWithoutFlex : function() {
+    testRowSpanWithoutFlex() {
       // test with spacing
       this._gridLayout.setSpacingY(6);
 
       var w1 = new qx.test.ui.layout.LayoutItem(100, 100);
-      this._gridWidget.add(w1, {row: 0, column: 1});
+      this._gridWidget.add(w1, { row: 0, column: 1 });
 
       var w2 = new qx.test.ui.layout.LayoutItem(100, 100);
-      this._gridWidget.add(w2, {row: 1, column: 1});
+      this._gridWidget.add(w2, { row: 1, column: 1 });
 
       var w3 = new qx.test.ui.layout.LayoutItem(100, 300);
-      this._gridWidget.add(w3, {row: 0, column: 0, rowSpan: 2});
+      this._gridWidget.add(w3, { row: 0, column: 0, rowSpan: 2 });
 
       this.flush();
       this.assertEquals(300, this._gridWidget.bounds.height);
@@ -89,51 +78,49 @@ qx.Class.define("qx.test.ui.layout.Grid",
       w3.dispose();
     },
 
-    testColSpanWithoutFlexAllowGrowTrue : function() {
-      
+    testColSpanWithoutFlexAllowGrowTrue() {
       this._gridLayout.setSpacingX(6);
       this._gridLayout.setAllowGrowSpannedCellWidth(true);
 
       var w1 = new qx.test.ui.layout.LayoutItem(100, 100);
-      this._gridWidget.add(w1, {row: 1, column: 0});
+      this._gridWidget.add(w1, { row: 1, column: 0 });
 
       var w2 = new qx.test.ui.layout.LayoutItem(100, 100);
-      this._gridWidget.add(w2, {row: 1, column: 1});
-      
+      this._gridWidget.add(w2, { row: 1, column: 1 });
+
       this.flush();
       this.assertEquals(206, this._gridWidget.bounds.width);
-      
+
       var w3 = new qx.test.ui.layout.LayoutItem(300, 100);
-      this._gridWidget.add(w3, {row: 0, column: 0, colSpan: 2});
+      this._gridWidget.add(w3, { row: 0, column: 0, colSpan: 2 });
 
       this.flush();
       this.assertEquals(300, this._gridWidget.bounds.width);
 
       this._gridLayout.resetAllowGrowSpannedCellWidth();
-      
+
       w1.dispose();
       w2.dispose();
       w3.dispose();
     },
 
-    testColSpanWithoutFlexAllowGrowFalse : function() {
-      
+    testColSpanWithoutFlexAllowGrowFalse() {
       this._gridLayout.setSpacingX(6);
       this._gridLayout.setAllowGrowSpannedCellWidth(false);
 
       var w1 = new qx.test.ui.layout.LayoutItem(100, 100);
-      this._gridWidget.add(w1, {row: 1, column: 0});
+      this._gridWidget.add(w1, { row: 1, column: 0 });
 
       var w2 = new qx.test.ui.layout.LayoutItem(100, 100);
-      this._gridWidget.add(w2, {row: 1, column: 1});
-      
+      this._gridWidget.add(w2, { row: 1, column: 1 });
+
       this.flush();
       this.assertEquals(206, this._gridWidget.bounds.width);
-      
+
       var w3 = new qx.test.ui.layout.LayoutItem(300, 100);
       w3.setAllowShrinkX(true);
-      
-      this._gridWidget.add(w3, {row: 0, column: 0, colSpan: 2});
+
+      this._gridWidget.add(w3, { row: 0, column: 0, colSpan: 2 });
 
       this.flush();
       this.assertEquals(206, this._gridWidget.bounds.width);
@@ -145,24 +132,23 @@ qx.Class.define("qx.test.ui.layout.Grid",
       w3.dispose();
     },
 
-    testColSpanWithoutFlexAllowGrowFalseChangeToTrue : function() {
-      
+    testColSpanWithoutFlexAllowGrowFalseChangeToTrue() {
       this._gridLayout.setSpacingX(6);
       this._gridLayout.setAllowGrowSpannedCellWidth(false);
 
       var w1 = new qx.test.ui.layout.LayoutItem(100, 100);
-      this._gridWidget.add(w1, {row: 1, column: 0});
+      this._gridWidget.add(w1, { row: 1, column: 0 });
 
       var w2 = new qx.test.ui.layout.LayoutItem(100, 100);
-      this._gridWidget.add(w2, {row: 1, column: 1});
-      
+      this._gridWidget.add(w2, { row: 1, column: 1 });
+
       this.flush();
       this.assertEquals(206, this._gridWidget.bounds.width);
 
       var w3 = new qx.test.ui.layout.LayoutItem(300, 100);
       w3.setAllowShrinkX(true);
-      
-      this._gridWidget.add(w3, {row: 0, column: 0, colSpan: 2});
+
+      this._gridWidget.add(w3, { row: 0, column: 0, colSpan: 2 });
 
       this.flush();
       this.assertEquals(206, this._gridWidget.bounds.width);
@@ -179,32 +165,29 @@ qx.Class.define("qx.test.ui.layout.Grid",
       w3.dispose();
     },
 
-    testGetCellWidget : function()
-    {
+    testGetCellWidget() {
       var grid = this._gridLayout;
 
       this.assertNull(grid.getCellWidget(0, 0));
       this.assertNull(grid.getCellWidget(1, 1));
 
       var w00 = this._getFixedWidget();
-      this._gridWidget.add(w00, {row: 0, column: 0});
+      this._gridWidget.add(w00, { row: 0, column: 0 });
       this.assertEquals(w00, grid.getCellWidget(0, 0));
       this.assertNull(grid.getCellWidget(1, 1));
 
       var w11 = this._getFixedWidget();
-      this._gridWidget.add(w11, {row: 1, column: 1});
+      this._gridWidget.add(w11, { row: 1, column: 1 });
       this.assertEquals(w00, grid.getCellWidget(0, 0));
       this.assertEquals(w11, grid.getCellWidget(1, 1));
       this.assertNull(grid.getCellWidget(1, 0));
     },
 
-
-    testAutoSize : function()
-    {
-      this._gridWidget.add(this._getFixedWidget(), {row: 0, column: 0});
-      this._gridWidget.add(this._getFixedWidget(), {row: 0, column: 1});
-      this._gridWidget.add(this._getFixedWidget(), {row: 1, column: 0});
-      this._gridWidget.add(this._getFixedWidget(), {row: 1, column: 1});
+    testAutoSize() {
+      this._gridWidget.add(this._getFixedWidget(), { row: 0, column: 0 });
+      this._gridWidget.add(this._getFixedWidget(), { row: 0, column: 1 });
+      this._gridWidget.add(this._getFixedWidget(), { row: 1, column: 0 });
+      this._gridWidget.add(this._getFixedWidget(), { row: 1, column: 1 });
 
       this.assertSize(this._gridWidget, 400, 200);
 
@@ -215,9 +198,7 @@ qx.Class.define("qx.test.ui.layout.Grid",
       this.assertSize(this._gridWidget, 420, 210);
     },
 
-
-    testAddRemove : function()
-    {
+    testAddRemove() {
       var a = this._getFixedWidget();
       var b = this._getFixedWidget();
       var c = this._getFixedWidget();
@@ -229,10 +210,10 @@ qx.Class.define("qx.test.ui.layout.Grid",
       // initial layout:
       // ab
       // cd
-      this._gridWidget.add(a, {row: 0, column: 0});
-      this._gridWidget.add(b, {row: 0, column: 1});
-      this._gridWidget.add(c, {row: 1, column: 0});
-      this._gridWidget.add(d, {row: 1, column: 1});
+      this._gridWidget.add(a, { row: 0, column: 0 });
+      this._gridWidget.add(b, { row: 0, column: 1 });
+      this._gridWidget.add(c, { row: 1, column: 0 });
+      this._gridWidget.add(d, { row: 1, column: 1 });
       this.assertSize(this._gridWidget, 420, 210);
 
       // layout:
@@ -245,15 +226,13 @@ qx.Class.define("qx.test.ui.layout.Grid",
       // layout:
       // a, d, b, c
       this._gridWidget.remove(c);
-      this._gridWidget.add(d, {row: 0, column: 1});
-      this._gridWidget.add(b, {row: 0, column: 2});
-      this._gridWidget.add(c, {row: 0, column: 3});
+      this._gridWidget.add(d, { row: 0, column: 1 });
+      this._gridWidget.add(b, { row: 0, column: 2 });
+      this._gridWidget.add(c, { row: 0, column: 3 });
       this.assertSize(this._gridWidget, 860, 100);
     },
 
-
-    testVisibility : function()
-    {
+    testVisibility() {
       var a = this._getFixedWidget();
       var b = this._getFixedWidget();
       var c = this._getFixedWidget();
@@ -265,10 +244,10 @@ qx.Class.define("qx.test.ui.layout.Grid",
       // initial layout:
       // ab
       // cd
-      this._gridWidget.add(a, {row: 0, column: 0});
-      this._gridWidget.add(b, {row: 0, column: 1});
-      this._gridWidget.add(c, {row: 1, column: 0});
-      this._gridWidget.add(d, {row: 1, column: 1});
+      this._gridWidget.add(a, { row: 0, column: 0 });
+      this._gridWidget.add(b, { row: 0, column: 1 });
+      this._gridWidget.add(c, { row: 1, column: 0 });
+      this._gridWidget.add(d, { row: 1, column: 1 });
       this.assertSize(this._gridWidget, 420, 210);
 
       // layout:
@@ -279,7 +258,6 @@ qx.Class.define("qx.test.ui.layout.Grid",
       c.setVisibility("hidden");
       this.assertSize(this._gridWidget, 420, 210);
 
-
       // layout:
       // ab
       b.setVisibility("visible");
@@ -297,9 +275,7 @@ qx.Class.define("qx.test.ui.layout.Grid",
       this.assertSize(this._gridWidget, 420, 110);
     },
 
-
-    testCellSize : function()
-    {
+    testCellSize() {
       this._gridLayout.setRowHeight(0, 40);
       this._gridLayout.setRowHeight(1, 150);
       this._gridLayout.setColumnWidth(0, 70);
@@ -310,10 +286,10 @@ qx.Class.define("qx.test.ui.layout.Grid",
       var c = new qx.test.ui.layout.LayoutItem(100, 50);
       var d = new qx.test.ui.layout.LayoutItem(100, 50);
 
-      this._gridWidget.add(a, {row: 0, column: 0});
-      this._gridWidget.add(b, {row: 0, column: 1});
-      this._gridWidget.add(c, {row: 1, column: 0});
-      this._gridWidget.add(d, {row: 1, column: 1});
+      this._gridWidget.add(a, { row: 0, column: 0 });
+      this._gridWidget.add(b, { row: 0, column: 1 });
+      this._gridWidget.add(c, { row: 1, column: 0 });
+      this._gridWidget.add(d, { row: 1, column: 1 });
 
       this.assertSize(a, 70, 40);
       this.assertSize(b, 290, 40);
@@ -321,21 +297,20 @@ qx.Class.define("qx.test.ui.layout.Grid",
       this.assertSize(d, 290, 150);
     },
 
-
-    testCellMinSize : function()
-    {
+    testCellMinSize() {
       var a = new qx.test.ui.layout.LayoutItem(100, 50).set({
         minWidth: 200,
         minHeight: 200
       });
+
       var b = new qx.test.ui.layout.LayoutItem(100, 50);
       var c = new qx.test.ui.layout.LayoutItem(100, 50);
       var d = new qx.test.ui.layout.LayoutItem(100, 50);
 
-      this._gridWidget.add(a, {row: 0, column: 0});
-      this._gridWidget.add(b, {row: 0, column: 1});
-      this._gridWidget.add(c, {row: 1, column: 0});
-      this._gridWidget.add(d, {row: 1, column: 1});
+      this._gridWidget.add(a, { row: 0, column: 0 });
+      this._gridWidget.add(b, { row: 0, column: 1 });
+      this._gridWidget.add(c, { row: 1, column: 0 });
+      this._gridWidget.add(d, { row: 1, column: 1 });
 
       this.assertSize(a, 200, 200);
       this.assertSize(b, 100, 200);
@@ -343,32 +318,44 @@ qx.Class.define("qx.test.ui.layout.Grid",
       this.assertSize(d, 100, 50);
     },
 
-
-    testGetRowCount : function()
-    {
+    testGetRowCount() {
       this.assertEquals(0, this._gridLayout.getRowCount());
 
-      this._gridWidget.add(new qx.test.ui.layout.LayoutItem(100, 50), {row: 0, column: 0});
+      this._gridWidget.add(new qx.test.ui.layout.LayoutItem(100, 50), {
+        row: 0,
+        column: 0
+      });
+
       this.assertEquals(1, this._gridLayout.getRowCount());
 
-      this._gridWidget.add(new qx.test.ui.layout.LayoutItem(100, 50), {row: 4, column: 0});
+      this._gridWidget.add(new qx.test.ui.layout.LayoutItem(100, 50), {
+        row: 4,
+        column: 0
+      });
+
       this.assertEquals(5, this._gridLayout.getRowCount());
     },
 
-
-    testGetColumnCount : function()
-    {
+    testGetColumnCount() {
       this.assertEquals(0, this._gridLayout.getColumnCount());
 
-      this._gridWidget.add(new qx.test.ui.layout.LayoutItem(100, 50), {row: 0, column: 0});
+      this._gridWidget.add(new qx.test.ui.layout.LayoutItem(100, 50), {
+        row: 0,
+        column: 0
+      });
+
       this.assertEquals(1, this._gridLayout.getColumnCount());
 
-      this._gridWidget.add(new qx.test.ui.layout.LayoutItem(100, 50), {row: 0, column: 4});
+      this._gridWidget.add(new qx.test.ui.layout.LayoutItem(100, 50), {
+        row: 0,
+        column: 4
+      });
+
       this.assertEquals(5, this._gridLayout.getColumnCount());
     }
   },
 
-  destruct : function() {
+  destruct() {
     this._gridWidget = this._gridLayout = null;
   }
 });

package/source/class/qx/test/ui/layout/LayoutItem.js

@@ -16,13 +16,11 @@
 
 ************************************************************************ */
 
-qx.Class.define("qx.test.ui.layout.LayoutItem",
-{
-  extend : qx.ui.core.LayoutItem,
+qx.Class.define("qx.test.ui.layout.LayoutItem", {
+  extend: qx.ui.core.LayoutItem,
 
-  construct : function(width, height)
-  {
-    this.base(arguments);
+  construct(width, height) {
+    super();
 
     if (width !== undefined) {
       this.setWidth(width);
@@ -35,28 +33,23 @@ qx.Class.define("qx.test.ui.layout.LayoutItem",
     this.bounds = {};
   },
 
-
-  properties :
-  {
-    visibility :
-    {
-      check : ["visible", "hidden", "excluded"],
-      init : "visible",
-      apply : "_applyVisibility",
-      event : "changeVisibility"
+  properties: {
+    visibility: {
+      check: ["visible", "hidden", "excluded"],
+      init: "visible",
+      apply: "_applyVisibility",
+      event: "changeVisibility"
     }
   },
 
-  members :
-  {
-    bounds : null,
+  members: {
+    bounds: null,
 
-    __layout : null,
-    __children : null,
+    __layout: null,
+    __children: null,
 
-    renderLayout : function(left, top, width, height)
-    {
-      var changes = this.base(arguments, left, top, width, height);
+    renderLayout(left, top, width, height) {
+      var changes = super.renderLayout(left, top, width, height);
 
       if (!changes) {
         return;
@@ -69,43 +62,40 @@ qx.Class.define("qx.test.ui.layout.LayoutItem",
         height: height
       };
 
-      if (changes.size || changes.local || changes.margin)
-      {
+      if (changes.size || changes.local || changes.margin) {
         if (this.__layout && this.getLayoutChildren().length > 0) {
-          this.__layout.renderLayout(width, height, {top: 0, right: 0, bottom: 0, left: 0});
+          this.__layout.renderLayout(width, height, {
+            top: 0,
+            right: 0,
+            bottom: 0,
+            left: 0
+          });
         }
       }
 
       return changes;
     },
 
-
-    setLayout : function(layout)
-    {
+    setLayout(layout) {
       layout.connectToWidget(this);
       qx.ui.core.queue.Layout.add(this);
       this.__layout = layout;
     },
 
-
-    _getLayout : function() {
+    _getLayout() {
       return this.__layout;
     },
 
-
     // overridden
-    invalidateLayoutCache : function()
-    {
-      this.base(arguments);
+    invalidateLayoutCache() {
+      super.invalidateLayoutCache();
 
       if (this.__layout) {
         this.__layout.invalidateLayoutCache();
       }
     },
 
-
-    invalidateLayoutChildren : function()
-    {
+    invalidateLayoutChildren() {
       var layout = this.__layout;
       if (layout) {
         layout.invalidateChildrenCache();
@@ -114,13 +104,17 @@ qx.Class.define("qx.test.ui.layout.LayoutItem",
       qx.ui.core.queue.Layout.add(this);
     },
 
-
     // property apply
-    _applyVisibility : function(value, old)
-    {
+    _applyVisibility(value, old) {
       // only force a layout update if visibility change from/to "exclude"
       var parent = this.$$parent;
-      if (parent && (old == null || value == null || old === "excluded" || value === "excluded")) {
+      if (
+        parent &&
+        (old == null ||
+          value == null ||
+          old === "excluded" ||
+          value === "excluded")
+      ) {
         parent.invalidateLayoutChildren();
       }
 
@@ -128,20 +122,16 @@ qx.Class.define("qx.test.ui.layout.LayoutItem",
       qx.ui.core.queue.Visibility.add(this);
     },
 
-
-    _getContentHint : function()
-    {
+    _getContentHint() {
       if (this.__layout && this.getLayoutChildren().length > 0) {
         return this.__layout.getSizeHint();
       } else {
-        return { width: 0, height: 0};
+        return { width: 0, height: 0 };
       }
     },
 
-
     // overridden
-    _computeSizeHint : function()
-    {
+    _computeSizeHint() {
       // Start with the user defined values
       var width = this.getWidth();
       var minWidth = this.getMinWidth();
@@ -151,7 +141,6 @@ qx.Class.define("qx.test.ui.layout.LayoutItem",
       var minHeight = this.getMinHeight();
       var maxHeight = this.getMaxHeight();
 
-
       // Ask content
       var contentHint = this._getContentHint();
 
@@ -163,22 +152,19 @@ qx.Class.define("qx.test.ui.layout.LayoutItem",
         height = contentHint.height;
       }
 
-      if (minWidth == null)
-      {
+      if (minWidth == null) {
         if (contentHint.minWidth != null) {
           minWidth = contentHint.minWidth;
         }
       }
 
-      if (minHeight == null)
-      {
+      if (minHeight == null) {
         if (contentHint.minHeight != null) {
           minHeight = contentHint.minHeight;
         }
       }
 
-      if (maxWidth == null)
-      {
+      if (maxWidth == null) {
         if (contentHint.maxWidth == null) {
           maxWidth = Infinity;
         } else {
@@ -186,8 +172,7 @@ qx.Class.define("qx.test.ui.layout.LayoutItem",
         }
       }
 
-      if (maxHeight == null)
-      {
+      if (maxHeight == null) {
         if (contentHint.maxHeight == null) {
           maxHeight = Infinity;
         } else {
@@ -196,18 +181,16 @@ qx.Class.define("qx.test.ui.layout.LayoutItem",
       }
 
       return {
-        width : width,
-        minWidth : minWidth,
-        maxWidth : maxWidth,
-        height : height,
-        minHeight : minHeight,
-        maxHeight : maxHeight
+        width: width,
+        minWidth: minWidth,
+        maxWidth: maxWidth,
+        height: height,
+        minHeight: minHeight,
+        maxHeight: maxHeight
       };
     },
 
-
-    add : function(child, options)
-    {
+    add(child, options) {
       if (!this.__children) {
         this.__children = [];
       }
@@ -224,9 +207,7 @@ qx.Class.define("qx.test.ui.layout.LayoutItem",
       qx.ui.core.queue.Layout.add(this);
     },
 
-
-    remove : function(child)
-    {
+    remove(child) {
       if (!this.__children) {
         this.__children = [];
       }
@@ -245,14 +226,11 @@ qx.Class.define("qx.test.ui.layout.LayoutItem",
       qx.ui.core.queue.Layout.add(this);
     },
 
-
-    getLayoutChildren : function()
-    {
+    getLayoutChildren() {
       var children = this.__children || [];
       var layoutChildren = [];
 
-      for (var i=0; i<children.length; i++)
-      {
+      for (var i = 0; i < children.length; i++) {
         var child = children[i];
         if (child.getVisibility() !== "excluded") {
           layoutChildren.push(child);
@@ -261,21 +239,17 @@ qx.Class.define("qx.test.ui.layout.LayoutItem",
       return layoutChildren;
     },
 
-
-    checkAppearanceNeeds : function() {},
-
+    checkAppearanceNeeds() {},
 
     // copied from qx.ui.core.Widget
-    addChildrenToQueue : function(queue)
-    {
+    addChildrenToQueue(queue) {
       var children = this.__children;
       if (!children) {
         return;
       }
 
       var child;
-      for (var i=0, l=children.length; i<l; i++)
-      {
+      for (var i = 0, l = children.length; i < l; i++) {
         child = children[i];
         queue.push(child);
 
@@ -284,7 +258,7 @@ qx.Class.define("qx.test.ui.layout.LayoutItem",
     }
   },
 
-  destruct : function() {
+  destruct() {
     this.bounds = this.__layout = this.__children = null;
   }
 });