@qooxdoo/framework 7.0.0-beta.5 → 7.0.0-beta.9

package/source/class/qx/ui/window/MDesktop.js

@@ -22,32 +22,27 @@
  * @ignore(qx.ui.window.Window)
  * @ignore(qx.ui.window.Window.*)
  */
-qx.Mixin.define("qx.ui.window.MDesktop",
-{
+qx.Mixin.define("qx.ui.window.MDesktop", {
   /*
   *****************************************************************************
      PROPERTIES
   *****************************************************************************
   */
 
-  properties :
-  {
+  properties: {
     /**
      * The currently active window
      */
-    activeWindow :
-    {
-      check : "qx.ui.window.Window",
-      apply : "_applyActiveWindow",
-      event : "changeActiveWindow",
-      init  : null,
-      nullable : true
+    activeWindow: {
+      check: "qx.ui.window.Window",
+      apply: "_applyActiveWindow",
+      event: "changeActiveWindow",
+      init: null,
+      nullable: true
     }
   },
 
-
-  events:
-  {
+  events: {
     /**
      * Fired when a window was added.
      */
@@ -59,20 +54,16 @@ qx.Mixin.define("qx.ui.window.MDesktop",
     windowRemoved: "qx.event.type.Data"
   },
 
-
-
   /*
   *****************************************************************************
      MEMBERS
   *****************************************************************************
   */
 
-  members :
-  {
-    __windows : null,
+  members: {
+    __windows: null,
     __manager: null,
 
-
     /**
      * Get the desktop's window manager. Each desktop must have a window manager.
      * If none is configured the default window manager {@link qx.ui.window.Window#DEFAULT_MANAGER_CLASS}
@@ -80,22 +71,20 @@ qx.Mixin.define("qx.ui.window.MDesktop",
      *
      * @return {qx.ui.window.IWindowManager} The desktop's window manager
      */
-    getWindowManager : function()
-    {
+    getWindowManager() {
       if (!this.__manager) {
         this.setWindowManager(new qx.ui.window.Window.DEFAULT_MANAGER_CLASS());
       }
       return this.__manager;
     },
 
-
     /**
      * Whether the configured layout supports a maximized window
      * e.g. is a Canvas.
      *
      * @return {Boolean} Whether the layout supports maximized windows
      */
-    supportsMaximize : function() {
+    supportsMaximize() {
       return true;
     },
 
@@ -104,8 +93,7 @@ qx.Mixin.define("qx.ui.window.MDesktop",
      *
      * @param manager {qx.ui.window.IWindowManager} The window manager
      */
-    setWindowManager : function(manager)
-    {
+    setWindowManager(manager) {
       if (this.__manager) {
         this.__manager.setDesktop(null);
       }
@@ -114,15 +102,13 @@ qx.Mixin.define("qx.ui.window.MDesktop",
       this.__manager = manager;
     },
 
-
     /**
      * Event handler. Called if one of the managed windows changes its active
      * state.
      *
      * @param e {qx.event.type.Event} the event object.
      */
-    _onChangeActive : function(e)
-    {
+    _onChangeActive(e) {
       if (e.getData()) {
         this.setActiveWindow(e.getTarget());
       } else if (this.getActiveWindow() == e.getTarget()) {
@@ -130,55 +116,50 @@ qx.Mixin.define("qx.ui.window.MDesktop",
       }
     },
 
-
     // property apply
-    _applyActiveWindow : function(value, old) {
+    _applyActiveWindow(value, old) {
       this.getWindowManager().changeActiveWindow(value, old);
       this.getWindowManager().updateStack();
     },
 
-
     /**
      * Event handler. Called if one of the managed windows changes its modality
      *
      * @param e {qx.event.type.Event} the event object.
      */
-    _onChangeModal : function(e) {
+    _onChangeModal(e) {
       this.getWindowManager().updateStack();
     },
 
-
     /**
      * Event handler. Called if one of the managed windows changes its visibility
      * state.
      */
-    _onChangeVisibility : function() {
+    _onChangeVisibility() {
       this.getWindowManager().updateStack();
     },
 
-
     /**
      * Overrides the method {@link qx.ui.core.Widget#_afterAddChild}
      *
      * @param win {qx.ui.core.Widget} added widget
      */
-    _afterAddChild : function(win)
-    {
-      if (qx.Class.isDefined("qx.ui.window.Window") && win instanceof qx.ui.window.Window) {
+    _afterAddChild(win) {
+      if (
+        qx.Class.isDefined("qx.ui.window.Window") &&
+        win instanceof qx.ui.window.Window
+      ) {
         this._addWindow(win);
       }
     },
 
-
     /**
      * Handles the case, when a window is added to the desktop.
      *
      * @param win {qx.ui.window.Window} Window, which has been added
      */
-    _addWindow : function(win)
-    {
-      if (!this.getWindows().includes(win))
-      {
+    _addWindow(win) {
+      if (!this.getWindows().includes(win)) {
         this.getWindows().push(win);
 
         this.fireDataEvent("windowAdded", win);
@@ -195,29 +176,27 @@ qx.Mixin.define("qx.ui.window.MDesktop",
       this.getWindowManager().updateStack();
     },
 
-
     /**
      * Overrides the method {@link qx.ui.core.Widget#_afterRemoveChild}
      *
      * @param win {qx.ui.core.Widget} removed widget
      */
-    _afterRemoveChild : function(win)
-    {
-      if (qx.Class.isDefined("qx.ui.window.Window") && win instanceof qx.ui.window.Window) {
+    _afterRemoveChild(win) {
+      if (
+        qx.Class.isDefined("qx.ui.window.Window") &&
+        win instanceof qx.ui.window.Window
+      ) {
         this._removeWindow(win);
       }
     },
 
-
     /**
      * Handles the case, when a window is removed from the desktop.
      *
      * @param win {qx.ui.window.Window} Window, which has been removed
      */
-    _removeWindow : function(win)
-    {
-      if (this.getWindows().includes(win))
-      {
+    _removeWindow(win) {
+      if (this.getWindows().includes(win)) {
         qx.lang.Array.remove(this.getWindows(), win);
 
         this.fireDataEvent("windowRemoved", win);
@@ -230,14 +209,12 @@ qx.Mixin.define("qx.ui.window.MDesktop",
       }
     },
 
-
     /**
      * Get a list of all windows added to the desktop (including hidden windows)
      *
      * @return {qx.ui.window.Window[]} Array of managed windows
      */
-    getWindows : function()
-    {
+    getWindows() {
       if (!this.__windows) {
         this.__windows = [];
       }
@@ -245,18 +222,13 @@ qx.Mixin.define("qx.ui.window.MDesktop",
     }
   },
 
-
-
-
-
   /*
   *****************************************************************************
      DESTRUCTOR
   *****************************************************************************
   */
 
-  destruct : function()
-  {
+  destruct() {
     this._disposeArray("__windows");
     this._disposeObjects("__manager");
   }

package/source/class/qx/ui/window/Manager.js

@@ -19,12 +19,9 @@
 /**
  * The default window manager implementation
  */
-qx.Class.define("qx.ui.window.Manager",
-{
-  extend : qx.core.Object,
-  implement : qx.ui.window.IWindowManager,
-
-
+qx.Class.define("qx.ui.window.Manager", {
+  extend: qx.core.Object,
+  implement: qx.ui.window.IWindowManager,
 
   /*
   *****************************************************************************
@@ -32,40 +29,34 @@ qx.Class.define("qx.ui.window.Manager",
   *****************************************************************************
   */
 
-  members :
-  {
-    __desktop : null,
-
+  members: {
+    __desktop: null,
 
     // interface implementation
-    setDesktop : function(desktop)
-    {
+    setDesktop(desktop) {
       this.__desktop = desktop;
-        
-      if(desktop) {
+
+      if (desktop) {
         this.updateStack();
-      }
-      else {
-         // the window manager should be removed
-         // from the widget queue if the desktop
-         // was set to null
-         qx.ui.core.queue.Widget.remove(this);
+      } else {
+        // the window manager should be removed
+        // from the widget queue if the desktop
+        // was set to null
+        qx.ui.core.queue.Widget.remove(this);
       }
     },
 
-
     /**
      * Returns the connected desktop
      *
      * @return {qx.ui.window.IDesktop} The desktop
      */
-    getDesktop : function() {
+    getDesktop() {
       return this.__desktop;
     },
 
-
     // interface implementation
-    changeActiveWindow : function(active, oldActive) {
+    changeActiveWindow(active, oldActive) {
       if (active) {
         this.bringToFront(active);
         active.setActive(true);
@@ -75,26 +66,21 @@ qx.Class.define("qx.ui.window.Manager",
       }
     },
 
-
     /** @type {Integer} Minimum zIndex to start with for windows */
-    _minZIndex : 1e5,
-
+    _minZIndex: 1e5,
 
     // interface implementation
-    updateStack : function()
-    {
+    updateStack() {
       // we use the widget queue to do the sorting one before the queues are
       // flushed. The queue will call "syncWidget"
       qx.ui.core.queue.Widget.add(this);
     },
 
-
     /**
      * This method is called during the flush of the
      * {@link qx.ui.core.queue.Widget widget queue}.
      */
-    syncWidget : function()
-    {
+    syncWidget() {
       this.__desktop.forceUnblock();
 
       var windows = this.__desktop.getWindows();
@@ -105,8 +91,7 @@ qx.Class.define("qx.ui.window.Manager",
       // marker if there is an active window
       var active = null;
 
-      for (var i = 0, l = windows.length; i < l; i++)
-      {
+      for (var i = 0, l = windows.length; i < l; i++) {
         var win = windows[i];
         // ignore invisible windows
         if (!win.isVisible()) {
@@ -122,23 +107,22 @@ qx.Class.define("qx.ui.window.Manager",
         if (win.isModal()) {
           win.setZIndex(zIndexModal);
           this.__desktop.blockContent(zIndexModal - 1);
-          zIndexModal +=2;
+          zIndexModal += 2;
           //just activate it if it's modal
           active = win;
-
         } else if (win.isAlwaysOnTop()) {
           win.setZIndex(zIndexOnTop);
-          zIndexOnTop +=2;
-
+          zIndexOnTop += 2;
         } else {
           win.setZIndex(zIndex);
-          zIndex +=2;
+          zIndex += 2;
         }
 
         // store the active window
-        if (!active.isModal() &&
-            win.isActive() ||
-            win.getZIndex() > active.getZIndex()) {
+        if (
+          (!active.isModal() && win.isActive()) ||
+          win.getZIndex() > active.getZIndex()
+        ) {
           active = win;
         }
       }
@@ -147,46 +131,36 @@ qx.Class.define("qx.ui.window.Manager",
       this.__desktop.setActiveWindow(active);
     },
 
-
     // interface implementation
-    bringToFront : function(win)
-    {
+    bringToFront(win) {
       var windows = this.__desktop.getWindows();
 
       var removed = qx.lang.Array.remove(windows, win);
-      if (removed)
-      {
+      if (removed) {
         windows.push(win);
         this.updateStack();
       }
     },
 
-
     // interface implementation
-    sendToBack : function(win)
-    {
+    sendToBack(win) {
       var windows = this.__desktop.getWindows();
 
       var removed = qx.lang.Array.remove(windows, win);
-      if (removed)
-      {
+      if (removed) {
         windows.unshift(win);
         this.updateStack();
       }
     }
   },
 
-
-
-
-
   /*
   *****************************************************************************
      DESTRUCTOR
   *****************************************************************************
   */
 
-  destruct : function() {
+  destruct() {
     this._disposeObjects("__desktop");
   }
 });