flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject git commit: [flex-asjs] [refs/heads/feature/mdl] - Fix compilation
Date Mon, 19 Dec 2016 09:34:08 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/feature/mdl fa6ce36ce -> 2316c20cc


Fix compilation


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2316c20c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2316c20c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2316c20c

Branch: refs/heads/feature/mdl
Commit: 2316c20cc3f02546352425b9d1fb73fb32e800f1
Parents: fa6ce36
Author: Carlos Rovira <carlosrovira@apache.org>
Authored: Mon Dec 19 10:34:04 2016 +0100
Committer: Carlos Rovira <carlosrovira@apache.org>
Committed: Mon Dec 19 10:34:04 2016 +0100

----------------------------------------------------------------------
 .../MaterialDesignLite/src/main/flex/MDLClasses.as   |  4 +++-
 .../org/apache/flex/mdl/beads/SliderThumbView.as     |  5 ++---
 .../org/apache/flex/mdl/beads/SliderTrackView.as     |  3 +--
 .../mdl/beads/controllers/SliderMouseController.as   |  4 +---
 .../src/main/resources/defaults.css                  | 15 +++++++++------
 .../src/main/resources/mdl-manifest.xml              |  2 --
 6 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2316c20c/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as b/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as
index 7a8d043..a11f639 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as
@@ -27,9 +27,11 @@ package
 	*/
 	internal class MDLClasses
 	{	
+		
 		COMPILE::SWF
 		{
-			//import org.apache.flex.mdl.beads.TextPromptBead; TextPromptBead;
+			import org.apache.flex.mdl.beads.SliderThumbView; SliderThumbView;
+			import org.apache.flex.mdl.beads.SliderTrackView; SliderTrackView;
 		}
 	}
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2316c20c/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/SliderThumbView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/SliderThumbView.as
b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/SliderThumbView.as
index 5113b5a..11ad3c3 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/SliderThumbView.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/SliderThumbView.as
@@ -25,12 +25,11 @@ package org.apache.flex.mdl.beads
     import org.apache.flex.core.BeadViewBase;
     import org.apache.flex.core.IBeadView;
     import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
+	import org.apache.flex.html.Button;
+    import org.apache.flex.events.Event;
     import org.apache.flex.events.IEventDispatcher;
     import org.apache.flex.core.IChild;
 	
-    import org.apache.flex.mdl.Button;
-
 	/**
 	 *  The SliderThumbView class creates the draggable input element for the 
 	 *  org.apache.flex.html.Slider component.

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2316c20c/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/SliderTrackView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/SliderTrackView.as
b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/SliderTrackView.as
index 603a4fb..dc63e1d 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/SliderTrackView.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/SliderTrackView.as
@@ -26,11 +26,10 @@ package org.apache.flex.mdl.beads
 	import org.apache.flex.core.IBeadView;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.UIBase;
+	import org.apache.flex.html.Button;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
 	import org.apache.flex.core.IChild;
-
-    import org.apache.flex.mdl.Button;
 	
 	/**
 	 *  The SliderTrackView class creates the track area for the org.apache.flex.html.Slider

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2316c20c/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
index 8cbc8db..3f06299 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
@@ -27,7 +27,6 @@ package org.apache.flex.mdl.beads.controllers
 	import org.apache.flex.events.IEventDispatcher;
 	import org.apache.flex.events.MouseEvent;
 	import org.apache.flex.geom.Point;
-
 	import org.apache.flex.html.beads.ISliderView;
 	import org.apache.flex.mdl.beads.SliderTrackView;
 
@@ -36,7 +35,6 @@ package org.apache.flex.mdl.beads.controllers
         import goog.events;
         import goog.events.EventType;
         import org.apache.flex.events.BrowserEvent;
-
         import org.apache.flex.mdl.Slider;
         import org.apache.flex.mdl.beads.SliderThumbView;
         import org.apache.flex.mdl.beads.SliderTrackView;
@@ -44,7 +42,7 @@ package org.apache.flex.mdl.beads.controllers
 	
 	/**
 	 *  The SliderMouseController class bead handles mouse events on the 
-	 *  org.apache.flex.html.Slider's component parts (thumb and track) and 
+	 *  org.apache.flex.mdl.Slider's component parts (thumb and track) and 
 	 *  dispatches change events on behalf of the Slider (as well as co-ordinating visual 
 	 *  changes (such as moving the thumb when the track has been tapped or clicked).
 	 *  

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2316c20c/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
index 810be12..14efca5 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
@@ -32,12 +32,6 @@ Slider
 	iBeadController: ClassReference("org.apache.flex.mdl.beads.controllers.SliderMouseController");
 }
 
-Slider
-{
-    iThumbView: ClassReference("org.apache.flex.mdl.beads.SliderThumbView");
-    iTrackView: ClassReference("org.apache.flex.mdl.beads.SliderTrackView");
-}
-
 List
 {
     IBeadView: ClassReference("org.apache.flex.mdl.beads.views.ListView");
@@ -48,3 +42,12 @@ List
     IItemRenderer: ClassReference("org.apache.flex.mdl.itemRenderers.ListItemRenderer");
 }
 
+
+@media -flex-flash
+{
+    Slider
+    {
+        iThumbView: ClassReference("org.apache.flex.mdl.beads.SliderThumbView");
+        iTrackView: ClassReference("org.apache.flex.mdl.beads.SliderTrackView");
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2316c20c/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
index 4ad2ebd..d13f49c 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
@@ -31,8 +31,6 @@
     <component id="Disabled" class="org.apache.flex.mdl.beads.Disabled"/>
     <component id="Slider" class="org.apache.flex.mdl.Slider"/>
     <component id="SliderView" class="org.apache.flex.mdl.beads.views.SliderView"/>
-    <component id="SliderTrackView" class="org.apache.flex.mdl.beads.SliderTrackView"/>
-    <component id="SliderThumbView" class="org.apache.flex.mdl.beads.SliderThumbView"/>
     <component id="SliderMouseController" class="org.apache.flex.mdl.beads.controllers.SliderMouseController"/>
     <component id="Badge" class="org.apache.flex.mdl.beads.Badge"/>
     <component id="Menu" class="org.apache.flex.mdl.Menu"/>


Mime
View raw message