Skip to content

C
check
Commit 421c9e02 by Vo Duc Thang
Options

10/4 リリース 

※CSS対応
parent e16f9955
Showing with 1457 additions and 1749 deletions
abvw-preview/common/js/avweb.js
...@@ -276,8 +276,8 @@ $(function () { ...@@ -276,8 +276,8 @@ $(function () {
// システム設定ファイルの配置先パスの決定 // システム設定ファイルの配置先パスの決定
var location = window.location.toString().toLowerCase(); var location = window.location.toString().toLowerCase();
var sysFile = ''; var sysFile = '';
if (location.indexOf('/abvw-preview') < 0) { if (location.indexOf('/abvw') < 0) {
sysFile = './abvw-preview/common/json/sys/conf.json'; sysFile = './abvw/common/json/sys/conf.json';
} else { } else {
sysFile = './common/json/sys/conf.json'; sysFile = './common/json/sys/conf.json';
} }
...@@ -351,15 +351,13 @@ function avwCheckLogin(option) { ...@@ -351,15 +351,13 @@ function avwCheckLogin(option) {
'<div><button id="avw-unauth-ok">OK</button></div>' + '<div><button id="avw-unauth-ok">OK</button></div>' +
'</div></div></div>'; '</div></div></div>';
$('body').prepend(tags); $('body').prepend(tags);
$('#avw-auth-error').css({ $('#avw-auth-error').css({
'color': '#fff',
'opacity': 1, 'opacity': 1,
'position': 'fixed', 'position': 'fixed',
'top': '0', 'top': '0',
'left': '0', 'left': '0',
'width': $(window).width(), 'width': $(window).width(),
'height': $(window).height(), 'height': $(window).height(),
'background': '#ccc',
'zIndex': '10000' 'zIndex': '10000'
}); });
// resize error page // resize error page
...@@ -569,7 +567,7 @@ function avwGrabContentPageImage(accountPath, params, success, error) { ...@@ -569,7 +567,7 @@ function avwGrabContentPageImage(accountPath, params, success, error) {
apiUrl = apiUrl + '/' + apiName + '/'; apiUrl = apiUrl + '/' + apiName + '/';
// 送信パラメータの構築 // 送信パラメータの構築
var requestParams = 'contentId=' + params.contentId + '&sid=' + params.sid + '&pageNo=' + params.pageNo + '&pid=' + params.pid ; var requestParams = 'contentId=' + params.contentId + '&sid=' + params.sid + '&pageNo=' + params.pageNo + '&pid=' + params.pid;
//apiUrl += '?' + requestParams; //apiUrl += '?' + requestParams;
apiUrl += '?' + requestParams + '&isBase64=true'; apiUrl += '?' + requestParams + '&isBase64=true';
......
abvw-preview/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.20130823)User:", "txtLoginUser":"(Ver.20131004)User:",
"txtAll":"All", "txtAll":"All",
"txtMkgSize":"Size", "txtMkgSize":"Size",
"txtMkgS":"S", "txtMkgS":"S",
...@@ -147,5 +147,6 @@ ...@@ -147,5 +147,6 @@
"txtContentPWTitle":"Password Confirm", "txtContentPWTitle":"Password Confirm",
"txtContentPWMsg":"Please input password to view this content.", "txtContentPWMsg":"Please input password to view this content.",
"txtContentWarning":"Waring", "txtContentWarning":"Waring",
"txtMediaAutoPlayWarning":"Media will be played automatically.",
"txtPreventLink": "プレビューにはこの機能が利用できません" "txtPreventLink": "プレビューにはこの機能が利用できません"
} }
abvw-preview/common/json/lang/lang-ja.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト", "dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果", "txtSearchResult":"検索結果",
"dspHome":"ホーム", "dspHome":"ホーム",
"txtLoginUser":"(Ver.20130823)ログイン中：", "txtLoginUser":"(Ver.20131004)ログイン中：",
"txtAll":"すべて", "txtAll":"すべて",
"txtMkgSize":"太さ", "txtMkgSize":"太さ",
"txtMkgS":"小", "txtMkgS":"小",
...@@ -147,5 +147,6 @@ ...@@ -147,5 +147,6 @@
"txtContentPWTitle":"パスワードの確認", "txtContentPWTitle":"パスワードの確認",
"txtContentPWMsg":"閲覧するにはパスワードの入力が必要です。", "txtContentPWMsg":"閲覧するにはパスワードの入力が必要です。",
"txtContentWarning":"警告", "txtContentWarning":"警告",
"txtMediaAutoPlayWarning":"メディアは自動再生されます。",
"txtPreventLink": "プレビューにはこの機能が利用できません" "txtPreventLink": "プレビューにはこの機能が利用できません"
} }
abvw-preview/common/json/lang/lang-ko.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃", "dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과", "txtSearchResult":"검색 결과",
"dspHome":"홈", "dspHome":"홈",
"txtLoginUser":"(Ver.20130823)로그인 중:", "txtLoginUser":"(Ver.20131004)로그인 중:",
"txtAll":"전체", "txtAll":"전체",
"txtMkgSize":"두께", "txtMkgSize":"두께",
"txtMkgS":"소", "txtMkgS":"소",
...@@ -147,5 +147,6 @@ ...@@ -147,5 +147,6 @@
"txtContentPWTitle":"KO_パスワードの確認", "txtContentPWTitle":"KO_パスワードの確認",
"txtContentPWMsg":"KO_閲覧するにはパスワードの入力が必要です。", "txtContentPWMsg":"KO_閲覧するにはパスワードの入力が必要です。",
"txtContentWarning":"KO_警告", "txtContentWarning":"KO_警告",
"txtMediaAutoPlayWarning":"KO_メディアは自動再生されます。",
"txtPreventLink": "プレビューにはこの機能が利用できません" "txtPreventLink": "プレビューにはこの機能が利用できません"
} }
abvw-preview/css/layout/viewer.css
...@@ -1328,7 +1328,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -1328,7 +1328,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
position: absolute; position: absolute;
top: 100%; top: 100%;
width: 0; width: 0;
height: 0; height: 0;
} }
/* HOVER STYLES */ /* HOVER STYLES */
.pop-up-memo { .pop-up-memo {
...@@ -1665,20 +1665,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -1665,20 +1665,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
zoom:1; zoom:1;
} }
/*------------*/ /*------------*/
#viewer #wrapper header .hdRcolumn .closebtn {
height: 25px;
width: 25px;
display: block;
float: right;
margin-top: 18px;
margin-right: 18px;
}
a.closebtn {
}
a.closebtn:hover{
}
.markingToolbar_off_hover .markingToolbar_off_hover
{ {
...@@ -1697,3 +1684,28 @@ ul#divListBookmark li:hover{} ...@@ -1697,3 +1684,28 @@ ul#divListBookmark li:hover{}
#powerTip{ #powerTip{
z-index: 999 !important; z-index: 999 !important;
} }
span.error{
}
span.no-item{
}
.dialog-content-music{
}
.imagePreview-one{
}
.picker-choose-on{
}
.picker-choose-off{
}
abvw-preview/css/theme/viewer.css
...@@ -1066,12 +1066,18 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -1066,12 +1066,18 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
border-color:#ccd; border-color:#ccd;
font-family: Verdana; font-family: Verdana;
font-size: 10pt; font-size: 10pt;
border-radius: 10px; border-radius: 10px;
-moz-box-shadow:-3px 3px 3px #777;
-webkit-box-shadow:-3px 3px 3px #777;
box-shadow : -3px 3px 3px #777
} }
.popuptext_arrow { .popuptext_arrow {
border-style: solid; border-style: solid;
border-width: 12px 12px 12px 12px; border-width: 12px 12px 12px 12px;
border-color: transparent transparent transparent rgb(204, 204, 221) !important;
} }
/* HOVER STYLES */ /* HOVER STYLES */
.pop-up-memo { .pop-up-memo {
...@@ -1390,15 +1396,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -1390,15 +1396,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
} }
/*------------*/ /*------------*/
#viewer #wrapper header .hdRcolumn .closebtn {
}
a.closebtn {
background: url(../../img/viewer/closebtn_01.png) 0px 0px;
}
a.closebtn:hover{
background-position:0px -25px;
}
.markingToolbar_off_hover .markingToolbar_off_hover
{ {
background-position: -414px -92px; background-position: -414px -92px;
...@@ -1409,4 +1407,31 @@ a.closebtn:hover{ ...@@ -1409,4 +1407,31 @@ a.closebtn:hover{
} }
ul#divSearchResult li:hover{ background:#f4f4f4;cursor:pointer;} ul#divSearchResult li:hover{ background:#f4f4f4;cursor:pointer;}
ul#divListBookmark li:hover{background:#f4f4f4;cursor:pointer;} ul#divListBookmark li:hover{background:#f4f4f4;cursor:pointer;}
#divListIndex span:hover{color: red; cursor: pointer} #divListIndex span:hover{color: red; cursor: pointer}
\ No newline at end of file
span.error{
color: red;
}
span.no-item{
color:#333333;
font-size:12px;
cursor:default;
text-decoration:none;
}
.dialog-content-music{
background: url(../../img/iPad_music.png) center center no-repeat;
background-color: white;
}
.imagePreview-one{
background-color: black;
}
.picker-choose-on{
border:1px solid #e6e6e6 !important;
}
.picker-choose-off{
border:1px solid #d3d5d6 !important;
}
abvw-preview/js/contentview.js
...@@ -413,7 +413,7 @@ function handleAPIWebContentPage(dataJson, pos) { ...@@ -413,7 +413,7 @@ function handleAPIWebContentPage(dataJson, pos) {
' </li>' + ' </li>' +
' <li>' + ' <li>' +
' <span class="mdltext">' + ' <span class="mdltext">' +
' <span style="color:red">' + i18nText('msgShioriDeleted') + '</span>' + ' <span class="error">' + i18nText('msgShioriDeleted') + '</span>' +
' </span>' + ' </span>' +
' </li>' ' </li>'
); );
...@@ -484,7 +484,7 @@ function handleAPIWebContentPage(dataJson, pos) { ...@@ -484,7 +484,7 @@ function handleAPIWebContentPage(dataJson, pos) {
' </li>' + ' </li>' +
' <li>' + ' <li>' +
' <span class="mdltext">' + ' <span class="mdltext">' +
' <span style="color:red">' + i18nText('msgShioriDeleted') + '</span>' + ' <span class="error">' + i18nText('msgShioriDeleted') + '</span>' +
' </span>' + ' </span>' +
' </li>' ' </li>'
); );
...@@ -2286,8 +2286,11 @@ function handleForContentTypeMusic(resourceUrl){ ...@@ -2286,8 +2286,11 @@ function handleForContentTypeMusic(resourceUrl){
var $container = $('#dialog'); var $container = $('#dialog');
$container.html(''); $container.html('');
//$container.css('position', 'absolute'); //$container.css('position', 'absolute');
$container.css('background', 'url(./img/iPad_music.png) center center no-repeat'); //START FIX CSS
$container.css('background-color', 'white'); //$container.css('background', 'url(./img/iPad_music.png) center center no-repeat');
//$container.css('background-color', 'white');
$container.addClass('dialog-content-music');
//END FIX CSS
//$container.css('background-attachment', 'fixed'); //$container.css('background-attachment', 'fixed');
if (ClientData.userOpt_musicMode() == "1") { if (ClientData.userOpt_musicMode() == "1") {
......
abvw-preview/js/contentview_ImagePreview.js
...@@ -15,18 +15,18 @@ var slideshowSelectLastIndex = 4; ...@@ -15,18 +15,18 @@ var slideshowSelectLastIndex = 4;
var slideshowMainCurrIndex = 0; var slideshowMainCurrIndex = 0;
/*==========================================*/ /*==========================================*/
function refreshSlideShowValue(){ function refreshSlideShowValue(){
slideshowImgFrom = 0; slideshowImgFrom = 0;
slideshowImgTo = 4; slideshowImgTo = 4;
slideshowImageCollection = []; slideshowImageCollection = [];
slideshowClickFlg = false; slideshowClickFlg = false;
slideshowInitFlg = true; slideshowInitFlg = true;
slideshowSelectedIndex = 0; slideshowSelectedIndex = 0;
//0: next - 1: prev //0: next - 1: prev
slideshowControlToggleFlg = 0; slideshowControlToggleFlg = 0;
totalRecord; totalRecord;
slideshowSelectFirstIndex = 0; slideshowSelectFirstIndex = 0;
slideshowSelectLastIndex = 4; slideshowSelectLastIndex = 4;
slideshowMainCurrIndex = 0; slideshowMainCurrIndex = 0;
}; };
...@@ -41,16 +41,19 @@ function showImagePreview(targetId, imgList) { ...@@ -41,16 +41,19 @@ function showImagePreview(targetId, imgList) {
if (slideshowImageCollection.length == 1) { if (slideshowImageCollection.length == 1) {
targetId.html(''); targetId.html('');
targetId.append('<div id="slideWrapper">' targetId.append('<div id="slideWrapper">'
+ '</div>'); + '</div>');
var mainImg = $('#slideWrapper'); var mainImg = $('#slideWrapper');
//START FIXCSS
var cssObj = { 'background-image': 'url(' + slideshowImageCollection[0].thumbnail + ')', var cssObj = { 'background-image': 'url(' + slideshowImageCollection[0].thumbnail + ')',
'background-repeat': 'no-repeat', 'background-repeat': 'no-repeat',
'background-size': 'contain', 'background-size': 'contain',
'background-position': 'center', 'background-position': 'center'
'background-color': 'black'
}; };
mainImg.addClass('imagePreview-one');
//END FIXCSS
mainImg.css(cssObj); mainImg.css(cssObj);
...@@ -74,41 +77,41 @@ function showImagePreview(targetId, imgList) { ...@@ -74,41 +77,41 @@ function showImagePreview(targetId, imgList) {
//Set image source for slide show //Set image source for slide show
function setImageSource(source){ function setImageSource(source){
var oldSource = source; var oldSource = source;
var newSource = []; var newSource = [];
for(var nIndex = 0; nIndex < oldSource.length; nIndex++){ for(var nIndex = 0; nIndex < oldSource.length; nIndex++){
newSource.push({index : nIndex, image : oldSource[nIndex], thumbnail : oldSource[nIndex]}); newSource.push({index : nIndex, image : oldSource[nIndex], thumbnail : oldSource[nIndex]});
} }
return newSource; return newSource;
}; };
//render background to show image preview //render background to show image preview
function renderSlideShowBackground(targetId){ function renderSlideShowBackground(targetId){
var targetDiv = targetId; var targetDiv = targetId;
targetDiv.html(''); targetDiv.html('');
targetDiv.append('<div id="slideWrapper">' targetDiv.append('<div id="slideWrapper">'
+' <div class="gallery-image" id="gallery-image">' +' <div class="gallery-image" id="gallery-image">'
+' <div class="main-control" id="main-control-prev"> </div>' +' <div class="main-control" id="main-control-prev"> </div>'
+' <div id="main-img" id="mainThumbnail"><div class="mainThumbnail"></div></div>' +' <div id="main-img" id="mainThumbnail"><div class="mainThumbnail"></div></div>'
+' <div class="main-control" id="main-control-next"> </div>' +' <div class="main-control" id="main-control-next"> </div>'
+' </div>' +' </div>'
+' <div class="gallery-thumb">' +' <div class="gallery-thumb">'
+' <div id="control-prev" class="slideshow-control"><img src="././img/arrow-left.gif"></div>' +' <div id="control-prev" class="slideshow-control"><img src="././img/arrow-left.gif"></div>'
+' <div id="selector-img">' +' <div id="selector-img">'
+' </div>' +' </div>'
+' <div id="control-next" class="slideshow-control"><img src="././img/arrow-right.gif"></div>' +' <div id="control-next" class="slideshow-control"><img src="././img/arrow-right.gif"></div>'
+' </div>' +' </div>'
+'</div>' +'</div>'
); );
$(window).resize(function () { $(window).resize(function () {
optimizeSizeImagePreview(); optimizeSizeImagePreview();
}); });
//handleImagePreviewEvent(); //handleImagePreviewEvent();
}; };
function optimizeSizeImagePreview() { function optimizeSizeImagePreview() {
var maxW = "798"; var maxW = "798";
...@@ -137,101 +140,101 @@ function optimizeSizeImagePreview() { ...@@ -137,101 +140,101 @@ function optimizeSizeImagePreview() {
//render select image //render select image
function renderSelectImage(){ function renderSelectImage(){
var selectImg = $('#selector-img'); var selectImg = $('#selector-img');
$.each(slideshowImageCollection, function(i, image){ $.each(slideshowImageCollection, function(i, image){
if(slideshowImgFrom <= i && i <= slideshowImgTo){ if(slideshowImgFrom <= i && i <= slideshowImgTo){
selectImg.append('<div class="thumbnail" imageId="'+ image.index +'" style="display:block; background-image : url('+image.thumbnail+')"></div>'); selectImg.append('<div class="thumbnail" imageId="'+ image.index +'" style="display:block; background-image : url('+image.thumbnail+')"></div>');
} }
else{ else{
selectImg.append('<div class="thumbnail" imageId="'+ image.index +'" style="display:none; background-image : url('+image.thumbnail+')"></div>'); selectImg.append('<div class="thumbnail" imageId="'+ image.index +'" style="display:none; background-image : url('+image.thumbnail+')"></div>');
} }
}); });
}; };
//Handle Image Preview Event //Handle Image Preview Event
function handleImagePreviewEvent(){ function handleImagePreviewEvent(){
$('#control-next').click(imageSelectNextFunction); $('#control-next').click(imageSelectNextFunction);
$('#control-prev').click(imageSelectPrevFunction); $('#control-prev').click(imageSelectPrevFunction);
$('#main-control-next').click(imageMainSelectNextFunction); $('#main-control-next').click(imageMainSelectNextFunction);
$('#main-control-prev').click(imageMainSelectPrevFunction); $('#main-control-prev').click(imageMainSelectPrevFunction);
$('.thumbnail').click(selectImgClickFunction); $('.thumbnail').click(selectImgClickFunction);
$('.thumbnail').mouseenter(selectImgMouseEnterFunction); $('.thumbnail').mouseenter(selectImgMouseEnterFunction);
$('.thumbnail').mouseleave(selectImgMouseLeaveFunction); $('.thumbnail').mouseleave(selectImgMouseLeaveFunction);
$('.main-control').css('opacity','0'); $('.main-control').css('opacity','0');
$('#main-control-next').mouseleave(mainControlNextMouseLeaveFunction); $('#main-control-next').mouseleave(mainControlNextMouseLeaveFunction);
$('#main-control-prev').mouseleave(mainControlPrevMouseLeaveFunction); $('#main-control-prev').mouseleave(mainControlPrevMouseLeaveFunction);
if (isTouchDevice() == false) { if (isTouchDevice() == false) {
//$('.main-control').mouseenter(mainControlMouseEnterFunction); //$('.main-control').mouseenter(mainControlMouseEnterFunction);
$('#main-control-next').mouseenter(mainControlNextMouseEnterFunction); $('#main-control-next').mouseenter(mainControlNextMouseEnterFunction);
$('#main-control-prev').mouseenter(mainControlPrevMouseEnterFunction); $('#main-control-prev').mouseenter(mainControlPrevMouseEnterFunction);
} }
//$('.main-control').mouseleave(mainControlMouseLeaveFunction); //$('.main-control').mouseleave(mainControlMouseLeaveFunction);
//$('.thumbnail:first').css('box-shadow','0px 7px 7px #555'); //$('.thumbnail:first').css('box-shadow','0px 7px 7px #555');
$('.thumbnail:first').addClass('activeThumb'); $('.thumbnail:first').addClass('activeThumb');
handleDispNextPrevButton(); handleDispNextPrevButton();
}; };
function mainControlNextMouseEnterFunction(){ function mainControlNextMouseEnterFunction(){
$(this).css('opacity','0.5'); $(this).css('opacity','0.5');
}; };
function mainControlNextMouseLeaveFunction(){ function mainControlNextMouseLeaveFunction(){
$(this).css('opacity','0'); $(this).css('opacity','0');
}; };
function mainControlPrevMouseEnterFunction(){ function mainControlPrevMouseEnterFunction(){
$(this).css('opacity','0.5'); $(this).css('opacity','0.5');
}; };
function mainControlPrevMouseLeaveFunction(){ function mainControlPrevMouseLeaveFunction(){
$(this).css('opacity','0'); $(this).css('opacity','0');
}; };
//Image Preview next icon function //Image Preview next icon function
function imageSelectNextFunction(){ function imageSelectNextFunction(){
if(slideshowSelectLastIndex < slideshowImageCollection.length - 1){ if(slideshowSelectLastIndex < slideshowImageCollection.length - 1){
$('#selector-img div:eq('+slideshowSelectFirstIndex+')').animate({width: 'hide'}, $('#selector-img div:eq('+slideshowSelectFirstIndex+')').animate({width: 'hide'},
{step: function(now, fx){ {step: function(now, fx){
$('#selector-img div:eq('+slideshowSelectLastIndex+')').animate({width: 'show'}); $('#selector-img div:eq('+slideshowSelectLastIndex+')').animate({width: 'show'});
} }
} }
); );
slideshowSelectFirstIndex = slideshowSelectFirstIndex + 1; slideshowSelectFirstIndex = slideshowSelectFirstIndex + 1;
slideshowSelectLastIndex = slideshowSelectLastIndex + 1; slideshowSelectLastIndex = slideshowSelectLastIndex + 1;
handleDispNextPrevButton(); handleDispNextPrevButton();
} }
}; };
//Image preview prev icon function //Image preview prev icon function
function imageSelectPrevFunction(){ function imageSelectPrevFunction(){
var fixedIndex = slideshowSelectFirstIndex - 1; var fixedIndex = slideshowSelectFirstIndex - 1;
if(slideshowSelectFirstIndex > 0){ if(slideshowSelectFirstIndex > 0){
$('#selector-img div:eq('+fixedIndex+')').animate({width: 'show'}); $('#selector-img div:eq('+fixedIndex+')').animate({width: 'show'});
$('#selector-img div:eq('+slideshowSelectLastIndex+')').animate({width:'hide'}); $('#selector-img div:eq('+slideshowSelectLastIndex+')').animate({width:'hide'});
slideshowSelectFirstIndex = slideshowSelectFirstIndex - 1; slideshowSelectFirstIndex = slideshowSelectFirstIndex - 1;
slideshowSelectLastIndex = slideshowSelectLastIndex - 1; slideshowSelectLastIndex = slideshowSelectLastIndex - 1;
handleDispNextPrevButton(); handleDispNextPrevButton();
} }
}; };
var slideshow_isTransaction = false; var slideshow_isTransaction = false;
...@@ -250,23 +253,23 @@ function imageMainSelectNextFunction() { ...@@ -250,23 +253,23 @@ function imageMainSelectNextFunction() {
if (slideshowMainCurrIndex < slideshowImageCollection.length - 1) { if (slideshowMainCurrIndex < slideshowImageCollection.length - 1) {
$('#main-img div').animate( $('#main-img div').animate(
{ "left": "-=100%" }, { "left": "-=100%" },
{ {
/*duration: "slow",*/ /*duration: "slow",*/
complete: function () { complete: function () {
$('#main-img div').hide(); $('#main-img div').hide();
renderMainImage(fixedIndex); renderMainImage(fixedIndex);
$('#main-img div').css('left', '+=300%'); $('#main-img div').css('left', '+=300%');
$('#main-img div').show(); $('#main-img div').show();
$('<img/>').attr('src', slideshowImageCollection[fixedIndex].thumbnail).load(function () { $('<img/>').attr('src', slideshowImageCollection[fixedIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' }); $('#main-img div').animate({ left: '0%' });
}); });
slideshowMainCurrIndex = eval(slideshowMainCurrIndex) + 1; slideshowMainCurrIndex = eval(slideshowMainCurrIndex) + 1;
syncImageMainWithSelectImage(); syncImageMainWithSelectImage();
handleDispNextPrevButton(); handleDispNextPrevButton();
} }
} }
); );
} }
} }
}; };
...@@ -283,23 +286,23 @@ function imageMainSelectPrevFunction() { ...@@ -283,23 +286,23 @@ function imageMainSelectPrevFunction() {
if (slideshowMainCurrIndex > 0) { if (slideshowMainCurrIndex > 0) {
$('#main-img div').animate( $('#main-img div').animate(
{ "left": "+=100%" }, { "left": "+=100%" },
{ {
duration: "medium", duration: "medium",
complete: function () { complete: function () {
$('#main-img div').hide(); $('#main-img div').hide();
renderMainImage(fixedIndex); renderMainImage(fixedIndex);
$('#main-img div').css('left', '-=300%'); $('#main-img div').css('left', '-=300%');
$('#main-img div').show(); $('#main-img div').show();
$('<img/>').attr('src', slideshowImageCollection[fixedIndex].thumbnail).load(function () { $('<img/>').attr('src', slideshowImageCollection[fixedIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' }); $('#main-img div').animate({ left: '0%' });
}); });
slideshowMainCurrIndex = eval(slideshowMainCurrIndex) - 1; slideshowMainCurrIndex = eval(slideshowMainCurrIndex) - 1;
syncImageMainWithSelectImage(); syncImageMainWithSelectImage();
handleDispNextPrevButton(); handleDispNextPrevButton();
} }
} }
); );
} }
} }
...@@ -313,42 +316,42 @@ function selectImgClickFunction() { ...@@ -313,42 +316,42 @@ function selectImgClickFunction() {
if (imgIndex > slideshowMainCurrIndex) { if (imgIndex > slideshowMainCurrIndex) {
$('#main-img div').animate( $('#main-img div').animate(
{ "left": "-=100%" }, { "left": "-=100%" },
{ {
duration: "medium", duration: "medium",
complete: function () { complete: function () {
$('#main-img div').css('display', 'none'); $('#main-img div').css('display', 'none');
renderMainImage(imgIndex); renderMainImage(imgIndex);
$('#main-img div').css('left', '+=300%'); $('#main-img div').css('left', '+=300%');
$('#main-img div').css('display', 'block'); $('#main-img div').css('display', 'block');
$('<img/>').attr('src', slideshowImageCollection[imgIndex].thumbnail).load(function () { $('<img/>').attr('src', slideshowImageCollection[imgIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' }); $('#main-img div').animate({ left: '0%' });
}); });
slideshowMainCurrIndex = imgIndex; slideshowMainCurrIndex = imgIndex;
handleDispNextPrevButton(); handleDispNextPrevButton();
} }
} }
); );
} }
else if (imgIndex < slideshowMainCurrIndex) { else if (imgIndex < slideshowMainCurrIndex) {
$('#main-img div').animate( $('#main-img div').animate(
{ "left": "+=100%" }, { "left": "+=100%" },
{ {
duration: "medium", duration: "medium",
complete: function () { complete: function () {
$('#main-img div').css('display', 'none'); $('#main-img div').css('display', 'none');
renderMainImage(imgIndex); renderMainImage(imgIndex);
$('#main-img div').css('left', '-=300%'); $('#main-img div').css('left', '-=300%');
$('#main-img div').css('display', 'block'); $('#main-img div').css('display', 'block');
$('<img/>').attr('src', slideshowImageCollection[imgIndex].thumbnail).load(function () { $('<img/>').attr('src', slideshowImageCollection[imgIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' }); $('#main-img div').animate({ left: '0%' });
}); });
slideshowMainCurrIndex = imgIndex; slideshowMainCurrIndex = imgIndex;
handleDispNextPrevButton(); handleDispNextPrevButton();
} }
} }
); );
} }
else { else {
slideshow_isTransaction = false; slideshow_isTransaction = false;
...@@ -367,94 +370,94 @@ function selectImgClickFunction() { ...@@ -367,94 +370,94 @@ function selectImgClickFunction() {
//Render Main Image //Render Main Image
function renderMainImage(i) { function renderMainImage(i) {
var mainImg = $('#main-img div'); var mainImg = $('#main-img div');
mainImg.css('background-image', 'url(' + slideshowImageCollection[i].thumbnail + ')'); mainImg.css('background-image', 'url(' + slideshowImageCollection[i].thumbnail + ')');
slideshow_isTransaction = false; slideshow_isTransaction = false;
if (isTouchDevice() == true) { if (isTouchDevice() == true) {
$('#main-control-next').css('opacity', '0'); $('#main-control-next').css('opacity', '0');
$('#main-control-prev').css('opacity', '0'); $('#main-control-prev').css('opacity', '0');
} }
}; };
function selectImgMouseLeaveFunction(){ function selectImgMouseLeaveFunction(){
if(!slideshowClickFlg){ if(!slideshowClickFlg){
//$('this').css('box-shadow',''); //$('this').css('box-shadow','');
$('this').removeClass('activeThumb'); $('this').removeClass('activeThumb');
slideshowClickFlg = false; slideshowClickFlg = false;
} }
else{ else{
//slideshowClickFlg = false; //slideshowClickFlg = false;
} }
}; };
function selectImgMouseEnterFunction(){ function selectImgMouseEnterFunction(){
//$('.thumbnail').css('box-shadow',''); //$('.thumbnail').css('box-shadow','');
$('.thumbnail').removeClass('activeThumb'); $('.thumbnail').removeClass('activeThumb');
//$(this).css('box-shadow','0px 7px 7px #555'); //$(this).css('box-shadow','0px 7px 7px #555');
$(this).addClass('activeThumb'); $(this).addClass('activeThumb');
}; };
//Main control mouse leave function //Main control mouse leave function
function mainControlMouseLeaveFunction(){ function mainControlMouseLeaveFunction(){
$('.main-control').css('opacity','0'); $('.main-control').css('opacity','0');
}; };
//Main control mouse enter function //Main control mouse enter function
function mainControlMouseEnterFunction(){ function mainControlMouseEnterFunction(){
$('.main-control').css('opacity','0.5'); $('.main-control').css('opacity','0.5');
}; };
//Sync Main Image with select Image //Sync Main Image with select Image
function syncImageMainWithSelectImage(){ function syncImageMainWithSelectImage(){
var thumbImg = $('.thumbnail[imageId="'+ slideshowMainCurrIndex +'"]'); var thumbImg = $('.thumbnail[imageId="'+ slideshowMainCurrIndex +'"]');
if(thumbImg.is(':hidden')){ if(thumbImg.is(':hidden')){
if(slideshowMainCurrIndex > slideshowSelectLastIndex){ if(slideshowMainCurrIndex > slideshowSelectLastIndex){
imageSelectNextFunction(); imageSelectNextFunction();
} }
else if(slideshowMainCurrIndex < slideshowSelectFirstIndex){ else if(slideshowMainCurrIndex < slideshowSelectFirstIndex){
imageSelectPrevFunction(); imageSelectPrevFunction();
} }
} }
//$('.thumbnail').css('box-shadow',''); //$('.thumbnail').css('box-shadow','');
$('.thumbnail').removeClass('activeThumb'); $('.thumbnail').removeClass('activeThumb');
//thumbImg.css('box-shadow','0px 7px 7px #555'); //thumbImg.css('box-shadow','0px 7px 7px #555');
thumbImg.addClass('activeThumb'); thumbImg.addClass('activeThumb');
}; };
//Handle display button control //Handle display button control
function handleDispNextPrevButton(){ function handleDispNextPrevButton(){
if(slideshowSelectFirstIndex > 0){ if(slideshowSelectFirstIndex > 0){
$('#control-prev').css('visibility','visible'); $('#control-prev').css('visibility','visible');
} }
else{ else{
$('#control-prev').css('visibility','hidden'); $('#control-prev').css('visibility','hidden');
} }
if(slideshowSelectLastIndex < (eval(slideshowImageCollection.length) - 1)){ if(slideshowSelectLastIndex < (eval(slideshowImageCollection.length) - 1)){
$('#control-next').css('visibility','visible'); $('#control-next').css('visibility','visible');
} }
else{ else{
$('#control-next').css('visibility','hidden'); $('#control-next').css('visibility','hidden');
} }
if(slideshowMainCurrIndex > 0){ if(slideshowMainCurrIndex > 0){
$('#main-control-prev').css('visibility','visible'); $('#main-control-prev').css('visibility','visible');
} }
else{ else{
$('#main-control-prev').css('visibility','hidden'); $('#main-control-prev').css('visibility','hidden');
} }
if(slideshowMainCurrIndex < (eval(slideshowImageCollection.length) - 1)){ if(slideshowMainCurrIndex < (eval(slideshowImageCollection.length) - 1)){
$('#main-control-next').css('visibility','visible'); $('#main-control-next').css('visibility','visible');
} }
else{ else{
$('#main-control-next').css('visibility','hidden'); $('#main-control-next').css('visibility','hidden');
} }
}; };
abvw/common/js/avweb.js
...@@ -351,15 +351,13 @@ function avwCheckLogin(option) { ...@@ -351,15 +351,13 @@ function avwCheckLogin(option) {
'<div><button id="avw-unauth-ok">OK</button></div>' + '<div><button id="avw-unauth-ok">OK</button></div>' +
'</div></div></div>'; '</div></div></div>';
$('body').prepend(tags); $('body').prepend(tags);
$('#avw-auth-error').css({ $('#avw-auth-error').css({
'color': '#fff',
'opacity': 1, 'opacity': 1,
'position': 'fixed', 'position': 'fixed',
'top': '0', 'top': '0',
'left': '0', 'left': '0',
'width': $(window).width(), 'width': $(window).width(),
'height': $(window).height(), 'height': $(window).height(),
'background': '#ccc',
'zIndex': '10000' 'zIndex': '10000'
}); });
// resize error page // resize error page
......
abvw/common/js/slideshow.js deleted 100644 → 0
/// <reference path="common.js" />
/*====Variable====*/
var slideshowImgFrom = 0;
var slideshowImgTo = 4;
var slideshowImageCollection = [];
var slideshowClickFlg = false;
var slideshowInitFlg = true;
var slideshowSelectedIndex = 0;
//0: next - 1: prev
var slideshowControlToggleFlg = 0;
var totalRecord;
var slideshowSelectFirstIndex = 0;
var slideshowSelectLastIndex = 4;
var slideshowMainCurrIndex = 0;
/*==========================================*/
function refreshSlideShowValue(){
slideshowImgFrom = 0;
slideshowImgTo = 4;
slideshowImageCollection = [];
slideshowClickFlg = false;
slideshowInitFlg = true;
slideshowSelectedIndex = 0;
//0: next - 1: prev
slideshowControlToggleFlg = 0;
totalRecord;
slideshowSelectFirstIndex = 0;
slideshowSelectLastIndex = 4;
slideshowMainCurrIndex = 0;
};
//Show Image Preview
function showImagePreview(targetId, imgList) {
refreshSlideShowValue();
//Check if imageList is not null
if (imgList != null && imgList != 'undefined' && imgList.length > 0) {
slideshowImageCollection = setImageSource(imgList);
//Check if targetId is not null
if (targetId != null && targetId != 'undefined') {
if (slideshowImageCollection.length == 1) {
targetId.html('');
targetId.append('<div id="slideWrapper">'
+ '</div>');
var mainImg = $('#slideWrapper');
var cssObj = { 'background-image': 'url(' + slideshowImageCollection[0].thumbnail + ')',
'background-repeat': 'no-repeat',
'background-size': 'contain',
'background-position': 'center',
'background-color': 'black'
};
mainImg.css(cssObj);
mainImg.parent().css('padding-top', '0px');
} else {
renderSlideShowBackground(targetId);
renderSelectImage();
renderMainImage(0);
handleImagePreviewEvent();
}
}
}
else {
renderSlideShowBackground(targetId);
$('.main-control').css('visibility', 'hidden');
$('.slideshow-control').css('visibility', 'hidden');
}
optimizeSizeImagePreview();
};
//Set image source for slide show
function setImageSource(source){
var oldSource = source;
var newSource = [];
for(var nIndex = 0; nIndex < oldSource.length; nIndex++){
newSource.push({index : nIndex, image : oldSource[nIndex], thumbnail : oldSource[nIndex]});
}
return newSource;
};
//render background to show image preview
function renderSlideShowBackground(targetId){
var targetDiv = targetId;
targetDiv.html('');
targetDiv.append('<div id="slideWrapper">'
+' <div class="gallery-image" id="gallery-image">'
+' <div class="main-control" id="main-control-prev"> </div>'
+' <div id="main-img" id="mainThumbnail"><div class="mainThumbnail"></div></div>'
+' <div class="main-control" id="main-control-next"> </div>'
+' </div>'
+' <div class="gallery-thumb">'
+' <div id="control-prev" class="slideshow-control"><img src="././img/arrow-left.gif"></div>'
+' <div id="selector-img">'
+' </div>'
+' <div id="control-next" class="slideshow-control"><img src="././img/arrow-right.gif"></div>'
+' </div>'
+'</div>'
);
$(window).resize(function () {
optimizeSizeImagePreview();
});
//handleImagePreviewEvent();
};
function optimizeSizeImagePreview() {
var maxW = "798";
var ratio = 1.566;
var maxH = maxW / ratio;
if ($("#dialog").width() < maxW || $("#dialog").height() < maxH) {
if ($("#dialog").width() < maxW) {
$("#dialog").css('width', maxW + 'px');
$("#dialog").css('height', maxH + 'px');
}
if ($("#dialog").height() < maxH) {
$("#dialog").css('height', maxH + 'px');
$("#dialog").css('width', maxW + 'px');
}
}
else {
$("#dialog").css('width', maxW + 'px');
$("#dialog").css('height', maxH + 'px');
}
$("#dialog").center();
};
//render select image
function renderSelectImage(){
var selectImg = $('#selector-img');
$.each(slideshowImageCollection, function(i, image){
if(slideshowImgFrom <= i && i <= slideshowImgTo){
selectImg.append('<div class="thumbnail" imageId="'+ image.index +'" style="display:block; background-image : url('+image.thumbnail+')"></div>');
}
else{
selectImg.append('<div class="thumbnail" imageId="'+ image.index +'" style="display:none; background-image : url('+image.thumbnail+')"></div>');
}
});
};
//Handle Image Preview Event
function handleImagePreviewEvent(){
$('#control-next').click(imageSelectNextFunction);
$('#control-prev').click(imageSelectPrevFunction);
$('#main-control-next').click(imageMainSelectNextFunction);
$('#main-control-prev').click(imageMainSelectPrevFunction);
$('.thumbnail').click(selectImgClickFunction);
$('.thumbnail').mouseenter(selectImgMouseEnterFunction);
$('.thumbnail').mouseleave(selectImgMouseLeaveFunction);
$('.main-control').css('opacity','0');
$('#main-control-next').mouseleave(mainControlNextMouseLeaveFunction);
$('#main-control-prev').mouseleave(mainControlPrevMouseLeaveFunction);
if (isTouchDevice() == false) {
//$('.main-control').mouseenter(mainControlMouseEnterFunction);
$('#main-control-next').mouseenter(mainControlNextMouseEnterFunction);
$('#main-control-prev').mouseenter(mainControlPrevMouseEnterFunction);
}
//$('.main-control').mouseleave(mainControlMouseLeaveFunction);
$('.thumbnail:first').css('box-shadow','0px 7px 7px #555');
handleDispNextPrevButton();
};
function mainControlNextMouseEnterFunction(){
$(this).css('opacity','0.5');
};
function mainControlNextMouseLeaveFunction(){
$(this).css('opacity','0');
};
function mainControlPrevMouseEnterFunction(){
$(this).css('opacity','0.5');
};
function mainControlPrevMouseLeaveFunction(){
$(this).css('opacity','0');
};
//Image Preview next icon function
function imageSelectNextFunction(){
if(slideshowSelectLastIndex < slideshowImageCollection.length - 1){
$('#selector-img div:eq('+slideshowSelectFirstIndex+')').animate({width: 'hide'},
{step: function(now, fx){
$('#selector-img div:eq('+slideshowSelectLastIndex+')').animate({width: 'show'});
}
}
);
slideshowSelectFirstIndex = slideshowSelectFirstIndex + 1;
slideshowSelectLastIndex = slideshowSelectLastIndex + 1;
handleDispNextPrevButton();
}
};
//Image preview prev icon function
function imageSelectPrevFunction(){
var fixedIndex = slideshowSelectFirstIndex - 1;
if(slideshowSelectFirstIndex > 0){
$('#selector-img div:eq('+fixedIndex+')').animate({width: 'show'});
$('#selector-img div:eq('+slideshowSelectLastIndex+')').animate({width:'hide'});
slideshowSelectFirstIndex = slideshowSelectFirstIndex - 1;
slideshowSelectLastIndex = slideshowSelectLastIndex - 1;
handleDispNextPrevButton();
}
};
var slideshow_isTransaction = false;
//Main Image next icon function
function imageMainSelectNextFunction() {
if (isTouchDevice() == true) {
$('#main-control-next').css('opacity', '0.5');
}
if (slideshow_isTransaction == false) {
slideshow_isTransaction = true;
var fixedIndex = eval(slideshowMainCurrIndex) + 1;
if (slideshowMainCurrIndex < slideshowImageCollection.length - 1) {
$('#main-img div').animate(
{ "left": "-=100%" },
{
/*duration: "slow",*/
complete: function () {
$('#main-img div').hide();
renderMainImage(fixedIndex);
$('#main-img div').css('left', '+=300%');
$('#main-img div').show();
$('<img/>').attr('src', slideshowImageCollection[fixedIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' });
});
slideshowMainCurrIndex = eval(slideshowMainCurrIndex) + 1;
syncImageMainWithSelectImage();
handleDispNextPrevButton();
}
}
);
}
}
};
//Main Image prev icon function
function imageMainSelectPrevFunction() {
if (isTouchDevice() == true) {
$('#main-control-prev').css('opacity', '0.5');
}
if (slideshow_isTransaction == false) {
slideshow_isTransaction = true;
var fixedIndex = eval(slideshowMainCurrIndex) - 1;
if (slideshowMainCurrIndex > 0) {
$('#main-img div').animate(
{ "left": "+=100%" },
{
duration: "medium",
complete: function () {
$('#main-img div').hide();
renderMainImage(fixedIndex);
$('#main-img div').css('left', '-=300%');
$('#main-img div').show();
$('<img/>').attr('src', slideshowImageCollection[fixedIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' });
});
slideshowMainCurrIndex = eval(slideshowMainCurrIndex) - 1;
syncImageMainWithSelectImage();
handleDispNextPrevButton();
}
}
);
}
}
};
//Selector Image click function
function selectImgClickFunction() {
if (slideshow_isTransaction == false) {
slideshow_isTransaction = true;
var imgIndex = $(this).attr('imageId');
if (imgIndex > slideshowMainCurrIndex) {
$('#main-img div').animate(
{ "left": "-=100%" },
{
duration: "medium",
complete: function () {
$('#main-img div').css('display', 'none');
renderMainImage(imgIndex);
$('#main-img div').css('left', '+=300%');
$('#main-img div').css('display', 'block');
$('<img/>').attr('src', slideshowImageCollection[imgIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' });
});
slideshowMainCurrIndex = imgIndex;
handleDispNextPrevButton();
}
}
);
}
else if (imgIndex < slideshowMainCurrIndex) {
$('#main-img div').animate(
{ "left": "+=100%" },
{
duration: "medium",
complete: function () {
$('#main-img div').css('display', 'none');
renderMainImage(imgIndex);
$('#main-img div').css('left', '-=300%');
$('#main-img div').css('display', 'block');
$('<img/>').attr('src', slideshowImageCollection[imgIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' });
});
slideshowMainCurrIndex = imgIndex;
handleDispNextPrevButton();
}
}
);
}
else {
slideshow_isTransaction = false;
slideshowMainCurrIndex = imgIndex;
handleDispNextPrevButton();
}
$('.thumbnail').css('box-shadow', '');
$(this).css('box-shadow', '0px 7px 7px #555');
slideshowClickFlg = true;
}
};
//Render Main Image
function renderMainImage(i) {
var mainImg = $('#main-img div');
mainImg.css('background-image', 'url(' + slideshowImageCollection[i].thumbnail + ')');
slideshow_isTransaction = false;
if (isTouchDevice() == true) {
$('#main-control-next').css('opacity', '0');
$('#main-control-prev').css('opacity', '0');
}
};
function selectImgMouseLeaveFunction(){
if(!slideshowClickFlg){
$('this').css('box-shadow','');
slideshowClickFlg = false;
}
else{
//slideshowClickFlg = false;
}
};
function selectImgMouseEnterFunction(){
$('.thumbnail').css('box-shadow','');
$(this).css('box-shadow','0px 7px 7px #555');
};
//Main control mouse leave function
function mainControlMouseLeaveFunction(){
$('.main-control').css('opacity','0');
};
//Main control mouse enter function
function mainControlMouseEnterFunction(){
$('.main-control').css('opacity','0.5');
};
//Sync Main Image with select Image
function syncImageMainWithSelectImage(){
var thumbImg = $('.thumbnail[imageId="'+ slideshowMainCurrIndex +'"]');
if(thumbImg.is(':hidden')){
if(slideshowMainCurrIndex > slideshowSelectLastIndex){
imageSelectNextFunction();
}
else if(slideshowMainCurrIndex < slideshowSelectFirstIndex){
imageSelectPrevFunction();
}
}
$('.thumbnail').css('box-shadow','');
thumbImg.css('box-shadow','0px 7px 7px #555');
};
//Handle display button control
function handleDispNextPrevButton(){
if(slideshowSelectFirstIndex > 0){
$('#control-prev').css('visibility','visible');
}
else{
$('#control-prev').css('visibility','hidden');
}
if(slideshowSelectLastIndex < (eval(slideshowImageCollection.length) - 1)){
$('#control-next').css('visibility','visible');
}
else{
$('#control-next').css('visibility','hidden');
}
if(slideshowMainCurrIndex > 0){
$('#main-control-prev').css('visibility','visible');
}
else{
$('#main-control-prev').css('visibility','hidden');
}
if(slideshowMainCurrIndex < (eval(slideshowImageCollection.length) - 1)){
$('#main-control-next').css('visibility','visible');
}
else{
$('#main-control-next').css('visibility','hidden');
}
};
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.20131003)User:", "txtLoginUser":"(Ver.20131004)User:",
"txtAll":"All", "txtAll":"All",
"txtMkgSize":"Size", "txtMkgSize":"Size",
"txtMkgS":"S", "txtMkgS":"S",
...@@ -146,6 +146,7 @@ ...@@ -146,6 +146,7 @@
"txtNoTransparent":"Opacity", "txtNoTransparent":"Opacity",
"txtContentPWTitle":"Password Confirm", "txtContentPWTitle":"Password Confirm",
"txtContentPWMsg":"Please input password to view this content.", "txtContentPWMsg":"Please input password to view this content.",
"txtContentWarning":"Warning", "txtContentWarning":"Waring",
"txtMediaAutoPlayWarning":"Media will be played automatically." "txtMediaAutoPlayWarning":"Media will be played automatically.",
"txtPreventLink": "プレビューにはこの機能が利用できません"
} }
abvw/common/json/lang/lang-ja.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト", "dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果", "txtSearchResult":"検索結果",
"dspHome":"ホーム", "dspHome":"ホーム",
"txtLoginUser":"(Ver.20131003)ログイン中：", "txtLoginUser":"(Ver.20131004)ログイン中：",
"txtAll":"すべて", "txtAll":"すべて",
"txtMkgSize":"太さ", "txtMkgSize":"太さ",
"txtMkgS":"小", "txtMkgS":"小",
...@@ -147,5 +147,6 @@ ...@@ -147,5 +147,6 @@
"txtContentPWTitle":"パスワードの確認", "txtContentPWTitle":"パスワードの確認",
"txtContentPWMsg":"閲覧するにはパスワードの入力が必要です。", "txtContentPWMsg":"閲覧するにはパスワードの入力が必要です。",
"txtContentWarning":"警告", "txtContentWarning":"警告",
"txtMediaAutoPlayWarning":"メディアは自動再生されます。" "txtMediaAutoPlayWarning":"メディアは自動再生されます。",
"txtPreventLink": "プレビューにはこの機能が利用できません"
} }
abvw/common/json/lang/lang-ko.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃", "dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과", "txtSearchResult":"검색 결과",
"dspHome":"홈", "dspHome":"홈",
"txtLoginUser":"(Ver.20131003)로그인 중:", "txtLoginUser":"(Ver.20131004)로그인 중:",
"txtAll":"전체", "txtAll":"전체",
"txtMkgSize":"두께", "txtMkgSize":"두께",
"txtMkgS":"소", "txtMkgS":"소",
...@@ -147,5 +147,6 @@ ...@@ -147,5 +147,6 @@
"txtContentPWTitle":"KO_パスワードの確認", "txtContentPWTitle":"KO_パスワードの確認",
"txtContentPWMsg":"KO_閲覧するにはパスワードの入力が必要です。", "txtContentPWMsg":"KO_閲覧するにはパスワードの入力が必要です。",
"txtContentWarning":"KO_警告", "txtContentWarning":"KO_警告",
"txtMediaAutoPlayWarning":"KO_メディアは自動再生されます。" "txtMediaAutoPlayWarning":"KO_メディアは自動再生されます。",
"txtPreventLink": "プレビューにはこの機能が利用できません"
} }
abvw/css/layout/history.css
...@@ -255,6 +255,12 @@ a:hover ...@@ -255,6 +255,12 @@ a:hover
{ {
display: none; display: none;
} }
#msgHistoryNotExist
{
text-align:left;
margin-top:20px;
clear:both;
}
.sort-title{ .sort-title{
float: left; float: left;
......
abvw/css/layout/viewer.css
...@@ -1328,7 +1328,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -1328,7 +1328,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
position: absolute; position: absolute;
top: 100%; top: 100%;
width: 0; width: 0;
height: 0; height: 0;
} }
/* HOVER STYLES */ /* HOVER STYLES */
.pop-up-memo { .pop-up-memo {
...@@ -1684,3 +1684,28 @@ ul#divListBookmark li:hover{} ...@@ -1684,3 +1684,28 @@ ul#divListBookmark li:hover{}
#powerTip{ #powerTip{
z-index: 999 !important; z-index: 999 !important;
} }
span.error{
}
span.no-item{
}
.dialog-content-music{
}
.imagePreview-one{
}
.picker-choose-on{
}
.picker-choose-off{
}
abvw/css/theme/common.css
...@@ -41,4 +41,10 @@ p.go_top{ ...@@ -41,4 +41,10 @@ p.go_top{
br.clear { } br.clear { }
.floatL { } .floatL { }
.floatR { } .floatR { }
\ No newline at end of file
#avw-auth-error
{
color: #fff;
background: #ccc;
}
\ No newline at end of file
abvw/css/theme/history.css
...@@ -192,7 +192,11 @@ a:hover ...@@ -192,7 +192,11 @@ a:hover
#msgSearchNotExist #msgSearchNotExist
{ {
} }
#msgHistoryNotExist
{
color:#f00;
font-size:16px;
}
.sort-title{ .sort-title{
font-size: 12px; font-size: 12px;
color: #333333; color: #333333;
......
abvw/css/theme/list_shiori.css
...@@ -135,6 +135,10 @@ a.delete:hover:not(:target) { ...@@ -135,6 +135,10 @@ a.delete:hover:not(:target) {
cursor:default; cursor:default;
text-decoration:none; text-decoration:none;
} }
.cnt_section .text label.name
{
color: #2D83DA;
}
.cnt_section .text a.name img .cnt_section .text a.name img
{ {
} }
......
abvw/css/theme/viewer.css
...@@ -1066,12 +1066,18 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -1066,12 +1066,18 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
border-color:#ccd; border-color:#ccd;
font-family: Verdana; font-family: Verdana;
font-size: 10pt; font-size: 10pt;
border-radius: 10px; border-radius: 10px;
-moz-box-shadow:-3px 3px 3px #777;
-webkit-box-shadow:-3px 3px 3px #777;
box-shadow : -3px 3px 3px #777
} }
.popuptext_arrow { .popuptext_arrow {
border-style: solid; border-style: solid;
border-width: 12px 12px 12px 12px; border-width: 12px 12px 12px 12px;
border-color: transparent transparent transparent rgb(204, 204, 221) !important;
} }
/* HOVER STYLES */ /* HOVER STYLES */
.pop-up-memo { .pop-up-memo {
...@@ -1401,4 +1407,31 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -1401,4 +1407,31 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
} }
ul#divSearchResult li:hover{ background:#f4f4f4;cursor:pointer;} ul#divSearchResult li:hover{ background:#f4f4f4;cursor:pointer;}
ul#divListBookmark li:hover{background:#f4f4f4;cursor:pointer;} ul#divListBookmark li:hover{background:#f4f4f4;cursor:pointer;}
#divListIndex span:hover{color: red; cursor: pointer} #divListIndex span:hover{color: red; cursor: pointer}
\ No newline at end of file
span.error{
color: red;
}
span.no-item{
color:#333333;
font-size:12px;
cursor:default;
text-decoration:none;
}
.dialog-content-music{
background: url(../../img/iPad_music.png) center center no-repeat;
background-color: white;
}
.imagePreview-one{
background-color: black;
}
.picker-choose-on{
border:1px solid #e6e6e6 !important;
}
.picker-choose-off{
border:1px solid #d3d5d6 !important;
}
abvw/js/bookmark.js
...@@ -581,7 +581,7 @@ function insertRowError(contentid, pageTitle, pageNo) { ...@@ -581,7 +581,7 @@ function insertRowError(contentid, pageTitle, pageNo) {
newRow += '</span>'; newRow += '</span>';
newRow += " <div class='text'>"; newRow += " <div class='text'>";
newRow += ' <label class="name" style="color: #2D83DA;">' + truncate(pageTitle, 20) + '</label>'; newRow += ' <label class="name">' + truncate(pageTitle, 20) + '</label>';
newRow += ' <div class="info">'; newRow += ' <div class="info">';
newRow += " <label class='lang name' lang='msgShioriDeleted'>" + i18nText('msgShioriDeleted') + "</label>"; newRow += " <label class='lang name' lang='msgShioriDeleted'>" + i18nText('msgShioriDeleted') + "</label>";
......
abvw/js/contentview.js
...@@ -123,7 +123,7 @@ function displayCanvasDraw() { ...@@ -123,7 +123,7 @@ function displayCanvasDraw() {
for (var nIndex = 0; nIndex < dataMarking.length; nIndex++) { for (var nIndex = 0; nIndex < dataMarking.length; nIndex++) {
if (dataMarking[nIndex].contentid == contentID if (dataMarking[nIndex].contentid == contentID
&& dataMarking[nIndex].pageNo == changePageIndex(getPageIndex())) { && dataMarking[nIndex].pageNo == changePageIndex(getPageIndex())) {
var img = new Image(); var img = new Image();
img.onload = function () { img.onload = function () {
...@@ -287,7 +287,7 @@ function isExistBookmark() { ...@@ -287,7 +287,7 @@ function isExistBookmark() {
listBM = ClientData.BookMarkData(); listBM = ClientData.BookMarkData();
for (var nIndex = 0; nIndex < listBM.length; nIndex++) { for (var nIndex = 0; nIndex < listBM.length; nIndex++) {
//check bookmark belong contentID //check bookmark belong contentID
if (listBM[nIndex].contentid == contentID && listBM[nIndex].pageNo == changePageIndex(getPageIndex())) { if (listBM[nIndex].contentid == contentID && listBM[nIndex].pageNo == changePageIndex(getPageIndex())) {
return nIndex; return nIndex;
} }
...@@ -413,7 +413,7 @@ function handleAPIWebContentPage(dataJson, pos) { ...@@ -413,7 +413,7 @@ function handleAPIWebContentPage(dataJson, pos) {
' </li>' + ' </li>' +
' <li>' + ' <li>' +
' <span class="mdltext">' + ' <span class="mdltext">' +
' <span style="color:red">' + i18nText('msgShioriDeleted') + '</span>' + ' <span class="error">' + i18nText('msgShioriDeleted') + '</span>' +
' </span>' + ' </span>' +
' </li>' ' </li>'
); );
...@@ -484,7 +484,7 @@ function handleAPIWebContentPage(dataJson, pos) { ...@@ -484,7 +484,7 @@ function handleAPIWebContentPage(dataJson, pos) {
' </li>' + ' </li>' +
' <li>' + ' <li>' +
' <span class="mdltext">' + ' <span class="mdltext">' +
' <span style="color:red">' + i18nText('msgShioriDeleted') + '</span>' + ' <span class="error">' + i18nText('msgShioriDeleted') + '</span>' +
' </span>' + ' </span>' +
' </li>' ' </li>'
); );
...@@ -630,7 +630,7 @@ function handleCopyTextData(data, pos) { ...@@ -630,7 +630,7 @@ function handleCopyTextData(data, pos) {
$('#divCopyText').children().remove(); $('#divCopyText').children().remove();
$('#divCopyText').append('<li class="last">' + i18nText('txtNoTextCopy') + '</li>'); $('#divCopyText').append('<li class="last">' + i18nText('txtNoTextCopy') + '</li>');
// $("#divCopyText").dialog({ // $("#divCopyText").dialog({
// show: "blind", // show: "blind",
// modal: true, // modal: true,
// resizable:false, // resizable:false,
...@@ -653,7 +653,7 @@ function handleCopyTextData(data, pos) { ...@@ -653,7 +653,7 @@ function handleCopyTextData(data, pos) {
$("#boxCopyText").offset({ left: w, top: h }); $("#boxCopyText").offset({ left: w, top: h });
$("#divCopyText").show(); $("#divCopyText").show();
//$("#divCopyText").offset({left:"45%",top:(45% + $('#bookmarkBoxHdCT').height())}); //$("#divCopyText").offset({left:"45%",top:(45% + $('#bookmarkBoxHdCT').height())});
//$("#boxCopyText").offset({left:"45%",top:"45%"}); //$("#boxCopyText").offset({left:"45%",top:"45%"});
} else { } else {
/* create data on dialog */ /* create data on dialog */
...@@ -668,7 +668,7 @@ function handleCopyTextData(data, pos) { ...@@ -668,7 +668,7 @@ function handleCopyTextData(data, pos) {
$('#divCopyText').append('<div class="last" id="txtTextCopy" style="word-wrap:break-word;line-height: 20px">' + strTemp + '</div>'); $('#divCopyText').append('<div class="last" id="txtTextCopy" style="word-wrap:break-word;line-height: 20px">' + strTemp + '</div>');
/* display dialog */ /* display dialog */
// $("#divCopyText").dialog({ // $("#divCopyText").dialog({
// show: "blind", // show: "blind",
// modal: true, // modal: true,
// width: WIDTH_DIALOG_COPYTEXT, // width: WIDTH_DIALOG_COPYTEXT,
...@@ -688,17 +688,17 @@ function handleCopyTextData(data, pos) { ...@@ -688,17 +688,17 @@ function handleCopyTextData(data, pos) {
//lockLayout(); //lockLayout();
$('#boxCopyText').css('z-index', '101'); $('#boxCopyText').css('z-index', '101');
$('#boxCopyText').css('display', 'block'); $('#boxCopyText').css('display', 'block');
//$('#boxCopyText').draggable({ handle: "h1" }); //$('#boxCopyText').draggable({ handle: "h1" });
$("#boxCopyText").offset({ left: w, top: h }); $("#boxCopyText").offset({ left: w, top: h });
$("#divCopyText").show(); $("#divCopyText").show();
//$("#divCopyText").offset({left:w,top:(h + $('#bookmarkBoxHdCT').height())}); //$("#divCopyText").offset({left:w,top:(h + $('#bookmarkBoxHdCT').height())});
//$("#boxCopyText").offset({left:"45%",top:"45%"}); //$("#boxCopyText").offset({left:"45%",top:"45%"});
/*$('#bookmarkBoxHdCT').mousedown(function(){ /*$('#bookmarkBoxHdCT').mousedown(function(){
$('#boxCopyText').draggable({ handle: "h1" }); $('#boxCopyText').draggable({ handle: "h1" });
}); });
$('#bookmarkBoxHdCT').mouseup(function(){ $('#bookmarkBoxHdCT').mouseup(function(){
$('#boxCopyText').unbind('draggable'); $('#boxCopyText').unbind('draggable');
});*/ });*/
if (isTouchDevice() == true) { if (isTouchDevice() == true) {
...@@ -709,10 +709,10 @@ function handleCopyTextData(data, pos) { ...@@ -709,10 +709,10 @@ function handleCopyTextData(data, pos) {
document.getElementById('bookmarkBoxHdCT').addEventListener('mouseup', eventEnd_CopyText, false); document.getElementById('bookmarkBoxHdCT').addEventListener('mouseup', eventEnd_CopyText, false);
} }
/*$('#boxCopyText h1').touchstart(function(e){ /*$('#boxCopyText h1').touchstart(function(e){
}); });
$('#boxCopyText h1').touchend(function(e){ $('#boxCopyText h1').touchend(function(e){
});*/ });*/
} }
}; };
...@@ -789,14 +789,14 @@ function searchHandle() { ...@@ -789,14 +789,14 @@ function searchHandle() {
var nStored = checkDataLoaded(sPageNo[i].pageNo, dataStored); var nStored = checkDataLoaded(sPageNo[i].pageNo, dataStored);
if (nStored != -1) { /* data loaded */ if (nStored != -1) { /* data loaded */
$('#divSearchResult').append( $('#divSearchResult').append(
' <li id="' + changePageNo(sPageNo[i].pageNo) + '">' + ' <li id="' + changePageNo(sPageNo[i].pageNo) + '">' +
' <img id="img_search_' + sPageNo[i].pageNo + '" class="imgbox" src="' + formatStringBase64(dataStored[nStored].pageThumbnail) + '"/>' + ' <img id="img_search_' + sPageNo[i].pageNo + '" class="imgbox" src="' + formatStringBase64(dataStored[nStored].pageThumbnail) + '"/>' +
' <span class="mdltext">' + ' <span class="mdltext">' +
i18nText('txtPage') + (changePageNo(sPageNo[i].pageNo) + 1) + '<br /> ' + i18nText('txtPage') + (changePageNo(sPageNo[i].pageNo) + 1) + '<br /> ' +
htmlEncode(truncate(sPageNo[i].pageText, 20)) + htmlEncode(truncate(sPageNo[i].pageText, 20)) +
' </span>' + ' </span>' +
' </li>' ' </li>'
); );
//Resize Image //Resize Image
var imgTemp = new Image(); var imgTemp = new Image();
...@@ -819,14 +819,14 @@ function searchHandle() { ...@@ -819,14 +819,14 @@ function searchHandle() {
imgTemp.src = formatStringBase64(dataStored[nStored].pageThumbnail); imgTemp.src = formatStringBase64(dataStored[nStored].pageThumbnail);
} else { } else {
$('#divSearchResult').append( $('#divSearchResult').append(
' <li id="' + changePageNo(sPageNo[i].pageNo) + '">' + ' <li id="' + changePageNo(sPageNo[i].pageNo) + '">' +
' <img id="img_search_' + sPageNo[i].pageNo + '" class="imgbox" src="img/view_loading.gif"/>' + ' <img id="img_search_' + sPageNo[i].pageNo + '" class="imgbox" src="img/view_loading.gif"/>' +
' <span class="mdltext">' + ' <span class="mdltext">' +
i18nText('txtPage') + (changePageNo(sPageNo[i].pageNo) + 1) + '<br /> ' + i18nText('txtPage') + (changePageNo(sPageNo[i].pageNo) + 1) + '<br /> ' +
htmlEncode(truncate(sPageNo[i].pageText, 20)) + htmlEncode(truncate(sPageNo[i].pageText, 20)) +
' </span>' + ' </span>' +
' </li>' ' </li>'
); );
//Resize Image //Resize Image
var imgTemp = new Image(); var imgTemp = new Image();
...@@ -885,7 +885,7 @@ function loadDataToDialogSearch(searchResultTemp) { ...@@ -885,7 +885,7 @@ function loadDataToDialogSearch(searchResultTemp) {
var myRegExp = new RegExp($('#txtSearch').val()); var myRegExp = new RegExp($('#txtSearch').val());
var searchResult = []; var searchResult = [];
//search content //search content
for (var nIndex = 0; nIndex < contentPage.length; nIndex++) { for (var nIndex = 0; nIndex < contentPage.length; nIndex++) {
if (myRegExp.test(contentPage[nIndex].pageText)) { if (myRegExp.test(contentPage[nIndex].pageText)) {
//var n = jQuery.inArray(contentPage[nIndex].pageNo,searchResultTemp); //var n = jQuery.inArray(contentPage[nIndex].pageNo,searchResultTemp);
...@@ -903,14 +903,14 @@ function loadDataToDialogSearch(searchResultTemp) { ...@@ -903,14 +903,14 @@ function loadDataToDialogSearch(searchResultTemp) {
$('#divSearchResult').children().remove(); $('#divSearchResult').children().remove();
for (var nIndex = 0; nIndex < searchResult.length; nIndex++) { for (var nIndex = 0; nIndex < searchResult.length; nIndex++) {
$('#divSearchResult').append( $('#divSearchResult').append(
' <li id="' + changePageNo(searchResult[nIndex].pageNo) + '">' + ' <li id="' + changePageNo(searchResult[nIndex].pageNo) + '">' +
' <img class="imgbox" src="' + formatStringBase64(searchResult[nIndex].pageThumbnail) + '"/>' + ' <img class="imgbox" src="' + formatStringBase64(searchResult[nIndex].pageThumbnail) + '"/>' +
' <span class="mdltext">' + ' <span class="mdltext">' +
i18nText('txtPage') + (changePageNo(searchResult[nIndex].pageNo) + 1) + '<br /> ' + i18nText('txtPage') + (changePageNo(searchResult[nIndex].pageNo) + 1) + '<br /> ' +
htmlEncode(truncate(searchResult[nIndex].pageText, 20)) + htmlEncode(truncate(searchResult[nIndex].pageText, 20)) +
' </span>' + ' </span>' +
' </li>' ' </li>'
); );
//Resize Image //Resize Image
var imgTemp = new Image(); var imgTemp = new Image();
...@@ -948,17 +948,17 @@ function playBGMOfPage(page_index_bg) { ...@@ -948,17 +948,17 @@ function playBGMOfPage(page_index_bg) {
if (ClientData.userOpt_musicMode() == "1") { if (ClientData.userOpt_musicMode() == "1") {
$('#playaudiopage').html( $('#playaudiopage').html(
' <audio id="play_audio_2" loop="loop" >' + ' <audio id="play_audio_2" loop="loop" >' +
' <source src="' + srcAudioType2 + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + srcAudioType2 + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} else { } else {
$('#playaudiopage').html( $('#playaudiopage').html(
' <audio id="play_audio_2" >' + ' <audio id="play_audio_2" >' +
' <source src="' + srcAudioType2 + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + srcAudioType2 + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} }
document.getElementById('play_audio_2').load(); document.getElementById('play_audio_2').load();
document.getElementById('play_audio_2').play(); document.getElementById('play_audio_2').play();
...@@ -980,17 +980,17 @@ function playBGMOfContent() { ...@@ -980,17 +980,17 @@ function playBGMOfContent() {
if (ClientData.userOpt_musicMode() == "1") { if (ClientData.userOpt_musicMode() == "1") {
$('#playaudioallpage').html( $('#playaudioallpage').html(
' <audio id="play_audio_1" loop="loop" >' + ' <audio id="play_audio_1" loop="loop" >' +
' <source src="' + srcAudioType1 + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + srcAudioType1 + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} else { } else {
$('#playaudioallpage').html( $('#playaudioallpage').html(
' <audio id="play_audio_1" >' + ' <audio id="play_audio_1" >' +
' <source src="' + srcAudioType1 + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + srcAudioType1 + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} }
document.getElementById('play_audio_1').load(); document.getElementById('play_audio_1').load();
document.getElementById('play_audio_1').play(); document.getElementById('play_audio_1').play();
...@@ -1082,13 +1082,13 @@ function changePage(page_index) { ...@@ -1082,13 +1082,13 @@ function changePage(page_index) {
//END : TRB00032 - Editor : Long - Date: 09/10/2013 - Summary : type none process //END : TRB00032 - Editor : Long - Date: 09/10/2013 - Summary : type none process
} }
} else if (ClientData.IsJumpBack() == true } else if (ClientData.IsJumpBack() == true
|| ClientData.common_prePageNo()) { || ClientData.common_prePageNo()) {
getContent().setPageImages(totalPage, pageImages) getContent().setPageImages(totalPage, pageImages)
.setPageObjects(pageObjects) .setPageObjects(pageObjects)
.setUpPage(0); .setUpPage(0);
//START : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM //START : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
createPageBGM(); createPageBGM();
//END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM //END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
} }
}; };
...@@ -1154,17 +1154,17 @@ function drawMouseMove(contextDraw, ev) { ...@@ -1154,17 +1154,17 @@ function drawMouseMove(contextDraw, ev) {
var quotSize = makerSize / 4; var quotSize = makerSize / 4;
var ptStart = [ var ptStart = [
{ x: sx - quotSize, y: sy - halfSize }, { x: sx - quotSize, y: sy - halfSize },
{ x: sx + quotSize, y: sy - halfSize }, { x: sx + quotSize, y: sy - halfSize },
{ x: sx + quotSize, y: sy + halfSize }, { x: sx + quotSize, y: sy + halfSize },
{ x: sx - quotSize, y: sy + halfSize } { x: sx - quotSize, y: sy + halfSize }
]; ];
var ptEnd = [ var ptEnd = [
{ x: ev._x - quotSize, y: ev._y - halfSize }, { x: ev._x - quotSize, y: ev._y - halfSize },
{ x: ev._x + quotSize, y: ev._y - halfSize }, { x: ev._x + quotSize, y: ev._y - halfSize },
{ x: ev._x + quotSize, y: ev._y + halfSize }, { x: ev._x + quotSize, y: ev._y + halfSize },
{ x: ev._x - quotSize, y: ev._y + halfSize } { x: ev._x - quotSize, y: ev._y + halfSize }
]; ];
if (sx > ev._x) { if (sx > ev._x) {
if (sy > ev._y) { if (sy > ev._y) {
contextDraw.beginPath(); contextDraw.beginPath();
...@@ -1533,7 +1533,7 @@ function tool_drawing() { ...@@ -1533,7 +1533,7 @@ function tool_drawing() {
if (tool.started) { if (tool.started) {
//tool.mousemove(ev); //tool.mousemove(ev);
tool.started = false; tool.started = false;
//context_draw.closePath(); //context_draw.closePath();
//isPressLeftMouse = false; //isPressLeftMouse = false;
} }
}; };
...@@ -1548,9 +1548,9 @@ function tool_drawing() { ...@@ -1548,9 +1548,9 @@ function tool_drawing() {
} }
/*if(isPressLeftMouse == true){ /*if(isPressLeftMouse == true){
isMoveOutDrawCanvas = true; isMoveOutDrawCanvas = true;
}else{ }else{
tool.started = false; tool.started = false;
}*/ }*/
}; };
...@@ -1671,7 +1671,7 @@ function handleFromJumpContent() { ...@@ -1671,7 +1671,7 @@ function handleFromJumpContent() {
/* handle button back */ /* handle button back */
function oldContent_Back() { function oldContent_Back() {
isJumpNotFromFirstPage = true; isJumpNotFromFirstPage = true;
var oldDataBack = ClientData.JumpQueue(); var oldDataBack = ClientData.JumpQueue();
...@@ -1774,24 +1774,24 @@ function resizeCanvasDraw() { ...@@ -1774,24 +1774,24 @@ function resizeCanvasDraw() {
flip(); flip();
if (isFullScreen == true) { if (isFullScreen == true) {
$("#draw_canvas").attr('height', destRect.bottom - destRect.top) $("#draw_canvas").attr('height', destRect.bottom - destRect.top)
.attr('width', destRect.right - destRect.left) .attr('width', destRect.right - destRect.left)
.css('top', destRect.top) .css('top', destRect.top)
.css('left', destRect.left + marginX); .css('left', destRect.left + marginX);
$("#marker_canvas").attr('height', destRect.bottom - destRect.top) $("#marker_canvas").attr('height', destRect.bottom - destRect.top)
.attr('width', destRect.right - destRect.left) .attr('width', destRect.right - destRect.left)
.css('top', destRect.top) .css('top', destRect.top)
.css('left', destRect.left + marginX); .css('left', destRect.left + marginX);
} else { } else {
$("#draw_canvas").attr('height', destRect.bottom - destRect.top) $("#draw_canvas").attr('height', destRect.bottom - destRect.top)
.attr('width', destRect.right - destRect.left) .attr('width', destRect.right - destRect.left)
.css('top', destRect.top + marginY) .css('top', destRect.top + marginY)
.css('left', destRect.left + marginX); .css('left', destRect.left + marginX);
$("#marker_canvas").attr('height', destRect.bottom - destRect.top) $("#marker_canvas").attr('height', destRect.bottom - destRect.top)
.attr('width', destRect.right - destRect.left) .attr('width', destRect.right - destRect.left)
.css('top', destRect.top + marginY) .css('top', destRect.top + marginY)
.css('left', destRect.left + marginX); .css('left', destRect.left + marginX);
} }
}; };
...@@ -1857,7 +1857,7 @@ function handleTooltip() { ...@@ -1857,7 +1857,7 @@ function handleTooltip() {
$('#imgmemo').attr('title', i18nText('txtTooltipShowMemo')); $('#imgmemo').attr('title', i18nText('txtTooltipShowMemo'));
$('#imgaddmemo').attr('title', i18nText('txtTooltipAddMemo')); $('#imgaddmemo').attr('title', i18nText('txtTooltipAddMemo'));
$('#imgmarking').attr('title', i18nText('txtTooltipShowMarking')); $('#imgmarking').attr('title', i18nText('txtTooltipShowMarking'));
$('#imgmarkingtoolbar').attr('title', i18nText('txtTooltipShowMarkingTool')); */ $('#imgmarkingtoolbar').attr('title', i18nText('txtTooltipShowMarkingTool')); */
}; };
function StartTimerUpdateLog() { function StartTimerUpdateLog() {
...@@ -1957,23 +1957,23 @@ function changePageWithoutSlide(pageMove) { ...@@ -1957,23 +1957,23 @@ function changePageWithoutSlide(pageMove) {
if(contentType == ContentTypeKeys.Type_PDF){ if(contentType == ContentTypeKeys.Type_PDF){
avwGrabContentPageImage(ClientData.userInfo_accountPath(), avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: contentID, sid: ClientData.userInfo_sid(), pageNo: pageMove + 1 }, { contentId: contentID, sid: ClientData.userInfo_sid(), pageNo: pageMove + 1 },
function (data) { function (data) {
pageImages = data; pageImages = data;
/* get page Objects */ /* get page Objects */
getPageObjectsByPageIndex(pageObjectsData, pageMove); getPageObjectsByPageIndex(pageObjectsData, pageMove);
getContent().setPageImages(totalPage, pageImages).setPageObjects(pageObjects); getContent().setPageImages(totalPage, pageImages).setPageObjects(pageObjects);
$('#divImageLoading').css('display', 'none'); $('#divImageLoading').css('display', 'none');
isFirstLoad = true; isFirstLoad = true;
// screenFit(); // screenFit();
getContent().toPage(pageMove); getContent().toPage(pageMove);
//START : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM //START : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
createPageBGM(); createPageBGM();
//END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM //END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
//Start FUnciton: No.4 - Editor : Long - Date : 08/12/2013 - Summary : Handle jump from bookmark page //Start FUnciton: No.4 - Editor : Long - Date : 08/12/2013 - Summary : Handle jump from bookmark page
...@@ -1995,23 +1995,23 @@ function changePageWithoutSlide(pageMove) { ...@@ -1995,23 +1995,23 @@ function changePageWithoutSlide(pageMove) {
//End Function : No.4 - Editor : Long - Date: 08/12/2013 - Summary : Handle jump form bookmark page //End Function : No.4 - Editor : Long - Date: 08/12/2013 - Summary : Handle jump form bookmark page
/* handle slider bar */ /* handle slider bar */
handleSliderBar(); handleSliderBar();
if (dataPageTitle[pageMove]) { if (dataPageTitle[pageMove]) {
if (dataPageTitle[pageMove] != '') { if (dataPageTitle[pageMove] != '') {
document.title = contentName + '_' + dataPageTitle[pageMove] + ' | ' + i18nText('sysAppTitle'); document.title = contentName + '_' + dataPageTitle[pageMove] + ' | ' + i18nText('sysAppTitle');
} else { } else {
document.title = contentName + ' | ' + i18nText('sysAppTitle'); document.title = contentName + ' | ' + i18nText('sysAppTitle');
} }
} else { } else {
document.title = contentName + ' | ' + i18nText('sysAppTitle'); document.title = contentName + ' | ' + i18nText('sysAppTitle');
} }
}, },
function (xmlHttpRequest, txtStatus, errorThrown) { function (xmlHttpRequest, txtStatus, errorThrown) {
showErrorScreen(); showErrorScreen();
}); });
} }
//START : TRB00032 - Editor : Long - Date: 09/10/2013 - Summary : type none process //START : TRB00032 - Editor : Long - Date: 09/10/2013 - Summary : type none process
else if(contentType == ContentTypeKeys.Type_NoFile){ else if(contentType == ContentTypeKeys.Type_NoFile){
...@@ -2283,9 +2283,13 @@ function handleForContentTypeMusic(resourceUrl){ ...@@ -2283,9 +2283,13 @@ function handleForContentTypeMusic(resourceUrl){
//Create Dialog overlay //Create Dialog overlay
var $container = $('#dialog'); var $container = $('#dialog');
$container.html(''); $container.html('');
$container.css('background', 'url(./img/iPad_music.png) center center no-repeat');
$container.css('background-color', 'white'); //START FIX CSS
//$container.css('background', 'url(./img/iPad_music.png) center center no-repeat');
//$container.css('background-color', 'white');
$container.addClass('dialog-content-music');
//END FIX CSS
if (ClientData.userOpt_musicMode() == "1") { if (ClientData.userOpt_musicMode() == "1") {
$container.html('<audio autoplay="true" loop="true" controls="controls" style="position: absolute; width: 100%; bottom: 1%;">' $container.html('<audio autoplay="true" loop="true" controls="controls" style="position: absolute; width: 100%; bottom: 1%;">'
+ ' <source src="' + resourceUrl + '" type="audio/mpeg"> ' + ' <source src="' + resourceUrl + '" type="audio/mpeg"> '
...@@ -2703,126 +2707,126 @@ ContentPage.prototype.addPageObjects = function (pageObjects) { ...@@ -2703,126 +2707,126 @@ ContentPage.prototype.addPageObjects = function (pageObjects) {
//mediaType = 1 //mediaType = 1
if (obj.actionType == 0) { if (obj.actionType == 0) {
pageObj = new imageNoAction( /* no action */ pageObj = new imageNoAction( /* no action */
obj.mediaType, obj.mediaType,
obj.actionType, obj.actionType,
obj.id, obj.id,
obj.imageUrl, obj.imageUrl,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.visible obj.visible
); );
} else if (obj.actionType == 1) { /* play video */ } else if (obj.actionType == 1) { /* play video */
pageObj = new videoType1( pageObj = new videoType1(
obj.mediaType, obj.mediaType,
obj.actionType, obj.actionType,
obj.id, obj.id,
obj.imageUrl, obj.imageUrl,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.visible, obj.visible,
obj.mediaFile, obj.mediaFile,
obj.media obj.media
); );
} else if (obj.actionType == 2) { } else if (obj.actionType == 2) {
pageObj = new audioType1( /* play audio */ pageObj = new audioType1( /* play audio */
obj.mediaType, obj.mediaType,
obj.actionType, obj.actionType,
obj.id, obj.id,
obj.imageUrl, obj.imageUrl,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.visible, obj.visible,
obj.audioFile obj.audioFile
); );
} else if (obj.actionType == 3) { /*open new url */ } else if (obj.actionType == 3) { /*open new url */
pageObj = new linkURL( pageObj = new linkURL(
obj.mediaType, obj.mediaType,
obj.actionType, obj.actionType,
obj.id, obj.id,
obj.imageUrl, obj.imageUrl,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.visible, obj.visible,
obj.action, obj.action,
obj.linkUrl, obj.linkUrl,
obj.browserType obj.browserType
); );
} else if (obj.actionType == 4) { /*image preview */ } else if (obj.actionType == 4) { /*image preview */
pageObj = new imagePreview( pageObj = new imagePreview(
obj.mediaType, obj.mediaType,
obj.actionType, obj.actionType,
obj.id, obj.id,
obj.imageUrl, obj.imageUrl,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.visible, obj.visible,
obj.imagePreview obj.imagePreview
); );
} else if (obj.actionType == 5) { /*jump page */ } else if (obj.actionType == 5) { /*jump page */
pageObj = new jumpPage( pageObj = new jumpPage(
obj.mediaType, obj.mediaType,
obj.actionType, obj.actionType,
obj.id, obj.id,
obj.imageUrl, obj.imageUrl,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.visible, obj.visible,
obj.jumpPage obj.jumpPage
); );
} else if (obj.actionType == 6) { /*send mail */ } else if (obj.actionType == 6) { /*send mail */
pageObj = new sendMail( pageObj = new sendMail(
obj.mediaType, obj.mediaType,
obj.actionType, obj.actionType,
obj.id, obj.id,
obj.imageUrl, obj.imageUrl,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.visible, obj.visible,
obj.emailSubject, obj.emailSubject,
obj.emailAddress obj.emailAddress
); );
} else if (obj.actionType == 8) { /* show popup */ } else if (obj.actionType == 8) { /* show popup */
pageObj = new openPopUp( pageObj = new openPopUp(
obj.mediaType, obj.mediaType,
obj.actionType, obj.actionType,
obj.id, obj.id,
obj.imageUrl, obj.imageUrl,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.visible, obj.visible,
obj.content obj.content
); );
} else if (obj.actionType == 10) { /* move to another content */ } else if (obj.actionType == 10) { /* move to another content */
pageObj = new moveToContent( pageObj = new moveToContent(
obj.mediaType, obj.mediaType,
obj.actionType, obj.actionType,
obj.id, obj.id,
obj.imageUrl, obj.imageUrl,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.visible, obj.visible,
obj.contentId, obj.contentId,
obj.pageNo obj.pageNo
); );
//Start Function : No.9 - Editor : Long - Summary : //Start Function : No.9 - Editor : Long - Summary :
}else if(obj.actionType == 11){ }else if(obj.actionType == 11){
pageObj = new htmlLinkButton( pageObj = new htmlLinkButton(
obj.mediaType, obj.mediaType,
...@@ -2859,97 +2863,97 @@ ContentPage.prototype.addPageObjects = function (pageObjects) { ...@@ -2859,97 +2863,97 @@ ContentPage.prototype.addPageObjects = function (pageObjects) {
break; break;
case 2: case 2:
pageObj = new videoType2( pageObj = new videoType2(
obj.mediaType, obj.mediaType,
obj.actionType, obj.actionType,
obj.id, obj.id,
obj.imageUrl, obj.imageUrl,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.visible, obj.visible,
obj.mediaFile, obj.mediaFile,
obj.media, obj.media,
obj.embed obj.embed
); );
break; break;
case 3: case 3:
pageObj = new audioType3( pageObj = new audioType3(
obj.mediaType, obj.mediaType,
obj.actionType, obj.actionType,
obj.id, obj.id,
obj.imageUrl, obj.imageUrl,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.visible, obj.visible,
obj.audioFile, obj.audioFile,
obj.playType obj.playType
); );
break; break;
case 4: case 4:
// mediaType = 4 // mediaType = 4
objType4_5.push(obj); objType4_5.push(obj);
pageObj = new listImage( pageObj = new listImage(
obj.mediaType, obj.mediaType,
obj.id, obj.id,
obj.imageUrl, obj.imageUrl,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.visible, obj.visible,
obj.dataObjects, obj.dataObjects,
obj.triggerType obj.triggerType
); );
break; break;
case 5: case 5:
// mediaType = 5 // mediaType = 5
objType4_5.push(obj); objType4_5.push(obj);
pageObj = new listVideo( pageObj = new listVideo(
obj.mediaType, obj.mediaType,
obj.id, obj.id,
obj.imageUrl, obj.imageUrl,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.visible, obj.visible,
obj.dataObjects obj.dataObjects
); );
break; break;
case 6: case 6:
// mediaType = 6 // mediaType = 6
pageObj = new trigger( pageObj = new trigger(
obj.mediaType, obj.mediaType,
obj.actionType, obj.actionType,
obj.id, obj.id,
obj.imageUrl, obj.imageUrl,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.index, obj.index,
obj.target, obj.target,
obj.visible, obj.visible,
obj.action obj.action
); );
break; break;
case 7: case 7:
// mediaType = 7 // mediaType = 7
pageObj = new text( pageObj = new text(
obj.mediaType, obj.mediaType,
obj.actionType, obj.actionType,
obj.id, obj.id,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.visible, obj.visible,
obj.action, obj.action,
obj.content obj.content
); );
break; break;
//Start Function : No.9 - Editor : Long - Date : 08/15/2013 - Summary : 3d object //Start Function : No.9 - Editor : Long - Date : 08/15/2013 - Summary : 3d object
case 8: case 8:
...@@ -3021,17 +3025,17 @@ ContentPage.prototype.addPageObjects = function (pageObjects) { ...@@ -3021,17 +3025,17 @@ ContentPage.prototype.addPageObjects = function (pageObjects) {
// default Object // default Object
pageObj = new PageObject(); pageObj = new PageObject();
pageObj.setup( pageObj.setup(
obj.mediaType, obj.mediaType,
obj.actionType, obj.actionType,
obj.id, obj.id,
obj.imageUrl, obj.imageUrl,
obj.x, obj.x,
obj.y, obj.y,
obj.width, obj.width,
obj.height, obj.height,
obj.visible, obj.visible,
obj.action obj.action
); );
} }
// add pageObject // add pageObject
this.addPageObject(pageObj); this.addPageObject(pageObj);
...@@ -3884,7 +3888,7 @@ function screenToImage(x, y) { ...@@ -3884,7 +3888,7 @@ function screenToImage(x, y) {
var pt = new Point(0, 0); var pt = new Point(0, 0);
// get current position of mouse on screen // get current position of mouse on screen
if (isFullScreen == true) { if (isFullScreen == true) {
pt.x = x - marginX; pt.x = x - marginX;
pt.y = y; pt.y = y;
...@@ -4010,7 +4014,7 @@ function drawMemoOnScreen(opt) { ...@@ -4010,7 +4014,7 @@ function drawMemoOnScreen(opt) {
for (var nIndex = 0; nIndex < memoData.length; nIndex++) { for (var nIndex = 0; nIndex < memoData.length; nIndex++) {
if (memoData[nIndex].contentid == contentID if (memoData[nIndex].contentid == contentID
&& memoData[nIndex].pageNo == tempPageNo) { && memoData[nIndex].pageNo == tempPageNo) {
/* create object of memo */ /* create object of memo */
var memoObject = null; var memoObject = null;
//START TRB00097 //START TRB00097
...@@ -4097,18 +4101,18 @@ function drawGetWebContent4(context, opt) { ...@@ -4097,18 +4101,18 @@ function drawGetWebContent4(context, opt) {
var dataObject = null; var dataObject = null;
dataObject = new webContentType4( dataObject = new webContentType4(
nLinkList, nLinkList,
dataLinkList[nLinkList].linkLocationX, dataLinkList[nLinkList].linkLocationX,
dataLinkList[nLinkList].linkLocationY, dataLinkList[nLinkList].linkLocationY,
dataLinkList[nLinkList].linkLocationWidth, dataLinkList[nLinkList].linkLocationWidth,
dataLinkList[nLinkList].linkLocationHeight, dataLinkList[nLinkList].linkLocationHeight,
"img/webGetContent4.png", "img/webGetContent4.png",
dataLinkList[nLinkList].linkKind, dataLinkList[nLinkList].linkKind,
dataLinkList[nLinkList].destURI, dataLinkList[nLinkList].destURI,
dataLinkList[nLinkList].destPageNumber dataLinkList[nLinkList].destPageNumber
); );
dataObject["pageNo"] = dataJsonType4[nIndex].page; dataObject["pageNo"] = dataJsonType4[nIndex].page;
webGetContentType4Objects.push(dataObject); webGetContentType4Objects.push(dataObject);
//Start Fix Bug : Cannot not click on link object - Editor : Long - Date : 08/30/2013 //Start Fix Bug : Cannot not click on link object - Editor : Long - Date : 08/30/2013
...@@ -4165,7 +4169,7 @@ function drawMarkingOnScreen(opt) { ...@@ -4165,7 +4169,7 @@ function drawMarkingOnScreen(opt) {
var dataMarking = ClientData.MarkingData(); var dataMarking = ClientData.MarkingData();
for (var nIndex = 0; nIndex < dataMarking.length; nIndex++) { for (var nIndex = 0; nIndex < dataMarking.length; nIndex++) {
if (dataMarking[nIndex].contentid == contentID if (dataMarking[nIndex].contentid == contentID
&& dataMarking[nIndex].pageNo == tempPageNo) { && dataMarking[nIndex].pageNo == tempPageNo) {
/*create image */ /*create image */
var img = new Image(); var img = new Image();
img.onload = function () { img.onload = function () {
...@@ -4643,27 +4647,27 @@ function showVideoObject(x, y, width, height, src, isFullscreen) { ...@@ -4643,27 +4647,27 @@ function showVideoObject(x, y, width, height, src, isFullscreen) {
if (ClientData.userOpt_videoMode() == "1") {/* loop video */ if (ClientData.userOpt_videoMode() == "1") {/* loop video */
$('#playvideo').html('<video class="mov" id="videoOnPage" ' + $('#playvideo').html('<video class="mov" id="videoOnPage" ' +
'width="' + (pt2.x - pt1.x) + '" ' + 'width="' + (pt2.x - pt1.x) + '" ' +
'height="' + (pt2.y - pt1.y) + '" ' + 'height="' + (pt2.y - pt1.y) + '" ' +
'autoplay controls loop>' + 'autoplay controls loop>' +
' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' + ' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' +
' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/ogg"> ' + ' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/ogg"> ' +
'</video>' '</video>'
); );
} else { } else {
$('#playvideo').html('<video class="mov" id="videoOnPage"' + $('#playvideo').html('<video class="mov" id="videoOnPage"' +
'width="' + (pt2.x - pt1.x) + '" ' + 'width="' + (pt2.x - pt1.x) + '" ' +
'height="' + (pt2.y - pt1.y) + '" ' + 'height="' + (pt2.y - pt1.y) + '" ' +
'autoplay controls>' + 'autoplay controls>' +
' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' + ' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' +
' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/ogg"> ' + ' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/ogg"> ' +
'</video>' '</video>'
); );
} }
} else { } else {
$('#playvideo').attr('z-order', '1000'); $('#playvideo').attr('z-order', '1000');
$('#playvideo').html('<video class="mov" id="videoOnPage" src="' + src + '" ' + $('#playvideo').html('<video class="mov" id="videoOnPage" src="' + src + '" ' +
'autoplay controls></video>'); 'autoplay controls></video>');
} }
//showControlsVideo($('#videoOnPage')); //showControlsVideo($('#videoOnPage'));
......
abvw/js/contentview_CreateObjects.js
...@@ -307,7 +307,7 @@ PageObject.prototype.drawPageObject = function (context, opt) { ...@@ -307,7 +307,7 @@ PageObject.prototype.drawPageObject = function (context, opt) {
flip(opt); flip(opt);
if (nCountObjectLoad >= nObjectCnt) { if (nCountObjectLoad >= nObjectCnt) {
/* draw marking */ /* draw marking */
drawMarkingOnScreen(opt); drawMarkingOnScreen(opt);
...@@ -528,13 +528,13 @@ listVideo.prototype = new PageObject(); ...@@ -528,13 +528,13 @@ listVideo.prototype = new PageObject();
var trigger = function (mediaType, actionType, id, imageUrl, x, y, w, h, index, target, visible, actionFunction) { var trigger = function (mediaType, actionType, id, imageUrl, x, y, w, h, index, target, visible, actionFunction) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, actionFunction, null); this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, actionFunction, null);
this.action = function () { this.action = function () {
// draw object // draw object
for (var nIndex = 0; nIndex < objType4_5.length; nIndex++) { for (var nIndex = 0; nIndex < objType4_5.length; nIndex++) {
for (var nIndex1 = 0; nIndex1 < objType4_5[nIndex].dataObjects.length; nIndex1++) { for (var nIndex1 = 0; nIndex1 < objType4_5[nIndex].dataObjects.length; nIndex1++) {
if (objType4_5[nIndex].dataObjects[nIndex1].index == index if (objType4_5[nIndex].dataObjects[nIndex1].index == index
&& objType4_5[nIndex].id == target) { && objType4_5[nIndex].id == target) {
if (objType4_5[nIndex].mediaType == '4') { /*image*/ if (objType4_5[nIndex].mediaType == '4') { /*image*/
changeImageType4(objType4_5, nIndex, nIndex1); changeImageType4(objType4_5, nIndex, nIndex1);
} else { /* video */ } else { /* video */
stopAllAudio(); stopAllAudio();
...@@ -1054,12 +1054,12 @@ Content.prototype.setPageObjects = function (pageObjects) { ...@@ -1054,12 +1054,12 @@ Content.prototype.setPageObjects = function (pageObjects) {
/* Set up page */ /* Set up page */
Content.prototype.setUpPage = function (pageIndex, opt) { Content.prototype.setUpPage = function (pageIndex, opt) {
this.currentPage = createPage( this.currentPage = createPage(
this.pageIndex, this.pageIndex,
this.pageImages, this.pageImages,
this.pageObjects, this.pageObjects,
function () { function () {
adjustPage(opt); adjustPage(opt);
}); });
return this; return this;
}; };
...@@ -1282,8 +1282,8 @@ Transition.prototype.flipPreviousPage = function () { ...@@ -1282,8 +1282,8 @@ Transition.prototype.flipPreviousPage = function () {
$('#mainPre').css('display', 'block'); $('#mainPre').css('display', 'block');
} }
if (getContent().hasPreviousPage()) { if (getContent().hasPreviousPage()) {
if(animateType == animateTypeKeys.Type_Slide){ if(animateType == animateTypeKeys.Type_Slide){
$('#canvasWrapper').stop(true).animate( $('#canvasWrapper').stop(true).animate(
{ left: w + 'px' }, { left: w + 'px' },
{ {
duration: animatePeriod, duration: animatePeriod,
...@@ -1422,35 +1422,35 @@ Transition.prototype.flipToPage = function (index) { ...@@ -1422,35 +1422,35 @@ Transition.prototype.flipToPage = function (index) {
context_main.clearRect(0, 0, canvas_main.width, canvas_main.height); context_main.clearRect(0, 0, canvas_main.width, canvas_main.height);
removeObject(); removeObject();
$('#main').animate( $('#main').animate(
{ left: w + 'px' }, { left: w + 'px' },
{ {
duration: animatePeriod, duration: animatePeriod,
complete: function () { complete: function () {
$('#main').css('left', -w + 'px'); $('#main').css('left', -w + 'px');
$('#main').animate( $('#main').animate(
{ left: marginX + 'px' }, { left: marginX + 'px' },
{ duration: animatePeriod, { duration: animatePeriod,
complete: function () { complete: function () {
isFirstLoad = true; isFirstLoad = true;
//screenFit(); //screenFit();
} }
}); });
//change pageIndex and image bookmark //change pageIndex and image bookmark
userScale = 1; userScale = 1;
//START TRB00097 //START TRB00097
//changeScale(userScale); //changeScale(userScale);
srcRect = new Rect(0, 0, 0, 0); srcRect = new Rect(0, 0, 0, 0);
srcRectNext = new Rect(0, 0, 0, 0); srcRectNext = new Rect(0, 0, 0, 0);
srcRectPrev = new Rect(0, 0, 0, 0); srcRectPrev = new Rect(0, 0, 0, 0);
destRect = new Rect(0, 0, 0, 0); destRect = new Rect(0, 0, 0, 0);
destRectNext = new Rect(0, 0, 0, 0); destRectNext = new Rect(0, 0, 0, 0);
destRectPrev = new Rect(0, 0, 0, 0); destRectPrev = new Rect(0, 0, 0, 0);
//END TRB00097 //END TRB00097
checkDisableButtonZoom(); checkDisableButtonZoom();
getContent().toPage(index); getContent().toPage(index);
if(index > 0){ if(index > 0){
prevContent.pageIndex = getPageIndex(); prevContent.pageIndex = getPageIndex();
getPrevPageObjectsByPageIndex(pageObjectsData, index - 1); getPrevPageObjectsByPageIndex(pageObjectsData, index - 1);
...@@ -1463,50 +1463,50 @@ Transition.prototype.flipToPage = function (index) { ...@@ -1463,50 +1463,50 @@ Transition.prototype.flipToPage = function (index) {
getNextPageObjectsByPageIndex(pageObjectsData, index + 1); getNextPageObjectsByPageIndex(pageObjectsData, index + 1);
renderNextPage(); renderNextPage();
} }
initImageBookmark(); initImageBookmark();
checkExistNextPrePage(); checkExistNextPrePage();
changeSlider(index); changeSlider(index);
/* init image had draw */ /* init image had draw */
initDisplayMarking(); initDisplayMarking();
/* change title of page */ /* change title of page */
if (dataPageTitle[index]) { if (dataPageTitle[index]) {
if (dataPageTitle[index] != '') { if (dataPageTitle[index] != '') {
document.title = contentName + '_' + dataPageTitle[index] + ' | ' + i18nText('sysAppTitle'); document.title = contentName + '_' + dataPageTitle[index] + ' | ' + i18nText('sysAppTitle');
} else { } else {
document.title = contentName + ' | ' + i18nText('sysAppTitle'); document.title = contentName + ' | ' + i18nText('sysAppTitle');
} }
} else { } else {
document.title = contentName + ' | ' + i18nText('sysAppTitle'); document.title = contentName + ' | ' + i18nText('sysAppTitle');
} }
/* set end log */ /* set end log */
SetEndLog(contentID); SetEndLog(contentID);
initImageCheckMarking(); initImageCheckMarking();
createLockLayout(false); createLockLayout(false);
} }
} }
); );
} }
else { else {
context_main.clearRect(0, 0, canvas_main.width, canvas_main.height); context_main.clearRect(0, 0, canvas_main.width, canvas_main.height);
removeObject(); removeObject();
$('#main').animate( $('#main').animate(
{ left: '-' + w + 'px' }, { left: '-' + w + 'px' },
{ {
duration: animatePeriod, duration: animatePeriod,
complete: function () { complete: function () {
$('#main').css('left', w + 'px'); $('#main').css('left', w + 'px');
$('#main').animate( $('#main').animate(
{ left: marginX + 'px' }, { left: marginX + 'px' },
{ duration: animatePeriod, { duration: animatePeriod,
complete: function () { complete: function () {
isFirstLoad = true; isFirstLoad = true;
//screenFit(); //screenFit();
} }
}); });
//change pageIndex and image bookmark //change pageIndex and image bookmark
userScale = 1; userScale = 1;
//START TRB00097 //START TRB00097
//changeScale(userScale); //changeScale(userScale);
srcRect = new Rect(0, 0, 0, 0); srcRect = new Rect(0, 0, 0, 0);
...@@ -1519,43 +1519,43 @@ Transition.prototype.flipToPage = function (index) { ...@@ -1519,43 +1519,43 @@ Transition.prototype.flipToPage = function (index) {
//END TRB00097 //END TRB00097
checkDisableButtonZoom(); checkDisableButtonZoom();
getContent().toPage(index); getContent().toPage(index);
if(index > 0){ if(index > 0){
prevContent.pageIndex = getPageIndex(); prevContent.pageIndex = getPageIndex();
getPrevPageObjectsByPageIndex(pageObjectsData, index - 1); getPrevPageObjectsByPageIndex(pageObjectsData, index - 1);
renderPrevPage(); renderPrevPage();
} }
if(index < totalPage - 1){ if(index < totalPage - 1){
nextContent.pageIndex = getPageIndex(); nextContent.pageIndex = getPageIndex();
getNextPageObjectsByPageIndex(pageObjectsData, index + 1); getNextPageObjectsByPageIndex(pageObjectsData, index + 1);
renderNextPage(); renderNextPage();
} }
initImageBookmark(); initImageBookmark();
checkExistNextPrePage(); checkExistNextPrePage();
changeSlider(index); changeSlider(index);
/* init image had draw */ /* init image had draw */
initDisplayMarking(); initDisplayMarking();
/* change title of page */ /* change title of page */
if (dataPageTitle[index]) { if (dataPageTitle[index]) {
if (dataPageTitle[index] != '') { if (dataPageTitle[index] != '') {
document.title = contentName + '_' + dataPageTitle[index] + ' | ' + i18nText('sysAppTitle'); document.title = contentName + '_' + dataPageTitle[index] + ' | ' + i18nText('sysAppTitle');
} else { } else {
document.title = contentName + ' | ' + i18nText('sysAppTitle'); document.title = contentName + ' | ' + i18nText('sysAppTitle');
} }
} else { } else {
document.title = contentName + ' | ' + i18nText('sysAppTitle'); document.title = contentName + ' | ' + i18nText('sysAppTitle');
} }
/* set end log */ /* set end log */
SetEndLog(contentID); SetEndLog(contentID);
initImageCheckMarking(); initImageCheckMarking();
createLockLayout(false); createLockLayout(false);
} }
}); });
} }
}; };
...@@ -1586,12 +1586,12 @@ function createPage(pageNumber, pageImage, pageObjects, onCompleteFunc) { ...@@ -1586,12 +1586,12 @@ function createPage(pageNumber, pageImage, pageObjects, onCompleteFunc) {
function createImagePreview() { function createImagePreview() {
$('#dialog').prepend( $('#dialog').prepend(
'<h1>' + '<h1>' +
'<img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnClose" class="align_right" ></img>' + '<img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnClose" class="align_right" ></img>' +
'</h1>' + '</h1>' +
'<div id="divImagePreview" class="content_image_preview">' + '<div id="divImagePreview" class="content_image_preview">' +
'</div>' '</div>'
); );
$('#dialog').css('box-shadow', '0px 0px 3px 1px #666'); $('#dialog').css('box-shadow', '0px 0px 3px 1px #666');
$('#dialog').css('border', 'solid 1px #666'); $('#dialog').css('border', 'solid 1px #666');
...@@ -1607,26 +1607,26 @@ function createVideoFulScreen(video, id) { ...@@ -1607,26 +1607,26 @@ function createVideoFulScreen(video, id) {
$('#dialog').children().remove(); $('#dialog').children().remove();
if (ClientData.userOpt_videoMode() == "1") {/* loop video */ if (ClientData.userOpt_videoMode() == "1") {/* loop video */
$('#dialog').html( $('#dialog').html(
'<h1>' + '<h1>' +
' <img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnCloseVideo" class="align_right" ></img>' + ' <img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnCloseVideo" class="align_right" ></img>' +
'</h1>' + '</h1>' +
' <div id="videoMedia' + id + '">' + ' <div id="videoMedia' + id + '">' +
' <video style="height:90%; width:100%;" class="mov" id="videoOnPopUp" autoplay controls loop>' + ' <video style="height:90%; width:100%;" class="mov" id="videoOnPopUp" autoplay controls loop>' +
' <source src="' + video + '" type="video/mp4"> ' + ' <source src="' + video + '" type="video/mp4"> ' +
' </video>' + ' </video>' +
' </div>' ' </div>'
); );
} else { } else {
$('#dialog').html( $('#dialog').html(
'<h1>' + '<h1>' +
' <img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnCloseVideo" class="align_right" width=25px" ></img>' + ' <img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnCloseVideo" class="align_right" width=25px" ></img>' +
'</h1>' + '</h1>' +
' <div id="videoMedia' + id + '">' + ' <div id="videoMedia' + id + '">' +
' <video style="height:90%; width:100%;" id="videoOnPopUp" class="mov" autoplay controls>' + ' <video style="height:90%; width:100%;" id="videoOnPopUp" class="mov" autoplay controls>' +
' <source src="' + video + '" type="video/mp4"> ' + ' <source src="' + video + '" type="video/mp4"> ' +
' </video>' + ' </video>' +
' </div>' ' </div>'
); );
} }
$('#videoOnPopUp').css('height', ($('#dialog').height() - 25) + "px"); $('#videoOnPopUp').css('height', ($('#dialog').height() - 25) + "px");
//showControlsVideo($('#videoOnPopUp')); //showControlsVideo($('#videoOnPopUp'));
...@@ -1648,39 +1648,39 @@ function createAudio(audio, type) { ...@@ -1648,39 +1648,39 @@ function createAudio(audio, type) {
if (ClientData.userOpt_musicMode() == "1") { if (ClientData.userOpt_musicMode() == "1") {
if (avwUserEnvObj.browser == 'firefox') { if (avwUserEnvObj.browser == 'firefox') {
$('#playaudio').html( $('#playaudio').html(
' <embed id="play_audio_0" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>' ' <embed id="play_audio_0" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>'
); );
} else if (avwUserEnvObj.os == "ipad") { } else if (avwUserEnvObj.os == "ipad") {
$('#playaudio').html( $('#playaudio').html(
' <audio id="play_audio_0" loop="loop" >' + ' <audio id="play_audio_0" loop="loop" >' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} else { } else {
$('#playaudio').html( $('#playaudio').html(
' <audio id="play_audio_0" loop="loop" autoplay ="autoplay">' + ' <audio id="play_audio_0" loop="loop" autoplay ="autoplay">' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} }
} else { } else {
if (avwUserEnvObj.browser == 'firefox') { if (avwUserEnvObj.browser == 'firefox') {
$('#playaudio').html( $('#playaudio').html(
' <embed id="play_audio_0" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>' ' <embed id="play_audio_0" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>'
); );
} else if (avwUserEnvObj.os == "ipad") { } else if (avwUserEnvObj.os == "ipad") {
$('#playaudio').html( $('#playaudio').html(
' <audio id="play_audio_0">' + ' <audio id="play_audio_0">' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} else { } else {
$('#playaudio').html( $('#playaudio').html(
' <audio id="play_audio_0" autoplay ="autoplay">' + ' <audio id="play_audio_0" autoplay ="autoplay">' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} }
} }
...@@ -1699,7 +1699,7 @@ function createAudio(audio, type) { ...@@ -1699,7 +1699,7 @@ function createAudio(audio, type) {
if (avwUserEnvObj.browser == 'firefox') { if (avwUserEnvObj.browser == 'firefox') {
/* /*
$('#playaudioallpage').html( $('#playaudioallpage').html(
' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>' ' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>'
);*/ );*/
} }
...@@ -1713,8 +1713,8 @@ function createAudio(audio, type) { ...@@ -1713,8 +1713,8 @@ function createAudio(audio, type) {
if (avwUserEnvObj.browser == 'firefox') { if (avwUserEnvObj.browser == 'firefox') {
/* /*
$('#playaudioallpage').html( $('#playaudioallpage').html(
' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>' ' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>'
);*/ );*/
} else { } else {
if(!isPendingContentBGM){ if(!isPendingContentBGM){
...@@ -1730,16 +1730,16 @@ function createAudio(audio, type) { ...@@ -1730,16 +1730,16 @@ function createAudio(audio, type) {
if (ClientData.userOpt_musicMode() == "1") { if (ClientData.userOpt_musicMode() == "1") {
if (avwUserEnvObj.browser == 'firefox') { if (avwUserEnvObj.browser == 'firefox') {
$('#playaudioallpage').html( $('#playaudioallpage').html(
' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>' ' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>'
); );
} }
else if (avwUserEnvObj.os == "ipad") { else if (avwUserEnvObj.os == "ipad") {
$('#playaudioallpage').html( $('#playaudioallpage').html(
' <audio id="play_audio_1" loop="loop" >' + ' <audio id="play_audio_1" loop="loop" >' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} }
else { else {
if(isPendingContentBGM){ if(isPendingContentBGM){
...@@ -1764,14 +1764,14 @@ function createAudio(audio, type) { ...@@ -1764,14 +1764,14 @@ function createAudio(audio, type) {
else { else {
if (avwUserEnvObj.browser == 'firefox') { if (avwUserEnvObj.browser == 'firefox') {
$('#playaudioallpage').html( $('#playaudioallpage').html(
' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>' ' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>'
); );
} else if (avwUserEnvObj.os == "ipad") { } else if (avwUserEnvObj.os == "ipad") {
$('#playaudioallpage').html( $('#playaudioallpage').html(
' <audio id="play_audio_1" >' + ' <audio id="play_audio_1" >' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} else { } else {
if(isPendingContentBGM){ if(isPendingContentBGM){
$('#playaudioallpage').html( $('#playaudioallpage').html(
...@@ -1829,38 +1829,38 @@ function createAudio(audio, type) { ...@@ -1829,38 +1829,38 @@ function createAudio(audio, type) {
if (ClientData.userOpt_musicMode() == "1") { if (ClientData.userOpt_musicMode() == "1") {
if (avwUserEnvObj.browser == 'firefox') { if (avwUserEnvObj.browser == 'firefox') {
$('#playaudiopage').html( $('#playaudiopage').html(
' <embed id="play_audio_2" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>' ' <embed id="play_audio_2" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>'
); );
} else if (avwUserEnvObj.os == "ipad") { } else if (avwUserEnvObj.os == "ipad") {
$('#playaudiopage').html( $('#playaudiopage').html(
' <audio id="play_audio_2" loop="loop" >' + ' <audio id="play_audio_2" loop="loop" >' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} else { } else {
$('#playaudiopage').html( $('#playaudiopage').html(
' <audio id="play_audio_2" loop="loop" autoplay ="autoplay">' + ' <audio id="play_audio_2" loop="loop" autoplay ="autoplay">' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} }
} else { } else {
if (avwUserEnvObj.browser == 'firefox') { if (avwUserEnvObj.browser == 'firefox') {
$('#playaudiopage').html( $('#playaudiopage').html(
' <embed id="play_audio_2" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>' ' <embed id="play_audio_2" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>'
); );
} else if (avwUserEnvObj.os == "ipad") { } else if (avwUserEnvObj.os == "ipad") {
$('#playaudiopage').html( $('#playaudiopage').html(
' <audio id="play_audio_2" >' + ' <audio id="play_audio_2" >' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} else { } else {
$('#playaudiopage').html( $('#playaudiopage').html(
' <audio id="play_audio_2" autoplay ="autoplay">' + ' <audio id="play_audio_2" autoplay ="autoplay">' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} }
} }
......
abvw/js/contentview_GetData.js
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
/* get Json stored content info */ /* get Json stored content info */
function getJsonContentInfo() { function getJsonContentInfo() {
avwGrabContentPageImage(ClientData.userInfo_accountPath(), avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: contentID, sid: ClientData.userInfo_sid(), pageNo: 1 }, { contentId: contentID, sid: ClientData.userInfo_sid(), pageNo: 1 },
function (data) { function (data) {
pageImages = data; pageImages = data;
webGetContentData(); webGetContentData();
getSearchDataFromJson(); getSearchDataFromJson();
...@@ -22,10 +22,10 @@ function getJsonContentInfo() { ...@@ -22,10 +22,10 @@ function getJsonContentInfo() {
getDataJsonFile(); getDataJsonFile();
//webGetPageImageContentSize(); //webGetPageImageContentSize();
webGetContentPageSize(); webGetContentPageSize();
}, },
function (xmlHttpRequest, txtStatus, errorThrown) { function (xmlHttpRequest, txtStatus, errorThrown) {
showErrorScreen(); showErrorScreen();
}); });
}; };
//END TRB00097 - Editor: Long - Date: 09/30/2013 - Summary : Get All Page size of content //END TRB00097 - Editor: Long - Date: 09/30/2013 - Summary : Get All Page size of content
...@@ -848,7 +848,7 @@ function getBookmarklist(pos) { ...@@ -848,7 +848,7 @@ function getBookmarklist(pos) {
$("#divListBookmark").show(); $("#divListBookmark").show();
$("#divListBookmark").offset({ left: pos[0], top: (pos[1] + $('#bookmarkBoxHdBM').height()) }); $("#divListBookmark").offset({ left: pos[0], top: (pos[1] + $('#bookmarkBoxHdBM').height()) });
} }
else { else {
handleAPIWebContentPage(dataWebContentPage, pos) handleAPIWebContentPage(dataWebContentPage, pos)
} }
}; };
...@@ -858,7 +858,7 @@ function getPageIndexJson(pos) { ...@@ -858,7 +858,7 @@ function getPageIndexJson(pos) {
if (dataJsonType5.length > 0) { if (dataJsonType5.length > 0) {
$('#divListIndex').children().remove(); $('#divListIndex').children().remove();
// $("#divListIndex").dialog({ // $("#divListIndex").dialog({
// show: "blind", // show: "blind",
// modal: true, // modal: true,
// width: WIDTH_DIALOG_INDEX, // width: WIDTH_DIALOG_INDEX,
...@@ -882,7 +882,7 @@ function getPageIndexJson(pos) { ...@@ -882,7 +882,7 @@ function getPageIndexJson(pos) {
$("#divListIndex").show(); $("#divListIndex").show();
$("#divListIndex").offset({ left: pos[0], top: (pos[1] + $('#indexBoxHdIndex').height()) }); $("#divListIndex").offset({ left: pos[0], top: (pos[1] + $('#indexBoxHdIndex').height()) });
//set data for dialog index //set data for dialog index
var dataContent = dataJsonType5; var dataContent = dataJsonType5;
var arrData = new Array(); var arrData = new Array();
$.each(dataContent, function (i, value) { $.each(dataContent, function (i, value) {
...@@ -912,10 +912,10 @@ function getPageIndexJson(pos) { ...@@ -912,10 +912,10 @@ function getPageIndexJson(pos) {
$(".treeview, .treeview ul").css('padding', '0px 8px 0'); $(".treeview, .treeview ul").css('padding', '0px 8px 0');
} else { } else {
$('#divListIndex').children().remove(); $('#divListIndex').children().remove();
$('#divListIndex').append('<span style="color:#333333; font-size:12px; cursor:default; text-decoration:none;">' + i18nText('msgNoIndex') + '</span>'); $('#divListIndex').append('<span class="no-item">' + i18nText('msgNoIndex') + '</span>');
// //show dialog index // //show dialog index
// $("#divListIndex").dialog({ // $("#divListIndex").dialog({
// show: "blind", // show: "blind",
// modal: true, // modal: true,
// resizable:false, // resizable:false,
...@@ -1103,7 +1103,7 @@ function getAllMemoOfPage() { ...@@ -1103,7 +1103,7 @@ function getAllMemoOfPage() {
for (var nIndex = 0; nIndex < memoData.length; nIndex++) { for (var nIndex = 0; nIndex < memoData.length; nIndex++) {
if (memoData[nIndex].contentid == contentID if (memoData[nIndex].contentid == contentID
&& memoData[nIndex].pageNo == changePageIndex(getPageIndex())) { && memoData[nIndex].pageNo == changePageIndex(getPageIndex())) {
/* create object of memo */ /* create object of memo */
var memoObject = null; var memoObject = null;
...@@ -1115,14 +1115,14 @@ function getAllMemoOfPage() { ...@@ -1115,14 +1115,14 @@ function getAllMemoOfPage() {
memoData[nIndex].posX = widthEachPage - 50; memoData[nIndex].posX = widthEachPage - 50;
} }
memoObject = new memo( memoObject = new memo(
nIndex, nIndex,
memoData[nIndex].Text, memoData[nIndex].Text,
memoData[nIndex].posX, memoData[nIndex].posX,
memoData[nIndex].posY, memoData[nIndex].posY,
50, 50,
50, 50,
"img/memo.png" "img/memo.png"
); );
memoObjects.push(memoObject); memoObjects.push(memoObject);
} }
......
abvw/js/contentview_ImagePreview.js
...@@ -15,18 +15,18 @@ var slideshowSelectLastIndex = 4; ...@@ -15,18 +15,18 @@ var slideshowSelectLastIndex = 4;
var slideshowMainCurrIndex = 0; var slideshowMainCurrIndex = 0;
/*==========================================*/ /*==========================================*/
function refreshSlideShowValue(){ function refreshSlideShowValue(){
slideshowImgFrom = 0; slideshowImgFrom = 0;
slideshowImgTo = 4; slideshowImgTo = 4;
slideshowImageCollection = []; slideshowImageCollection = [];
slideshowClickFlg = false; slideshowClickFlg = false;
slideshowInitFlg = true; slideshowInitFlg = true;
slideshowSelectedIndex = 0; slideshowSelectedIndex = 0;
//0: next - 1: prev //0: next - 1: prev
slideshowControlToggleFlg = 0; slideshowControlToggleFlg = 0;
totalRecord; totalRecord;
slideshowSelectFirstIndex = 0; slideshowSelectFirstIndex = 0;
slideshowSelectLastIndex = 4; slideshowSelectLastIndex = 4;
slideshowMainCurrIndex = 0; slideshowMainCurrIndex = 0;
}; };
...@@ -41,16 +41,19 @@ function showImagePreview(targetId, imgList) { ...@@ -41,16 +41,19 @@ function showImagePreview(targetId, imgList) {
if (slideshowImageCollection.length == 1) { if (slideshowImageCollection.length == 1) {
targetId.html(''); targetId.html('');
targetId.append('<div id="slideWrapper">' targetId.append('<div id="slideWrapper">'
+ '</div>'); + '</div>');
var mainImg = $('#slideWrapper'); var mainImg = $('#slideWrapper');
//START FIXCSS
var cssObj = { 'background-image': 'url(' + slideshowImageCollection[0].thumbnail + ')', var cssObj = { 'background-image': 'url(' + slideshowImageCollection[0].thumbnail + ')',
'background-repeat': 'no-repeat', 'background-repeat': 'no-repeat',
'background-size': 'contain', 'background-size': 'contain',
'background-position': 'center', 'background-position': 'center'
'background-color': 'black'
}; };
mainImg.addClass('imagePreview-one');
//END FIXCSS
mainImg.css(cssObj); mainImg.css(cssObj);
...@@ -74,41 +77,41 @@ function showImagePreview(targetId, imgList) { ...@@ -74,41 +77,41 @@ function showImagePreview(targetId, imgList) {
//Set image source for slide show //Set image source for slide show
function setImageSource(source){ function setImageSource(source){
var oldSource = source; var oldSource = source;
var newSource = []; var newSource = [];
for(var nIndex = 0; nIndex < oldSource.length; nIndex++){ for(var nIndex = 0; nIndex < oldSource.length; nIndex++){
newSource.push({index : nIndex, image : oldSource[nIndex], thumbnail : oldSource[nIndex]}); newSource.push({index : nIndex, image : oldSource[nIndex], thumbnail : oldSource[nIndex]});
} }
return newSource; return newSource;
}; };
//render background to show image preview //render background to show image preview
function renderSlideShowBackground(targetId){ function renderSlideShowBackground(targetId){
var targetDiv = targetId; var targetDiv = targetId;
targetDiv.html(''); targetDiv.html('');
targetDiv.append('<div id="slideWrapper">' targetDiv.append('<div id="slideWrapper">'
+' <div class="gallery-image" id="gallery-image">' +' <div class="gallery-image" id="gallery-image">'
+' <div class="main-control" id="main-control-prev"> </div>' +' <div class="main-control" id="main-control-prev"> </div>'
+' <div id="main-img" id="mainThumbnail"><div class="mainThumbnail"></div></div>' +' <div id="main-img" id="mainThumbnail"><div class="mainThumbnail"></div></div>'
+' <div class="main-control" id="main-control-next"> </div>' +' <div class="main-control" id="main-control-next"> </div>'
+' </div>' +' </div>'
+' <div class="gallery-thumb">' +' <div class="gallery-thumb">'
+' <div id="control-prev" class="slideshow-control"><img src="././img/arrow-left.gif"></div>' +' <div id="control-prev" class="slideshow-control"><img src="././img/arrow-left.gif"></div>'
+' <div id="selector-img">' +' <div id="selector-img">'
+' </div>' +' </div>'
+' <div id="control-next" class="slideshow-control"><img src="././img/arrow-right.gif"></div>' +' <div id="control-next" class="slideshow-control"><img src="././img/arrow-right.gif"></div>'
+' </div>' +' </div>'
+'</div>' +'</div>'
); );
$(window).resize(function () { $(window).resize(function () {
optimizeSizeImagePreview(); optimizeSizeImagePreview();
}); });
//handleImagePreviewEvent(); //handleImagePreviewEvent();
}; };
function optimizeSizeImagePreview() { function optimizeSizeImagePreview() {
var maxW = "798"; var maxW = "798";
...@@ -137,101 +140,101 @@ function optimizeSizeImagePreview() { ...@@ -137,101 +140,101 @@ function optimizeSizeImagePreview() {
//render select image //render select image
function renderSelectImage(){ function renderSelectImage(){
var selectImg = $('#selector-img'); var selectImg = $('#selector-img');
$.each(slideshowImageCollection, function(i, image){ $.each(slideshowImageCollection, function(i, image){
if(slideshowImgFrom <= i && i <= slideshowImgTo){ if(slideshowImgFrom <= i && i <= slideshowImgTo){
selectImg.append('<div class="thumbnail" imageId="'+ image.index +'" style="display:block; background-image : url('+image.thumbnail+')"></div>'); selectImg.append('<div class="thumbnail" imageId="'+ image.index +'" style="display:block; background-image : url('+image.thumbnail+')"></div>');
} }
else{ else{
selectImg.append('<div class="thumbnail" imageId="'+ image.index +'" style="display:none; background-image : url('+image.thumbnail+')"></div>'); selectImg.append('<div class="thumbnail" imageId="'+ image.index +'" style="display:none; background-image : url('+image.thumbnail+')"></div>');
} }
}); });
}; };
//Handle Image Preview Event //Handle Image Preview Event
function handleImagePreviewEvent(){ function handleImagePreviewEvent(){
$('#control-next').click(imageSelectNextFunction); $('#control-next').click(imageSelectNextFunction);
$('#control-prev').click(imageSelectPrevFunction); $('#control-prev').click(imageSelectPrevFunction);
$('#main-control-next').click(imageMainSelectNextFunction); $('#main-control-next').click(imageMainSelectNextFunction);
$('#main-control-prev').click(imageMainSelectPrevFunction); $('#main-control-prev').click(imageMainSelectPrevFunction);
$('.thumbnail').click(selectImgClickFunction); $('.thumbnail').click(selectImgClickFunction);
$('.thumbnail').mouseenter(selectImgMouseEnterFunction); $('.thumbnail').mouseenter(selectImgMouseEnterFunction);
$('.thumbnail').mouseleave(selectImgMouseLeaveFunction); $('.thumbnail').mouseleave(selectImgMouseLeaveFunction);
$('.main-control').css('opacity','0'); $('.main-control').css('opacity','0');
$('#main-control-next').mouseleave(mainControlNextMouseLeaveFunction); $('#main-control-next').mouseleave(mainControlNextMouseLeaveFunction);
$('#main-control-prev').mouseleave(mainControlPrevMouseLeaveFunction); $('#main-control-prev').mouseleave(mainControlPrevMouseLeaveFunction);
if (isTouchDevice() == false) { if (isTouchDevice() == false) {
//$('.main-control').mouseenter(mainControlMouseEnterFunction); //$('.main-control').mouseenter(mainControlMouseEnterFunction);
$('#main-control-next').mouseenter(mainControlNextMouseEnterFunction); $('#main-control-next').mouseenter(mainControlNextMouseEnterFunction);
$('#main-control-prev').mouseenter(mainControlPrevMouseEnterFunction); $('#main-control-prev').mouseenter(mainControlPrevMouseEnterFunction);
} }
//$('.main-control').mouseleave(mainControlMouseLeaveFunction); //$('.main-control').mouseleave(mainControlMouseLeaveFunction);
//$('.thumbnail:first').css('box-shadow','0px 7px 7px #555'); //$('.thumbnail:first').css('box-shadow','0px 7px 7px #555');
$('.thumbnail:first').addClass('activeThumb'); $('.thumbnail:first').addClass('activeThumb');
handleDispNextPrevButton(); handleDispNextPrevButton();
}; };
function mainControlNextMouseEnterFunction(){ function mainControlNextMouseEnterFunction(){
$(this).css('opacity','0.5'); $(this).css('opacity','0.5');
}; };
function mainControlNextMouseLeaveFunction(){ function mainControlNextMouseLeaveFunction(){
$(this).css('opacity','0'); $(this).css('opacity','0');
}; };
function mainControlPrevMouseEnterFunction(){ function mainControlPrevMouseEnterFunction(){
$(this).css('opacity','0.5'); $(this).css('opacity','0.5');
}; };
function mainControlPrevMouseLeaveFunction(){ function mainControlPrevMouseLeaveFunction(){
$(this).css('opacity','0'); $(this).css('opacity','0');
}; };
//Image Preview next icon function //Image Preview next icon function
function imageSelectNextFunction(){ function imageSelectNextFunction(){
if(slideshowSelectLastIndex < slideshowImageCollection.length - 1){ if(slideshowSelectLastIndex < slideshowImageCollection.length - 1){
$('#selector-img div:eq('+slideshowSelectFirstIndex+')').animate({width: 'hide'}, $('#selector-img div:eq('+slideshowSelectFirstIndex+')').animate({width: 'hide'},
{step: function(now, fx){ {step: function(now, fx){
$('#selector-img div:eq('+slideshowSelectLastIndex+')').animate({width: 'show'}); $('#selector-img div:eq('+slideshowSelectLastIndex+')').animate({width: 'show'});
} }
} }
); );
slideshowSelectFirstIndex = slideshowSelectFirstIndex + 1; slideshowSelectFirstIndex = slideshowSelectFirstIndex + 1;
slideshowSelectLastIndex = slideshowSelectLastIndex + 1; slideshowSelectLastIndex = slideshowSelectLastIndex + 1;
handleDispNextPrevButton(); handleDispNextPrevButton();
} }
}; };
//Image preview prev icon function //Image preview prev icon function
function imageSelectPrevFunction(){ function imageSelectPrevFunction(){
var fixedIndex = slideshowSelectFirstIndex - 1; var fixedIndex = slideshowSelectFirstIndex - 1;
if(slideshowSelectFirstIndex > 0){ if(slideshowSelectFirstIndex > 0){
$('#selector-img div:eq('+fixedIndex+')').animate({width: 'show'}); $('#selector-img div:eq('+fixedIndex+')').animate({width: 'show'});
$('#selector-img div:eq('+slideshowSelectLastIndex+')').animate({width:'hide'}); $('#selector-img div:eq('+slideshowSelectLastIndex+')').animate({width:'hide'});
slideshowSelectFirstIndex = slideshowSelectFirstIndex - 1; slideshowSelectFirstIndex = slideshowSelectFirstIndex - 1;
slideshowSelectLastIndex = slideshowSelectLastIndex - 1; slideshowSelectLastIndex = slideshowSelectLastIndex - 1;
handleDispNextPrevButton(); handleDispNextPrevButton();
} }
}; };
var slideshow_isTransaction = false; var slideshow_isTransaction = false;
...@@ -250,23 +253,23 @@ function imageMainSelectNextFunction() { ...@@ -250,23 +253,23 @@ function imageMainSelectNextFunction() {
if (slideshowMainCurrIndex < slideshowImageCollection.length - 1) { if (slideshowMainCurrIndex < slideshowImageCollection.length - 1) {
$('#main-img div').animate( $('#main-img div').animate(
{ "left": "-=100%" }, { "left": "-=100%" },
{ {
/*duration: "slow",*/ /*duration: "slow",*/
complete: function () { complete: function () {
$('#main-img div').hide(); $('#main-img div').hide();
renderMainImage(fixedIndex); renderMainImage(fixedIndex);
$('#main-img div').css('left', '+=300%'); $('#main-img div').css('left', '+=300%');
$('#main-img div').show(); $('#main-img div').show();
$('<img/>').attr('src', slideshowImageCollection[fixedIndex].thumbnail).load(function () { $('<img/>').attr('src', slideshowImageCollection[fixedIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' }); $('#main-img div').animate({ left: '0%' });
}); });
slideshowMainCurrIndex = eval(slideshowMainCurrIndex) + 1; slideshowMainCurrIndex = eval(slideshowMainCurrIndex) + 1;
syncImageMainWithSelectImage(); syncImageMainWithSelectImage();
handleDispNextPrevButton(); handleDispNextPrevButton();
} }
} }
); );
} }
} }
}; };
...@@ -283,23 +286,23 @@ function imageMainSelectPrevFunction() { ...@@ -283,23 +286,23 @@ function imageMainSelectPrevFunction() {
if (slideshowMainCurrIndex > 0) { if (slideshowMainCurrIndex > 0) {
$('#main-img div').animate( $('#main-img div').animate(
{ "left": "+=100%" }, { "left": "+=100%" },
{ {
duration: "medium", duration: "medium",
complete: function () { complete: function () {
$('#main-img div').hide(); $('#main-img div').hide();
renderMainImage(fixedIndex); renderMainImage(fixedIndex);
$('#main-img div').css('left', '-=300%'); $('#main-img div').css('left', '-=300%');
$('#main-img div').show(); $('#main-img div').show();
$('<img/>').attr('src', slideshowImageCollection[fixedIndex].thumbnail).load(function () { $('<img/>').attr('src', slideshowImageCollection[fixedIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' }); $('#main-img div').animate({ left: '0%' });
}); });
slideshowMainCurrIndex = eval(slideshowMainCurrIndex) - 1; slideshowMainCurrIndex = eval(slideshowMainCurrIndex) - 1;
syncImageMainWithSelectImage(); syncImageMainWithSelectImage();
handleDispNextPrevButton(); handleDispNextPrevButton();
} }
} }
); );
} }
} }
...@@ -313,42 +316,42 @@ function selectImgClickFunction() { ...@@ -313,42 +316,42 @@ function selectImgClickFunction() {
if (imgIndex > slideshowMainCurrIndex) { if (imgIndex > slideshowMainCurrIndex) {
$('#main-img div').animate( $('#main-img div').animate(
{ "left": "-=100%" }, { "left": "-=100%" },
{ {
duration: "medium", duration: "medium",
complete: function () { complete: function () {
$('#main-img div').css('display', 'none'); $('#main-img div').css('display', 'none');
renderMainImage(imgIndex); renderMainImage(imgIndex);
$('#main-img div').css('left', '+=300%'); $('#main-img div').css('left', '+=300%');
$('#main-img div').css('display', 'block'); $('#main-img div').css('display', 'block');
$('<img/>').attr('src', slideshowImageCollection[imgIndex].thumbnail).load(function () { $('<img/>').attr('src', slideshowImageCollection[imgIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' }); $('#main-img div').animate({ left: '0%' });
}); });
slideshowMainCurrIndex = imgIndex; slideshowMainCurrIndex = imgIndex;
handleDispNextPrevButton(); handleDispNextPrevButton();
} }
} }
); );
} }
else if (imgIndex < slideshowMainCurrIndex) { else if (imgIndex < slideshowMainCurrIndex) {
$('#main-img div').animate( $('#main-img div').animate(
{ "left": "+=100%" }, { "left": "+=100%" },
{ {
duration: "medium", duration: "medium",
complete: function () { complete: function () {
$('#main-img div').css('display', 'none'); $('#main-img div').css('display', 'none');
renderMainImage(imgIndex); renderMainImage(imgIndex);
$('#main-img div').css('left', '-=300%'); $('#main-img div').css('left', '-=300%');
$('#main-img div').css('display', 'block'); $('#main-img div').css('display', 'block');
$('<img/>').attr('src', slideshowImageCollection[imgIndex].thumbnail).load(function () { $('<img/>').attr('src', slideshowImageCollection[imgIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' }); $('#main-img div').animate({ left: '0%' });
}); });
slideshowMainCurrIndex = imgIndex; slideshowMainCurrIndex = imgIndex;
handleDispNextPrevButton(); handleDispNextPrevButton();
} }
} }
); );
} }
else { else {
slideshow_isTransaction = false; slideshow_isTransaction = false;
...@@ -367,94 +370,94 @@ function selectImgClickFunction() { ...@@ -367,94 +370,94 @@ function selectImgClickFunction() {
//Render Main Image //Render Main Image
function renderMainImage(i) { function renderMainImage(i) {
var mainImg = $('#main-img div'); var mainImg = $('#main-img div');
mainImg.css('background-image', 'url(' + slideshowImageCollection[i].thumbnail + ')'); mainImg.css('background-image', 'url(' + slideshowImageCollection[i].thumbnail + ')');
slideshow_isTransaction = false; slideshow_isTransaction = false;
if (isTouchDevice() == true) { if (isTouchDevice() == true) {
$('#main-control-next').css('opacity', '0'); $('#main-control-next').css('opacity', '0');
$('#main-control-prev').css('opacity', '0'); $('#main-control-prev').css('opacity', '0');
} }
}; };
function selectImgMouseLeaveFunction(){ function selectImgMouseLeaveFunction(){
if(!slideshowClickFlg){ if(!slideshowClickFlg){
//$('this').css('box-shadow',''); //$('this').css('box-shadow','');
$('this').removeClass('activeThumb'); $('this').removeClass('activeThumb');
slideshowClickFlg = false; slideshowClickFlg = false;
} }
else{ else{
//slideshowClickFlg = false; //slideshowClickFlg = false;
} }
}; };
function selectImgMouseEnterFunction(){ function selectImgMouseEnterFunction(){
//$('.thumbnail').css('box-shadow',''); //$('.thumbnail').css('box-shadow','');
$('.thumbnail').removeClass('activeThumb'); $('.thumbnail').removeClass('activeThumb');
//$(this).css('box-shadow','0px 7px 7px #555'); //$(this).css('box-shadow','0px 7px 7px #555');
$(this).addClass('activeThumb'); $(this).addClass('activeThumb');
}; };
//Main control mouse leave function //Main control mouse leave function
function mainControlMouseLeaveFunction(){ function mainControlMouseLeaveFunction(){
$('.main-control').css('opacity','0'); $('.main-control').css('opacity','0');
}; };
//Main control mouse enter function //Main control mouse enter function
function mainControlMouseEnterFunction(){ function mainControlMouseEnterFunction(){
$('.main-control').css('opacity','0.5'); $('.main-control').css('opacity','0.5');
}; };
//Sync Main Image with select Image //Sync Main Image with select Image
function syncImageMainWithSelectImage(){ function syncImageMainWithSelectImage(){
var thumbImg = $('.thumbnail[imageId="'+ slideshowMainCurrIndex +'"]'); var thumbImg = $('.thumbnail[imageId="'+ slideshowMainCurrIndex +'"]');
if(thumbImg.is(':hidden')){ if(thumbImg.is(':hidden')){
if(slideshowMainCurrIndex > slideshowSelectLastIndex){ if(slideshowMainCurrIndex > slideshowSelectLastIndex){
imageSelectNextFunction(); imageSelectNextFunction();
} }
else if(slideshowMainCurrIndex < slideshowSelectFirstIndex){ else if(slideshowMainCurrIndex < slideshowSelectFirstIndex){
imageSelectPrevFunction(); imageSelectPrevFunction();
} }
} }
//$('.thumbnail').css('box-shadow',''); //$('.thumbnail').css('box-shadow','');
$('.thumbnail').removeClass('activeThumb'); $('.thumbnail').removeClass('activeThumb');
//thumbImg.css('box-shadow','0px 7px 7px #555'); //thumbImg.css('box-shadow','0px 7px 7px #555');
thumbImg.addClass('activeThumb'); thumbImg.addClass('activeThumb');
}; };
//Handle display button control //Handle display button control
function handleDispNextPrevButton(){ function handleDispNextPrevButton(){
if(slideshowSelectFirstIndex > 0){ if(slideshowSelectFirstIndex > 0){
$('#control-prev').css('visibility','visible'); $('#control-prev').css('visibility','visible');
} }
else{ else{
$('#control-prev').css('visibility','hidden'); $('#control-prev').css('visibility','hidden');
} }
if(slideshowSelectLastIndex < (eval(slideshowImageCollection.length) - 1)){ if(slideshowSelectLastIndex < (eval(slideshowImageCollection.length) - 1)){
$('#control-next').css('visibility','visible'); $('#control-next').css('visibility','visible');
} }
else{ else{
$('#control-next').css('visibility','hidden'); $('#control-next').css('visibility','hidden');
} }
if(slideshowMainCurrIndex > 0){ if(slideshowMainCurrIndex > 0){
$('#main-control-prev').css('visibility','visible'); $('#main-control-prev').css('visibility','visible');
} }
else{ else{
$('#main-control-prev').css('visibility','hidden'); $('#main-control-prev').css('visibility','hidden');
} }
if(slideshowMainCurrIndex < (eval(slideshowImageCollection.length) - 1)){ if(slideshowMainCurrIndex < (eval(slideshowImageCollection.length) - 1)){
$('#main-control-next').css('visibility','visible'); $('#main-control-next').css('visibility','visible');
} }
else{ else{
$('#main-control-next').css('visibility','hidden'); $('#main-control-next').css('visibility','hidden');
} }
}; };
abvw/js/contentview_Maker.js
...@@ -9,7 +9,7 @@ var maker_chooseColor; ...@@ -9,7 +9,7 @@ var maker_chooseColor;
function ShowMaker(targetId){ function ShowMaker(targetId){
maker_targetDiv = targetId; maker_targetDiv = targetId;
i18nReplaceText(); i18nReplaceText();
$('#dlgMaker').show(); $('#dlgMaker').show();
$('#dlgMaker').draggable(); $('#dlgMaker').draggable();
Maker_handleColorPickerEvent(); Maker_handleColorPickerEvent();
...@@ -17,93 +17,93 @@ function ShowMaker(targetId){ ...@@ -17,93 +17,93 @@ function ShowMaker(targetId){
}; };
function touchStart_BtnOk_Maker(e){ function touchStart_BtnOk_Maker(e){
e.preventDefault(); e.preventDefault();
Maker_dspOK_click(); Maker_dspOK_click();
}; };
function touchStart_BtnCancel_Maker(e){ function touchStart_BtnCancel_Maker(e){
e.preventDefault(); e.preventDefault();
Maker_dspCancel_click(); Maker_dspCancel_click();
}; };
function Maker_handleColorPickerEvent(){ function Maker_handleColorPickerEvent(){
if(avwUserEnvObj.os == "ipad" || avwUserEnvObj.os == "android"){ if(avwUserEnvObj.os == "ipad" || avwUserEnvObj.os == "android"){
$('#dlgMaker .colorpicker').unbind('mouseenter'); $('#dlgMaker .colorpicker').unbind('mouseenter');
$('#dlgMaker .colorpicker').unbind('mouseleave'); $('#dlgMaker .colorpicker').unbind('mouseleave');
$('#makerColorwrapper').unbind('mouseleave'); $('#makerColorwrapper').unbind('mouseleave');
document.getElementById('Maker_btnOk').addEventListener('touchstart',touchStart_BtnOk_Maker,false); document.getElementById('Maker_btnOk').addEventListener('touchstart',touchStart_BtnOk_Maker,false);
document.getElementById('Maker_btnCancel').addEventListener('touchstart',touchStart_BtnCancel_Maker,false); document.getElementById('Maker_btnCancel').addEventListener('touchstart',touchStart_BtnCancel_Maker,false);
} }
else{ else{
$('#dlgMaker .colorpicker').unbind('mouseenter'); $('#dlgMaker .colorpicker').unbind('mouseenter');
$('#dlgMaker .colorpicker').unbind('mouseleave'); $('#dlgMaker .colorpicker').unbind('mouseleave');
$('#makerColorwrapper').unbind('mouseleave'); $('#makerColorwrapper').unbind('mouseleave');
$('#dlgMaker .colorpicker').bind('mouseenter', Maker_colorPickerMouseEnterFunction); $('#dlgMaker .colorpicker').bind('mouseenter', Maker_colorPickerMouseEnterFunction);
$('#dlgMaker .colorpicker').bind('mouseleave', Maker_colorPickerMouseLeaveFunction); $('#dlgMaker .colorpicker').bind('mouseleave', Maker_colorPickerMouseLeaveFunction);
$('#makerColorwrapper').bind('mouseleave', Maker_colorWrapperMouseLeaveFunction); $('#makerColorwrapper').bind('mouseleave', Maker_colorWrapperMouseLeaveFunction);
} }
$('#Maker_btnOk').live('click', Maker_dspOK_click); $('#Maker_btnOk').live('click', Maker_dspOK_click);
$('#Maker_btnCancel').live('click', Maker_dspCancel_click); $('#Maker_btnCancel').live('click', Maker_dspCancel_click);
Maker_SetDefaultValue(); Maker_SetDefaultValue();
$('#marker-small-text').live('click', markerSmallTextClick); $('#marker-small-text').live('click', markerSmallTextClick);
$('#marker-medium-text').live('click', markerMediumTextClick); $('#marker-medium-text').live('click', markerMediumTextClick);
$('#marker-large-text').live('click', markerLargeTextClick); $('#marker-large-text').live('click', markerLargeTextClick);
$('#marker-oversize-text').live('click', markerOversizeTextClick); $('#marker-oversize-text').live('click', markerOversizeTextClick);
$('#dlgMaker .colorpicker').live('click', Maker_colorPickerClickFunction); $('#dlgMaker .colorpicker').live('click', Maker_colorPickerClickFunction);
}; };
function markerSmallTextClick(){ function markerSmallTextClick(){
$('#maker-size-small').attr('checked','checked'); $('#maker-size-small').attr('checked','checked');
$('#maker-size-medium').removeAttr('checked'); $('#maker-size-medium').removeAttr('checked');
$('#maker-size-large').removeAttr('checked'); $('#maker-size-large').removeAttr('checked');
$('#maker-size-oversize').removeAttr('checked'); $('#maker-size-oversize').removeAttr('checked');
Maker_rdo1_click(); Maker_rdo1_click();
}; };
function markerMediumTextClick(){ function markerMediumTextClick(){
$('#maker-size-small').removeAttr('checked'); $('#maker-size-small').removeAttr('checked');
$('#maker-size-medium').attr('checked','checked'); $('#maker-size-medium').attr('checked','checked');
$('#maker-size-large').removeAttr('checked'); $('#maker-size-large').removeAttr('checked');
$('#maker-size-oversize').removeAttr('checked'); $('#maker-size-oversize').removeAttr('checked');
Maker_rdo2_click(); Maker_rdo2_click();
}; };
function markerLargeTextClick(){ function markerLargeTextClick(){
$('#maker-size-small').removeAttr('checked'); $('#maker-size-small').removeAttr('checked');
$('#maker-size-medium').removeAttr('checked'); $('#maker-size-medium').removeAttr('checked');
$('#maker-size-large').attr('checked','checked'); $('#maker-size-large').attr('checked','checked');
$('#maker-size-oversize').removeAttr('checked'); $('#maker-size-oversize').removeAttr('checked');
Maker_rdo3_click(); Maker_rdo3_click();
}; };
function markerOversizeTextClick(){ function markerOversizeTextClick(){
$('#maker-size-small').removeAttr('checked'); $('#maker-size-small').removeAttr('checked');
$('#maker-size-medium').removeAttr('checked'); $('#maker-size-medium').removeAttr('checked');
$('#maker-size-large').removeAttr('checked'); $('#maker-size-large').removeAttr('checked');
$('#maker-size-oversize').attr('checked','checked'); $('#maker-size-oversize').attr('checked','checked');
Maker_rdo4_click(); Maker_rdo4_click();
}; };
// Choose type of eraser, and draw to canvas // Choose type of eraser, and draw to canvas
function Maker_chooseType(typeValue, color) { function Maker_chooseType(typeValue, color) {
var fillColor; var fillColor;
maker_Size = typeValue; maker_Size = typeValue;
var canvas = document.getElementById('Maker_cvPreviewmaker'); var canvas = document.getElementById('Maker_cvPreviewmaker');
if(color == null || color == 'undefined'){
fillColor = "f8ff00";
}
else{
fillColor = '#'+ color;
}
if(color == null || color == 'undefined'){
fillColor = "f8ff00";
}
else{
fillColor = '#'+ color;
}
if (canvas.getContext) { if (canvas.getContext) {
// use getContext to use the canvas for drawing // use getContext to use the canvas for drawing
...@@ -126,11 +126,11 @@ function Maker_SetDefaultValue() { ...@@ -126,11 +126,11 @@ function Maker_SetDefaultValue() {
maker_Size = typeValue; maker_Size = typeValue;
if(makerColor != null || makerColor != undefined){ if(makerColor != null || makerColor != undefined){
maker_chooseColor = makerColor; maker_chooseColor = makerColor;
} }
else{ else{
maker_chooseColor = 'f8ff00'; maker_chooseColor = 'f8ff00';
makerColor = 'f8ff00'; makerColor = 'f8ff00';
} }
if (typeValue == 5) { if (typeValue == 5) {
...@@ -155,26 +155,46 @@ function Maker_SetDefaultValue() { ...@@ -155,26 +155,46 @@ function Maker_SetDefaultValue() {
$("#maker-size-small").focus(); $("#maker-size-small").focus();
} }
$('#dlgMaker .colorpicker[colorId="'+makerColor+'"]').css('border','1px solid #e6e6e6'); //START FIXCSS
Maker_chooseType(maker_Size, makerColor); //$('#dlgMaker .colorpicker[colorId="'+makerColor+'"]').css('border','1px solid #e6e6e6');
$('#dlgMaker .colorpicker[colorId="'+makerColor+'"]').addClass('picker-choose-on');
$('#dlgMaker .colorpicker[colorId="'+makerColor+'"]').removeClass('picker-choose-off');
//END FIXCSS
Maker_chooseType(maker_Size, makerColor);
}; };
function Maker_colorPickerMouseLeaveFunction() { function Maker_colorPickerMouseLeaveFunction() {
$(this).css('border','1px solid white'); //START FIXCSS
$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').css('border', '1px solid #e6e6e6'); //$(this).css('border','1px solid white');
//$('#dlgMaker .colorpicker[colorId="'+makerColor+'"]').css('border','1px solid #e6e6e6');
$(this).addClass('picker-choose-off');
$(this).removeClass('picker-choose-on');
$('#dlgMaker .colorpicker[colorId="'+makerColor+'"]').addClass('picker-choose-on');
$('#dlgMaker .colorpicker[colorId="'+makerColor+'"]').removeClass('picker-choose-off');
//END FIXCSS
}; };
function Maker_colorPickerMouseEnterFunction() { function Maker_colorPickerMouseEnterFunction() {
$(this).css('border','1px solid #e6e6e6'); //START FIXCSS
var color = $(this).attr('colorId'); //$(this).css('border','1px solid #e6e6e6');
Maker_chooseType(maker_Size, color); $(this).removeClass('picker-choose-off');
$(this).addClass('picker-choose-on');
//END FIXCSS
var color = $(this).attr('colorId');
Maker_chooseType(maker_Size, color);
}; };
function Maker_colorPickerClickFunction() { function Maker_colorPickerClickFunction() {
$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').css('border', '1px solid white'); //START FIXCSS
$(this).css('border','1px solid #e6e6e6'); //$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').css('border', '1px solid white');
maker_chooseColor = $(this).attr('colorId'); //$(this).css('border','1px solid #e6e6e6');
Maker_chooseType(maker_Size, maker_chooseColor); $('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').addClass('picker-choose-off');
$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').removeClass('picker-choose-on');
$(this).addClass('picker-choose-on');
$(this).removeClass('picker-choose-off');
//END FIXCSS
maker_chooseColor = $(this).attr('colorId');
Maker_chooseType(maker_Size, maker_chooseColor);
}; };
function Maker_rdo1_click() { function Maker_rdo1_click() {
...@@ -209,60 +229,63 @@ function Maker_dspOK_click() { ...@@ -209,60 +229,63 @@ function Maker_dspOK_click() {
typeValue = 50; typeValue = 50;
} }
if(ClientData.maker_color() != maker_chooseColor){ if(ClientData.maker_color() != maker_chooseColor){
imgMarkerTemp = canvas_marker.toDataURL("image/png;"); imgMarkerTemp = canvas_marker.toDataURL("image/png;");
var img = new Image(); var img = new Image();
img.onload = function () { img.onload = function () {
context_draw.drawImage(img, 0, 0, canvas_draw.width, canvas_draw.height); context_draw.drawImage(img, 0, 0, canvas_draw.width, canvas_draw.height);
}; };
img.src = imgMarkerTemp; img.src = imgMarkerTemp;
context_marker.clearRect(0, 0, canvas_marker.width, canvas_marker.height); context_marker.clearRect(0, 0, canvas_marker.width, canvas_marker.height);
ClientData.maker_color(); ClientData.maker_color();
} }
// Set value to local // Set value to local
ClientData.maker_size(typeValue); ClientData.maker_size(typeValue);
ClientData.maker_color(maker_chooseColor); ClientData.maker_color(maker_chooseColor);
maker_Size = typeValue; maker_Size = typeValue;
makerColor = maker_chooseColor; makerColor = maker_chooseColor;
maker_targetDiv.hide(); maker_targetDiv.hide();
/*enable button */ /*enable button */
enableButtonMarking(); enableButtonMarking();
ClientData.IsAddingMarking(true); ClientData.IsAddingMarking(true);
isAddingMarking = ClientData.IsAddingMarking(); isAddingMarking = ClientData.IsAddingMarking();
makerSize = ClientData.maker_size(); makerSize = ClientData.maker_size();
makerColor = ClientData.maker_color(); makerColor = ClientData.maker_color();
/* unlock dialog overlay */ /* unlock dialog overlay */
$("#overlay").hide(); $("#overlay").hide();
$('#dlgMarking_imgMakerOption').removeClass(); $('#dlgMarking_imgMakerOption').removeClass();
$('#dlgMarking_imgMakerOption').addClass('maker_option_hover'); $('#dlgMarking_imgMakerOption').addClass('maker_option_hover');
}; };
// Event of button cancel // Event of button cancel
function Maker_dspCancel_click() { function Maker_dspCancel_click() {
maker_targetDiv.hide(); maker_targetDiv.hide();
/*enable button */ /*enable button */
enableButtonMarking(); enableButtonMarking();
ClientData.IsAddingMarking(true); ClientData.IsAddingMarking(true);
isAddingMarking = ClientData.IsAddingMarking(); isAddingMarking = ClientData.IsAddingMarking();
/* unlock dialog overlay */ /* unlock dialog overlay */
$("#overlay").hide(); $("#overlay").hide();
$('#dlgMarking_imgMakerOption').removeClass(); $('#dlgMarking_imgMakerOption').removeClass();
$('#dlgMarking_imgMakerOption').addClass('maker_option_hover'); $('#dlgMarking_imgMakerOption').addClass('maker_option_hover');
}; };
function Maker_colorWrapperMouseLeaveFunction() { function Maker_colorWrapperMouseLeaveFunction() {
Maker_chooseType(maker_Size, maker_chooseColor); Maker_chooseType(maker_Size, maker_chooseColor);
$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').css('border', '1px solid #e6e6e6'); //START FIXCSS
//$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').css('border', '1px solid #e6e6e6');
$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').addClass('picker-choose-on');
$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').removeClass('picker-choose-off');
//END FIXCSS
}; };
/// =============================================================================================== /// ===============================================================================================
......
abvw/js/contentview_Paint.js
...@@ -144,7 +144,7 @@ function drawMove(coors, context_draw) { ...@@ -144,7 +144,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = "bevel"; context_draw.lineJoin = "bevel";
context_draw.lineWidth = penSize; context_draw.lineWidth = penSize;
context_draw.strokeStyle = "#" + penColor; context_draw.strokeStyle = "#" + penColor;
//context_draw.globalAlpha = 1; //context_draw.globalAlpha = 1;
context_draw.lineTo(coors.x, coors.y); context_draw.lineTo(coors.x, coors.y);
context_draw.stroke(); context_draw.stroke();
} }
...@@ -158,24 +158,24 @@ function drawMove(coors, context_draw) { ...@@ -158,24 +158,24 @@ function drawMove(coors, context_draw) {
context_draw.lineTo(coors.x, coors.y); context_draw.lineTo(coors.x, coors.y);
context_draw.stroke(); context_draw.stroke();
context_draw.globalCompositeOperation = 'source-over';*/ context_draw.globalCompositeOperation = 'source-over';*/
//context_draw.globalCompositeOperation = 'destination-out' //context_draw.globalCompositeOperation = 'destination-out'
context_draw.beginPath(); context_draw.beginPath();
var halfSize = makerSize / 2; var halfSize = makerSize / 2;
var quotSize = makerSize / 4; var quotSize = makerSize / 4;
var ptStart = [ var ptStart = [
{ x: sx - quotSize, y: sy - halfSize }, { x: sx - quotSize, y: sy - halfSize },
{ x: sx + quotSize, y: sy - halfSize }, { x: sx + quotSize, y: sy - halfSize },
{ x: sx + quotSize, y: sy + halfSize }, { x: sx + quotSize, y: sy + halfSize },
{ x: sx - quotSize, y: sy + halfSize } { x: sx - quotSize, y: sy + halfSize }
]; ];
var ptEnd = [ var ptEnd = [
{ x: coors.x - quotSize, y: coors.y - halfSize }, { x: coors.x - quotSize, y: coors.y - halfSize },
{ x: coors.x + quotSize, y: coors.y - halfSize }, { x: coors.x + quotSize, y: coors.y - halfSize },
{ x: coors.x + quotSize, y: coors.y + halfSize }, { x: coors.x + quotSize, y: coors.y + halfSize },
{ x: coors.x - quotSize, y: coors.y + halfSize } { x: coors.x - quotSize, y: coors.y + halfSize }
]; ];
if (sx > coors.x) { if (sx > coors.x) {
if (sy > coors.y) { if (sy > coors.y) {
context_draw.globalCompositeOperation = 'destination-out'; context_draw.globalCompositeOperation = 'destination-out';
...@@ -188,7 +188,7 @@ function drawMove(coors, context_draw) { ...@@ -188,7 +188,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel'; context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'lighter'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath(); context_draw.beginPath();
...@@ -207,11 +207,11 @@ function drawMove(coors, context_draw) { ...@@ -207,11 +207,11 @@ function drawMove(coors, context_draw) {
context_draw.lineTo(ptStart[2].x, ptStart[2].y); context_draw.lineTo(ptStart[2].x, ptStart[2].y);
context_draw.lineTo(ptEnd[2].x, ptEnd[2].y); context_draw.lineTo(ptEnd[2].x, ptEnd[2].y);
context_draw.lineTo(ptEnd[3].x, ptEnd[3].y); context_draw.lineTo(ptEnd[3].x, ptEnd[3].y);
context_draw.lineTo(ptEnd[0].x, ptEnd[0].y); context_draw.lineTo(ptEnd[0].x, ptEnd[0].y);
context_draw.lineJoin = 'bevel'; context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'lighter'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath(); context_draw.beginPath();
...@@ -233,7 +233,7 @@ function drawMove(coors, context_draw) { ...@@ -233,7 +233,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel'; context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'lighter'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath(); context_draw.beginPath();
...@@ -257,8 +257,8 @@ function drawMove(coors, context_draw) { ...@@ -257,8 +257,8 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel'; context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'lighter'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath(); context_draw.beginPath();
...@@ -281,7 +281,7 @@ function drawMove(coors, context_draw) { ...@@ -281,7 +281,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel'; context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'lighter'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath(); context_draw.beginPath();
...@@ -303,7 +303,7 @@ function drawMove(coors, context_draw) { ...@@ -303,7 +303,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel'; context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'lighter'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath(); context_draw.beginPath();
...@@ -325,7 +325,7 @@ function drawMove(coors, context_draw) { ...@@ -325,7 +325,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel'; context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'lighter'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath(); context_draw.beginPath();
...@@ -345,7 +345,7 @@ function drawMove(coors, context_draw) { ...@@ -345,7 +345,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel'; context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'lighter'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath(); context_draw.beginPath();
...@@ -365,7 +365,7 @@ function drawMove(coors, context_draw) { ...@@ -365,7 +365,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel'; context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'lighter'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath(); context_draw.beginPath();
...@@ -437,10 +437,10 @@ function drawPoint(coors, context_draw) { ...@@ -437,10 +437,10 @@ function drawPoint(coors, context_draw) {
context_draw.globalCompositeOperation = 'destination-out'; context_draw.globalCompositeOperation = 'destination-out';
context_draw.lineWidth = makerSize ; context_draw.lineWidth = makerSize ;
context_draw.lineHeight = makerSize; context_draw.lineHeight = makerSize;
context_draw.lineTo(coors.x , coors.y + 0.001); context_draw.lineTo(coors.x , coors.y + 0.001);
context_draw.lineCap = 'square'; context_draw.lineCap = 'square';
context_draw.strokeStyle = "#" + makerColor; context_draw.strokeStyle = "#" + makerColor;
context_draw.stroke(); context_draw.stroke();
context_draw.globalCompositeOperation = 'lighter'; context_draw.globalCompositeOperation = 'lighter';
context_draw.lineCap = "square"; context_draw.lineCap = "square";
......
abvw/js/contentview_Pen.js
...@@ -168,27 +168,45 @@ function Pen_SetDefaultValue() { ...@@ -168,27 +168,45 @@ function Pen_SetDefaultValue() {
} }
Pen_chooseType(typeValue, penColor); Pen_chooseType(typeValue, penColor);
$('#dlgPen .colorpicker[colorId="'+penColor+'"]').css('border','1px solid #e6e6e6'); //START FIXCSS
//$('#dlgPen .colorpicker[colorId="'+penColor+'"]').css('border','1px solid #e6e6e6');
$('#dlgPen .colorpicker[colorId="'+penColor+'"]').addClass('picker-choose-on');
$('#dlgPen .colorpicker[colorId="'+penColor+'"]').removeClass('picker-choose-off');
//END FIXCSS
}; };
function Pen_colorPickerMouseLeaveFunction() { function Pen_colorPickerMouseLeaveFunction() {
$(this).css('border','1px solid white'); //START FIXCSS
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').css('border', '1px solid #e6e6e6'); //$(this).css('border','1px solid white');
//$('#dlgMaker .colorpicker[colorId="'+makerColor+'"]').css('border','1px solid #e6e6e6');
$(this).addClass('picker-choose-off');
$(this).removeClass('picker-choose-on');
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').addClass('picker-choose-on');
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').removeClass('picker-choose-off');
//END FIXCSS
}; };
function Pen_colorPickerMouseEnterFunction() { function Pen_colorPickerMouseEnterFunction() {
//START FIXCSS
$(this).css('border','1px solid #e6e6e6'); //$(this).css('border','1px solid #e6e6e6');
$(this).removeClass('picker-choose-off');
$(this).addClass('picker-choose-on');
//END FIXCSS
var color = $(this).attr('colorId'); var color = $(this).attr('colorId');
Pen_chooseType(pen_Size, color); Pen_chooseType(pen_Size, color);
}; };
function Pen_colorPickerClickFunction() { function Pen_colorPickerClickFunction() {
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').css('border', '1px solid white'); //START FIXCSS
$(this).css('border','1px solid #e6e6e6'); //$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').css('border', '1px solid white');
//$(this).css('border','1px solid #e6e6e6');
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').addClass('picker-choose-off');
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').removeClass('picker-choose-on');
$(this).addClass('picker-choose-on');
$(this).removeClass('picker-choose-off');
//END FIXCSS
pen_chooseColor = $(this).attr('colorId'); pen_chooseColor = $(this).attr('colorId');
Pen_chooseType(pen_Size, pen_chooseColor); Pen_chooseType(pen_Size, pen_chooseColor);
}; };
...@@ -266,6 +284,10 @@ function Pen_dspCancel_click() { ...@@ -266,6 +284,10 @@ function Pen_dspCancel_click() {
function Pen_colorWrapperMouseLeaveFunction() { function Pen_colorWrapperMouseLeaveFunction() {
Pen_chooseType(pen_Size, pen_chooseColor); Pen_chooseType(pen_Size, pen_chooseColor);
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').css('border', '1px solid #e6e6e6'); //$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').css('border', '1px solid #e6e6e6');
//START FIXCSS
//$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').css('border', '1px solid #e6e6e6');
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').addClass('picker-choose-on');
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').removeClass('picker-choose-off');
//END FIXCSS
}; };
abvw/js/contentview_PopupText.js
...@@ -52,41 +52,43 @@ function OpenPopupText(posX, posY, content, dialogDiv, arrowDiv) { ...@@ -52,41 +52,43 @@ function OpenPopupText(posX, posY, content, dialogDiv, arrowDiv) {
} }
} }
// Ajust direction [ end ] // Ajust direction [ end ]
//START FIXCSS
switch (direction) { switch (direction) {
case 0: left_dialog = left_arrow - dialogDiv.outerWidth(); case 0: left_dialog = left_arrow - dialogDiv.outerWidth();
top_dialog = top_arrow - 20; top_dialog = top_arrow - 20;
arrowDiv.css("border-color", "transparent transparent transparent #ccd"); //arrowDiv.css("border-color", "transparent transparent transparent #ccd");
dialogDiv.css("-moz-box-shadow", "-3px 3px 3px #777"); //dialogDiv.css("-moz-box-shadow", "-3px 3px 3px #777");
dialogDiv.css("-webkit-box-shadow", "-3px 3px 3px #777"); //dialogDiv.css("-webkit-box-shadow", "-3px 3px 3px #777");
dialogDiv.css("box-shadow", "-3px 3px 3px #777"); //dialogDiv.css("box-shadow", "-3px 3px 3px #777");
//arrowDiv.css("border-color", "transparent transparent transparent #ccd");
break; break;
case 1: left_dialog = left_arrow - dialogDiv.outerWidth(); case 1: left_dialog = left_arrow - dialogDiv.outerWidth();
top_dialog = top_arrow - dialogDiv.height() + 30; top_dialog = top_arrow - dialogDiv.height() + 30;
arrowDiv.css("border-color", "transparent transparent transparent #ccd"); //arrowDiv.css("border-color", "transparent transparent transparent #ccd");
dialogDiv.css("-moz-box-shadow", "-3px 3px 3px #777"); //dialogDiv.css("-moz-box-shadow", "-3px 3px 3px #777");
dialogDiv.css("-webkit-box-shadow", "-3px 3px 3px #777"); //dialogDiv.css("-webkit-box-shadow", "-3px 3px 3px #777");
dialogDiv.css("box-shadow", "-3px 3px 3px #777"); //dialogDiv.css("box-shadow", "-3px 3px 3px #777");
break; break;
case 2: left_dialog = left_arrow + 24; case 2: left_dialog = left_arrow + 24;
top_dialog = top_arrow - 20; top_dialog = top_arrow - 20;
arrowDiv.css("border-color", "transparent #ccd transparent transparent"); //arrowDiv.css("border-color", "transparent #ccd transparent transparent");
dialogDiv.css("-moz-box-shadow", "3px 3px 3px #777"); //dialogDiv.css("-moz-box-shadow", "3px 3px 3px #777");
dialogDiv.css("-webkit-box-shadow", "3px 3px 3px #777"); //dialogDiv.css("-webkit-box-shadow", "3px 3px 3px #777");
dialogDiv.css("box-shadow", "3px 3px 3px #777"); //dialogDiv.css("box-shadow", "3px 3px 3px #777");
break; break;
case 3: left_dialog = left_arrow + 24; case 3: left_dialog = left_arrow + 24;
top_dialog = top_arrow - dialogDiv.height() + 30; top_dialog = top_arrow - dialogDiv.height() + 30;
arrowDiv.css("border-color", "transparent #ccd transparent transparent"); //arrowDiv.css("border-color", "transparent #ccd transparent transparent");
dialogDiv.css("-moz-box-shadow", "3px 3px 3px #777"); //dialogDiv.css("-moz-box-shadow", "3px 3px 3px #777");
dialogDiv.css("-webkit-box-shadow", "3px 3px 3px #777"); //dialogDiv.css("-webkit-box-shadow", "3px 3px 3px #777");
dialogDiv.css("box-shadow", "3px 3px 3px #777"); //dialogDiv.css("box-shadow", "3px 3px 3px #777");
break; break;
} }
//END FIXCSS
dialogDiv.css("left", left_dialog + "px"); dialogDiv.css("left", left_dialog + "px");
dialogDiv.css("top", (top_dialog + 10) + "px"); dialogDiv.css("top", (top_dialog + 10) + "px");
}; };
......
abvw/js/header.js
...@@ -732,15 +732,13 @@ function showErrorScreenForceChangePassword(){ ...@@ -732,15 +732,13 @@ function showErrorScreenForceChangePassword(){
'<div><button id="avw-unauth-ok">OK</button></div>' + '<div><button id="avw-unauth-ok">OK</button></div>' +
'</div></div></div>'; '</div></div></div>';
$('body').prepend(tags); $('body').prepend(tags);
$('#avw-auth-error').css( { $('#avw-auth-error').css( {
'color': '#fff',
'opacity': 1, 'opacity': 1,
'position': 'fixed', 'position': 'fixed',
'top': '0', 'top': '0',
'left': '0', 'left': '0',
'width': $(window).width(), 'width': $(window).width(),
'height': $(window).height(), 'height': $(window).height(),
'background': '#ccc',
'zIndex': '10000' 'zIndex': '10000'
}); });
// resize error page // resize error page
......
abvw/js/history.js
...@@ -314,7 +314,7 @@ function handleLanguage(){ ...@@ -314,7 +314,7 @@ function handleLanguage(){
$('#control-sort-titlekana-off').css('display','block'); $('#control-sort-titlekana-off').css('display','block');
$('#content-grid').html(i18nText('msgHistoryNotExist')); $('#content-grid').html("<div id='msgHistoryNotExist'>" + i18nText('msgHistoryNotExist') + "</div>");
}else{ }else{
$('#control-sort-titlekana').css('display','block'); $('#control-sort-titlekana').css('display','block');
$('#separate').css('display','block'); $('#separate').css('display','block');
...@@ -1586,8 +1586,7 @@ function changeLanguageCallBackFunction(){ ...@@ -1586,8 +1586,7 @@ function changeLanguageCallBackFunction(){
function displayResultNoRecord(){ function displayResultNoRecord(){
i18nReplaceText(); i18nReplaceText();
$('#content-grid').html(i18nText('msgHistoryNotExist')); $('#content-grid').html("<div id='msgHistoryNotExist'>" + i18nText('msgHistoryNotExist') + "</div>");
$('#content-grid').css({'text-align':'left','margin-top':'20px','clear':'both','font-size':'16px','color':'red'});
$('#control-nextrecord').css('visibility','hidden'); $('#control-nextrecord').css('visibility','hidden');
$('.control_sort_on').hide(); $('.control_sort_on').hide();
$('.control_sort_off').show(); $('.control_sort_off').show();
......
abvw/js/home.js
...@@ -1398,17 +1398,6 @@ function readSubmenuFunction_callback(contentId) ...@@ -1398,17 +1398,6 @@ function readSubmenuFunction_callback(contentId)
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Add ContentType to Storage. //Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Add ContentType to Storage.
}; };
//Item Mouse Enter Event
function itemMouseEnterEvent() {
$(this).css('background-color', 'gray');
};
//Item Mouse Leave Event
function itemMouseLeaveEvent() {
$(this).css('background-color', 'white');
};
//Handle Back To Top Button //Handle Back To Top Button
function handleBackToTop() { function handleBackToTop() {
......
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