Author: hqm
Date: 2008-03-24 11:13:44 -0700 (Mon, 24 Mar 2008)
New Revision: 8371
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/Library.lzs
openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzInputText.lzs
openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.lzs
Log:
Change 20080324-hqm-k by [EMAIL PROTECTED] on 2008-03-24 14:13:23 EDT
in /Users/hqm/openlaszlo/devildog2/WEB-INF/lps/lfc
for http://svn.openlaszlo.org/openlaszlo/branches/devildog/WEB-INF/lps/lfc
Summary: fix some merge issues in LzInputText
New Features:
Bugs Fixed:
Technical Reviewer: (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
Tests:
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/Library.lzs
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/Library.lzs
2008-03-24 18:04:46 UTC (rev 8370)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/Library.lzs
2008-03-24 18:13:44 UTC (rev 8371)
@@ -9,13 +9,12 @@
#include "views/LaszloView.lzs"
#include "views/LzText.lzs"
+#include "views/LzInputText.lzs"
if($swf9) {
#include "views/LzViewLinkage.js"
- #include "views/LzInputText.js"
} else {
#include "views/LzViewLinkage.lzs"
- #include "views/LzInputText.lzs"
}
if($swf9) {
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzInputText.lzs
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzInputText.lzs
2008-03-24 18:04:46 UTC (rev 8370)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzInputText.lzs
2008-03-24 18:13:44 UTC (rev 8371)
@@ -87,20 +87,6 @@
/** @lzxtype event */
var onselect = LzDeclaredEvent;
-/** whenever the text in the field changes.
- * @lzxtype event
- */
-var ontext = LzDeclaredEvent;
-
-/** @access private */
-var _onfocusDel = null;
-
-/** @access private */
-var _onblurDel = null;
-
-/** @access private */
-var _modemanagerDel = null;
-
/**
* Width to use for text field if none is specified
* @access private
@@ -111,11 +97,11 @@
/** @access private */
-var _onfocusDel;
+var _onfocusDel = null;
/** @access private */
-var _onblurDel;
+var _onblurDel = null;
/** @access private */
-var _modemanagerDel;
+var _modemanagerDel = null;
/**
* @access private
@@ -134,7 +120,7 @@
/**
* @access private
*/
-function destroy (recursiveCall) {
+override function destroy (recursiveCall) {
if (this._onfocusDel) {
this._onfocusDel.unregisterAll();
this._onfocusDel = null;
@@ -277,7 +263,7 @@
if (this.ontext.ready) this.ontext.sendEvent(t);
}
-function getText ( ){
+override function getText ( ){
return this.sprite.getText();
}
@@ -338,7 +324,7 @@
/**
* @access private
*/
-public override function setSelectable(value) {
+override function setSelectable(value) {
this._selectable = value;
// depending on allowselectable : the setted value or false !
super.setSelectable( this._allowselectable ? value : false );
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.lzs
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.lzs
2008-03-24 18:04:46 UTC (rev 8370)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.lzs
2008-03-24 18:13:44 UTC (rev 8371)
@@ -551,7 +551,7 @@
/**
* @access private
*/
-function toString ( ){
+override function toString ( ){
return "LzText: " + this.getText();
}
@@ -627,7 +627,7 @@
/**
* @access private
*/
-function $lzc$set_font(v) { this.setFontName(v); }
+override function $lzc$set_font(v) { this.setFontName(v); }
/**
* @access private
*/
@@ -876,7 +876,7 @@
/**
* @access private
*/
-function setFontName ( fname ){
+override function setFontName ( fname ){
this.tsprite.setFontName(fname);
this.fontname = fname;
// force recompute of height if needed
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
