Skip to content

Commit 6db2412

Browse files
author
minjk-bl
committed
Fix not to add block by default
1 parent 8f98b05 commit 6db2412

4 files changed

Lines changed: 64 additions & 47 deletions

File tree

‎visualpython/js/com/component/PackageManager.js‎

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ define([
1717
'vp_base/js/com/com_util',
1818
'vp_base/js/com/com_Const',
1919
'vp_base/js/com/com_String',
20+
'vp_base/js/com/com_interface',
2021
'vp_base/js/com/component/SuggestInput',
2122
'vp_base/js/com/component/PopupComponent',
2223
'vp_base/js/com/component/FileNavigation',
2324
'vp_base/js/com/component/LoadingSpinner'
24-
], function(ifHtml, ifCss, com_util, com_Const, com_String, SuggestInput, PopupComponent, FileNavigation, LoadingSpinner) {
25+
], function(ifHtml, ifCss, com_util, com_Const, com_String, com_interface, SuggestInput, PopupComponent, FileNavigation, LoadingSpinner) {
2526

2627
/**
2728
* PackageManager
@@ -197,28 +198,32 @@ define([
197198
if (vpConfig.extensionType === 'lite') {
198199
code = com_util.formatString("%pip uninstall {0}", pipName);
199200
}
201+
// DEPRECATED: no longer save to block as default
200202
// create block and run it
201-
$('#vp_wrapper').trigger({
202-
type: 'create_option_page',
203-
blockType: 'block',
204-
menuId: 'lgExe_code',
205-
menuState: { taskState: { code: code } },
206-
afterAction: 'run'
207-
});
203+
// $('#vp_wrapper').trigger({
204+
// type: 'create_option_page',
205+
// blockType: 'block',
206+
// menuId: 'lgExe_code',
207+
// menuState: { taskState: { code: code } },
208+
// afterAction: 'run'
209+
// });
210+
com_interface.insertCell('code', code, true, 'Package Manager');
208211
} else if (menu === 'upgrade') {
209212
var pipName = that.packageLib[key].pipName;
210213
var code = com_util.formatString("!pip install --upgrade {0}", pipName);
211214
if (vpConfig.extensionType === 'lite') {
212215
code = com_util.formatString("%pip install {0}", pipName);
213216
}
217+
// DEPRECATED: no longer save to block as default
214218
// create block and run it
215-
$('#vp_wrapper').trigger({
216-
type: 'create_option_page',
217-
blockType: 'block',
218-
menuId: 'lgExe_code',
219-
menuState: { taskState: { code: code } },
220-
afterAction: 'run'
221-
});
219+
// $('#vp_wrapper').trigger({
220+
// type: 'create_option_page',
221+
// blockType: 'block',
222+
// menuId: 'lgExe_code',
223+
// menuState: { taskState: { code: code } },
224+
// afterAction: 'run'
225+
// });
226+
com_interface.insertCell('code', code, true, 'Package Manager');
222227
} else if (menu === 'delete') {
223228
$(item).remove();
224229
delete that.packageLib[key];
@@ -331,14 +336,17 @@ define([
331336
return false;
332337
}
333338
}
339+
// DEPRECATED: no longer save to block as default
334340
// create block and run it
335-
$('#vp_wrapper').trigger({
336-
type: 'create_option_page',
337-
blockType: 'block',
338-
menuId: 'lgExe_code',
339-
menuState: { taskState: { code: code } },
340-
afterAction: 'run'
341-
});
341+
// $('#vp_wrapper').trigger({
342+
// type: 'create_option_page',
343+
// blockType: 'block',
344+
// menuId: 'lgExe_code',
345+
// menuState: { taskState: { code: code } },
346+
// afterAction: 'run'
347+
// });
348+
com_interface.insertCell('code', code, true, 'Package Manager');
349+
342350
break;
343351
}
344352

‎visualpython/js/m_apps/Information.js‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ define([
1717
__VP_CSS_LOADER__('vp_base/css/m_apps/information'), // INTEGRATION: unified version of css loader
1818
'vp_base/js/com/com_String',
1919
'vp_base/js/com/com_util',
20+
'vp_base/js/com/com_interface',
2021
'vp_base/js/com/component/PopupComponent',
2122
'vp_base/js/com/component/DataSelector',
2223
'vp_base/js/com/component/LoadingSpinner'
23-
], function(varHtml, varCss, com_String, com_util, PopupComponent, DataSelector, LoadingSpinner) {
24+
], function(varHtml, varCss, com_String, com_util, com_interface, PopupComponent, DataSelector, LoadingSpinner) {
2425

2526
/**
2627
* Information
@@ -406,15 +407,17 @@ define([
406407
// click run button
407408
$(this.wrapSelector('.vp-information-run-button')).click(function(event) {
408409
// get code
409-
var code = that.generateCode();
410+
var code = that.generateCodeForInfo();
411+
// DEPRECATED: no longer save to block as default
410412
// create block and run it
411-
$('#vp_wrapper').trigger({
412-
type: 'create_option_page',
413-
blockType: 'block',
414-
menuId: 'lgExe_code',
415-
menuState: { taskState: { code: code } },
416-
afterAction: 'run'
417-
});
413+
// $('#vp_wrapper').trigger({
414+
// type: 'create_option_page',
415+
// blockType: 'block',
416+
// menuId: 'lgExe_code',
417+
// menuState: { taskState: { code: code } },
418+
// afterAction: 'run'
419+
// });
420+
com_interface.insertCell('code', code, true, 'Data Analysis > Data Info');
418421
});
419422
}
420423

‎visualpython/js/m_apps/Snippets.js‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ define([
1818
'vp_base/js/com/com_util',
1919
'vp_base/js/com/com_Const',
2020
'vp_base/js/com/com_String',
21+
'vp_base/js/com/com_interface',
2122
'vp_base/js/com/component/PopupComponent',
2223
'vp_base/js/com/component/FileNavigation',
2324
'vp_base/js/com/component/LoadingSpinner'
24-
], function(snHtml, snCss, com_util, com_Const, com_String, PopupComponent, FileNavigation, LoadingSpinner) {
25+
], function(snHtml, snCss, com_util, com_Const, com_String, com_interface, PopupComponent, FileNavigation, LoadingSpinner) {
2526

2627
/**
2728
* Snippets
@@ -471,14 +472,16 @@ define([
471472
let cmCode = that.codemirrorList[title];
472473
cmCode.save();
473474
var code = cmCode.getValue();
475+
// DEPRECATED: no longer save to block as default
474476
// create block and run it
475-
$('#vp_wrapper').trigger({
476-
type: 'create_option_page',
477-
blockType: 'block',
478-
menuId: 'lgExe_code',
479-
menuState: { taskState: { code: code } },
480-
afterAction: 'run'
481-
});
477+
// $('#vp_wrapper').trigger({
478+
// type: 'create_option_page',
479+
// blockType: 'block',
480+
// menuId: 'lgExe_code',
481+
// menuState: { taskState: { code: code } },
482+
// afterAction: 'run'
483+
// });
484+
com_interface.insertCell('code', code, true, 'Data Analysis > Snippets');
482485
} else if (menu == 'duplicate') {
483486
var dupNo = 1;
484487
var timestamp = new Date().getTime();

‎visualpython/js/m_visualize/Seaborn.js‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ define([
1818
'vp_base/js/com/com_String',
1919
'vp_base/js/com/com_generatorV2',
2020
'vp_base/js/com/com_util',
21+
'vp_base/js/com/com_interface',
2122
'vp_base/js/com/component/PopupComponent',
2223
'vp_base/js/com/component/SuggestInput',
2324
'vp_base/js/com/component/VarSelector2',
2425
'vp_base/data/m_visualize/seabornLibrary',
2526
'vp_base/js/com/component/DataSelector'
26-
], function(chartHTml, chartCss, com_String, com_generator, com_util, PopupComponent, SuggestInput, VarSelector2, SEABORN_LIBRARIES, DataSelector) {
27+
], function(chartHTml, chartCss, com_String, com_generator, com_util, com_interface, PopupComponent, SuggestInput, VarSelector2, SEABORN_LIBRARIES, DataSelector) {
2728

2829
class Seaborn extends PopupComponent {
2930
_init() {
@@ -770,14 +771,16 @@ define([
770771
handleInnerOk() {
771772
// generateImportCode
772773
var code = this.generateImportCode();
774+
// DEPRECATED: no longer save to block as default
773775
// create block and run it
774-
$('#vp_wrapper').trigger({
775-
type: 'create_option_page',
776-
blockType: 'block',
777-
menuId: 'lgExe_code',
778-
menuState: { taskState: { code: code } },
779-
afterAction: 'run'
780-
});
776+
// $('#vp_wrapper').trigger({
777+
// type: 'create_option_page',
778+
// blockType: 'block',
779+
// menuId: 'lgExe_code',
780+
// menuState: { taskState: { code: code } },
781+
// afterAction: 'run'
782+
// });
783+
com_interface.insertCell('code', code, true, 'Visualization > Seaborn');
781784

782785
this.closeInnerPopup();
783786

0 commit comments

Comments
 (0)