Merge branch 'contract/ttss/1.0.0_kim-ec' into 'contract/ttss/1.1.0'

Contract/ttss/1.0.0 kim ec

See merge request abook_web/web-viewer!57

abvw/js/contentview.js

@@ -747,7 +747,7 @@ CONTENTVIEW.searchHandle = function() {
             var myQuery;
             var myQuery;
             var myRegExpArr = [];
             var myRegExpArr = [];
             var count = 0;          
             var count = 0;          
-            var textReg = $('#txtSearch').val().replace(/\(/g," \( ").replace(/\)/g," \) ");
+            var textReg = $('#txtSearch').val().replace(/\(/g," \( ").replace(/\)/g," \) ").replace(/　/g,'"\　"');
 
 
             //)(check
             //)(check
             var dummyArray = [];
             var dummyArray = [];
@@ -4759,7 +4759,24 @@ CONTENTVIEW.flip = function(opt) {
 
 
         // display rect
         // display rect
         CONTENTVIEW.srcRect.add(CONTENTVIEW.moveX, CONTENTVIEW.moveY);
         CONTENTVIEW.srcRect.add(CONTENTVIEW.moveX, CONTENTVIEW.moveY);
-
+        if($(rotatebtnR).attr('angle') == '90' || $(rotatebtnR).attr('angle') == '-90'){
+            if (CONTENTVIEW.srcRect.left < 0) {
+                CONTENTVIEW.srcRect.left = 0;
+                CONTENTVIEW.srcRect.right = CONTENTVIEW.srcRect.left + CONTENTVIEW.srcRect.width;
+            }
+            if (CONTENTVIEW.srcRect.right > offscreen.width) {
+                CONTENTVIEW.srcRect.left = offscreen.width - CONTENTVIEW.srcRect.width;
+                CONTENTVIEW.srcRect.right = offscreen.width;
+            }
+            if (CONTENTVIEW.srcRect.top < 0) {
+                CONTENTVIEW.srcRect.top = 0;
+                CONTENTVIEW.srcRect.bottom = CONTENTVIEW.srcRect.top + CONTENTVIEW.srcRect.height;
+            }
+            if (CONTENTVIEW.srcRect.bottom > offscreen.height) {
+                CONTENTVIEW.srcRect.top = offscreen.height - CONTENTVIEW.srcRect.height;
+                CONTENTVIEW.srcRect.bottom = offscreen.height;
+            }
+        }else{
             // fix rect
             // fix rect
             if (CONTENTVIEW.srcRect.left < 0) {
             if (CONTENTVIEW.srcRect.left < 0) {
                 CONTENTVIEW.srcRect.left = 0;
                 CONTENTVIEW.srcRect.left = 0;
@@ -4775,6 +4792,7 @@ CONTENTVIEW.flip = function(opt) {
                 CONTENTVIEW.srcRect.top = offscreen.height - CONTENTVIEW.srcRect.height;
                 CONTENTVIEW.srcRect.top = offscreen.height - CONTENTVIEW.srcRect.height;
                 CONTENTVIEW.srcRect.bottom = offscreen.height;
                 CONTENTVIEW.srcRect.bottom = offscreen.height;
             }
             }
+        }
 
 
         // target rect
         // target rect
         var width = offscreen.width;
         var width = offscreen.width;