Skip to content

C
check
Commit 057362ae by Kidong Song
Options

Merge branch 'feature/1.1.0_kdh' into 'feature/1.1.1' 

Feature/1.1.0 kdh

See merge request !139
parents d5d85487 7d170bd5
Showing with 56 additions and 56 deletions
abvw/common/js/avweb.js
......@@ -397,7 +397,7 @@ AVWEB.avwCheckLogin = function(option) {
var returnPage;
if(option) {
returnPage = option
returnPage = option;
} else {
var sysSetting = AVWEB.avwSysSetting();
returnPage = sysSetting.loginPage;
......@@ -639,7 +639,7 @@ AVWEB.avwGrabContentPageImage = function(accountPath, params, success, error) {
var apiUrl;
apiUrl = ClientData.conf_apiUrl(); //sysSettings.apiUrl;
if(accountPath) {
apiUrl = AVWEB.format(apiUrl, accountPath)
apiUrl = AVWEB.format(apiUrl, accountPath);
}
apiUrl = apiUrl + '/' + apiName + '/';
......@@ -750,7 +750,7 @@ AVWEB.avwUploadBackupFile = function(accountPath, params, async, success, error)
var apiUrl;
apiUrl = ClientData.conf_apiUrl(); //sysSettings.apiUrl;
if(accountPath) {
apiUrl = AVWEB.format(apiUrl, accountPath)
apiUrl = AVWEB.format(apiUrl, accountPath);
}
apiUrl = apiUrl + '/' + apiName + '/';
......
abvw/common/js/common.js
......@@ -2138,7 +2138,7 @@ var ValidationUtil = {
list[i] = c;
}
var count = list.length;
return count
return count;
},
// Special character: *
IsCharacterSpecial : function(value) {
......@@ -3029,7 +3029,7 @@ COMMON.getBytes = function(value) {
count = (count / 3) * 2 + tmp;
} else {
count = escapedStr.length
count = escapedStr.length;
}
return count;
};
......
abvw/common/js/jquery.toastmessage.js
......@@ -101,7 +101,7 @@
else if (localSettings.messages) {
toastItemInner = $('<div></div>').hide().addClass('toast-item').appendTo(toastWrapAll).animate(localSettings.inEffect, localSettings.inEffectDuration);
toastItemClose = $('<div></div>').addClass('toast-item-close').prependTo(toastItemInner).html(localSettings.closeText).click(function () { $().toastmessage('removeToast', toastItemInner, localSettings) });
toastItemClose = $('<div></div>').addClass('toast-item-close').prependTo(toastItemInner).html(localSettings.closeText).click(function () { $().toastmessage('removeToast', toastItemInner, localSettings); });
for (var nIndexMsg = 0; nIndexMsg < localSettings.messages.length; nIndexMsg++) {
// Add each message to display
......@@ -111,7 +111,7 @@
else { // Single message -> Same to old method
toastItemInner = $('<div></div>').hide().addClass('toast-item toast-type-' + localSettings.type).appendTo(toastWrapAll).html($('<p>').append(localSettings.text)).animate(localSettings.inEffect, localSettings.inEffectDuration).wrap(toastItemOuter);
toastItemClose = $('<div></div>').addClass('toast-item-close').prependTo(toastItemInner).html(localSettings.closeText).click(function () { $().toastmessage('removeToast', toastItemInner, localSettings) });
toastItemClose = $('<div></div>').addClass('toast-item-close').prependTo(toastItemInner).html(localSettings.closeText).click(function () { $().toastmessage('removeToast', toastItemInner, localSettings); });
toastItemImage = $('<div></div>').addClass('toast-item-image').addClass('toast-item-image-' + localSettings.type).prependTo(toastItemInner);
}
......
abvw/common/js/jquery.treeview.js
......@@ -94,7 +94,7 @@
classes += this + "-hitarea ";
});
$(this).addClass( classes );
})
});
}
// apply event to hitarea
......
abvw/common/js/scrolltopcontrol.js
......@@ -17,60 +17,60 @@ var scrolltotop={
scrollup:function(){
if (!this.cssfixedsupport) //if control is positioned using JavaScript
this.$control.css({opacity:0}) //hide control immediately after clicking it
var dest=isNaN(this.setting.scrollto)? this.setting.scrollto : parseInt(this.setting.scrollto)
this.$control.css({opacity:0}); //hide control immediately after clicking it
var dest=isNaN(this.setting.scrollto)? this.setting.scrollto : parseInt(this.setting.scrollto);
if (typeof dest=="string" && jQuery('#'+dest).length==1) //check element set by string exists
dest=jQuery('#'+dest).offset().top
dest=jQuery('#'+dest).offset().top;
else
dest=0
dest=0;
this.$body.animate({scrollTop: dest}, this.setting.scrollduration);
},
keepfixed:function(){
var $window=jQuery(window)
var controlx=$window.scrollLeft() + $window.width() - this.$control.width() - this.controlattrs.offsetx
var controly=$window.scrollTop() + $window.height() - this.$control.height() - this.controlattrs.offsety
this.$control.css({left:controlx+'px', top:controly+'px'})
var $window=jQuery(window);
var controlx=$window.scrollLeft() + $window.width() - this.$control.width() - this.controlattrs.offsetx;
var controly=$window.scrollTop() + $window.height() - this.$control.height() - this.controlattrs.offsety;
this.$control.css({left:controlx+'px', top:controly+'px'});
},
togglecontrol:function(){
var scrolltop=jQuery(window).scrollTop()
var scrolltop=jQuery(window).scrollTop();
if (!this.cssfixedsupport)
this.keepfixed()
this.state.shouldvisible=(scrolltop>=this.setting.startline)? true : false
this.keepfixed();
this.state.shouldvisible=(scrolltop>=this.setting.startline)? true : false;
if (this.state.shouldvisible && !this.state.isvisible){
this.$control.stop().animate({opacity:1}, this.setting.fadeduration[0])
this.state.isvisible=true
this.$control.stop().animate({opacity:1}, this.setting.fadeduration[0]);
this.state.isvisible=true;
}
else if (this.state.shouldvisible==false && this.state.isvisible){
this.$control.stop().animate({opacity:0}, this.setting.fadeduration[1])
this.state.isvisible=false
this.$control.stop().animate({opacity:0}, this.setting.fadeduration[1]);
this.state.isvisible=false;
}
},
init:function(){
jQuery(document).ready(function($){
var mainobj=scrolltotop
var iebrws=document.all
mainobj.cssfixedsupport=!iebrws || iebrws && document.compatMode=="CSS1Compat" && window.XMLHttpRequest //not IE or IE7+ browsers in standards mode
mainobj.$body=(window.opera)? (document.compatMode=="CSS1Compat"? $('html') : $('body')) : $('html,body')
var mainobj=scrolltotop;
var iebrws=document.all;
mainobj.cssfixedsupport=!iebrws || iebrws && document.compatMode=="CSS1Compat" && window.XMLHttpRequest; //not IE or IE7+ browsers in standards mode
mainobj.$body=(window.opera)? (document.compatMode=="CSS1Compat"? $('html') : $('body')) : $('html,body');
mainobj.$control=$('<div id="topcontrol">'+mainobj.controlHTML+'</div>')
.css({position:mainobj.cssfixedsupport? 'fixed' : 'absolute', bottom:mainobj.controlattrs.offsety, right:mainobj.controlattrs.offsetx, opacity:0, cursor:'pointer'})
//.attr({title:'Scroll Back to Top'})
.click(function(){mainobj.scrollup(); return false})
.appendTo('body')
.click(function(){mainobj.scrollup(); return false;})
.appendTo('body');
if (document.all && !window.XMLHttpRequest && mainobj.$control.text()!='') //loose check for IE6 and below, plus whether control contains any text
mainobj.$control.css({width:mainobj.$control.width()}) //IE6- seems to require an explicit width on a DIV containing text
mainobj.togglecontrol()
mainobj.$control.css({width:mainobj.$control.width()}); //IE6- seems to require an explicit width on a DIV containing text
mainobj.togglecontrol();
$('a[href="' + mainobj.anchorkeyword +'"]').click(function(){
mainobj.scrollup()
return false
})
mainobj.scrollup();
return false;
});
$(window).bind('scroll resize', function(e){
mainobj.togglecontrol()
})
})
mainobj.togglecontrol();
});
});
}
}
};
scrolltotop.init()
\ No newline at end of file
scrolltotop.init();
\ No newline at end of file
abvw/js/contentview_Events.js
......@@ -233,7 +233,7 @@ CONTENTVIEW_EVENTS.showCopyText = function(e) {
$("#overlay").show();
var array = [e.pageX, e.pageY];
var contentPage = CONTENTVIEW_GENERAL.dataWebContentPage.pages;
CONTENTVIEW.handleCopyTextData(contentPage, array)
CONTENTVIEW.handleCopyTextData(contentPage, array);
}
};
......
abvw/js/contentview_GetData.js
......@@ -1049,7 +1049,7 @@ CONTENTVIEW_GETDATA.getBookmarklist = function(pos) {
$("#divListBookmark").offset({ left: pos[0], top: (pos[1] + $('#bookmarkBoxHdBM').height()) });
}
else {
CONTENTVIEW.handleAPIWebContentPage(CONTENTVIEW_GENERAL.dataWebContentPage, pos)
CONTENTVIEW.handleAPIWebContentPage(CONTENTVIEW_GENERAL.dataWebContentPage, pos);
}
};
......
abvw/js/header.js
......@@ -654,7 +654,7 @@ HEADER.DoBackup = function(isBackupMarking, isBackupMemo, isBackupBookmark,isLog
$('#divResultMessage .toast-item-loading').hide();
// active close toast button
$('.toast-item-close').click(function () { $().toastmessage('removeToast', $('#divResultMessage'), null) });
$('.toast-item-close').click(function () { $().toastmessage('removeToast', $('#divResultMessage'), null); });
if (isLogout) {
$('.toast-position-middle-center').css('width', '500px');
......@@ -1128,7 +1128,7 @@ HEADER.downloadResourceById = function(contentId){
if (HEADER.isSafariNotOnIpad()) {
window.onbeforeunload = null;
window.open(resourceUrl, "_self"); // open url to download file on safari not for ipad
var toogleTime = setTimeout(function () { COMMON.ToogleLogoutNortice() }, 200);
var toogleTime = setTimeout(function () { COMMON.ToogleLogoutNortice(); }, 200);
}
else {
window.open(resourceUrl); //open url to download file on orther browser
......
abvw/js/stview.js
......@@ -181,7 +181,7 @@ STVIEW.ready = function(){
//ページ番号指定有り
if( page == "" || page == "0" || page == "1"){
ClientData.common_prePageNo(null)
ClientData.common_prePageNo(null);
} else {
ClientData.common_prePageNo(page);
}
......
abweb/common/js/constant.js
......@@ -3,7 +3,7 @@
*
* @since 1.4.3.2 & 1.4.3.3 & 1.4.3.4
*/
const CONSTANT = {};
var CONSTANT = {};
CONSTANT.DEVICE_TYPE = {
WEB: 4,
......@@ -54,7 +54,7 @@ CONSTANT.PICK_UP_TYPE = {
NEW_REPORT : 'newReport',
CONTINOUS_WORK : 'continousWork',
WARNING_REPORT : 'warningReport',
}
};
CONSTANT.URL_TREE_PASS = {
1: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.PICKUP, CONSTANT.URL_TREE_NAME.REPORT_LIST, CONSTANT.URL_TREE_NAME.REPORT_FORM],
......
abweb/common/js/event.js
......@@ -56,7 +56,7 @@ function hide_del_btn() {
$(this).parent().find('.ac-tb-form').hide();
}
});
}
};
/** Handle when deleting while closing the accordion */
function tbWrapClear(tbwrap) {
// If you delete the form while closing the accordion
......@@ -66,7 +66,7 @@ function tbWrapClear(tbwrap) {
} else {
tbwrap.removeClass('visually-hidden');
}
}
};
/** input form accordion */
$('.ac-tb-form').on('click', function () {
......
abweb/common/js/header.js
......@@ -18,7 +18,7 @@ var HEADER = {};
HEADER.initLogout = function() {
$("#btnLogout").click(HEADER.logoutFunction);
}
};
/**
* create url tree & show breadcrumbs list
......
abweb/js/agreementToTerms/agreementToTerms.js
......@@ -92,7 +92,7 @@ agreementToTerms.agreeTerm = function(){
COMMON.showAlert("errorOccured");
}
}
)
);
};
//利用規約に同意しない
......
abweb/js/reportList/reportList.js
......@@ -18,7 +18,7 @@
COMMON.checkQuickReport(function(result) {
if (result) {
RL.isQuickReport = result.isQuickReport;
};
}
});
RL.loadCommon();
RL.initTaskReportList();
......@@ -52,7 +52,7 @@
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
},
]
];
} else {
if (sessionStorage.getItem("pickUpType")) sessionStorage.removeItem("pickUpType");
navs = [
......@@ -63,10 +63,10 @@
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
},
]
];
}
TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.REPORT_LIST, navs, RL.loadMainTitleCallback);
}
};
/**
* init task report list
......
abweb/js/setting/settings.js
......@@ -187,7 +187,7 @@ SETTINGS.initScreen = function () {
{
titleLang: 'accountSetting',
},
]
];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'accountSetting', navs, null);
// Login ID
$('#txtLoginId').text(ClientData.userInfo_loginId_session());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment