Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite4e10f7

Browse files
authored
Merge pull request#163 from minjk-bl/devops
Update for v2.2.12
2 parentsf5009de +fd4f069 commite4e10f7

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

‎js/com/component/PopupComponent.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,20 @@ define([
792792
open(){
793793
vpLog.display(VP_LOG_TYPE.DEVELOP,'open popup',this);
794794
this.loadState();
795+
795796
this.show();
797+
798+
// set popup position if its top-left side is outside of view
799+
letpos=$(this.wrapSelector()).position();
800+
if(pos){
801+
if(pos.top<0){
802+
$(this.wrapSelector()).css({top:0});
803+
}
804+
if(pos.left<0){
805+
$(this.wrapSelector()).css({left:0});
806+
}
807+
}
808+
796809
this._bindCodemirror();
797810

798811
$(this.eventTarget).trigger({

‎js/m_apps/Frame.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,12 +1302,12 @@ define([
13021302
vartab=content.addtype;
13031303
if(tab=='value'){
13041304
varvalue=com_util.convertToStr(content.value,content.valueastext);
1305-
code.appendFormat("{0}[[{1}]] = {2}",tempObj,name,value);
1305+
code.appendFormat("{0}[{1}] = {2}",tempObj,name,value);
13061306
}elseif(tab=='calculation'){
13071307
var{ var1col, oper, var2col}=content;
13081308
varvar1code=tempObj+"['"+var1col+"']";
13091309
varvar2code=tempObj+"['"+var2col+"']";
1310-
code.appendFormat('{0}[[{1}]] = {2} {3} {4}',tempObj,name,var1code,oper,var2code);
1310+
code.appendFormat('{0}[{1}] = {2} {3} {4}',tempObj,name,var1code,oper,var2code);
13111311
}elseif(tab=='replace'){
13121312
varreplaceStr=newcom_String();
13131313
varuseRegex=content['useregex'];
@@ -1325,7 +1325,7 @@ define([
13251325
if(selectedName&&selectedName!=''){
13261326
selectedName='[['+selectedName+']]';
13271327
}
1328-
code.appendFormat("{0}[[{1}]] = {2}{3}.replace({{4}}",tempObj,name,tempObj,selectedName,replaceStr);
1328+
code.appendFormat("{0}[{1}] = {2}{3}.replace({{4}}",tempObj,name,tempObj,selectedName,replaceStr);
13291329
if(useRegex){
13301330
code.append(', regex=True');
13311331
}
@@ -1334,7 +1334,7 @@ define([
13341334
varvalue=com_util.convertToStr(content.value,content.valueastext);
13351335
code.appendFormat("{0} = {1}",content.subset,value);
13361336
}elseif(tab=='apply'){
1337-
code.appendFormat("{0}[[{1}]] = {2}[{3}].apply({4})",tempObj,name,tempObj,content.column,content.apply);
1337+
code.appendFormat("{0}[{1}] = {2}[{3}].apply({4})",tempObj,name,tempObj,content.column,content.apply);
13381338
}
13391339
break;
13401340
caseFRAME_EDIT_TYPE.ADD_ROW:

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp