diff --git a/src/file_io/udf.js b/src/file_io/udf.js
index 2d34bdff..e53d9367 100644
--- a/src/file_io/udf.js
+++ b/src/file_io/udf.js
@@ -81,6 +81,9 @@ define([
this.importedList = [];
this.title_no = 0;
+ // double click setter
+ this.clicked = 0;
+
// file navigation : state 데이터 목록
this.state = {
paramData:{
@@ -138,22 +141,22 @@ define([
var that = this;
// toggle item codebox
- $(document).on('click', this.wrapSelector('.vp-sn-item-header .vp-sn-indicator'), function() {
- var parent = $(this).parent();
- var hasOpen = $(this).hasClass('open');
- // hide all codebox
- $(that.wrapSelector('.vp-sn-indicator')).removeClass('open');
- $(that.wrapSelector('.vp-sn-item-code')).hide();
+ // $(document).on('click', this.wrapSelector('.vp-sn-item-header .vp-sn-indicator'), function() {
+ // var parent = $(this).parent();
+ // var hasOpen = $(this).hasClass('open');
+ // // hide all codebox
+ // $(that.wrapSelector('.vp-sn-indicator')).removeClass('open');
+ // $(that.wrapSelector('.vp-sn-item-code')).hide();
- if (!hasOpen) {
- // show code
- $(this).addClass('open');
- $(parent).parent().find('.vp-sn-item-code').show();
- } else {
- // hide code
- $(parent).parent().find('.vp-sn-item-code').hide();
- }
- });
+ // if (!hasOpen) {
+ // // show code
+ // $(this).addClass('open');
+ // $(parent).parent().find('.vp-sn-item-code').show();
+ // } else {
+ // // hide code
+ // $(parent).parent().find('.vp-sn-item-code').hide();
+ // }
+ // });
// menu popup
$(document).on('click', this.wrapSelector('.vp-sn-menu'), function(evt) {
@@ -285,34 +288,111 @@ define([
that.title_no += 1;
});
+ // item header click (toggle & select item) & double click (edit title)
+ $(document).on('click', this.wrapSelector('.vp-sn-item-header'), function(evt) {
+ var thisHeader = this;
+ that.clicked++;
+ if (that.clicked == 1) {
+ setTimeout(function(){
+ if(that.clicked > 1) {
+ // double click
+ // enable input
+ $(thisHeader).find('.vp-sn-item-title').prop('disabled', false);
+ $(thisHeader).find('.vp-sn-item-title').focus();
+
+ }
+ // single click
+ // select item
+ // remove selection
+ $(that.wrapSelector('.vp-sn-item-header')).removeClass('selected');
+ // select item
+ $(thisHeader).addClass('selected');
+
+ // toggle item
+ var parent = $(thisHeader).parent();
+ var indicator = $(thisHeader).find('.vp-sn-indicator');
+ var hasOpen = $(indicator).hasClass('open');
+ // hide all codebox
+ $(that.wrapSelector('.vp-sn-indicator')).removeClass('open');
+ $(that.wrapSelector('.vp-sn-item-code')).hide();
+
+ if (that.clicked > 1 || !hasOpen) {
+ // show code
+ $(indicator).addClass('open');
+ $(parent).find('.vp-sn-item-code').show();
+ } else {
+ // hide code
+ $(parent).find('.vp-sn-item-code').hide();
+ }
+ that.clicked = 0;
+ }, 200);
+ }
+ evt.stopPropagation();
+ });
+
+ // prevent occuring header click event by clicking input
+ $(document).on('click', this.wrapSelector('.vp-sn-item-title'), function(evt) {
+ evt.stopPropagation();
+ });
+
// item title save
- $(document).on('change', this.wrapSelector('.vp-sn-item-title'), function(evt) {
+ $(document).on('blur', this.wrapSelector('.vp-sn-item-title'), function(evt) {
var prevTitle = $(this).closest('.vp-sn-item').data('title');
- var newTitle = $(this).val();
+ var inputTitle = $(this).val();
- that.codemirrorList[prevTitle].save();
- var code = that.codemirrorList[prevTitle].getValue();
- // 기존 title 제거
- vpSetting.removeUserDefinedCode(prevTitle);
-
- // 새 title로 저장
- // save udf
- var newTimestamp = new Date().getTime();
- var newSnippet = { [newTitle]: { code: code, timestamp: newTimestamp } };
- vpSetting.saveUserDefinedCode(newSnippet);
+ if (prevTitle == inputTitle) {
+ ;
+ } else {
+ // check duplicated
+ var titleList = Object.keys(that.codemirrorList);
+ var newTitle = inputTitle;
+ var dupNo = 0
+ while(titleList.includes(newTitle)) {
+ dupNo += 1;
+ newTitle = inputTitle + '_' + dupNo;
+ }
+
+ that.codemirrorList[prevTitle].save();
+ var code = that.codemirrorList[prevTitle].getValue();
+ // 기존 title 제거
+ vpSetting.removeUserDefinedCode(prevTitle);
+
+ // 새 title로 저장
+ // save udf
+ var newTimestamp = new Date().getTime();
+ var newSnippet = { [newTitle]: { code: code, timestamp: newTimestamp } };
+ vpSetting.saveUserDefinedCode(newSnippet);
+
+ // update title & codemirror
+ $(this).closest('.vp-sn-item-title').val(newTitle);
+ $(this).closest('.vp-sn-item').data('title', newTitle);
+ // update codemirror
+ that.codemirrorList[newTitle] = that.codemirrorList[prevTitle];
+ delete that.codemirrorList[prevTitle];
+ }
- // update title & codemirror
- $(this).closest('.vp-sn-item').data('title', newTitle);
- // update codemirror
- that.codemirrorList[newTitle] = that.codemirrorList[prevTitle];
- delete that.codemirrorList[prevTitle];
+ // disable
+ $(this).prop('disabled', true);
});
// item menu click
$(document).on('click', this.wrapSelector('.vp-sn-item-menu-item'), function(evt) {
var menu = $(this).data('menu');
var title = $(this).closest('.vp-sn-item').data('title');
- if (menu == 'duplicate') {
+ if (menu == 'run') {
+ var item = $(this).closest('.vp-sn-item');
+ var title = $(item).data('title');
+
+ // get codemirror
+ that.codemirrorList[title].save();
+ var code = that.codemirrorList[title].getValue();
+ $(vpCommon.wrapSelector('#vp_appsCode')).val(code);
+ $(vpCommon.wrapSelector('#vp_appsCode')).trigger({
+ type: 'popup_apply',
+ title: 'Snippets',
+ code: code
+ });
+ } else if (menu == 'duplicate') {
var dupNo = 1;
var timestamp = new Date().getTime();
var dupTitle = title + '_dup' + dupNo;
@@ -333,7 +413,7 @@ define([
var dupSnippet = { [dupTitle]: { code: code, timestamp: timestamp } };
vpSetting.saveUserDefinedCode(dupSnippet);
- var tag = $(that.wrapSelector('.vp-sn-item-code textarea[data-title="' + dupTitle + '"]'));
+ var tag = $(that.wrapSelector('.vp-sn-item[data-title="' + dupTitle + '"] textarea'));
that.bindCodeMirror(dupTitle, tag[0]);
$(dupItem).find('.vp-sn-indicator').trigger('click');
@@ -417,7 +497,7 @@ define([
// export complete event
$(document).on('snippetSaved.fileNavigation', this.wrapSelector('.vp-sn-filepath'), function(evt) {
- var fileName = evt.path;
+ var fileName = evt.file;
var selectedPath = $(this).val();
// get checked snippets
@@ -489,11 +569,15 @@ define([
item.appendFormatLine('
', 'vp-sn-item', title, timestamp);
item.appendFormatLine('
', 'vp-sn-item-header');
item.appendFormatLine('', 'vp-sn-indicator');
- item.appendFormatLine('', 'vp-sn-item-title', title);
+ item.appendFormatLine('', 'vp-sn-item-title', title);
if (hasImported) {
item.appendFormatLine('', 'fa fa-circle vp-sn-imported-item');
}
item.appendFormatLine('
', 'vp-sn-item-menu');
+ item.appendFormatLine('
'
+ , 'vp-sn-item-menu-item', 'run', 'Run');
+ item.appendFormatLine('
', '/nbextensions/visualpython/resource/snippets/run.svg');
+ item.appendLine('
');
item.appendFormatLine(''
, 'vp-sn-item-menu-item', 'duplicate', 'Duplicate');
item.appendFormatLine('', '/nbextensions/visualpython/resource/snippets/duplicate.svg');
@@ -595,6 +679,19 @@ define([
// save codemirror value to origin textarea
// this.vp_userCode.save();
+ // selected snippet
+ var selected = $(this.wrapSelector('.vp-sn-item-header.selected'));
+ if (selected) {
+ var item = $(selected).closest('.vp-sn-item');
+ var title = $(item).data('title');
+
+ // get codemirror
+ this.codemirrorList[title].save();
+ var code = this.codemirrorList[title].getValue();
+ sbCode.append(code);
+ }
+
+
if (addCell) this.cellExecute(sbCode.toString(), exec);
return sbCode.toString();
diff --git a/src/matplotlib/plot.js b/src/matplotlib/plot.js
index faaeffce..2f3cb15f 100644
--- a/src/matplotlib/plot.js
+++ b/src/matplotlib/plot.js
@@ -605,6 +605,8 @@ define([
// view button click - view little popup to show variable & details
$(this.wrapSelector('.vp-select-data')).click(function(event) {
var axes = $(this).data('axes');
+
+ var btnPos = $(this)[0].getBoundingClientRect();
if($(that.wrapSelector('#vp_varViewBox')).is(":hidden")) {
// refresh variables
@@ -612,12 +614,16 @@ define([
// set position
var boxSize = { width: 280, height: 260 };
var boxPosition = { position: 'fixed', left: event.pageX - 20, top: event.pageY + 20 };
- if (event.pageX + boxSize.width > window.innerWidth) {
- boxPosition.left = event.pageX - boxSize.width;
- }
- if (event.pageY + boxSize.height > window.innerHeight) {
- boxPosition.top = event.pageY - boxSize.height - 20;
- }
+ // if (event.pageX + boxSize.width > window.innerWidth) {
+ // boxPosition.left = event.pageX - boxSize.width;
+ // }
+ // if (event.pageY + boxSize.height > window.innerHeight) {
+ // boxPosition.top = event.pageY - boxSize.height - 20;
+ // }
+
+ // set as center
+ boxPosition.left = 'calc(50% - 140px)'
+ boxPosition.top = 'calc(50% - 130px)'
$('#vp_varViewBox').css({
...boxPosition
});
diff --git a/src/pandas/fileNavigation/renderer.js b/src/pandas/fileNavigation/renderer.js
index 8dafcf76..6b352fed 100644
--- a/src/pandas/fileNavigation/renderer.js
+++ b/src/pandas/fileNavigation/renderer.js
@@ -394,29 +394,33 @@ define([
/** 최초의 path가 C:/Users/L.E.E/Desktop/Bit Python이라면, baseFolder는 Bit Python
* 현재 이동한 시점의 path에서 baseFolder인 Bit Python가 존재하지 않을 때
*/
+ var pathInput = '';
+ var fileInput = `${filePathStr}`;
if (upDirectoryCount > 0
&& currentDirStr.indexOf(baseFolder) === -1) {
/** 2020년 12월 21일 single quote 삭제 */
- $(fileNavigationRendererThis.fileResultState.pathInputId).val(`${prefixUpDirectory}${relativeDirPath}${slashstr}${filePathStr}`);
- $(fileNavigationRendererThis.fileResultState.fileInputId).val(`${filePathStr}`);
- /** 현재 이동한 시점의 path에서 baseFolder인 Bit Python가 존재할 때 */
+ pathInput = `${prefixUpDirectory}${relativeDirPath}${slashstr}${filePathStr}`;
+ /** 현재 이동한 시점의 path에서 baseFolder인 Bit Python가 존재할 때 */
} else {
- $(fileNavigationRendererThis.fileResultState.pathInputId).val(`./${relativeDirPath}${slashstr}${filePathStr}`);
- $(fileNavigationRendererThis.fileResultState.fileInputId).val(`${filePathStr}`);
+ pathInput = `./${relativeDirPath}${slashstr}${filePathStr}`;
}
+ $(fileNavigationRendererThis.fileResultState.pathInputId).val(pathInput);
+ $(fileNavigationRendererThis.fileResultState.fileInputId).val(fileInput);
// vpCommon.renderSuccessMessage(filePathStr + ' selection ' + 'completed');
/** 장안태 추가. 파일 선택 완료시 문서 이벤트 발동 */
if (fileNavigationState.getFileNavigationtype() === FILE_NAVIGATION_TYPE.SAVE_FILE) {
$(document).trigger({
- type:"fileSaveSelected.fileNavigation",
- path:`${filePathStr}`
+ type: "fileSaveSelected.fileNavigation",
+ file: fileInput,
+ path: pathInput
});
} else {
$(document).trigger({
- type:"fileReadSelected.fileNavigation",
- path:`${filePathStr}`
+ type: "fileReadSelected.fileNavigation",
+ file: fileInput,
+ path: pathInput
});
}
@@ -425,7 +429,8 @@ define([
if (fileNavigationState.getFileNavigationtype() === FILE_NAVIGATION_TYPE.READ_IMG_FOR_MARKDOWN) {
$(document).trigger({
type: fileNavigationState.getTriggerName(),
- path: `${filePathStr}`
+ file: fileInput,
+ path: pathInput
})
}
@@ -433,14 +438,16 @@ define([
if (fileNavigationState.getFileNavigationtype() === FILE_NAVIGATION_TYPE.SAVE_SNIPPETS) {
$(fileNavigationRendererThis.fileResultState.pathInputId).trigger({
type: 'snippetSaved.fileNavigation',
- path:`${filePathStr}`
+ file: fileInput,
+ path: pathInput
});
}
/** Snippets 불러오기 후 이벤트 발동 */
if (fileNavigationState.getFileNavigationtype() === FILE_NAVIGATION_TYPE.READ_SNIPPETS) {
$(fileNavigationRendererThis.fileResultState.pathInputId).trigger({
type: 'snippetRead.fileNavigation',
- path:`${filePathStr}`
+ file: fileInput,
+ path: pathInput
});
}