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] - Moving DataGridModel (and IDataGridModel) from FlexJSUI project to FlexJSJX project. Fixed issue with placement of NonVirtualDataGrid in JS-side ListView bean.
Date Wed, 05 Feb 2014 20:23:05 GMT
Updated Branches:
  refs/heads/develop dc97a235a -> c8f4a8961


Moving DataGridModel (and IDataGridModel) from FlexJSUI project to FlexJSJX project. Fixed
issue with placement of NonVirtualDataGrid in JS-side ListView bean.


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

Branch: refs/heads/develop
Commit: c8f4a8961bb42d8fceb1c592516585ea2a4a8751
Parents: dc97a23
Author: Peter Ent <pent@apache.org>
Authored: Wed Feb 5 15:22:52 2014 -0500
Committer: Peter Ent <pent@apache.org>
Committed: Wed Feb 5 15:22:52 2014 -0500

----------------------------------------------------------------------
 .../as/projects/FlexJSJX/src/FlexJSJXClasses.as |  1 +
 .../src/org/apache/flex/core/IDataGridModel.as  | 44 ++++++++++++
 .../beads/models/DataGridModel.as               | 70 ++++++++++++++++++++
 .../as/projects/FlexJSUI/src/FlexJSUIClasses.as |  1 -
 .../src/org/apache/flex/core/IDataGridModel.as  | 44 ------------
 .../beads/models/DataGridModel.as               | 70 --------------------
 .../flex/html/staticControls/beads/ListView.js  |  2 -
 7 files changed, 115 insertions(+), 117 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c8f4a896/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as b/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
index 69d2648..2b8e3c7 100644
--- a/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
+++ b/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
@@ -37,6 +37,7 @@ internal class FlexJSJXClasses
 	
 	import org.apache.flex.html.staticControls.beads.DataGridColumnView; DataGridColumnView;
 	import org.apache.flex.html.staticControls.beads.DataGridView; DataGridView;
+	import org.apache.flex.html.staticControls.beads.models.DataGridModel; DataGridModel;
 	import org.apache.flex.html.staticControls.beads.models.DataGridPresentationModel; DataGridPresentationModel;
 }
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c8f4a896/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/IDataGridModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/IDataGridModel.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/IDataGridModel.as
new file mode 100644
index 0000000..5ac0584
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/IDataGridModel.as
@@ -0,0 +1,44 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.core
+{
+    /**
+     *  The IDataGridModel interface describes the minimum set of properties
+     *  available to an DataGrid control.  More sophisticated DataGrid controls
+     *  could have models that extend IDataGridModel.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public interface IDataGridModel extends ISelectionModel
+	{		
+        /**
+         *  The set of DataGridColumns.
+         *
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		function get columns():Array;
+		function set columns(value:Array):void;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c8f4a896/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.as
b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.as
new file mode 100644
index 0000000..0fff6b8
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.as
@@ -0,0 +1,70 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.html.staticControls.beads.models
+{
+	import org.apache.flex.core.IDataGridModel;
+	import org.apache.flex.events.Event;
+	
+	/**
+	 *  The DataGridModel class bead extends ArraySelectionModel and adds the array
+	 *  of DataGridColumns used to define each of the column in the DataGrid.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DataGridModel extends ArraySelectionModel implements IDataGridModel
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DataGridModel()
+		{
+			super();
+		}
+		
+		private var _columns:Array;
+		
+		/**
+		 *  The array of DataGridColumns used to define each column of the DataGrid.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get columns():Array
+		{
+			return _columns;
+		}
+		public function set columns(value:Array):void
+		{
+			if (_columns != value) {
+				_columns = value;
+				dispatchEvent( new Event("columnsChanged"));
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c8f4a896/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as b/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as
index 1b8e7f7..1d08346 100644
--- a/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as
+++ b/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as
@@ -63,7 +63,6 @@ internal class FlexJSUIClasses
     import org.apache.flex.html.staticControls.beads.models.AlertModel; AlertModel;
     import org.apache.flex.html.staticControls.beads.models.ArraySelectionModel; ArraySelectionModel;
     import org.apache.flex.html.staticControls.beads.models.ComboBoxModel; ComboBoxModel;
-	import org.apache.flex.html.staticControls.beads.models.DataGridModel; DataGridModel;
 	import org.apache.flex.html.staticControls.beads.models.ImageModel; ImageModel;
 	import org.apache.flex.html.staticControls.beads.models.PanelModel; PanelModel;
     import org.apache.flex.html.staticControls.beads.models.SingleLineBorderModel; SingleLineBorderModel;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c8f4a896/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/IDataGridModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/IDataGridModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/IDataGridModel.as
deleted file mode 100644
index 5ac0584..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/IDataGridModel.as
+++ /dev/null
@@ -1,44 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You 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.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.core
-{
-    /**
-     *  The IDataGridModel interface describes the minimum set of properties
-     *  available to an DataGrid control.  More sophisticated DataGrid controls
-     *  could have models that extend IDataGridModel.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public interface IDataGridModel extends ISelectionModel
-	{		
-        /**
-         *  The set of DataGridColumns.
-         *
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		function get columns():Array;
-		function set columns(value:Array):void;
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c8f4a896/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.as
b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.as
deleted file mode 100644
index 0fff6b8..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.as
+++ /dev/null
@@ -1,70 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You 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.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
-{
-	import org.apache.flex.core.IDataGridModel;
-	import org.apache.flex.events.Event;
-	
-	/**
-	 *  The DataGridModel class bead extends ArraySelectionModel and adds the array
-	 *  of DataGridColumns used to define each of the column in the DataGrid.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DataGridModel extends ArraySelectionModel implements IDataGridModel
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DataGridModel()
-		{
-			super();
-		}
-		
-		private var _columns:Array;
-		
-		/**
-		 *  The array of DataGridColumns used to define each column of the DataGrid.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get columns():Array
-		{
-			return _columns;
-		}
-		public function set columns(value:Array):void
-		{
-			if (_columns != value) {
-				_columns = value;
-				dispatchEvent( new Event("columnsChanged"));
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c8f4a896/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 32afbac..862b94c 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
@@ -163,8 +163,6 @@ org.apache.flex.html.staticControls.beads.ListView.prototype.get_resizeableView
  * @param {Object} event The event that triggered the resize.
  */
 org.apache.flex.html.staticControls.beads.ListView.prototype.handleSizeChange = function(event)
{
-  this.dataGroup_.set_x(0);
-  this.dataGroup_.set_y(0);
   this.dataGroup_.set_width(this.strand_.get_width());
   this.dataGroup_.set_height(this.strand_.get_height());
 };


Mime
View raw message