CDPP / AMDA_IHM

Commit c0f7313c57516e2e940de164dfdd889708d3e988

Authored by Benjamin Renard
1 parent 453a5dc8
Exists in minimize

Some fix for YUI compressor

Showing 6 changed files with 12 additions and 106 deletions   Show diff stats
Inline Side-by-side
js/app/models/RequestParamObject.js
  Diff comments   View file @c0f7313
... ... @@ -44,7 +44,7 @@ Ext.define('amdaModel.RequestParamObject', {
44 44  
45 45 fields : [
46 46 {name: 'type', type: 'int'}, /* Parameter type. 0: Scalar, 1: Tab1D, 2: Tab2D */
47   - {name: 'is-init', type: 'bool', default:false},
  47 + {name: 'is-init', type: 'bool', defaultValue: false},
48 48 {name: 'paramid', type: 'string'},
49 49 /* Fields for dim1 */
50 50 {name: 'dim1-index', type: 'string', defaultValue: '*'},
... ...
js/app/views/FeedbackUI.js
  Diff comments   View file @c0f7313
... ... @@ -121,7 +121,7 @@ Ext.define('amdaUI.FeedbackUI', {
121 121  
122 122 //make the object to send
123 123 var feed = {user : fielduser.getValue(),
124   - interface : fieldinterface.getValue(),
  124 + 'interface' : fieldinterface.getValue(),
125 125 subject : subjectMsg,
126 126 userText : fielddes.getValue(),
127 127 userAgent : fieldbrowser.getValue(),
... ... @@ -263,4 +263,4 @@ Ext.define('amdaUI.FeedbackUI', {
263 263 }
264 264 Ext.apply (this , Ext.apply (arguments, myConf));
265 265 }
266   -});
267 266 \ No newline at end of file
  267 +});
... ...
js/app/views/ParamArgumentsUI.js
  Diff comments   View file @c0f7313
... ... @@ -474,7 +474,7 @@ Ext.define('amdaUI.ParamArgumentsUI', {
474 474 fieldLabel: argument.name,
475 475 decimalPrecision : 3,
476 476 allowBlank : false,
477   - value: parseFloat(argument.default),
  477 + value: parseFloat(arg['default']),
478 478 listeners: {
479 479 change: function(field, newValue, oldValue, eOpts) {
480 480 var template_args = me.paramRequestObject.get('template_args');
... ... @@ -508,7 +508,7 @@ Ext.define('amdaUI.ParamArgumentsUI', {
508 508 queryMode: 'local',
509 509 displayField: 'value',
510 510 valueField: 'key',
511   - value: argument.default,
  511 + value: argument['default'],
512 512 editable: false,
513 513 argId: 'template_' + key,
514 514 listeners: {
... ... @@ -532,7 +532,7 @@ Ext.define('amdaUI.ParamArgumentsUI', {
532 532 var argumentField = Ext.create('Ext.form.Checkbox', {
533 533 argId: 'template_' + key,
534 534 fieldLabel: argument.name,
535   - value: (parseInt(argument.default) == 1),
  535 + value: (parseInt(argument['default']) == 1),
536 536 listeners: {
537 537 change: function(field, newValue, oldValue, eOpts) {
538 538 var template_args = me.paramRequestObject.get('template_args');
... ...
js/app/views/StatisticsUI.js
  Diff comments   View file @c0f7313
... ... @@ -131,7 +131,7 @@ Ext.define('amdaUI.StatisticsUI',
131 131 {
132 132 var obj = Ext.clone(rec.data);
133 133  
134   - if (obj.function == null)
  134 + if (obj['function'] == null)
135 135 {
136 136 myDesktopApp.warningMsg('Please select function : `click to select`');
137 137 updateStatus = false;
... ...
js/app/views/TabResultUI.js
  Diff comments   View file @c0f7313
... ... @@ -85,7 +85,7 @@ Ext.define('amdaUI.ResultItem', {
85 85  
86 86 linkedNode : null,
87 87  
88   - delete: function(processId) {
  88 + deleteItem: function(processId) {
89 89 var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.result.id);
90 90 var jobLinkedNode = module.linkedNodes.getByKey(processId);
91 91 jobLinkedNode.deleteNode();
... ... @@ -217,7 +217,7 @@ Ext.define('amdaUI.ResultItem', {
217 217 text: 'Delete Both',
218 218 scope : this,
219 219 handler: function() {
220   - this.delete(config.processId);
  220 + this.deleteItem(config.processId);
221 221 this.ownerCt.remove(this);
222 222 }
223 223 }]
... ... @@ -243,7 +243,7 @@ Ext.define('amdaUI.ResultItem', {
243 243 text: 'Delete',
244 244 scope : this,
245 245 handler: function() {
246   - this.delete(config.processId);
  246 + this.deleteItem(config.processId);
247 247 this.ownerCt.remove(this);
248 248 }
249 249 }]
... ... @@ -272,7 +272,7 @@ Ext.define('amdaUI.ResultItem', {
272 272 text: 'Delete',
273 273 scope : this,
274 274 handler: function() {
275   - this.delete(config.processId);
  275 + this.deleteItem(config.processId);
276 276 this.ownerCt.remove(this);
277 277 }
278 278 }]
... ... @@ -301,7 +301,7 @@ Ext.define('amdaUI.ResultItem', {
301 301 text: 'Delete',
302 302 scope : this,
303 303 handler: function() {
304   - this.delete(config.processId);
  304 + this.deleteItem(config.processId);
305 305 this.ownerCt.remove(this);
306 306 }
307 307 },{
... ...
js/app/views/Viewport.js deleted
View file @453a5dc
... ... @@ -1,94 +0,0 @@
1   -/**
2   - * @class AMDA-NG4.Viewport
3   - * @extends Ext.Panel
4   - * This is a default generated class which would usually be used to initialize your application's
5   - * main viewport. By default this is simply a welcome screen that tells you that the app was
6   - * generated correctly.
7   - */
8   -AMDA-NG4.Viewport = Ext.extend(Ext.Panel, {
9   - id : 'viewport',
10   - layout : 'card',
11   - fullscreen: true,
12   -
13   - initComponent: function() {
14   - var store = new Ext.data.Store({
15   - fields: ['text', 'href'],
16   - data : [
17   - {
18   - text: 'Touch API',
19   - href: 'http://dev.sencha.com/deploy/touch/docs/'
20   - },
21   - {
22   - text: 'Touch Examples',
23   - href: 'http://dev.sencha.com/deploy/touch/examples/'
24   - }
25   - ]
26   - });
27   -
28   - Ext.apply(this, {
29   - dockedItems: [
30   - {
31   - dock : 'left',
32   - xtype: 'list',
33   - store: store,
34   - width: 250,
35   -
36   - tpl : '<tpl for="."><div class="link"><strong>{text}</strong></div></tpl>',
37   - itemSelector: 'div.link',
38   -
39   - listeners: {
40   - itemtap: this.onListItemTap
41   - },
42   -
43   - dockedItems: [
44   - {
45   - xtype: 'toolbar',
46   - dock : 'top',
47   - ui : 'light'
48   - }
49   - ]
50   - }
51   - ],
52   -
53   - items: [
54   - {
55   - xtype : 'panel',
56   - layout: 'fit',
57   -
58   - dockedItems: [
59   - {
60   - dock : 'top',
61   - xtype: 'toolbar',
62   - title: 'Welcome to Sencha Touch'
63   - }
64   - ],
65   -
66   - items: [
67   - {
68   - xtype: 'panel',
69   - style: 'background:#fff',
70   -
71   - styleHtmlContent: true,
72   -
73   - html : [
74   - '<h3>Getting Started</h3>',
75   - '<p>You have successfully generated the AMDA-NG4 application. Currently this app is a blank slate, ',
76   - 'with just the minimum set of files and directories. The file creating this interface can be found ',
77   - 'in app/views/Viewport.js</p>'
78   - ]
79   - }
80   - ]
81   - }
82   - ]
83   - });
84   -
85   - AMDA-NG4.Viewport.superclass.initComponent.apply(this, arguments);
86   - },
87   -
88   - onListItemTap: function(list, index, node, e) {
89   - var record = list.getRecord(node);
90   -
91   - window.open(record.get('href'));
92   - }
93   -});
94   -