Fix for indexOf, when working with legacy browsers. Thanks to Jim Par…

…tin for the heads up.
cutterbl · May 18, 2012 · dc0a48f · dc0a48f
1 parent 056c14c
commit dc0a48f
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /.project
 /settings.xml
 /GA_code_for_examples.txt
+/*.tmp*
diff --git a/css/default.css b/css/default.css
@@ -58,11 +58,11 @@ pre {
     padding: 10px 20px;
 }
 
-.x-panel-body, .x-panel-body-noheader {
+/*.x-panel-body, .x-panel-body-noheader {
 	padding: 5px;
 	background-color: #E6E8E8;
 	color: #000;
-}
+}*/
 
 .demoGrids .x-grid { margin: 0 auto; }
 

diff --git a/index-4.html b/index-4.html
@@ -9,14 +9,14 @@
 		<link rel="stylesheet" type="text/css" href="/css/default.css" />
 		<link rel="shortcut icon" href="/favicon_32x32.ico" />
 		<script type="text/javascript" src="/js/extjs-4.1.0/ext-all.js"></script>
-		<script type="text/javascript" src="/js/custom/CFQueryReader-ExtJS4-2.1.min.js"></script>
+		<script type="text/javascript" src="/js/custom/CFQueryReader-ExtJS4-2.2.min.js"></script>
 		<script language="javascript" type="text/javascript" src="/servicebus/Api.cfm"></script>
 		<script type="text/javascript" src="/js/custom/test-extjs_4.js"></script>
 	</head>
 	<body>
 		<div id="content">
 		<ul>
-			<li><a href="/js/custom/CFQueryReader-ExtJS4-2.1.js" target="_blank">CFQueryReader.js</a> - v2.1 for Ext JS 4.1.0</li>
+			<li><a href="/js/custom/CFQueryReader-ExtJS4-2.2.js" target="_blank">CFQueryReader.js</a> - v2.1 for Ext JS 4.1.0</li>
 			<li><a href="/js/custom/test-extjs_4.js" target="_blank">test-extjs_4.js</a> - script for this page</li>
 		</ul><br />
 		<p>This is a Demo for CFQueryReader with <a href="/js/extjs-4.1.0/docs/" target="_blank">ExtJS 4.1.0</a>. ExtJS 4 is the latest version of ExtJS, and is a complete rewrite of the entire framework. With that comes an entirely new CFQueryReader, that conforms to Ext's new class model. There are three stores defined in the script:</p>

diff --git a/index-5.html b/index-5.html
@@ -9,14 +9,14 @@
 		<link rel="stylesheet" type="text/css" href="/css/default.css" />
 		<link rel="shortcut icon" href="/favicon_32x32.ico" />
 		<script type="text/javascript" src="/js/extjs-4.1.0/ext-all.js"></script>
-		<script type="text/javascript" src="/js/custom/CFQueryReader-ExtJS4-2.1.min.js"></script>
+		<script type="text/javascript" src="/js/custom/CFQueryReader-ExtJS4-2.2.min.js"></script>
 		<script language="javascript" type="text/javascript" src="/servicebus/Api.cfm"></script>
 		<script type="text/javascript" src="/js/custom/test-extjs_4_pt2.js"></script>
 	</head>
 	<body>
 		<div id="content">
 		<ul>
-			<li><a href="/js/custom/CFQueryReader-ExtJS4-2.1.js" target="_blank">CFQueryReader.js</a> - v2.1 for Ext JS 4.1.0</li>
+			<li><a href="/js/custom/CFQueryReader-ExtJS4-2.2.js" target="_blank">CFQueryReader.js</a> - v2.1 for Ext JS 4.1.0</li>
 			<li><a href="/js/custom/test-extjs_4_pt2.js" target="_blank">test-extjs_4_pt2.js</a> - script for this page</li>
 		</ul><br />
 		<p>This is a Demo for CFQueryReader with <a href="/js/extjs-4.1.0/docs/" target="_blank">ExtJS 4.1.0</a>. ExtJS 4 is the latest version of ExtJS, and is a complete rewrite of the entire framework. With that comes an entirely new CFQueryReader, that conforms to Ext's new class model. There is a single store defined in the script:</p>

diff --git a/js/custom/CFQueryReader-ExtJS4-2.1.min.js b/js/custom/CFQueryReader-ExtJS4-2.1.min.js
diff --git a/js/custom/CFQueryReader-ExtJS4-2.1.js → js/custom/CFQueryReader-ExtJS4-2.2.js b/js/custom/CFQueryReader-ExtJS4-2.1.js → js/custom/CFQueryReader-ExtJS4-2.2.js
@@ -1,6 +1,7 @@
 /**
  * @author Steve 'Cutter' Blades
  * @class ColdFusion.data.reader.CFQueryReader
+ * @version 2.2 [05.17.2012]
  *
  * <p>The CFQueryReader Reader is used by a Proxy to read a ColdFusion server response that is sent back in JSON format. This usually
  * happens as a result of loading a Store - for example we might create something like this:</p>
@@ -222,9 +223,9 @@ Ext.define('ColdFusion.data.reader.CFQueryReader',{
 						}
 						// Map the columns. Fields might not map to a column in the response
 						for (var i = 0; i < fields.length; i++) {
-							var pos = obj.COLUMNS.indexOf(fields[i].name.toUpperCase());
+							var pos = Ext.Array.indexOf(obj.COLUMNS, fields[i].name.toUpperCase());
 							if(pos >= 0){
-								fields[i].mapping = obj.COLUMNS.indexOf(fields[i].name.toUpperCase());
+								fields[i].mapping = Ext.Array.indexOf(obj.COLUMNS, fields[i].name.toUpperCase());
 							}
 						}
 						// Put the changes back in the model
@@ -247,7 +248,7 @@ Ext.define('ColdFusion.data.reader.CFQueryReader',{
 					message: err
 				});
 
-				this.fireEvent('exception', this, response, error);
+				this.fireEvent('exception', this, data, error);
 
 				Ext.Logger.warn(err);
 

diff --git a/js/custom/CFQueryReader-ExtJS4-2.2.min.js b/js/custom/CFQueryReader-ExtJS4-2.2.min.js
diff --git a/js/custom/test-extjs_4.js b/js/custom/test-extjs_4.js
@@ -60,7 +60,14 @@ Ext.onReady(function(){
 	Ext.create('Ext.grid.Panel', Ext.Object.merge({}, gridPanelBase, {
 			title: 'Testing: GetAllStandard (Basic CF Query object)',
 			store: Ext.getStore('entryStore'),
-			renderTo: 'demo1'
+			renderTo: 'demo1',
+			columns: [
+			    {header: 'ID', dataIndex: 'id', hidden: true},
+			    {header: 'Title', dataIndex: 'title', flex: 6},
+			    {header: 'Posted', dataIndex: 'posted', flex: 2},
+			    {header: 'Views', dataIndex: 'views', align: 'right', flex: 2}
+			],
+			scroll: 'vertical'
 		})
 	);