Merge branch 'master' into android

EBook.Web/Common/new_tasklib_book.js

@@ -86,12 +86,12 @@ function selectImgULContent(item, Id) {
     }
     if (uLCClsName != undefined && uLCClsName.indexOf("underlineContent") > -1 && uLCClsName.indexOf("noKey") == -1) {
         // 如果为答题点,ucflag用户作答控制高亮，1表示作答内容存在高亮
-        item.attr("yaoshi-flag", Id).attr("showflag", "1").attr("ucflag","1");
+        item.attr("yaoshi-flag", Id).attr("parent-anid", Id).attr("showflag", "1").attr("ucflag", "1");
     }
     // 判断子节点是否存在钥匙标签
     if (item.find(".yaoshi").length == 0) {
         $.each(item.find(".underlineContent").not(".noKey"), function (iIndex, iItem) {
-            $(iItem).attr("yaoshi-flag", Id).attr("showflag", "1").attr("ucflag", "1");
+            $(iItem).attr("yaoshi-flag", Id).attr("parent-anid", Id).attr("showflag", "1").attr("ucflag", "1");
         });
     }
     else {
@@ -1080,7 +1080,7 @@ function bindEventYS(sWidthVal, isAStatus, isMAStatus) {
         }
         // 如果不存在答题点答案，那么构建一个空的underlinecontent
         if ($(".underlineContent[yaoshi-flag='" + index + "']").length == 0) {
-            var HtmlStr = '<u class="underlineContent" yaoshi-flag="' + index + '" showflag="1" ucflag="1" style="border-bottom: 1px solid rgb(151, 151, 151); text-decoration: none; white-space: pre-wrap; font-size: 16px;"></u>';
+            var HtmlStr = '<u class="underlineContent" yaoshi-flag="' + index + '" parent-anid="' + index + '" showflag="1" ucflag="1" style="border-bottom: 1px solid rgb(151, 151, 151); text-decoration: none; white-space: pre-wrap; font-size: 16px;"></u>';
             $(this).after(HtmlStr);
         }
         // 获取当前要是的标准答案
@@ -1139,7 +1139,7 @@ function bindEventYS(sWidthVal, isAStatus, isMAStatus) {
             if ($(item).hasClass('boxQue')) {
                 $(item).find('.yaoshi').attr('answer-isky', "2");
                 if ($(item).find(".underlineContent").length == 0) {
-                    var AddHtmlStr = '<span class="ULCBGUse" data-select="0" onselectstart="return true"><u class="underlineContent" yaoshi-flag="' + checkId + '" parent-anid="' + headid + '" data-errstatus="0" showflag="1" style="border-bottom: 1px solid rgb(151, 151, 151); text-decoration: none; white-space: pre-wrap;" ucflag="1">&nbsp;&nbsp;&nbsp;</u></span>';
+                    var AddHtmlStr = '<span class="ULCBGUse" data-select="0" onselectstart="return true"><u class="underlineContent" yaoshi-flag="' + checkId + '" parent-anid="' +headid + '" data-errstatus="0" showflag="1" style="border-bottom: 1px solid rgb(151, 151, 151); text-decoration: none; white-space: pre-wrap;" ucflag="1">&nbsp;&nbsp;&nbsp;</u></span>';
                     $(item).find('.yaoshi').after(AddHtmlStr);
                 }
             }
@@ -1170,7 +1170,7 @@ function bindEventTeaOrignalYS(sWidthVal, isAStatus, isMAStatus) {
         }
         // 如果不存在答题点答案，那么构建一个空的underlinecontent
         if ($(".underlineContent[yaoshi-flag='" + index + "']").length == 0) {
-            var HtmlStr = '<u class="underlineContent" yaoshi-flag="' + index + '" showflag="1" ucflag="1" style="border-bottom: 1px solid rgb(151, 151, 151); text-decoration: none; white-space: pre-wrap; font-size: 16px;"></u>';
+            var HtmlStr = '<u class="underlineContent" yaoshi-flag="' + index + '" parent-anid="' + index + '" showflag="1" ucflag="1" style="border-bottom: 1px solid rgb(151, 151, 151); text-decoration: none; white-space: pre-wrap; font-size: 16px;"></u>';
             $(this).after(HtmlStr);
         }
         if (isAStatus != 1) {
@@ -2365,7 +2365,12 @@ function scrollAnswer(answerid) {
     var ansDom = $(".answer-body[parent-anid='" + answerid + "']");
     if (ansDom.length == 0) {
         ansDom = $(".cBoxCls[parent-anid='" + answerid + "']");
-        $(ansDom).parent(".cBoxClsBg").attr("data-select", "1");
+        if (ansDom.length == 0) {
+            ansDom = $(".underlineContent[parent-anid='" + answerid + "']");
+        }
+        else {
+            $(ansDom).parent(".cBoxClsBg").attr("data-select", "1");
+        }
     }
     else {
         $(ansDom).addClass("select-answer");