CDPP / AMDA_IHM

Commit daa705877ef44511cee4481c9c29d1c9f29e5da9

Authored by Benjamin Renard
1 parent 52f177b6
Exists in master and in 2 other branches akkodis/amdadev, amdadev

Fix regression with module help

Showing 7 changed files with 24 additions and 17 deletions   Show diff stats
Inline Side-by-side
js/app/AmdaApp.js
  Diff comments   View file @daa7058
... ... @@ -728,15 +728,15 @@ Ext.define('amdaApp.AmdaApp', {
728 728 }
729 729 else {
730 730 if (isSpecialInfo && !isNewInfo) {
731   - myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.info.id, true, function(module) {
732   - module.createWindow(isSpecialInfo, 'Welcome on AMDA', true);
733   - });
  731 + myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.help.id, true, function(module) {
  732 + module.createWindow();
  733 + });
734 734 }
735 735 }
736 736  
737 737 if (isNewInfo) {
738 738 myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.info.id, true, function(module) {
739   - module.createWindow(news, 'Amda Latest News');
  739 + module.createWindow('amda-info', 'Amda Latest News', news);
740 740 });
741 741 }
742 742  
... ...
js/app/controllers/AmdaModule.js
  Diff comments   View file @daa7058
... ... @@ -83,7 +83,7 @@ Ext.define('amdaDesktop.AmdaModule', {
83 83 handler: function(event, toolEl, panel){
84 84 var me = this;
85 85 myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.info.id, true, function(module) {
86   - module.createWindow(me.helpFile, me.helpTitle);
  86 + module.createWindow('amda-info', me.helpTitle, me.helpFile);
87 87 });
88 88 }
89 89 }],
... ...
js/app/controllers/InfoModule.js
  Diff comments   View file @daa7058
... ... @@ -15,7 +15,7 @@ Ext.define('amdaDesktop.InfoModule',
15 15 contentId : 'infoUI',
16 16 file : 'releaseNotes.md',
17 17  
18   - createWindow : function(type)
  18 + createWindow : function(type, title=null, help=null)
19 19 {
20 20 var desktop = myDesktopApp.getDesktop();
21 21 var win = desktop.getWindow(this.id);
... ... @@ -37,7 +37,7 @@ Ext.define('amdaDesktop.InfoModule',
37 37  
38 38 win.on({
39 39 show : function(win, eOpts) {
40   - this.updateInfo(win, type);
  40 + this.updateInfo(win, type, title, help);
41 41 },
42 42 scope : this
43 43 });
... ... @@ -45,24 +45,28 @@ Ext.define('amdaDesktop.InfoModule',
45 45 win.show();
46 46 }
47 47 else {
48   - this.updateInfo(win, type);
  48 + this.updateInfo(win, type, title, help);
49 49 }
50 50  
51 51 win.toFront();
52 52 },
53 53  
54   - updateInfo : function(win, type) {
  54 + updateInfo : function(win, type, title, help) {
55 55 var file = '';
56   - var title = '';
  56 + var win_title = '';
57 57  
58 58 switch (type) {
59 59 case 'release-notes':
60 60 file = 'releaseNotes.md';
61   - title = 'AMDA Release Notes';
  61 + win_title = 'AMDA Release Notes';
  62 + break;
  63 + case 'amda-info':
  64 + file = help;
  65 + win_title = title;
62 66 break;
63 67 default:
64 68 file = 'about';
65   - title = "About AMDA";
  69 + win_title = "About AMDA";
66 70 }
67 71  
68 72  
... ... @@ -75,11 +79,14 @@ Ext.define('amdaDesktop.InfoModule',
75 79 var converter = new showdown.Converter(),
76 80 text = converter.makeHtml(text);
77 81 break;
  82 + case 'amda-info':
  83 + // Nothing to do
  84 + break;
78 85 default:
79 86 text = text.replace('{AMDA_VERSION}', AMDA_VERSION).replace('{AMDA_RELEASE_DATE}', AMDA_RELEASE_DATE);
80 87 }
81 88 win.update(text);
82   - win.setTitle(title);
  89 + win.setTitle(win_title);
83 90 }
84 91 });
85 92 }
... ...
js/app/controllers/InteractiveModule.js
  Diff comments   View file @daa7058
... ... @@ -72,7 +72,7 @@ Ext.define('amdaDesktop.InteractiveModule', {
72 72 scope:this,
73 73 handler: function(event, toolEl, panel){
74 74 myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.info.id, true, function(module) {
75   - module.createWindow(me.helpFile, me.helpTitle);
  75 + module.createWindow('amda-info', me.helpTitle, me.helpFile);
76 76 });
77 77 }
78 78 }
... ...
js/app/controllers/InteropModule.js
  Diff comments   View file @daa7058
... ... @@ -367,7 +367,7 @@ Ext.define('amdaDesktop.InteropModule', {
367 367 scope:this,
368 368 handler: function(event, toolEl, panel) {
369 369 myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.info.id, true, function(module) {
370   - module.createWindow(me.helpFile, me.helpTitle);
  370 + module.createWindow('amda-info', me.helpTitle, me.helpFile);
371 371 });
372 372 }
373 373 }],
... ...
js/app/views/CustomFilters.js
  Diff comments   View file @daa7058
... ... @@ -28,7 +28,7 @@ Ext.define('amdaUI.CustomFilters', {
28 28 listeners: {
29 29 click: function (item, e, eOpts) {
30 30 myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.info.id, true, function (module) {
31   - module.createWindow(me.helpFile, me.helpTitle);
  31 + module.createWindow('amda-info', me.helpTitle, me.helpFile);
32 32 });
33 33 }
34 34 }
... ...
js/app/views/ExplorerUI.js
  Diff comments   View file @daa7058
... ... @@ -697,7 +697,7 @@ Ext.define('amdaUI.ExplorerUI', {
697 697 {
698 698 case 'info' :
699 699 myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.info.id, true, function (module) {
700   - module.createWindow(record.get('help'), record.get('text'));
  700 + module.createWindow('amda-info', record.get('text'), record.get('help'));
701 701 });
702 702 break;
703 703 }
... ...