X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/0494b8d9b9bb03ab6c22b34dae81261e3cd7e3e6..7a654f8d43fdb43d78b63d90528bed6e86b608cc:/src/data/JsonStore.js

diff --git a/src/data/JsonStore.js b/src/data/JsonStore.js
index 4dbd357b..9781c621 100644
--- a/src/data/JsonStore.js
+++ b/src/data/JsonStore.js
@@ -1,26 +1,35 @@
-/*!
- * Ext JS Library 3.3.1
- * Copyright(c) 2006-2010 Sencha Inc.
- * licensing@sencha.com
- * http://www.sencha.com/license
- */
 /**
+ * @author Ed Spencer
  * @class Ext.data.JsonStore
  * @extends Ext.data.Store
+ * @ignore
+ *
  * <p>Small helper class to make creating {@link Ext.data.Store}s from JSON data easier.
- * A JsonStore will be automatically configured with a {@link Ext.data.JsonReader}.</p>
- * <p>A store configuration would be something like:<pre><code>
+ * A JsonStore will be automatically configured with a {@link Ext.data.reader.Json}.</p>
+ *
+ * <p>A store configuration would be something like:</p>
+ *
+<pre><code>
 var store = new Ext.data.JsonStore({
     // store configs
     autoDestroy: true,
-    url: 'get-images.php',
-    storeId: 'myStore',
-    // reader configs
-    root: 'images',
-    idProperty: 'name',
+    storeId: 'myStore'
+
+    proxy: {
+        type: 'ajax',
+        url: 'get-images.php',
+        reader: {
+            type: 'json',
+            root: 'images',
+            idProperty: 'name'
+        }
+    },
+
+    //alternatively, a {@link Ext.data.Model} name can be given (see {@link Ext.data.Store} for an example)
     fields: ['name', 'url', {name:'size', type: 'float'}, {name:'lastmod', type:'date'}]
 });
- * </code></pre></p>
+</code></pre>
+ *
  * <p>This store is configured to consume a returned object of the form:<pre><code>
 {
     images: [
@@ -28,22 +37,32 @@ var store = new Ext.data.JsonStore({
         {name: 'Image Two', url:'/GetImage.php?id=2', size:43.2, lastmod: new Date(2007, 10, 30)}
     ]
 }
- * </code></pre>
- * An object literal of this form could also be used as the {@link #data} config option.</p>
- * <p><b>*Note:</b> Although not listed here, this class accepts all of the configuration options of
- * <b>{@link Ext.data.JsonReader JsonReader}</b>.</p>
+</code></pre>
+ *
+ * <p>An object literal of this form could also be used as the {@link #data} config option.</p>
+ *
  * @constructor
  * @param {Object} config
  * @xtype jsonstore
  */
-Ext.data.JsonStore = Ext.extend(Ext.data.Store, {
+Ext.define('Ext.data.JsonStore',  {
+    extend: 'Ext.data.Store',
+    alias: 'store.json',
+
     /**
      * @cfg {Ext.data.DataReader} reader @hide
      */
-    constructor: function(config){
-        Ext.data.JsonStore.superclass.constructor.call(this, Ext.apply(config, {
-            reader: new Ext.data.JsonReader(config)
-        }));
+    constructor: function(config) {
+        config = config || {};
+
+        Ext.applyIf(config, {
+            proxy: {
+                type  : 'ajax',
+                reader: 'json',
+                writer: 'json'
+            }
+        });
+
+        this.callParent([config]);
     }
 });
-Ext.reg('jsonstore', Ext.data.JsonStore);
\ No newline at end of file