You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/05/16 16:48:31 UTC
[2/8] git commit: [flex-asjs] [refs/heads/release0.8.0] - take
StatesImpl and EffectTimer out of defaults. Most examples weren't using them
take StatesImpl and EffectTimer out of defaults. Most examples weren't using them
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f18db104
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f18db104
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f18db104
Branch: refs/heads/release0.8.0
Commit: f18db104ae9d74f87e30fb3defd5472c46bb3618
Parents: 0ae1768
Author: Alex Harui <ah...@apache.org>
Authored: Mon May 15 20:26:33 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue May 16 09:47:40 2017 -0700
----------------------------------------------------------------------
.../DataBindingExample/src/main/flex/DataBindingExample.mxml | 7 +++++++
.../src/main/flex/DataBindingExampleWithFlexLayout.mxml | 7 +++++++
.../src/main/flex/MyInitialView.mxml | 4 ++++
.../src/main/flex/DataBindingExample.mxml | 7 +++++++
.../DataBindingExample_Flat/src/main/flex/MyInitialView.mxml | 4 ++++
examples/flexjs/FlexJSStore/src/main/flex/main.css | 1 +
examples/flexjs/FlexJSStore_jquery/src/main/flex/main.css | 1 +
frameworks/projects/Basic/src/main/resources/defaults.css | 2 --
frameworks/projects/Express/src/main/resources/defaults.css | 5 +++++
manualtests/DataBindingTestbed/src/DataBindingTestbed.mxml | 7 +++++++
manualtests/FlexJSTest_SVG/src/FlexJSTest_SVG.mxml | 7 +++++++
mustella/tests/basicTests/BasicTestsApp.mxml | 7 +++++++
12 files changed, 57 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f18db104/examples/flexjs/DataBindingExample/src/main/flex/DataBindingExample.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample/src/main/flex/DataBindingExample.mxml b/examples/flexjs/DataBindingExample/src/main/flex/DataBindingExample.mxml
index 751e427..fa8132b 100644
--- a/examples/flexjs/DataBindingExample/src/main/flex/DataBindingExample.mxml
+++ b/examples/flexjs/DataBindingExample/src/main/flex/DataBindingExample.mxml
@@ -24,6 +24,13 @@ limitations under the License.
xmlns:controllers="controllers.*"
initialize="MyModel(model).stockSymbol='ADBE'"
>
+ <fx:Style>
+ @namespace basic "library://ns.apache.org/flexjs/basic";
+
+ global {
+ IStatesImpl: ClassReference("org.apache.flex.core.SimpleStatesImpl");
+ }
+ </fx:Style>
<js:valuesImpl>
<js:SimpleCSSValuesImpl />
</js:valuesImpl>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f18db104/examples/flexjs/DataBindingExampleWithFlexLayout/src/main/flex/DataBindingExampleWithFlexLayout.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExampleWithFlexLayout/src/main/flex/DataBindingExampleWithFlexLayout.mxml b/examples/flexjs/DataBindingExampleWithFlexLayout/src/main/flex/DataBindingExampleWithFlexLayout.mxml
index 751e427..fa8132b 100644
--- a/examples/flexjs/DataBindingExampleWithFlexLayout/src/main/flex/DataBindingExampleWithFlexLayout.mxml
+++ b/examples/flexjs/DataBindingExampleWithFlexLayout/src/main/flex/DataBindingExampleWithFlexLayout.mxml
@@ -24,6 +24,13 @@ limitations under the License.
xmlns:controllers="controllers.*"
initialize="MyModel(model).stockSymbol='ADBE'"
>
+ <fx:Style>
+ @namespace basic "library://ns.apache.org/flexjs/basic";
+
+ global {
+ IStatesImpl: ClassReference("org.apache.flex.core.SimpleStatesImpl");
+ }
+ </fx:Style>
<js:valuesImpl>
<js:SimpleCSSValuesImpl />
</js:valuesImpl>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f18db104/examples/flexjs/DataBindingExampleWithFlexLayout/src/main/flex/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExampleWithFlexLayout/src/main/flex/MyInitialView.mxml b/examples/flexjs/DataBindingExampleWithFlexLayout/src/main/flex/MyInitialView.mxml
index 034d8c1..99dc269 100644
--- a/examples/flexjs/DataBindingExampleWithFlexLayout/src/main/flex/MyInitialView.mxml
+++ b/examples/flexjs/DataBindingExampleWithFlexLayout/src/main/flex/MyInitialView.mxml
@@ -71,6 +71,10 @@ limitations under the License.
<fx:Style>
@namespace basic "library://ns.apache.org/flexjs/basic";
+ global {
+ IStatesImpl: ClassReference("org.apache.flex.core.SimpleStatesImpl");
+ }
+
.inner {
width: 400px;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f18db104/examples/flexjs/DataBindingExample_Flat/src/main/flex/DataBindingExample.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_Flat/src/main/flex/DataBindingExample.mxml b/examples/flexjs/DataBindingExample_Flat/src/main/flex/DataBindingExample.mxml
index 751e427..fa8132b 100644
--- a/examples/flexjs/DataBindingExample_Flat/src/main/flex/DataBindingExample.mxml
+++ b/examples/flexjs/DataBindingExample_Flat/src/main/flex/DataBindingExample.mxml
@@ -24,6 +24,13 @@ limitations under the License.
xmlns:controllers="controllers.*"
initialize="MyModel(model).stockSymbol='ADBE'"
>
+ <fx:Style>
+ @namespace basic "library://ns.apache.org/flexjs/basic";
+
+ global {
+ IStatesImpl: ClassReference("org.apache.flex.core.SimpleStatesImpl");
+ }
+ </fx:Style>
<js:valuesImpl>
<js:SimpleCSSValuesImpl />
</js:valuesImpl>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f18db104/examples/flexjs/DataBindingExample_Flat/src/main/flex/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_Flat/src/main/flex/MyInitialView.mxml b/examples/flexjs/DataBindingExample_Flat/src/main/flex/MyInitialView.mxml
index 26ca9b0..a639a18 100644
--- a/examples/flexjs/DataBindingExample_Flat/src/main/flex/MyInitialView.mxml
+++ b/examples/flexjs/DataBindingExample_Flat/src/main/flex/MyInitialView.mxml
@@ -72,6 +72,10 @@ limitations under the License.
<fx:Style>
@namespace basic "library://ns.apache.org/flexjs/basic";
+ global {
+ IStatesImpl: ClassReference("org.apache.flex.core.SimpleStatesImpl");
+ }
+
.output {
font-size: 20px;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f18db104/examples/flexjs/FlexJSStore/src/main/flex/main.css
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/main/flex/main.css b/examples/flexjs/FlexJSStore/src/main/flex/main.css
index f678354..bb2e8b3 100755
--- a/examples/flexjs/FlexJSStore/src/main/flex/main.css
+++ b/examples/flexjs/FlexJSStore/src/main/flex/main.css
@@ -35,6 +35,7 @@
global {
IStatesImpl: ClassReference("org.apache.flex.core.StatesWithTransitionsImpl");
+ IEffectTimer: ClassReference("org.apache.flex.utils.EffectTimer");
}
/*
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f18db104/examples/flexjs/FlexJSStore_jquery/src/main/flex/main.css
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/main/flex/main.css b/examples/flexjs/FlexJSStore_jquery/src/main/flex/main.css
index f678354..bb2e8b3 100755
--- a/examples/flexjs/FlexJSStore_jquery/src/main/flex/main.css
+++ b/examples/flexjs/FlexJSStore_jquery/src/main/flex/main.css
@@ -35,6 +35,7 @@
global {
IStatesImpl: ClassReference("org.apache.flex.core.StatesWithTransitionsImpl");
+ IEffectTimer: ClassReference("org.apache.flex.utils.EffectTimer");
}
/*
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f18db104/frameworks/projects/Basic/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css
index bb92b5d..90f0ccb 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -595,8 +595,6 @@ WebBrowser
/* Global Style Declaration */
global
{
- IStatesImpl: ClassReference("org.apache.flex.core.SimpleStatesImpl");
- IEffectTimer: ClassReference("org.apache.flex.utils.EffectTimer");
effectTimerInterval: 10;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f18db104/frameworks/projects/Express/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/resources/defaults.css b/frameworks/projects/Express/src/main/resources/defaults.css
index cf49448..4949005 100644
--- a/frameworks/projects/Express/src/main/resources/defaults.css
+++ b/frameworks/projects/Express/src/main/resources/defaults.css
@@ -33,6 +33,11 @@
box-sizing: border-box;
}
+global {
+ IStatesImpl: ClassReference("org.apache.flex.core.StatesWithTransitionsImpl");
+ IEffectTimer: ClassReference("org.apache.flex.utils.EffectTimer");
+}
+
Application
{
padding: 0px;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f18db104/manualtests/DataBindingTestbed/src/DataBindingTestbed.mxml
----------------------------------------------------------------------
diff --git a/manualtests/DataBindingTestbed/src/DataBindingTestbed.mxml b/manualtests/DataBindingTestbed/src/DataBindingTestbed.mxml
index 6857198..42ff05a 100644
--- a/manualtests/DataBindingTestbed/src/DataBindingTestbed.mxml
+++ b/manualtests/DataBindingTestbed/src/DataBindingTestbed.mxml
@@ -24,6 +24,13 @@ limitations under the License.
xmlns:controllers="controllers.*"
>
+ <fx:Style>
+ @namespace basic "library://ns.apache.org/flexjs/basic";
+
+ global {
+ IStatesImpl: ClassReference("org.apache.flex.core.SimpleStatesImpl");
+ }
+ </fx:Style>
<js:valuesImpl>
<js:SimpleCSSValuesImpl />
</js:valuesImpl>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f18db104/manualtests/FlexJSTest_SVG/src/FlexJSTest_SVG.mxml
----------------------------------------------------------------------
diff --git a/manualtests/FlexJSTest_SVG/src/FlexJSTest_SVG.mxml b/manualtests/FlexJSTest_SVG/src/FlexJSTest_SVG.mxml
index e405b05..4192a21 100644
--- a/manualtests/FlexJSTest_SVG/src/FlexJSTest_SVG.mxml
+++ b/manualtests/FlexJSTest_SVG/src/FlexJSTest_SVG.mxml
@@ -24,6 +24,13 @@ limitations under the License.
xmlns:controllers="controllers.*"
initialize="MyModel(model).labelText='Hello SVG'"
>
+ <fx:Style>
+ @namespace basic "library://ns.apache.org/flexjs/basic";
+
+ global {
+ IStatesImpl: ClassReference("org.apache.flex.core.SimpleStatesImpl");
+ }
+ </fx:Style>
<js:valuesImpl>
<js:SimpleCSSValuesImpl />
</js:valuesImpl>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f18db104/mustella/tests/basicTests/BasicTestsApp.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/basicTests/BasicTestsApp.mxml b/mustella/tests/basicTests/BasicTestsApp.mxml
index 805b535..cc3a9a0 100644
--- a/mustella/tests/basicTests/BasicTestsApp.mxml
+++ b/mustella/tests/basicTests/BasicTestsApp.mxml
@@ -23,6 +23,13 @@ limitations under the License.
xmlns:models="models.*"
xmlns:controllers="controllers.*"
>
+ <fx:Style>
+ @namespace basic "library://ns.apache.org/flexjs/basic";
+
+ global {
+ IStatesImpl: ClassReference("org.apache.flex.core.SimpleStatesImpl");
+ }
+ </fx:Style>
<js:valuesImpl>
<js:SimpleCSSValuesImpl />
</js:valuesImpl>