flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject git commit: [flex-asjs] [refs/heads/develop] - Adding IDataGridModel as well as fix to Image component to make it compliant with recent framework changes.
Date Mon, 18 Nov 2013 20:28:24 GMT
Updated Branches:
  refs/heads/develop c8d4d49d9 -> 2ab957fa6


Adding IDataGridModel as well as fix to Image component to make it compliant with recent framework
changes.


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

Branch: refs/heads/develop
Commit: 2ab957fa6ad332cb92a8afb17ff6743e79083dd0
Parents: c8d4d49
Author: Peter Ent <pent@apache.org>
Authored: Mon Nov 18 15:28:13 2013 -0500
Committer: Peter Ent <pent@apache.org>
Committed: Mon Nov 18 15:28:13 2013 -0500

----------------------------------------------------------------------
 .../src/org/apache/flex/core/IDataGridModel.js  | 47 ++++++++++++++++++++
 .../apache/flex/html/staticControls/Image.js    |  6 ++-
 2 files changed, 52 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2ab957fa/frameworks/js/FlexJS/src/org/apache/flex/core/IDataGridModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/IDataGridModel.js b/frameworks/js/FlexJS/src/org/apache/flex/core/IDataGridModel.js
new file mode 100644
index 0000000..34449e5
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/IDataGridModel.js
@@ -0,0 +1,47 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @fileoverview
+ * @suppress {checkTypes}
+ */
+
+goog.provide('org.apache.flex.core.IDataGridModel');
+
+goog.require('org.apache.flex.core.IBead');
+goog.require('org.apache.flex.core.IBeadModel');
+goog.require('org.apache.flex.events.IEventDispatcher');
+
+
+
+/**
+ * @interface
+ * @extends {org.apache.flex.core.IBead}
+ * @extends {org.apache.flex.core.IBeadModel}
+ * @extends {org.apache.flex.events.IEventDispatcher}
+ */
+org.apache.flex.core.IDataGridModel = function() {
+};
+
+
+/**
+ * @const
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.core.IDataGridModel.prototype.FLEXJS_CLASS_INFO =
+{ names: [{ name: 'IDataGridModel',
+                qName: 'org.apache.flex.core.IDataGridModel' }],
+      interfaces: [org.apache.flex.core.IBead,
+                   org.apache.flex.core.IBeadModel,
+                   org.apache.flex.events.IEventDispatcher] };
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2ab957fa/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Image.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Image.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Image.js
index 22cf83d..5fde007 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Image.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Image.js
@@ -43,9 +43,11 @@ org.apache.flex.html.staticControls.Image.prototype.FLEXJS_CLASS_INFO =
 
 /**
  * @override
+ * @protected
+ * @return {Object} The actual element to be parented.
  */
 org.apache.flex.html.staticControls.Image.prototype.createElement =
-    function(p) {
+    function() {
 
   this.element = document.createElement('img');
 
@@ -59,6 +61,8 @@ org.apache.flex.html.staticControls.Image.prototype.createElement =
 
   this.addBead(new
       org.apache.flex.html.staticControls.beads.ImageView());
+      
+  return this.element;
 };
 
 


Mime
View raw message