Skip to content

C
check
Commit cd8ece9d by Motohisa Nakano
Options

20121218-1

parent 6865932b
Showing with 138 additions and 67 deletions
.gitignore
2012*/
_bk/
abvw.zip
_config/
abvw/common/json/lang/lang-en.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"Logout",
"txtSearchResult":"Result",
"dspHome":"Home",
"txtLoginUser":"(Ver.20121217-3)User:",
"txtLoginUser":"(Ver.20121218-1)User:",
"txtAll":"All",
"txtMkgSize":"Size",
"txtMkgS":"S",
......
abvw/common/json/lang/lang-ja.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果",
"dspHome":"ホーム",
"txtLoginUser":"(Ver.20121217-3)ログイン中：",
"txtLoginUser":"(Ver.20121218-1)ログイン中：",
"txtAll":"すべて",
"txtMkgSize":"太さ",
"txtMkgS":"小",
......
abvw/common/json/lang/lang-ko.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과",
"dspHome":"홈",
"txtLoginUser":"(Ver.20121217-3)로그인 중:",
"txtLoginUser":"(Ver.20121218-1)로그인 중:",
"txtAll":"전체",
"txtMkgSize":"두께",
"txtMkgS":"소",
......
abvw/contentsearch.html
......@@ -122,19 +122,19 @@
<ul>
<li><span class="lang" lang="txtSort">並べ替え</span><b>|</b></li>
<li>
<a class="active_tops lang control_sort_on" id="control-sort-title" lang="dspTitleNm">タイトル名</a>
<a class="lang control_sort_off" style="display: none" lang="dspTitleNm">タイトル名</a>
<a class="active_tops lang control_sort_on nottouchdevice" id="control-sort-title" lang="dspTitleNm">タイトル名</a>
<a class="lang control_sort_off active_tops" style="display: none" lang="dspTitleNm">タイトル名</a>
<span id="title-sorttype"> </span>
<span><b>|</b></span>
</li>
<li>
<a id="control-sort-titlekana" class="lang control_sort_on" lang="dspTitleNmKn" >タイトル名（かな）</a>
<a id="label-sort-titlekana" class="lang control_sort_off" style="display: none" lang="dspTitleNmKn">タイトル名（かな）</a>
<a id="control-sort-titlekana" class="lang control_sort_on nottouchdevice" lang="dspTitleNmKn" >タイトル名（かな）</a>
<a id="label-sort-titlekana" class="lang control_sort_off " style="display: none" lang="dspTitleNmKn">タイトル名（かな）</a>
<span id="titlekana-sorttype"> </span>
<span id="separate"><b>|</b></span>
</li>
<li>
<a id="control-sort-releasedate" class="lang control_sort_on" lang="txtPubDt" >公開日</a>
<a id="control-sort-releasedate" class="lang control_sort_on nottouchdevice" lang="txtPubDt" >公開日</a>
<a class="lang control_sort_off" style="display: none" lang="txtPubDt">公開日</a>
<span id="rDate-sorttype"> </span>
</li>
......
abvw/contentview.html
......@@ -144,6 +144,12 @@
var arrThumbnailsLoaded = [];
var isSendingData = true;
/*
Clear canvas
*/
function clearCanvas(targetCanvas) {
targetCanvas.width = targetCanvas.width;
}
/* get Json stored content info */
function getJsonContentInfo(){
......@@ -2659,8 +2665,8 @@
$('#divImageLoading').css('display', 'block');
// Clear canvas main
context_main.clearRect(0, 0, context_main.width, context_main.height);
// Clear canvas offscreen
clearCanvas(document.getElementById("offscreen"));
avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{contentId: contentID,sid:ClientData.userInfo_sid(),pageNo:getPageIndex() + 2},
......@@ -2726,8 +2732,8 @@
$('#divImageLoading').css('display','block');
// Clear canvas main
context_main.clearRect(0, 0, context_main.width, context_main.height);
// Clear canvas offscreen
clearCanvas(document.getElementById("offscreen"));
//pageImages = getURLPageImage("webContentPageImage") + "?contentId=" + contentID + "&sid=" + ClientData.userInfo_sid() + "&pageNo=" + (getPageIndex() - 1);
avwGrabContentPageImage(ClientData.userInfo_accountPath(),
......@@ -2758,8 +2764,8 @@
$('#divImageLoading').css('display','block');
// Clear canvas main
context_main.clearRect(0, 0, context_main.width, context_main.height);
// Clear canvas offscreen
clearCanvas(document.getElementById("offscreen"));
avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{contentId: contentID,sid:ClientData.userInfo_sid(),pageNo:1},
......@@ -2789,8 +2795,8 @@
$('#divImageLoading').css('display','block');
// Clear canvas main
context_main.clearRect(0, 0, context_main.width, context_main.height);
// Clear canvas offscreen
clearCanvas(document.getElementById("offscreen"));
//pageImages = getURLPageImage("webContentPageImage") + "?contentId=" + contentID + "&sid=" + ClientData.userInfo_sid() + "&pageNo=" + (totalPage - 1);
avwGrabContentPageImage(ClientData.userInfo_accountPath(),
......@@ -2827,8 +2833,8 @@
$('#divImageLoading').css('display', 'block');
// Clear canvas main
context_main.clearRect(0, 0, context_main.width, context_main.height);
// Clear canvas offscreen
clearCanvas(document.getElementById("offscreen"));
avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{contentId: contentID,sid:ClientData.userInfo_sid(),pageNo:page_index + 1},
......@@ -3764,8 +3770,8 @@ function oldContent_Back(){
$('#divImageLoading').css('display','block');
// Clear canvas main
context_main.clearRect(0, 0, context_main.width, context_main.height);
// Clear canvas offscreen
clearCanvas(document.getElementById("offscreen"));
avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{contentId: contentID,sid:ClientData.userInfo_sid(),pageNo:pageMove + 1},
......
abvw/css/contentsearch.css
......@@ -90,7 +90,7 @@
margin-right:5px;
margin-left:5px;
}
.tops ul li a:hover{ text-decoration:underline;}
.tops ul li a.nottouchdevice:hover{ text-decoration:underline;}
.tops ul li a.gray_text{ color:#999999;}
.tops ul li a.active_tops{ color:#2d83da; text-decoration:underline;}
.tops ul li b{ font-weight:normal; float:left; font-size:12px;}
......
abvw/css/history.css
......@@ -90,7 +90,7 @@
margin-right:5px;
margin-left:5px;
}
.tops ul li a:hover{ text-decoration:underline;}
.tops ul li a.nottouchdevice:hover{ text-decoration:underline;}
.tops ul li a.gray_text{ color:#999999;}
.tops ul li a.active_tops{ color:#2d83da; text-decoration:underline;}
.tops ul li b{ font-weight:normal; float:left; font-size:12px;}
......
abvw/css/home.css
......@@ -37,7 +37,7 @@
margin-right:5px;
margin-left:5px;
}
.tops ul li a:hover{ text-decoration:underline;}
.tops ul li a.nottouchdevice:hover{ text-decoration:underline;}
.tops ul li a.gray_text{ color:#999999;}
.tops ul li a.active_tops{ color:#2d83da; text-decoration:underline;}
/*.tops ul li a.active_tops{ color:#ec2020; text-decoration:underline;}*/
......
abvw/history.html
......@@ -110,26 +110,26 @@
<ul>
<li><span class="lang" lang="txtSort">並べ替え</span><b>|</b></li>
<li>
<a class="lang control_sort_on" id="control-sort-title" lang="dspTitleNm">タイトル名</a>
<a class="lang control_sort_on nottouchdevice" id="control-sort-title" lang="dspTitleNm">タイトル名</a>
<a class="lang control_sort_off" style="display: none" lang="dspTitleNm">タイトル名</a>
<span id="title-sorttype"> </span>
<span><b>|</b></span>
</li>
<li>
<a id="control-sort-titlekana" class="lang control_sort_on" lang="dspTitleNmKn" >タイトル名（かな）</a>
<a id="control-sort-titlekana" class="lang control_sort_on nottouchdevice" lang="dspTitleNmKn" >タイトル名（かな）</a>
<a id="label-sort-titlekana" class="lang control_sort_off" style="display: none" lang="dspTitleNmKn" >タイトル名（かな）</a>
<span id="titlekana-sorttype"> </span>
<span id="separate"><b>|</b></span>
</li>
<li>
<a id="control-sort-releasedate" class="lang control_sort_on" lang="txtPubDt" >公開日</a>
<a id="control-sort-releasedate" class="lang control_sort_on nottouchdevice" lang="txtPubDt" >公開日</a>
<a class="lang control_sort_off" style="display: none" lang="txtPubDt">公開日</a>
<span id="rDate-sorttype"> </span>
<span><b>|</b></span>
</li>
<li>
<a id="control-sort-viewdate" class="active_tops lang control_sort_on" lang="txtViewDt" >閲覧日</a>
<a class="lang control_sort_off" style="display: none" lang="txtViewDt" >閲覧日</a>
<a id="control-sort-viewdate" class="active_tops lang control_sort_on nottouchdevice" lang="txtViewDt" >閲覧日</a>
<a class="lang control_sort_off active_tops" style="display: none" lang="txtViewDt" >閲覧日</a>
<span id="vDate-sorttype"> </span>
</li>
</ul>
......
abvw/home.html
......@@ -141,9 +141,9 @@
<ul>
<li><span class="lang" lang="txtSort">並べ替え</span><span><b>|</b></span></li>
<li><a class="lang" id="control-sort-title" lang="dspTitleNm">タイトル名</a><span id="title-sorttype"> </span><span><b>|</b></span></li>
<li><a id="control-sort-titlekana" class="lang" lang="dspTitleNmKn" >タイトル名（かな）</a><span id="titlekana-sorttype"> </span><span id="separate"><b>|</b></span></li>
<li><a id="control-sort-releasedate" class="active_tops lang" lang="txtPubDt" >公開日</a><span id="rDate-sorttype"> </span></li>
<li><a class="lang nottouchdevice" id="control-sort-title" lang="dspTitleNm">タイトル名</a><span id="title-sorttype"> </span><span><b>|</b></span></li>
<li><a id="control-sort-titlekana" class="lang nottouchdevice" lang="dspTitleNmKn" >タイトル名（かな）</a><span id="titlekana-sorttype"> </span><span id="separate"><b>|</b></span></li>
<li><a id="control-sort-releasedate" class="lang nottouchdevice" lang="txtPubDt" >公開日</a><span id="rDate-sorttype"> </span></li>
</ul>
<p>
<label id="dispPage" class="pageNumControl" style="visibility: hidden"> </label>
......
abvw/js/contentsearch.js
......@@ -53,6 +53,9 @@ $(document).ready(function(){
//Format text display more record
formatDisplayMoreRecord();
//remove hover effect when is touch device
removeHoverCss();
//InitScreen
initialScreen();
......@@ -1120,6 +1123,10 @@ function setMetaVersionData(conId){
//handle display sort direction
function handleSortDisp(){
$('#control-sort-title').removeClass('active_tops');
$('#control-sort-titlekana').removeClass('active_tops');
$('#control-sort-releasedate').removeClass('active_tops');
var typeSort;
var orderSort;
......@@ -1149,8 +1156,11 @@ function handleSortDisp(){
$('#titlekana-sorttype').html('');
$('#rDate-sorttype').html('');
}
$('#control-sort-title').addClass('active_tops');
}
else if(typeSort == 2){
if(orderSort == Consts.ConstOrderSetting_Asc){
$('#title-sorttype').html('');
$('#titlekana-sorttype').html('');
......@@ -1165,8 +1175,10 @@ function handleSortDisp(){
$('#titlekana-sorttype').css('width', '12px');
$('#rDate-sorttype').html('');
}
$('#control-sort-titlekana').addClass('active_tops');
}
else{
else if(typeSort == 3){
if(orderSort == Consts.ConstOrderSetting_Asc){
$('#title-sorttype').html('');
$('#titlekana-sorttype').html('');
......@@ -1181,6 +1193,8 @@ function handleSortDisp(){
$('#rDate-sorttype').html('▼');
$('#rDate-sorttype').css('width', '12px');
}
$('#control-sort-releasedate').addClass('active_tops');
}
}
}
......@@ -1377,3 +1391,12 @@ function resizeResourceThumbnail(mg, width, height) {
return result;
}
function removeHoverCss(){
if(isTouchDevice()){
$('#control-sort-title').removeClass('nottouchdevice');
$('#control-sort-titlekana').removeClass('nottouchdevice');
$('#control-sort-releasedate').removeClass('nottouchdevice');
}
}
\ No newline at end of file
......
abvw/js/history.js
......@@ -57,6 +57,9 @@ $(document).ready(function(){
ClientData.BookmarkScreen(ScreenIds.History);
//remove hover effect when is touch device
removeHoverCss();
//Render Grid
renderGridView();
......@@ -888,6 +891,13 @@ function returnOriginalViewDate(id){
//handle display sort direction
function handleSortDisp(){
$('#control-sort-title').removeClass('active_tops');
$('#control-sort-titlekana').removeClass('active_tops');
$('#control-sort-releasedate').removeClass('active_tops');
$('#control-sort-viewdate').removeClass('active_tops');
var typeSort;
var orderSort;
......@@ -920,6 +930,8 @@ function handleSortDisp(){
$('#rDate-sorttype').html('');
$('#vDate-sorttype').html('');
}
$('#control-sort-title').addClass('active_tops');
}
else if(typeSort == 2){
if(orderSort == Consts.ConstOrderSetting_Asc){
......@@ -938,6 +950,8 @@ function handleSortDisp(){
$('#rDate-sorttype').html('');
$('#vDate-sorttype').html('');
}
$('#control-sort-titlekana').addClass('active_tops');
}
else if(typeSort == 3){
if(orderSort == Consts.ConstOrderSetting_Asc){
......@@ -956,6 +970,8 @@ function handleSortDisp(){
$('#rDate-sorttype').css('width', '12px');
$('#vDate-sorttype').html('');
}
$('#control-sort-releasedate').addClass('active_tops');
}
else{
if(orderSort == Consts.ConstOrderSetting_Asc){
......@@ -975,6 +991,8 @@ function handleSortDisp(){
$('#vDate-sorttype').html('▼');
$('#vDate-sorttype').css('width', '12px');
}
$('#control-sort-viewdate').addClass('active_tops');
}
}
}
......@@ -1495,3 +1513,14 @@ function resizeResourceThumbnail(mg, width, height) {
return result;
}
function removeHoverCss(){
if(isTouchDevice()){
$('#control-sort-title').removeClass('nottouchdevice');
$('#control-sort-titlekana').removeClass('nottouchdevice');
$('#control-sort-releasedate').removeClass('nottouchdevice');
$('#control-sort-viewdate').removeClass('nottouchdevice');
}
}
abvw/js/home.js
......@@ -20,8 +20,8 @@
//----Constant-----------//
var DEFAULT_DISP_NUMBER_RECORD_FROM = 1;
var DEFAULT_DISP_NUMBER_RECORD_TO = 15;
var DEFAULT_SORT_TYPE = '3';
var DEFAULT_SORT_ORDER = '2';
var DEFAULT_SORT_TYPE = 3;
var DEFAULT_SORT_ORDER = 2;
var DEFAULT_SEARCH_DIVISION = 0;
var DEFAULT_IMG_OPTION_MEMO = 'img/list/pic_1.png';
......@@ -68,6 +68,9 @@ $(document).ready(function () {
syncContentData();
}
//remove hover css if is touch device
removeHoverCss();
//Get default view mode for rendergrid view
setDefaultViewMode();
......@@ -666,8 +669,8 @@ function genreSelectFunction() {
recordTo = returnNumberDispRecordForBookShelf();
}
ClientData.searchCond_sortOrder(DEFAULT_SORT_ORDER);
ClientData.searchCond_sortType(DEFAULT_SORT_TYPE);
//ClientData.searchCond_sortOrder(DEFAULT_SORT_ORDER);
//ClientData.searchCond_sortType(DEFAULT_SORT_TYPE);
var id = ClientData.userInfo_sid();
var searchText = ClientData.searchCond_searchText();
......@@ -716,8 +719,8 @@ function groupSelectFunction() {
recordTo = returnNumberDispRecordForBookShelf();
}
ClientData.searchCond_sortOrder(DEFAULT_SORT_ORDER);
ClientData.searchCond_sortType(DEFAULT_SORT_TYPE);
//ClientData.searchCond_sortOrder(DEFAULT_SORT_ORDER);
//ClientData.searchCond_sortType(DEFAULT_SORT_TYPE);
var id = ClientData.userInfo_sid();
var searchText = ClientData.searchCond_searchText();
......@@ -859,8 +862,8 @@ function AddGenre_Callback(selectedNode) {
}
ClientData.searchCond_genreId(lCateId);
ClientData.searchCond_sortOrder(DEFAULT_SORT_ORDER);
ClientData.searchCond_sortType(DEFAULT_SORT_TYPE);
//ClientData.searchCond_sortOrder(DEFAULT_SORT_ORDER);
//ClientData.searchCond_sortType(DEFAULT_SORT_TYPE);
var id = ClientData.userInfo_sid();
var searchText = ClientData.searchCond_searchText();
......@@ -875,9 +878,9 @@ function AddGenre_Callback(selectedNode) {
resetShowNextRecordCount();
handleSortDisp();
renderContent(id, searchText, searchDivision, sortType, sortOrder, recordFrom, recordTo, genreId , groupId);
handleSortDisp();
}
//Get Data from Group Json
......@@ -1023,8 +1026,8 @@ function AddGroup_Callback(selectedNode) {
}
ClientData.searchCond_groupId(lGrpId);
ClientData.searchCond_sortOrder(DEFAULT_SORT_ORDER);
ClientData.searchCond_sortType(DEFAULT_SORT_TYPE);
//ClientData.searchCond_sortOrder(DEFAULT_SORT_ORDER);
//ClientData.searchCond_sortType(DEFAULT_SORT_TYPE);
var id = ClientData.userInfo_sid();
var searchText = ClientData.searchCond_searchText();
......@@ -1039,9 +1042,9 @@ function AddGroup_Callback(selectedNode) {
resetShowNextRecordCount();
handleSortDisp();
renderContent(id, searchText, searchDivision, sortType, sortOrder, recordFrom, recordTo, genreId , groupId);
handleSortDisp();
}
//Re-render page from and total record
......@@ -1271,7 +1274,8 @@ function sortByTitleFunction(){
$('#control-nextrecord').hide();
$(this).addClass('active_tops');
//$(this).addClass('active_tops');
$('#control-sort-title').addClass('active_tops');
$('#control-sort-titlekana').removeClass('active_tops');
$('#control-sort-releasedate').removeClass('active_tops');
......@@ -1285,7 +1289,7 @@ function sortByTitleFunction(){
if(sortOrder == Consts.ConstOrderSetting_Asc)
{
if(sortType == '1'){
if(sortType == 1){
sortOrder = Consts.ConstOrderSetting_Desc;
$('#title-sorttype').html('');
$('#title-sorttype').html('▼');
......@@ -1333,7 +1337,7 @@ function sortByTitleFunction(){
ClientData.searchCond_recordFrom(recordTo);
}
sortType = '1';
sortType = 1;
ClientData.searchCond_sortType(sortType);
//refresh Gridview
......@@ -1347,7 +1351,7 @@ function sortByTitleKanaFunction(){
$('#control-nextrecord').hide();
$(this).addClass('active_tops');
$('#control-sort-titlekana').addClass('active_tops');
$('#control-sort-title').removeClass('active_tops');
$('#control-sort-releasedate').removeClass('active_tops');
......@@ -1361,7 +1365,7 @@ function sortByTitleKanaFunction(){
if(sortOrder == Consts.ConstOrderSetting_Asc)
{
if(sortType == '2'){
if(sortType == 2){
sortOrder = Consts.ConstOrderSetting_Desc;
$('#title-sorttype').html('');
$('#titlekana-sorttype').html('');
......@@ -1409,7 +1413,7 @@ function sortByTitleKanaFunction(){
ClientData.searchCond_recordFrom(recordTo);
}
sortType = '2';
sortType = 2;
//refresh gridview
refreshGrid();
......@@ -1423,7 +1427,8 @@ function sortByReleaseDateFunction(){
$('#control-nextrecord').hide();
$(this).addClass('active_tops');
//$(this).addClass('active_tops');
$('#control-sort-releasedate').addClass('active_tops');
$('#control-sort-title').removeClass('active_tops');
$('#control-sort-titlekana').removeClass('active_tops');
......@@ -1437,7 +1442,7 @@ function sortByReleaseDateFunction(){
if(sortOrder == Consts.ConstOrderSetting_Asc)
{
if(sortType == '3'){
if(sortType == 3){
sortOrder = Consts.ConstOrderSetting_Desc;
$('#title-sorttype').html('');
$('#titlekana-sorttype').html('');
......@@ -1485,7 +1490,7 @@ function sortByReleaseDateFunction(){
ClientData.searchCond_recordFrom(recordTo);
}
sortType = '3';
sortType = 3;
//refresh gridview
refreshGrid();
......@@ -2101,6 +2106,7 @@ function handleSortDisp(){
$('#control-sort-title').removeClass('active_tops');
$('#control-sort-titlekana').removeClass('active_tops');
$('#control-sort-releasedate').removeClass('active_tops');
var typeSort;
var orderSort;
......@@ -2116,10 +2122,6 @@ function handleSortDisp(){
orderSort = ClientData.searchCond_sortOrder();
if(typeSort == 1){
$('#control-sort-title').addClass('active_tops');
$('#control-sort-titlekana').removeClass('active_tops');
$('#control-sort-releasedate').removeClass('active_tops');
if(orderSort == Consts.ConstOrderSetting_Asc){
$('#title-sorttype').html('');
$('#title-sorttype').html('▲');
......@@ -2134,11 +2136,10 @@ function handleSortDisp(){
$('#titlekana-sorttype').html('');
$('#rDate-sorttype').html('');
}
$('#control-sort-title').addClass('active_tops');
}
else if(typeSort == 2){
$('#control-sort-title').removeClass('active_tops');
$('#control-sort-titlekana').addClass('active_tops');
$('#control-sort-releasedate').removeClass('active_tops');
if(orderSort == Consts.ConstOrderSetting_Asc){
$('#title-sorttype').html('');
......@@ -2154,12 +2155,10 @@ function handleSortDisp(){
$('#titlekana-sorttype').css('width', '12px');
$('#rDate-sorttype').html('');
}
}
else{
$('#control-sort-title').removeClass('active_tops');
$('#control-sort-titlekana').removeClass('active_tops');
$('#control-sort-releasedate').addClass('active_tops');
$('#control-sort-titlekana').addClass('active_tops');
}
else if(typeSort == 3){
if(orderSort == Consts.ConstOrderSetting_Asc){
$('#title-sorttype').html('');
$('#titlekana-sorttype').html('');
......@@ -2174,6 +2173,8 @@ function handleSortDisp(){
$('#rDate-sorttype').html('▼');
$('#rDate-sorttype').css('width', '12px');
}
$('#control-sort-releasedate').addClass('active_tops');
}
}
}
......@@ -2609,3 +2610,12 @@ function setDefaultViewMode(){
isShowBookShelf = true;
}
}
function removeHoverCss(){
if(isTouchDevice()){
$('#control-sort-title').removeClass('nottouchdevice');
$('#control-sort-titlekana').removeClass('nottouchdevice');
$('#control-sort-releasedate').removeClass('nottouchdevice');
}
}
......
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