You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2013/11/13 14:05:53 UTC
[1/3] git commit: [flex-asjs] [refs/heads/develop] - Fix some
warnings when publishing with '-strict-publishing'
Updated Branches:
refs/heads/develop 6b8271177 -> 2d8d5e441
Fix some warnings when publishing with '-strict-publishing'
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5132d5f9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5132d5f9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5132d5f9
Branch: refs/heads/develop
Commit: 5132d5f956ac40d154662935d22d3c435f79bfc9
Parents: 6b82711
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Nov 13 13:26:30 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Nov 13 13:26:30 2013 +0100
----------------------------------------------------------------------
.../src/org/apache/flex/core/IBeadView.js | 24 +-------------------
.../FlexJS/src/org/apache/flex/core/UIBase.js | 13 ++++++-----
.../flex/html/staticControls/ButtonBar.js | 2 ++
.../apache/flex/html/staticControls/DataGrid.js | 2 ++
.../org/apache/flex/html/staticControls/List.js | 4 +++-
.../flex/html/staticControls/SimpleList.js | 22 ++++++++----------
.../html/staticControls/beads/DataGridView.js | 14 +++++++++---
.../DataItemRendererFactoryForColumnData.js | 10 ++++----
.../flex/html/staticControls/beads/ListView.js | 15 ++++++++----
.../beads/layouts/ButtonBarLayout.js | 15 +++++++-----
10 files changed, 60 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5132d5f9/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadView.js b/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadView.js
index 3ac9550..3bca281 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadView.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadView.js
@@ -12,34 +12,12 @@
* limitations under the License.
*/
-/**
- * @fileoverview
- * @suppress {checkTypes}
- */
-
goog.provide('org.apache.flex.core.IBeadView');
-goog.require('org.apache.flex.events.EventDispatcher');
-
/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
+ * @interface
*/
org.apache.flex.core.IBeadView = function() {
- goog.base(this);
-};
-goog.inherits(
- org.apache.flex.core.IBeadView,
- org.apache.flex.events.EventDispatcher);
-
-
-/**
- * @expose
- * @return {boolean} I guess this method is 'old' since we now
- * support regular type checking?
- */
-org.apache.flex.core.IBeadView.prototype.isaView = function() {
- return true;
};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5132d5f9/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
index daa026b..88ae134 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
@@ -36,12 +36,6 @@ org.apache.flex.core.UIBase = function() {
*/
this.lastDisplay_ = '';
- /**
- * @protected
- * @type {Object}
- */
- this.positioner = null;
-
this.createElement();
};
goog.inherits(org.apache.flex.core.UIBase,
@@ -49,6 +43,13 @@ goog.inherits(org.apache.flex.core.UIBase,
/**
+ * @expose
+ * @type {Object}
+ */
+org.apache.flex.core.UIBase.prototype.positioner = null;
+
+
+/**
* @return {Object} The array of children.
*/
org.apache.flex.core.UIBase.prototype.internalChildren =
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5132d5f9/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ButtonBar.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ButtonBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ButtonBar.js
index 393eec9..27c2593 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ButtonBar.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ButtonBar.js
@@ -70,4 +70,6 @@ org.apache.flex.html.staticControls.ButtonBar.prototype.createElement =
this.positioner = this.element;
this.set_className('ButtonBar');
+
+ return this.element;
};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5132d5f9/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/DataGrid.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/DataGrid.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/DataGrid.js
index 003d871..0d0a2b2 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/DataGrid.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/DataGrid.js
@@ -47,6 +47,8 @@ org.apache.flex.html.staticControls.DataGrid.prototype.createElement =
// this.addBead(new
// org.apache.flex.html.staticControls.beads.DataGridView());
+
+ return this.element;
};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5132d5f9/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/List.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/List.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/List.js
index 9147c7c..39470f8 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/List.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/List.js
@@ -41,6 +41,8 @@ org.apache.flex.html.staticControls.List.prototype.createElement =
function() {
goog.base(this, 'createElement');
this.set_className('List');
+
+ return this.element;
};
@@ -77,7 +79,7 @@ org.apache.flex.html.staticControls.List.prototype.internalChildren =
/**
* @expose
- * @param {object} event The event that triggered the selection.
+ * @param {Object} event The event that triggered the selection.
*/
org.apache.flex.html.staticControls.List.prototype.selectedHandler =
function(event) {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5132d5f9/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/SimpleList.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/SimpleList.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/SimpleList.js
index 86318f3..3dbcad2 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/SimpleList.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/SimpleList.js
@@ -43,12 +43,13 @@ org.apache.flex.html.staticControls.SimpleList.prototype.
goog.bind(this.changeHandler, this));
this.positioner = this.element;
this.set_className('SimpleList');
+
+ return this.element;
};
/**
- * @expose
- * @return {Object} Returns the dataProvider.
+ * @override
*/
org.apache.flex.html.staticControls.SimpleList.prototype.
get_dataProvider = function() {
@@ -57,8 +58,7 @@ org.apache.flex.html.staticControls.SimpleList.prototype.
/**
- * @expose
- * @param {Object} value The new dataProvider.
+ * @override
*/
org.apache.flex.html.staticControls.SimpleList.prototype.
set_dataProvider = function(value) {
@@ -75,7 +75,7 @@ org.apache.flex.html.staticControls.SimpleList.prototype.
n = value.length;
for (i = 0; i < n; i++) {
opt = document.createElement('option');
- opt.text = value[i];
+ opt.text = value[i].toString();
dp.add(opt);
}
@@ -83,8 +83,7 @@ org.apache.flex.html.staticControls.SimpleList.prototype.
/**
- * @expose
- * @return {Object} Returns the selected index.
+ * @override
*/
org.apache.flex.html.staticControls.SimpleList.prototype.
get_selectedIndex = function() {
@@ -93,8 +92,7 @@ org.apache.flex.html.staticControls.SimpleList.prototype.
/**
- * @expose
- * @param {Number} value The new selected index.
+ * @override
*/
org.apache.flex.html.staticControls.SimpleList.prototype.
set_selectedIndex = function(value) {
@@ -103,8 +101,7 @@ org.apache.flex.html.staticControls.SimpleList.prototype.
/**
- * @expose
- * @return {Object} Returns the selectedItem.
+ * @override
*/
org.apache.flex.html.staticControls.SimpleList.prototype.
get_selectedItem = function() {
@@ -113,8 +110,7 @@ org.apache.flex.html.staticControls.SimpleList.prototype.
/**
- * @expose
- * @param {Object} value The new selected item.
+ * @override
*/
org.apache.flex.html.staticControls.SimpleList.prototype.
set_selectedItem = function(value) {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5132d5f9/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataGridView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataGridView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataGridView.js
index 94b6cb3..24a1f89 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataGridView.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataGridView.js
@@ -32,7 +32,8 @@ goog.require('org.apache.flex.html.staticControls.beads.models.DataGridPresentat
/**
* @constructor
- * @extends {org.apache.flex.core.IBeadView}
+ * @extends {org.apache.flex.events.EventDispatcher}
+ * @implements {org.apache.flex.core.IBeadView}
*/
org.apache.flex.html.staticControls.beads.DataGridView = function() {
this.lastSelectedIndex = -1;
@@ -40,7 +41,6 @@ org.apache.flex.html.staticControls.beads.DataGridView = function() {
};
goog.inherits(
org.apache.flex.html.staticControls.beads.DataGridView,
- org.apache.flex.core.IBeadView,
org.apache.flex.events.EventDispatcher);
@@ -107,7 +107,7 @@ org.apache.flex.html.staticControls.beads.DataGridView.prototype.set_strand =
/**
- * @param {object} event The selection change event from one of the column
+ * @param {Object} event The selection change event from one of the column
* lists.
*/
org.apache.flex.html.staticControls.beads.DataGridView.prototype.
@@ -127,3 +127,11 @@ org.apache.flex.html.staticControls.beads.DataGridView.prototype.
}
};
+
+/**
+ * @const
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.DataGridView.prototype.
+ FLEXJS_CLASS_INFO =
+ { interfaces: [org.apache.flex.core.IBeadView] };
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5132d5f9/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.js
index 26b7e06..a7dd091 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.js
@@ -20,6 +20,7 @@ goog.require('org.apache.flex.events.EventDispatcher');
goog.require('org.apache.flex.html.staticControls.beads.DataGridColumnView');
goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
goog.require('org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer');
+goog.require('org.apache.flex.html.staticControls.supportClasses.StringItemRenderer');
@@ -41,7 +42,7 @@ goog.inherits(
/**
* @expose
DataItemRendererFactoryForColumnData}
- * @param {object} value The component strand.
+ * @param {Object} value The component strand.
*/
org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData.
prototype.set_strand = function(value) {
@@ -73,7 +74,7 @@ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData.
/**
* @expose
* DataItemRendererFactoryForColumnData}
- * @return {object} The factory class to use for creating item renderers.
+ * @return {Object} The factory class to use for creating item renderers.
*/
org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData.
prototype.get_itemRendererFactory = function() {
@@ -84,7 +85,7 @@ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData.
/**
* @expose
* DataItemRendererFactoryForColumnData}
- * @param {object} value The factory class to use for creating item renderers.
+ * @param {Object} value The factory class to use for creating item renderers.
*/
org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData.
prototype.set_itemRendererFactory = function(value) {
@@ -95,7 +96,7 @@ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData.
/**
* @expose
DataItemRendererFactoryForColumnData}
- * @param {object} event The event that triggered the dataProvider change.
+ * @param {Object} event The event that triggered the dataProvider change.
*/
org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData.
prototype.dataProviderChangedHandler = function(event) {
@@ -124,6 +125,7 @@ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData.
/**
* @const
+ * @type {Object.<string, Array.<Object>>}
*/
org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData
.prototype.FLEXJS_CLASS_INFO =
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5132d5f9/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ListView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ListView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ListView.js
index c29e4ed..884389c 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ListView.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ListView.js
@@ -26,17 +26,13 @@ goog.require('org.apache.flex.html.staticControls.supportClasses.NonVirtualDataG
/**
* @constructor
- * @extends {org.apache.flex.core.IBeadView}
+ * @implements {org.apache.flex.core.IBeadView}
*/
org.apache.flex.html.staticControls.beads.ListView = function() {
this.lastSelectedIndex = -1;
- goog.base(this);
this.className = 'ListView';
};
-goog.inherits(
- org.apache.flex.html.staticControls.beads.ListView,
- org.apache.flex.core.IBeadView);
/**
@@ -92,3 +88,12 @@ org.apache.flex.html.staticControls.beads.ListView.prototype.
}
this.lastSelectedIndex = this.model.get_selectedIndex();
};
+
+
+/**
+ * @const
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.ListView.prototype.
+ FLEXJS_CLASS_INFO =
+ { interfaces: [org.apache.flex.core.IBeadView] };
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5132d5f9/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.js
index 7f99405..9d7f61b 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.js
@@ -21,21 +21,18 @@ goog.require('org.apache.flex.html.staticControls.beads.ListView');
/**
* @constructor
- * @extends {org.apache.flex.core.IBeadLayout}
+ * @implements {org.apache.flex.core.IBeadLayout}
*/
org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout =
function() {
- goog.base(this);
this.strand_ = null;
+
this.className = 'ButtonBarLayout';
};
-goog.inherits(org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout,
- org.apache.flex.core.IBeadLayout);
/**
* @expose
- ButtonBarLayout}
* @param {Object} value The new host.
*/
org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.
@@ -53,7 +50,6 @@ org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.
/**
- ButtonBarLayout}
* @param {org.apache.flex.events.Event} event The text getter.
*/
org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.
@@ -83,3 +79,10 @@ org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.
};
+/**
+ * @const
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout
+ .prototype.FLEXJS_CLASS_INFO =
+ { interfaces: [org.apache.flex.core.IBeadLayout] };
[3/3] git commit: [flex-asjs] [refs/heads/develop] - Fix type
checking: instanceof doesn't work with interfaces.
Posted by er...@apache.org.
Fix type checking: instanceof doesn't work with interfaces.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2d8d5e44
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2d8d5e44
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2d8d5e44
Branch: refs/heads/develop
Commit: 2d8d5e4419c882a344cc5a08e1e2bb11f2a6f8d8
Parents: 56d75ed
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Nov 13 14:04:34 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Nov 13 14:04:34 2013 +0100
----------------------------------------------------------------------
frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2d8d5e44/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
index 88ae134..a3846fb 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
@@ -181,10 +181,10 @@ org.apache.flex.core.UIBase.prototype.addBead = function(bead) {
}
this.beads_.push(bead);
- if (bead instanceof org.apache.flex.core.IBeadModel)
+ if (org.apache.flex.utils.Language.is(bead, org.apache.flex.core.IBeadModel))
this.model = bead;
- if (bead instanceof org.apache.flex.core.IBeadView) {
+ if (org.apache.flex.utils.Language.is(bead, org.apache.flex.core.IBeadView)) {
this.dispatchEvent(new org.apache.flex.events.Event('viewChanged'));
}
@@ -203,7 +203,7 @@ org.apache.flex.core.UIBase.prototype.getBeadByType =
}
for (var i = 0; i < this.beads_.length; i++) {
var bead = this.beads_[i];
- if (bead instanceof classOrInterface) {
+ if (org.apache.flex.utils.Language.is(bead, classOrInterface)) {
return bead;
}
}
[2/3] git commit: [flex-asjs] [refs/heads/develop] - If the view
doesn't have cssData (as with the DataGridExample),
this prevents an exception.
Posted by er...@apache.org.
If the view doesn't have cssData (as with the DataGridExample), this prevents an exception.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/56d75ed9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/56d75ed9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/56d75ed9
Branch: refs/heads/develop
Commit: 56d75ed9dc6ed860436af6750bef114f39d18e21
Parents: 5132d5f
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Nov 13 14:03:59 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Nov 13 14:03:59 2013 +0100
----------------------------------------------------------------------
.../org/apache/flex/core/SimpleCSSValuesImpl.js | 86 ++++++++++----------
1 file changed, 44 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/56d75ed9/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js b/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js
index 22c362c..48a4318 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js
@@ -143,54 +143,56 @@ org.apache.flex.core.SimpleCSSValuesImpl.prototype.init = function(mainclass) {
if (values == null)
values = {};
- var n = cssData.length;
- var i = 0;
- while (i < n)
- {
- var numMQ = cssData[i++];
- if (numMQ > 0)
- {
- // skip MediaQuery tests for now
- i += numMQ;
- }
- var numSel = cssData[i++];
- var props = {};
- for (var j = 0; j < numSel; j++)
+ if (cssData) {
+ var n = cssData.length;
+ var i = 0;
+ while (i < n)
{
- var selName = cssData[i++];
- if (selName.indexOf('.') != 0 &&
- selName != '*' && selName != 'global')
+ var numMQ = cssData[i++];
+ if (numMQ > 0)
{
- // should be a type selector
- var parts = selName.split('.');
- var numParts = parts.length;
- var part = window;
- for (var k = 0; k < numParts; k++)
+ // skip MediaQuery tests for now
+ i += numMQ;
+ }
+ var numSel = cssData[i++];
+ var props = {};
+ for (var j = 0; j < numSel; j++)
+ {
+ var selName = cssData[i++];
+ if (selName.indexOf('.') != 0 &&
+ selName != '*' && selName != 'global')
{
- var partName = parts[k];
- var subpart = part[partName];
- if (subpart == undefined)
- break;
- // assume last part is ctor func
- if (k == numParts - 1)
- subpart = subpart.prototype;
- subpart.__css__package_parent = part;
- subpart.__css__name = partName;
- part = subpart;
+ // should be a type selector
+ var parts = selName.split('.');
+ var numParts = parts.length;
+ var part = window;
+ for (var k = 0; k < numParts; k++)
+ {
+ var partName = parts[k];
+ var subpart = part[partName];
+ if (subpart == undefined)
+ break;
+ // assume last part is ctor func
+ if (k == numParts - 1)
+ subpart = subpart.prototype;
+ subpart.__css__package_parent = part;
+ subpart.__css__name = partName;
+ part = subpart;
+ }
}
+ if (values[selName])
+ props = values[selName];
+ values[selName] = props;
+ }
+ var numProps = cssData[i++];
+ for (j = 0; j < numProps; j++)
+ {
+ var propName = cssData[i++];
+ var propValue = cssData[i++];
+ props[propName] = propValue;
}
- if (values[selName])
- props = values[selName];
- values[selName] = props;
- }
- var numProps = cssData[i++];
- for (j = 0; j < numProps; j++)
- {
- var propName = cssData[i++];
- var propValue = cssData[i++];
- props[propName] = propValue;
}
}
+
this.values = values;
};
-