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,12 +747,12 @@ CONTENTVIEW.searchHandle = function() {
             var myQuery;
             var myRegExpArr = [];
             var count = 0;          
-            var textReg = $('#txtSearch').val().replace(/\(/g," \( ").replace(/\)/g," \) ");
+            var textReg = $('#txtSearch').val().replace(/\(/g," \( ").replace(/\)/g," \) ").replace(/　/g,'"\　"');
 
             //)(check
             var dummyArray = [];
-			var dummytextReg = $('#txtSearch').val().replace(/\"/g,"'\"'");
-
+            var dummytextReg = $('#txtSearch').val().replace(/\"/g,"'\"'");
+            
             if($('#txtSearch').val() == '"("'){
                 myRegExpArr[0] = new RegExp("[\(]");
                 for (var nIndex = 0; nIndex < contentPage.length; nIndex++) {
@@ -4759,21 +4759,39 @@ CONTENTVIEW.flip = function(opt) {
 
         // display rect
         CONTENTVIEW.srcRect.add(CONTENTVIEW.moveX, CONTENTVIEW.moveY);
-
-        // fix rect
-        if (CONTENTVIEW.srcRect.left < 0) {
-            CONTENTVIEW.srcRect.left = 0;
-            CONTENTVIEW.srcRect.right = CONTENTVIEW.srcRect.left + CONTENTVIEW.srcRect.width;
-        } else 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;
-        } else if (CONTENTVIEW.srcRect.bottom > offscreen.height) {
-            CONTENTVIEW.srcRect.top = offscreen.height - CONTENTVIEW.srcRect.height;
-            CONTENTVIEW.srcRect.bottom = offscreen.height;
+        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
+            if (CONTENTVIEW.srcRect.left < 0) {
+                CONTENTVIEW.srcRect.left = 0;
+                CONTENTVIEW.srcRect.right = CONTENTVIEW.srcRect.left + CONTENTVIEW.srcRect.width;
+            } else 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;
+            } else if (CONTENTVIEW.srcRect.bottom > offscreen.height) {
+                CONTENTVIEW.srcRect.top = offscreen.height - CONTENTVIEW.srcRect.height;
+                CONTENTVIEW.srcRect.bottom = offscreen.height;
+            }
         }
 
         // target rect