Some fix for YUI compressor

Benjamin Renard
1 parent 453a5dc8
Showing 6 changed files with 12 additions and 106 deletions Show diff stats
js/app/models/RequestParamObject.js
js/app/views/FeedbackUI.js
js/app/views/ParamArgumentsUI.js
js/app/views/StatisticsUI.js
js/app/views/TabResultUI.js
js/app/views/Viewport.js
@@ -44,7 +44,7 @@ Ext.define(&#39;amdaModel.RequestParamObject&#39;, {
         fields : [
           {name: 'type', type: 'int'}, /* Parameter type. 0: Scalar, 1: Tab1D, 2: Tab2D */
-          {name: 'is-init', type: 'bool', default:false},
+          {name: 'is-init', type: 'bool', defaultValue: false},
           {name: 'paramid', type: 'string'},
           /* Fields for dim1 */
           {name: 'dim1-index', type: 'string', defaultValue: '*'},
@@ -121,7 +121,7 @@ Ext.define(&#39;amdaUI.FeedbackUI&#39;, {
 		//make the object to send
 		var feed = {user : fielduser.getValue(), 
-				interface : fieldinterface.getValue(), 
+				'interface' : fieldinterface.getValue(), 
 				subject : subjectMsg, 
 				userText : fielddes.getValue(), 
 				userAgent : fieldbrowser.getValue(),
@@ -263,4 +263,4 @@ Ext.define(&#39;amdaUI.FeedbackUI&#39;, {
 		}
 		Ext.apply (this , Ext.apply (arguments, myConf));
 	}
-});
 \ No newline at end of file
+});
@@ -474,7 +474,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
     				fieldLabel: argument.name,
     				decimalPrecision : 3,
     				allowBlank       : false,
-    				value: parseFloat(argument.default),
+    				value: parseFloat(arg['default']),
     				listeners: {
     					change: function(field, newValue, oldValue, eOpts) {
     						var template_args = me.paramRequestObject.get('template_args');
@@ -508,7 +508,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
     			    queryMode: 'local',
     			    displayField: 'value',
     			    valueField: 'key',
-    			    value: argument.default,
+    			    value: argument['default'],
     			    editable: false,
     				argId: 'template_' + key,
     			    listeners: {
@@ -532,7 +532,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
     			var argumentField = Ext.create('Ext.form.Checkbox', {
     				argId: 'template_' + key,
     				fieldLabel: argument.name,
-    				value: (parseInt(argument.default) == 1),
+    				value: (parseInt(argument['default']) == 1),
     				listeners: {
     					change: function(field, newValue, oldValue, eOpts) {
     						var template_args = me.paramRequestObject.get('template_args');
@@ -131,7 +131,7 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
 		{			 			
 			var obj = Ext.clone(rec.data);
-			if (obj.function == null) 
+			if (obj['function'] == null) 
 			{				
 				myDesktopApp.warningMsg('Please select function : `click to select`'); 
 				updateStatus = false;
@@ -85,7 +85,7 @@ Ext.define(&#39;amdaUI.ResultItem&#39;, {
 	linkedNode : null,
-	delete: function(processId) {
+	deleteItem: function(processId) {
 		var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.result.id);
 		var jobLinkedNode = module.linkedNodes.getByKey(processId);
 		jobLinkedNode.deleteNode();
@@ -217,7 +217,7 @@ Ext.define(&#39;amdaUI.ResultItem&#39;, {
 				text: 'Delete Both',
 				scope : this,
 				handler: function() {
-					this.delete(config.processId);
+					this.deleteItem(config.processId);
 					this.ownerCt.remove(this);
 				}
 			}]
@@ -243,7 +243,7 @@ Ext.define(&#39;amdaUI.ResultItem&#39;, {
 				text: 'Delete',
 				scope : this,
 				handler: function() {
-					this.delete(config.processId);
+					this.deleteItem(config.processId);
 					this.ownerCt.remove(this);
 				}
 			}]
@@ -272,7 +272,7 @@ Ext.define(&#39;amdaUI.ResultItem&#39;, {
 				text: 'Delete',
 				scope : this,
 				handler: function() {
-					this.delete(config.processId);
+					this.deleteItem(config.processId);
 					this.ownerCt.remove(this);
 				}
 			}]
@@ -301,7 +301,7 @@ Ext.define(&#39;amdaUI.ResultItem&#39;, {
 				text: 'Delete',
 				scope : this,
 				handler: function() {
-					this.delete(config.processId);
+					this.deleteItem(config.processId);
 					this.ownerCt.remove(this);
 				}
 			},{
@@ -1,94 +0,0 @@
-/**
- * @class AMDA-NG4.Viewport
- * @extends Ext.Panel
- * This is a default generated class which would usually be used to initialize your application's
- * main viewport. By default this is simply a welcome screen that tells you that the app was 
- * generated correctly.
- */
-AMDA-NG4.Viewport = Ext.extend(Ext.Panel, {
-    id        : 'viewport',
-    layout    : 'card',
-    fullscreen: true,
-
-    initComponent: function() {
-        var store = new Ext.data.Store({
-            fields: ['text', 'href'],
-            data  : [
-                {
-                    text: 'Touch API',
-                    href: 'http://dev.sencha.com/deploy/touch/docs/'
-                },
-                {
-                    text: 'Touch Examples',
-                    href: 'http://dev.sencha.com/deploy/touch/examples/'
-                }
-            ]
-        });
-
-        Ext.apply(this, {
-            dockedItems: [
-                {
-                    dock : 'left',
-                    xtype: 'list',
-                    store: store,
-                    width: 250,
-
-                    tpl         : '<tpl for="."><div class="link"><strong>{text}</strong></div></tpl>',
-                    itemSelector: 'div.link',
-
-                    listeners: {
-                        itemtap: this.onListItemTap
-                    },
-
-                    dockedItems: [
-                        {
-                            xtype: 'toolbar',
-                            dock : 'top',
-                            ui   : 'light'
-                        }
-                    ]
-                }
-            ],
-
-            items: [
-                {
-                    xtype : 'panel',
-                    layout: 'fit',
-
-                    dockedItems: [
-                        {
-                            dock : 'top',
-                            xtype: 'toolbar',
-                            title: 'Welcome to Sencha Touch'
-                        }
-                    ],
-
-                    items: [
-                        {
-                            xtype: 'panel',
-                            style: 'background:#fff',
-
-                            styleHtmlContent: true,
-
-                            html : [
-                                '<h3>Getting Started</h3>',
-                                '<p>You have successfully generated the AMDA-NG4 application. Currently this app is a blank slate, ',
-                                'with just the minimum set of files and directories. The file creating this interface can be found ',
-                                'in app/views/Viewport.js</p>'
-                            ]
-                        }
-                    ]
-                }
-            ]
-        });
-
-        AMDA-NG4.Viewport.superclass.initComponent.apply(this, arguments);
-    },
-
-    onListItemTap: function(list, index, node, e) {
-        var record = list.getRecord(node);
-
-        window.open(record.get('href'));
-    }
-});
-