You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2017/08/30 20:37:14 UTC
[02/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] -
Simplified ToggleTextButton
Simplified ToggleTextButton
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d104a2ed
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d104a2ed
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d104a2ed
Branch: refs/heads/feature/dragAndDrop
Commit: d104a2edb2ef06e348ee65d9b56d44ccd071841c
Parents: 8b10930
Author: Harbs <ha...@in-tools.com>
Authored: Mon Aug 21 14:01:55 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Aug 21 14:01:55 2017 +0300
----------------------------------------------------------------------
.../org/apache/flex/html/ToggleTextButton.as | 25 ++++----------------
1 file changed, 4 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d104a2ed/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as
index 6061898..8718a6f 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as
@@ -85,10 +85,6 @@ package org.apache.flex.html
{
addEventListener(MouseEvent.CLICK, internalMouseHandler);
}
- COMPILE::JS
- {
- this.typeNames = 'toggleTextButton';
- }
}
private var _selected:Boolean = false;
@@ -130,9 +126,7 @@ package org.apache.flex.html
if (_selected != value)
{
_selected = value;
-
internalSelected();
-
dispatchEvent(new Event("change"));
}
}
@@ -177,26 +171,15 @@ package org.apache.flex.html
COMPILE::JS
{
var isToggleTextButtonSelected:Boolean = element.classList.contains("toggleTextButton_Selected");
- if (!isToggleTextButtonSelected && _selected == true)
- {
- element.classList.add("toggleTextButton_Selected");
- }
- else if (isToggleTextButtonSelected && _selected == false)
- {
+ //sync the class with the state
+ if(isToggleTextButtonSelected != _selected)
element.classList.toggle("toggleTextButton_Selected");
- }
var isToggleTextButton:Boolean = element.classList.contains("toggleTextButton");
- if (!isToggleTextButton && _selected == false)
- {
- element.classList.add("toggleTextButton");
- }
- else if (isToggleTextButton && _selected == true)
- {
+ // Need to toggle if we have the class and it's selected or we don't and it's not selected.
+ if(isToggleTextButton == _selected)
element.classList.toggle("toggleTextButton");
- }
- typeNames = element.className;
}
}