Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_web
check
Commits
f9f531cf
Commit
f9f531cf
authored
Apr 02, 2015
by
Masaru Abe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SRL対応 デフォルトソート順プロパティ化
parent
d4929ff5
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
115 additions
and
95 deletions
+115
-95
abvw/common/json/sys/conf.json
+12
-4
abvw/js/bookmark.js
+36
-27
abvw/js/contentsearch.js
+18
-26
abvw/js/history.js
+11
-3
abvw/js/home.js
+28
-33
env.sh
+10
-2
No files found.
abvw/common/json/sys/conf.json
View file @
f9f531cf
{
{
"apiUrl"
:
"https://web
3.agentec.jp
/acms/{0}/abvapi"
,
"apiUrl"
:
"https://web
5.abook.bz
/acms/{0}/abvapi"
,
"apiLoginUrl"
:
"https://web
3.agentec.jp
/acms/nuabvapi"
,
"apiLoginUrl"
:
"https://web
5.abook.bz
/acms/nuabvapi"
,
"apiResourceDlUrl"
:
"https://web
3.agentec.jp
/acms/{0}/dl"
,
"apiResourceDlUrl"
:
"https://web
5.abook.bz
/acms/{0}/dl"
,
"bookShelfCount"
:
15
,
"bookShelfCount"
:
15
,
"bookListCount"
:
15
,
"bookListCount"
:
15
,
"screenlockTimeDefault"
:
30
,
"screenlockTimeDefault"
:
30
,
...
@@ -14,5 +14,13 @@
...
@@ -14,5 +14,13 @@
"anonymousLoginId"
:
"nologin"
,
"anonymousLoginId"
:
"nologin"
,
"appName"
:
"ABookWebCL"
,
"appName"
:
"ABookWebCL"
,
"appVersion"
:
"0.0.1"
,
"appVersion"
:
"0.0.1"
,
"optMusicMode"
:
1
"optMusicMode"
:
1
,
"sortTypeHome"
:
"3"
,
"sortOrderHome"
:
"2"
,
"sortTypeBookmark"
:
"1"
,
"sortOrderBookmark"
:
"2"
,
"sortTypeHistory"
:
"4"
,
"sortOrderHistory"
:
"2"
,
"sortTypeSearch"
:
"1"
,
"sortOrderSearch"
:
"1"
}
}
abvw/js/bookmark.js
View file @
f9f531cf
...
@@ -13,8 +13,8 @@ BOOKMARK.bookmark_errorContent = [];
...
@@ -13,8 +13,8 @@ BOOKMARK.bookmark_errorContent = [];
BOOKMARK
.
collection_contents
=
[];
BOOKMARK
.
collection_contents
=
[];
//ソート条件復帰
//ソート条件復帰
BOOKMARK
.
searchDivision
=
1
;
BOOKMARK
.
searchDivision
=
"1"
;
BOOKMARK
.
sortType
=
2
;
BOOKMARK
.
sortType
=
"2"
;
//スクロール復帰
//スクロール復帰
BOOKMARK
.
scrollTop
=
0
;
BOOKMARK
.
scrollTop
=
0
;
...
@@ -23,6 +23,14 @@ $(document).ready(function () {
...
@@ -23,6 +23,14 @@ $(document).ready(function () {
if
(
!
AVWEB
.
avwCheckLogin
(
COMMON
.
ScreenIds
.
Login
))
return
;
if
(
!
AVWEB
.
avwCheckLogin
(
COMMON
.
ScreenIds
.
Login
))
return
;
//ソート条件デフォルト設定
if
(
AVWEB
.
avwSysSetting
().
sortTypeBookmark
!=
undefined
){
BOOKMARK
.
searchDivision
=
AVWEB
.
avwSysSetting
().
sortTypeBookmark
;
}
if
(
AVWEB
.
avwSysSetting
().
sortOrderBookmark
!=
undefined
){
BOOKMARK
.
sortType
=
AVWEB
.
avwSysSetting
().
sortOrderBookmark
;
}
COMMON
.
LockScreen
();
COMMON
.
LockScreen
();
document
.
title
=
I18N
.
i18nText
(
'dspShiori'
)
+
' | '
+
I18N
.
i18nText
(
'sysAppTitle'
);
document
.
title
=
I18N
.
i18nText
(
'dspShiori'
)
+
' | '
+
I18N
.
i18nText
(
'sysAppTitle'
);
...
@@ -139,16 +147,16 @@ BOOKMARK.refreshView = function() {
...
@@ -139,16 +147,16 @@ BOOKMARK.refreshView = function() {
// Default sort is タイトル名, default is asc
// Default sort is タイトル名, default is asc
ClientData
.
sortOpt_searchDivision
(
BOOKMARK
.
searchDivision
);
ClientData
.
sortOpt_searchDivision
(
BOOKMARK
.
searchDivision
);
//前と同じ状態にするので逆転させる
//前と同じ状態にするので逆転させる
if
(
BOOKMARK
.
sortType
==
1
){
if
(
BOOKMARK
.
sortType
==
"1"
){
BOOKMARK
.
sortType
=
2
;
BOOKMARK
.
sortType
=
"2"
;
}
else
{
}
else
{
BOOKMARK
.
sortType
=
1
;
BOOKMARK
.
sortType
=
"1"
;
}
}
ClientData
.
sortOpt_sortType
(
BOOKMARK
.
sortType
);
ClientData
.
sortOpt_sortType
(
BOOKMARK
.
sortType
);
if
(
BOOKMARK
.
searchDivision
==
1
){
if
(
BOOKMARK
.
searchDivision
==
"1"
){
BOOKMARK
.
dspTitleNm_Click
();
BOOKMARK
.
dspTitleNm_Click
();
}
else
if
(
BOOKMARK
.
searchDivision
==
2
){
}
else
if
(
BOOKMARK
.
searchDivision
==
"2"
){
BOOKMARK
.
dspTitleNmKn_Click
();
BOOKMARK
.
dspTitleNmKn_Click
();
}
else
{
}
else
{
BOOKMARK
.
dspPubDt_Click
();
BOOKMARK
.
dspPubDt_Click
();
...
@@ -166,20 +174,20 @@ Event groups [start]
...
@@ -166,20 +174,20 @@ Event groups [start]
BOOKMARK
.
dspTitleNm_Click
=
function
()
{
BOOKMARK
.
dspTitleNm_Click
=
function
()
{
var
isAsc
=
false
;
var
isAsc
=
false
;
if
(
ClientData
.
sortOpt_searchDivision
()
==
1
)
{
// Name
if
(
ClientData
.
sortOpt_searchDivision
()
==
"1"
)
{
// Name
if
(
ClientData
.
sortOpt_sortType
()
==
1
)
{
// ASC
if
(
ClientData
.
sortOpt_sortType
()
==
"1"
)
{
// ASC
isAsc
=
false
;
isAsc
=
false
;
BOOKMARK
.
sortType
=
2
;
BOOKMARK
.
sortType
=
"2"
;
}
}
else
{
else
{
isAsc
=
true
;
isAsc
=
true
;
BOOKMARK
.
sortType
=
1
;
BOOKMARK
.
sortType
=
"1"
;
}
}
}
}
else
{
else
{
BOOKMARK
.
searchDivision
=
1
;
BOOKMARK
.
searchDivision
=
"1"
;
BOOKMARK
.
sortType
=
1
;
BOOKMARK
.
sortType
=
"1"
;
ClientData
.
sortOpt_searchDivision
(
1
);
ClientData
.
sortOpt_searchDivision
(
BOOKMARK
.
searchDivision
);
isAsc
=
true
;
isAsc
=
true
;
}
}
ClientData
.
sortOpt_sortType
(
BOOKMARK
.
sortType
);
ClientData
.
sortOpt_sortType
(
BOOKMARK
.
sortType
);
...
@@ -192,20 +200,20 @@ BOOKMARK.dspTitleNm_Click = function() {
...
@@ -192,20 +200,20 @@ BOOKMARK.dspTitleNm_Click = function() {
};
};
BOOKMARK
.
dspTitleNmKn_Click
=
function
()
{
BOOKMARK
.
dspTitleNmKn_Click
=
function
()
{
var
isAsc
=
false
;
var
isAsc
=
false
;
if
(
ClientData
.
sortOpt_searchDivision
()
==
2
)
{
// Kana
if
(
ClientData
.
sortOpt_searchDivision
()
==
"2"
)
{
// Kana
if
(
ClientData
.
sortOpt_sortType
()
==
1
)
{
// ASC
if
(
ClientData
.
sortOpt_sortType
()
==
"1"
)
{
// ASC
isAsc
=
false
;
isAsc
=
false
;
BOOKMARK
.
sortType
=
2
;
BOOKMARK
.
sortType
=
"2"
;
}
}
else
{
else
{
isAsc
=
true
;
isAsc
=
true
;
BOOKMARK
.
sortType
=
1
;
BOOKMARK
.
sortType
=
"1"
;
}
}
}
}
else
{
else
{
BOOKMARK
.
searchDivision
=
2
;
BOOKMARK
.
searchDivision
=
"2"
;
BOOKMARK
.
sortType
=
1
;
BOOKMARK
.
sortType
=
"1"
;
ClientData
.
sortOpt_searchDivision
(
2
);
// Kana
ClientData
.
sortOpt_searchDivision
(
BOOKMARK
.
searchDivision
);
// Kana
isAsc
=
true
;
isAsc
=
true
;
}
}
ClientData
.
sortOpt_sortType
(
BOOKMARK
.
sortType
);
ClientData
.
sortOpt_sortType
(
BOOKMARK
.
sortType
);
...
@@ -218,19 +226,20 @@ BOOKMARK.dspTitleNmKn_Click = function() {
...
@@ -218,19 +226,20 @@ BOOKMARK.dspTitleNmKn_Click = function() {
};
};
BOOKMARK
.
dspPubDt_Click
=
function
()
{
BOOKMARK
.
dspPubDt_Click
=
function
()
{
var
isAsc
=
false
;
var
isAsc
=
false
;
if
(
ClientData
.
sortOpt_searchDivision
()
==
3
)
{
// Publish date
if
(
ClientData
.
sortOpt_searchDivision
()
==
"3"
)
{
// Publish date
if
(
ClientData
.
sortOpt_sortType
()
==
1
)
{
// ASC
if
(
ClientData
.
sortOpt_sortType
()
==
"1"
)
{
// ASC
isAsc
=
false
;
isAsc
=
false
;
BOOKMARK
.
sortType
=
2
;
BOOKMARK
.
sortType
=
"2"
;
}
}
else
{
else
{
isAsc
=
true
;
isAsc
=
true
;
BOOKMARK
.
sortType
=
1
;
BOOKMARK
.
sortType
=
"1"
;
}
}
}
}
else
{
else
{
BOOKMARK
.
sortType
=
1
;
BOOKMARK
.
searchDivision
=
"3"
;
ClientData
.
sortOpt_searchDivision
(
3
);
// Kana
BOOKMARK
.
sortType
=
"1"
;
ClientData
.
sortOpt_searchDivision
(
BOOKMARK
.
searchDivision
);
// Kana
isAsc
=
true
;
isAsc
=
true
;
}
}
ClientData
.
sortOpt_sortType
(
BOOKMARK
.
sortType
);
ClientData
.
sortOpt_sortType
(
BOOKMARK
.
sortType
);
...
...
abvw/js/contentsearch.js
View file @
f9f531cf
...
@@ -31,6 +31,14 @@ $(document).ready(function(){
...
@@ -31,6 +31,14 @@ $(document).ready(function(){
return
;
return
;
}
}
//ソート条件デフォルト設定
if
(
AVWEB
.
avwSysSetting
().
sortTypeSearch
!=
undefined
){
CONTENTSEARCH
.
DEFAULT_SORT_TYPE
=
AVWEB
.
avwSysSetting
().
sortTypeSearch
;
}
if
(
AVWEB
.
avwSysSetting
().
sortOrderSearch
!=
undefined
){
CONTENTSEARCH
.
DEFAULT_SORT_ORDER
=
AVWEB
.
avwSysSetting
().
sortOrderSearch
;
}
COMMON
.
LockScreen
();
COMMON
.
LockScreen
();
document
.
title
=
I18N
.
i18nText
(
'txtSearchResult'
)
+
' | '
+
I18N
.
i18nText
(
'sysAppTitle'
);
document
.
title
=
I18N
.
i18nText
(
'txtSearchResult'
)
+
' | '
+
I18N
.
i18nText
(
'sysAppTitle'
);
...
@@ -572,18 +580,14 @@ CONTENTSEARCH.sortByTitleFunction = function(){
...
@@ -572,18 +580,14 @@ CONTENTSEARCH.sortByTitleFunction = function(){
if
(
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
)
if
(
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
)
{
{
if
(
sortType
==
'1'
){
if
(
sortType
==
'1'
){
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Desc
;
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Desc
;
}
}
else
{
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
}
ClientData
.
searchCond_sortOrder
(
sortOrder
);
}
}
else
else
{
{
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
ClientData
.
searchCond_sortOrder
(
sortOrder
);
}
}
ClientData
.
searchCond_sortOrder
(
sortOrder
);
HEADER
.
setStatusSort
(
'#control-sort-title'
,
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
HEADER
.
setStatusSort
(
'#control-sort-title'
,
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
...
@@ -622,21 +626,17 @@ CONTENTSEARCH.sortByTitleKanaFunction = function(){
...
@@ -622,21 +626,17 @@ CONTENTSEARCH.sortByTitleKanaFunction = function(){
var
groupId
=
ClientData
.
searchCond_groupId
();
var
groupId
=
ClientData
.
searchCond_groupId
();
if
(
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
)
if
(
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
)
{
{
if
(
sortType
==
'2'
){
if
(
sortType
==
'2'
){
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Desc
;
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Desc
;
}
}
else
{
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
}
ClientData
.
searchCond_sortOrder
(
sortOrder
);
}
}
else
else
{
{
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
ClientData
.
searchCond_sortOrder
(
sortOrder
);
}
}
ClientData
.
searchCond_sortOrder
(
sortOrder
);
HEADER
.
setStatusSort
(
'#control-sort-titlekana'
,
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
HEADER
.
setStatusSort
(
'#control-sort-titlekana'
,
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
if
(
recordFrom
==
null
||
recordFrom
==
'undefined'
){
if
(
recordFrom
==
null
||
recordFrom
==
'undefined'
){
...
@@ -654,12 +654,10 @@ CONTENTSEARCH.sortByTitleKanaFunction = function(){
...
@@ -654,12 +654,10 @@ CONTENTSEARCH.sortByTitleKanaFunction = function(){
sortType
=
'2'
;
sortType
=
'2'
;
//refresh gridview
//refresh gridview
CONTENTSEARCH
.
refreshGrid
();
CONTENTSEARCH
.
refreshGrid
();
//refresh add more record
//refresh add more record
$
(
'#control-nextrecord'
).
css
(
'visibility'
,
'hidden'
);
$
(
'#control-nextrecord'
).
css
(
'visibility'
,
'hidden'
);
ClientData
.
searchCond_sortType
(
sortType
);
ClientData
.
searchCond_sortType
(
sortType
);
CONTENTSEARCH
.
renderContent
(
sid
,
ClientData
.
searchCond_searchText
(),
ClientData
.
searchCond_searchDivision
(),
sortType
,
sortOrder
,
recordFrom
,
recordTo
,
genreId
,
groupId
);
CONTENTSEARCH
.
renderContent
(
sid
,
ClientData
.
searchCond_searchText
(),
ClientData
.
searchCond_searchDivision
(),
sortType
,
sortOrder
,
recordFrom
,
recordTo
,
genreId
,
groupId
);
};
};
...
@@ -680,16 +678,12 @@ CONTENTSEARCH.sortByReleaseDateFunction = function(){
...
@@ -680,16 +678,12 @@ CONTENTSEARCH.sortByReleaseDateFunction = function(){
if
(
sortType
==
'3'
){
if
(
sortType
==
'3'
){
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Desc
;
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Desc
;
}
}
else
{
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
}
ClientData
.
searchCond_sortOrder
(
sortOrder
);
}
}
else
else
{
{
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
ClientData
.
searchCond_sortOrder
(
sortOrder
);
}
}
ClientData
.
searchCond_sortOrder
(
sortOrder
);
HEADER
.
setStatusSort
(
'#control-sort-releasedate'
,
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
HEADER
.
setStatusSort
(
'#control-sort-releasedate'
,
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
...
@@ -699,9 +693,7 @@ CONTENTSEARCH.sortByReleaseDateFunction = function(){
...
@@ -699,9 +693,7 @@ CONTENTSEARCH.sortByReleaseDateFunction = function(){
}
}
if
(
recordTo
==
null
||
recordTo
==
'undefined'
){
if
(
recordTo
==
null
||
recordTo
==
'undefined'
){
recordTo
=
CONTENTSEARCH
.
returnNumberDispRecordForList
();
recordTo
=
CONTENTSEARCH
.
returnNumberDispRecordForList
();
ClientData
.
searchCond_recordFrom
(
recordTo
);
ClientData
.
searchCond_recordFrom
(
recordTo
);
}
}
...
...
abvw/js/history.js
View file @
f9f531cf
...
@@ -28,9 +28,17 @@ HISTORY.scrollTop = 0;
...
@@ -28,9 +28,17 @@ HISTORY.scrollTop = 0;
$
(
document
).
ready
(
function
(){
$
(
document
).
ready
(
function
(){
if
(
!
AVWEB
.
avwCheckLogin
(
COMMON
.
ScreenIds
.
Login
)){
if
(
!
AVWEB
.
avwCheckLogin
(
COMMON
.
ScreenIds
.
Login
)){
return
;
return
;
}
}
//ソート条件デフォルト設定
if
(
AVWEB
.
avwSysSetting
().
sortTypeHistory
!=
undefined
){
HISTORY
.
DEFAULT_SORT_TYPE
=
AVWEB
.
avwSysSetting
().
sortTypeHistory
;
}
if
(
AVWEB
.
avwSysSetting
().
sortOrderHistory
!=
undefined
){
HISTORY
.
DEFAULT_SORT_ORDER
=
AVWEB
.
avwSysSetting
().
sortOrderHistory
;
}
COMMON
.
LockScreen
();
COMMON
.
LockScreen
();
...
...
abvw/js/home.js
View file @
f9f531cf
...
@@ -6,8 +6,8 @@ var HOME = {};
...
@@ -6,8 +6,8 @@ var HOME = {};
//----Constant-----------//
//----Constant-----------//
HOME
.
DEFAULT_DISP_NUMBER_RECORD_FROM
=
1
;
HOME
.
DEFAULT_DISP_NUMBER_RECORD_FROM
=
1
;
//HOME.DEFAULT_DISP_NUMBER_RECORD_TO = 15;
//HOME.DEFAULT_DISP_NUMBER_RECORD_TO = 15;
HOME
.
DEFAULT_SORT_TYPE
=
3
;
HOME
.
DEFAULT_SORT_TYPE
=
"3"
;
HOME
.
DEFAULT_SORT_ORDER
=
2
;
HOME
.
DEFAULT_SORT_ORDER
=
"2"
;
HOME
.
DEFAULT_SEARCH_DIVISION
=
0
;
HOME
.
DEFAULT_SEARCH_DIVISION
=
0
;
HOME
.
home_realTotalRecord
=
0
;
HOME
.
home_realTotalRecord
=
0
;
...
@@ -49,6 +49,14 @@ $(document).ready(function () {
...
@@ -49,6 +49,14 @@ $(document).ready(function () {
return
;
return
;
}
}
//ソート条件デフォルト設定
if
(
AVWEB
.
avwSysSetting
().
sortTypeHome
!=
undefined
){
HOME
.
DEFAULT_SORT_TYPE
=
AVWEB
.
avwSysSetting
().
sortTypeHome
;
}
if
(
AVWEB
.
avwSysSetting
().
sortOrderHome
!=
undefined
){
HOME
.
DEFAULT_SORT_ORDER
=
AVWEB
.
avwSysSetting
().
sortOrderHome
;
}
document
.
title
=
I18N
.
i18nText
(
'dspHome'
)
+
' | '
+
I18N
.
i18nText
(
'sysAppTitle'
);
document
.
title
=
I18N
.
i18nText
(
'dspHome'
)
+
' | '
+
I18N
.
i18nText
(
'sysAppTitle'
);
// Set bookmark screen
// Set bookmark screen
...
@@ -1439,18 +1447,14 @@ HOME.sortByTitleFunction = function() {
...
@@ -1439,18 +1447,14 @@ HOME.sortByTitleFunction = function() {
var
groupId
=
ClientData
.
searchCond_groupId
();
var
groupId
=
ClientData
.
searchCond_groupId
();
if
(
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
)
{
if
(
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
)
{
if
(
sortType
==
1
)
{
if
(
sortType
==
"1"
)
{
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Desc
;
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Desc
;
}
}
else
{
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
}
ClientData
.
searchCond_sortOrder
(
sortOrder
);
}
}
else
{
else
{
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
ClientData
.
searchCond_sortOrder
(
sortOrder
);
}
}
ClientData
.
searchCond_sortOrder
(
sortOrder
);
HEADER
.
setStatusSort
(
'#control-sort-title'
,
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
HEADER
.
setStatusSort
(
'#control-sort-title'
,
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
...
@@ -1473,7 +1477,7 @@ HOME.sortByTitleFunction = function() {
...
@@ -1473,7 +1477,7 @@ HOME.sortByTitleFunction = function() {
ClientData
.
searchCond_recordFrom
(
recordTo
);
ClientData
.
searchCond_recordFrom
(
recordTo
);
}
}
sortType
=
1
;
sortType
=
"1"
;
ClientData
.
searchCond_sortType
(
sortType
);
ClientData
.
searchCond_sortType
(
sortType
);
//refresh Gridview
//refresh Gridview
...
@@ -1496,18 +1500,14 @@ HOME.sortByTitleKanaFunction = function() {
...
@@ -1496,18 +1500,14 @@ HOME.sortByTitleKanaFunction = function() {
var
groupId
=
ClientData
.
searchCond_groupId
();
var
groupId
=
ClientData
.
searchCond_groupId
();
if
(
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
)
{
if
(
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
)
{
if
(
sortType
==
2
)
{
if
(
sortType
==
"2"
)
{
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Desc
;
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Desc
;
}
}
else
{
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
}
ClientData
.
searchCond_sortOrder
(
sortOrder
);
}
}
else
{
else
{
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
ClientData
.
searchCond_sortOrder
(
sortOrder
);
}
}
ClientData
.
searchCond_sortOrder
(
sortOrder
);
HEADER
.
setStatusSort
(
'#control-sort-titlekana'
,
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
HEADER
.
setStatusSort
(
'#control-sort-titlekana'
,
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
...
@@ -1530,8 +1530,7 @@ HOME.sortByTitleKanaFunction = function() {
...
@@ -1530,8 +1530,7 @@ HOME.sortByTitleKanaFunction = function() {
ClientData
.
searchCond_recordFrom
(
recordTo
);
ClientData
.
searchCond_recordFrom
(
recordTo
);
}
}
sortType
=
2
;
sortType
=
"2"
;
//refresh gridview
HOME
.
refreshGrid
();
HOME
.
refreshGrid
();
ClientData
.
searchCond_sortType
(
sortType
);
ClientData
.
searchCond_sortType
(
sortType
);
...
@@ -1553,18 +1552,14 @@ HOME.sortByReleaseDateFunction = function() {
...
@@ -1553,18 +1552,14 @@ HOME.sortByReleaseDateFunction = function() {
var
groupId
=
ClientData
.
searchCond_groupId
();
var
groupId
=
ClientData
.
searchCond_groupId
();
if
(
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
)
{
if
(
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
)
{
if
(
sortType
==
3
)
{
if
(
sortType
==
"3"
)
{
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Desc
;
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Desc
;
}
}
else
{
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
}
ClientData
.
searchCond_sortOrder
(
sortOrder
);
}
}
else
{
else
{
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
sortOrder
=
COMMON
.
Consts
.
ConstOrderSetting_Asc
;
ClientData
.
searchCond_sortOrder
(
sortOrder
);
}
}
ClientData
.
searchCond_sortOrder
(
sortOrder
);
HEADER
.
setStatusSort
(
'#control-sort-releasedate'
,
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
HEADER
.
setStatusSort
(
'#control-sort-releasedate'
,
sortOrder
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
if
(
recordFrom
==
null
||
recordFrom
==
'undefined'
)
{
if
(
recordFrom
==
null
||
recordFrom
==
'undefined'
)
{
...
@@ -1586,7 +1581,7 @@ HOME.sortByReleaseDateFunction = function() {
...
@@ -1586,7 +1581,7 @@ HOME.sortByReleaseDateFunction = function() {
ClientData
.
searchCond_recordFrom
(
recordTo
);
ClientData
.
searchCond_recordFrom
(
recordTo
);
}
}
sortType
=
3
;
sortType
=
"3"
;
//refresh gridview
//refresh gridview
HOME
.
refreshGrid
();
HOME
.
refreshGrid
();
...
@@ -1611,12 +1606,12 @@ HOME.handleLanguage = function() {
...
@@ -1611,12 +1606,12 @@ HOME.handleLanguage = function() {
var
orderSort
=
ClientData
.
searchCond_sortOrder
();
var
orderSort
=
ClientData
.
searchCond_sortOrder
();
HEADER
.
setStatusSort
(
'#'
+
$
(
'#menu_sort li.current a'
).
attr
(
'id'
),
orderSort
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
HEADER
.
setStatusSort
(
'#'
+
$
(
'#menu_sort li.current a'
).
attr
(
'id'
),
orderSort
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
if
(
typeSort
==
2
)
{
//if (typeSort == "2"
) {
if
(
orderSort
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
)
{
//
if (orderSort == COMMON.Consts.ConstOrderSetting_Asc) {
}
//
}
else
{
//
else {
}
//
}
}
//
}
}
}
}
}
};
};
...
@@ -2145,13 +2140,13 @@ HOME.handleSortDisp = function() {
...
@@ -2145,13 +2140,13 @@ HOME.handleSortDisp = function() {
typeSort
=
ClientData
.
searchCond_sortType
();
typeSort
=
ClientData
.
searchCond_sortType
();
orderSort
=
ClientData
.
searchCond_sortOrder
();
orderSort
=
ClientData
.
searchCond_sortOrder
();
if
(
typeSort
==
1
)
{
if
(
typeSort
==
"1"
)
{
HEADER
.
setStatusSort
(
'#control-sort-title'
,
orderSort
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
HEADER
.
setStatusSort
(
'#control-sort-title'
,
orderSort
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
}
}
else
if
(
typeSort
==
2
)
{
else
if
(
typeSort
==
"2"
)
{
HEADER
.
setStatusSort
(
'#control-sort-titlekana'
,
orderSort
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
HEADER
.
setStatusSort
(
'#control-sort-titlekana'
,
orderSort
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
}
}
else
if
(
typeSort
==
3
)
{
else
if
(
typeSort
==
"3"
)
{
HEADER
.
setStatusSort
(
'#control-sort-releasedate'
,
orderSort
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
HEADER
.
setStatusSort
(
'#control-sort-releasedate'
,
orderSort
==
COMMON
.
Consts
.
ConstOrderSetting_Asc
);
}
}
}
}
...
...
env.sh
View file @
f9f531cf
...
@@ -37,11 +37,19 @@ modify_api()
...
@@ -37,11 +37,19 @@ modify_api()
"anonymousLoginId" : "nologin",
"anonymousLoginId" : "nologin",
"appName" : "ABookWebCL",
"appName" : "ABookWebCL",
"appVersion" : "0.0.1",
"appVersion" : "0.0.1",
"optMusicMode" : 1
"optMusicMode" : 1,
"sortTypeHome" : "3",
"sortOrderHome" : "2",
"sortTypeBookmark" : "1",
"sortOrderBookmark" : "2",
"sortTypeHistory" : "4",
"sortOrderHistory" : "2",
"sortTypeSearch" : "1",
"sortOrderSearch" : "1"
}
}
EOF
EOF
}
}
modify_htaccess
"
$PROTOCOL
://
$DOMAIN
/webvw/"
modify_htaccess
"
$PROTOCOL
://
$DOMAIN
/
acms/
webvw/"
modify_api
"
$PROTOCOL
://
$DOMAIN
/acms"
modify_api
"
$PROTOCOL
://
$DOMAIN
/acms"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment