9・27 第2回リリース

7766f8c6 · Vo Duc Thang · 24a2668c · 7766f8c6 · 7766f8c6 · 7766f8c6
Commit 7766f8c6 authored Sep 28, 2013 by Vo Duc Thang
11 changed files
--- a/abvw/common/js/common.js
+++ b/abvw/common/js/common.js
@@ -86,7 +86,15 @@ var ShortKeys = {
    // Show, hide toolbar: "["
    ShowHideToolbar: 219,
    // Show, hide marking: "]"
-    ShowHideMarking: 221
+    ShowHideMarking: 221,
+    // Zoom out : "-"
+    ZoomOutAlt: 189,
+    //Zoom in: "+"
+    ZoomInAlt: 187,
+    //Zoom out: "-" firefox/opera
+    ZoomOutAlt_Firefox: 173,
+    //Zoom in : "+" firefox/opera
+    ZoominAlt_Firefox: 61
 };
 // -------------------------------------------------

--- a/abvw/common/json/lang/lang-en.json
+++ b/abvw/common/json/lang/lang-en.json
@@ -64,7 +64,7 @@
 "dspBkCancel":"Logout",
 "txtSearchResult":"Result",
 "dspHome":"Home",
-"txtLoginUser":"(Ver.20130927)User:",
+"txtLoginUser":"(Ver.20130927_2)User:",
 "txtAll":"All",
 "txtMkgSize":"Size",
 "txtMkgS":"S",

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

--- a/abvw/common/json/lang/lang-ko.json
+++ b/abvw/common/json/lang/lang-ko.json
@@ -64,7 +64,7 @@
 "dspBkCancel":"로그아웃",
 "txtSearchResult":"검색 결과",
 "dspHome":"홈",
-"txtLoginUser":"(Ver.20130927)로그인 중:",
+"txtLoginUser":"(Ver.20130927_2)로그인 중:",
 "txtAll":"전체",
 "txtMkgSize":"두께",
 "txtMkgS":"소",

--- a/abvw/home.html
+++ b/abvw/home.html
@@ -68,15 +68,6 @@
   	<script src="./common/js/screenLock.js" type="text/javascript"></script>
    <script src="js/detail.js" type="text/javascript"></script>
-    <!--[if IE 9 ]>
-        <style>
-            .tab_bg_color
-            {
-                overflow-x:scroll;
-            }
-        </style>
-    <![endif]-->
 </head>
 <body id="bookshelf">

--- a/abvw/js/contentview.js
+++ b/abvw/js/contentview.js
@@ -2160,6 +2160,8 @@ function displayOverlayForSpecifyContentType(){
    //End : TRB00075 - Editor : Long - Date : 09/25/2013 - Summary : prevent moving page
    /* window resize event */
    $(window).resize(function () {
+        //sizingScreen();    
        //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
@@ -2183,6 +2185,7 @@ function displayOverlayForSpecifyContentType(){
                }
            }
        }
+        sizingScreen();
        //Start : TRB00082 - Editor : Long - Date : 09/25/2013 - Summary : For win 8 rotate handling.
        setViewportForWin8();
@@ -2278,19 +2281,17 @@ function handleForContentTypeMusic(resourceUrl){
    //Create Dialog overlay
    var $container = $('#dialog');
    $container.html('');
-    //$container.css('position', 'absolute');
    $container.css('background', 'url(./img/iPad_music.png) center center no-repeat');
    $container.css('background-color', 'white');
-    //$container.css('background-attachment', 'fixed');
    if (ClientData.userOpt_musicMode() == "1") {       
-        $container.html('<audio autoplay="true" loop="true" 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"> '
        + '</audio>'
        );
    } 
    else {
-        $container.html('<audio autoplay="true" controls style="position: absolute; width: 100%; bottom: 1%;">'
+        $container.html('<audio autoplay="true" controls="controls" style="position: absolute; width: 100%; bottom: 1%;">'
        + '     <source src="' + resourceUrl + '" type="audio/mpeg"> '
        + '</audio>'
        );
@@ -2340,6 +2341,7 @@ function handleForContentTypeHTML(resourceUrl){
    }
    else{
        $container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%; height: 100%; "> </iframe>');
+         $container.css('overflow', 'hidden');
    }
    //END TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
    $container.show(); 
@@ -2442,9 +2444,6 @@ function enableControlForImageAndNoneType(){
 //Full screen function for not pdf type
 function fullScreenForNotPdfType(){
-    var w = $("#wrapper").width();
-    var h = $("#wrapper").height();
    if(contentType == ContentTypeKeys.Type_Video){
        if(avwUserEnvObj.os == 'ipad'){
            $('#content_video').removeAttr('controls');
@@ -2462,10 +2461,12 @@ function fullScreenForNotPdfType(){
    $container.css('top', '0%')
              .css('left', '0%')
-              .css('height', h)
+              .css('height', '100%')
-              .css('width', w);
+              .css('width', '100%');
+    //$container.attr('style', 'top: 0; left: 0; height: 100%; width: 100%;');
    isZoomingContent = true;
+    isFullScreen = true;
 };
 //Original screen for not pdf type
@@ -2516,6 +2517,7 @@ function originalScreenForNotPdfType(){
    //END TRB00068
    isZoomingContent = false;
+    isFullScreen = false;
 };
 //Get resource Id of content
@@ -4424,6 +4426,13 @@ function imageToScreen(x, y) {
 //Start Function : No.4 - Editor : Long - Date : 08/09/2013 - Summary : 
 /* Adjust Component size */
 function sizingNotFull(width, height) {
+    //START TRB
+    if(isMediaAndHTMLContent()){
+    }
+    //END TRB
+    else{
        //adjust size of canvas using for draw      
        if (isTouchDevice() == true) {
            $("#main").css('top', marginY);
@@ -4477,11 +4486,19 @@ function sizingNotFull(width, height) {
        /* move image check marking*/
        $('#divCheckExistMarking').css('top', '70px');
        $('#divCheckExistMarking').show();
+    }   
 };
 /* Adjust Component size */
 function sizingFullSize(width, height) {
    // adjust size of body
+    //START TRB
+    if(isMediaAndHTMLContent()){
+    }
+    //END TRB
+    else{
        if (isTouchDevice() == true) {
            $("#main").css('top', '0px');
            $("#main").attr('height', height)
@@ -4532,6 +4549,7 @@ function sizingFullSize(width, height) {
        } else {
            $('#divCheckExistMarking').show();
        }
+    }   
 };
 //End Function : No.4 - Editor : Long - Date : 08/09/2013 - Summary : 
 function zoomVideo() {

--- a/abvw/js/contentview_Anket.js
+++ b/abvw/js/contentview_Anket.js
@@ -52,15 +52,18 @@ function showAnket(url, fullscreen) {
            //START TRB00092 - EDITOR: Long - Date: 09/26/2013 - Summary : Fix opacity
            if ($(this).index() == 0) {
-                opacity = 0.6;
+                opacity = 0.3;
+                $('#dialog,#dialog iframe,#dialog .anket-commands,#dialog .anket-commands input').css('opacity', opacity);
+                $('.anket-container').css('opacity', 0);
            }
-            else if($(this).index()==1)
+            else if ($(this).index() == 1) {
-            {
                opacity = 0.8;
-            }
                //END TRB00092 - EDITOR: Long - Date: 09/26/2013 - Summary : Fix opacity
-            $('#dialog,#dialog iframe,#dialog .anket-commands,#dialog .anket-commands input').css('opacity', opacity);
+                $('#dialog,#dialog iframe,#dialog .anket-commands,#dialog .anket-commands input,.anket-container').css('opacity', opacity);
+            }
+            else {
+                $('#dialog,#dialog iframe,#dialog .anket-commands,#dialog .anket-commands input,.anket-container').css('opacity', opacity);
+            }
        }
    );
        // resize anket

--- a/abvw/js/contentview_Events.js
+++ b/abvw/js/contentview_Events.js
@@ -483,7 +483,6 @@ function createLockLayout(opt){
 //START TRB00049 - Editor: Long - Date: 09/26/2013 - Summary : Add short key alt 
 var altMode = false; 
 /* handle keydown */
 $(document).keydown(function (e) {
    /* set fag true when click ctrl */
@@ -586,6 +585,23 @@ $(document).keydown(function (e) {
                        zoomOut();
                    }                   
                    break;
+                case ShortKeys.ZoominAlt_Firefox: /* zoomIn */
+                    if(avwUserEnvObj.browser == 'firefox'){
+                        if(contentType == ContentTypeKeys.Type_PDF || contentType == ContentTypeKeys.Type_Image
+                            || contentType == ContentTypeKeys.Type_NoFile){
+                            zoomIn();
+                        } 
+                    }                   
+                    break;
+                case ShortKeys.ZoomOutAlt_Firefox: /* zoomOut */
+                    if(avwUserEnvObj.browser == 'firefox'){
+                        if(contentType == ContentTypeKeys.Type_PDF || contentType == ContentTypeKeys.Type_Image
+                            || contentType == ContentTypeKeys.Type_NoFile){
+                            zoomOut();
+                        }       
+                    }            
+                    break;
            }
        }
    }
@@ -915,7 +931,9 @@ function mouseMove_canvasMain(event) {
        py = y;
        currPos = {x:event.pageX,y:event.pageY};
        // pevious page not exist -> do not move
        if(!getContent().hasPreviousPage()){
            if(currPos.x >= _clickFirstPos.x){
                return;
            }              
@@ -923,9 +941,10 @@ function mouseMove_canvasMain(event) {
        // next page not exist -> do not move
        if(!getContent().hasNextPage()){
-            if(currPos.x <= _clickFirstPos.x)
+            if(currPos.x <= _clickFirstPos.x){
              return;  
            }              
+        }
        //examinate direction 
        if(_moveNum==0 &&  deltaX < 0){
@@ -1016,7 +1035,6 @@ function mouseMove_canvasMain(event) {
 };
 function mouseDown_CanvasMain(event) {
    //Start Function : No.20 - Editor : Long - Date: 08/17/2013 - Summary : 
    if(_isTouching){       
       //_isTouching = false;
@@ -1045,8 +1063,8 @@ function mouseDown_CanvasMain(event) {
        py = event.pageY;      
        //Start Function : No.20
-        _clickFirstPos = {x:event.screenX, y: event.screenY};
+        _clickFirstPos = {x:event.pageX, y: event.pageY};
-        _clickLastPos = {x:event.screenX, y: event.screenY};
+        _clickLastPos = {x:event.pageX, y: event.pageY};
        _moveNum = 0; 

--- a/abvw/js/contentview_InitObjects.js
+++ b/abvw/js/contentview_InitObjects.js
@@ -263,7 +263,6 @@ function initPage() {
    /* window resize event */
    $(window).resize(function () {  
        //Start : TRB00015 - Editor : Long - Date : 08/28/2013 - Summary : For win 8 rotate handling.
        setViewportForWin8();
        //End : TRB00015 - Editor : Long - Date : 08/28/2013 - Summary : For win 8 rotate handling.
@@ -612,12 +611,12 @@ function initPageMediaAndHtmlType(){
        //Check if content is zooming
        if(isZoomingContent){
-            var $container = $("#dialog");
+            //var $container = $("#dialog");
-            var w = window.innerWidth;
+           // var w = window.innerWidth;
-            var h = window.innerHeight;
+            //var h = window.innerHeight;
-            $container.css('height', h);
+            //$container.css('height', h);
-            $container.css('width', w);
+            //$container.css('width', w);
        }                
    });

--- a/abvw/js/header.js
+++ b/abvw/js/header.js
@@ -1050,26 +1050,20 @@ function downloadResourceById(contentId){
        contentId: contentId,
        getType: '2'
    };
-  /*  abapi('webGetContent', params, 'GET', function (data) {
-        var resourceId=data.contentData.content.resourceId;
-       //Get resource
-       resourceUrl = getResourceByIdFromAPI(resourceId);           
-       // open url to download file
-       window.open(resourceUrl);
-    });           */
    avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", "get", params,
            function (data) {
                //Get resourceurl
                var resourceUrl = getResourceByIdFromAPI(data.contentData.content.resourceId);
                // open url to download file
-                        window.open(resourceUrl);
+                if (isSafariNotOnIpad()) {
+                    window.onbeforeunload = null;
+                    window.open(resourceUrl, "_self"); // open url to download file on safari not for ipad
+                    var toogleTime = setTimeout(function () { ToogleLogoutNortice() }, 200);
+                }
+                else {
+                    window.open(resourceUrl); //open url to download file on orther browser
+                }
            },
        function (xhr, b, c) { });
 };
@@ -1078,3 +1072,14 @@ function downloadResourceById(contentId){
 function getResourceByIdFromAPI(resourceId){
    return getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + resourceId + "&isDownload=true";
 };
+// check is browser safari on Mac and Window devide ( not Ipad )
+function isSafariNotOnIpad() {
+    if (!window.chrome) {
+        var ua = navigator.userAgent.toLowerCase();
+        if (!/ipad/.test(ua) && /safari/.test(ua)) {
+            return true;
+        }
+    }
+    return false;
+};
\ No newline at end of file
--- a/abvw/js/home.js
+++ b/abvw/js/home.js
@@ -196,12 +196,17 @@ $(document).ready(function () {
    }
    // hide tab group with user anonymous
-    if(isAnonymousLogin())
+    if (isAnonymousLogin()) {
-    {
        $('.switchingTab .colright').hide();
    }
    else $('.switchingTab .colright').show();
+    // set scroll for tree view on IE 9
+    var ua = window.navigator.userAgent.toLowerCase();
+    if (/msie 9.0/.test(ua)&&!/tablet/.test(ua)) {
+        $('.tab_bg_color').css({ "overflow-x": "scroll" });
+    }
 });
 var allowTimerCloseSubMenu = true;
 var timer_subMenu;