SF.net SVN: qooxdoo: [3072] branches/namespaces/qooxdoo/source/script/qx
Brought to you by:
ecker,
martinwittemann
Menu
▾
▴
SF.net SVN: qooxdoo: [3072] branches/namespaces/qooxdoo/source/script/qx
|
From: <wp...@us...> - 2006-04-28 15:04:48
|
Revision: 3072 Author: wpbasti Date: 2006-04-28 08:04:17 -0700 (Fri, 28 Apr 2006) ViewCVS: http://svn.sourceforge.net/qooxdoo/?rev=3072&view=rev Log Message: ----------- Moved some more common events to namespace Modified Paths: -------------- branches/namespaces/qooxdoo/source/contributed/taskbar_milea/QxTaskBar.js branches/namespaces/qooxdoo/source/script/qx/Const.js branches/namespaces/qooxdoo/source/script/qx/constant/Event.js branches/namespaces/qooxdoo/source/script/qx/event/handler/EventHandler.js branches/namespaces/qooxdoo/source/script/qx/event/type/FocusEvent.js branches/namespaces/qooxdoo/source/script/qx/type/Range.js branches/namespaces/qooxdoo/source/script/qx/ui/core/Parent.js branches/namespaces/qooxdoo/source/script/qx/ui/core/Widget.js branches/namespaces/qooxdoo/source/script/qx/ui/form/ComboBox.js branches/namespaces/qooxdoo/source/script/qx/ui/form/Spinner.js branches/namespaces/qooxdoo/source/script/qx/ui/form/TextField.js branches/namespaces/qooxdoo/source/script/qx/ui/listview/ListView.js branches/namespaces/qooxdoo/tools/migration/0.6/patches/04-events.dat Modified: branches/namespaces/qooxdoo/source/contributed/taskbar_milea/QxTaskBar.js =================================================================== --- branches/namespaces/qooxdoo/source/contributed/taskbar_milea/QxTaskBar.js 2006-04-28 14:56:15 UTC (rev 3071) +++ branches/namespaces/qooxdoo/source/contributed/taskbar_milea/QxTaskBar.js 2006-04-28 15:04:17 UTC (rev 3072) @@ -94,10 +94,10 @@ win.addEventListener(qx.Const.EVENT_TYPE_DISAPPEAR, function(e) { tmpButton.setChecked(false); }); - win.addEventListener(qx.Const.EVENT_TYPE_BLUR, function(e) { + win.addEventListener(qx.constant.Event.BLUR, function(e) { tmpButton.setChecked(false); }); - win.addEventListener(qx.Const.EVENT_TYPE_FOCUS, function(e) { + win.addEventListener(qx.constant.Event.FOCUS, function(e) { tmpButton.setChecked(true); }); }; Modified: branches/namespaces/qooxdoo/source/script/qx/Const.js =================================================================== --- branches/namespaces/qooxdoo/source/script/qx/Const.js 2006-04-28 14:56:15 UTC (rev 3071) +++ branches/namespaces/qooxdoo/source/script/qx/Const.js 2006-04-28 15:04:17 UTC (rev 3072) @@ -41,14 +41,6 @@ EVENT_TYPE_DRAGLEAVE : "dragleave", EVENT_TYPE_DRAG : "drag", - EVENT_TYPE_BLUR : "blur", - EVENT_TYPE_FOCUS : "focus", - EVENT_TYPE_FOCUSIN : "focusin", - EVENT_TYPE_FOCUSOUT : "focusout", - EVENT_TYPE_SELECT : "select", - EVENT_TYPE_SCROLL : "scroll", - EVENT_TYPE_INPUT : "input", - EVENT_TYPE_CHANGE : "change", EVENT_TYPE_LOAD : "load", EVENT_TYPE_UNLOAD : "unload", EVENT_TYPE_BEFOREUNLOAD : "beforeunload", Modified: branches/namespaces/qooxdoo/source/script/qx/constant/Event.js =================================================================== --- branches/namespaces/qooxdoo/source/script/qx/constant/Event.js 2006-04-28 14:56:15 UTC (rev 3071) +++ branches/namespaces/qooxdoo/source/script/qx/constant/Event.js 2006-04-28 15:04:17 UTC (rev 3072) @@ -40,5 +40,14 @@ CONTEXTMENU : "contextmenu", KEYDOWN : "keydown", KEYPRESS : "keypress", - KEYUP : "keyup" + KEYUP : "keyup", + + BLUR : "blur", + FOCUS : "focus", + FOCUSIN : "focusin", + FOCUSOUT : "focusout", + SELECT : "select", + SCROLL : "scroll", + INPUT : "input", + CHANGE : "change" }); Modified: branches/namespaces/qooxdoo/source/script/qx/event/handler/EventHandler.js =================================================================== --- branches/namespaces/qooxdoo/source/script/qx/event/handler/EventHandler.js 2006-04-28 14:56:15 UTC (rev 3071) +++ branches/namespaces/qooxdoo/source/script/qx/event/handler/EventHandler.js 2006-04-28 15:04:17 UTC (rev 3072) @@ -219,8 +219,8 @@ this.attachEventTypes(qx.event.handler.EventHandler.dragEventTypes, this.__ondragevent); // Register window events - qx.dom.DomEventRegistration.addEventListener(wel, qx.Const.EVENT_TYPE_BLUR, this.__onwindowblur); - qx.dom.DomEventRegistration.addEventListener(wel, qx.Const.EVENT_TYPE_FOCUS, this.__onwindowfocus); + qx.dom.DomEventRegistration.addEventListener(wel, qx.constant.Event.BLUR, this.__onwindowblur); + qx.dom.DomEventRegistration.addEventListener(wel, qx.constant.Event.FOCUS, this.__onwindowfocus); qx.dom.DomEventRegistration.addEventListener(wel, qx.Const.EVENT_TYPE_RESIZE, this.__onwindowresize); // Register selection events @@ -244,8 +244,8 @@ this.detachEventTypes(qx.event.handler.EventHandler.dragEventTypes, this.__ondragevent); // Unregister window events - qx.dom.DomEventRegistration.removeEventListener(wel, qx.Const.EVENT_TYPE_BLUR, this.__onwindowblur); - qx.dom.DomEventRegistration.removeEventListener(wel, qx.Const.EVENT_TYPE_FOCUS, this.__onwindowfocus); + qx.dom.DomEventRegistration.removeEventListener(wel, qx.constant.Event.BLUR, this.__onwindowblur); + qx.dom.DomEventRegistration.removeEventListener(wel, qx.constant.Event.FOCUS, this.__onwindowfocus); qx.dom.DomEventRegistration.removeEventListener(wel, qx.Const.EVENT_TYPE_RESIZE, this.__onwindowresize); // Unregister selection events @@ -1005,7 +1005,7 @@ // Send blur event to client document if (this._attachedClientWindow) { - this._attachedClientWindow.getClientDocument().createDispatchEvent(qx.Const.EVENT_TYPE_BLUR); + this._attachedClientWindow.getClientDocument().createDispatchEvent(qx.constant.Event.BLUR); }; }; @@ -1028,7 +1028,7 @@ // Send focus event to client document if (this._attachedClientWindow) { - this._attachedClientWindow.getClientDocument().createDispatchEvent(qx.Const.EVENT_TYPE_FOCUS); + this._attachedClientWindow.getClientDocument().createDispatchEvent(qx.constant.Event.FOCUS); }; }; Modified: branches/namespaces/qooxdoo/source/script/qx/event/type/FocusEvent.js =================================================================== --- branches/namespaces/qooxdoo/source/script/qx/event/type/FocusEvent.js 2006-04-28 14:56:15 UTC (rev 3071) +++ branches/namespaces/qooxdoo/source/script/qx/event/type/FocusEvent.js 2006-04-28 15:04:17 UTC (rev 3072) @@ -42,8 +42,8 @@ switch(vType) { - case qx.Const.EVENT_TYPE_FOCUSIN: - case qx.Const.EVENT_TYPE_FOCUSOUT: + case qx.constant.Event.FOCUSIN: + case qx.constant.Event.FOCUSOUT: this.setBubbles(true); this.setPropagationStopped(false); }; Modified: branches/namespaces/qooxdoo/source/script/qx/type/Range.js =================================================================== --- branches/namespaces/qooxdoo/source/script/qx/type/Range.js 2006-04-28 14:56:15 UTC (rev 3071) +++ branches/namespaces/qooxdoo/source/script/qx/type/Range.js 2006-04-28 15:04:17 UTC (rev 3072) @@ -46,8 +46,8 @@ qx.Proto._modifyValue = function(propValue, propOldValue, propData) { - if (this.hasEventListeners(qx.Const.EVENT_TYPE_CHANGE)) { - this.dispatchEvent(new qx.event.type.Event(qx.Const.EVENT_TYPE_CHANGE), true); + if (this.hasEventListeners(qx.constant.Event.CHANGE)) { + this.dispatchEvent(new qx.event.type.Event(qx.constant.Event.CHANGE), true); }; return true; @@ -61,8 +61,8 @@ { this.setValue(Math.min(this.getValue(), propValue)); - if (this.hasEventListeners(qx.Const.EVENT_TYPE_CHANGE)) { - this.dispatchEvent(new qx.event.type.Event(qx.Const.EVENT_TYPE_CHANGE), true); + if (this.hasEventListeners(qx.constant.Event.CHANGE)) { + this.dispatchEvent(new qx.event.type.Event(qx.constant.Event.CHANGE), true); }; return true; @@ -76,8 +76,8 @@ { this.setValue(Math.max(this.getValue(), propValue)); - if (this.hasEventListeners(qx.Const.EVENT_TYPE_CHANGE)) { - this.dispatchEvent(new qx.event.type.Event(qx.Const.EVENT_TYPE_CHANGE), true); + if (this.hasEventListeners(qx.constant.Event.CHANGE)) { + this.dispatchEvent(new qx.event.type.Event(qx.constant.Event.CHANGE), true); }; return true; Modified: branches/namespaces/qooxdoo/source/script/qx/ui/core/Parent.js =================================================================== --- branches/namespaces/qooxdoo/source/script/qx/ui/core/Parent.js 2006-04-28 14:56:15 UTC (rev 3071) +++ branches/namespaces/qooxdoo/source/script/qx/ui/core/Parent.js 2006-04-28 15:04:17 UTC (rev 3072) @@ -166,9 +166,9 @@ if (vBlurValid) { // Dispatch FocusOut - if (propOldValue.hasEventListeners(qx.Const.EVENT_TYPE_FOCUSOUT)) + if (propOldValue.hasEventListeners(qx.constant.Event.FOCUSOUT)) { - var vEventObject = new qx.event.type.FocusEvent(qx.Const.EVENT_TYPE_FOCUSOUT, propOldValue); + var vEventObject = new qx.event.type.FocusEvent(qx.constant.Event.FOCUSOUT, propOldValue); if (vFocusValid) { vEventObject.setRelatedTarget(propValue); @@ -181,10 +181,10 @@ if (vFocusValid) { - if (propValue.hasEventListeners(qx.Const.EVENT_TYPE_FOCUSIN)) + if (propValue.hasEventListeners(qx.constant.Event.FOCUSIN)) { // Dispatch FocusIn - var vEventObject = new qx.event.type.FocusEvent(qx.Const.EVENT_TYPE_FOCUSIN, propValue); + var vEventObject = new qx.event.type.FocusEvent(qx.constant.Event.FOCUSIN, propValue); if (vBlurValid) { vEventObject.setRelatedTarget(propOldValue); @@ -204,7 +204,7 @@ propOldValue.setFocused(false); // Dispatch Blur - var vEventObject = new qx.event.type.FocusEvent(qx.Const.EVENT_TYPE_BLUR, propOldValue); + var vEventObject = new qx.event.type.FocusEvent(qx.constant.Event.BLUR, propOldValue); if (vFocusValid) { vEventObject.setRelatedTarget(propValue); @@ -223,7 +223,7 @@ propValue.getTopLevelWidget().getEventManager().setFocusRoot(this); // Dispatch Focus - var vEventObject = new qx.event.type.FocusEvent(qx.Const.EVENT_TYPE_FOCUS, propValue); + var vEventObject = new qx.event.type.FocusEvent(qx.constant.Event.FOCUS, propValue); if (vBlurValid) { vEventObject.setRelatedTarget(propOldValue); Modified: branches/namespaces/qooxdoo/source/script/qx/ui/core/Widget.js =================================================================== --- branches/namespaces/qooxdoo/source/script/qx/ui/core/Widget.js 2006-04-28 14:56:15 UTC (rev 3071) +++ branches/namespaces/qooxdoo/source/script/qx/ui/core/Widget.js 2006-04-28 15:04:17 UTC (rev 3072) @@ -3422,7 +3422,7 @@ this._oninlineproperty(e); break; - case qx.Const.EVENT_TYPE_INPUT: + case qx.constant.Event.INPUT: this._oninlineinput(e); break; @@ -3433,7 +3433,7 @@ qx.Proto._oninlineinput = function(e) { - this.createDispatchDataEvent(qx.Const.EVENT_TYPE_INPUT, this.getComputedValue()); + this.createDispatchDataEvent(qx.constant.Event.INPUT, this.getComputedValue()); // Block parents from this event if (e.stopPropagation) { Modified: branches/namespaces/qooxdoo/source/script/qx/ui/form/ComboBox.js =================================================================== --- branches/namespaces/qooxdoo/source/script/qx/ui/form/ComboBox.js 2006-04-28 14:56:15 UTC (rev 3071) +++ branches/namespaces/qooxdoo/source/script/qx/ui/form/ComboBox.js 2006-04-28 15:04:17 UTC (rev 3072) @@ -129,7 +129,7 @@ // CHILDREN EVENTS // ************************************************************************ p.addEventListener(qx.Const.EVENT_TYPE_APPEAR, this._onpopupappear, this); - f.addEventListener(qx.Const.EVENT_TYPE_INPUT, this._oninput, this); + f.addEventListener(qx.constant.Event.INPUT, this._oninput, this); // ************************************************************************ @@ -222,7 +222,7 @@ this._fromValue = true; // only do this if we called setValue seperatly - // and not from the event qx.Const.EVENT_TYPE_INPUT. + // and not from the event qx.constant.Event.INPUT. if (!this._fromInput) { this._field.setValue(propValue); }; Modified: branches/namespaces/qooxdoo/source/script/qx/ui/form/Spinner.js =================================================================== --- branches/namespaces/qooxdoo/source/script/qx/ui/form/Spinner.js 2006-04-28 14:56:15 UTC (rev 3071) +++ branches/namespaces/qooxdoo/source/script/qx/ui/form/Spinner.js 2006-04-28 15:04:17 UTC (rev 3072) @@ -99,11 +99,11 @@ this.addEventListener(qx.constant.Event.KEYUP, this._onkeyup, this); this.addEventListener(qx.constant.Event.MOUSEWHEEL, this._onmousewheel, this); - this._textfield.addEventListener(qx.Const.EVENT_TYPE_INPUT, this._oninput, this); - this._textfield.addEventListener(qx.Const.EVENT_TYPE_BLUR, this._onblur, this); + this._textfield.addEventListener(qx.constant.Event.INPUT, this._oninput, this); + this._textfield.addEventListener(qx.constant.Event.BLUR, this._onblur, this); this._upbutton.addEventListener(qx.constant.Event.MOUSEDOWN, this._onmousedown, this); this._downbutton.addEventListener(qx.constant.Event.MOUSEDOWN, this._onmousedown, this); - this._manager.addEventListener(qx.Const.EVENT_TYPE_CHANGE, this._onchange, this); + this._manager.addEventListener(qx.constant.Event.CHANGE, this._onchange, this); this._timer.addEventListener(qx.Const.EVENT_TYPE_INTERVAL, this._oninterval, this); @@ -404,8 +404,8 @@ this._upbutton.setEnabled(true); }; - if (this.hasEventListeners(qx.Const.EVENT_TYPE_CHANGE)) { - this.dispatchEvent(new qx.event.type.Event(qx.Const.EVENT_TYPE_CHANGE), true); + if (this.hasEventListeners(qx.constant.Event.CHANGE)) { + this.dispatchEvent(new qx.event.type.Event(qx.constant.Event.CHANGE), true); }; }; @@ -643,8 +643,8 @@ if (this._textfield) { - this._textfield.removeEventListener(qx.Const.EVENT_TYPE_BLUR, this._onblur, this); - this._textfield.removeEventListener(qx.Const.EVENT_TYPE_INPUT, this._oninput, this); + this._textfield.removeEventListener(qx.constant.Event.BLUR, this._onblur, this); + this._textfield.removeEventListener(qx.constant.Event.INPUT, this._oninput, this); this._textfield.dispose(); this._textfield = null; }; @@ -679,7 +679,7 @@ if (this._manager) { - this._manager.removeEventListener(qx.Const.EVENT_TYPE_CHANGE, this._onchange, this); + this._manager.removeEventListener(qx.constant.Event.CHANGE, this._onchange, this); this._manager.dispose(); this._manager = null; }; Modified: branches/namespaces/qooxdoo/source/script/qx/ui/form/TextField.js =================================================================== --- branches/namespaces/qooxdoo/source/script/qx/ui/form/TextField.js 2006-04-28 14:56:15 UTC (rev 3071) +++ branches/namespaces/qooxdoo/source/script/qx/ui/form/TextField.js 2006-04-28 15:04:17 UTC (rev 3072) @@ -52,10 +52,10 @@ // ************************************************************************ // EVENTS // ************************************************************************ - this.enableInlineEvent(qx.Const.EVENT_TYPE_INPUT); + this.enableInlineEvent(qx.constant.Event.INPUT); - this.addEventListener(qx.Const.EVENT_TYPE_BLUR, this._onblur); - this.addEventListener(qx.Const.EVENT_TYPE_FOCUS, this._onfocus); + this.addEventListener(qx.constant.Event.BLUR, this._onblur); + this.addEventListener(qx.constant.Event.FOCUS, this._onfocus); }); @@ -494,8 +494,8 @@ return; }; - this.removeEventListener(qx.Const.EVENT_TYPE_BLUR, this._onblur); - this.removeEventListener(qx.Const.EVENT_TYPE_FOCUS, this._onfocus); + this.removeEventListener(qx.constant.Event.BLUR, this._onblur); + this.removeEventListener(qx.constant.Event.FOCUS, this._onfocus); qx.ui.basic.Terminator.prototype.dispose.call(this); }; Modified: branches/namespaces/qooxdoo/source/script/qx/ui/listview/ListView.js =================================================================== --- branches/namespaces/qooxdoo/source/script/qx/ui/listview/ListView.js 2006-04-28 14:56:15 UTC (rev 3071) +++ branches/namespaces/qooxdoo/source/script/qx/ui/listview/ListView.js 2006-04-28 15:04:17 UTC (rev 3072) @@ -92,8 +92,8 @@ this._scroll.setWidth(qx.constant.Core.AUTO); this._scroll.setOverflow(qx.constant.Style.OVERFLOW_VERTICAL); this._scroll.setParent(this._frame); - this._scroll.enableInlineEvent(qx.Const.EVENT_TYPE_SCROLL); - this._scroll.addEventListener(qx.Const.EVENT_TYPE_SCROLL, this._onscroll, this); + this._scroll.enableInlineEvent(qx.constant.Event.SCROLL); + this._scroll.addEventListener(qx.constant.Event.SCROLL, this._onscroll, this); Modified: branches/namespaces/qooxdoo/tools/migration/0.6/patches/04-events.dat =================================================================== --- branches/namespaces/qooxdoo/tools/migration/0.6/patches/04-events.dat 2006-04-28 14:56:15 UTC (rev 3071) +++ branches/namespaces/qooxdoo/tools/migration/0.6/patches/04-events.dat 2006-04-28 15:04:17 UTC (rev 3072) @@ -10,3 +10,10 @@ qx.Const.EVENT_TYPE_KEYDOWN=qx.constant.Event.KEYDOWN qx.Const.EVENT_TYPE_KEYPRESS=qx.constant.Event.KEYPRESS qx.Const.EVENT_TYPE_KEYUP=qx.constant.Event.KEYUP + +qx.Const.EVENT_TYPE_BLUR=qx.constant.Event.BLUR +qx.Const.EVENT_TYPE_FOCUS=qx.constant.Event.FOCUS +qx.Const.EVENT_TYPE_SELECT=qx.constant.Event.SELECT +qx.Const.EVENT_TYPE_SCROLL=qx.constant.Event.SCROLL +qx.Const.EVENT_TYPE_INPUT=qx.constant.Event.INPUT +qx.Const.EVENT_TYPE_CHANGE=qx.constant.Event.CHANGE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |