From 54967d05cfe6083cb0014d7a789e19ac354f420b Mon Sep 17 00:00:00 2001 From: Jason Johnston Date: Tue, 12 Nov 2013 17:10:29 -0700 Subject: [PATCH] Update to Architect 3.0 build 1337 --- ExtFeedViewer/FeedViewer.xds | 4 ++-- ExtFeedViewer/app.js | 7 ++----- ExtFeedViewer/app.json | 3 ++- ExtFeedViewer/app/store/FeedItemStore.js | 4 ++-- ExtFeedViewer/app/view/Viewport.js | 19 ------------------- ExtFeedViewer/bootstrap.css | 11 ++--------- ExtFeedViewer/bootstrap.js | 8 ++------ ExtFeedViewer/metadata/Application | 6 +----- 8 files changed, 13 insertions(+), 49 deletions(-) delete mode 100644 ExtFeedViewer/app/view/Viewport.js diff --git a/ExtFeedViewer/FeedViewer.xds b/ExtFeedViewer/FeedViewer.xds index 5d6c97c..cc70d0d 100644 --- a/ExtFeedViewer/FeedViewer.xds +++ b/ExtFeedViewer/FeedViewer.xds @@ -35,9 +35,9 @@ } }, "xdsVersion": "3.0.0", - "xdsBuild": 1316, + "xdsBuild": 1337, "schemaVersion": 1, - "upgradeVersion": 300000000001, + "upgradeVersion": 300000000003, "framework": "ext42", "viewOrderMap": { "view": [ diff --git a/ExtFeedViewer/app.js b/ExtFeedViewer/app.js index 5350416..829316b 100644 --- a/ExtFeedViewer/app.js +++ b/ExtFeedViewer/app.js @@ -15,10 +15,7 @@ // @require @packageOverrides Ext.Loader.setConfig({ - enabled: true, - paths: { - 'Ext.ux': 'ux/' - } + enabled: true }); @@ -51,10 +48,10 @@ Ext.application({ name: 'MyApp', launch: function() { + Ext.create('MyApp.view.MyViewport'); Ext.syncRequire([ 'Ext.ux.PreviewPlugin' ]); - Ext.create('MyApp.view.MyViewport'); } }); diff --git a/ExtFeedViewer/app.json b/ExtFeedViewer/app.json index 0c4730b..fe80934 100644 --- a/ExtFeedViewer/app.json +++ b/ExtFeedViewer/app.json @@ -10,6 +10,7 @@ "_comment": "Please don't edit. This is Architect data.", "resources": [ "Feed-Viewer.css" - ] + ], + "requires": [] } } \ No newline at end of file diff --git a/ExtFeedViewer/app/store/FeedItemStore.js b/ExtFeedViewer/app/store/FeedItemStore.js index 4585043..88e6ad4 100644 --- a/ExtFeedViewer/app/store/FeedItemStore.js +++ b/ExtFeedViewer/app/store/FeedItemStore.js @@ -17,10 +17,10 @@ Ext.define('MyApp.store.FeedItemStore', { extend: 'Ext.data.Store', requires: [ + 'MyApp.model.FeedItem', 'Ext.data.proxy.Ajax', 'Ext.data.reader.Xml', - 'Ext.util.Sorter', - 'MyApp.model.FeedItem' + 'Ext.util.Sorter' ], constructor: function(cfg) { diff --git a/ExtFeedViewer/app/view/Viewport.js b/ExtFeedViewer/app/view/Viewport.js deleted file mode 100644 index 2be3ba0..0000000 --- a/ExtFeedViewer/app/view/Viewport.js +++ /dev/null @@ -1,19 +0,0 @@ -/* - * File: app/view/Viewport.js - * - * This file was generated by Sencha Architect version 3.0.0. - * http://www.sencha.com/products/architect/ - * - * This file requires use of the Ext JS 4.2.x library, under independent license. - * License of Sencha Architect does not include license for Ext JS 4.2.x. For more - * details see http://www.sencha.com/license or contact license@sencha.com. - * - * This file will be auto-generated each and everytime you save your project. - * - * Do NOT hand edit this file. - */ - -Ext.define('MyApp.view.Viewport', { - extend: 'MyApp.view.MyViewport', - renderTo: Ext.getBody() -}); \ No newline at end of file diff --git a/ExtFeedViewer/bootstrap.css b/ExtFeedViewer/bootstrap.css index c9c9a72..83d85a3 100644 --- a/ExtFeedViewer/bootstrap.css +++ b/ExtFeedViewer/bootstrap.css @@ -1,9 +1,2 @@ - - -/* - * This file is generated by Sencha Cmd and should NOT be edited. It redirects - * to the most recently built CSS file for the application to allow index.html - * in the development directory to load properly (i.e., "dev mode"). - */ -@import 'build/testing/FeedViewer/resources/FeedViewer-all.css'; - +/* generated file */ +@import 'ext/packages/ext-theme-classic/build/resources/ext-theme-classic-all-rtl.css' \ No newline at end of file diff --git a/ExtFeedViewer/bootstrap.js b/ExtFeedViewer/bootstrap.js index a8e9af3..9d9ebe7 100644 --- a/ExtFeedViewer/bootstrap.js +++ b/ExtFeedViewer/bootstrap.js @@ -413,7 +413,6 @@ Ext.ClassManager.addNameAlternateMappings({ ], "Ext.grid.RowEditor": [], "Ext.grid.RowEditorButtons": [], - "Ext.grid.Scroller": [], "Ext.grid.View": [], "Ext.grid.ViewDropZone": [], "Ext.grid.column.Action": [ @@ -844,8 +843,7 @@ Ext.ClassManager.addNameAlternateMappings({ "MyApp.view.FeedPanel": [], "MyApp.view.FeedPost": [], "MyApp.view.FeedWindow": [], - "MyApp.view.MyViewport": [], - "MyApp.view.Viewport": [] + "MyApp.view.MyViewport": [] }); Ext.ClassManager.addNameAliasMappings({ "Ext.AbstractComponent": [], @@ -1283,7 +1281,6 @@ Ext.ClassManager.addNameAliasMappings({ "Ext.grid.RowEditorButtons": [ "widget.roweditorbuttons" ], - "Ext.grid.Scroller": [], "Ext.grid.View": [ "widget.gridview" ], @@ -1862,8 +1859,7 @@ Ext.ClassManager.addNameAliasMappings({ "MyApp.view.FeedWindow": [ "widget.feedwindow" ], - "MyApp.view.MyViewport": [], - "MyApp.view.Viewport": [] + "MyApp.view.MyViewport": [] }); Ext.setVersion("ext-theme-base", "4.2.1"); Ext.setVersion("ext-theme-classic", "4.2.1"); diff --git a/ExtFeedViewer/metadata/Application b/ExtFeedViewer/metadata/Application index 5b7685a..4474d37 100644 --- a/ExtFeedViewer/metadata/Application +++ b/ExtFeedViewer/metadata/Application @@ -6,7 +6,6 @@ }, "codeClass": null, "userConfig": { - "autoCreateViewport": true, "controllers": [ "FeedController" ], @@ -57,10 +56,7 @@ }, "codeClass": null, "userConfig": { - "enabled": true, - "paths": [ - "{\"Ext.ux\":\"ux/\"}" - ] + "enabled": true }, "designerId": "10e31052-bd3e-4fa1-9e22-9983d22d34f7" }