You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2019/08/14 06:02:19 UTC
[royale-asjs] 04/08: RichTextEditor was using embeds and throwing
exceptions. Probably a TODO around getting the assets into the output
folders. Fixed #439
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit bd65f3aed0c3956c226f5eef86baa2715df32616
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Aug 13 16:29:47 2019 -0700
RichTextEditor was using embeds and throwing exceptions. Probably a TODO around getting the assets into the output folders. Fixed #439
---
.../src/main/config/compile-js-config.xml | 33 +++++++++++++++++++--
.../src/main/config/compile-swf-config.xml | 32 ++++++++++++++++++++
.../src/main/resources/assets/divider_vertical.png | Bin 0 -> 27186 bytes
.../main/resources/assets/icon_align_center.png | Bin 0 -> 27220 bytes
.../main/resources/assets/icon_align_justify.png | Bin 0 -> 27095 bytes
.../src/main/resources/assets/icon_align_left.png | Bin 0 -> 27210 bytes
.../src/main/resources/assets/icon_align_right.png | Bin 0 -> 27210 bytes
.../src/main/resources/assets/icon_bullet.png | Bin 0 -> 27234 bytes
.../src/main/resources/assets/icon_style_bold.png | Bin 0 -> 27205 bytes
.../main/resources/assets/icon_style_italic.png | Bin 0 -> 27229 bytes
.../main/resources/assets/icon_style_underline.png | Bin 0 -> 27197 bytes
.../main/royale/mx/controls/RichTextEditor.mxml | 16 +++++-----
12 files changed, 71 insertions(+), 10 deletions(-)
diff --git a/frameworks/js/projects/MXRoyaleJS/src/main/config/compile-js-config.xml b/frameworks/js/projects/MXRoyaleJS/src/main/config/compile-js-config.xml
index 1b48205..10b994b 100644
--- a/frameworks/js/projects/MXRoyaleJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/projects/MXRoyaleJS/src/main/config/compile-js-config.xml
@@ -95,10 +95,39 @@
<name>defaults.css</name>
<path>../../../../../../projects/MXRoyale/src/main/resources/defaults.css</path>
</include-file>
-
<include-file>
+ <name>assets/icon_align_center.png</name>
+ <path>../../../../../../projects/MXRoyale/src/main/resources/assets/icon_align_center.png</path>
</include-file>
-
+ <include-file>
+ <name>assets/icon_align_justify.png</name>
+ <path>../../../../../../projects/MXRoyale/src/main/resources/assets/icon_align_justify.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_align_left.png</name>
+ <path>../../../../../../projects/MXRoyale/src/main/resources/assets/icon_align_left.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_align_right.png</name>
+ <path>../../../../../../projects/MXRoyale/src/main/resources/assets/icon_align_right.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_bullet.png</name>
+ <path>../../../../../../projects/MXRoyale/src/main/resources/assets/icon_bullet.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_style_bold.png</name>
+ <path>../../../../../../projects/MXRoyale/src/main/resources/assets/icon_style_bold.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_style_italic.png</name>
+ <path>../../../../../../projects/MXRoyale/src/main/resources/assets/icon_style_italic.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_style_underline.png</name>
+ <path>../../../../../../projects/MXRoyale/src/main/resources/assets/icon_style_underline.png</path>
+ </include-file>
+
<include-classes>
<class>MXRoyaleClasses</class>
</include-classes>
diff --git a/frameworks/projects/MXRoyale/src/main/config/compile-swf-config.xml b/frameworks/projects/MXRoyale/src/main/config/compile-swf-config.xml
index 57f3dfb..f37525c 100644
--- a/frameworks/projects/MXRoyale/src/main/config/compile-swf-config.xml
+++ b/frameworks/projects/MXRoyale/src/main/config/compile-swf-config.xml
@@ -98,6 +98,38 @@
<name>defaults.css</name>
<path>../resources/defaults.css</path>
</include-file>
+ <include-file>
+ <name>assets/icon_align_center.png</name>
+ <path>../resources/assets/icon_align_center.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_align_justify.png</name>
+ <path>../resources/assets/icon_align_justify.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_align_left.png</name>
+ <path>../resources/assets/icon_align_left.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_align_right.png</name>
+ <path>../resources/assets/icon_align_right.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_bullet.png</name>
+ <path>../resources/assets/icon_bullet.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_style_bold.png</name>
+ <path>../resources/assets/icon_style_bold.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_style_italic.png</name>
+ <path>../resources/assets/icon_style_italic.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_style_underline.png</name>
+ <path>../resources/assets/icon_style_underline.png</path>
+ </include-file>
<include-lookup-only>true</include-lookup-only>
diff --git a/frameworks/projects/MXRoyale/src/main/resources/assets/divider_vertical.png b/frameworks/projects/MXRoyale/src/main/resources/assets/divider_vertical.png
new file mode 100644
index 0000000..b87b3bd
Binary files /dev/null and b/frameworks/projects/MXRoyale/src/main/resources/assets/divider_vertical.png differ
diff --git a/frameworks/projects/MXRoyale/src/main/resources/assets/icon_align_center.png b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_align_center.png
new file mode 100644
index 0000000..3fac48d
Binary files /dev/null and b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_align_center.png differ
diff --git a/frameworks/projects/MXRoyale/src/main/resources/assets/icon_align_justify.png b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_align_justify.png
new file mode 100644
index 0000000..bf4a6d6
Binary files /dev/null and b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_align_justify.png differ
diff --git a/frameworks/projects/MXRoyale/src/main/resources/assets/icon_align_left.png b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_align_left.png
new file mode 100644
index 0000000..c9f45f6
Binary files /dev/null and b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_align_left.png differ
diff --git a/frameworks/projects/MXRoyale/src/main/resources/assets/icon_align_right.png b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_align_right.png
new file mode 100644
index 0000000..1bdcda3
Binary files /dev/null and b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_align_right.png differ
diff --git a/frameworks/projects/MXRoyale/src/main/resources/assets/icon_bullet.png b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_bullet.png
new file mode 100644
index 0000000..a99e9a2
Binary files /dev/null and b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_bullet.png differ
diff --git a/frameworks/projects/MXRoyale/src/main/resources/assets/icon_style_bold.png b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_style_bold.png
new file mode 100644
index 0000000..a0a71d1
Binary files /dev/null and b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_style_bold.png differ
diff --git a/frameworks/projects/MXRoyale/src/main/resources/assets/icon_style_italic.png b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_style_italic.png
new file mode 100644
index 0000000..2d0221d
Binary files /dev/null and b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_style_italic.png differ
diff --git a/frameworks/projects/MXRoyale/src/main/resources/assets/icon_style_underline.png b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_style_underline.png
new file mode 100644
index 0000000..316b2f1
Binary files /dev/null and b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_style_underline.png differ
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/RichTextEditor.mxml b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/RichTextEditor.mxml
index 418e138..4add9d2 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/RichTextEditor.mxml
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/RichTextEditor.mxml
@@ -1060,15 +1060,15 @@
<mx:HBox id="toolBar2" horizontalGap="0">
<mx:Button id="boldButton" width="20" toggle="true"
- icon="@Embed('assets/icon_style_bold.png')"
+ icon="assets/icon_style_bold.png"
click="setTextStyles('bold', event.currentTarget.selected);" />
<mx:Button id="italicButton" width="20" toggle="true"
- icon="@Embed('assets/icon_style_italic.png')"
+ icon="assets/icon_style_italic.png"
click="setTextStyles('italic', event.currentTarget.selected);" />
<mx:Button id="underlineButton" width="20" toggle="true"
- icon="@Embed('assets/icon_style_underline.png')"
+ icon="assets/icon_style_underline.png"
click="setTextStyles('underline', event.currentTarget.selected);" />
</mx:HBox>
@@ -1082,16 +1082,16 @@
itemClick="setTextStyles('align', ToggleButtonBar(event.currentTarget).dataProvider.getItemAt(ToggleButtonBar(event.currentTarget).selectedIndex).action); " >
<mx:dataProvider>
<fx:Array>
- <fx:Object icon="@Embed('assets/icon_align_left.png')" action="left"/>
- <fx:Object icon="@Embed('assets/icon_align_center.png')" action="center"/>
- <fx:Object icon="@Embed('assets/icon_align_right.png')" action="right"/>
- <fx:Object icon="@Embed('assets/icon_align_justify.png')" action="justify"/>
+ <fx:Object icon="assets/icon_align_left.png" action="left"/>
+ <fx:Object icon="assets/icon_align_center.png" action="center"/>
+ <fx:Object icon="assets/icon_align_right.png" action="right"/>
+ <fx:Object icon="assets/icon_align_justify.png" action="justify"/>
</fx:Array>
</mx:dataProvider>
</mx:ToggleButtonBar>
<mx:Button id="bulletButton" width="20" toggle="true"
- icon="@Embed('assets/icon_bullet.png')"
+ icon="assets/icon_bullet.png"
click="setTextStyles('bullet', event.currentTarget.selected);" />
<mx:VRule height="{linkTextInput.height}"/>