Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/HendrixString/Falcon
Browse files Browse the repository at this point in the history 
Conflicts:
	.actionScriptProperties
	bin/Falcon.swc
  • Loading branch information
@HendrixString
HendrixString committed Dec 5, 2015
2 parents 416375a + 1d37edb commit b708072
Show file tree
Hide file tree
Showing 40 changed files with 789 additions and 287 deletions.
6 changes: 3 additions & 3 deletions .actionScriptProperties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<excludedEntries>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_charts.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/advancedgrids.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/charts.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_air.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/locale/{locale}" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/charts.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/netmon.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/locale/{locale}" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/spark.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/sparkskins.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/rpc.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp_air.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/videoPlayer.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp_air.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/flash-integration.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/authoringsupport.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp.swc" useDefaultLinkType="false"/>
Expand Down
Binary file removed bin/Falcon.swc
View file
Binary file not shown.
1 change: 1 addition & 0 deletions src/com/hendrix/feathers/controls/CompsFactory.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ package com.hendrix.feathers.controls
*/
public function CompsFactory()
{

// placed here in order to load the TextFieldLibarary
var btf:BidiTextField;
var coll:IdCollection;
Expand Down
11 changes: 6 additions & 5 deletions src/com/hendrix/feathers/controls/core/sql/sqlSerialData/SQLSerialDataTable.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package com.hendrix.feathers.controls.core.sql.sqlSerialData
private var _TABLE_NAME: String;

// Contacts Table Columns names
private static const KEY_ID: String = "id";
private static const KEY_DATA: String = "data";
protected static const KEY_ID: String = "id";
protected static const KEY_DATA: String = "data";

private var _connection: SQLConnection = null;
protected var _connection: SQLConnection = null;

private var _dbName: String = null;
private var _dbPath: File = null;
Expand Down Expand Up @@ -100,9 +100,11 @@ package com.hendrix.feathers.controls.core.sql.sqlSerialData
/**
* Select data from a window of identifiers. useful when ids are timestamps.
* requires QA.
*
* @param idFrom starting id
* @param idTo last id
* @param callback a callback
*
* @return Array result, or null and Array into callback
*/
public function getDataBetween(idFrom:String, idTo:String, callback:Function = null):Array
Expand Down Expand Up @@ -153,9 +155,8 @@ package com.hendrix.feathers.controls.core.sql.sqlSerialData
* add new data, or update an older one with the correct conflict algorithm
* @param id the id of the data
* @param data the data
* @param conflictAlgorithm for example <code>SQLiteDatabase.CONFLICT_REPLACE</code>
*/
public function addData(id: String, data:Object, conflictAlgorithm:int):void
public function addData(id: String, data:Object):void
{
if(_connection.connected == false)
return ;
Expand Down
1 change: 0 additions & 1 deletion src/com/hendrix/feathers/controls/core/sql/sqlSerialData/SQLUtils.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ package com.hendrix.feathers.controls.core.sql.sqlSerialData
arr[ix].data = Serialize.stringToObject(arr[ix].data);
}


return arr;
}
}
Expand Down
33 changes: 18 additions & 15 deletions src/com/hendrix/feathers/controls/flex/ActionBar.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,27 @@ package com.hendrix.feathers.controls.flex

/**
* <p>a very lite Action Bar component, requires a data provider</p>
* <p><b>Example:</b><br>
* <code>
* this.dataProvier = Vector.Object([<br>
* { id: "1", src: do1, align:"right"},<br>
* { id: "2", src: do2, align:"center"},<br>
* { id: "3", src: do3, align:"left"},<br>
* { id: "4", src: do4, align:"left"}<br>
* ]);</code><br>
* <p><b>Example:</b>
*
* <pre>
* this.dataProvier = Vector.Object([
* { id: "1", src: do1, align:"right"},
* { id: "2", src: do2, align:"center"},
* { id: "3", src: do3, align:"left"},
* { id: "4", src: do4, align:"left"}
* ]);</pre><br>
*
* <b>Notes:</b>
*
* <ul>
* <li>set <code>leftItemsPercentWidth/Height, rightItemsPercentWidth/Height, centerItemsPercentWidth/Height</code> to control layout</li>
* <li>set <code>percentHeight</code> to control height of componenet relative to it's parent, or <code>height</code> to control pixel wise</li>
* <li>set <code>bgSkinSource</code> to control background, it can be color, texture, class, bitmap etc..</li>
* <li>set <code>onSelected</code> to listen to items being clicked, it will return an <code>id</code> string</li>
* <li><code>src</code> can be any <code>DisplayObject</code></li>
* <li>use <code>mrUpdateContent(id, src)</code> to update an exiting item</li>
* <li>set <code>leftItemsPercentWidth/Height, rightItemsPercentWidth/Height, centerItemsPercentWidth/Height</code> to control layout</li>
* <li>set <code>percentHeight</code> to control height of componenet relative to it's parent, or <code>height</code> to control pixel wise</li>
* <li>set <code>bgSkinSource</code> to control background, it can be color, texture, class, bitmap etc..</li>
* <li>set <code>onSelected</code> to listen to items being clicked, it will return an <code>id</code> string</li>
* <li><code>src</code> can be any <code>DisplayObject</code></li>
* <li>use <code>mrUpdateContent(id, src)</code> to update an exiting item</li>
* </ul>
* </p>
*
* @author Tomer Shalev
*/
public class ActionBar extends FlexComp
Expand Down
1 change: 1 addition & 0 deletions src/com/hendrix/feathers/controls/flex/AnimatedControl.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package com.hendrix.feathers.controls.flex

/**
* animated control
*
* @author Tomer Shalev
*
*/
Expand Down
6 changes: 5 additions & 1 deletion src/com/hendrix/feathers/controls/flex/Dialog.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@ package com.hendrix.feathers.controls.flex
import starling.events.Event;

/**
* a Dialog control <br>
* a Dialog control
*
* <li>use <code>this.dialogContent</code> to put a DisplayObject as the content of the dialog.
* <li>use <code>this.textOK, this.textCANCEL, this.textHEADLINE</code> to alter the text.
* <li>use <code>this.textCANCEL</code> to put a DisplayObject as the content of the dialog.
* <li>use <code>this.tf_buttons, tf_headline</code> to control textFormat of buttons and headline respectively.
* <li>use <code>this.embeddedFonts</code> to specify that the fonts are embedded or not.
* <li>use <code>this.onAction</code> callback to listen to OK/CANCEL, callback will return ACTION_OK/ACTION_CANCEL respectively.
* <li>use <code>this.show()/close()</code> to show/close the dialog.
*
* @author Tomer Shalev
*
*/
Expand All @@ -51,6 +53,8 @@ package com.hendrix.feathers.controls.flex

private var _dialogContent: DisplayObject = null;
private var _container: FlexComp = null;
private var _contentPercentWidth:Number = 0.95;
private var _contentPercentHeight:Number = 0.95;

/**
* a Dialog control <br>
Expand Down
12 changes: 11 additions & 1 deletion src/com/hendrix/feathers/controls/flex/FlexButton.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ package com.hendrix.feathers.controls.flex

/**
* a responsive flex button, resizes both default icon and font's size.
*
* <li>use <code>this.fontPercentHeight</code>
* <li>use <code>this.iconPercentHeight</code>
*
* @author Tomer Shalev
*/
public class FlexButton extends ToggleButton implements IFlexComp
Expand All @@ -40,6 +42,8 @@ package com.hendrix.feathers.controls.flex

private var _id: String = null;

private var _data: Object = null;

/**
* font size in percentages based on the control height
*/
Expand Down Expand Up @@ -270,9 +274,15 @@ package com.hendrix.feathers.controls.flex
_id = value;
}

public function get data():Object { return _data; }
public function set data(value:Object):void
{
_data = value;
}

public function applyAlignment():void { }
public function get isSensitiveToParent(): Boolean { return false; }
public function set isSensitiveToParent(value:Boolean): void {}
public function setSensitiveToParent(count:uint):void {}

override public function dispose():void
{
Expand Down
Loading

0 comments on commit b708072

Please sign in to comment.