9/25 リリース

abvw/common/js/thickbox.js

@@ -5,7 +5,7 @@
  * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php
 */
 
-var tb_pathToImage = "/common/images/loadingAnimation.gif";
+var tb_pathToImage = "";// "/common/images/loadingAnimation.gif";
 var tmpPage;
 var linkPage;
 var TB_WIDTH;

abvw/common/json/lang/lang-en.json

@@ -64,7 +64,7 @@
 "dspBkCancel":"Logout",
 "txtSearchResult":"Result",
 "dspHome":"Home",
-"txtLoginUser":"(Ver.20130924)User:",
+"txtLoginUser":"(Ver.20130925)User:",
 "txtAll":"All",
 "txtMkgSize":"Size",
 "txtMkgS":"S",

abvw/common/json/lang/lang-ja.json

@@ -64,7 +64,7 @@
 "dspBkCancel":"バックアップせずにログアウト",
 "txtSearchResult":"検索結果",
 "dspHome":"ホーム",
-"txtLoginUser":"(Ver.20130924)ログイン中：",
+"txtLoginUser":"(Ver.20130925)ログイン中：",
 "txtAll":"すべて",
 "txtMkgSize":"太さ",
 "txtMkgS":"小",

abvw/common/json/lang/lang-ko.json

@@ -64,7 +64,7 @@
 "dspBkCancel":"로그아웃",
 "txtSearchResult":"검색 결과",
 "dspHome":"홈",
-"txtLoginUser":"(Ver.20130924)로그인 중:",
+"txtLoginUser":"(Ver.20130925)로그인 중:",
 "txtAll":"전체",
 "txtMkgSize":"두께",
 "txtMkgS":"소",

abvw/js/Limit_Access_Content.js

@@ -33,6 +33,12 @@ function checkLimitContent(contentId, func,isNotUnlockScreen) {
         $('#limit_level1').show().center();
         $('#limit_level1 .deletebtn .ok').unbind('click').click(
             function () {
+
+                if (isNotUnlockScreen != 1) {
+                    unlockLayout();
+                }
+                $('#limit_level1').hide();
+
                 func();
             }
         );
@@ -116,6 +122,10 @@ function checkLimitContent(contentId, func,isNotUnlockScreen) {
 	                // update sid id
 	                ClientData.userInfo_sid(data.sid);
 
+	                if (isNotUnlockScreen != 1) {
+	                    unlockLayout();
+	                }
+	                $('#limit_level2').hide();
 	                // open content
 	                func();
 	            }

abvw/js/contentsearch.js

@@ -926,6 +926,9 @@ function downloadResourceById(contentId){
              
        window.open(resourceUrl, "_blank");        
 
+       // redraw content remove new icon
+       drawEditImage(contentId);
+         
     });           
 };
 

abvw/js/contentview.js

@@ -2108,6 +2108,61 @@ function displayOverlayForSpecifyContentType(){
     else if(contentType == ContentTypeKeys.Type_Html){
         handleForContentTypeHTML(resourceUrl);
     }
+    
+    if (isTouchDevice() == true) {
+        if (avwUserEnvObj.os == "android") {
+            standardRatio = document.documentElement.clientWidth / window.innerWidth;
+            startDetectZoom({ time: 500,
+                callbackFunction: function (oldRatio, newRatio, oldW, oldH, newW, newH) {
+                    currentRatio = newRatio;
+
+                }
+            });
+            var top = window.innerHeight - $("#footer_toolbar_1").height();
+            $("#wrapper").css("width", window.innerWidth);
+            $("#wrapper").css("height", window.innerHeight);
+            $("#footer_toolbar_1").css("top", top + "px");
+            $("#footer_toolbar_2").css("top", top + "px");
+            sizingScreen();
+        }
+    }
+    
+    /* window resize event */
+    $(window).resize(function () {    
+        //START : TRB00034 - DATE : 09/11/2013 - Editor : Long  - Summary : Fix for center loading image           
+        setLoadingSize();
+        //END : TRB00034 - DATE : 09/11/2013 - Editor : Long  - Summary : Fix for center loading image
+        if (isTouchDevice() == true) {
+            if (avwUserEnvObj.os == "android") {
+                var tempRatio = document.documentElement.clientWidth / window.innerWidth;
+                if (tempRatio <= 1) {
+                    // Adjust position for toolbar and footer bar
+                    var top = window.innerHeight - $("#footer_toolbar_1").height();
+                    $("#wrapper").css("width", window.innerWidth);
+                    $("#wrapper").css("height", window.innerHeight);
+                    $("#footer_toolbar_1").css("top", top + "px");
+                    $("#footer_toolbar_2").css("top", top + "px");
+                }
+                else {
+                    var top = $(window).height() - $("#footer_toolbar_1").height();
+                    $("#wrapper").css("width", $(window).width());
+                    $("#wrapper").css("height", $(window).height());
+                    $("#footer_toolbar_1").css("top", top + "px");
+                    $("#footer_toolbar_2").css("top", top + "px");
+                }
+            }
+        }
+
+        resizeScreen();
+        isChangeSizeScreen = false;
+
+        /* change position dialog */
+        changePosDialog();
+
+        /* close dialog popuptext */
+        closeDialogResize();                
+
+    });     
 };
 
 //handle for content type = video
@@ -2122,7 +2177,7 @@ function handleForContentTypeVideo(resourceUrl){
          $container.html(
               '<h1>' 
             + '</h1>'
-            + '<video autoplay="true" loop="true" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
+            + '<video id="content_video" autoplay="true" loop="true" preload="auto" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
             + '     <source src="' + resourceUrl + '" type="video/mp4"> '
             + '</video>'
             );
@@ -2131,7 +2186,7 @@ function handleForContentTypeVideo(resourceUrl){
          $container.html(
           '<h1>' 
         + '</h1>'
-        + '<video autoplay="true" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
+        + '<video id="content_video" autoplay="true" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
         + '     <source src="' + resourceUrl + '" type="video/mp4"> '
         + '</video>'
         );
@@ -2145,11 +2200,34 @@ function handleForContentTypeVideo(resourceUrl){
         $("#contentVideoConfirm_OK").unbind('click');
         $("#contentVideoConfirm_OK").click(function () {
   
+            var myVideo=document.getElementById("content_video"); 
+            if (myVideo.paused)
+            {
+             myVideo.play();   
+            }                                    
+              
+            $container.show();
             $("#contentVideoConfirm").hide();
             isShowVideoContent = true;                           
+        });
+        $("#contentVideoConfirm").show();
+        $("#contentVideoConfirm").center();
+    }
+    else if (avwUserEnvObj.os == "android") { 
+        // Show confim message to play background music
+        $("#contentVideoConfirm").css('z-index', 999);
+        $("#contentVideoConfirm_OK").unbind('click');
         $container.show();
-            $("#dialog").find('video').load();
-            $("#dialog").find('video').play();           
+        $("#contentVideoConfirm_OK").click(function () {
+            
+            var myVideo=document.getElementById("content_video"); 
+            if (myVideo.paused)
+            {
+             myVideo.play();   
+            }                                    
+                         
+            $("#contentVideoConfirm").hide();
+            isShowVideoContent = true;                           
         });
         $("#contentVideoConfirm").show();
         $("#contentVideoConfirm").center();

abvw/js/contentview_InitObjects.js

@@ -297,7 +297,11 @@ function initPage() {
             } else {
                 if (getPageIndex() == 0) {
                     //START TRB00069
+                    //START TRB00069
+                        if(isHasPageBGM()){
                             isPendingContentBGM = true;   
+                        }                       
+                        //END TRB00069
                     //END TRB00069
                     getContent().setPageImages(totalPage, pageImages)
 					 				.setPageObjects(pageObjects)
@@ -432,7 +436,9 @@ function initPage() {
                     if (getPageIndex() == 0) {
                         
                         //START TRB00069
+                        if(isHasPageBGM()){
                             isPendingContentBGM = true;   
+                        }                       
                         //END TRB00069
                         
                         getContent().setPageImages(totalPage, pageImages)
@@ -550,6 +556,23 @@ function initPage() {
     });
 };
 
+//START TRB00069
+function isHasPageBGM(){
+         
+    var iResult = false;
+    getPageObjectsByPageIndex(pageObjectsData, 0);
+    for (var nIndex = 0; nIndex < pageObjects.length; nIndex++) {
+        if (pageObjects[nIndex].mediaType == '3' && pageObjects[nIndex].playType == '2') {
+            iResult = true;
+            break;
+        }
+    }
+    
+    return iResult;  
+};
+
+//END TRB00069
+
 function initPageMediaAndHtmlType(){
     
     //$('#divImageLoading').css('display', 'block');

abvw/js/history.js

@@ -747,6 +747,10 @@ function downloadResourceById(contentId){
        //Get resource
        resourceUrl = getResourceByIdFromAPI(resourceId);
        window.open(resourceUrl, "_blank");        
+
+        // redraw content remove new icon
+       drawEditImage(contentId);
+
     });           
 };
 

abvw/js/home.js

@@ -2046,6 +2046,9 @@ function downloadResourceById(contentId){
        
        window.open(resourceUrl, "_blank");      
 
+       // redraw content remove new icon
+       drawEditImage(contentId);
+
     });           
 };