Skip to content

Commit b708072

Browse files
HendrixStringHendrixString
committed
Merge branch 'master' of https://github.com/HendrixString/Falcon
Conflicts: .actionScriptProperties bin/Falcon.swc
2 parents 416375a + 1d37edb commit b708072

40 files changed

+789
-287
lines changed

‎.actionScriptProperties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<excludedEntries>
88
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_charts.swc" useDefaultLinkType="false"/>
99
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/advancedgrids.swc" useDefaultLinkType="false"/>
10-
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/charts.swc" useDefaultLinkType="false"/>
1110
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_air.swc" useDefaultLinkType="false"/>
12-
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/locale/{locale}" useDefaultLinkType="false"/>
11+
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/charts.swc" useDefaultLinkType="false"/>
1312
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/netmon.swc" useDefaultLinkType="false"/>
13+
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/locale/{locale}" useDefaultLinkType="false"/>
1414
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/spark.swc" useDefaultLinkType="false"/>
1515
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/sparkskins.swc" useDefaultLinkType="false"/>
1616
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/rpc.swc" useDefaultLinkType="false"/>
17-
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp_air.swc" useDefaultLinkType="false"/>
1817
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/videoPlayer.swc" useDefaultLinkType="false"/>
18+
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp_air.swc" useDefaultLinkType="false"/>
1919
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/flash-integration.swc" useDefaultLinkType="false"/>
2020
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/authoringsupport.swc" useDefaultLinkType="false"/>
2121
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp.swc" useDefaultLinkType="false"/>

‎bin/Falcon.swc‎

-1.61 MB
Binary file not shown.

‎src/com/hendrix/feathers/controls/CompsFactory.as‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ package com.hendrix.feathers.controls
3939
*/
4040
public function CompsFactory()
4141
{
42+
4243
// placed here in order to load the TextFieldLibarary
4344
var btf:BidiTextField;
4445
var coll:IdCollection;

‎src/com/hendrix/feathers/controls/core/sql/sqlSerialData/SQLSerialDataTable.as‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ package com.hendrix.feathers.controls.core.sql.sqlSerialData
1717
private var _TABLE_NAME: String;
1818

1919
// Contacts Table Columns names
20-
private static const KEY_ID: String = "id";
21-
private static const KEY_DATA: String = "data";
20+
protected static const KEY_ID: String = "id";
21+
protected static const KEY_DATA: String = "data";
2222

23-
private var _connection: SQLConnection = null;
23+
protected var _connection: SQLConnection = null;
2424

2525
private var _dbName: String = null;
2626
private var _dbPath: File = null;
@@ -100,9 +100,11 @@ package com.hendrix.feathers.controls.core.sql.sqlSerialData
100100
/**
101101
* Select data from a window of identifiers. useful when ids are timestamps.
102102
* requires QA.
103+
*
103104
* @param idFrom starting id
104105
* @param idTo last id
105106
* @param callback a callback
107+
*
106108
* @return Array result, or null and Array into callback
107109
*/
108110
public function getDataBetween(idFrom:String, idTo:String, callback:Function = null):Array
@@ -153,9 +155,8 @@ package com.hendrix.feathers.controls.core.sql.sqlSerialData
153155
* add new data, or update an older one with the correct conflict algorithm
154156
* @param id the id of the data
155157
* @param data the data
156-
* @param conflictAlgorithm for example <code>SQLiteDatabase.CONFLICT_REPLACE</code>
157158
*/
158-
public function addData(id: String, data:Object, conflictAlgorithm:int):void
159+
public function addData(id: String, data:Object):void
159160
{
160161
if(_connection.connected == false)
161162
return ;

‎src/com/hendrix/feathers/controls/core/sql/sqlSerialData/SQLUtils.as‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ package com.hendrix.feathers.controls.core.sql.sqlSerialData
2424
arr[ix].data = Serialize.stringToObject(arr[ix].data);
2525
}
2626

27-
2827
return arr;
2928
}
3029
}

‎src/com/hendrix/feathers/controls/flex/ActionBar.as‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,27 @@ package com.hendrix.feathers.controls.flex
1212

1313
/**
1414
* <p>a very lite Action Bar component, requires a data provider</p>
15-
* <p><b>Example:</b><br>
16-
* <code>
17-
* this.dataProvier = Vector.Object([<br>
18-
* { id: "1", src: do1, align:"right"},<br>
19-
* { id: "2", src: do2, align:"center"},<br>
20-
* { id: "3", src: do3, align:"left"},<br>
21-
* { id: "4", src: do4, align:"left"}<br>
22-
* ]);</code><br>
15+
* <p><b>Example:</b>
16+
*
17+
* <pre>
18+
* this.dataProvier = Vector.Object([
19+
* { id: "1", src: do1, align:"right"},
20+
* { id: "2", src: do2, align:"center"},
21+
* { id: "3", src: do3, align:"left"},
22+
* { id: "4", src: do4, align:"left"}
23+
* ]);</pre><br>
24+
*
2325
* <b>Notes:</b>
26+
*
2427
* <ul>
25-
* <li>set <code>leftItemsPercentWidth/Height, rightItemsPercentWidth/Height, centerItemsPercentWidth/Height</code> to control layout</li>
26-
* <li>set <code>percentHeight</code> to control height of componenet relative to it's parent, or <code>height</code> to control pixel wise</li>
27-
* <li>set <code>bgSkinSource</code> to control background, it can be color, texture, class, bitmap etc..</li>
28-
* <li>set <code>onSelected</code> to listen to items being clicked, it will return an <code>id</code> string</li>
29-
* <li><code>src</code> can be any <code>DisplayObject</code></li>
30-
* <li>use <code>mrUpdateContent(id, src)</code> to update an exiting item</li>
28+
* <li>set <code>leftItemsPercentWidth/Height, rightItemsPercentWidth/Height, centerItemsPercentWidth/Height</code> to control layout</li>
29+
* <li>set <code>percentHeight</code> to control height of componenet relative to it's parent, or <code>height</code> to control pixel wise</li>
30+
* <li>set <code>bgSkinSource</code> to control background, it can be color, texture, class, bitmap etc..</li>
31+
* <li>set <code>onSelected</code> to listen to items being clicked, it will return an <code>id</code> string</li>
32+
* <li><code>src</code> can be any <code>DisplayObject</code></li>
33+
* <li>use <code>mrUpdateContent(id, src)</code> to update an exiting item</li>
3134
* </ul>
32-
* </p>
35+
*
3336
* @author Tomer Shalev
3437
*/
3538
public class ActionBar extends FlexComp

‎src/com/hendrix/feathers/controls/flex/AnimatedControl.as‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package com.hendrix.feathers.controls.flex
88

99
/**
1010
* animated control
11+
*
1112
* @author Tomer Shalev
1213
*
1314
*/

‎src/com/hendrix/feathers/controls/flex/Dialog.as‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@ package com.hendrix.feathers.controls.flex
1919
import starling.events.Event;
2020

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

5254
private var _dialogContent: DisplayObject = null;
5355
private var _container: FlexComp = null;
56+
private var _contentPercentWidth:Number = 0.95;
57+
private var _contentPercentHeight:Number = 0.95;
5458

5559
/**
5660
* a Dialog control <br>

‎src/com/hendrix/feathers/controls/flex/FlexButton.as‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ package com.hendrix.feathers.controls.flex
1212

1313
/**
1414
* a responsive flex button, resizes both default icon and font's size.
15+
*
1516
* <li>use <code>this.fontPercentHeight</code>
1617
* <li>use <code>this.iconPercentHeight</code>
18+
*
1719
* @author Tomer Shalev
1820
*/
1921
public class FlexButton extends ToggleButton implements IFlexComp
@@ -40,6 +42,8 @@ package com.hendrix.feathers.controls.flex
4042

4143
private var _id: String = null;
4244

45+
private var _data: Object = null;
46+
4347
/**
4448
* font size in percentages based on the control height
4549
*/
@@ -270,9 +274,15 @@ package com.hendrix.feathers.controls.flex
270274
_id = value;
271275
}
272276

277+
public function get data():Object { return _data; }
278+
public function set data(value:Object):void
279+
{
280+
_data = value;
281+
}
282+
273283
public function applyAlignment():void { }
274284
public function get isSensitiveToParent(): Boolean { return false; }
275-
public function set isSensitiveToParent(value:Boolean): void {}
285+
public function setSensitiveToParent(count:uint):void {}
276286

277287
override public function dispose():void
278288
{

0 commit comments

Comments
 (0)