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
247c6574
Commit
247c6574
authored
Sep 25, 2014
by
Masaru Abe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
詳細の開くボタンが効かないバグ対応
parent
b7fd44a5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
135 additions
and
309 deletions
+135
-309
abvw/common/js/common.js
+93
-0
abvw/js/contentsearch.js
+10
-99
abvw/js/detail.js
+2
-91
abvw/js/history.js
+10
-10
abvw/js/home.js
+20
-109
No files found.
abvw/common/js/common.js
View file @
247c6574
...
@@ -8,6 +8,9 @@
...
@@ -8,6 +8,9 @@
//グローバルの名前空間用のオブジェクトを用意する
//グローバルの名前空間用のオブジェクトを用意する
var
COMMON
=
{};
var
COMMON
=
{};
COMMON
.
resourceVersionArr
=
[];
COMMON
.
metaVersionArr
=
[];
COMMON
.
DEFAULT_IMG_OPTION_MEMO
=
'img/list/icon_sticker.png'
;
COMMON
.
DEFAULT_IMG_OPTION_MEMO
=
'img/list/icon_sticker.png'
;
COMMON
.
DEFAULT_IMG_OPTION_MARKING
=
'img/list/icon_pen.png'
;
COMMON
.
DEFAULT_IMG_OPTION_MARKING
=
'img/list/icon_pen.png'
;
COMMON
.
DEFAULT_IMG_CONTENT_EDIT
=
'img/common/band_updated.png'
;
COMMON
.
DEFAULT_IMG_CONTENT_EDIT
=
'img/common/band_updated.png'
;
...
@@ -2850,3 +2853,93 @@ COMMON.isIE10 = function() {
...
@@ -2850,3 +2853,93 @@ COMMON.isIE10 = function() {
}
}
return
false
;
return
false
;
};
};
//set resource version data
COMMON
.
setResourceVersionData
=
function
(
conId
)
{
var
tempResourceArr
;
var
tempResource
;
//check if insert new or edit
var
flag
=
false
;
if
(
ClientData
.
ResourceVersion
().
length
<=
0
||
ClientData
.
ResourceVersion
()
==
null
||
ClientData
.
ResourceVersion
()
==
'undefined'
)
{
tempResourceArr
=
[];
}
else
{
tempResourceArr
=
ClientData
.
ResourceVersion
();
}
for
(
var
i
=
0
;
i
<
COMMON
.
resourceVersionArr
.
length
;
i
++
)
{
if
(
COMMON
.
resourceVersionArr
[
i
].
contentid
==
conId
)
{
tempResource
=
COMMON
.
resourceVersionArr
[
i
].
resourceversion
;
break
;
}
}
if
(
tempResourceArr
.
length
>
0
)
{
for
(
var
j
=
0
;
j
<
tempResourceArr
.
length
;
j
++
)
{
if
(
tempResourceArr
[
j
].
contentid
==
conId
)
{
tempResourceArr
[
j
].
resourceversion
=
tempResource
;
flag
=
true
;
break
;
}
else
{
flag
=
false
;
}
}
if
(
!
flag
)
{
tempResourceArr
.
push
({
contentid
:
conId
,
resourceversion
:
tempResource
});
}
}
else
{
tempResourceArr
.
push
({
contentid
:
conId
,
resourceversion
:
tempResource
});
}
ClientData
.
ResourceVersion
(
tempResourceArr
);
};
//set meta Version Data
COMMON
.
setMetaVersionData
=
function
(
conId
)
{
var
tempMetaArr
;
var
tempMeta
;
//check if insert new or edit
var
flag
=
false
;
if
(
ClientData
.
MetaVersion
().
length
<=
0
||
ClientData
.
MetaVersion
()
==
null
||
ClientData
.
MetaVersion
()
==
'undefined'
)
{
tempMetaArr
=
[];
}
else
{
tempMetaArr
=
ClientData
.
MetaVersion
();
}
for
(
var
i
=
0
;
i
<
COMMON
.
metaVersionArr
.
length
;
i
++
)
{
if
(
COMMON
.
metaVersionArr
[
i
].
contentid
==
conId
)
{
tempMeta
=
COMMON
.
metaVersionArr
[
i
].
metaversion
;
break
;
}
}
if
(
tempMetaArr
.
length
>
0
)
{
for
(
var
j
=
0
;
j
<
tempMetaArr
.
length
;
j
++
)
{
if
(
tempMetaArr
[
j
].
contentid
==
conId
)
{
tempMetaArr
[
j
].
metaversion
=
tempMeta
;
flag
=
true
;
break
;
}
else
{
flag
=
false
;
}
}
if
(
!
flag
)
{
tempMetaArr
.
push
({
contentid
:
conId
,
metaversion
:
tempMeta
});
}
}
else
{
tempMetaArr
.
push
({
contentid
:
conId
,
metaversion
:
tempMeta
});
}
ClientData
.
MetaVersion
(
tempMetaArr
);
};
abvw/js/contentsearch.js
View file @
247c6574
...
@@ -30,8 +30,8 @@ var contentTypeArr = [];
...
@@ -30,8 +30,8 @@ var contentTypeArr = [];
//};
//};
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Create new Array for function No.12.
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Create new Array for function No.12.
var
contentIdArray
=
[];
var
contentIdArray
=
[];
var
resourceVersionArr
=
[];
//
var resourceVersionArr = [];
var
metaVersionArr
=
[];
//
var metaVersionArr = [];
var
totalPage
;
var
totalPage
;
var
chkSearchTextEmpty
=
false
;
var
chkSearchTextEmpty
=
false
;
var
noRecordFlg
=
false
;
var
noRecordFlg
=
false
;
...
@@ -288,10 +288,10 @@ function renderContent(id, text, division, type, order, from, to, cateid, grpid)
...
@@ -288,10 +288,10 @@ function renderContent(id, text, division, type, order, from, to, cateid, grpid)
checkUserHasReadContent
(
post
.
contentId
,
post
.
resourceVersion
,
post
.
metaVersion
);
checkUserHasReadContent
(
post
.
contentId
,
post
.
resourceVersion
,
post
.
metaVersion
);
//assign version to array
//assign version to array
resourceVersionArr
.
push
({
contentid
:
post
.
contentId
,
resourceversion
:
post
.
resourceVersion
});
COMMON
.
resourceVersionArr
.
push
({
contentid
:
post
.
contentId
,
resourceversion
:
post
.
resourceVersion
});
//assign meta version to array
//assign meta version to array
metaVersionArr
.
push
({
contentid
:
post
.
contentId
,
metaversion
:
post
.
metaVersion
});
COMMON
.
metaVersionArr
.
push
({
contentid
:
post
.
contentId
,
metaversion
:
post
.
metaVersion
});
//Check if content has marking or memo
//Check if content has marking or memo
checkContentMarkingMemoOption
(
post
.
contentId
);
checkContentMarkingMemoOption
(
post
.
contentId
);
...
@@ -504,10 +504,10 @@ function canvasClickFunction(e){
...
@@ -504,10 +504,10 @@ function canvasClickFunction(e){
ClientData
.
ReadingContentIds
(
contentIdArray
);
ClientData
.
ReadingContentIds
(
contentIdArray
);
//Set ResouceVersion for content
//Set ResouceVersion for content
setResourceVersionData
(
outputId
);
COMMON
.
setResourceVersionData
(
outputId
);
//Set MetaVersion for content
//Set MetaVersion for content
setMetaVersionData
(
outputId
);
COMMON
.
setMetaVersionData
(
outputId
);
//Close Submenu
//Close Submenu
$
(
'#dlgSubMenu'
).
hide
();
$
(
'#dlgSubMenu'
).
hide
();
...
@@ -945,10 +945,10 @@ function readSubmenuFunction_callback(contentId)
...
@@ -945,10 +945,10 @@ function readSubmenuFunction_callback(contentId)
ClientData
.
ReadingContentIds
(
newArray
);
ClientData
.
ReadingContentIds
(
newArray
);
//Set ResouceVersion for content
//Set ResouceVersion for content
setResourceVersionData
(
contentId
);
COMMON
.
setResourceVersionData
(
contentId
);
//Set MetaVersion for content
//Set MetaVersion for content
setMetaVersionData
(
contentId
);
COMMON
.
setMetaVersionData
(
contentId
);
//Set data for readingcontentid
//Set data for readingcontentid
ClientData
.
ReadingContentIds
(
contentIdArray
);
ClientData
.
ReadingContentIds
(
contentIdArray
);
...
@@ -1304,95 +1304,6 @@ function renderViewDate(id){
...
@@ -1304,95 +1304,6 @@ function renderViewDate(id){
}
}
};
};
//set resource version data
function
setResourceVersionData
(
conId
){
var
tempResourceArr
;
var
tempResource
;
//check if insert new or edit
var
flag
=
false
;
if
(
ClientData
.
ResourceVersion
().
length
<=
0
||
ClientData
.
ResourceVersion
()
==
null
||
ClientData
.
ResourceVersion
()
==
'undefined'
){
tempResourceArr
=
[];
}
else
{
tempResourceArr
=
ClientData
.
ResourceVersion
();
}
for
(
var
i
=
0
;
i
<
resourceVersionArr
.
length
;
i
++
){
if
(
resourceVersionArr
[
i
].
contentid
==
conId
){
tempResource
=
resourceVersionArr
[
i
].
resourceversion
;
break
;
}
}
if
(
tempResourceArr
.
length
>
0
){
for
(
var
j
=
0
;
j
<
tempResourceArr
.
length
;
j
++
){
if
(
tempResourceArr
[
j
].
contentid
==
conId
){
tempResourceArr
[
j
].
resourceversion
=
tempResource
;
flag
=
true
;
break
;
}
else
{
flag
=
false
;
}
}
if
(
!
flag
){
tempResourceArr
.
push
({
contentid
:
conId
,
resourceversion
:
tempResource
});
}
}
else
{
tempResourceArr
.
push
({
contentid
:
conId
,
resourceversion
:
tempResource
});
}
ClientData
.
ResourceVersion
(
tempResourceArr
);
};
//set meta Version Data
function
setMetaVersionData
(
conId
){
var
tempMetaArr
;
var
tempMeta
;
//check if insert new or edit
var
flag
=
false
;
if
(
ClientData
.
MetaVersion
().
length
<=
0
||
ClientData
.
MetaVersion
()
==
null
||
ClientData
.
MetaVersion
()
==
'undefined'
){
tempMetaArr
=
[];
}
else
{
tempMetaArr
=
ClientData
.
MetaVersion
();
}
for
(
var
i
=
0
;
i
<
metaVersionArr
.
length
;
i
++
){
if
(
metaVersionArr
[
i
].
contentid
==
conId
){
tempMeta
=
metaVersionArr
[
i
].
metaversion
;
break
;
}
}
if
(
tempMetaArr
.
length
>
0
){
for
(
var
j
=
0
;
j
<
tempMetaArr
.
length
;
j
++
){
if
(
tempMetaArr
[
j
].
contentid
==
conId
){
tempMetaArr
[
j
].
metaversion
=
tempMeta
;
flag
=
true
;
break
;
}
else
{
flag
=
false
;
}
}
if
(
!
flag
){
tempMetaArr
.
push
({
contentid
:
conId
,
metaversion
:
tempMeta
});
}
}
else
{
tempMetaArr
.
push
({
contentid
:
conId
,
metaversion
:
tempMeta
});
}
ClientData
.
MetaVersion
(
tempMetaArr
);
};
//handle display sort direction
//handle display sort direction
function
handleSortDisp
(){
function
handleSortDisp
(){
// $('#control-sort-title').removeClass('active_tops');
// $('#control-sort-title').removeClass('active_tops');
...
@@ -1558,10 +1469,10 @@ function titleClickFunction(e){
...
@@ -1558,10 +1469,10 @@ function titleClickFunction(e){
ClientData
.
ReadingContentIds
(
contentIdArray
);
ClientData
.
ReadingContentIds
(
contentIdArray
);
//Set ResouceVersion for content
//Set ResouceVersion for content
setResourceVersionData
(
contentid
);
COMMON
.
setResourceVersionData
(
contentid
);
//Set MetaVersion for content
//Set MetaVersion for content
setMetaVersionData
(
contentid
);
COMMON
.
setMetaVersionData
(
contentid
);
//Close Submenu
//Close Submenu
$
(
'#dlgSubMenu'
).
hide
();
$
(
'#dlgSubMenu'
).
hide
();
...
...
abvw/js/detail.js
View file @
247c6574
...
@@ -190,10 +190,10 @@ function contentdetail_dspRead_Click_callback(outputId) {
...
@@ -190,10 +190,10 @@ function contentdetail_dspRead_Click_callback(outputId) {
ClientData
.
ReadingContentIds
(
contentIdArray
);
ClientData
.
ReadingContentIds
(
contentIdArray
);
//Set ResouceVersion for content
//Set ResouceVersion for content
setResourceVersionData
(
outputId
);
COMMON
.
setResourceVersionData
(
outputId
);
//Set MetaVersion for content
//Set MetaVersion for content
setMetaVersionData
(
outputId
);
COMMON
.
setMetaVersionData
(
outputId
);
// Redirect to screen: contentview
// Redirect to screen: contentview
//$('body,html').animate({ scrollTop: 0 }, 0);
//$('body,html').animate({ scrollTop: 0 }, 0);
...
@@ -371,95 +371,6 @@ function insertRow1(pageThumbnail, pageText, pageNo) {
...
@@ -371,95 +371,6 @@ function insertRow1(pageThumbnail, pageText, pageNo) {
};
};
//set resource version data
function
setResourceVersionData
(
conId
){
var
tempResourceArr
;
var
tempResource
;
//check if insert new or edit
var
flag
=
false
;
if
(
ClientData
.
ResourceVersion
().
length
<=
0
||
ClientData
.
ResourceVersion
()
==
null
||
ClientData
.
ResourceVersion
()
==
'undefined'
){
tempResourceArr
=
[];
}
else
{
tempResourceArr
=
ClientData
.
ResourceVersion
();
}
for
(
var
i
=
0
;
i
<
resourceVersionArr
.
length
;
i
++
){
if
(
resourceVersionArr
[
i
].
contentid
==
conId
){
tempResource
=
resourceVersionArr
[
i
].
resourceversion
;
break
;
}
}
if
(
tempResourceArr
.
length
>
0
){
for
(
var
j
=
0
;
j
<
tempResourceArr
.
length
;
j
++
){
if
(
tempResourceArr
[
j
].
contentid
==
conId
){
tempResourceArr
[
j
].
resourceversion
=
tempResource
;
flag
=
true
;
break
;
}
else
{
flag
=
false
;
}
}
if
(
!
flag
){
tempResourceArr
.
push
({
contentid
:
conId
,
resourceversion
:
tempResource
});
}
}
else
{
tempResourceArr
.
push
({
contentid
:
conId
,
resourceversion
:
tempResource
});
}
ClientData
.
ResourceVersion
(
tempResourceArr
);
};
//set meta Version Data
function
setMetaVersionData
(
conId
){
var
tempMetaArr
;
var
tempMeta
;
//check if insert new or edit
var
flag
=
false
;
if
(
ClientData
.
MetaVersion
().
length
<=
0
||
ClientData
.
MetaVersion
()
==
null
||
ClientData
.
MetaVersion
()
==
'undefined'
){
tempMetaArr
=
[];
}
else
{
tempMetaArr
=
ClientData
.
MetaVersion
();
}
for
(
var
i
=
0
;
i
<
metaVersionArr
.
length
;
i
++
){
if
(
metaVersionArr
[
i
].
contentid
==
conId
){
tempMeta
=
metaVersionArr
[
i
].
metaversion
;
break
;
}
}
if
(
tempMetaArr
.
length
>
0
){
for
(
var
j
=
0
;
j
<
tempMetaArr
.
length
;
j
++
){
if
(
tempMetaArr
[
j
].
contentid
==
conId
){
tempMetaArr
[
j
].
metaversion
=
tempMeta
;
flag
=
true
;
break
;
}
else
{
flag
=
false
;
}
}
if
(
!
flag
){
tempMetaArr
.
push
({
contentid
:
conId
,
metaversion
:
tempMeta
});
}
}
else
{
tempMetaArr
.
push
({
contentid
:
conId
,
metaversion
:
tempMeta
});
}
ClientData
.
MetaVersion
(
tempMetaArr
);
};
function
formatNormalDate
(
day
,
month
,
year
)
{
function
formatNormalDate
(
day
,
month
,
year
)
{
var
outputDate
=
year
+
'/'
+
((
''
+
month
).
length
<
2
?
'0'
:
''
)
+
month
+
'/'
+
((
''
+
day
).
length
<
2
?
'0'
:
''
)
+
day
;
var
outputDate
=
year
+
'/'
+
((
''
+
month
).
length
<
2
?
'0'
:
''
)
+
month
+
'/'
+
((
''
+
day
).
length
<
2
?
'0'
:
''
)
+
day
;
...
...
abvw/js/history.js
View file @
247c6574
...
@@ -32,8 +32,8 @@ var contentTypeArr = [];
...
@@ -32,8 +32,8 @@ var contentTypeArr = [];
//};
//};
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Create new Array for function No.12.
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Create new Array for function No.12.
var
contentIdArray
=
[];
var
contentIdArray
=
[];
var
resourceVersionArr
=
[];
//
var resourceVersionArr = [];
var
metaVersionArr
=
[];
//
var metaVersionArr = [];
var
totalPage
;
var
totalPage
;
var
contentViewData
=
[];
var
contentViewData
=
[];
var
noRecordFlg
=
false
;
var
noRecordFlg
=
false
;
...
@@ -235,10 +235,10 @@ function renderContent(id, text, division, type, order, from, to, cateid, grpid)
...
@@ -235,10 +235,10 @@ function renderContent(id, text, division, type, order, from, to, cateid, grpid)
checkUserHasReadContent
(
post
.
contentId
,
post
.
resourceVersion
,
post
.
metaVersion
);
checkUserHasReadContent
(
post
.
contentId
,
post
.
resourceVersion
,
post
.
metaVersion
);
//assign version to array
//assign version to array
resourceVersionArr
.
push
({
contentid
:
post
.
contentId
,
resourceversion
:
post
.
resourceVersion
});
COMMON
.
resourceVersionArr
.
push
({
contentid
:
post
.
contentId
,
resourceversion
:
post
.
resourceVersion
});
//assign meta version to array
//assign meta version to array
metaVersionArr
.
push
({
contentid
:
post
.
contentId
,
metaversion
:
post
.
metaVersion
});
COMMON
.
metaVersionArr
.
push
({
contentid
:
post
.
contentId
,
metaversion
:
post
.
metaVersion
});
//Check if content has marking or memo
//Check if content has marking or memo
checkContentMarkingMemoOption
(
post
.
contentId
);
checkContentMarkingMemoOption
(
post
.
contentId
);
...
@@ -414,10 +414,10 @@ function canvasClickFunction(e){
...
@@ -414,10 +414,10 @@ function canvasClickFunction(e){
ClientData
.
ReadingContentIds
(
contentIdArray
);
ClientData
.
ReadingContentIds
(
contentIdArray
);
//Set ResouceVersion for content
//Set ResouceVersion for content
setResourceVersionData
(
outputId
);
COMMON
.
setResourceVersionData
(
outputId
);
//Set MetaVersion for content
//Set MetaVersion for content
setMetaVersionData
(
outputId
);
COMMON
.
setMetaVersionData
(
outputId
);
//Delete 'new' icon
//Delete 'new' icon
drawEditImage
(
outputId
);
drawEditImage
(
outputId
);
...
@@ -842,10 +842,10 @@ function readSubmenuFunction_callback(contentId)
...
@@ -842,10 +842,10 @@ function readSubmenuFunction_callback(contentId)
ClientData
.
ReadingContentIds
(
newArray
);
ClientData
.
ReadingContentIds
(
newArray
);
//Set ResouceVersion for content
//Set ResouceVersion for content
setResourceVersionData
(
contentId
);
COMMON
.
setResourceVersionData
(
contentId
);
//Set MetaVersion for content
//Set MetaVersion for content
setMetaVersionData
(
contentId
);
COMMON
.
setMetaVersionData
(
contentId
);
//Set data for readingcontentid
//Set data for readingcontentid
ClientData
.
ReadingContentIds
(
contentIdArray
);
ClientData
.
ReadingContentIds
(
contentIdArray
);
...
@@ -1331,10 +1331,10 @@ function titleClickFunction(e){
...
@@ -1331,10 +1331,10 @@ function titleClickFunction(e){
ClientData
.
ReadingContentIds
(
contentIdArray
);
ClientData
.
ReadingContentIds
(
contentIdArray
);
//Set ResouceVersion for content
//Set ResouceVersion for content
setResourceVersionData
(
contentid
);
COMMON
.
setResourceVersionData
(
contentid
);
//Set MetaVersion for content
//Set MetaVersion for content
setMetaVersionData
(
contentid
);
COMMON
.
setMetaVersionData
(
contentid
);
//Delete 'new' icon
//Delete 'new' icon
drawEditImage
(
contentid
);
drawEditImage
(
contentid
);
...
...
abvw/js/home.js
View file @
247c6574
...
@@ -20,8 +20,8 @@ HOME.thumbnailArr = [];
...
@@ -20,8 +20,8 @@ HOME.thumbnailArr = [];
HOME
.
contentTypeArr
=
[];
HOME
.
contentTypeArr
=
[];
HOME
.
contentIdArray
=
[];
HOME
.
contentIdArray
=
[];
HOME
.
resourceVersionArr
=
[];
//
HOME.resourceVersionArr = [];
HOME
.
metaVersionArr
=
[];
//
HOME.metaVersionArr = [];
HOME
.
errorPage
=
[];
HOME
.
errorPage
=
[];
HOME
.
errorContent
=
[];
HOME
.
errorContent
=
[];
HOME
.
dataGroup
;
HOME
.
dataGroup
;
...
@@ -509,10 +509,10 @@ HOME.canvasClickFunction_callback = function(outputId)
...
@@ -509,10 +509,10 @@ HOME.canvasClickFunction_callback = function(outputId)
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
//Set ResouceVersion for content
//Set ResouceVersion for content
HOME
.
setResourceVersionData
(
outputId
);
COMMON
.
setResourceVersionData
(
outputId
);
//Set MetaVersion for content
//Set MetaVersion for content
HOME
.
setMetaVersionData
(
outputId
);
COMMON
.
setMetaVersionData
(
outputId
);
//Close Submenu
//Close Submenu
$
(
'#dlgSubMenu'
).
hide
();
$
(
'#dlgSubMenu'
).
hide
();
...
@@ -559,10 +559,10 @@ HOME.canvasClickFunction_callback = function(outputId)
...
@@ -559,10 +559,10 @@ HOME.canvasClickFunction_callback = function(outputId)
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
//Set ResouceVersion for content
//Set ResouceVersion for content
HOME
.
setResourceVersionData
(
outputId
);
COMMON
.
setResourceVersionData
(
outputId
);
//Set MetaVersion for content
//Set MetaVersion for content
HOME
.
setMetaVersionData
(
outputId
);
COMMON
.
setMetaVersionData
(
outputId
);
//$('body,html').animate({ scrollTop: 0 }, 0);
//$('body,html').animate({ scrollTop: 0 }, 0);
ClientData
.
IsRefresh
(
false
);
ClientData
.
IsRefresh
(
false
);
...
@@ -620,10 +620,10 @@ HOME.canvasClickFunction_callback = function(outputId)
...
@@ -620,10 +620,10 @@ HOME.canvasClickFunction_callback = function(outputId)
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
//Set ResouceVersion for content
//Set ResouceVersion for content
HOME
.
setResourceVersionData
(
outputId
);
COMMON
.
setResourceVersionData
(
outputId
);
//Set MetaVersion for content
//Set MetaVersion for content
HOME
.
setMetaVersionData
(
outputId
);
COMMON
.
setMetaVersionData
(
outputId
);
//Close Submenu
//Close Submenu
$
(
'#dlgSubMenu'
).
hide
();
$
(
'#dlgSubMenu'
).
hide
();
...
@@ -670,10 +670,10 @@ HOME.canvasClickFunction_callback = function(outputId)
...
@@ -670,10 +670,10 @@ HOME.canvasClickFunction_callback = function(outputId)
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
//Set ResouceVersion for content
//Set ResouceVersion for content
HOME
.
setResourceVersionData
(
outputId
);
COMMON
.
setResourceVersionData
(
outputId
);
//Set MetaVersion for content
//Set MetaVersion for content
HOME
.
setMetaVersionData
(
outputId
);
COMMON
.
setMetaVersionData
(
outputId
);
//$('body,html').animate({ scrollTop: 0 }, 0);
//$('body,html').animate({ scrollTop: 0 }, 0);
ClientData
.
IsRefresh
(
false
);
ClientData
.
IsRefresh
(
false
);
...
@@ -757,10 +757,10 @@ HOME.openSubMenuDialogFunction = function(e) {
...
@@ -757,10 +757,10 @@ HOME.openSubMenuDialogFunction = function(e) {
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
//Set ResouceVersion for content
//Set ResouceVersion for content
HOME
.
setResourceVersionData
(
contentid
);
COMMON
.
setResourceVersionData
(
contentid
);
//Set MetaVersion for content
//Set MetaVersion for content
HOME
.
setMetaVersionData
(
contentid
);
COMMON
.
setMetaVersionData
(
contentid
);
//Close Submenu
//Close Submenu
$
(
'#dlgSubMenu'
).
hide
();
$
(
'#dlgSubMenu'
).
hide
();
...
@@ -838,10 +838,10 @@ HOME.openSubMenuDialogFunction = function(e) {
...
@@ -838,10 +838,10 @@ HOME.openSubMenuDialogFunction = function(e) {
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
//Set ResouceVersion for content
//Set ResouceVersion for content
HOME
.
setResourceVersionData
(
contentid
);
COMMON
.
setResourceVersionData
(
contentid
);
//Set MetaVersion for content
//Set MetaVersion for content
HOME
.
setMetaVersionData
(
contentid
);
COMMON
.
setMetaVersionData
(
contentid
);
//Close Submenu
//Close Submenu
$
(
'#dlgSubMenu'
).
hide
();
$
(
'#dlgSubMenu'
).
hide
();
...
@@ -1363,10 +1363,10 @@ HOME.detailsSubmenuFunction = function(e) {
...
@@ -1363,10 +1363,10 @@ HOME.detailsSubmenuFunction = function(e) {
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
//Set ResouceVersion for content
//Set ResouceVersion for content
HOME
.
setResourceVersionData
(
contentId
);
COMMON
.
setResourceVersionData
(
contentId
);
//Set MetaVersion for content
//Set MetaVersion for content
HOME
.
setMetaVersionData
(
contentId
);
COMMON
.
setMetaVersionData
(
contentId
);
// Close popup menu
// Close popup menu
$
(
'#dlgSubMenu'
).
hide
();
$
(
'#dlgSubMenu'
).
hide
();
...
@@ -1458,10 +1458,10 @@ HOME.readSubmenuFunction_callback = function(contentId)
...
@@ -1458,10 +1458,10 @@ HOME.readSubmenuFunction_callback = function(contentId)
ClientData
.
ReadingContentIds
(
newArray
);
ClientData
.
ReadingContentIds
(
newArray
);
//Set ResouceVersion for content
//Set ResouceVersion for content
HOME
.
setResourceVersionData
(
contentId
);
COMMON
.
setResourceVersionData
(
contentId
);
//Set MetaVersion for content
//Set MetaVersion for content
HOME
.
setMetaVersionData
(
contentId
);
COMMON
.
setMetaVersionData
(
contentId
);
//Set data for readingcontentid
//Set data for readingcontentid
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
ClientData
.
ReadingContentIds
(
HOME
.
contentIdArray
);
...
@@ -1920,10 +1920,10 @@ HOME.renderContent = function(id, text, division, type, order, from, to, cateid,
...
@@ -1920,10 +1920,10 @@ HOME.renderContent = function(id, text, division, type, order, from, to, cateid,
//Check if user has read this content or not.
//Check if user has read this content or not.
HOME
.
checkUserHasReadContent
(
post
.
contentId
,
post
.
resourceVersion
,
post
.
metaVersion
);
HOME
.
checkUserHasReadContent
(
post
.
contentId
,
post
.
resourceVersion
,
post
.
metaVersion
);
//assign version to array
//assign version to array
HOME
.
resourceVersionArr
.
push
({
contentid
:
post
.
contentId
,
resourceversion
:
post
.
resourceVersion
});
COMMON
.
resourceVersionArr
.
push
({
contentid
:
post
.
contentId
,
resourceversion
:
post
.
resourceVersion
});
//assign meta version to array
//assign meta version to array
HOME
.
metaVersionArr
.
push
({
contentid
:
post
.
contentId
,
metaversion
:
post
.
metaVersion
});
COMMON
.
metaVersionArr
.
push
({
contentid
:
post
.
contentId
,
metaversion
:
post
.
metaVersion
});
//Check if content has marking or memo
//Check if content has marking or memo
HOME
.
checkContentMarkingMemoOption
(
post
.
contentId
);
HOME
.
checkContentMarkingMemoOption
(
post
.
contentId
);
...
@@ -2330,95 +2330,6 @@ HOME.renderViewDate = function(id) {
...
@@ -2330,95 +2330,6 @@ HOME.renderViewDate = function(id) {
}
}
};
};
//set resource version data
HOME
.
setResourceVersionData
=
function
(
conId
)
{
var
tempResourceArr
;
var
tempResource
;
//check if insert new or edit
var
flag
=
false
;
if
(
ClientData
.
ResourceVersion
().
length
<=
0
||
ClientData
.
ResourceVersion
()
==
null
||
ClientData
.
ResourceVersion
()
==
'undefined'
)
{
tempResourceArr
=
[];
}
else
{
tempResourceArr
=
ClientData
.
ResourceVersion
();
}
for
(
var
i
=
0
;
i
<
HOME
.
resourceVersionArr
.
length
;
i
++
)
{
if
(
HOME
.
resourceVersionArr
[
i
].
contentid
==
conId
)
{
tempResource
=
HOME
.
resourceVersionArr
[
i
].
resourceversion
;
break
;
}
}
if
(
tempResourceArr
.
length
>
0
)
{
for
(
var
j
=
0
;
j
<
tempResourceArr
.
length
;
j
++
)
{
if
(
tempResourceArr
[
j
].
contentid
==
conId
)
{
tempResourceArr
[
j
].
resourceversion
=
tempResource
;
flag
=
true
;
break
;
}
else
{
flag
=
false
;
}
}
if
(
!
flag
)
{
tempResourceArr
.
push
({
contentid
:
conId
,
resourceversion
:
tempResource
});
}
}
else
{
tempResourceArr
.
push
({
contentid
:
conId
,
resourceversion
:
tempResource
});
}
ClientData
.
ResourceVersion
(
tempResourceArr
);
};
//set meta Version Data
HOME
.
setMetaVersionData
=
function
(
conId
)
{
var
tempMetaArr
;
var
tempMeta
;
//check if insert new or edit
var
flag
=
false
;
if
(
ClientData
.
MetaVersion
().
length
<=
0
||
ClientData
.
MetaVersion
()
==
null
||
ClientData
.
MetaVersion
()
==
'undefined'
)
{
tempMetaArr
=
[];
}
else
{
tempMetaArr
=
ClientData
.
MetaVersion
();
}
for
(
var
i
=
0
;
i
<
HOME
.
metaVersionArr
.
length
;
i
++
)
{
if
(
HOME
.
metaVersionArr
[
i
].
contentid
==
conId
)
{
tempMeta
=
HOME
.
metaVersionArr
[
i
].
metaversion
;
break
;
}
}
if
(
tempMetaArr
.
length
>
0
)
{
for
(
var
j
=
0
;
j
<
tempMetaArr
.
length
;
j
++
)
{
if
(
tempMetaArr
[
j
].
contentid
==
conId
)
{
tempMetaArr
[
j
].
metaversion
=
tempMeta
;
flag
=
true
;
break
;
}
else
{
flag
=
false
;
}
}
if
(
!
flag
)
{
tempMetaArr
.
push
({
contentid
:
conId
,
metaversion
:
tempMeta
});
}
}
else
{
tempMetaArr
.
push
({
contentid
:
conId
,
metaversion
:
tempMeta
});
}
ClientData
.
MetaVersion
(
tempMetaArr
);
};
//handle display sort direction
//handle display sort direction
HOME
.
handleSortDisp
=
function
()
{
HOME
.
handleSortDisp
=
function
()
{
$
(
'#control-sort-title'
).
removeClass
(
'active_tops'
);
$
(
'#control-sort-title'
).
removeClass
(
'active_tops'
);
...
...
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