#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()) {
@@ -2371,6 +2373,30 @@ CONTENTVIEW.handleForContentTypeExam = function(resourceUrl){
    $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();
+};
+
 //Check type of content
 CONTENTVIEW.isMediaAndHTMLContent = function(){
     if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video ||
@@ -5692,7 +5718,6 @@ CONTENTVIEW.ready = function(initContentId){
     		getType: 1,
     		isStreaming: ClientData.isStreamingMode()
     };
-
     AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
          "webGetContent",
          "GET",
@@ -5754,6 +5779,7 @@ CONTENTVIEW.ready = function(initContentId){
                 else{
                 	if(CONTENTVIEW_GENERAL.contentType == "exam" || CONTENTVIEW_GENERAL.contentType == "enquete") {
 	            		var isShowResult, isSendResult;
+	            		if(CONTENTVIEW_GENERAL.contentType == "exam") {
 	            			if(data.contentData.showResult == 1){
 		                    	isShowResult = true;
 		                    } else {
@@ -5764,8 +5790,14 @@ CONTENTVIEW.ready = function(initContentId){
 		                    } else {
 		                    	isSendResult = false;
 		                    }
+	            		}
 	                    var contentId = data.contentData.contentId;
-	                    var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&sid=" + CONTENTVIEW.getSessionId()+"&contentId="+contentId+"&isShowResult="+isShowResult+"&isSendResult="+isSendResult;
+	                    var url;
+	                    if(CONTENTVIEW_GENERAL.contentType == "exam"){
+	                    	url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId=&sid=" + CONTENTVIEW.getSessionId()+"&contentId="+contentId+"&isShowResult="+isShowResult+"&isSendResult="+isSendResult;
+	                    } else {
+	                    	url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId=&sid=" + CONTENTVIEW.getSessionId()+"&contentId="+contentId;
+	                    }
 	                    /* init footer toolbar */
 	                    $('#footer_toolbar_2').hide();
 	                    $('#footer_toolbar_1').show();
@@ -5809,7 +5841,7 @@ CONTENTVIEW.ready = function(initContentId){
                         }
 
                         COMMON.disable('#txtSearch', '#txtSlider');
-                	} else {
+                	 }else {
                 		CONTENTVIEW_INITOBJECT.initPage();
                 	 }
                 }