Skip to content

C
check
Commit ba8996da by Vo Duc Thang
Options

9/25 リリース

parent 4cd95f13
Showing with 139 additions and 18 deletions
abvw/common/js/thickbox.js
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* Copyright (c) 2007 cody lindley * Copyright (c) 2007 cody lindley
* Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php
*/ */
var tb_pathToImage = "/common/images/loadingAnimation.gif"; var tb_pathToImage = "";// "/common/images/loadingAnimation.gif";
var tmpPage; var tmpPage;
var linkPage; var linkPage;
var TB_WIDTH; var TB_WIDTH;
......
abvw/common/json/lang/lang-en.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"Logout", "dspBkCancel":"Logout",
"txtSearchResult":"Result", "txtSearchResult":"Result",
"dspHome":"Home", "dspHome":"Home",
"txtLoginUser":"(Ver.20130924)User:", "txtLoginUser":"(Ver.20130925)User:",
"txtAll":"All", "txtAll":"All",
"txtMkgSize":"Size", "txtMkgSize":"Size",
"txtMkgS":"S", "txtMkgS":"S",
......
abvw/common/json/lang/lang-ja.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト", "dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果", "txtSearchResult":"検索結果",
"dspHome":"ホーム", "dspHome":"ホーム",
"txtLoginUser":"(Ver.20130924)ログイン中：", "txtLoginUser":"(Ver.20130925)ログイン中：",
"txtAll":"すべて", "txtAll":"すべて",
"txtMkgSize":"太さ", "txtMkgSize":"太さ",
"txtMkgS":"小", "txtMkgS":"小",
......
abvw/common/json/lang/lang-ko.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃", "dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과", "txtSearchResult":"검색 결과",
"dspHome":"홈", "dspHome":"홈",
"txtLoginUser":"(Ver.20130924)로그인 중:", "txtLoginUser":"(Ver.20130925)로그인 중:",
"txtAll":"전체", "txtAll":"전체",
"txtMkgSize":"두께", "txtMkgSize":"두께",
"txtMkgS":"소", "txtMkgS":"소",
......
abvw/js/Limit_Access_Content.js
...@@ -33,6 +33,12 @@ function checkLimitContent(contentId, func,isNotUnlockScreen) { ...@@ -33,6 +33,12 @@ function checkLimitContent(contentId, func,isNotUnlockScreen) {
$('#limit_level1').show().center(); $('#limit_level1').show().center();
$('#limit_level1 .deletebtn .ok').unbind('click').click( $('#limit_level1 .deletebtn .ok').unbind('click').click(
function () { function () {
if (isNotUnlockScreen != 1) {
unlockLayout();
}
$('#limit_level1').hide();
func(); func();
} }
); );
...@@ -116,6 +122,10 @@ function checkLimitContent(contentId, func,isNotUnlockScreen) { ...@@ -116,6 +122,10 @@ function checkLimitContent(contentId, func,isNotUnlockScreen) {
// update sid id // update sid id
ClientData.userInfo_sid(data.sid); ClientData.userInfo_sid(data.sid);
if (isNotUnlockScreen != 1) {
unlockLayout();
}
$('#limit_level2').hide();
// open content // open content
func(); func();
} }
......
abvw/js/contentsearch.js
...@@ -925,6 +925,9 @@ function downloadResourceById(contentId){ ...@@ -925,6 +925,9 @@ function downloadResourceById(contentId){
resourceUrl = getResourceByIdFromAPI(resourceId); resourceUrl = getResourceByIdFromAPI(resourceId);
window.open(resourceUrl, "_blank"); window.open(resourceUrl, "_blank");
// redraw content remove new icon
drawEditImage(contentId);
}); });
}; };
......
abvw/js/contentview.js
...@@ -2096,7 +2096,7 @@ var isZoomingContent = false; ...@@ -2096,7 +2096,7 @@ var isZoomingContent = false;
function displayOverlayForSpecifyContentType(){ function displayOverlayForSpecifyContentType(){
var contentId = ClientData.contentInfo_contentId(); var contentId = ClientData.contentInfo_contentId();
var resourceUrl = downloadResourceById(contentId); var resourceUrl = downloadResourceById(contentId);
//contentType = ContentTypeKeys.Type_Html; //contentType = ContentTypeKeys.Type_Html;
if(contentType == ContentTypeKeys.Type_Music){ if(contentType == ContentTypeKeys.Type_Music){
...@@ -2108,6 +2108,61 @@ function displayOverlayForSpecifyContentType(){ ...@@ -2108,6 +2108,61 @@ function displayOverlayForSpecifyContentType(){
else if(contentType == ContentTypeKeys.Type_Html){ else if(contentType == ContentTypeKeys.Type_Html){
handleForContentTypeHTML(resourceUrl); handleForContentTypeHTML(resourceUrl);
} }
if (isTouchDevice() == true) {
if (avwUserEnvObj.os == "android") {
standardRatio = document.documentElement.clientWidth / window.innerWidth;
startDetectZoom({ time: 500,
callbackFunction: function (oldRatio, newRatio, oldW, oldH, newW, newH) {
currentRatio = newRatio;
}
});
var top = window.innerHeight - $("#footer_toolbar_1").height();
$("#wrapper").css("width", window.innerWidth);
$("#wrapper").css("height", window.innerHeight);
$("#footer_toolbar_1").css("top", top + "px");
$("#footer_toolbar_2").css("top", top + "px");
sizingScreen();
}
}
/* window resize event */
$(window).resize(function () {
//START : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
setLoadingSize();
//END : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
if (isTouchDevice() == true) {
if (avwUserEnvObj.os == "android") {
var tempRatio = document.documentElement.clientWidth / window.innerWidth;
if (tempRatio <= 1) {
// Adjust position for toolbar and footer bar
var top = window.innerHeight - $("#footer_toolbar_1").height();
$("#wrapper").css("width", window.innerWidth);
$("#wrapper").css("height", window.innerHeight);
$("#footer_toolbar_1").css("top", top + "px");
$("#footer_toolbar_2").css("top", top + "px");
}
else {
var top = $(window).height() - $("#footer_toolbar_1").height();
$("#wrapper").css("width", $(window).width());
$("#wrapper").css("height", $(window).height());
$("#footer_toolbar_1").css("top", top + "px");
$("#footer_toolbar_2").css("top", top + "px");
}
}
}
resizeScreen();
isChangeSizeScreen = false;
/* change position dialog */
changePosDialog();
/* close dialog popuptext */
closeDialogResize();
});
}; };
//handle for content type = video //handle for content type = video
...@@ -2122,7 +2177,7 @@ function handleForContentTypeVideo(resourceUrl){ ...@@ -2122,7 +2177,7 @@ function handleForContentTypeVideo(resourceUrl){
$container.html( $container.html(
'<h1>' '<h1>'
+ '</h1>' + '</h1>'
+ '<video autoplay="true" loop="true" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">' + '<video id="content_video" autoplay="true" loop="true" preload="auto" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
+ ' <source src="' + resourceUrl + '" type="video/mp4"> ' + ' <source src="' + resourceUrl + '" type="video/mp4"> '
+ '</video>' + '</video>'
); );
...@@ -2131,25 +2186,48 @@ function handleForContentTypeVideo(resourceUrl){ ...@@ -2131,25 +2186,48 @@ function handleForContentTypeVideo(resourceUrl){
$container.html( $container.html(
'<h1>' '<h1>'
+ '</h1>' + '</h1>'
+ '<video autoplay="true" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">' + '<video id="content_video" autoplay="true" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
+ ' <source src="' + resourceUrl + '" type="video/mp4"> ' + ' <source src="' + resourceUrl + '" type="video/mp4"> '
+ '</video>' + '</video>'
); );
} }
//START TRB00068 //START TRB00068
// Check to play Video on ipad // Check to play Video on ipad
if (avwUserEnvObj.os == "ipad") { if (avwUserEnvObj.os == "ipad") {
// Show confim message to play background music // Show confim message to play background music
$("#contentVideoConfirm").css('z-index', 999); $("#contentVideoConfirm").css('z-index', 999);
$("#contentVideoConfirm_OK").unbind('click'); $("#contentVideoConfirm_OK").unbind('click');
$("#contentVideoConfirm_OK").click(function () { $("#contentVideoConfirm_OK").click(function () {
$("#contentVideoConfirm").hide(); var myVideo=document.getElementById("content_video");
isShowVideoContent = true; if (myVideo.paused)
{
myVideo.play();
}
$container.show(); $container.show();
$("#dialog").find('video').load(); $("#contentVideoConfirm").hide();
$("#dialog").find('video').play(); isShowVideoContent = true;
});
$("#contentVideoConfirm").show();
$("#contentVideoConfirm").center();
}
else if (avwUserEnvObj.os == "android") {
// Show confim message to play background music
$("#contentVideoConfirm").css('z-index', 999);
$("#contentVideoConfirm_OK").unbind('click');
$container.show();
$("#contentVideoConfirm_OK").click(function () {
var myVideo=document.getElementById("content_video");
if (myVideo.paused)
{
myVideo.play();
}
$("#contentVideoConfirm").hide();
isShowVideoContent = true;
}); });
$("#contentVideoConfirm").show(); $("#contentVideoConfirm").show();
$("#contentVideoConfirm").center(); $("#contentVideoConfirm").center();
......
abvw/js/contentview_InitObjects.js
...@@ -297,7 +297,11 @@ function initPage() { ...@@ -297,7 +297,11 @@ function initPage() {
} else { } else {
if (getPageIndex() == 0) { if (getPageIndex() == 0) {
//START TRB00069 //START TRB00069
isPendingContentBGM = true; //START TRB00069
if(isHasPageBGM()){
isPendingContentBGM = true;
}
//END TRB00069
//END TRB00069 //END TRB00069
getContent().setPageImages(totalPage, pageImages) getContent().setPageImages(totalPage, pageImages)
.setPageObjects(pageObjects) .setPageObjects(pageObjects)
...@@ -432,7 +436,9 @@ function initPage() { ...@@ -432,7 +436,9 @@ function initPage() {
if (getPageIndex() == 0) { if (getPageIndex() == 0) {
//START TRB00069 //START TRB00069
isPendingContentBGM = true; if(isHasPageBGM()){
isPendingContentBGM = true;
}
//END TRB00069 //END TRB00069
getContent().setPageImages(totalPage, pageImages) getContent().setPageImages(totalPage, pageImages)
...@@ -550,6 +556,23 @@ function initPage() { ...@@ -550,6 +556,23 @@ function initPage() {
}); });
}; };
//START TRB00069
function isHasPageBGM(){
var iResult = false;
getPageObjectsByPageIndex(pageObjectsData, 0);
for (var nIndex = 0; nIndex < pageObjects.length; nIndex++) {
if (pageObjects[nIndex].mediaType == '3' && pageObjects[nIndex].playType == '2') {
iResult = true;
break;
}
}
return iResult;
};
//END TRB00069
function initPageMediaAndHtmlType(){ function initPageMediaAndHtmlType(){
//$('#divImageLoading').css('display', 'block'); //$('#divImageLoading').css('display', 'block');
......
abvw/js/history.js
...@@ -747,6 +747,10 @@ function downloadResourceById(contentId){ ...@@ -747,6 +747,10 @@ function downloadResourceById(contentId){
//Get resource //Get resource
resourceUrl = getResourceByIdFromAPI(resourceId); resourceUrl = getResourceByIdFromAPI(resourceId);
window.open(resourceUrl, "_blank"); window.open(resourceUrl, "_blank");
// redraw content remove new icon
drawEditImage(contentId);
}); });
}; };
......
abvw/js/home.js
...@@ -2045,7 +2045,10 @@ function downloadResourceById(contentId){ ...@@ -2045,7 +2045,10 @@ function downloadResourceById(contentId){
resourceUrl = getResourceByIdFromAPI(resourceId); resourceUrl = getResourceByIdFromAPI(resourceId);
window.open(resourceUrl, "_blank"); window.open(resourceUrl, "_blank");
// redraw content remove new icon
drawEditImage(contentId);
}); });
}; };
......
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