[qooxdoo-commit] SF.net SVN: qooxdoo: [7572] trunk/qooxdoo/frontend/framework/source/class/ qx
Brought to you by:
ecker,
martinwittemann
From: <wp...@us...> - 2007-04-27 12:48:51
|
Revision: 7572 http://svn.sourceforge.net/qooxdoo/?rev=7572&view=rev Author: wpbasti Date: 2007-04-27 05:48:48 -0700 (Fri, 27 Apr 2007) Log Message: ----------- Cleaned up RadioView, minor fix for property system, init dimension and location stuff to null by default Modified Paths: -------------- trunk/qooxdoo/frontend/framework/source/class/qx/Class.js trunk/qooxdoo/frontend/framework/source/class/qx/core/Property.js trunk/qooxdoo/frontend/framework/source/class/qx/theme/classic/Appearance.js trunk/qooxdoo/frontend/framework/source/class/qx/ui/core/Widget.js trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/AbstractButton.js trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/buttonview/Bar.js trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/buttonview/Button.js trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Bar.js trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Button.js trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Page.js trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Pane.js trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/RadioView.js trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/tabview/Button.js Modified: trunk/qooxdoo/frontend/framework/source/class/qx/Class.js =================================================================== --- trunk/qooxdoo/frontend/framework/source/class/qx/Class.js 2007-04-27 11:59:00 UTC (rev 7571) +++ trunk/qooxdoo/frontend/framework/source/class/qx/Class.js 2007-04-27 12:48:48 UTC (rev 7572) @@ -1187,11 +1187,8 @@ throw new Error('The configuration key "' + key + '" of property "' + name + '" in class "' + clazz.classname + '" is not allowed!'); } - if (config[key] == null) { - // null is allowed as init value for nullable properties. - if (!(key == "init" && config.nullable == true)) { - throw new Error('Invalid key "' + key + '" of property "' + name + '" in class "' + clazz.classname + '"! The value is undefined/null!'); - } + if (config[key] === undefined) { + throw new Error('Invalid key "' + key + '" of property "' + name + '" in class "' + clazz.classname + '"! The value is undefined: ' + config[key]); } if (allowed[key] !== null && typeof config[key] !== allowed[key]) { Modified: trunk/qooxdoo/frontend/framework/source/class/qx/core/Property.js =================================================================== --- trunk/qooxdoo/frontend/framework/source/class/qx/core/Property.js 2007-04-27 11:59:00 UTC (rev 7571) +++ trunk/qooxdoo/frontend/framework/source/class/qx/core/Property.js 2007-04-27 12:48:48 UTC (rev 7572) @@ -656,6 +656,7 @@ + // [1] PRE CONDITIONS if (variant === "init") { @@ -686,14 +687,6 @@ if (variant === "set" || variant === "style" || variant === "init") { - // Another variant. If there is no init value defined for the property, - // and the init() method is called without any argument, then just ignore - // the call. This is needed because derived classes can add the init value - // for properties which were missing them in the original declaration. - if (config.nullable && variant === "init") { - code.add('if(value===undefined)return;'); - } - // Undefined check // Must be above the comparision between old and new, because otherwise previously unset // values get not detected and will be quitely ignored which is a bad behavior. Modified: trunk/qooxdoo/frontend/framework/source/class/qx/theme/classic/Appearance.js =================================================================== --- trunk/qooxdoo/frontend/framework/source/class/qx/theme/classic/Appearance.js 2007-04-27 11:59:00 UTC (rev 7571) +++ trunk/qooxdoo/frontend/framework/source/class/qx/theme/classic/Appearance.js 2007-04-27 12:48:48 UTC (rev 7572) @@ -487,26 +487,12 @@ --------------------------------------------------------------------------- */ - "radio-view" : - { - style : function(states) - { - return { - backgroundColor : "#FAFBFE", - border : "shadow" - }; - } + "radio-view" : { + include : "button-view" }, "radio-view-pane" : { - style : function(states) - { - return { - width : null, - height : "1*" - }; - } }, "radio-view-page" : @@ -524,10 +510,7 @@ paddingRight : 0, paddingBottom : 1, paddingLeft : 0, - border : new qx.renderer.border.Border, - height : "auto", - width : null, - orientation : "vertical" + border : new qx.renderer.border.Border }; result.border.setBottom(1, "solid", "threedshadow"); @@ -566,6 +549,7 @@ result.marginTop = result.marginBottom = 0; result.marginRight = result.marginLeft = 1; result.width = "auto"; + result.opacity = states.checked ? 1.0 : 0.3; return result; } Modified: trunk/qooxdoo/frontend/framework/source/class/qx/ui/core/Widget.js =================================================================== --- trunk/qooxdoo/frontend/framework/source/class/qx/ui/core/Widget.js 2007-04-27 11:59:00 UTC (rev 7571) +++ trunk/qooxdoo/frontend/framework/source/class/qx/ui/core/Widget.js 2007-04-27 12:48:48 UTC (rev 7572) @@ -88,8 +88,9 @@ this._states = {}; this._applyAppearance(); - - // Initialize dimension & location + // ************************************************************************ + // PROPERTY INIT + // ************************************************************************ this.initTop(); this.initRight(); this.initBottom(); @@ -1700,7 +1701,8 @@ { apply : "_modifyLeft", nullable : true, - themeable : true + themeable : true, + init : null }, @@ -1715,7 +1717,8 @@ { apply : "_modifyRight", nullable : true, - themeable : true + themeable : true, + init : null }, @@ -1730,7 +1733,8 @@ { apply : "_modifyWidth", nullable : true, - themeable : true + themeable : true, + init : null }, @@ -1743,7 +1747,8 @@ { apply : "_modifyMinWidth", nullable : true, - themeable : true + themeable : true, + init : null }, @@ -1756,7 +1761,8 @@ { apply : "_modifyMaxWidth", nullable : true, - themeable : true + themeable : true, + init : null }, @@ -1779,7 +1785,8 @@ { apply : "_modifyTop", nullable : true, - themeable : true + themeable : true, + init : null }, @@ -1794,7 +1801,8 @@ { apply : "_modifyBottom", nullable : true, - themeable : true + themeable : true, + init : null }, @@ -1809,7 +1817,8 @@ { apply : "_modifyHeight", nullable : true, - themeable : true + themeable : true, + init : null }, @@ -1822,7 +1831,8 @@ { apply : "_modifyMinHeight", nullable : true, - themeable : true + themeable : true, + init : null }, @@ -1835,7 +1845,8 @@ { apply : "_modifyMaxHeight", nullable : true, - themeable : true + themeable : true, + init : null }, Modified: trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/AbstractButton.js =================================================================== --- trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/AbstractButton.js 2007-04-27 11:59:00 UTC (rev 7571) +++ trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/AbstractButton.js 2007-04-27 12:48:48 UTC (rev 7572) @@ -41,6 +41,8 @@ { this.base(arguments, vText, vIcon, vIconWidth, vIconHeight, vFlash); + this.initChecked(); + this.addEventListener("mouseover", this._onmouseover); this.addEventListener("mouseout", this._onmouseout); this.addEventListener("mousedown", this._onmousedown); Modified: trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/buttonview/Bar.js =================================================================== --- trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/buttonview/Bar.js 2007-04-27 11:59:00 UTC (rev 7571) +++ trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/buttonview/Bar.js 2007-04-27 12:48:48 UTC (rev 7572) @@ -34,19 +34,7 @@ - /* - ***************************************************************************** - CONSTRUCTOR - ***************************************************************************** - */ - construct : function() { - this.base(arguments); - }, - - - - /* ***************************************************************************** PROPERTIES Modified: trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/buttonview/Button.js =================================================================== --- trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/buttonview/Button.js 2007-04-27 11:59:00 UTC (rev 7571) +++ trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/buttonview/Button.js 2007-04-27 12:48:48 UTC (rev 7572) @@ -36,19 +36,7 @@ - /* - ***************************************************************************** - CONSTRUCTOR - ***************************************************************************** - */ - construct : function(vText, vIcon, vIconWidth, vIconHeight, vFlash) { - this.base(arguments, vText, vIcon, vIconWidth, vIconHeight, vFlash); - }, - - - - /* ***************************************************************************** PROPERTIES Modified: trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Bar.js =================================================================== --- trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Bar.js 2007-04-27 11:59:00 UTC (rev 7571) +++ trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Bar.js 2007-04-27 12:48:48 UTC (rev 7572) @@ -14,6 +14,7 @@ Authors: * Derrell Lipman + * Sebastian Werner (wpbasti) ************************************************************************ */ @@ -28,37 +29,32 @@ */ qx.Class.define("qx.ui.pageview.radioview.Bar", { - extend : qx.ui.pageview.buttonview.Bar, + extend : qx.ui.pageview.AbstractBar, - - - - /* - ***************************************************************************** - CONSTRUCTOR - ***************************************************************************** - */ - - construct : function() - { - this.base(arguments); - }, - - - - - /* - ***************************************************************************** - PROPERTIES - ***************************************************************************** - */ - properties : { appearance : { refine : true, init : "radio-view-bar" + }, + + height : + { + refine : true, + init : "auto" + }, + + width : + { + refine : true, + init : null + }, + + orientation : + { + refine : true, + init : "vertical" } } }); Modified: trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Button.js =================================================================== --- trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Button.js 2007-04-27 11:59:00 UTC (rev 7571) +++ trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Button.js 2007-04-27 12:48:48 UTC (rev 7572) @@ -14,6 +14,7 @@ Authors: * Derrell Lipman (derrell) + * Sebastian Werner (wpbasti) ************************************************************************ */ @@ -37,27 +38,6 @@ /* ***************************************************************************** - CONSTRUCTOR - ***************************************************************************** - */ - - construct : function(vText, vIcon, vIconWidth, vIconHeight, vFlash) - { - this.base(arguments, vText, vIcon, vIconWidth, vIconHeight, vFlash); - - // Initially, the icon is in its unselected state - var oIcon = this.getIconObject(); - if (oIcon) - { - this.getIconObject().setOpacity(0.3); - } - }, - - - - - /* - ***************************************************************************** PROPERTIES ***************************************************************************** */ @@ -94,12 +74,6 @@ members : { - /* - --------------------------------------------------------------------------- - EVENT HANDLER - --------------------------------------------------------------------------- - */ - /** * TODOC * @@ -140,7 +114,8 @@ vChild = vChild.getPreviousSibling(); // Ensure that it's a button. If not, loop again. - } while (! (vChild instanceof qx.ui.pageview.AbstractButton)); + } + while (!(vChild instanceof qx.ui.pageview.AbstractButton)); } else { @@ -159,7 +134,8 @@ vChild = vChild.getNextSibling(); // Ensure that it's a button. If not, loop again. - } while (! (vChild instanceof qx.ui.pageview.AbstractButton)); + } + while (!(vChild instanceof qx.ui.pageview.AbstractButton)); } // focus next/previous button @@ -167,36 +143,6 @@ // and naturally also check it vChild.setChecked(true); - }, - - - /* - --------------------------------------------------------------------------- - MODIFIER - --------------------------------------------------------------------------- - */ - - /** - * TODOC - * - * @type member - * @param propValue {var} Current value - * @param propOldValue {var} Previous value - * @param propData {var} Property configuration map - * @return {Boolean} TODOC - */ - _modifyChecked : function(propValue, propOldValue, propData) - { - this.base(arguments, propValue, propOldValue, propData); - - // Show the icon only for the checked item - var oIcon = this.getIconObject(); - if (oIcon) - { - oIcon.setOpacity(propValue ? 1.0 : 0.3); - } - - return true; } } }); Modified: trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Page.js =================================================================== --- trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Page.js 2007-04-27 11:59:00 UTC (rev 7571) +++ trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Page.js 2007-04-27 12:48:48 UTC (rev 7572) @@ -14,6 +14,7 @@ Authors: * Derrell Lipman (derrell) + * Sebastian Werner (wpbasti) ************************************************************************ */ @@ -28,25 +29,12 @@ */ qx.Class.define("qx.ui.pageview.radioview.Page", { - extend : qx.ui.pageview.buttonview.Page, + extend : qx.ui.pageview.AbstractPage, - /* - ***************************************************************************** - CONSTRUCTOR - ***************************************************************************** - */ - construct : function(vButton) - { - this.base(arguments, vButton); - }, - - - - /* ***************************************************************************** PROPERTIES Modified: trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Pane.js =================================================================== --- trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Pane.js 2007-04-27 11:59:00 UTC (rev 7571) +++ trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/Pane.js 2007-04-27 12:48:48 UTC (rev 7572) @@ -14,6 +14,7 @@ Authors: * Derrell Lipman (derrell) + * Sebastian Werner (wpbasti) ************************************************************************ */ @@ -28,27 +29,12 @@ */ qx.Class.define("qx.ui.pageview.radioview.Pane", { - extend : qx.ui.pageview.buttonview.Pane, + extend : qx.ui.pageview.AbstractPane, - /* ***************************************************************************** - CONSTRUCTOR - ***************************************************************************** - */ - - construct : function() - { - this.base(arguments); - }, - - - - - /* - ***************************************************************************** PROPERTIES ***************************************************************************** */ Modified: trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/RadioView.js =================================================================== --- trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/RadioView.js 2007-04-27 11:59:00 UTC (rev 7571) +++ trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/radioview/RadioView.js 2007-04-27 12:48:48 UTC (rev 7572) @@ -14,6 +14,7 @@ Authors: * Derrell Lipman (derrell) + * Sebastian Werner (wpbasti) ************************************************************************ */ @@ -44,11 +45,8 @@ ***************************************************************************** */ - construct : function() - { - this.base(arguments, - qx.ui.pageview.radioview.Bar, - qx.ui.pageview.radioview.Pane); + construct : function() { + this.base(arguments, qx.ui.pageview.radioview.Bar, qx.ui.pageview.radioview.Pane); }, @@ -62,40 +60,10 @@ properties : { - /* - --------------------------------------------------------------------------- - PROPERTIES - --------------------------------------------------------------------------- - */ - appearance : { refine : true, init : "radio-view" } - }, - - - - - /* - ***************************************************************************** - MEMBERS - ***************************************************************************** - */ - - members : - { - /** - * TODOC - * - * @type member - * @return {void} - */ - getBarPosition : function() - { - // always at top - return "top"; - } } }); Modified: trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/tabview/Button.js =================================================================== --- trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/tabview/Button.js 2007-04-27 11:59:00 UTC (rev 7571) +++ trunk/qooxdoo/frontend/framework/source/class/qx/ui/pageview/tabview/Button.js 2007-04-27 12:48:48 UTC (rev 7572) @@ -37,19 +37,8 @@ - /* - ***************************************************************************** - CONSTRUCTOR - ***************************************************************************** - */ - construct : function(vText, vIcon, vIconWidth, vIconHeight, vFlash) { - this.base(arguments, vText, vIcon, vIconWidth, vIconHeight, vFlash); - }, - - - /* ***************************************************************************** EVENTS @@ -78,14 +67,6 @@ }, - - - /* - --------------------------------------------------------------------------- - PROPERTIES - --------------------------------------------------------------------------- - */ - /** default Close Tab Button */ showCloseButton : { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |