Skip to content

Release v2.2.12 #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 8, 2022
Merged

Release v2.2.12 #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f56186
Fix Add and Replace column's python code on Frame app
Aug 8, 2022
fd4f069
Fix PopupComponent to prevent top-left position of popup not to be le…
Aug 8, 2022
e4e10f7
Merge pull request #163 from minjk-bl/devops
minjk-bl Aug 8, 2022
19a6e5c
deploy visualpython 2.2.12
visualpython Aug 8, 2022
488878c
Merge branch 'release' of https://github.com/visualpython/visualpytho…
visualpython Aug 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/com/com_Config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ define([
/**
* Version
*/
Config.version = "2.2.11";
Config.version = "2.2.12";

/**
* Type of mode
Expand Down
2 changes: 1 addition & 1 deletion js/com/com_Const.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ define ([
class Constants { }

Constants.TOOLBAR_BTN_INFO = {
HELP: "Visual Python 2.2.11"
HELP: "Visual Python 2.2.12"
, ICON: "vp-main-icon"
, ID: "vpBtnToggle"
, NAME: "toggle-vp"
Expand Down
13 changes: 13 additions & 0 deletions js/com/component/PopupComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,20 @@ define([
open() {
vpLog.display(VP_LOG_TYPE.DEVELOP, 'open popup', this);
this.loadState();

this.show();

// set popup position if its top-left side is outside of view
let pos = $(this.wrapSelector()).position();
if (pos) {
if (pos.top < 0) {
$(this.wrapSelector()).css({ top: 0 });
}
if (pos.left < 0) {
$(this.wrapSelector()).css({ left: 0 });
}
}

this._bindCodemirror();

$(this.eventTarget).trigger({
Expand Down
8 changes: 4 additions & 4 deletions js/m_apps/Frame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,12 +1302,12 @@ define([
var tab = content.addtype;
if (tab == 'value') {
var value = com_util.convertToStr(content.value, content.valueastext);
code.appendFormat("{0}[[{1}]] = {2}", tempObj, name, value);
code.appendFormat("{0}[{1}] = {2}", tempObj, name, value);
} else if (tab == 'calculation') {
var { var1col, oper, var2col } = content;
var var1code = tempObj + "['" + var1col + "']";
var var2code = tempObj + "['" + var2col + "']";
code.appendFormat('{0}[[{1}]] = {2} {3} {4}', tempObj, name, var1code, oper, var2code);
code.appendFormat('{0}[{1}] = {2} {3} {4}', tempObj, name, var1code, oper, var2code);
} else if (tab == 'replace') {
var replaceStr = new com_String();
var useRegex = content['useregex'];
Expand All @@ -1325,7 +1325,7 @@ define([
if (selectedName && selectedName != '') {
selectedName = '[[' + selectedName + ']]';
}
code.appendFormat("{0}[[{1}]] = {2}{3}.replace({{4}}", tempObj, name, tempObj, selectedName, replaceStr);
code.appendFormat("{0}[{1}] = {2}{3}.replace({{4}}", tempObj, name, tempObj, selectedName, replaceStr);
if (useRegex) {
code.append(', regex=True');
}
Expand All @@ -1334,7 +1334,7 @@ define([
var value = com_util.convertToStr(content.value, content.valueastext);
code.appendFormat("{0} = {1}", content.subset, value);
} else if (tab == 'apply') {
code.appendFormat("{0}[[{1}]] = {2}[{3}].apply({4})", tempObj, name, tempObj, content.column, content.apply);
code.appendFormat("{0}[{1}] = {2}[{3}].apply({4})", tempObj, name, tempObj, content.column, content.apply);
}
break;
case FRAME_EDIT_TYPE.ADD_ROW:
Expand Down