#16382 アンケートコンテンツ・試験コンテンツ

abvw/js/contentview.js

@@ -2125,8 +2125,10 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
         }
         CONTENTVIEW.handleForContentTypeHTML(linkUrlTmp);
     }
-    else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Exam) {
+    else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Exam){
     	CONTENTVIEW.handleForContentTypeExam(resourceUrl);
+    } else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Enquete){
+    	CONTENTVIEW.handleForContentTypeEnquete(resourceUrl);
     }
     if (COMMON.isTouchDevice() == true) {
         if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
@@ -2365,7 +2367,31 @@ CONTENTVIEW.handleForContentTypeExam = function(resourceUrl){
    }
    else{
        $container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%; height: 100%; "> </iframe>');
-        $container.css('overflow', 'hidden');
+       $container.css('overflow', 'hidden');
+   }
+   //END TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
+   $container.show();
+};
+
+CONTENTVIEW.handleForContentTypeEnquete = function(resourceUrl){
+    //Create Dialog overlay
+   var $container = $('#dialog');
+
+   $container.html('');
+   $container.css('left','0%');
+   $container.css('width','100%');
+   $container.css('background-color','white');
+
+   //START TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
+   if(CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()){
+      $container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%;"></iframe>');
+
+      $container.css('overflow', 'scroll');
+      $container.css('-webkit-overflow-scrolling', 'touch');
+   }
+   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();
@@ -5692,7 +5718,6 @@ CONTENTVIEW.ready = function(initContentId){
     		getType: 1,
     		isStreaming: ClientData.isStreamingMode()
     };
-
     AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
          "webGetContent",
          "GET",
@@ -5754,18 +5779,25 @@ CONTENTVIEW.ready = function(initContentId){
                 else{
                 	if(CONTENTVIEW_GENERAL.contentType == "exam" || CONTENTVIEW_GENERAL.contentType == "enquete") {
 	            		var isShowResult, isSendResult;
-	                    if(data.contentData.showResult == 1){
-	                    	isShowResult = true;
-	                    } else {
-	                    	isShowResult = false;
-	                    }
-	                    if(data.contentData.sendResult == 1){
-	                    	isSendResult = true;
+	            		if(CONTENTVIEW_GENERAL.contentType == "exam") {
+	            			if(data.contentData.showResult == 1){
+		                    	isShowResult = true;
+		                    } else {
+		                    	isShowResult = false;
+		                    }
+		                    if(data.contentData.sendResult == 1){
+		                    	isSendResult = true;
+		                    } else {
+		                    	isSendResult = false;
+		                    }
+	            		}
+	                    var contentId = data.contentData.contentId;
+	                    var url;
+	                    if(CONTENTVIEW_GENERAL.contentType == "exam"){
+	                    	url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId=&sid=" + CONTENTVIEW.getSessionId()+"&contentId="+contentId+"&isShowResult="+isShowResult+"&isSendResult="+isSendResult;
 	                    } else {
-	                    	isSendResult = false;
+	                    	url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId=&sid=" + CONTENTVIEW.getSessionId()+"&contentId="+contentId;
 	                    }
-	                    var contentId = data.contentData.contentId;
-	                    var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&sid=" + CONTENTVIEW.getSessionId()+"&contentId="+contentId+"&isShowResult="+isShowResult+"&isSendResult="+isSendResult;
 	                    /* init footer toolbar */
 	                    $('#footer_toolbar_2').hide();
 	                    $('#footer_toolbar_1').show();
@@ -5788,7 +5820,7 @@ CONTENTVIEW.ready = function(initContentId){
 	                    //enable SpecifyControl
 	                    CONTENTVIEW.enableControlForMediaAndHtmlType();
                        　CONTENTVIEW.displayOverlayForSpecifyContentType(url);
-                       $(window).resize(function () {
+                        $(window).resize(function () {
 
                            //Check if content is zooming
                            if(CONTENTVIEW.isZoomingContent){
@@ -5799,19 +5831,19 @@ CONTENTVIEW.ready = function(initContentId){
                                //$container.css('height', h);
                                //$container.css('width', w);
                            }
-                       });
+                        });
 
-                       CONTENTVIEW.handleSliderBar();
-                       $('#lblSlider').text('/ ' + 1);
+                        CONTENTVIEW.handleSliderBar();
+                        $('#lblSlider').text('/ ' + 1);
 
-                       if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid() == false) {
+                        if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid() == false) {
                            $("#slider_page").slider("option", "disabled", true);
-                       }
+                        }
 
-                       COMMON.disable('#txtSearch', '#txtSlider');
-                	} else {
+                        COMMON.disable('#txtSearch', '#txtSlider');
+                	 }else {
                 		CONTENTVIEW_INITOBJECT.initPage();
-                	}
+                	 }
                 }
 
                 //ストリーミングならデバイス側に初期表示済通知